From 1a52f5f2d153bbae0f630930e17c0b7492be9cec Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Fri, 24 Dec 2010 08:50:16 +0000
Subject: made 3.1.0beta6 release.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2772 ee746299-78ed-0310-b773-934348b2243d
---
 po/zh_CN.po | 226 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 113 insertions(+), 113 deletions(-)

(limited to 'po/zh_CN.po')

diff --git a/po/zh_CN.po b/po/zh_CN.po
index dc98809c..ca1f86bf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-22 11:06+0900\n"
+"POT-Creation-Date: 2010-12-24 14:31+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -20,6 +20,16 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "正在读取所有帐号的配置...\n"
 
+#: libsylph/filter.c:1545
+#, fuzzy
+msgid "Junk mail filter (manual)"
+msgstr "文件夹："
+
+#: libsylph/filter.c:1548
+#, fuzzy
+msgid "Junk mail filter"
+msgstr "文件夹："
+
 #: libsylph/imap.c:537
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
@@ -223,34 +233,34 @@ msgstr "iconv 无法转换 UTF-7 到 %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 无法转换 %s 到 UTF-7\n"
 
-#: libsylph/mbox.c:49 libsylph/mbox.c:216
+#: libsylph/mbox.c:49 libsylph/mbox.c:226
 msgid "can't write to temporary file\n"
 msgstr "无法写入临时文件\n"
 
-#: libsylph/mbox.c:81
+#: libsylph/mbox.c:84
 #, c-format
 msgid "Getting messages from %s into %s...\n"
 msgstr "正在从 %s 获取邮件到 %s...\n"
 
-#: libsylph/mbox.c:93
+#: libsylph/mbox.c:96
 msgid "can't read mbox file.\n"
 msgstr "无法读取 mbox 文件。\n"
 
-#: libsylph/mbox.c:100
+#: libsylph/mbox.c:103
 #, c-format
 msgid "invalid mbox format: %s\n"
 msgstr "无效的 mbox 格式：%s\n"
 
-#: libsylph/mbox.c:107
+#: libsylph/mbox.c:110
 #, c-format
 msgid "malformed mbox: %s\n"
 msgstr "格式不正确的 mbox：%s\n"
 
-#: libsylph/mbox.c:130
+#: libsylph/mbox.c:139
 msgid "can't open temporary file\n"
 msgstr "无法打开临时文件\n"
 
-#: libsylph/mbox.c:181
+#: libsylph/mbox.c:191
 #, c-format
 msgid ""
 "unescaped From found:\n"
@@ -259,43 +269,43 @@ msgstr ""
 "找到没有转码的发件人：\n"
 "%s"
 
-#: libsylph/mbox.c:324
+#: libsylph/mbox.c:338
 #, c-format
 msgid "can't create lock file %s\n"
 msgstr "无法创建锁文件 %s\n"
 
-#: libsylph/mbox.c:325
+#: libsylph/mbox.c:339
 msgid "use 'flock' instead of 'file' if possible.\n"
 msgstr "如果可能，用“flock”代替“file”。\n"
 
-#: libsylph/mbox.c:337
+#: libsylph/mbox.c:351
 #, c-format
 msgid "can't create %s\n"
 msgstr "无法创建 %s\n"
 
-#: libsylph/mbox.c:343
+#: libsylph/mbox.c:357
 msgid "mailbox is owned by another process, waiting...\n"
 msgstr "另一个进程拥有该邮箱，等待...\n"
 
-#: libsylph/mbox.c:372
+#: libsylph/mbox.c:386
 #, c-format
 msgid "can't lock %s\n"
 msgstr "无法锁住 %s\n"
 
-#: libsylph/mbox.c:379 libsylph/mbox.c:429
+#: libsylph/mbox.c:393 libsylph/mbox.c:443
 msgid "invalid lock type\n"
 msgstr "无效的锁类型\n"
 
-#: libsylph/mbox.c:415
+#: libsylph/mbox.c:429
 #, c-format
 msgid "can't unlock %s\n"
 msgstr "无法解锁 %s\n"
 
-#: libsylph/mbox.c:450
+#: libsylph/mbox.c:464
 msgid "can't truncate mailbox to zero.\n"
 msgstr "无法将邮箱删除为空。\n"
 
-#: libsylph/mbox.c:475
+#: libsylph/mbox.c:489
 #, c-format
 msgid "Exporting messages from %s into %s...\n"
 msgstr "正在从 %s 导出信件到 %s...\n"
@@ -314,7 +324,7 @@ msgstr "源文件夹与目的文件夹是同一个。\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:187
+#: libsylph/mh.c:1195 libsylph/mh.c:1208 src/main.c:191
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -502,16 +512,6 @@ msgstr "发现 %s\n"
 msgid "Configuration is saved.\n"
 msgstr "配置已经保存。\n"
 
-#: libsylph/prefs_common.c:611
-#, fuzzy
-msgid "Junk mail filter (manual)"
-msgstr "文件夹："
-
-#: libsylph/prefs_common.c:614
-#, fuzzy
-msgid "Junk mail filter"
-msgstr "文件夹："
-
 #: libsylph/procmime.c:1293
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content()：代码转换失败。\n"
@@ -1256,15 +1256,15 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:826
+#: src/alertpanel.c:142 src/compose.c:6746 src/main.c:841
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:155 src/main.c:963
+#: src/alertpanel.c:155 src/main.c:978
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:752
+#: src/alertpanel.c:168 src/inc.c:768
 msgid "Error"
 msgstr "错误"
 
@@ -1307,7 +1307,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5130
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5145
 msgid "None"
 msgstr "没有"
 
@@ -1851,7 +1851,7 @@ msgstr "日期"
 #. S_COL_DATE
 #: src/compose.c:5319 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:425 src/select-keys.c:309
-#: src/summaryview.c:5279
+#: src/summaryview.c:5294
 msgid "Size"
 msgstr "大小"
 
@@ -2915,156 +2915,156 @@ msgstr "属性"
 msgid "Sylpheed: %d new messages"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:485
+#: src/inc.c:492
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "正在验证"
 
-#: src/inc.c:512
+#: src/inc.c:519
 msgid "Retrieving new messages"
 msgstr "正在获取新邮件"
 
-#: src/inc.c:514
+#: src/inc.c:521
 #, fuzzy
 msgid "Cancel _all"
 msgstr "取消"
 
-#: src/inc.c:560
+#: src/inc.c:567
 msgid "Standby"
 msgstr "请等待"
 
-#: src/inc.c:708 src/inc.c:758
+#: src/inc.c:724 src/inc.c:774
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:719
+#: src/inc.c:735
 msgid "Retrieving"
 msgstr "正在获取"
 
-#: src/inc.c:728 src/inc.c:1057
+#: src/inc.c:744 src/inc.c:1073
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "完成 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:732
+#: src/inc.c:748
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "没有新邮件"
 
-#: src/inc.c:733
+#: src/inc.c:749
 msgid "Done"
 msgstr "完成"
 
-#: src/inc.c:738
+#: src/inc.c:754
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/inc.c:741
+#: src/inc.c:757
 msgid "Auth failed"
 msgstr "验证失败"
 
-#: src/inc.c:745
+#: src/inc.c:761
 msgid "Locked"
 msgstr "锁住"
 
-#: src/inc.c:755
+#: src/inc.c:771
 msgid "Timeout"
 msgstr "超时"
 
-#: src/inc.c:802
+#: src/inc.c:818
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:805
+#: src/inc.c:821
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:814
+#: src/inc.c:830
 msgid "Some errors occurred while getting mail."
 msgstr "获取邮件时发生错误。"
 
-#: src/inc.c:850
+#: src/inc.c:866
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "正在获取帐号 %s 的新邮件...\n"
 
-#: src/inc.c:854
+#: src/inc.c:870
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "正在验证"
 
-#: src/inc.c:857
+#: src/inc.c:873
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s：正在获取新邮件"
 
-#: src/inc.c:862
+#: src/inc.c:878
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "正在连接POP3服务器：%s..."
 
-#: src/inc.c:880
+#: src/inc.c:896
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:962 src/rpop3.c:835 src/send_message.c:833
+#: src/inc.c:978 src/rpop3.c:835 src/send_message.c:833
 #, c-format
 msgid "Authenticating..."
 msgstr "正在验证..."
 
-#: src/inc.c:963
+#: src/inc.c:979
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/inc.c:968
+#: src/inc.c:984
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/inc.c:972
+#: src/inc.c:988
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在获取新邮件数量(LAST)..."
 
-#: src/inc.c:976
+#: src/inc.c:992
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在获取新邮件数量(UIDL)..."
 
-#: src/inc.c:980
+#: src/inc.c:996
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在获取新邮件的大小(LIST)..."
 
-#: src/inc.c:990
+#: src/inc.c:1006
 #, c-format
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:997 src/send_message.c:851
+#: src/inc.c:1013 src/send_message.c:851
 msgid "Quitting"
 msgstr "正在退出"
 
-#: src/inc.c:1032
+#: src/inc.c:1048
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1293 src/inc.c:1316 src/summaryview.c:4657
+#: src/inc.c:1310 src/inc.c:1334 src/summaryview.c:4656
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1375
+#: src/inc.c:1393
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1381
+#: src/inc.c:1399
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1386
+#: src/inc.c:1404
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3073,29 +3073,29 @@ msgstr ""
 "处理邮件时发生错误：\n"
 "%s"
 
-#: src/inc.c:1392
+#: src/inc.c:1410
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1397
+#: src/inc.c:1415
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1402
+#: src/inc.c:1420
 msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1408 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
+#: src/inc.c:1426 src/rpop3.c:551 src/rpop3.c:552 src/send_message.c:777
 #: src/send_message.c:994
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
-#: src/inc.c:1414
+#: src/inc.c:1432
 msgid "Mailbox is locked."
 msgstr "信箱被锁住。"
 
-#: src/inc.c:1418
+#: src/inc.c:1436
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3104,11 +3104,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1424 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
+#: src/inc.c:1442 src/rpop3.c:526 src/rpop3.c:531 src/send_message.c:974
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1429 src/rpop3.c:528 src/send_message.c:977
+#: src/inc.c:1447 src/rpop3.c:528 src/send_message.c:977
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3117,15 +3117,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1434 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
+#: src/inc.c:1452 src/rpop3.c:556 src/rpop3.c:557 src/send_message.c:998
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1475
+#: src/inc.c:1493
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1584
+#: src/inc.c:1602
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -3143,16 +3143,16 @@ msgstr "输入密码"
 msgid "Protocol log"
 msgstr "协议记录"
 
-#: src/main.c:583
+#: src/main.c:598
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/main.c:586
+#: src/main.c:601
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    打开撰写窗口"
 
-#: src/main.c:587
+#: src/main.c:602
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3161,23 +3161,23 @@ msgstr ""
 "  --attach 文件1 [文件2]...\n"
 "                         打开撰写窗口并添加指定的附件"
 
-#: src/main.c:590
+#: src/main.c:605
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 
-#: src/main.c:591
+#: src/main.c:606
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 
-#: src/main.c:592
+#: src/main.c:607
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送队列中的邮件"
 
-#: src/main.c:593
+#: src/main.c:608
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [文件夹]...   显示邮件总数"
 
-#: src/main.c:594
+#: src/main.c:609
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3185,49 +3185,49 @@ msgstr ""
 "  --status-full [文件夹]...\n"
 "                         显示每个文件夹的状态"
 
-#: src/main.c:596
+#: src/main.c:611
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:597
+#: src/main.c:612
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:599
+#: src/main.c:614
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:601
+#: src/main.c:616
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:602
+#: src/main.c:617
 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:603
+#: src/main.c:618
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 显示该帮助并退出"
 
-#: src/main.c:604
+#: src/main.c:619
 msgid "  --version              output version information and exit"
 msgstr "  --version              输出版本信息并退出"
 
-#: src/main.c:608
+#: src/main.c:623
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "或按下“y”键。\n"
 "\n"
 
-#: src/main.c:743
+#: src/main.c:758
 #, fuzzy
 msgid "Filename encoding"
 msgstr "发送时使用的字符编码"
 
-#: src/main.c:744
+#: src/main.c:759
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3241,19 +3241,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:827
+#: src/main.c:842
 msgid "Composing message exists. Really quit?"
 msgstr "正在撰写邮件。真的要退出吗？"
 
-#: src/main.c:838
+#: src/main.c:853
 msgid "Queued messages"
 msgstr "队列中的邮件"
 
-#: src/main.c:839
+#: src/main.c:854
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "一些未发送的信件被放入队列。现在退出吗？"
 
-#: src/main.c:964
+#: src/main.c:979
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3261,20 +3261,20 @@ msgstr ""
 "没有正确安装 GnuPG，或者版本太老。\n"
 "已禁用 OpenPGP 支持。"
 
-#: src/main.c:1197
+#: src/main.c:1212
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1393
+#: src/main.c:1408
 msgid "another Sylpheed is already running.\n"
 msgstr "另外一个 Sylpheed 正在运行。\n"
 
-#: src/main.c:1680
+#: src/main.c:1695
 msgid "Migration of configuration"
 msgstr "正在迁移配置"
 
-#: src/main.c:1681
+#: src/main.c:1696
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3953,7 +3953,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
 #: src/mainwindow.c:1219 src/summaryview.c:2568 src/summaryview.c:2655
-#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4739
+#: src/summaryview.c:4222 src/summaryview.c:4351 src/summaryview.c:4738
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -6398,19 +6398,19 @@ msgstr "附件"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:422
-#: src/summaryview.c:5272
+#: src/summaryview.c:5287
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:423
-#: src/summaryview.c:5275
+#: src/summaryview.c:5290
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:424
-#: src/summaryview.c:5277
+#: src/summaryview.c:5292
 msgid "Date"
 msgstr "日期"
 
@@ -6420,7 +6420,7 @@ msgid "Number"
 msgstr "序号"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5283
+#: src/prefs_summary_column.c:74 src/summaryview.c:5298
 #, fuzzy
 msgid "To"
 msgstr "收件人："
@@ -6853,7 +6853,7 @@ msgstr "关于"
 msgid "%s - POP3 Remote mailbox"
 msgstr "删除邮箱"
 
-#: src/rpop3.c:421 src/summaryview.c:5281
+#: src/rpop3.c:421 src/summaryview.c:5296
 msgid "No."
 msgstr "No."
 
@@ -7806,15 +7806,15 @@ msgstr "正在取消线索..."
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4700
+#: src/summaryview.c:4699
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4700
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4746
+#: src/summaryview.c:4745
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
-- 
cgit v1.2.3