included server name in the receive error dialog.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@3090 ee746299-78ed-0310-b773-934348b2243d

1 files changed, 69 insertions, 54 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2efc874e..9e74b8c1 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: 2012-06-06 16:00+0900\n"
+"POT-Creation-Date: 2012-06-13 15:40+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"
@@ -1264,7 +1264,7 @@ msgstr "注意"
 msgid "Warning"
 msgstr "警告"
 
-#: src/alertpanel.c:168 src/inc.c:890
+#: src/alertpanel.c:168 src/inc.c:891
 #: plugin/attachment_tool/attachment_tool.c:263
 msgid "Error"
 msgstr "错误"
@@ -2324,20 +2324,25 @@ msgstr "选择导出文件"
 msgid "Select destination folder"
 msgstr "选择导出文件"
 
-#: src/filesel.c:216
+#: src/filesel.c:214
+#, fuzzy
+msgid "The link target not found."
+msgstr "没发现标记的文件。\n"
+
+#: src/filesel.c:245
 msgid "Save as"
 msgstr "另存为"
 
-#: src/filesel.c:223 src/filesel.c:337
+#: src/filesel.c:252 src/filesel.c:380
 #, fuzzy
 msgid "Overwrite existing file"
 msgstr "覆盖已存在的文件？"
 
-#: src/filesel.c:224 src/filesel.c:338
+#: src/filesel.c:253 src/filesel.c:381
 msgid "The file already exists. Do you want to replace it?"
 msgstr ""
 
-#: src/filesel.c:241 src/foldersel.c:256
+#: src/filesel.c:270 src/foldersel.c:256
 msgid "Select folder"
 msgstr "选择文件夹"
 
@@ -2915,177 +2920,187 @@ msgstr "导入 LDIF 文件到地址簿"
 msgid "Attributes"
 msgstr "属性"
 
-#: src/inc.c:196
+#: src/inc.c:197
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:207
+#: src/inc.c:208
 #, c-format
 msgid "[Local]: %d"
 msgstr ""
 
-#: src/inc.c:608
+#: src/inc.c:609
 #, fuzzy
 msgid "Authenticating with POP3"
 msgstr "正在验证"
 
-#: src/inc.c:637
+#: src/inc.c:638
 msgid "Retrieving new messages"
 msgstr "正在获取新邮件"
 
-#: src/inc.c:639
+#: src/inc.c:640
 #, fuzzy
 msgid "Cancel _all"
 msgstr "取消"
 
-#: src/inc.c:685
+#: src/inc.c:686
 msgid "Standby"
 msgstr "请等待"
 
-#: src/inc.c:842 src/inc.c:896
+#: src/inc.c:843 src/inc.c:897
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/inc.c:853
+#: src/inc.c:854
 msgid "Retrieving"
 msgstr "正在获取"
 
-#: src/inc.c:862 src/inc.c:1203
+#: src/inc.c:863 src/inc.c:1205
 #, fuzzy, c-format
 msgid "%d message(s) (%s) received"
 msgstr "完成 (收到 %d 个邮件 (%s))"
 
-#: src/inc.c:866
+#: src/inc.c:867
 #, fuzzy, c-format
 msgid "no new messages"
 msgstr "没有新邮件"
 
-#: src/inc.c:867
+#: src/inc.c:868
 msgid "Done"
 msgstr "完成"
 
-#: src/inc.c:872
+#: src/inc.c:873
 #, fuzzy
 msgid "Server not found"
 msgstr "服务器资料"
 
-#: src/inc.c:876
+#: src/inc.c:877
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: src/inc.c:879
+#: src/inc.c:880
 msgid "Auth failed"
 msgstr "验证失败"
 
-#: src/inc.c:883
+#: src/inc.c:884
 msgid "Locked"
 msgstr "锁住"
 
-#: src/inc.c:893
+#: src/inc.c:894
 msgid "Timeout"
 msgstr "超时"
 
-#: src/inc.c:942
+#: src/inc.c:944
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "完成 (%d 个新邮件)"
 
-#: src/inc.c:945
+#: src/inc.c:947
 #, c-format
 msgid "Finished (no new messages)"
 msgstr "完成 (没有新邮件)"
 
-#: src/inc.c:954
+#: src/inc.c:956
 msgid "Some errors occurred while getting mail."
 msgstr "获取邮件时发生错误。"
 
-#: src/inc.c:990
+#: src/inc.c:992
 #, c-format
 msgid "getting new messages of account %s...\n"
 msgstr "正在获取帐号 %s 的新邮件...\n"
 
-#: src/inc.c:994
+#: src/inc.c:996
 #, fuzzy, c-format
 msgid "%s: Authenticating with POP3"
 msgstr "正在验证"
 
-#: src/inc.c:997
+#: src/inc.c:999
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s：正在获取新邮件"
 
-#: src/inc.c:1002
+#: src/inc.c:1004
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "正在连接POP3服务器：%s..."
 
-#: src/inc.c:1020
+#: src/inc.c:1022
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:1106 src/rpop3.c:862 src/send_message.c:846
+#: src/inc.c:1108 src/rpop3.c:862 src/send_message.c:846
 #, c-format
 msgid "Authenticating..."
 msgstr "正在验证..."
 
-#: src/inc.c:1107
+#: src/inc.c:1109
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "正在从 %s 获取邮件..."
 
-#: src/inc.c:1112
+#: src/inc.c:1114
 msgid "Getting the number of new messages (STAT)..."
 msgstr "正在获取新邮件数量(STAT)..."
 
-#: src/inc.c:1116
+#: src/inc.c:1118
 msgid "Getting the number of new messages (LAST)..."
 msgstr "正在获取新邮件数量(LAST)..."
 
-#: src/inc.c:1120
+#: src/inc.c:1122
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "正在获取新邮件数量(UIDL)..."
 
-#: src/inc.c:1124
+#: src/inc.c:1126
 msgid "Getting the size of messages (LIST)..."
 msgstr "正在获取新邮件的大小(LIST)..."
 
-#: src/inc.c:1134
+#: src/inc.c:1136
 #, c-format
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:1141 src/send_message.c:864
+#: src/inc.c:1143 src/send_message.c:864
 msgid "Quitting"
 msgstr "正在退出"
 
-#: src/inc.c:1178
+#: src/inc.c:1180
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1443 src/inc.c:1470 src/summaryview.c:4807 src/summaryview.c:4997
+#: src/inc.c:1445 src/inc.c:1472 src/summaryview.c:4807 src/summaryview.c:4997
 #: src/summaryview.c:5048
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
 msgstr ""
 
-#: src/inc.c:1534 src/send_message.c:1001
+#: src/inc.c:1536 src/send_message.c:1001
 #, fuzzy
 msgid "Server not found."
 msgstr "没发现标记的文件。\n"
 
 #: src/inc.c:1540
+#, fuzzy, c-format
+msgid "Server %s not found."
+msgstr "没发现标记的文件。\n"
+
+#: src/inc.c:1543
 msgid "Connection failed."
 msgstr "连接失败"
 
-#: src/inc.c:1546
+#: src/inc.c:1547
+#, fuzzy, c-format
+msgid "Connection to %s:%d failed."
+msgstr "连接失败"
+
+#: src/inc.c:1551
 msgid "Error occurred while processing mail."
 msgstr "处理邮件时发生错误。"
 
-#: src/inc.c:1551
+#: src/inc.c:1556
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
@@ -3094,29 +3109,29 @@ msgstr ""
 "处理邮件时发生错误：\n"
 "%s"
 
-#: src/inc.c:1557
+#: src/inc.c:1562
 msgid "No disk space left."
 msgstr "没有剩余磁盘空间。"
 
-#: src/inc.c:1562
+#: src/inc.c:1567
 msgid "Can't write file."
 msgstr "无法写入文件。"
 
-#: src/inc.c:1567
+#: src/inc.c:1572
 msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1573 src/rpop3.c:575 src/rpop3.c:576 src/send_message.c:786
+#: src/inc.c:1578 src/rpop3.c:575 src/rpop3.c:576 src/send_message.c:786
 #: src/send_message.c:1014
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
-#: src/inc.c:1579
+#: src/inc.c:1584
 msgid "Mailbox is locked."
 msgstr "信箱被锁住。"
 
-#: src/inc.c:1583
+#: src/inc.c:1588
 #, c-format
 msgid ""
 "Mailbox is locked:\n"
@@ -3125,11 +3140,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1589 src/rpop3.c:550 src/rpop3.c:555 src/send_message.c:990
+#: src/inc.c:1594 src/rpop3.c:550 src/rpop3.c:555 src/send_message.c:990
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1594 src/rpop3.c:552 src/send_message.c:993
+#: src/inc.c:1599 src/rpop3.c:552 src/send_message.c:993
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3138,15 +3153,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1599 src/rpop3.c:580 src/rpop3.c:581 src/send_message.c:1018
+#: src/inc.c:1604 src/rpop3.c:580 src/rpop3.c:581 src/send_message.c:1018
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1640
+#: src/inc.c:1645
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1752
+#: src/inc.c:1757
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"