always display error dialog when connection to SMTP server failed.

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

1 files changed, 86 insertions, 79 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 80601462..7ff45bbb 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: 2008-04-08 16:14+0900\n"
+"POT-Creation-Date: 2008-04-09 17:55+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"
@@ -678,7 +678,7 @@ msgstr ""
 "时会检查新邮件。"
 
 #: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:519
-#: src/compose.c:5011 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:5024 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:321
@@ -815,7 +815,7 @@ msgstr "动作的用户参数"
 msgid "Add Address to Book"
 msgstr "将地址添加到地址簿"
 
-#: src/addressadd.c:187 src/compose.c:3125 src/prefs_toolbar.c:86
+#: src/addressadd.c:187 src/compose.c:3138 src/prefs_toolbar.c:86
 #: src/select-keys.c:322
 msgid "Address"
 msgstr "地址"
@@ -993,17 +993,17 @@ msgstr "地址簿"
 msgid "Name:"
 msgstr "姓名："
 
-#: src/addressbook.c:673 src/compose.c:3073 src/headerview.c:55
+#: src/addressbook.c:673 src/compose.c:3083 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:677 src/compose.c:3089 src/headerview.c:56
+#: src/addressbook.c:677 src/compose.c:3100 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:681 src/compose.c:3105 src/prefs_folder_item.c:367
+#: src/addressbook.c:681 src/compose.c:3117 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件抄送："
@@ -1205,7 +1205,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6287 src/main.c:742
+#: src/alertpanel.c:142 src/compose.c:6300 src/main.c:742
 msgid "Notice"
 msgstr "注意"
 
@@ -1580,7 +1580,7 @@ msgstr "文件 %s 不存在\n"
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2135 src/compose.c:4105
+#: src/compose.c:2135 src/compose.c:4118
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
@@ -1631,33 +1631,33 @@ msgstr "附件"
 msgid "There is no attachment. Send it without attachments?"
 msgstr ""
 
-#: src/compose.c:2968 src/compose.c:2993
+#: src/compose.c:2969 src/compose.c:2995
 msgid "Check recipients"
 msgstr ""
 
-#: src/compose.c:3013
+#: src/compose.c:3015
 #, fuzzy
 msgid "Really send this mail to the following addresses?"
 msgstr "自动设置以下地址"
 
-#: src/compose.c:3026 src/compose.c:4877 src/headerview.c:54
+#: src/compose.c:3028 src/compose.c:4890 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:3044 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3050 src/headerview.c:58 src/prefs_template.c:187
 msgid "Subject:"
 msgstr "标题："
 
-#: src/compose.c:3130
+#: src/compose.c:3143
 #, fuzzy
 msgid "_Send"
 msgstr "发送"
 
-#: src/compose.c:3215
+#: src/compose.c:3228
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:3235
+#: src/compose.c:3248
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1665,25 +1665,25 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:3249 src/send_message.c:315
+#: src/compose.c:3262 src/send_message.c:315
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:3299
+#: src/compose.c:3312
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:3337
+#: src/compose.c:3350
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3465 src/compose.c:3804 src/compose.c:3867 src/compose.c:3987
+#: src/compose.c:3478 src/compose.c:3817 src/compose.c:3880 src/compose.c:4000
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:3498
+#: src/compose.c:3511
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1693,12 +1693,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3504
+#: src/compose.c:3517
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3590
+#: src/compose.c:3603
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1707,15 +1707,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3594
+#: src/compose.c:3607
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3756
+#: src/compose.c:3769
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3757
+#: src/compose.c:3770
 msgid ""
 "This message has Bcc recipients. If this message is encrypted, all Bcc "
 "recipients will be visible by examing the encryption key list, leading to "
@@ -1724,91 +1724,91 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3947
+#: src/compose.c:3960
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3965
+#: src/compose.c:3978
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:4053
+#: src/compose.c:4066
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:4060
+#: src/compose.c:4073
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4100
+#: src/compose.c:4113
 #, fuzzy, c-format
 msgid "File %s doesn't exist."
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:4109
+#: src/compose.c:4122
 #, fuzzy, c-format
 msgid "Can't open file %s."
 msgstr "无法打开文件 %s\n"
 
-#: src/compose.c:4709
+#: src/compose.c:4722
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4824
+#: src/compose.c:4837
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4951
+#: src/compose.c:4964
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4954
+#: src/compose.c:4967
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4992 src/compose.c:6106
+#: src/compose.c:5005 src/compose.c:6119
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:5001 src/mimeview.c:217 src/prefs_filter_edit.c:497
+#: src/compose.c:5014 src/mimeview.c:217 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:78 src/select-keys.c:319 src/summaryview.c:5087
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:6001
+#: src/compose.c:6014
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:6019
+#: src/compose.c:6032
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:6088
+#: src/compose.c:6101
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:6108 src/prefs_common_dialog.c:1551
+#: src/compose.c:6121 src/prefs_common_dialog.c:1551
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:6131 src/prefs_folder_item.c:202
+#: src/compose.c:6144 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:6132
+#: src/compose.c:6145
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:6222
+#: src/compose.c:6235
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:6284
+#: src/compose.c:6297
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1818,51 +1818,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6621 src/mainwindow.c:2976
+#: src/compose.c:6634 src/mainwindow.c:2976
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6741 src/compose.c:6746 src/compose.c:6752
+#: src/compose.c:6754 src/compose.c:6759 src/compose.c:6765
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6843
+#: src/compose.c:6856
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6866
+#: src/compose.c:6879
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6901
+#: src/compose.c:6914
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6902
+#: src/compose.c:6915
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6904
+#: src/compose.c:6917
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6946
+#: src/compose.c:6959
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6948
+#: src/compose.c:6961
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6949
+#: src/compose.c:6962
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6949
+#: src/compose.c:6962
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2774,7 +2774,7 @@ msgstr "正在连接POP3服务器：%s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:949 src/send_message.c:810
+#: src/inc.c:949 src/send_message.c:813
 msgid "Authenticating..."
 msgstr "正在验证..."
 
@@ -2804,7 +2804,7 @@ msgstr "正在获取新邮件的大小(LIST)..."
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:984 src/send_message.c:828
+#: src/inc.c:984 src/send_message.c:831
 msgid "Quitting"
 msgstr "正在退出"
 
@@ -2854,7 +2854,7 @@ msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1324 src/send_message.c:757 src/send_message.c:955
+#: src/inc.c:1324 src/send_message.c:760 src/send_message.c:963
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
@@ -2871,11 +2871,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1340 src/send_message.c:940
+#: src/inc.c:1340 src/send_message.c:943
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1345 src/send_message.c:943
+#: src/inc.c:1345 src/send_message.c:946
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2884,7 +2884,7 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1350 src/send_message.c:959
+#: src/inc.c:1350 src/send_message.c:967
 msgid "Session timed out."
 msgstr "会话超时。"
 
@@ -6437,61 +6437,61 @@ msgid "Connecting to SMTP server: %s ..."
 msgstr "正在连接SMTP服务器：%s ..."
 
 #. ignore errors right after QUIT
-#: src/send_message.c:762
+#: src/send_message.c:765
 #, fuzzy
 msgid "Error occurred after QUIT command (ignored)"
 msgstr "发送命令时发生错误\n"
 
-#: src/send_message.c:800
+#: src/send_message.c:803
 msgid "Sending HELO..."
 msgstr "正在发送 HELO..."
 
-#: src/send_message.c:801 src/send_message.c:806 src/send_message.c:811
+#: src/send_message.c:804 src/send_message.c:809 src/send_message.c:814
 msgid "Authenticating"
 msgstr "正在验证"
 
-#: src/send_message.c:802 src/send_message.c:807
+#: src/send_message.c:805 src/send_message.c:810
 msgid "Sending message..."
 msgstr "正在发送邮件..."
 
-#: src/send_message.c:805
+#: src/send_message.c:808
 msgid "Sending EHLO..."
 msgstr "正在发送 EHLO..."
 
-#: src/send_message.c:814
+#: src/send_message.c:817
 msgid "Sending MAIL FROM..."
 msgstr "正在发送 MAIL FROM..."
 
-#: src/send_message.c:815 src/send_message.c:819 src/send_message.c:824
+#: src/send_message.c:818 src/send_message.c:822 src/send_message.c:827
 msgid "Sending"
 msgstr "正在发送"
 
-#: src/send_message.c:818
+#: src/send_message.c:821
 msgid "Sending RCPT TO..."
 msgstr "正在发送 RCPT TO..."
 
-#: src/send_message.c:823
+#: src/send_message.c:826
 msgid "Sending DATA..."
 msgstr "正在发送 DATA..."
 
-#: src/send_message.c:827
+#: src/send_message.c:830
 msgid "Quitting..."
 msgstr "正在退出..."
 
-#: src/send_message.c:855
+#: src/send_message.c:858
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: src/send_message.c:886
+#: src/send_message.c:889
 msgid "Sending message"
 msgstr "正在发送邮件"
 
-#: src/send_message.c:931 src/send_message.c:951
+#: src/send_message.c:934 src/send_message.c:958
 msgid "Error occurred while sending the message."
 msgstr "发送邮件时发生错误。"
 
-#: src/send_message.c:934
+#: src/send_message.c:937
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"
@@ -6500,6 +6500,16 @@ msgstr ""
 "发送邮件时发生错误：\n"
 "%s"
 
+#: src/send_message.c:954
+#, fuzzy
+msgid "Can't connect to SMTP server."
+msgstr "无法连接SMTP服务器：%s:%d\n"
+
+#: src/send_message.c:956
+#, fuzzy, c-format
+msgid "Can't connect to SMTP server: %s:%d"
+msgstr "无法连接SMTP服务器：%s:%d\n"
+
 #: src/setup.c:43
 msgid "Mailbox setting"
 msgstr "信箱设置"
@@ -7690,9 +7700,6 @@ msgstr "旧式的Sylpheed"
 #~ msgid "Error occurred while sending QUIT\n"
 #~ msgstr "发送 QUIT 时发生错误\n"
 
-#~ msgid "Can't connect to SMTP server: %s:%d\n"
-#~ msgstr "无法连接SMTP服务器：%s:%d\n"
-
 #~ msgid "Error occurred while connecting to %s:%d\n"
 #~ msgstr "连接到 %s:%d 时发生错误\n"