X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=po%2Fzh_CN.po;h=86031a7a6bf44d0c3d6c0dc3415b84eda28b9460;hp=92b7c8a2a78c6821070be901a3da04eb3c61f441;hb=a3ffef91203c9f82647178637643547939739349;hpb=4f53c20e27f4e6db75aef4c7ea2812330d48017c

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 92b7c8a2..86031a7a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: wget 1.12-pre2\n"
+"Project-Id-Version: wget 1.12-pre6\n"
 "Report-Msgid-Bugs-To: bug-wget@gnu.org\n"
-"POT-Creation-Date: 2009-09-08 01:04-0700\n"
-"PO-Revision-Date: 2009-07-07 23:50中国标准时间\n"
+"POT-Creation-Date: 2009-09-21 10:00-0700\n"
+"PO-Revision-Date: 2009-09-18 14:54中国标准时间\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
 "sourceforge.net>\n"
@@ -430,7 +430,7 @@ msgstr ""
 "%s (%s) - %s 已保存 [%s]\n"
 "\n"
 
-#: src/ftp.c:1568 src/main.c:1299 src/recur.c:438 src/retr.c:990
+#: src/ftp.c:1568 src/main.c:1301 src/recur.c:438 src/retr.c:990
 #, c-format
 msgid "Removing %s.\n"
 msgstr "正在删除 %s。\n"
@@ -529,17 +529,17 @@ msgstr "拒绝 %s。\n"
 msgid "Error matching %s against %s: %s\n"
 msgstr "%s 和 %s 匹配错误: %s\n"
 
-#: src/ftp.c:2077
+#: src/ftp.c:2091
 #, c-format
 msgid "No matches on pattern %s.\n"
 msgstr "没有与模式 %s 相符合的。\n"
 
-#: src/ftp.c:2148
+#: src/ftp.c:2162
 #, c-format
 msgid "Wrote HTML-ized index to %s [%s].\n"
 msgstr "已经将 HTML 格式的索引写入到 %s [%s]。\n"
 
-#: src/ftp.c:2153
+#: src/ftp.c:2167
 #, c-format
 msgid "Wrote HTML-ized index to %s.\n"
 msgstr "已经将 HTML 格式的索引写入到 %s。\n"
@@ -943,13 +943,13 @@ msgid "%s: %s: Invalid progress type %s.\n"
 msgstr "%s：%s：无效的进度指示方式 %s。\n"
 
 #: src/init.c:1306
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s: %s: Invalid restriction %s,\n"
 "    use [unix|windows],[lowercase|uppercase],[nocontrol],[ascii].\n"
 msgstr ""
-"%s：%s：无效的限定项 %s，请使用 [unix|windows]、[lowercase|uppercase] 或 "
-"[nocontrol]。\n"
+"%s：%s：无效的限定项 %s，\n"
+"    请使用 [unix|windows]、[lowercase|uppercase]、[nocontrol] 或 [ascii]。\n"
 
 #: src/iri.c:104
 #, c-format
@@ -1084,13 +1084,12 @@ msgid "  -F,  --force-html          treat input file as HTML.\n"
 msgstr "  -F,  --force-html          把输入文件当成 HTML 文件。\n"
 
 #: src/main.c:436
-#, fuzzy
 msgid ""
 "  -B,  --base=URL            resolves HTML input-file links (-i -F)\n"
 "                             relative to URL.\n"
 msgstr ""
-"  -N,  --timestamping            只获取比本地文件新的文件。\n"
-"                                 \n"
+"  -B,  --base=URL            解析与 URL 相关的\n"
+"                             HTML 输入文件（由 -i -F 选项指定）。\n"
 
 #: src/main.c:441
 msgid "Download:\n"
@@ -1230,8 +1229,7 @@ msgid ""
 "                                 one of IPv6, IPv4, or none.\n"
 msgstr ""
 "       --prefer-family=FAMILY    首先连接至指定协议的地址\n"
-"                                 协议为 IPv6，IPv4 或是不指定其中的任何一"
-"个。\n"
+"                                 FAMILY 为 IPv6，IPv4 或是 none。\n"
 
 #: src/main.c:500
 msgid "       --user=USER               set both ftp and http user to USER.\n"
@@ -1249,19 +1247,18 @@ msgid "       --ask-password            prompt for passwords.\n"
 msgstr "       --ask-password           提示输入密码。\n"
 
 #: src/main.c:506
-#, fuzzy
 msgid "       --no-iri                  turn off IRI support.\n"
-msgstr "       --no-proxy                关闭代理。\n"
+msgstr "       --no-iri                关闭 IRI 支持。\n"
 
 #: src/main.c:508
 msgid ""
 "       --local-encoding=ENC      use ENC as the local encoding for IRIs.\n"
-msgstr ""
+msgstr "       --local-encoding=ENC      IRI 使用 ENC 作为本地编码。\n"
 
 #: src/main.c:510
 msgid ""
 "       --remote-encoding=ENC     use ENC as the default remote encoding.\n"
-msgstr ""
+msgstr "       --remote-encoding=ENC     使用 ENC 作为默认远程编码。\n"
 
 #: src/main.c:514
 msgid "Directories:\n"
@@ -1318,11 +1315,10 @@ msgstr ""
 "                               （默认页通常是“index.html”）。\n"
 
 #: src/main.c:541
-#, fuzzy
 msgid ""
 "  -E,  --adjust-extension      save HTML/CSS documents with proper "
 "extensions.\n"
-msgstr "  -E,  --html-extension        以‘.html’扩展名保存 HTML 文档。\n"
+msgstr "  -E,  --adjust-extension      以合适的扩展名保存 HTML/CSS 文档。\n"
 
 #: src/main.c:543
 msgid "       --ignore-length         ignore `Content-Length' header field.\n"
@@ -1702,11 +1698,11 @@ msgstr "    %s (系统)\n"
 
 #. TRANSLATORS: When available, an actual copyright character
 #. (cirle-c) should be used in preference to "(C)".
-#: src/main.c:843
+#: src/main.c:845
 msgid "Copyright (C) 2009 Free Software Foundation, Inc.\n"
 msgstr "版权所有 (C) 2009 Free Software Foundation, Inc.\n"
 
-#: src/main.c:845
+#: src/main.c:847
 msgid ""
 "License GPLv3+: GNU GPL version 3 or later\n"
 "<http://www.gnu.org/licenses/gpl.html>.\n"
@@ -1720,7 +1716,7 @@ msgstr ""
 
 #. TRANSLATORS: When available, please use the proper diacritics for
 #. names such as this one. See en_US.po for reference.
-#: src/main.c:852
+#: src/main.c:854
 msgid ""
 "\n"
 "Originally written by Hrvoje Niksic <hniksic@xemacs.org>.\n"
@@ -1728,40 +1724,40 @@ msgstr ""
 "\n"
 "最初由 Hrvoje Niksic <hniksic@xemacs.org> 编写。\n"
 
-#: src/main.c:854
+#: src/main.c:856
 msgid "Currently maintained by Micah Cowan <micah@cowan.name>.\n"
 msgstr "目前由 Micah Cowan <micah@cowan.name> 维护。\n"
 
-#: src/main.c:856
+#: src/main.c:858
 msgid "Please send bug reports and questions to <bug-wget@gnu.org>.\n"
 msgstr "请将错误报告或建议寄给 <bug-wget@gnu.org>。\n"
 
-#: src/main.c:906 src/main.c:975 src/main.c:1097
+#: src/main.c:908 src/main.c:977 src/main.c:1099
 #, c-format
 msgid "Try `%s --help' for more options.\n"
 msgstr "请尝试使用“%s --help”查看更多的选项。\n"
 
-#: src/main.c:972
+#: src/main.c:974
 #, c-format
 msgid "%s: illegal option -- `-n%c'\n"
 msgstr "%s：非法的选项 -- “-n%c”\n"
 
-#: src/main.c:1030
+#: src/main.c:1032
 #, c-format
 msgid "Can't be verbose and quiet at the same time.\n"
 msgstr "无法同时使用详细输出模式和安静模式。\n"
 
-#: src/main.c:1036
+#: src/main.c:1038
 #, c-format
 msgid "Can't timestamp and not clobber old files at the same time.\n"
 msgstr "无法修改时间戳标记而不更改本地文件。\n"
 
-#: src/main.c:1044
+#: src/main.c:1046
 #, c-format
 msgid "Cannot specify both --inet4-only and --inet6-only.\n"
 msgstr "无法同时指定 --inet4-only 和 --inet6-only。\n"
 
-#: src/main.c:1054
+#: src/main.c:1056
 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"
@@ -1771,7 +1767,7 @@ msgstr ""
 "结合使用。参阅手册来获取详细信息。\n"
 "\n"
 
-#: src/main.c:1063
+#: src/main.c:1065
 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"
@@ -1781,7 +1777,7 @@ msgstr ""
 "会被放入您指定的那个单一文件。\n"
 "\n"
 
-#: src/main.c:1069
+#: src/main.c:1071
 msgid ""
 "WARNING: timestamping does nothing in combination with -O. See the manual\n"
 "for details.\n"
@@ -1791,27 +1787,27 @@ msgstr ""
 "参阅手册来获取详细信息。\n"
 "\n"
 
-#: src/main.c:1077
+#: src/main.c:1079
 #, c-format
 msgid "File `%s' already there; not retrieving.\n"
 msgstr "文件“%s”已经存在；不取回。\n"
 
-#: src/main.c:1084
+#: src/main.c:1086
 #, c-format
 msgid "Cannot specify both --ask-password and --password.\n"
 msgstr "无法同时指定 --ask-password 和 --password。\n"
 
-#: src/main.c:1092
+#: src/main.c:1094
 #, c-format
 msgid "%s: missing URL\n"
 msgstr "%s：未指定 URL\n"
 
-#: src/main.c:1117
+#: src/main.c:1119
 #, c-format
 msgid "This version does not have support for IRIs\n"
 msgstr "此版本不支持 IRIs\n"
 
-#: src/main.c:1181
+#: src/main.c:1183
 msgid ""
 "WARNING: Can't reopen standard output in binary mode;\n"
 "         downloaded file may contain inappropriate line endings.\n"
@@ -1819,12 +1815,12 @@ msgstr ""
 "警告: 无法在二进制模式下重新打开标准输出设备；\n"
 "         下载到的文件可能带有错误的行尾结束符。\n"
 
-#: src/main.c:1316
+#: src/main.c:1318
 #, c-format
 msgid "No URLs found in %s.\n"
 msgstr "在 %s 中找不到 URL。\n"
 
-#: src/main.c:1334
+#: src/main.c:1336
 #, c-format
 msgid ""
 "FINISHED --%s--\n"
@@ -1833,7 +1829,7 @@ msgstr ""
 "下载完毕 --%1$s--\n"
 "下载了：%2$d 个文件，%4$s (%5$s) 中的 %3$s\n"
 
-#: src/main.c:1343
+#: src/main.c:1345
 #, c-format
 msgid "Download quota of %s EXCEEDED!\n"
 msgstr "超过下载限额( %s 字节)！\n"
@@ -1919,6 +1915,9 @@ msgid ""
 "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 ""
+"%s: 证书通用名无效（包含空字符）。\n"
+"这可能是由于主机声明错误\n"
+"（即，不是真正的 %s）。\n"
 
 #: src/openssl.c:627
 #, c-format