diff --git a/po/ja.po b/po/ja.po
index dfa590f5..7a5e9eb6 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: wget 1.10-b1\n"
+"Project-Id-Version: wget 1.10.1-b1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-06 09:11-0400\n"
-"PO-Revision-Date: 2005-05-13 02:47+0900\n"
+"POT-Creation-Date: 2005-07-08 08:08-0400\n"
+"PO-Revision-Date: 2005-07-09 02:29+0900\n"
 "Last-Translator: Hiroshi Takekawa <sian@big.or.jp>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -18,9 +18,7 @@ msgstr ""
 #: src/connect.c:199
 #, c-format
 msgid "%s: unable to resolve bind address `%s'; disabling bind.\n"
-msgstr ""
-"%s: �Х���ɤ��褦�Ȥ������ɥ쥹 `%s' ����Ǥ��ޤ���Ǥ���; �Х���ɤ�ػ�"
-"���ޤ���\n"
+msgstr "%s: �Х���ɤ��褦�Ȥ������ɥ쥹 `%s' ����Ǥ��ޤ���Ǥ���; �Х���ɤ�ػߤ��ޤ���\n"
 
 #: src/connect.c:271
 #, c-format
@@ -36,6 +34,11 @@ msgstr "%s:%d 
 msgid "connected.\n"
 msgstr "��³���ޤ�����\n"
 
+#: src/connect.c:347 src/host.c:789 src/host.c:818
+#, c-format
+msgid "failed: %s.\n"
+msgstr "���Ԥ��ޤ���: %s.\n"
+
 #: src/convert.c:176
 #, c-format
 msgid "Converted %d files in %.*f seconds.\n"
@@ -75,17 +78,22 @@ msgstr "Set-Cookie
 msgid "Syntax error in Set-Cookie: %s at position %d.\n"
 msgstr "Set-Cookie: %s �ΰ��� %d �ˤ�ʸˡ���顼������ޤ���\n"
 
-#: src/cookies.c:1469
+#: src/cookies.c:881
+#, c-format
+msgid "Cookie coming from %s attempted to set domain to %s\n"
+msgstr "%s ����Υ��å������ɥᥤ��� %s �����ꤷ�褦�Ȥ��ޤ���\n"
+
+#: src/cookies.c:1328 src/cookies.c:1477
 #, c-format
 msgid "Cannot open cookies file `%s': %s\n"
 msgstr "���å����ե����� `%s' �򳫤��ޤ���Ǥ���: %s\n"
 
-#: src/cookies.c:1481
+#: src/cookies.c:1489
 #, c-format
 msgid "Error writing to `%s': %s\n"
 msgstr "`%s' �ؽ񤭹���ޤ���: %s\n"
 
-#: src/cookies.c:1484
+#: src/cookies.c:1492
 #, c-format
 msgid "Error closing `%s': %s\n"
 msgstr "`%s' ���Ĥ���ݤ˥��顼��ȯ�����ޤ���: %s\n"
@@ -134,12 +142,12 @@ msgstr " (%s 
 msgid "Length: %s"
 msgstr "��: %s"
 
-#: src/ftp.c:232 src/http.c:1857
+#: src/ftp.c:232 src/http.c:1861
 #, c-format
 msgid ", %s (%s) remaining"
 msgstr ", %s (%s) �ĤäƤ��ޤ�"
 
-#: src/ftp.c:236 src/http.c:1861
+#: src/ftp.c:236 src/http.c:1865
 #, c-format
 msgid ", %s remaining"
 msgstr ", %s �ĤäƤ��ޤ�"
@@ -272,7 +280,7 @@ msgstr ""
 #. 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:946 src/http.c:1913
+#: src/ftp.c:946 src/http.c:1922
 #, c-format
 msgid "%s has sprung into existence.\n"
 msgstr "%s ��¸�ߤ��Ƥ��ޤ���\n"
@@ -295,17 +303,17 @@ msgstr "
 msgid "Data transfer aborted.\n"
 msgstr "�ǡ���ž�������Ǥ��ޤ�����\n"
 
-#: src/ftp.c:1114
+#: src/ftp.c:1117
 #, c-format
-msgid "File `%s' already there, not retrieving.\n"
+msgid "File `%s' already there; not retrieving.\n"
 msgstr "�ե����� `%s' �Ϥ��Ǥ�¸�ߤ���Τǡ��������ޤ���\n"
 
-#: src/ftp.c:1182 src/http.c:2130
+#: src/ftp.c:1185 src/http.c:2142
 #, c-format
 msgid "(try:%2d)"
 msgstr "(���:%2d)"
 
-#: src/ftp.c:1252 src/http.c:2409
+#: src/ftp.c:1255 src/http.c:2421
 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%s]\n"
@@ -314,37 +322,35 @@ msgstr ""
 "%s (%s) - `%s' ����¸���ޤ��� [%s]\n"
 "\n"
 
-#: src/ftp.c:1294 src/main.c:948 src/recur.c:376 src/retr.c:842
+#: src/ftp.c:1297 src/main.c:948 src/recur.c:376 src/retr.c:844
 #, c-format
 msgid "Removing %s.\n"
 msgstr "%s �������ޤ�����\n"
 
-#: src/ftp.c:1336
+#: src/ftp.c:1339
 #, c-format
 msgid "Using `%s' as listing tmp file.\n"
 msgstr "����ե������ꥹ�Ȥ��뤿��� `%s' ����Ѥ��ޤ���\n"
 
-#: src/ftp.c:1351
+#: src/ftp.c:1354
 #, c-format
 msgid "Removed `%s'.\n"
 msgstr "`%s' �������ޤ�����\n"
 
-#: src/ftp.c:1386
+#: src/ftp.c:1389
 #, c-format
 msgid "Recursion depth %d exceeded max. depth %d.\n"
 msgstr "�Ƶ����뿼�� %d �������ͤ�Ķ�ᤷ�Ƥ��ޤ��������� %d �Ǥ���\n"
 
 #. Remote file is older, file sizes can be compared and
 #. are both equal.
-#: src/ftp.c:1456
+#: src/ftp.c:1459
 #, c-format
 msgid "Remote file no newer than local file `%s' -- not retrieving.\n"
-msgstr ""
-"������¦�Υե��������������Υե����� `%s' ��������������Ʊ���ʤΤǼ�����"
-"�ޤ���\n"
+msgstr "������¦�Υե��������������Υե����� `%s' ��������������Ʊ���ʤΤǼ������ޤ���\n"
 
 #. Remote file is newer or sizes cannot be matched
-#: src/ftp.c:1463
+#: src/ftp.c:1466
 #, c-format
 msgid ""
 "Remote file is newer than local file `%s' -- retrieving.\n"
@@ -354,7 +360,7 @@ msgstr ""
 "\n"
 
 #. Sizes do not match
-#: src/ftp.c:1470
+#: src/ftp.c:1473
 #, c-format
 msgid ""
 "The sizes do not match (local %s) -- retrieving.\n"
@@ -363,11 +369,11 @@ msgstr ""
 "�����������ʤ��Τ�(��������� %s)���������ޤ���\n"
 "\n"
 
-#: src/ftp.c:1488
+#: src/ftp.c:1491
 msgid "Invalid name of the symlink, skipping.\n"
 msgstr "�����ʥ���ܥ�å����̾�ʤΤǡ��ȤФ��ޤ���\n"
 
-#: src/ftp.c:1505
+#: src/ftp.c:1508
 #, c-format
 msgid ""
 "Already have correct symlink %s -> %s\n"
@@ -376,44 +382,42 @@ msgstr ""
 "���Ǥ� %s -> %s �Ȥ�������������ܥ�å���󥯤�����ޤ�\n"
 "\n"
 
-#: src/ftp.c:1513
+#: src/ftp.c:1516
 #, c-format
 msgid "Creating symlink %s -> %s\n"
 msgstr "%s -> %s �Ȥ�������ܥ�å���󥯤�������Ƥ��ޤ�\n"
 
-#: src/ftp.c:1523
+#: src/ftp.c:1526
 #, c-format
 msgid "Symlinks not supported, skipping symlink `%s'.\n"
-msgstr ""
-"����ܥ�å���󥯤��б����Ƥ��ʤ��Τǡ�����ܥ�å���� `%s' ��ȤФ���"
-"����\n"
+msgstr "����ܥ�å���󥯤��б����Ƥ��ʤ��Τǡ�����ܥ�å���� `%s' ��ȤФ��ޤ���\n"
 
-#: src/ftp.c:1535
+#: src/ftp.c:1538
 #, c-format
 msgid "Skipping directory `%s'.\n"
 msgstr "�ǥ��쥯�ȥ� `%s' ��ȤФ��ޤ���\n"
 
-#: src/ftp.c:1544
+#: src/ftp.c:1547
 #, c-format
 msgid "%s: unknown/unsupported file type.\n"
 msgstr "%s: �����ʤޤ����б����Ƥ��ʤ��ե�����μ���Ǥ���\n"
 
-#: src/ftp.c:1571
+#: src/ftp.c:1574
 #, c-format
 msgid "%s: corrupt time-stamp.\n"
 msgstr "%s: ���դ�����Ƥ��ޤ���\n"
 
-#: src/ftp.c:1599
+#: src/ftp.c:1602
 #, c-format
 msgid "Will not retrieve dirs since depth is %d (max %d).\n"
 msgstr "������ %d (���� %d)�ʤΤǥǥ��쥯�ȥ��ž�����ޤ���\n"
 
-#: src/ftp.c:1649
+#: src/ftp.c:1652
 #, c-format
 msgid "Not descending to `%s' as it is excluded/not-included.\n"
 msgstr "��������Ƥ��뤫�ޤޤ�Ƥ��ʤ��Τ� `%s' �˰�ư���ޤ���\n"
 
-#: src/ftp.c:1715 src/ftp.c:1729
+#: src/ftp.c:1718 src/ftp.c:1732
 #, c-format
 msgid "Rejecting `%s'.\n"
 msgstr "`%s' ��������ޤ���\n"
@@ -421,17 +425,17 @@ msgstr "`%s' 
 #. No luck.
 #. #### This message SUCKS.  We should see what was the
 #. reason that nothing was retrieved.
-#: src/ftp.c:1775
+#: src/ftp.c:1778
 #, c-format
 msgid "No matches on pattern `%s'.\n"
 msgstr "�ѥ����� `%s' ��Ŭ�礹���Τ�����ޤ���\n"
 
-#: src/ftp.c:1841
+#: src/ftp.c:1844
 #, c-format
 msgid "Wrote HTML-ized index to `%s' [%s].\n"
 msgstr "`%s' [%s]���Ф���HTML�����줿���Ф�(index)��񤭤ޤ�����\n"
 
-#: src/ftp.c:1846
+#: src/ftp.c:1849
 #, c-format
 msgid "Wrote HTML-ized index to `%s'.\n"
 msgstr "`%s' ���Ф���HTML�����줿���Ф�(index)��񤭤ޤ�����\n"
@@ -495,35 +499,30 @@ msgstr "%s: 
 msgid "%s: option `-W %s' doesn't allow an argument\n"
 msgstr "%s: ���ץ���� `-W %s' �ϰ�������ޤ���\n"
 
-#: src/host.c:371
+#: src/host.c:366
 msgid "Unknown host"
 msgstr "�����ʥۥ��ȤǤ�"
 
 #. Message modeled after what gai_strerror returns in similar
 #. circumstances.
-#: src/host.c:375
+#: src/host.c:370
 msgid "Temporary failure in name resolution"
 msgstr "̾�������˰��Ū�ʼ��Ԥ�ȯ�����ޤ���"
 
-#: src/host.c:377
+#: src/host.c:372
 msgid "Unknown error"
 msgstr "�����ʥ��顼�Ǥ�"
 
-#: src/host.c:756
+#: src/host.c:751
 #, c-format
 msgid "Resolving %s... "
 msgstr "%s ��DNS���䤤���碌�Ƥ��ޤ�... "
 
-#: src/host.c:800 src/host.c:829
-#, c-format
-msgid "failed: %s.\n"
-msgstr "���Ԥ��ޤ���: %s.\n"
-
-#: src/host.c:809
+#: src/host.c:798
 msgid "failed: No IPv4/IPv6 addresses for host.\n"
 msgstr "����: �ۥ��Ȥ� IPv4/IPv6 ���ɥ쥹������ޤ���\n"
 
-#: src/host.c:832
+#: src/host.c:821
 msgid "failed: timed out.\n"
 msgstr "���Ԥ��ޤ���: �����ॢ����.\n"
 
@@ -532,7 +531,12 @@ msgstr "
 msgid "%s: Cannot resolve incomplete link %s.\n"
 msgstr "%s: �Դ����ʥ�� %s ����Ǥ��ޤ���\n"
 
-#: src/http.c:373 src/http.c:1549
+#: src/html-url.c:705
+#, c-format
+msgid "%s: Invalid URL %s: %s\n"
+msgstr "%s: %s ��̵���� URL �Ǥ�(%s)��\n"
+
+#: src/http.c:373
 #, c-format
 msgid "Failed writing HTTP request: %s.\n"
 msgstr "HTTP �ˤ����³�׵�������˼��Ԥ��ޤ���: %s\n"
@@ -541,79 +545,79 @@ msgstr "HTTP 
 msgid "No headers, assuming HTTP/0.9"
 msgstr "�إå����ʤ��Τǡ�HTTP/0.9 ���Ȳ��ꤷ�ޤ�"
 
-#: src/http.c:1198
+#: src/http.c:1204
 msgid "Disabling SSL due to encountered errors.\n"
 msgstr "���顼��ȯ�������Τ� SSL ��̵���ˤ��ޤ�\n"
 
-#: src/http.c:1417
+#: src/http.c:1374
+#, c-format
+msgid "POST data file `%s' missing: %s\n"
+msgstr "POST �ǡ����ե����� `%s' ������ޤ���: %s\n"
+
+#: src/http.c:1423
 #, c-format
 msgid "Reusing existing connection to %s:%d.\n"
 msgstr "%s:%d �ؤ���³������Ѥ��ޤ���\n"
 
-#: src/http.c:1479
-#, c-format
-msgid "Failed writing to proxy: %s.\n"
-msgstr "�ץ������ؤ������˼��Ԥ��ޤ���: %s\n"
-
-#: src/http.c:1488
+#: src/http.c:1492
 #, c-format
 msgid "Failed reading proxy response: %s\n"
 msgstr "�ץ�����������ɤ߹��ߤ˼��Ԥ��ޤ���: %s\n"
 
-#: src/http.c:1508
+#: src/http.c:1512
 #, c-format
 msgid "Proxy tunneling failed: %s"
 msgstr "�ץ������Υȥ�ͥ�󥰤˼��Ԥ��ޤ���: %s"
 
-#: src/http.c:1555
+#: src/http.c:1557
 #, c-format
 msgid "%s request sent, awaiting response... "
 msgstr "%s �ˤ����³�׵���������ޤ������������ԤäƤ��ޤ�... "
 
-#: src/http.c:1566
+#: src/http.c:1568
 msgid "No data received.\n"
 msgstr "�ǡ�������������ޤ���Ǥ���\n"
 
-#: src/http.c:1573
+#: src/http.c:1575
 #, c-format
 msgid "Read error (%s) in headers.\n"
 msgstr "�إå�����ɤ߹��ߥ��顼(%s)�Ǥ�\n"
 
 #. If the authentication header is missing or
 #. unrecognized, there's no sense in retrying.
-#: src/http.c:1658
+#: src/http.c:1660
 msgid "Unknown authentication scheme.\n"
 msgstr "������ǧ�ڷ����Ǥ���\n"
 
-#: src/http.c:1682
+#: src/http.c:1684
 msgid "Authorization failed.\n"
 msgstr "ǧ�ڤ˼��Ԥ��ޤ�����\n"
 
-#: src/http.c:1696
+#: src/http.c:1698
 msgid "Malformed status line"
 msgstr "��̯�ʥ��ơ������ԤǤ�"
 
-#: src/http.c:1698
+#: src/http.c:1700
 msgid "(no description)"
 msgstr "(�����ʤ�)"
 
-#: src/http.c:1769
+#: src/http.c:1763
 #, c-format
 msgid "Location: %s%s\n"
 msgstr "���: %s%s\n"
 
-#: src/http.c:1770 src/http.c:1867
+#: src/http.c:1764 src/http.c:1871
 msgid "unspecified"
 msgstr "����Ǥ��ޤ���"
 
-#: src/http.c:1771
+#: src/http.c:1765
 msgid " [following]"
 msgstr " [³��]"
 
 #. 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:1817
+#: src/http.c:1821
 msgid ""
 "\n"
 "    The file is already fully retrieved; nothing to do.\n"
@@ -626,73 +630,76 @@ msgstr ""
 #. No need to print this output if the body won't be
 #. downloaded at all, or if the original server response is
 #. printed.
-#: src/http.c:1847
+#: src/http.c:1851
 msgid "Length: "
 msgstr "��: "
 
-#: src/http.c:1867
+#: src/http.c:1871
 msgid "ignored"
 msgstr "̵�뤷�ޤ���"
 
-#: src/http.c:2007
+#: src/http.c:2019
 msgid "Warning: wildcards not supported in HTTP.\n"
 msgstr "�ٹ�: HTTP�ϥ磻��ɥ����ɤ��б����Ƥ��ޤ���\n"
 
 #. If opt.noclobber is turned on and file already exists, do not
 #. retrieve the file
-#: src/http.c:2042
+#: src/http.c:2054
 #, c-format
-msgid "File `%s' already there, will not retrieve.\n"
-msgstr "�ե����� `%s' �Ϥ��Ǥ�¸�ߤ���Τǡ�ž�����ޤ���\n"
+msgid ""
+"File `%s' already there; not retrieving.\n"
+"\n"
+msgstr ""
+"�ե����� `%s' �Ϥ��Ǥ�¸�ߤ���Τǡ��������ޤ���\n"
+"\n"
 
-#: src/http.c:2232
+#: src/http.c:2244
 #, c-format
 msgid "Cannot write to `%s' (%s).\n"
 msgstr "`%s' (%s)�ؽ񤭹���ޤ���\n"
 
 #. Another fatal error.
-#: src/http.c:2239
+#: src/http.c:2251
 msgid "Unable to establish SSL connection.\n"
 msgstr "SSL �ˤ����³����Ω�Ǥ��ޤ���\n"
 
-#: src/http.c:2248
+#: src/http.c:2260
 #, c-format
 msgid "ERROR: Redirection (%d) without location.\n"
 msgstr "���顼: ��꤬¸�ߤ��ʤ�������쥯�����(%d)�Ǥ���\n"
 
-#: src/http.c:2278
+#: src/http.c:2290
 #, c-format
 msgid "%s ERROR %d: %s.\n"
 msgstr "%s ���顼 %d: %s��\n"
 
-#: src/http.c:2291
+#: src/http.c:2303
 msgid "Last-modified header missing -- time-stamps turned off.\n"
 msgstr "Last-modified �إå�������ޤ��� -- ���դ�̵���ˤ��ޤ���\n"
 
-#: src/http.c:2299
+#: src/http.c:2311
 msgid "Last-modified header invalid -- time-stamp ignored.\n"
 msgstr "Last-modified �إå���̵���Ǥ� -- ���դ�̵�뤷�ޤ���\n"
 
-#: src/http.c:2322
+#: src/http.c:2334
 #, c-format
 msgid ""
 "Server file no newer than local file `%s' -- not retrieving.\n"
 "\n"
 msgstr ""
-"������¦�Υե��������������Υե����� `%s' �������������ΤǼ������ޤ�"
-"��\n"
+"������¦�Υե��������������Υե����� `%s' �������������ΤǼ������ޤ���\n"
 "\n"
 
-#: src/http.c:2330
+#: src/http.c:2342
 #, c-format
 msgid "The sizes do not match (local %s) -- retrieving.\n"
 msgstr "�礭�������ʤ��Τ�(��������� %s)��ž�����ޤ���\n"
 
-#: src/http.c:2335
+#: src/http.c:2347
 msgid "Remote file is newer, retrieving.\n"
 msgstr "��⡼�ȥե�����Τۤ����������Τǡ�ž�����ޤ���\n"
 
-#: src/http.c:2377
+#: src/http.c:2389 src/http.c:2455
 #, c-format
 msgid ""
 "%s (%s) - `%s' saved [%s/%s]\n"
@@ -701,31 +708,22 @@ msgstr ""
 "%s (%s) - `%s' ����¸���ޤ��� [%s/%s]\n"
 "\n"
 
-#: src/http.c:2434
+#: src/http.c:2446
 #, c-format
 msgid "%s (%s) - Connection closed at byte %s. "
 msgstr "%s (%s) - %s �Х��Ȥ���³����λ���ޤ����� "
 
-#: src/http.c:2443
-#, c-format
-msgid ""
-"%s (%s) - `%s' saved [%s/%s])\n"
-"\n"
-msgstr ""
-"%s (%s) - `%s' ����¸���ޤ��� [%s/%s])\n"
-"\n"
-
-#: src/http.c:2469
+#: src/http.c:2481
 #, c-format
 msgid "%s (%s) - Connection closed at byte %s/%s. "
 msgstr "%s (%s) - %s/%s �Х��Ȥ���³����λ���ޤ����� "
 
-#: src/http.c:2483
+#: src/http.c:2495
 #, c-format
 msgid "%s (%s) - Read error at byte %s (%s)."
 msgstr "%s (%s) - %s �Х��Ȥ��ɤ߹��ߥ��顼��ȯ�����ޤ��� (%s)��"
 
-#: src/http.c:2493
+#: src/http.c:2505
 #, c-format
 msgid "%s (%s) - Read error at byte %s/%s (%s). "
 msgstr "%s (%s) - %s/%s �Х��Ȥ��ɤ߹��ߥ��顼��ȯ�����ޤ��� (%s)�� "
@@ -767,47 +765,49 @@ msgstr "%s: ̵
 
 #: src/init.c:707
 #, c-format
-msgid "%s: %s: Invalid boolean `%s', use `on' or `off'.\n"
-msgstr "%s: %s: `%s'��̵���Ǥ���on �� off ������ꤷ�Ƥ���������\n"
+msgid "%s: %s: Invalid boolean `%s'; use `on' or `off'.\n"
+msgstr "%s: %s: `%s'�ϥ֡����ͤȤ���̵���Ǥ���on �� off ������ꤷ�Ƥ���������\n"
 
-#: src/init.c:750
+#: src/init.c:759
 #, c-format
-msgid "%s: %s: Invalid boolean `%s', use always, on, off, or never.\n"
+msgid ""
+"%s: %s: Invalid extended boolean `%s';\n"
+"use one of `on', `off', `always', or `never'.\n"
 msgstr ""
-"%s: %s: `%s'��̵���Ǥ���always, on, off �ޤ��� never �Τ����줫����ꤷ�Ƥ���"
-"������\n"
+"%s: %s: `%s'�ϳ�ĥ�֡����ͤȤ���̵���Ǥ���\n"
+"on, off, always, never �Τ����줫����ꤷ�Ƥ���������\n"
 
-#: src/init.c:767
+#: src/init.c:777
 #, c-format
 msgid "%s: %s: Invalid number `%s'.\n"
 msgstr "%s: %s: `%s'��̵���ʿ��Ǥ���\n"
 
-#: src/init.c:998 src/init.c:1017
+#: src/init.c:1008 src/init.c:1027
 #, c-format
 msgid "%s: %s: Invalid byte value `%s'\n"
 msgstr "%s: %s: `%s' �ϥХ����ͤǤ���\n"
 
-#: src/init.c:1042
+#: src/init.c:1052
 #, c-format
 msgid "%s: %s: Invalid time period `%s'\n"
 msgstr "%s: %s: `%s' ��̵���ʻ��ֳִ֤Ǥ���\n"
 
-#: src/init.c:1096 src/init.c:1186 src/init.c:1281 src/init.c:1306
+#: src/init.c:1106 src/init.c:1196 src/init.c:1291 src/init.c:1316
 #, c-format
 msgid "%s: %s: Invalid value `%s'.\n"
 msgstr "%s: %s: `%s'��̵�����ͤǤ���\n"
 
-#: src/init.c:1133
+#: src/init.c:1143
 #, c-format
 msgid "%s: %s: Invalid header `%s'.\n"
 msgstr "%s: %s: `%s' ��̵���ʥإå��Ǥ���\n"
 
-#: src/init.c:1198
+#: src/init.c:1208
 #, c-format
 msgid "%s: %s: Invalid progress type `%s'.\n"
 msgstr "%s: %s: `%s' ��̵���ʷв�ɽ�������Ǥ���\n"
 
-#: src/init.c:1249
+#: src/init.c:1259
 #, c-format
 msgid "%s: %s: Invalid restriction `%s', use `unix' or `windows'.\n"
 msgstr "%s: %s: `%s'��̵���Ǥ���unix �� windows ����ꤷ�Ƥ���������\n"
@@ -895,35 +895,28 @@ msgid "  -v,  --verbose             be verbose (this is the default).\n"
 msgstr "  -v,  --verbose             ��Ĺ�ʽ��Ϥ򤹤� (�ǥե����)\n"
 
 #: src/main.c:415
-msgid ""
-"  -nv, --no-verbose          turn off verboseness, without being quiet.\n"
+msgid "  -nv, --no-verbose          turn off verboseness, without being quiet.\n"
 msgstr "  -nv, --no-verbose          ��Ĺ�ǤϤʤ�����\n"
 
 #: src/main.c:417
 msgid "  -i,  --input-file=FILE     download URLs found in FILE.\n"
-msgstr ""
-"  -i,  --input-file=FILE     FILE ����˻��ꤵ�줿 URL �����������ɤ���\n"
+msgstr "  -i,  --input-file=FILE     FILE ����˻��ꤵ�줿 URL �����������ɤ���\n"
 
 #: src/main.c:419
 msgid "  -F,  --force-html          treat input file as HTML.\n"
 msgstr "  -F,  --force-html          ���ϥե������ HTML �Ȥ��ư���\n"
 
 #: src/main.c:421
-msgid ""
-"  -B,  --base=URL            prepends URL to relative links in -F -i file.\n"
-msgstr ""
-"  -B,  --base=URL            ���� URL(-F -i ���ѻ�) �Υ١��� URL ����ꤹ��\n"
+msgid "  -B,  --base=URL            prepends URL to relative links in -F -i file.\n"
+msgstr "  -B,  --base=URL            ���� URL(-F -i ���ѻ�) �Υ١��� URL ����ꤹ��\n"
 
 #: src/main.c:425
 msgid "Download:\n"
 msgstr "�����������:\n"
 
 #: src/main.c:427
-msgid ""
-"  -t,  --tries=NUMBER            set number of retries to NUMBER (0 "
-"unlimits).\n"
-msgstr ""
-"  -t,  --tries=NUMBER            ��ȥ饤����ξ�¤���� (0 ��̵����).\n"
+msgid "  -t,  --tries=NUMBER            set number of retries to NUMBER (0 unlimits).\n"
+msgstr "  -t,  --tries=NUMBER            ��ȥ饤����ξ�¤���� (0 ��̵����).\n"
 
 #: src/main.c:429
 msgid "       --retry-connrefused       retry even if connection is refused.\n"
@@ -937,30 +930,21 @@ msgstr "  -O,  --output-document=FILE    FILE 
 msgid ""
 "  -nc, --no-clobber              skip downloads that would download to\n"
 "                                 existing files.\n"
-msgstr ""
-"  -nc, --no-clobber              ¸�ߤ��Ƥ���ե���������������ɤǾ�񤭤�"
-"�ʤ�\n"
+msgstr "  -nc, --no-clobber              ¸�ߤ��Ƥ���ե���������������ɤǾ�񤭤��ʤ�\n"
 
 #: src/main.c:436
-msgid ""
-"  -c,  --continue                resume getting a partially-downloaded "
-"file.\n"
-msgstr ""
-"  -c,  --continue                ��ʬŪ�˥���������ɤ����ե������³�������"
-"���\n"
+msgid "  -c,  --continue                resume getting a partially-downloaded file.\n"
+msgstr "  -c,  --continue                ��ʬŪ�˥���������ɤ����ե������³������Ϥ��\n"
 
 #: src/main.c:438
 msgid "       --progress=TYPE           select progress gauge type.\n"
-msgstr ""
-"       --progress=TYPE           �ʹ�ɽ���������μ���� TYPE �˻��ꤹ��\n"
+msgstr "       --progress=TYPE           �ʹ�ɽ���������μ���� TYPE �˻��ꤹ��\n"
 
 #: src/main.c:440
 msgid ""
 "  -N,  --timestamping            don't re-retrieve files unless newer than\n"
 "                                 local.\n"
-msgstr ""
-"  -N,  --timestamping            ��������ˤ���ե�������⿷�����ե������"
-"����������\n"
+msgstr "  -N,  --timestamping            ��������ˤ���ե�������⿷�����ե����������������\n"
 
 #: src/main.c:443
 msgid "  -S,  --server-response         print server response.\n"
@@ -972,39 +956,30 @@ msgstr "       --spider                  
 
 #: src/main.c:447
 msgid "  -T,  --timeout=SECONDS         set all timeout values to SECONDS.\n"
-msgstr ""
-"  -T,  --timeout=SECONDS         ���ƤΥ����ॢ���Ȥ� SECONDS �ä����ꤹ��\n"
+msgstr "  -T,  --timeout=SECONDS         ���ƤΥ����ॢ���Ȥ� SECONDS �ä����ꤹ��\n"
 
 #: src/main.c:449
 msgid "       --dns-timeout=SECS        set the DNS lookup timeout to SECS.\n"
-msgstr ""
-"       --dns-timeout=SECS        DNS �䤤��碌�Υ����ॢ���Ȥ� SECS �ä�����"
-"����\n"
+msgstr "       --dns-timeout=SECS        DNS �䤤��碌�Υ����ॢ���Ȥ� SECS �ä����ꤹ��\n"
 
 #: src/main.c:451
 msgid "       --connect-timeout=SECS    set the connect timeout to SECS.\n"
-msgstr ""
-"       --connect-timeout=SECS    ��³�����ॢ���Ȥ� SECS �ä����ꤹ��\n"
+msgstr "       --connect-timeout=SECS    ��³�����ॢ���Ȥ� SECS �ä����ꤹ��\n"
 
 #: src/main.c:453
 msgid "       --read-timeout=SECS       set the read timeout to SECS.\n"
-msgstr ""
-"       --read-timeout=SECS       �ɤ߹��ߥ����ॢ���Ȥ� SECS �ä����ꤹ��\n"
+msgstr "       --read-timeout=SECS       �ɤ߹��ߥ����ॢ���Ȥ� SECS �ä����ꤹ��\n"
 
 #: src/main.c:455
 msgid "  -w,  --wait=SECONDS            wait SECONDS between retrievals.\n"
 msgstr "  -w,  --wait=SECONDS            �������������� SECONDS ���Ԥ�\n"
 
 #: src/main.c:457
-msgid ""
-"       --waitretry=SECONDS       wait 1..SECONDS between retries of a "
-"retrieval.\n"
+msgid "       --waitretry=SECONDS       wait 1..SECONDS between retries of a retrieval.\n"
 msgstr "       --waitretry=SECONDS       ��ȥ饤��� 1��SECONDS ���Ԥ�\n"
 
 #: src/main.c:459
-msgid ""
-"       --random-wait             wait from 0...2*WAIT secs between "
-"retrievals.\n"
+msgid "       --random-wait             wait from 0...2*WAIT secs between retrievals.\n"
 msgstr "       --random-wait             �������������� 0��2*WAIT ���Ԥ�\n"
 
 #: src/main.c:461
@@ -1017,16 +992,11 @@ msgstr "       --no-proxy                
 
 #: src/main.c:465
 msgid "  -Q,  --quota=NUMBER            set retrieval quota to NUMBER.\n"
-msgstr ""
-"  -Q,  --quota=NUMBER            ����������ɤ���Х��ȿ��ξ�¤���ꤹ��\n"
+msgstr "  -Q,  --quota=NUMBER            ����������ɤ���Х��ȿ��ξ�¤���ꤹ��\n"
 
 #: src/main.c:467
-msgid ""
-"       --bind-address=ADDRESS    bind to ADDRESS (hostname or IP) on local "
-"host.\n"
-msgstr ""
-"       --bind-address=ADDRESS    �������륢�ɥ쥹�Ȥ��� ADDRESS (�ۥ���̾�� "
-"IP) ��Ȥ�\n"
+msgid "       --bind-address=ADDRESS    bind to ADDRESS (hostname or IP) on local host.\n"
+msgstr "       --bind-address=ADDRESS    �������륢�ɥ쥹�Ȥ��� ADDRESS (�ۥ���̾�� IP) ��Ȥ�\n"
 
 #: src/main.c:469
 msgid "       --limit-rate=RATE         limit download rate to RATE.\n"
@@ -1034,13 +1004,10 @@ msgstr "       --limit-rate=RATE         
 
 #: src/main.c:471
 msgid "       --no-dns-cache            disable caching DNS lookups.\n"
-msgstr ""
-"       --no-dns-cache            DNS ���䤤��碌��̤򥭥�å��夷�ʤ�\n"
+msgstr "       --no-dns-cache            DNS ���䤤��碌��̤򥭥�å��夷�ʤ�\n"
 
 #: src/main.c:473
-msgid ""
-"       --restrict-file-names=OS  restrict chars in file names to ones OS "
-"allows.\n"
+msgid "       --restrict-file-names=OS  restrict chars in file names to ones OS allows.\n"
 msgstr "       --restrict-file-names=OS  OS �������Ƥ���ե�����̾�����¤���\n"
 
 #: src/main.c:476
@@ -1053,20 +1020,16 @@ msgstr "  -6,  --inet6-only              IPv6 
 
 #: src/main.c:480
 msgid ""
-"       --prefer-family=FAMILY    connect first to addresses of specified "
-"family,\n"
+"       --prefer-family=FAMILY    connect first to addresses of specified family,\n"
 "                                 one of IPv6, IPv4, or none.\n"
-msgstr ""
-"       --prefer-family=FAMILY    ���ꤷ���ե��ߥ�(IPv6, IPv4, none)�Ǻǽ����"
-"³����\n"
+msgstr "       --prefer-family=FAMILY    ���ꤷ���ե��ߥ�(IPv6, IPv4, none)�Ǻǽ����³����\n"
 
 #: src/main.c:484
 msgid "       --user=USER               set both ftp and http user to USER.\n"
 msgstr "       --user=USER               ftp, http �Υ桼��̾����ꤹ��\n"
 
 #: src/main.c:486
-msgid ""
-"       --password=PASS           set both ftp and http password to PASS.\n"
+msgid "       --password=PASS           set both ftp and http password to PASS.\n"
 msgstr "       --password=PASS           ftp, http �Υѥ���ɤ���ꤹ��\n"
 
 #: src/main.c:490
@@ -1094,12 +1057,8 @@ msgid "  -P,  --directory-prefix=PREFIX  save files to PREFIX/...\n"
 msgstr "  -P,  --directory-prefix=PREFIX  �ե������ PREFIX/ �ʲ�����¸����\n"
 
 #: src/main.c:502
-msgid ""
-"       --cut-dirs=NUMBER          ignore NUMBER remote directory "
-"components.\n"
-msgstr ""
-"       --cut-dirs=NUMBER          ��⡼�ȥǥ��쥯�ȥ�̾�� NUMBER ����ʬ��̵"
-"�뤹��\n"
+msgid "       --cut-dirs=NUMBER          ignore NUMBER remote directory components.\n"
+msgstr "       --cut-dirs=NUMBER          ��⡼�ȥǥ��쥯�ȥ�̾�� NUMBER ����ʬ��̵�뤹��\n"
 
 #: src/main.c:506
 msgid "HTTP options:\n"
@@ -1115,12 +1074,10 @@ msgstr "       --http-password=PASS    http 
 
 #: src/main.c:512
 msgid "       --no-cache              disallow server-cached data.\n"
-msgstr ""
-"       --no-cache              �����Ф�����å��夷���ǡ�������Ĥ��ʤ�\n"
+msgstr "       --no-cache              �����Ф�����å��夷���ǡ�������Ĥ��ʤ�\n"
 
 #: src/main.c:514
-msgid ""
-"  -E,  --html-extension        save HTML documents with `.html' extension.\n"
+msgid "  -E,  --html-extension        save HTML documents with `.html' extension.\n"
 msgstr "  -E,  --html-extension        HTML ʸ��� `.html' ��ĥ�Ҥ���¸����\n"
 
 #: src/main.c:516
@@ -1140,9 +1097,7 @@ msgid "       --proxy-password=PASS   set PASS as proxy password.\n"
 msgstr "       --proxy-password=PASS   �ץ������ѥ���ɤȤ��� PASS ��Ȥ�\n"
 
 #: src/main.c:524
-msgid ""
-"       --referer=URL           include `Referer: URL' header in HTTP "
-"request.\n"
+msgid "       --referer=URL           include `Referer: URL' header in HTTP request.\n"
 msgstr "       --referer=URL           Referer �� URL �����ꤹ��\n"
 
 #: src/main.c:526
@@ -1150,19 +1105,12 @@ msgid "       --save-headers          save the HTTP headers to file.\n"
 msgstr "       --save-headers          HTTP �Υإå���ե��������¸����\n"
 
 #: src/main.c:528
-msgid ""
-"  -U,  --user-agent=AGENT      identify as AGENT instead of Wget/VERSION.\n"
-msgstr ""
-"  -U,  --user-agent=AGENT      User-Agent �Ȥ��� Wget/VERSION �ǤϤʤ� AGENT "
-"��Ȥ�\n"
+msgid "  -U,  --user-agent=AGENT      identify as AGENT instead of Wget/VERSION.\n"
+msgstr "  -U,  --user-agent=AGENT      User-Agent �Ȥ��� Wget/VERSION �ǤϤʤ� AGENT ��Ȥ�\n"
 
 #: src/main.c:530
-msgid ""
-"       --no-http-keep-alive    disable HTTP keep-alive (persistent "
-"connections).\n"
-msgstr ""
-"       --no-http-keep-alive    HTTP �� keep-alive (��³Ū��³) ��ǽ��Ȥ��"
-"��\n"
+msgid "       --no-http-keep-alive    disable HTTP keep-alive (persistent connections).\n"
+msgstr "       --no-http-keep-alive    HTTP �� keep-alive (��³Ū��³) ��ǽ��Ȥ�ʤ�\n"
 
 #: src/main.c:532
 msgid "       --no-cookies            don't use cookies.\n"
@@ -1177,24 +1125,16 @@ msgid "       --save-cookies=FILE     save cookies to FILE after session.\n"
 msgstr "       --save-cookies=FILE     ���å����� FILE ����¸����\n"
 
 #: src/main.c:538
-msgid ""
-"       --keep-session-cookies  load and save session (non-permanent) "
-"cookies.\n"
-msgstr ""
-"       --keep-session-cookies  ���å����������Ѥ��륯�å������ݻ�����\n"
+msgid "       --keep-session-cookies  load and save session (non-permanent) cookies.\n"
+msgstr "       --keep-session-cookies  ���å����������Ѥ��륯�å������ݻ�����\n"
 
 #: src/main.c:540
-msgid ""
-"       --post-data=STRING      use the POST method; send STRING as the "
-"data.\n"
-msgstr ""
-"       --post-data=STRING      POST �᥽�åɤ��Ѥ��� STRING ����������\n"
+msgid "       --post-data=STRING      use the POST method; send STRING as the data.\n"
+msgstr "       --post-data=STRING      POST �᥽�åɤ��Ѥ��� STRING ����������\n"
 
 #: src/main.c:542
-msgid ""
-"       --post-file=FILE        use the POST method; send contents of FILE.\n"
-msgstr ""
-"       --post-file=FILE        POST �᥽�åɤ��Ѥ��� FILE ����̣����������\n"
+msgid "       --post-file=FILE        use the POST method; send contents of FILE.\n"
+msgstr "       --post-file=FILE        POST �᥽�åɤ��Ѥ��� FILE ����̣����������\n"
 
 #: src/main.c:547
 msgid "HTTPS (SSL/TLS) options:\n"
@@ -1204,13 +1144,10 @@ msgstr "HTTPS (SSL/TLS) 
 msgid ""
 "       --secure-protocol=PR     choose secure protocol, one of auto, SSLv2,\n"
 "                                SSLv3, and TLSv1.\n"
-msgstr ""
-"       --secure-protocol=PR     �����奢�ץ��ȥ�������򤹤� (auto, SSLv2, "
-"SSLv3, TLSv1)\n"
+msgstr "       --secure-protocol=PR     �����奢�ץ��ȥ�������򤹤� (auto, SSLv2, SSLv3, TLSv1)\n"
 
 #: src/main.c:552
-msgid ""
-"       --no-check-certificate   don't validate the server's certificate.\n"
+msgid "       --no-check-certificate   don't validate the server's certificate.\n"
 msgstr "       --no-check-certificate   �����о�����򸡾ڤ��ʤ�\n"
 
 #: src/main.c:554
@@ -1219,9 +1156,7 @@ msgstr "       --certificate=FILE       
 
 #: src/main.c:556
 msgid "       --certificate-type=TYPE  client certificate type, PEM or DER.\n"
-msgstr ""
-"       --certificate-type=TYPE  ���饤����Ⱦ�����μ���� TYPE (PEM, DER) ��"
-"���ꤹ��\n"
+msgstr "       --certificate-type=TYPE  ���饤����Ⱦ�����μ���� TYPE (PEM, DER) �����ꤹ��\n"
 
 #: src/main.c:558
 msgid "       --private-key=FILE       private key file.\n"
@@ -1229,33 +1164,22 @@ msgstr "       --private-key=FILE       
 
 #: src/main.c:560
 msgid "       --private-key-type=TYPE  private key type, PEM or DER.\n"
-msgstr ""
-"       --private-key-type=TYPE  ��̩���μ���� TYPE (PEM, DER) �����ꤹ��\n"
+msgstr "       --private-key-type=TYPE  ��̩���μ���� TYPE (PEM, DER) �����ꤹ��\n"
 
 #: src/main.c:562
 msgid "       --ca-certificate=FILE    file with the bundle of CA's.\n"
 msgstr "       --ca-certificate=FILE    CA ������Ȥ��� FILE ��Ȥ�\n"
 
 #: src/main.c:564
-msgid ""
-"       --ca-directory=DIR       directory where hash list of CA's is "
-"stored.\n"
-msgstr ""
-"       --ca-directory=DIR       CA �Υϥå���ꥹ�Ȥ��ݻ�����Ƥ���ǥ��쥯��"
-"�����ꤹ��\n"
+msgid "       --ca-directory=DIR       directory where hash list of CA's is stored.\n"
+msgstr "       --ca-directory=DIR       CA �Υϥå���ꥹ�Ȥ��ݻ�����Ƥ���ǥ��쥯�ȥ����ꤹ��\n"
 
 #: src/main.c:566
-msgid ""
-"       --random-file=FILE       file with random data for seeding the SSL "
-"PRNG.\n"
-msgstr ""
-"       --random-file=FILE       SSL PRNG �ν�����ǡ����˻Ȥ��ե��������ꤹ"
-"��\n"
+msgid "       --random-file=FILE       file with random data for seeding the SSL PRNG.\n"
+msgstr "       --random-file=FILE       SSL PRNG �ν�����ǡ����˻Ȥ��ե��������ꤹ��\n"
 
 #: src/main.c:568
-msgid ""
-"       --egd-file=FILE          file naming the EGD socket with random "
-"data.\n"
+msgid "       --egd-file=FILE          file naming the EGD socket with random data.\n"
 msgstr "       --egd-file=FILE          EGD �����åȤȤ��� FILE ��Ȥ�\n"
 
 #: src/main.c:573
@@ -1283,17 +1207,12 @@ msgid "       --no-passive-ftp        disable the \"passive\" transfer mode.\n"
 msgstr "       --no-passive-ftp        \"passive\" ž���⡼�ɤ�Ȥ�ʤ�\n"
 
 #: src/main.c:585
-msgid ""
-"       --retr-symlinks         when recursing, get linked-to files (not "
-"dir).\n"
-msgstr ""
-"       --retr-symlinks         �Ƶ�������ˡ�����ܥ�å���󥯤ǥ�󥯤��줿"
-"��Υե�������������\n"
+msgid "       --retr-symlinks         when recursing, get linked-to files (not dir).\n"
+msgstr "       --retr-symlinks         �Ƶ�������ˡ�����ܥ�å���󥯤ǥ�󥯤��줿��Υե�������������\n"
 
 #: src/main.c:587
 msgid "       --preserve-permissions  preserve remote file permissions.\n"
-msgstr ""
-"       --preserve-permissions  ��⡼�ȥե�����Υѡ��ߥå�������¸����\n"
+msgstr "       --preserve-permissions  ��⡼�ȥե�����Υѡ��ߥå�������¸����\n"
 
 #: src/main.c:591
 msgid "Recursive download:\n"
@@ -1304,49 +1223,31 @@ msgid "  -r,  --recursive          specify recursive download.\n"
 msgstr "  -r,  --recursive          �Ƶ�����������ɤ�Ԥ�\n"
 
 #: src/main.c:595
-msgid ""
-"  -l,  --level=NUMBER       maximum recursion depth (inf or 0 for "
-"infinite).\n"
-msgstr ""
-"  -l,  --level=NUMBER       �Ƶ����γ��ؤκ���ο����� NUMBER �����ꤹ�� (0 "
-"��̵����)\n"
+msgid "  -l,  --level=NUMBER       maximum recursion depth (inf or 0 for infinite).\n"
+msgstr "  -l,  --level=NUMBER       �Ƶ����γ��ؤκ���ο����� NUMBER �����ꤹ�� (0 ��̵����)\n"
 
 #: src/main.c:597
-msgid ""
-"       --delete-after       delete files locally after downloading them.\n"
-msgstr ""
-"       --delete-after       ����������ɽ�λ�塢����������ɤ����ե�������"
-"������\n"
+msgid "       --delete-after       delete files locally after downloading them.\n"
+msgstr "       --delete-after       ����������ɽ�λ�塢����������ɤ����ե������������\n"
 
 #: src/main.c:599
-msgid ""
-"  -k,  --convert-links      make links in downloaded HTML point to local "
-"files.\n"
-msgstr ""
-"  -k,  --convert-links      HTML ��Υ�󥯤���������ؤ��褦���ѹ�����\n"
+msgid "  -k,  --convert-links      make links in downloaded HTML point to local files.\n"
+msgstr "  -k,  --convert-links      HTML ��Υ�󥯤���������ؤ��褦���ѹ�����\n"
 
 #: src/main.c:601
-msgid ""
-"  -K,  --backup-converted   before converting file X, back up as X.orig.\n"
-msgstr ""
-"  -K,  --backup-converted   ����Ѵ����Υե������ .orig �Ȥ�����¸����\n"
+msgid "  -K,  --backup-converted   before converting file X, back up as X.orig.\n"
+msgstr "  -K,  --backup-converted   ����Ѵ����Υե������ .orig �Ȥ�����¸����\n"
 
 #: src/main.c:603
-msgid ""
-"  -m,  --mirror             shortcut option equivalent to -r -N -l inf -nr.\n"
-msgstr "  -m,  --mirror             -r -N -l 0 -nr �ξ�ά��\n"
+msgid "  -m,  --mirror             shortcut for -N -r -l inf --no-remove-listing.\n"
+msgstr "  -m,  --mirror             -N -r -l 0 --no-remove-listing �ξ�ά��\n"
 
 #: src/main.c:605
-msgid ""
-"  -p,  --page-requisites    get all images, etc. needed to display HTML "
-"page.\n"
-msgstr ""
-"  -p,  --page-requisites    HTML ��ɽ������Τ�ɬ�פ����Ƥβ��������������\n"
+msgid "  -p,  --page-requisites    get all images, etc. needed to display HTML page.\n"
+msgstr "  -p,  --page-requisites    HTML ��ɽ������Τ�ɬ�פ����Ƥβ��������������\n"
 
 #: src/main.c:607
-msgid ""
-"       --strict-comments    turn on strict (SGML) handling of HTML "
-"comments.\n"
+msgid "       --strict-comments    turn on strict (SGML) handling of HTML comments.\n"
 msgstr "       --strict-comments    HTML ��Υ����Ȥν�����̩�ˤ���\n"
 
 #: src/main.c:611
@@ -1354,65 +1255,36 @@ msgid "Recursive accept/reject:\n"
 msgstr "�Ƶ�����������ɻ��Υե��륿:\n"
 
 #: src/main.c:613
-msgid ""
-"  -A,  --accept=LIST               comma-separated list of accepted "
-"extensions.\n"
-msgstr ""
-"  -A,  --accept=LIST               ����������ɤ����ĥ�Ҥ򥳥�޶��ڤ�ǻ���"
-"����\n"
+msgid "  -A,  --accept=LIST               comma-separated list of accepted extensions.\n"
+msgstr "  -A,  --accept=LIST               ����������ɤ����ĥ�Ҥ򥳥�޶��ڤ�ǻ��ꤹ��\n"
 
 #: src/main.c:615
-msgid ""
-"  -R,  --reject=LIST               comma-separated list of rejected "
-"extensions.\n"
-msgstr ""
-"  -R,  --reject=LIST               ����������ɤ��ʤ���ĥ�Ҥ򥳥�޶��ڤ�ǻ�"
-"�ꤹ��\n"
+msgid "  -R,  --reject=LIST               comma-separated list of rejected extensions.\n"
+msgstr "  -R,  --reject=LIST               ����������ɤ��ʤ���ĥ�Ҥ򥳥�޶��ڤ�ǻ��ꤹ��\n"
 
 #: src/main.c:617
-msgid ""
-"  -D,  --domains=LIST              comma-separated list of accepted "
-"domains.\n"
-msgstr ""
-"  -D,  --domains=LIST              ����������ɤ���ɥᥤ��򥳥�޶��ڤ�ǻ�"
-"�ꤹ��\n"
+msgid "  -D,  --domains=LIST              comma-separated list of accepted domains.\n"
+msgstr "  -D,  --domains=LIST              ����������ɤ���ɥᥤ��򥳥�޶��ڤ�ǻ��ꤹ��\n"
 
 #: src/main.c:619
-msgid ""
-"       --exclude-domains=LIST      comma-separated list of rejected "
-"domains.\n"
-msgstr ""
-"       --exclude-domains=LIST      ����������ɤ��ʤ��ɥᥤ��򥳥�޶��ڤ��"
-"���ꤹ��\n"
+msgid "       --exclude-domains=LIST      comma-separated list of rejected domains.\n"
+msgstr "       --exclude-domains=LIST      ����������ɤ��ʤ��ɥᥤ��򥳥�޶��ڤ�ǻ��ꤹ��\n"
 
 #: src/main.c:621
-msgid ""
-"       --follow-ftp                follow FTP links from HTML documents.\n"
-msgstr ""
-"       --follow-ftp                HTML ʸ����� FTP ��󥯤�����оݤˤ���\n"
+msgid "       --follow-ftp                follow FTP links from HTML documents.\n"
+msgstr "       --follow-ftp                HTML ʸ����� FTP ��󥯤�����оݤˤ���\n"
 
 #: src/main.c:623
-msgid ""
-"       --follow-tags=LIST          comma-separated list of followed HTML "
-"tags.\n"
-msgstr ""
-"       --follow-tags=LIST          �����оݤˤ��륿��̾�򥳥�޶��ڤ�ǻ��ꤹ"
-"��\n"
+msgid "       --follow-tags=LIST          comma-separated list of followed HTML tags.\n"
+msgstr "       --follow-tags=LIST          �����оݤˤ��륿��̾�򥳥�޶��ڤ�ǻ��ꤹ��\n"
 
 #: src/main.c:625
-msgid ""
-"       --ignore-tags=LIST          comma-separated list of ignored HTML "
-"tags.\n"
-msgstr ""
-"       --ignore-tags=LIST          �����оݤˤ��ʤ�����̾�򥳥�޶��ڤ�ǻ���"
-"����\n"
+msgid "       --ignore-tags=LIST          comma-separated list of ignored HTML tags.\n"
+msgstr "       --ignore-tags=LIST          �����оݤˤ��ʤ�����̾�򥳥�޶��ڤ�ǻ��ꤹ��\n"
 
 #: src/main.c:627
-msgid ""
-"  -H,  --span-hosts                go to foreign hosts when recursive.\n"
-msgstr ""
-"  -H,  --span-hosts                �Ƶ�����̤Υۥ��Ȥ������������оݤˤ�"
-"��\n"
+msgid "  -H,  --span-hosts                go to foreign hosts when recursive.\n"
+msgstr "  -H,  --span-hosts                �Ƶ�����̤Υۥ��Ȥ������������оݤˤ���\n"
 
 #: src/main.c:629
 msgid "  -L,  --relative                  follow relative links only.\n"
@@ -1420,17 +1292,14 @@ msgstr "  -L,  --relative                  
 
 #: src/main.c:631
 msgid "  -I,  --include-directories=LIST  list of allowed directories.\n"
-msgstr ""
-"  -I,  --include-directories=LIST  �����оݤˤ���ǥ��쥯�ȥ����ꤹ��\n"
+msgstr "  -I,  --include-directories=LIST  �����оݤˤ���ǥ��쥯�ȥ����ꤹ��\n"
 
 #: src/main.c:633
 msgid "  -X,  --exclude-directories=LIST  list of excluded directories.\n"
-msgstr ""
-"  -X,  --exclude-directories=LIST  �����оݤˤ��ʤ��ǥ��쥯�ȥ����ꤹ��\n"
+msgstr "  -X,  --exclude-directories=LIST  �����оݤˤ��ʤ��ǥ��쥯�ȥ����ꤹ��\n"
 
 #: src/main.c:635
-msgid ""
-"  -np, --no-parent                 don't ascend to the parent directory.\n"
+msgid "  -np, --no-parent                 don't ascend to the parent directory.\n"
 msgstr "  -np, --no-parent                 �ƥǥ��쥯�ȥ������оݤˤ��ʤ�\n"
 
 #: src/main.c:639
@@ -1487,9 +1356,7 @@ msgstr "%s: `-n%c' 
 #: src/main.c:830
 #, c-format
 msgid "Can't be verbose and quiet at the same time.\n"
-msgstr ""
-"���Ϥ�ܺ٤ˤ��륪�ץ����Ƚ��Ϥ��������륪�ץ�����Ʊ���ˤϻ���Ǥ��ޤ�"
-"��\n"
+msgstr "���Ϥ�ܺ٤ˤ��륪�ץ����Ƚ��Ϥ��������륪�ץ�����Ʊ���ˤϻ���Ǥ��ޤ���\n"
 
 #: src/main.c:836
 #, c-format
@@ -1521,12 +1388,12 @@ msgid ""
 msgstr ""
 "\n"
 "��λ���ޤ��� --%s--\n"
-"�����������: %s �Х���(�ե������ %d)\n"
+"����������ɴ�λ: %s �Х��ȡ�%d �ե�����\n"
 
-#: src/main.c:978
+#: src/main.c:979
 #, c-format
 msgid "Download quota (%s bytes) EXCEEDED!\n"
-msgstr "��������(%s �Х��Ȥ�quota)��Ķ�ᤷ�ޤ�!\n"
+msgstr "��������(%s �Х���)��Ķ�ᤷ�ޤ�!\n"
 
 #: src/mswindows.c:235
 #, c-format
@@ -1538,7 +1405,7 @@ msgstr "
 msgid "Continuing in background, pid %lu.\n"
 msgstr "�Хå����饦��ɤǷ�³���ޤ���pid�� %lu��\n"
 
-#: src/mswindows.c:429 src/utils.c:348
+#: src/mswindows.c:429 src/utils.c:351
 #, c-format
 msgid "Output will be written to `%s'.\n"
 msgstr "���Ϥ� `%s' �˽񤭹��ߤޤ���\n"
@@ -1551,9 +1418,7 @@ msgstr "%s: 
 #: src/netrc.c:385
 #, c-format
 msgid "%s: %s:%d: warning: \"%s\" token appears before any machine name\n"
-msgstr ""
-"%s: %s:%d: �ٹ�: ���ڤ국��(token) \"%s\" �Ϥ��٤ƤΥޥ���̾�����˸�����"
-"��\n"
+msgstr "%s: %s:%d: �ٹ�: ���ڤ국��(token) \"%s\" �Ϥ��٤ƤΥޥ���̾�����˸����ޤ�\n"
 
 #: src/netrc.c:416
 #, c-format
@@ -1600,18 +1465,17 @@ msgstr "%s: %s 
 #: src/openssl.c:458
 #, c-format
 msgid "%s: Certificate verification error for %s: %s\n"
-msgstr "%s: %s �ξ�����θ��ڤ˼��Ԥ��ޤ���: %s\n"
+msgstr "%s: %s �ξ�����θ��ڥ��顼�Ǥ�: %s\n"
 
 #: src/openssl.c:485
 #, c-format
-msgid ""
-"%s: certificate common name `%s' doesn't match requested host name `%s'.\n"
+msgid "%s: certificate common name `%s' doesn't match requested host name `%s'.\n"
 msgstr "%s: ������˵��ܤ���Ƥ���̾�� `%s' �ȥۥ���̾ `%s' �����פ��ޤ���\n"
 
 #: src/openssl.c:498
 #, c-format
 msgid "To connect to %s insecurely, use `--no-check-certificate'.\n"
-msgstr ""
+msgstr "%s �˰����γ�ǧ�򤷤ʤ�����³����ˤϡ�`--no-check-certificate' ��ȤäƤ���������\n"
 
 #. Align the [ skipping ... ] line with the dots.  To do
 #. that, insert the number of spaces equal to the number of
@@ -1630,11 +1494,23 @@ msgstr ""
 msgid "Invalid dot style specification `%s'; leaving unchanged.\n"
 msgstr "`%s' ��̵���ʷв�ɽ�������ʤΤ��ѹ����ޤ���\n"
 
+#. If no clock was found, it means that clock_getres failed for
+#. the realtime clock.
+#: src/ptimer.c:176
+#, c-format
+msgid "Cannot get REALTIME clock frequency: %s\n"
+msgstr "�ꥢ�륿���९���å��μ��ȿ�������Ǥ��ޤ���: %s\n"
+
 #: src/recur.c:377
 #, c-format
 msgid "Removing %s since it should be rejected.\n"
 msgstr "���ݤ��٤��ʤΤǡ�%s �������ޤ�����\n"
 
+#: src/res.c:394
+#, c-format
+msgid "Cannot open %s: %s"
+msgstr "%s �򳫤��ޤ���: %s"
+
 #: src/res.c:544
 msgid "Loading robots.txt; please ignore errors.\n"
 msgstr "robots.txt���ɤ߹���Ǥ��ޤ������顼��̵�뤷�Ƥ���������\n"
@@ -1649,12 +1525,12 @@ msgstr "proxy URL %s 
 msgid "Error in proxy URL %s: Must be HTTP.\n"
 msgstr "proxy URL %s �˴ְ㤤������ޤ�: HTTP�Ǥʤ���Фʤ�ޤ���\n"
 
-#: src/retr.c:738
+#: src/retr.c:740
 #, c-format
 msgid "%d redirections exceeded.\n"
 msgstr "������쥯��������� %d ��ۤ��ޤ�����\n"
 
-#: src/retr.c:863
+#: src/retr.c:865
 msgid ""
 "Giving up.\n"
 "\n"
@@ -1662,7 +1538,7 @@ msgstr ""
 "��ߤ��ޤ�����\n"
 "\n"
 
-#: src/retr.c:863
+#: src/retr.c:865
 msgid ""
 "Retrying.\n"
 "\n"
@@ -1679,8 +1555,8 @@ msgid "Unsupported scheme"
 msgstr "���ݡ��Ȥ���Ƥ��ʤ���������"
 
 #: src/url.c:630
-msgid "Empty host"
-msgstr "�ۥ��Ȥ����Ǥ�"
+msgid "Invalid host name"
+msgstr "�ۥ���̾�������Ǥ�"
 
 #: src/url.c:632
 msgid "Bad port number"
@@ -1703,12 +1579,12 @@ msgid "Invalid IPv6 numeric address"
 msgstr "IPv6 ���ɥ쥹�������Ǥ�"
 
 #. parent, no error
-#: src/utils.c:346
+#: src/utils.c:349
 #, c-format
 msgid "Continuing in background, pid %d.\n"
 msgstr "�Хå����饦��ɤǷ�³���ޤ���pid�� %d��\n"
 
-#: src/utils.c:394
+#: src/utils.c:397
 #, c-format
 msgid "Failed to unlink symlink `%s': %s\n"
 msgstr "����ܥ�å���� `%s' �κ���˼��Ԥ��ޤ���: %s\n"