Import new translations from translation project.

svn path=/branches/BRANCH_6-3/; revision=5236

1 files changed, 83 insertions, 84 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index ed5c2837..c702e7ee 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: fetchmail 6.3.8\n"
+"Project-Id-Version: fetchmail 6.3.9-rc3\n"
 "Report-Msgid-Bugs-To: fetchmail-devel@lists.berlios.de\n"
 "POT-Creation-Date: 2008-06-30 15:43+0200\n"
-"PO-Revision-Date: 2008-02-23 15:37+0800\n"
+"PO-Revision-Date: 2008-11-05 22:30+0800\n"
 "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
 "sourceforge.net>\n"
@@ -608,7 +608,6 @@ msgid "Option --check is not supported with ETRN\n"
 msgstr "ETRN 不支持 --check 选项\n"
 
 #: fetchmail.c:137
-#, fuzzy
 msgid ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
@@ -619,8 +618,8 @@ msgstr ""
 "Copyright (C) 2002, 2003 Eric S. Raymond\n"
 "Copyright (C) 2004 Matthias Andree, Eric S. Raymond, Robert M. Funk, Graham "
 "Wilson\n"
-"Copyright (C) 2005-2006 Sunil Shetye\n"
-"Copyright (C) 2005-2007 Matthias Andree\n"
+"Copyright (C) 2005 - 2006 Sunil Shetye\n"
+"Copyright (C) 2005 - 2008 Matthias Andree\n"
 
 #: fetchmail.c:142
 msgid ""
@@ -752,7 +751,7 @@ msgstr "无法打开 %s 添加记录\n"
 
 #: fetchmail.c:612
 msgid "--check mode enabled, not fetching mail\n"
-msgstr ""
+msgstr "开启 --check 模式, 而非真正取回邮件\n"
 
 #: fetchmail.c:634
 #, fuzzy, c-format
@@ -1152,9 +1151,9 @@ msgid "  SSL trusted certificate directory: %s\n"
 msgstr " SSL 受信证书目录: %s\n"
 
 #: fetchmail.c:1642
-#, fuzzy, c-format
+#, c-format
 msgid "  SSL server CommonName: %s\n"
-msgstr "服务器通用名: %s\n"
+msgstr "服务器的 CommonName: %s\n"
 
 #: fetchmail.c:1644
 #, c-format
@@ -1930,261 +1929,261 @@ msgstr "用法: fetchmail [选项] [服务器...]\n"
 
 #: options.c:592
 msgid "  Options are as follows:\n"
-msgstr "  以下这些是选项:\n"
+msgstr "选项如下:\n"
 
 #: options.c:593
 msgid "  -?, --help        display this option help\n"
-msgstr " -?, --help     显示此选项帮助\n"
+msgstr " -?, --help\t显示此选项帮助\n"
 
 #: options.c:594
 msgid "  -V, --version     display version info\n"
-msgstr " -V, --version  显示版本信息\n"
+msgstr " -V, --version\t显示版本信息\n"
 
 #: options.c:596
 msgid "  -c, --check       check for messages without fetching\n"
-msgstr " -c, --check    只检查邮件而不收取\n"
+msgstr " -c, --check\t只检查邮件而不收取\n"
 
 #: options.c:597
 msgid "  -s, --silent      work silently\n"
-msgstr " -s, --silent   运行时不要显示多余信息\n"
+msgstr " -s, --silent\t运行时不要显示多余信息\n"
 
 #: options.c:598
 msgid "  -v, --verbose     work noisily (diagnostic output)\n"
-msgstr " -v, --verbose  运行时给出信息 (诊断型的输出)\n"
+msgstr " -v, --verbose\t运行时给出信息 (诊断型的输出)\n"
 
 #: options.c:599
 msgid "  -d, --daemon      run as a daemon once per n seconds\n"
-msgstr " -d, --daemon   每 n 秒运行后台服务一次\n"
+msgstr " -d, --daemon\t每 n 秒运行后台服务一次\n"
 
 #: options.c:600
 msgid "  -N, --nodetach    don't detach daemon process\n"
-msgstr " -N, --nodetach 不分离后台进程\n"
+msgstr " -N, --nodetach\t不分离后台进程\n"
 
 #: options.c:601
 msgid "  -q, --quit        kill daemon process\n"
-msgstr " -q, --quit     终止后台进程\n"
+msgstr " -q, --quit\t终止后台进程\n"
 
 #: options.c:602
 msgid "  -L, --logfile     specify logfile name\n"
-msgstr " -L, --logfile  指定日志文件名\n"
+msgstr " -L, --logfile\t指定日志文件名\n"
 
 #: options.c:603
 msgid ""
 "      --syslog      use syslog(3) for most messages when running as a "
 "daemon\n"
-msgstr " --syslog       以后台服务运行时用 syslog(3) 得到更多的信息\n"
+msgstr " --syslog\t以后台服务运行时用 syslog(3) 得到更多的信息\n"
 
 #: options.c:604
 msgid "      --invisible   don't write Received & enable host spoofing\n"
-msgstr " --invisible    不写 Received 邮件头并允许伪装主机\n"
+msgstr " --invisible\t不写 Received 邮件头并允许伪装主机\n"
 
 #: options.c:605
 msgid "  -f, --fetchmailrc specify alternate run control file\n"
-msgstr " -f, --fetchmailrc 指定可选的配置文件\n"
+msgstr " -f, --fetchmailrc\t指定可选的配置文件\n"
 
 #: options.c:606
 msgid "  -i, --idfile      specify alternate UIDs file\n"
-msgstr " -i, --idfile   指定可选的 UIDs 文件\n"
+msgstr " -i, --idfile\t指定可选的 UIDs 文件\n"
 
 #: options.c:607
 msgid "      --pidfile     specify alternate PID (lock) file\n"
-msgstr " --pidfile      指定可选的进程(锁)文件\n"
+msgstr " --pidfile\t指定可选的进程(锁)文件\n"
 
 #: options.c:608
 msgid "      --postmaster  specify recipient of last resort\n"
-msgstr " --postmaster   指定邮件管理员\n"
+msgstr " --postmaster\t指定邮件管理员\n"
 
 #: options.c:609
 msgid "      --nobounce    redirect bounces from user to postmaster.\n"
-msgstr " --nobounce     将回送邮件从用户重定向至邮件管理员\n"
+msgstr " --nobounce\t将回送邮件从用户重定向至邮件管理员\n"
 
 #: options.c:611
 msgid "  -I, --interface   interface required specification\n"
-msgstr " -I, --interface  指定网络地址\n"
+msgstr " -I, --interface\t指定网络地址\n"
 
 #: options.c:612
 msgid "  -M, --monitor     monitor interface for activity\n"
-msgstr " -M, --moniter  监控指定网络地址的活跃度\n"
+msgstr " -M, --moniter\t监控指定网络地址的活跃度\n"
 
 #: options.c:615
 msgid "      --ssl         enable ssl encrypted session\n"
-msgstr " --ssl  启用 ssl 加密会话\n"
+msgstr " --ssl\t启用 ssl 加密会话\n"
 
 #: options.c:616
 msgid "      --sslkey      ssl private key file\n"
-msgstr " --sslkey       ssl 私钥文件\n"
+msgstr " --sslkey\tssl 私钥文件\n"
 
 #: options.c:617
 msgid "      --sslcert     ssl client certificate\n"
-msgstr " --sslcert      ssl 客户端证书\n"
+msgstr " --sslcert\tssl 客户端证书\n"
 
 #: options.c:618
 msgid "      --sslcertck   do strict server certificate check (recommended)\n"
-msgstr " --sslcertck    进行严格的服务器证书检查(推荐)\n"
+msgstr " --sslcertck\t进行严格的服务器证书检查(推荐)\n"
 
 #: options.c:619
 msgid "      --sslcertpath path to ssl certificates\n"
-msgstr " --sslcertpath  ssl 证书目录\n"
+msgstr " --sslcertpath\tssl 证书目录\n"
 
 #: options.c:620
 msgid ""
 "      --sslcommonname  expect this CommonName from server (discouraged)\n"
-msgstr ""
+msgstr " --sslcommonname\t期望服务器返回 CommonName (不鼓励)\n"
 
 #: options.c:621
 msgid ""
 "      --sslfingerprint fingerprint that must match that of the server's "
 "cert.\n"
-msgstr " --sslfingerprint      指定一个指纹，它必须与服务器证书的指纹匹配\n"
+msgstr " --sslfingerprint\t指定一个指纹，它必须与服务器证书的指纹匹配\n"
 
 #: options.c:622
 msgid "      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"
-msgstr " --sslproto     指定强制使用的 ssl 协议(SSL2/SSL3/TLS1)\n"
+msgstr " --sslproto\t指定强制使用的 ssl 协议(SSL2/SSL3/TLS1)\n"
 
 #: options.c:624
 msgid "      --plugin      specify external command to open connection\n"
-msgstr " --plugin       指定外部程序打开连接\n"
+msgstr " --plugin\t指定外部程序打开连接\n"
 
 #: options.c:625
 msgid "      --plugout     specify external command to open smtp connection\n"
-msgstr " --plugout      指定外部程序打开 smtp 连接\n"
+msgstr " --plugout\t指定外部程序打开 smtp 连接\n"
 
 #: options.c:627
 msgid "  -p, --protocol    specify retrieval protocol (see man page)\n"
-msgstr " -p, --protocol 指定收件协议 (看 man 手册页)\n"
+msgstr " -p, --protocol\t指定收件协议 (看 man 手册页)\n"
 
 #: options.c:628
 msgid "  -U, --uidl        force the use of UIDLs (pop3 only)\n"
-msgstr " -U, --uidl     强制使用 UIDLs(仅适用于 pop3)\n"
+msgstr " -U, --uidl\t强制使用 UIDLs(仅适用于 pop3)\n"
 
 #: options.c:629
 msgid "      --port        TCP port to connect to (obsolete, use --service)\n"
-msgstr " --port 要连接的 TCP 端口(过时了，用 --service)\n"
+msgstr " --port\t要连接的 TCP 端口(过时了，用 --service)\n"
 
 #: options.c:630
 msgid ""
 "  -P, --service     TCP service to connect to (can be numeric TCP port)\n"
-msgstr " -P, --service  要连接的 TCP 服务(允许用 TCP 端口的数值来表示)\n"
+msgstr " -P, --service\t要连接的 TCP 服务(允许用 TCP 端口的数值来表示)\n"
 
 #: options.c:631
 msgid "      --auth        authentication type (password/kerberos/ssh/otp)\n"
-msgstr " --auth   指定验证方式(password/kerberos/ssh/otp)\n"
+msgstr " --auth\t指定验证方式(password/kerberos/ssh/otp)\n"
 
 #: options.c:632
 msgid "  -t, --timeout     server nonresponse timeout\n"
-msgstr " -t, --timeout  指定服务器超时无响应的时间\n"
+msgstr " -t, --timeout\t指定服务器超时无响应的时间\n"
 
 #: options.c:633
 msgid "  -E, --envelope    envelope address header\n"
-msgstr " -E, --envelope   指定邮件地址头\n"
+msgstr " -E, --envelope\t指定邮件地址头\n"
 
 #: options.c:634
 msgid "  -Q, --qvirtual    prefix to remove from local user id\n"
-msgstr " -Q, --qvirtual   从当前用户移除前缀\n"
+msgstr " -Q, --qvirtual\t从当前用户移除前缀\n"
 
 #: options.c:635
 msgid "      --principal   mail service principal\n"
-msgstr "--principal     邮件服务验证方\n"
+msgstr " --principal\t邮件服务验证方\n"
 
 #: options.c:636
 msgid "      --tracepolls  add poll-tracing information to Received header\n"
-msgstr " --tracepolls   Received 邮件头中添加收件跟踪信息\n"
+msgstr " --tracepolls\tReceived 邮件头中添加收件跟踪信息\n"
 
 #: options.c:638
 msgid "  -u, --username    specify users's login on server\n"
-msgstr " -u, --username 指定登录服务器的用户名\n"
+msgstr " -u, --username\t指定登录服务器的用户名\n"
 
 #: options.c:639
 msgid "  -a, --[fetch]all  retrieve old and new messages\n"
-msgstr " -a, --[fetch]all       收取所有新旧邮件\n"
+msgstr " -a, --[fetch]all\t收取所有新旧邮件\n"
 
 #: options.c:640
 msgid "  -K, --nokeep      delete new messages after retrieval\n"
-msgstr " -K, --nokeep   收件后删除服务器上新邮件\n"
+msgstr " -K, --nokeep\t收件后删除服务器上新邮件\n"
 
 #: options.c:641
 msgid "  -k, --keep        save new messages after retrieval\n"
-msgstr " -k, --keep     收件后保留服务器上新邮件\n"
+msgstr " -k, --keep\t收件后保留服务器上新邮件\n"
 
 #: options.c:642
 msgid "  -F, --flush       delete old messages from server\n"
-msgstr " -F, --flush    从服务器上删除旧邮件\n"
+msgstr " -F, --flush\t从服务器上删除旧邮件\n"
 
 #: options.c:643
 msgid "      --limitflush  delete oversized messages\n"
-msgstr " --limitflush   删除超大的邮件\n"
+msgstr " --limitflush\t删除过大的邮件\n"
 
 #: options.c:644
 msgid "  -n, --norewrite   don't rewrite header addresses\n"
-msgstr " -n, --norewrite        不要重写地址头\n"
+msgstr " -n, --norewrite\t不要重写地址头\n"
 
 #: options.c:645
 msgid "  -l, --limit       don't fetch messages over given size\n"
-msgstr " -l, --limit    不收超过指定大小的邮件\n"
+msgstr " -l, --limit\t不收超过指定大小的邮件\n"
 
 #: options.c:646
 msgid "  -w, --warnings    interval between warning mail notification\n"
-msgstr " -w, --warnings    邮件通知警告的间隔\n"
+msgstr " -w, --warnings\t邮件通知警告的间隔\n"
 
 #: options.c:648
 msgid "  -S, --smtphost    set SMTP forwarding host\n"
-msgstr " -S, --smtphost    设置 SMTP 转发主机\n"
+msgstr " -S, --smtphost\t设置 SMTP 转发主机\n"
 
 #: options.c:649
 msgid "      --fetchdomains fetch mail for specified domains\n"
-msgstr " --fetchdomains   收取指定域的邮件\n"
+msgstr " --fetchdomains\t收取指定域的邮件\n"
 
 #: options.c:650
 msgid "  -D, --smtpaddress set SMTP delivery domain to use\n"
-msgstr " -D, --smtpaddress      设置 SMTP 投递域\n"
+msgstr " -D, --smtpaddress\t设置 SMTP 投递域\n"
 
 #: options.c:651
 msgid "      --smtpname    set SMTP full name username@domain\n"
-msgstr " --smtpname     设置 SMTP 全名，用户名@域\n"
+msgstr " --smtpname\t设置 SMTP 全名，用户名@域\n"
 
 #: options.c:652
 msgid "  -Z, --antispam,   set antispam response values\n"
-msgstr " -Z, --antispam,        设置 antispam 响应值\n"
+msgstr " -Z, --antispam,\t设置 antispam 响应值\n"
 
 #: options.c:653
 msgid "  -b, --batchlimit  set batch limit for SMTP connections\n"
-msgstr " -b, --bathlimit        为 SMTP 连接设置批量处理限制\n"
+msgstr " -b, --bathlimit\t为 SMTP 连接设置批量处理限制\n"
 
 #: options.c:654
 msgid "  -B, --fetchlimit  set fetch limit for server connections\n"
-msgstr " -B, --fetchlimit       为服务器连接设置收取限制\n"
+msgstr " -B, --fetchlimit\t为服务器连接设置收取限制\n"
 
 #: options.c:655
 msgid "      --fetchsizelimit set fetch message size limit\n"
-msgstr " --fetchsizelimit       设置收件大小限制\n"
+msgstr " --fetchsizelimit\t设置收件大小限制\n"
 
 #: options.c:656
 msgid "      --fastuidl    do a binary search for UIDLs\n"
-msgstr " --fastuidl     对 UIDLs 进行折半查找\n"
+msgstr " --fastuidl\t对 UIDLs 进行折半查找\n"
 
 #: options.c:657
 msgid "  -e, --expunge     set max deletions between expunges\n"
-msgstr " -e, --expunge  设置删除操作发生在多少封邮件之后\n"
+msgstr " -e, --expunge\t设置删除操作发生在多少封邮件之后\n"
 
 #: options.c:658
 msgid "  -m, --mda         set MDA to use for forwarding\n"
-msgstr " -m, --mda      设置用于转发的 MDA\n"
+msgstr " -m, --mda\t设置用于转发的 MDA\n"
 
 #: options.c:659
 msgid "      --bsmtp       set output BSMTP file\n"
-msgstr " --bsmtp          设置 BSMTP 文件输出\n"
+msgstr " --bsmtp\t设置 BSMTP 文件输出\n"
 
 #: options.c:660
 msgid "      --lmtp        use LMTP (RFC2033) for delivery\n"
-msgstr " --lmtp            用 LMTP 协议(RFC2033) 投递邮件\n"
+msgstr " --lmtp\t用 LMTP 协议(RFC2033) 投递邮件\n"
 
 #: options.c:661
 msgid "  -r, --folder      specify remote folder name\n"
-msgstr " -r, --folder   指定远程邮箱名\n"
+msgstr " -r, --folder\t指定远程邮箱名\n"
 
 #: options.c:662
 msgid "      --showdots    show progress dots even in logfiles\n"
-msgstr " --showdots     即使在日志文件中也要显示进度条(以点的形式)\n"
+msgstr " --showdots\t即使在日志文件中也要显示进度条(以点的形式)\n"
 
 #: pop3.c:355
 msgid ""
@@ -2297,9 +2296,9 @@ msgid "File %s must be a regular file.\n"
 msgstr "文件 %s 必须是个普通文件。\n"
 
 #: rcfile_y.y:431
-#, fuzzy, c-format
+#, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
-msgstr "文件 %s 不能拥有多于 -rwx--x--- (0710) 的权限。\n"
+msgstr "文件 %s 不允许拥有高于 -rwx------ (0700) 的权限。\n"
 
 #: rcfile_y.y:443
 #, c-format
@@ -2549,14 +2548,14 @@ msgid "BSMTP preamble write failed.\n"
 msgstr "写入 BSMTP 报头失败。\n"
 
 #: sink.c:972
-#, fuzzy, c-format
+#, c-format
 msgid "%cMTP listener doesn't like recipient address `%s'\n"
-msgstr "%cMTP 端不喜欢收件人地址 “%s”\n"
+msgstr "%cMTP 端不认可收件人地址 “%s”\n"
 
 #: sink.c:979
-#, fuzzy, c-format
+#, c-format
 msgid "%cMTP listener doesn't really like recipient address `%s'\n"
-msgstr "%cMTP 端不是真的喜欢收件人地址 “%s”\n"
+msgstr "%cMTP 端不是真的认可收件人地址 “%s”\n"
 
 #: sink.c:1025
 msgid "no address matches; no postmaster set.\n"
@@ -2745,29 +2744,29 @@ msgstr "未知的组织\n"
 #: socket.c:617
 #, c-format
 msgid "Issuer CommonName: %s\n"
-msgstr "发行者通用名: %s\n"
+msgstr "发行者 CommonName: %s\n"
 
 #: socket.c:619
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
-msgstr "警告: 发行者通用名太长 (可能截短)。\n"
+msgstr "警告: 发行者 CommonName 太长 (可能截短)。\n"
 
 #: socket.c:621
 msgid "Unknown Issuer CommonName\n"
-msgstr "未知的发行者通用名\n"
+msgstr "未知的发行者 CommonName\n"
 
 #: socket.c:625
 #, c-format
 msgid "Server CommonName: %s\n"
-msgstr "服务器通用名: %s\n"
+msgstr "服务器 CommonName: %s\n"
 
 #: socket.c:629
 msgid "Bad certificate: Subject CommonName too long!\n"
-msgstr "证书错误: 主通用名太长!\n"
+msgstr "证书错误: 主 CommonName 太长!\n"
 
 #: socket.c:675
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
-msgstr "服务器通用名不匹配: %s != %s\n"
+msgstr "服务器 CommonName 不匹配: %s != %s\n"
 
 #: socket.c:681
 msgid "Server name not set, could not verify certificate!\n"
@@ -2775,7 +2774,7 @@ msgstr "未设置服务器名称，无法验证证书！\n"
 
 #: socket.c:686
 msgid "Unknown Server CommonName\n"
-msgstr "未知的服务器通用名\n"
+msgstr "未知的服务器 CommonName\n"
 
 #: socket.c:688
 msgid "Server name not specified in certificate!\n"