fixed a memory leak, and made 2.4.4 release.

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

1 files changed, 107 insertions, 101 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e20bac70..620d8bf3 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: 2007-07-11 15:39+0900\n"
+"POT-Creation-Date: 2007-07-20 15:25+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:520
-#: src/compose.c:4720 src/editaddress.c:777 src/editaddress.c:826
+#: src/compose.c:4579 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:225
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
@@ -1048,7 +1048,7 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1666 src/folderview.c:2485
+#: src/addressbook.c:1666 src/folderview.c:2491
 msgid "Delete folder"
 msgstr "删除文件夹"
 
@@ -1203,7 +1203,7 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:5989 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:5857 src/main.c:740
 msgid "Notice"
 msgstr "注意"
 
@@ -1551,80 +1551,80 @@ msgstr "/工具(_T)/执行(_X)"
 msgid "/_Tools/_Set spell language"
 msgstr "/工具(_T)/模板(_T)"
 
-#: src/compose.c:941
+#: src/compose.c:965
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s：文件不存在\n"
 
-#: src/compose.c:1045 src/compose.c:1119
+#: src/compose.c:1069 src/compose.c:1143
 msgid "Can't get text part\n"
 msgstr "无法得到文本分块\n"
 
-#: src/compose.c:1619
+#: src/compose.c:1623
 msgid "Quote mark format error."
 msgstr "引文标记格式错误。"
 
-#: src/compose.c:1631
+#: src/compose.c:1635
 msgid "Message reply/forward format error."
 msgstr "邮件回复/转发格式错误。"
 
-#: src/compose.c:2120
+#: src/compose.c:2124
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "文件 %s 不存在\n"
 
-#: src/compose.c:2124
+#: src/compose.c:2128
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "无法获得文件 %s 的大小\n"
 
-#: src/compose.c:2128
+#: src/compose.c:2132
 #, c-format
 msgid "File %s is empty."
 msgstr "文件 %s 是空的。"
 
-#: src/compose.c:2132
+#: src/compose.c:2136
 #, c-format
 msgid "Can't read %s."
 msgstr "无法读取 %s。"
 
-#: src/compose.c:2165
+#: src/compose.c:2169
 #, c-format
 msgid "Message: %s"
 msgstr "邮件：%s"
 
-#: src/compose.c:2225 src/mimeview.c:582
+#: src/compose.c:2229 src/mimeview.c:582
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2709 src/headerview.c:233 src/query_search.c:669
+#: src/compose.c:2713 src/headerview.c:233 src/query_search.c:669
 #: src/summaryview.c:2381
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
-#: src/compose.c:2712
+#: src/compose.c:2716
 #, fuzzy, c-format
 msgid "%s - Compose%s"
 msgstr "%s - 撰写邮件%s"
 
-#: src/compose.c:2827
+#: src/compose.c:2831
 msgid "Recipient is not specified."
 msgstr "没有指定收件人。"
 
-#: src/compose.c:2835
+#: src/compose.c:2839
 #, fuzzy
 msgid "Empty subject"
 msgstr "主题"
 
-#: src/compose.c:2836
+#: src/compose.c:2840
 msgid "Subject is empty. Send it anyway?"
 msgstr "主题是空的。还要发送吗？"
 
-#: src/compose.c:3003
+#: src/compose.c:2899
 msgid "can't get recipient list."
 msgstr "无法获得收件人列表。"
 
-#: src/compose.c:3023
+#: src/compose.c:2919
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1632,25 +1632,25 @@ msgstr ""
 "没有指定发送邮件要用的帐号。\n"
 "请在发送前选择一个邮件帐号。"
 
-#: src/compose.c:3037 src/send_message.c:338
+#: src/compose.c:2933 src/send_message.c:314
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "发送邮件到 %s 时发生错误。"
 
-#: src/compose.c:3085
+#: src/compose.c:2983
 msgid "Can't save the message to outbox."
 msgstr "无法将该邮件保存到发件箱。"
 
-#: src/compose.c:3123
+#: src/compose.c:3021
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "无法找到和当前选中的密钥标识“%s”相联系的钥匙。"
 
-#: src/compose.c:3187 src/compose.c:3482 src/compose.c:3545 src/compose.c:3665
+#: src/compose.c:3085 src/compose.c:3380 src/compose.c:3443 src/compose.c:3563
 msgid "can't change file mode\n"
 msgstr "无法改变文件属性\n"
 
-#: src/compose.c:3220
+#: src/compose.c:3118
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1660,12 +1660,12 @@ msgstr ""
 "无法将邮件的字符编码从 %s 转换到 %s。\n"
 "仍然用 %s 发送吗？"
 
-#: src/compose.c:3226
+#: src/compose.c:3124
 #, fuzzy
 msgid "Code conversion error"
 msgstr "地址簿转换错误"
 
-#: src/compose.c:3308
+#: src/compose.c:3206
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1674,15 +1674,15 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3312
+#: src/compose.c:3210
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3441
+#: src/compose.c:3339
 msgid "Encrypting with Bcc"
 msgstr ""
 
-#: src/compose.c:3442
+#: src/compose.c:3340
 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 "
@@ -1691,85 +1691,85 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:3625
+#: src/compose.c:3523
 msgid "can't remove the old message\n"
 msgstr "无法删除旧邮件\n"
 
-#: src/compose.c:3643
+#: src/compose.c:3541
 msgid "queueing message...\n"
 msgstr "正在排队邮件...\n"
 
-#: src/compose.c:3750
+#: src/compose.c:3629
 msgid "can't find queue folder\n"
 msgstr "无法找到队列文件夹：%s\n"
 
-#: src/compose.c:3757
+#: src/compose.c:3636
 msgid "can't queue the message\n"
 msgstr "无法排队该邮件\n"
 
-#: src/compose.c:4418
+#: src/compose.c:4277
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "生成邮件标识号：%s\n"
 
-#: src/compose.c:4533
+#: src/compose.c:4392
 msgid "Creating compose window...\n"
 msgstr "正在创建撰写窗口...\n"
 
-#: src/compose.c:4586 src/headerview.c:54
+#: src/compose.c:4445 src/headerview.c:54
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:4660
+#: src/compose.c:4519
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/工具(_T)/PGP 签名(_G)"
 
-#: src/compose.c:4663
+#: src/compose.c:4522
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/工具(_T)/PGP 加密(_E)"
 
-#: src/compose.c:4701 src/compose.c:5808
+#: src/compose.c:4560 src/compose.c:5676
 msgid "MIME type"
 msgstr "MIME 类型"
 
 #. S_COL_DATE
-#: src/compose.c:4710 src/mimeview.c:216 src/prefs_filter_edit.c:497
+#: src/compose.c:4569 src/mimeview.c:216 src/prefs_filter_edit.c:497
 #: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:5182
 msgid "Size"
 msgstr "大小"
 
-#: src/compose.c:5704
+#: src/compose.c:5572
 msgid "Invalid MIME type."
 msgstr "无效的MIME类型。"
 
-#: src/compose.c:5722
+#: src/compose.c:5590
 msgid "File doesn't exist or is empty."
 msgstr "文件不存在或为空。"
 
-#: src/compose.c:5790
+#: src/compose.c:5658
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:5810 src/prefs_common_dialog.c:1504
+#: src/compose.c:5678 src/prefs_common_dialog.c:1504
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5833 src/prefs_folder_item.c:202
+#: src/compose.c:5701 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
-#: src/compose.c:5834
+#: src/compose.c:5702
 msgid "File name"
 msgstr "文件名"
 
-#: src/compose.c:5924
+#: src/compose.c:5792
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "外部编辑器命令行无效：“%s”\n"
 
-#: src/compose.c:5986
+#: src/compose.c:5854
 #, fuzzy, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1779,51 +1779,51 @@ msgstr ""
 "强制结束程序？\n"
 "程序组标识号：%d"
 
-#: src/compose.c:6323 src/mainwindow.c:2867
+#: src/compose.c:6191 src/mainwindow.c:2867
 msgid "_Customize toolbar..."
 msgstr ""
 
-#: src/compose.c:6439 src/compose.c:6444 src/compose.c:6450
+#: src/compose.c:6307 src/compose.c:6312 src/compose.c:6318
 msgid "Can't queue the message."
 msgstr "无法将该邮件排队。"
 
-#: src/compose.c:6541
+#: src/compose.c:6409
 msgid "Select files"
 msgstr "选择文件"
 
-#: src/compose.c:6564
+#: src/compose.c:6432
 msgid "Select file"
 msgstr "选择文件"
 
-#: src/compose.c:6599
+#: src/compose.c:6467
 #, fuzzy
 msgid "Save message"
 msgstr "立即发送邮件"
 
-#: src/compose.c:6600
+#: src/compose.c:6468
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "该邮件已修改。丢弃它？"
 
-#: src/compose.c:6602
+#: src/compose.c:6470
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:6644
+#: src/compose.c:6512
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "您要使用模板“%s”吗？"
 
-#: src/compose.c:6646
+#: src/compose.c:6514
 msgid "Apply template"
 msgstr "使用模板"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Replace"
 msgstr "替换"
 
-#: src/compose.c:6647
+#: src/compose.c:6515
 #, fuzzy
 msgid "_Insert"
 msgstr "插入"
@@ -2365,12 +2365,12 @@ msgstr "重命名文件件"
 msgid "Can't rename the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2409
+#: src/folderview.c:2412
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2475
+#: src/folderview.c:2481
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2379,12 +2379,12 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2477
+#: src/folderview.c:2483
 #, fuzzy
 msgid "Delete search folder"
 msgstr "删除文件夹"
 
-#: src/folderview.c:2482
+#: src/folderview.c:2488
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2395,21 +2395,21 @@ msgstr ""
 "“%s”下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:2514 src/folderview.c:2520
+#: src/folderview.c:2520 src/folderview.c:2526
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2556
+#: src/folderview.c:2562
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:2557
+#: src/folderview.c:2563
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2598
+#: src/folderview.c:2604
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2418,34 +2418,34 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2600
+#: src/folderview.c:2606
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2650
+#: src/folderview.c:2656
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号“%s”？"
 
-#: src/folderview.c:2651
+#: src/folderview.c:2657
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2804
+#: src/folderview.c:2810
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2805
+#: src/folderview.c:2811
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2855
+#: src/folderview.c:2861
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2856
+#: src/folderview.c:2862
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -2739,7 +2739,7 @@ msgstr "正在连接POP3服务器：%s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "无法连接POP3服务器：%s:%d\n"
 
-#: src/inc.c:950 src/send_message.c:795
+#: src/inc.c:950 src/send_message.c:809
 msgid "Authenticating..."
 msgstr "正在验证..."
 
@@ -2769,7 +2769,7 @@ msgstr "正在获取新邮件的大小(LIST)..."
 msgid "Deleting message %d"
 msgstr "正在删除邮件 %d"
 
-#: src/inc.c:985 src/send_message.c:813
+#: src/inc.c:985 src/send_message.c:827
 msgid "Quitting"
 msgstr "正在退出"
 
@@ -2819,7 +2819,7 @@ msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:747 src/send_message.c:940
+#: src/inc.c:1325 src/send_message.c:756 src/send_message.c:954
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
@@ -2836,11 +2836,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:925
+#: src/inc.c:1341 src/send_message.c:939
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1346 src/send_message.c:928
+#: src/inc.c:1346 src/send_message.c:942
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2849,7 +2849,7 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:944
+#: src/inc.c:1351 src/send_message.c:958
 msgid "Session timed out."
 msgstr "会话超时。"
 
@@ -6295,84 +6295,90 @@ msgstr ""
 "的人那里。\n"
 "您仍然要使用它吗？"
 
-#: src/send_message.c:220
+#: src/send_message.c:196
 msgid "Queued message header is broken.\n"
 msgstr "队列中的邮件的邮件头头损坏。\n"
 
-#: src/send_message.c:549
+#: src/send_message.c:558
 #, fuzzy, c-format
 msgid "Sending message using command: %s\n"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: src/send_message.c:558
+#: src/send_message.c:567
 #, fuzzy, c-format
 msgid "Can't execute command: %s"
 msgstr "无法执行外部命令：%s\n"
 
-#: src/send_message.c:593
+#: src/send_message.c:602
 #, fuzzy, c-format
 msgid "Error occurred while executing command: %s"
 msgstr "发送命令时发生错误\n"
 
-#: src/send_message.c:710
+#: src/send_message.c:719
 msgid "Connecting"
 msgstr "正在连接"
 
-#: src/send_message.c:712
+#: src/send_message.c:721
 #, c-format
 msgid "Connecting to SMTP server: %s ..."
 msgstr "正在连接SMTP服务器：%s ..."
 
-#: src/send_message.c:785
+#. ignore errors right after QUIT
+#: src/send_message.c:761
+#, fuzzy
+msgid "Error occurred after QUIT command (ignored)"
+msgstr "发送命令时发生错误\n"
+
+#: src/send_message.c:799
 msgid "Sending HELO..."
 msgstr "正在发送 HELO..."
 
-#: src/send_message.c:786 src/send_message.c:791 src/send_message.c:796
+#: src/send_message.c:800 src/send_message.c:805 src/send_message.c:810
 msgid "Authenticating"
 msgstr "正在验证"
 
-#: src/send_message.c:787 src/send_message.c:792
+#: src/send_message.c:801 src/send_message.c:806
 msgid "Sending message..."
 msgstr "正在发送邮件..."
 
-#: src/send_message.c:790
+#: src/send_message.c:804
 msgid "Sending EHLO..."
 msgstr "正在发送 EHLO..."
 
-#: src/send_message.c:799
+#: src/send_message.c:813
 msgid "Sending MAIL FROM..."
 msgstr "正在发送 MAIL FROM..."
 
-#: src/send_message.c:800 src/send_message.c:804 src/send_message.c:809
+#: src/send_message.c:814 src/send_message.c:818 src/send_message.c:823
 msgid "Sending"
 msgstr "正在发送"
 
-#: src/send_message.c:803
+#: src/send_message.c:817
 msgid "Sending RCPT TO..."
 msgstr "正在发送 RCPT TO..."
 
-#: src/send_message.c:808
+#: src/send_message.c:822
 msgid "Sending DATA..."
 msgstr "正在发送 DATA..."
 
-#: src/send_message.c:812
+#: src/send_message.c:826
 msgid "Quitting..."
 msgstr "正在退出..."
 
-#: src/send_message.c:840
+#: src/send_message.c:854
 #, c-format
 msgid "Sending message (%d / %d bytes)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: src/send_message.c:871
+#: src/send_message.c:885
 msgid "Sending message"
 msgstr "正在发送邮件"
 
-#: src/send_message.c:916 src/send_message.c:936
+#: src/send_message.c:930 src/send_message.c:950
 msgid "Error occurred while sending the message."
 msgstr "发送邮件时发生错误。"
 
-#: src/send_message.c:919
+#: src/send_message.c:933
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"