removed debug prints, updated def file and updated Windows ico file. Made 3.0.0beta2 release.

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

1 files changed, 99 insertions, 99 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index f1d27d45..a183e335 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-10 15:05+0900\n"
+"POT-Creation-Date: 2009-11-13 18:07+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -136,79 +136,79 @@ msgstr "取得信封時發生錯誤。\n"
 msgid "can't parse envelope: %s\n"
 msgstr "無法解析信封：%s\n"
 
-#: libsylph/imap.c:2752
+#: libsylph/imap.c:2750
 msgid "can't get envelope\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:2860 libsylph/imap.c:2866
+#: libsylph/imap.c:2857 libsylph/imap.c:2863
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器：%s:%d\n"
 
-#: libsylph/imap.c:2874
+#: libsylph/imap.c:2871
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "無法產生 IMAP4 連線：%s:%d\n"
 
-#: libsylph/imap.c:2949
+#: libsylph/imap.c:2946
 msgid "can't get namespace\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:3483
+#: libsylph/imap.c:3480
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾：%s\n"
 
-#: libsylph/imap.c:3521
+#: libsylph/imap.c:3518
 msgid "error on imap command: STATUS\n"
 msgstr "發生錯誤的 imap 命令： STATUS\n"
 
-#: libsylph/imap.c:3645 libsylph/imap.c:3680
+#: libsylph/imap.c:3642 libsylph/imap.c:3677
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 認證失敗\n"
 
-#: libsylph/imap.c:3733
+#: libsylph/imap.c:3730
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登入失敗。\n"
 
-#: libsylph/imap.c:4108 libsylph/imap.c:4115
+#: libsylph/imap.c:4103 libsylph/imap.c:4110
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "無法將郵件從 %s 搬移到 %s。\n"
 
-#: libsylph/imap.c:4122
+#: libsylph/imap.c:4117
 msgid "(sending file...)"
 msgstr "（送出檔案 ...）"
 
-#: libsylph/imap.c:4151
+#: libsylph/imap.c:4146
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "無法附加訊息到 %s\n"
 
-#: libsylph/imap.c:4183
+#: libsylph/imap.c:4178
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "無法將郵件 %s 移到 %s\n"
 
-#: libsylph/imap.c:4206
+#: libsylph/imap.c:4201
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 發生錯誤，命令為： STORE %s %s\n"
 
-#: libsylph/imap.c:4222
+#: libsylph/imap.c:4217
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 發生錯誤，命令為： EXPUNGE\n"
 
-#: libsylph/imap.c:4237
+#: libsylph/imap.c:4232
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 發生錯誤，命令為： CLOSE\n"
 
-#: libsylph/imap.c:4547
+#: libsylph/imap.c:4539
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "無法將 UTF-7 轉換為 %s\n"
 
-#: libsylph/imap.c:4577
+#: libsylph/imap.c:4569
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "無法轉換 %s 為 UTF-7\n"
@@ -683,7 +683,7 @@ msgstr ""
 "檢查新郵件時將會依照下面的順序。您可以勾選 G 欄位中的方塊，\n"
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
-#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:684
+#: src/account_dialog.c:374 src/addressadd.c:177 src/addressbook.c:702
 #: src/compose.c:5110 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -824,7 +824,7 @@ msgstr "將地址加入通訊錄"
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:197 src/addressbook.c:714 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:734 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
 msgid "Remarks"
 msgstr "備註"
@@ -833,29 +833,29 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressbook.c:351 src/compose.c:560 src/mainwindow.c:540
+#: src/addressbook.c:359 src/compose.c:560 src/mainwindow.c:540
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/檔案(_F)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:360
 msgid "/_File/New _Book"
 msgstr "/檔案(_F)/新增通訊錄(_B)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:361
 msgid "/_File/New _vCard"
 msgstr "/檔案(_F)/新增vCard(_V)"
 
-#: src/addressbook.c:355
+#: src/addressbook.c:363
 msgid "/_File/New _JPilot"
 msgstr "/檔案(_F)/新增J-Pilot(_J)"
 
-#: src/addressbook.c:358
+#: src/addressbook.c:366
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:565
+#: src/addressbook.c:368 src/addressbook.c:371 src/compose.c:565
 #: src/compose.c:570 src/compose.c:573 src/compose.c:576 src/mainwindow.c:558
 #: src/mainwindow.c:561 src/mainwindow.c:563 src/mainwindow.c:565
 #: src/mainwindow.c:570 src/mainwindow.c:572 src/messageview.c:151
@@ -863,101 +863,101 @@ msgstr "/檔案(_F)/新增伺服器(_S)"
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:369
 msgid "/_File/_Edit"
 msgstr "/檔案(_F)/編輯(_E)"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:370
 msgid "/_File/_Delete"
 msgstr "/檔案(_F)/刪除(_D)"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:372
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:365 src/compose.c:577 src/messageview.c:157
+#: src/addressbook.c:373 src/compose.c:577 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
-#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
+#: src/addressbook.c:375 src/addressbook.c:415 src/addressbook.c:425
 #: src/compose.c:579 src/mainwindow.c:576 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:368 src/compose.c:584 src/mainwindow.c:577
+#: src/addressbook.c:376 src/compose.c:584 src/mainwindow.c:577
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/addressbook.c:369 src/compose.c:585
+#: src/addressbook.c:377 src/compose.c:585
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:379
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:380
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:381
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群組(_G)"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:382
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新增資料夾(_F)"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:383
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:376
+#: src/addressbook.c:384
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/編輯(_E)"
 
-#: src/addressbook.c:377
+#: src/addressbook.c:385
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:379 src/compose.c:695 src/mainwindow.c:824
+#: src/addressbook.c:387 src/compose.c:695 src/mainwindow.c:824
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:380
+#: src/addressbook.c:388
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:381
+#: src/addressbook.c:389
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:383 src/compose.c:716 src/mainwindow.c:880
+#: src/addressbook.c:391 src/compose.c:716 src/mainwindow.c:880
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:384 src/compose.c:717 src/mainwindow.c:894
+#: src/addressbook.c:392 src/compose.c:717 src/mainwindow.c:894
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
 
-#: src/addressbook.c:403 src/addressbook.c:413
+#: src/addressbook.c:411 src/addressbook.c:421
 msgid "/New _Address"
 msgstr "/新增地址(_A)"
 
-#: src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:412 src/addressbook.c:422
 msgid "/New _Group"
 msgstr "/新增群組(_G)"
 
-#: src/addressbook.c:405 src/addressbook.c:415
+#: src/addressbook.c:413 src/addressbook.c:423
 msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
-#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
+#: src/addressbook.c:414 src/addressbook.c:424 src/addressbook.c:427
 #: src/compose.c:554 src/folderview.c:256 src/folderview.c:258
 #: src/folderview.c:263 src/folderview.c:266 src/folderview.c:279
 #: src/folderview.c:281 src/folderview.c:283 src/folderview.c:288
@@ -970,88 +970,88 @@ msgstr "/新增資料夾(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:441
+#: src/addressbook.c:416 src/addressbook.c:426 src/summaryview.c:441
 msgid "/_Delete"
 msgstr "/刪除(_D)"
 
-#: src/addressbook.c:420
+#: src/addressbook.c:428
 #, fuzzy
 msgid "/_Copy"
 msgstr "/複製(_C)..."
 
-#: src/addressbook.c:421
+#: src/addressbook.c:429
 #, fuzzy
 msgid "/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:544 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
+#: src/addressbook.c:554 src/prefs_common_dialog.c:2373 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "通訊錄"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:618 src/addressbook.c:3645 src/folderview.c:385
+#: src/addressbook.c:628 src/addressbook.c:3734 src/folderview.c:385
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:707
+#: src/addressbook.c:726
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:739 src/prefs_filter_edit.c:251
+#: src/addressbook.c:760 src/prefs_filter_edit.c:251
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
-#: src/addressbook.c:776 src/compose.c:3153 src/headerview.c:55
+#: src/addressbook.c:797 src/compose.c:3153 src/headerview.c:55
 #: src/prefs_folder_item.c:339 src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:780 src/compose.c:3170 src/headerview.c:56
+#: src/addressbook.c:801 src/compose.c:3170 src/headerview.c:56
 #: src/prefs_folder_item.c:356 src/prefs_template.c:181
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:784 src/compose.c:3187 src/prefs_folder_item.c:367
+#: src/addressbook.c:805 src/compose.c:3187 src/prefs_folder_item.c:367
 #: src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件副本"
 
 #. Buttons
-#: src/addressbook.c:805 src/addressbook.c:1874 src/editaddress.c:719
+#: src/addressbook.c:826 src/addressbook.c:1904 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:239 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "刪除"
 
-#: src/addressbook.c:808 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:829 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1560
 msgid "Add"
 msgstr "新增"
 
-#: src/addressbook.c:811
+#: src/addressbook.c:833
 msgid "Lookup"
 msgstr "尋找"
 
-#: src/addressbook.c:814
+#: src/addressbook.c:837
 #, fuzzy
 msgid "_Close"
 msgstr "顏色"
 
 #. Confirm deletion
-#: src/addressbook.c:1015
+#: src/addressbook.c:1044
 msgid "Delete address(es)"
 msgstr "刪除通訊紀錄"
 
-#: src/addressbook.c:1016
+#: src/addressbook.c:1045
 msgid "Really delete the address(es)?"
 msgstr "您確定要刪除這些紀錄嗎？"
 
-#: src/addressbook.c:1865
+#: src/addressbook.c:1895
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1060,38 +1060,38 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1868 src/folderview.c:2546
+#: src/addressbook.c:1898 src/folderview.c:2546
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "_Folder only"
 msgstr "只刪除資料夾(_F)"
 
-#: src/addressbook.c:1868
+#: src/addressbook.c:1898
 msgid "Folder and _addresses"
 msgstr "全部刪除(_A)"
 
-#: src/addressbook.c:1873
+#: src/addressbook.c:1903
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "您確定要刪除「%s」? "
 
-#: src/addressbook.c:2741 src/addressbook.c:2877
+#: src/addressbook.c:2791 src/addressbook.c:2927
 msgid "New user, could not save index file."
 msgstr "無法儲存索引檔案。"
 
-#: src/addressbook.c:2745 src/addressbook.c:2881
+#: src/addressbook.c:2795 src/addressbook.c:2931
 msgid "New user, could not save address book files."
 msgstr "無法儲存通訊錄檔案。"
 
-#: src/addressbook.c:2755 src/addressbook.c:2891
+#: src/addressbook.c:2805 src/addressbook.c:2941
 msgid "Old address book converted successfully."
 msgstr ""
 "轉換舊通訊錄格式完成。\n"
 "您可以開始使用新的通訊錄。"
 
-#: src/addressbook.c:2760
+#: src/addressbook.c:2810
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1099,7 +1099,7 @@ msgstr ""
 "舊通訊錄格式已轉換，\n"
 "但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2773
+#: src/addressbook.c:2823
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1107,7 +1107,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2779
+#: src/addressbook.c:2829
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1115,7 +1115,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2784
+#: src/addressbook.c:2834
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1123,17 +1123,17 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2791
+#: src/addressbook.c:2841
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2795
+#: src/addressbook.c:2845
 #, fuzzy
 msgid "Address book conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:2832
+#: src/addressbook.c:2882
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1141,73 +1141,73 @@ msgid ""
 "%s%c%s"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:2835
+#: src/addressbook.c:2885
 #, fuzzy
 msgid "Address Book Error"
 msgstr "通訊錄發生錯誤"
 
-#: src/addressbook.c:2896
+#: src/addressbook.c:2946
 msgid "Old address book converted, could not save new address index file"
 msgstr "舊通訊錄格式已轉換，但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2910
+#: src/addressbook.c:2960
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "無法轉換通訊錄格式，但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2916
+#: src/addressbook.c:2966
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2922
+#: src/addressbook.c:2972
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2934
+#: src/addressbook.c:2984
 msgid "Could not read address index"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:2940
+#: src/addressbook.c:2990
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2946
+#: src/addressbook.c:2996
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3575 src/prefs_common_dialog.c:2198
+#: src/addressbook.c:3664 src/prefs_common_dialog.c:2198
 msgid "Interface"
 msgstr "介面"
 
-#: src/addressbook.c:3589 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:3678 src/importcsv.c:671 src/importldif.c:478
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:3603
+#: src/addressbook.c:3692
 msgid "Person"
 msgstr "人名"
 
-#: src/addressbook.c:3617
+#: src/addressbook.c:3706
 msgid "EMail Address"
 msgstr "電子郵件信箱"
 
-#: src/addressbook.c:3631
+#: src/addressbook.c:3720
 msgid "Group"
 msgstr "群組"
 
-#: src/addressbook.c:3659
+#: src/addressbook.c:3748
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3673 src/addressbook.c:3687
+#: src/addressbook.c:3762 src/addressbook.c:3776
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3701
+#: src/addressbook.c:3790
 msgid "LDAP Server"
 msgstr "LDAP 伺服器"
 
@@ -3160,15 +3160,15 @@ msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1208
+#: src/main.c:1211
 msgid "another Sylpheed is already running.\n"
 msgstr "已經有 Sylpheed 程式正在執行中。\n"
 
-#: src/main.c:1478
+#: src/main.c:1481
 msgid "Migration of configuration"
 msgstr "設定資料轉移"
 
-#: src/main.c:1479
+#: src/main.c:1482
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"