new setup dialog which improves usability.

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

1 files changed, 230 insertions, 196 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 71688715..04b3bc99 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: 2009-12-09 17:20+0900\n"
+"POT-Creation-Date: 2009-12-11 17:11+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"
@@ -986,7 +986,7 @@ msgstr "/复制(_C)..."
 msgid "/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:535 src/prefs_common_dialog.c:2401 src/prefs_toolbar.c:90
+#: src/addressbook.c:535 src/prefs_common_dialog.c:2402 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "地址簿"
 
@@ -1180,7 +1180,7 @@ msgstr "地址簿转换错误"
 msgid "Address Book Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3690 src/prefs_common_dialog.c:2226
+#: src/addressbook.c:3690 src/prefs_common_dialog.c:2227
 msgid "Interface"
 msgstr "界面"
 
@@ -1826,7 +1826,7 @@ msgstr "文件不存在或为空。"
 msgid "Properties"
 msgstr "属性"
 
-#: src/compose.c:6286 src/prefs_common_dialog.c:1620
+#: src/compose.c:6286 src/prefs_common_dialog.c:1621
 msgid "Encoding"
 msgstr "编码方式"
 
@@ -2080,7 +2080,7 @@ msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
 #: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
-#: src/prefs_common_dialog.c:2028
+#: src/prefs_common_dialog.c:2029
 msgid " ... "
 msgstr " ... "
 
@@ -2386,18 +2386,18 @@ msgstr "/删除新闻组(_R)"
 msgid "Creating folder view...\n"
 msgstr "正在创建文件夹视图...\n"
 
-#: src/folderview.c:415 src/prefs_common_dialog.c:1538
+#: src/folderview.c:415 src/prefs_common_dialog.c:1539
 msgid "New"
 msgstr "新建"
 
 #. S_COL_MARK
-#: src/folderview.c:431 src/prefs_common_dialog.c:1539
+#: src/folderview.c:431 src/prefs_common_dialog.c:1540
 #: src/prefs_filter_edit.c:507 src/prefs_summary_column.c:67
 #: src/quick_search.c:98
 msgid "Unread"
 msgstr "未读"
 
-#: src/folderview.c:447 src/prefs_common_dialog.c:1540
+#: src/folderview.c:447 src/prefs_common_dialog.c:1541
 msgid "Total"
 msgstr ""
 
@@ -2409,12 +2409,12 @@ msgstr "正在设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:80
+#: src/folderview.c:889 src/mainwindow.c:4060 src/setup.c:258
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:85
+#: src/folderview.c:893 src/mainwindow.c:4065 src/setup.c:263
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
@@ -2439,7 +2439,7 @@ msgstr "重建文件夹树失败。"
 msgid "Checking for new messages in all folders..."
 msgstr "正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1256 src/prefs_common_dialog.c:1972 src/prefs_toolbar.c:68
+#: src/folderview.c:1256 src/prefs_common_dialog.c:1973 src/prefs_toolbar.c:68
 msgid "Junk"
 msgstr ""
 
@@ -3892,16 +3892,16 @@ msgstr ""
 "输入邮箱位置。\n"
 "如果指定了已存在的邮箱，它将被自动扫描。"
 
-#: src/mainwindow.c:1789 src/setup.c:49
+#: src/mainwindow.c:1789
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "邮箱“%s”已经存在。"
 
-#: src/mainwindow.c:1794 src/setup.c:56
+#: src/mainwindow.c:1794 src/setup.c:234
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: src/mainwindow.c:1800 src/setup.c:62
+#: src/mainwindow.c:1800 src/setup.c:238
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
@@ -4316,7 +4316,7 @@ msgstr "隐私"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2319
+#: src/prefs_account_dialog.c:568 src/prefs_common_dialog.c:2320
 msgid "Advanced"
 msgstr "高级"
 
@@ -4443,7 +4443,7 @@ msgid "Authentication method"
 msgstr "验证方法"
 
 #: src/prefs_account_dialog.c:989 src/prefs_account_dialog.c:1148
-#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2753
+#: src/prefs_common_dialog.c:947 src/prefs_common_dialog.c:2754
 msgid "Automatic"
 msgstr "自动"
 
@@ -4493,8 +4493,8 @@ msgstr "生成邮件标识"
 msgid "Add user-defined header"
 msgstr "添加用户定义的头域"
 
-#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1728
-#: src/prefs_common_dialog.c:1755
+#: src/prefs_account_dialog.c:1105 src/prefs_common_dialog.c:1729
+#: src/prefs_common_dialog.c:1756
 msgid " Edit... "
 msgstr " 编辑... "
 
@@ -4875,8 +4875,8 @@ msgstr "合并邮件后更新所有的本地文件夹"
 msgid "Execute command when new messages arrived"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2562
-#: src/prefs_common_dialog.c:2584 src/prefs_common_dialog.c:2606
+#: src/prefs_common_dialog.c:834 src/prefs_common_dialog.c:2563
+#: src/prefs_common_dialog.c:2585 src/prefs_common_dialog.c:2607
 msgid "Command"
 msgstr "命令"
 
@@ -4986,7 +4986,7 @@ msgid "Inherit recipients on reply to self messages"
 msgstr ""
 
 #. editor
-#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2525
+#: src/prefs_common_dialog.c:1145 src/prefs_common_dialog.c:2526
 #: src/prefs_toolbar.c:120
 msgid "Editor"
 msgstr "编辑器"
@@ -5076,65 +5076,65 @@ msgstr "在文件夹名后显示未读邮件的数量"
 msgid "Displaying message number columns in the folder view:"
 msgstr "在文件夹名后显示未读邮件的数量"
 
-#: src/prefs_common_dialog.c:1549
+#: src/prefs_common_dialog.c:1550
 msgid "Abbreviate newsgroups longer than"
 msgstr "缩写新闻组长于"
 
-#: src/prefs_common_dialog.c:1564
+#: src/prefs_common_dialog.c:1565
 msgid "letters"
 msgstr "信件"
 
 #. ---- Summary ----
-#: src/prefs_common_dialog.c:1570
+#: src/prefs_common_dialog.c:1571
 msgid "Summary View"
 msgstr "摘要视图"
 
-#: src/prefs_common_dialog.c:1579
+#: src/prefs_common_dialog.c:1580
 msgid "Display recipient on `From' column if sender is yourself"
 msgstr "如果发件人是您自己，“发件人”栏中显示的是收件人"
 
-#: src/prefs_common_dialog.c:1581
+#: src/prefs_common_dialog.c:1582
 msgid "Expand threads"
 msgstr "展开线索"
 
-#: src/prefs_common_dialog.c:1589 src/prefs_common_dialog.c:2996
-#: src/prefs_common_dialog.c:3034
+#: src/prefs_common_dialog.c:1590 src/prefs_common_dialog.c:2997
+#: src/prefs_common_dialog.c:3035
 msgid "Date format"
 msgstr "日期格式"
 
-#: src/prefs_common_dialog.c:1610
+#: src/prefs_common_dialog.c:1611
 msgid " Set display item of summary... "
 msgstr " 设置摘要中显示的项... "
 
-#: src/prefs_common_dialog.c:1616
+#: src/prefs_common_dialog.c:1617
 msgid "Message"
 msgstr "邮件"
 
-#: src/prefs_common_dialog.c:1626
+#: src/prefs_common_dialog.c:1627
 #, fuzzy
 msgid "Default character encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/prefs_common_dialog.c:1640
+#: src/prefs_common_dialog.c:1641
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
 
-#: src/prefs_common_dialog.c:1646
+#: src/prefs_common_dialog.c:1647
 #, fuzzy
 msgid "Outgoing character encoding"
 msgstr "/查看(_V)/字符编码(_E)"
 
-#: src/prefs_common_dialog.c:1660
+#: src/prefs_common_dialog.c:1661
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr "如果选择“自动”，将使用最适合当前区域设置的编码方式。"
 
-#: src/prefs_common_dialog.c:1724
+#: src/prefs_common_dialog.c:1725
 msgid "Enable coloration of message"
 msgstr "启用邮件的颜色表示"
 
-#: src/prefs_common_dialog.c:1739
+#: src/prefs_common_dialog.c:1740
 msgid ""
 "Display multi-byte alphabet and numeric as\n"
 "ASCII character (Japanese only)"
@@ -5142,610 +5142,610 @@ msgstr ""
 "用单字节字符显示多字节字母和数字\n"
 "(仅适用于日语)"
 
-#: src/prefs_common_dialog.c:1746
+#: src/prefs_common_dialog.c:1747
 msgid "Display header pane above message view"
 msgstr "在邮件视图之上显示邮件头面板"
 
-#: src/prefs_common_dialog.c:1753
+#: src/prefs_common_dialog.c:1754
 msgid "Display short headers on message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common_dialog.c:1765
+#: src/prefs_common_dialog.c:1766
 msgid "Render HTML messages as text"
 msgstr "将HTML内容显示为文本"
 
-#: src/prefs_common_dialog.c:1767
+#: src/prefs_common_dialog.c:1768
 #, fuzzy
 msgid "Treat HTML only messages as attachment"
 msgstr "将HTML内容显示为文本"
 
-#: src/prefs_common_dialog.c:1771
+#: src/prefs_common_dialog.c:1772
 #, fuzzy
 msgid "Display cursor in message view"
 msgstr "在邮件视图中显示简短的邮件头"
 
-#: src/prefs_common_dialog.c:1784
+#: src/prefs_common_dialog.c:1785
 msgid "Line space"
 msgstr "邮件内容行间距"
 
-#: src/prefs_common_dialog.c:1798 src/prefs_common_dialog.c:1836
+#: src/prefs_common_dialog.c:1799 src/prefs_common_dialog.c:1837
 msgid "pixel(s)"
 msgstr "个像素"
 
-#: src/prefs_common_dialog.c:1803
+#: src/prefs_common_dialog.c:1804
 msgid "Scroll"
 msgstr "滚动"
 
-#: src/prefs_common_dialog.c:1810
+#: src/prefs_common_dialog.c:1811
 msgid "Half page"
 msgstr "半页滚动"
 
-#: src/prefs_common_dialog.c:1816
+#: src/prefs_common_dialog.c:1817
 msgid "Smooth scroll"
 msgstr "平滑滚动"
 
-#: src/prefs_common_dialog.c:1822
+#: src/prefs_common_dialog.c:1823
 msgid "Step"
 msgstr "每次滚动"
 
-#: src/prefs_common_dialog.c:1842
+#: src/prefs_common_dialog.c:1843
 msgid "Images"
 msgstr "图像"
 
-#: src/prefs_common_dialog.c:1850
+#: src/prefs_common_dialog.c:1851
 msgid "Resize attached large images to fit in the window"
 msgstr "将附件中的图像缩放至适合窗口大小"
 
-#: src/prefs_common_dialog.c:1852
+#: src/prefs_common_dialog.c:1853
 msgid "Display images as inline"
 msgstr "嵌入显示图像"
 
-#: src/prefs_common_dialog.c:1938
+#: src/prefs_common_dialog.c:1939
 #, fuzzy
 msgid "Enable Junk mail control"
 msgstr "文件夹："
 
-#: src/prefs_common_dialog.c:1950
+#: src/prefs_common_dialog.c:1951
 #, fuzzy
 msgid "Learning command:"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:1959
+#: src/prefs_common_dialog.c:1960
 #, fuzzy
 msgid "(Select preset)"
 msgstr "选择密钥"
 
-#: src/prefs_common_dialog.c:1984
+#: src/prefs_common_dialog.c:1985
 msgid "Not Junk"
 msgstr ""
 
-#: src/prefs_common_dialog.c:1999
+#: src/prefs_common_dialog.c:2000
 #, fuzzy
 msgid "Classifying command"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:2010
+#: src/prefs_common_dialog.c:2011
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2020
+#: src/prefs_common_dialog.c:2021
 #, fuzzy
 msgid "Junk folder"
 msgstr "文件夹："
 
-#: src/prefs_common_dialog.c:2038
+#: src/prefs_common_dialog.c:2039
 #, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
 msgstr "(没有过滤的邮件会保存在该文件夹中)"
 
-#: src/prefs_common_dialog.c:2049
+#: src/prefs_common_dialog.c:2050
 #, fuzzy
 msgid "Filter messages classified as junk on receiving"
 msgstr "在接收邮件时进行过滤"
 
-#: src/prefs_common_dialog.c:2052
+#: src/prefs_common_dialog.c:2053
 #, fuzzy
 msgid "Filter junk mails before normal filtering"
 msgstr "从服务器上删除"
 
-#: src/prefs_common_dialog.c:2055
+#: src/prefs_common_dialog.c:2056
 #, fuzzy
 msgid "Delete junk mails from server on receiving"
 msgstr "从服务器上删除"
 
-#: src/prefs_common_dialog.c:2060
+#: src/prefs_common_dialog.c:2061
 msgid "Mark filtered junk mails as read"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_common_dialog.c:2103
 msgid "Automatically check signatures"
 msgstr "自动检查签名"
 
-#: src/prefs_common_dialog.c:2105
+#: src/prefs_common_dialog.c:2106
 msgid "Show signature check result in a popup window"
 msgstr "在弹出窗口中显示签名检查结果"
 
-#: src/prefs_common_dialog.c:2108
+#: src/prefs_common_dialog.c:2109
 msgid "Store passphrase in memory temporarily"
 msgstr "将口令串临时存放在内存中"
 
-#: src/prefs_common_dialog.c:2123
+#: src/prefs_common_dialog.c:2124
 msgid "Expired after"
 msgstr "过期时间"
 
-#: src/prefs_common_dialog.c:2136
+#: src/prefs_common_dialog.c:2137
 msgid "minute(s) "
 msgstr "分钟后"
 
-#: src/prefs_common_dialog.c:2150
+#: src/prefs_common_dialog.c:2151
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr "设置为“0”将在整个会话过程中储存口令串"
 
-#: src/prefs_common_dialog.c:2159
+#: src/prefs_common_dialog.c:2160
 msgid "Grab input while entering a passphrase"
 msgstr "输入口令串时捕获输入(更安全)"
 
-#: src/prefs_common_dialog.c:2164
+#: src/prefs_common_dialog.c:2165
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "如果 GnuPG 无法工作，在启动时显示警告"
 
-#: src/prefs_common_dialog.c:2234
+#: src/prefs_common_dialog.c:2235
 msgid "Always open messages in summary when selected"
 msgstr "在摘要窗口中选择邮件时打开邮件"
 
-#: src/prefs_common_dialog.c:2238
+#: src/prefs_common_dialog.c:2239
 #, fuzzy
 msgid "Open first unread message when a folder is opened"
 msgstr "进入文件夹时打开第一个未读的邮件"
 
-#: src/prefs_common_dialog.c:2245
+#: src/prefs_common_dialog.c:2246
 #, fuzzy
 msgid "Remember last selected message"
 msgstr "没有找到用颜色标注过的邮件"
 
-#: src/prefs_common_dialog.c:2249
+#: src/prefs_common_dialog.c:2250
 msgid "Only mark message as read when opened in new window"
 msgstr "仅在新窗口中打开邮件时标记邮件为已读"
 
-#: src/prefs_common_dialog.c:2253
+#: src/prefs_common_dialog.c:2254
 #, fuzzy
 msgid "Open inbox after receiving new mail"
 msgstr "收到新邮件时转到收件箱"
 
-#: src/prefs_common_dialog.c:2255
+#: src/prefs_common_dialog.c:2256
 #, fuzzy
 msgid "Open inbox on startup"
 msgstr "启动时检查新邮件"
 
-#: src/prefs_common_dialog.c:2263
+#: src/prefs_common_dialog.c:2264
 msgid "Execute immediately when moving or deleting messages"
 msgstr "当移动或删除邮件时立即执行"
 
-#: src/prefs_common_dialog.c:2275
+#: src/prefs_common_dialog.c:2276
 msgid "Messages will be marked until execution if this is turned off."
 msgstr "如果该选项关闭，标记邮件直到完成执行。"
 
-#: src/prefs_common_dialog.c:2284
+#: src/prefs_common_dialog.c:2285
 msgid "Make the order of buttons comply with GNOME HIG"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2287
+#: src/prefs_common_dialog.c:2288
 #, fuzzy
 msgid "Display tray icon"
 msgstr "显示姓名"
 
-#: src/prefs_common_dialog.c:2289
+#: src/prefs_common_dialog.c:2290
 msgid "Minimize to tray icon"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2291
+#: src/prefs_common_dialog.c:2292
 msgid "Toggle window on trayicon click"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2301
+#: src/prefs_common_dialog.c:2302
 msgid " Set key bindings... "
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common_dialog.c:2307 src/select-keys.c:337
+#: src/prefs_common_dialog.c:2308 src/select-keys.c:337
 msgid "Other"
 msgstr "其它"
 
-#: src/prefs_common_dialog.c:2311
+#: src/prefs_common_dialog.c:2312
 #, fuzzy
 msgid "External commands"
 msgstr "执行命令"
 
-#: src/prefs_common_dialog.c:2315
+#: src/prefs_common_dialog.c:2316
 #, fuzzy
 msgid "Update"
 msgstr "日期"
 
-#: src/prefs_common_dialog.c:2368
+#: src/prefs_common_dialog.c:2369
 msgid "Receive dialog"
 msgstr "收对话框"
 
-#: src/prefs_common_dialog.c:2378
+#: src/prefs_common_dialog.c:2379
 msgid "Show receive dialog"
 msgstr "显示接收对话框"
 
-#: src/prefs_common_dialog.c:2388
+#: src/prefs_common_dialog.c:2389
 msgid "Always"
 msgstr "总是"
 
-#: src/prefs_common_dialog.c:2389
+#: src/prefs_common_dialog.c:2390
 msgid "Only on manual receiving"
 msgstr "仅在手工接收时"
 
-#: src/prefs_common_dialog.c:2391
+#: src/prefs_common_dialog.c:2392
 msgid "Never"
 msgstr "从不"
 
-#: src/prefs_common_dialog.c:2396
+#: src/prefs_common_dialog.c:2397
 msgid "Don't popup error dialog on receive error"
 msgstr "在接收错误时不弹出错误对话框"
 
-#: src/prefs_common_dialog.c:2399
+#: src/prefs_common_dialog.c:2400
 msgid "Close receive dialog when finished"
 msgstr "完成后关闭接收对话框"
 
-#: src/prefs_common_dialog.c:2410
+#: src/prefs_common_dialog.c:2411
 msgid "Add address to destination when double-clicked"
 msgstr "双击时将地址添加为收件人"
 
-#: src/prefs_common_dialog.c:2412
+#: src/prefs_common_dialog.c:2413
 msgid "On exit"
 msgstr "退出程序时"
 
-#: src/prefs_common_dialog.c:2420
+#: src/prefs_common_dialog.c:2421
 msgid "Confirm on exit"
 msgstr "退出时进行确认"
 
-#: src/prefs_common_dialog.c:2427
+#: src/prefs_common_dialog.c:2428
 msgid "Empty trash on exit"
 msgstr "退出时清空废件箱"
 
-#: src/prefs_common_dialog.c:2429
+#: src/prefs_common_dialog.c:2430
 msgid "Ask before emptying"
 msgstr "在清空前询问"
 
-#: src/prefs_common_dialog.c:2433
+#: src/prefs_common_dialog.c:2434
 msgid "Warn if there are queued messages"
 msgstr "如果队列中有邮件就发出警告"
 
-#: src/prefs_common_dialog.c:2488
+#: src/prefs_common_dialog.c:2489
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
 msgstr "外部命令 (%s 将被替换为文件名或URI)"
 
-#: src/prefs_common_dialog.c:2497
+#: src/prefs_common_dialog.c:2498
 msgid "Web browser"
 msgstr "网页浏览器"
 
-#: src/prefs_common_dialog.c:2509 src/prefs_common_dialog.c:4009
-#: src/prefs_common_dialog.c:4030
+#: src/prefs_common_dialog.c:2510 src/prefs_common_dialog.c:4010
+#: src/prefs_common_dialog.c:4031
 #, fuzzy
 msgid "(Default browser)"
 msgstr "默认收件箱"
 
-#: src/prefs_common_dialog.c:2550
+#: src/prefs_common_dialog.c:2551
 #, fuzzy
 msgid "Use external program for printing"
 msgstr "使用外部程序发送"
 
-#: src/prefs_common_dialog.c:2572
+#: src/prefs_common_dialog.c:2573
 msgid "Use external program for incorporation"
 msgstr "使用外部程序合并邮件"
 
-#: src/prefs_common_dialog.c:2594
+#: src/prefs_common_dialog.c:2595
 msgid "Use external program for sending"
 msgstr "使用外部程序发送"
 
-#: src/prefs_common_dialog.c:2645
+#: src/prefs_common_dialog.c:2646
 msgid "Update check requires 'curl' command."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2656
+#: src/prefs_common_dialog.c:2657
 msgid "Enable auto update check"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2658
+#: src/prefs_common_dialog.c:2659
 msgid "Use HTTP proxy"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2660
+#: src/prefs_common_dialog.c:2661
 msgid "HTTP proxy host (hostname:port):"
 msgstr ""
 
-#: src/prefs_common_dialog.c:2700
+#: src/prefs_common_dialog.c:2701
 #, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/prefs_common_dialog.c:2703
+#: src/prefs_common_dialog.c:2704
 msgid ""
 "Enable this if the contents of folders have the possibility of modification "
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
 
-#: src/prefs_common_dialog.c:2710
+#: src/prefs_common_dialog.c:2711
 msgid "Socket I/O timeout:"
 msgstr "套接字 I/O 超时："
 
-#: src/prefs_common_dialog.c:2723
+#: src/prefs_common_dialog.c:2724
 msgid "second(s)"
 msgstr "秒"
 
-#: src/prefs_common_dialog.c:2751
+#: src/prefs_common_dialog.c:2752
 msgid "Automatic (Recommended)"
 msgstr "自动 (建议使用)"
 
-#: src/prefs_common_dialog.c:2756
+#: src/prefs_common_dialog.c:2757
 msgid "7bit ascii (US-ASCII)"
 msgstr "7位 ASCII (US-ASCII) "
 
-#: src/prefs_common_dialog.c:2758
+#: src/prefs_common_dialog.c:2759
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: src/prefs_common_dialog.c:2760
+#: src/prefs_common_dialog.c:2761
 msgid "Western European (ISO-8859-1)"
 msgstr "西欧 (ISO-8859-1)"
 
-#: src/prefs_common_dialog.c:2761
+#: src/prefs_common_dialog.c:2762
 msgid "Western European (ISO-8859-15)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2763
+#: src/prefs_common_dialog.c:2764
 #, fuzzy
 msgid "Western European (Windows-1252)"
 msgstr "西欧 (ISO-8859-15)"
 
-#: src/prefs_common_dialog.c:2767
+#: src/prefs_common_dialog.c:2768
 msgid "Central European (ISO-8859-2)"
 msgstr "中欧 (ISO-8859-2)"
 
-#: src/prefs_common_dialog.c:2769
+#: src/prefs_common_dialog.c:2770
 msgid "Baltic (ISO-8859-13)"
 msgstr "波罗的语 (ISO-8859-13)"
 
-#: src/prefs_common_dialog.c:2770
+#: src/prefs_common_dialog.c:2771
 msgid "Baltic (ISO-8859-4)"
 msgstr "波罗的语 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2771
+#: src/prefs_common_dialog.c:2772
 #, fuzzy
 msgid "Baltic (Windows-1257)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2773
+#: src/prefs_common_dialog.c:2774
 msgid "Greek (ISO-8859-7)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2775
+#: src/prefs_common_dialog.c:2776
 #, fuzzy
 msgid "Arabic (ISO-8859-6)"
 msgstr "波罗的语 (ISO-8859-4)"
 
-#: src/prefs_common_dialog.c:2776
+#: src/prefs_common_dialog.c:2777
 #, fuzzy
 msgid "Arabic (Windows-1256)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2778
+#: src/prefs_common_dialog.c:2779
 #, fuzzy
 msgid "Hebrew (ISO-8859-8)"
 msgstr "希腊语 (ISO-8859-7)"
 
-#: src/prefs_common_dialog.c:2779
+#: src/prefs_common_dialog.c:2780
 #, fuzzy
 msgid "Hebrew (Windows-1255)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2781
+#: src/prefs_common_dialog.c:2782
 msgid "Turkish (ISO-8859-9)"
 msgstr "土耳其语 (ISO-8859-9)"
 
-#: src/prefs_common_dialog.c:2783
+#: src/prefs_common_dialog.c:2784
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "斯拉夫语 (ISO-8859-5)"
 
-#: src/prefs_common_dialog.c:2784
+#: src/prefs_common_dialog.c:2785
 msgid "Cyrillic (KOI8-R)"
 msgstr "斯拉夫语 (KOI8-R)"
 
-#: src/prefs_common_dialog.c:2785
+#: src/prefs_common_dialog.c:2786
 msgid "Cyrillic (KOI8-U)"
 msgstr "斯拉夫语 (KOI8-U)"
 
-#: src/prefs_common_dialog.c:2786
+#: src/prefs_common_dialog.c:2787
 msgid "Cyrillic (Windows-1251)"
 msgstr "斯拉夫语 (Windows-1251)"
 
-#: src/prefs_common_dialog.c:2788
+#: src/prefs_common_dialog.c:2789
 msgid "Japanese (ISO-2022-JP)"
 msgstr "日语 (ISO-2022-JP)"
 
-#: src/prefs_common_dialog.c:2790
+#: src/prefs_common_dialog.c:2791
 msgid "Japanese (EUC-JP)"
 msgstr "日语 (EUC-JP)"
 
-#: src/prefs_common_dialog.c:2791
+#: src/prefs_common_dialog.c:2792
 msgid "Japanese (Shift_JIS)"
 msgstr "日语 (Shift_JIS)"
 
-#: src/prefs_common_dialog.c:2794
+#: src/prefs_common_dialog.c:2795
 msgid "Simplified Chinese (GB2312)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2795
+#: src/prefs_common_dialog.c:2796
 #, fuzzy
 msgid "Simplified Chinese (GBK)"
 msgstr "简体中文 (GB2312)"
 
-#: src/prefs_common_dialog.c:2796
+#: src/prefs_common_dialog.c:2797
 msgid "Traditional Chinese (Big5)"
 msgstr "繁体中文 (Big5)"
 
-#: src/prefs_common_dialog.c:2798
+#: src/prefs_common_dialog.c:2799
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "繁体中文 (EUC-TW)"
 
-#: src/prefs_common_dialog.c:2799
+#: src/prefs_common_dialog.c:2800
 msgid "Chinese (ISO-2022-CN)"
 msgstr "中文 (ISO-2022-CN)"
 
-#: src/prefs_common_dialog.c:2802
+#: src/prefs_common_dialog.c:2803
 msgid "Korean (EUC-KR)"
 msgstr "朝鲜文 (EUC-KR)"
 
-#: src/prefs_common_dialog.c:2804
+#: src/prefs_common_dialog.c:2805
 msgid "Thai (TIS-620)"
 msgstr "泰文 (TIS-620)"
 
-#: src/prefs_common_dialog.c:2805
+#: src/prefs_common_dialog.c:2806
 msgid "Thai (Windows-874)"
 msgstr "泰文 (Windows-874)"
 
-#: src/prefs_common_dialog.c:2972
+#: src/prefs_common_dialog.c:2973
 msgid "the full abbreviated weekday name"
 msgstr "缩写的星期名"
 
-#: src/prefs_common_dialog.c:2973
+#: src/prefs_common_dialog.c:2974
 msgid "the full weekday name"
 msgstr "完整的星期名"
 
-#: src/prefs_common_dialog.c:2974
+#: src/prefs_common_dialog.c:2975
 msgid "the abbreviated month name"
 msgstr "缩写的月份名"
 
-#: src/prefs_common_dialog.c:2975
+#: src/prefs_common_dialog.c:2976
 msgid "the full month name"
 msgstr "完整的月份名"
 
-#: src/prefs_common_dialog.c:2976
+#: src/prefs_common_dialog.c:2977
 msgid "the preferred date and time for the current locale"
 msgstr "当前区域设置首选的日期和时间格式"
 
-#: src/prefs_common_dialog.c:2977
+#: src/prefs_common_dialog.c:2978
 msgid "the century number (year/100)"
 msgstr "世纪(年份/100)"
 
-#: src/prefs_common_dialog.c:2978
+#: src/prefs_common_dialog.c:2979
 msgid "the day of the month as a decimal number"
 msgstr "十进制表示的月中的天数"
 
-#: src/prefs_common_dialog.c:2979
+#: src/prefs_common_dialog.c:2980
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "24小时时钟的十进制小时"
 
-#: src/prefs_common_dialog.c:2980
+#: src/prefs_common_dialog.c:2981
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "12小时时钟的十进制小时"
 
-#: src/prefs_common_dialog.c:2981
+#: src/prefs_common_dialog.c:2982
 msgid "the day of the year as a decimal number"
 msgstr "十进制表示的一年中的天数"
 
-#: src/prefs_common_dialog.c:2982
+#: src/prefs_common_dialog.c:2983
 msgid "the month as a decimal number"
 msgstr "十进制表示的月份"
 
-#: src/prefs_common_dialog.c:2983
+#: src/prefs_common_dialog.c:2984
 msgid "the minute as a decimal number"
 msgstr "十进制表示的天数"
 
-#: src/prefs_common_dialog.c:2984
+#: src/prefs_common_dialog.c:2985
 msgid "either AM or PM"
 msgstr "AM或PM"
 
-#: src/prefs_common_dialog.c:2985
+#: src/prefs_common_dialog.c:2986
 msgid "the second as a decimal number"
 msgstr "十进制表示的秒"
 
-#: src/prefs_common_dialog.c:2986
+#: src/prefs_common_dialog.c:2987
 msgid "the day of the week as a decimal number"
 msgstr "十进制表示的星期中的天数"
 
-#: src/prefs_common_dialog.c:2987
+#: src/prefs_common_dialog.c:2988
 msgid "the preferred date for the current locale"
 msgstr "当前区域设置的首选日期格式"
 
-#: src/prefs_common_dialog.c:2988
+#: src/prefs_common_dialog.c:2989
 msgid "the last two digits of a year"
 msgstr "年份的最后两个数字"
 
-#: src/prefs_common_dialog.c:2989
+#: src/prefs_common_dialog.c:2990
 msgid "the year as a decimal number"
 msgstr "十进制的年份"
 
-#: src/prefs_common_dialog.c:2990
+#: src/prefs_common_dialog.c:2991
 msgid "the time zone or name or abbreviation"
 msgstr "时区、名字或缩写"
 
-#: src/prefs_common_dialog.c:3011
+#: src/prefs_common_dialog.c:3012
 msgid "Specifier"
 msgstr "说明符"
 
-#: src/prefs_common_dialog.c:3012
+#: src/prefs_common_dialog.c:3013
 msgid "Description"
 msgstr "描述"
 
-#: src/prefs_common_dialog.c:3052
+#: src/prefs_common_dialog.c:3053
 msgid "Example"
 msgstr "示例"
 
-#: src/prefs_common_dialog.c:3133
+#: src/prefs_common_dialog.c:3134
 msgid "Set message colors"
 msgstr "设置邮件颜色"
 
-#: src/prefs_common_dialog.c:3141
+#: src/prefs_common_dialog.c:3142
 msgid "Colors"
 msgstr "颜色"
 
-#: src/prefs_common_dialog.c:3175
+#: src/prefs_common_dialog.c:3176
 msgid "Quoted Text - First Level"
 msgstr "引文－第一级"
 
-#: src/prefs_common_dialog.c:3181
+#: src/prefs_common_dialog.c:3182
 msgid "Quoted Text - Second Level"
 msgstr "引文－第二级"
 
-#: src/prefs_common_dialog.c:3187
+#: src/prefs_common_dialog.c:3188
 msgid "Quoted Text - Third Level"
 msgstr "引文－第三级"
 
-#: src/prefs_common_dialog.c:3193
+#: src/prefs_common_dialog.c:3194
 msgid "URI link"
 msgstr "URI 链接"
 
-#: src/prefs_common_dialog.c:3200
+#: src/prefs_common_dialog.c:3201
 msgid "Recycle quote colors"
 msgstr "循环使用引文颜色"
 
-#: src/prefs_common_dialog.c:3267
+#: src/prefs_common_dialog.c:3268
 msgid "Pick color for quotation level 1"
 msgstr "选择引文级别 1 的颜色"
 
-#: src/prefs_common_dialog.c:3270
+#: src/prefs_common_dialog.c:3271
 msgid "Pick color for quotation level 2"
 msgstr "选择引文级别 2 的颜色"
 
-#: src/prefs_common_dialog.c:3273
+#: src/prefs_common_dialog.c:3274
 msgid "Pick color for quotation level 3"
 msgstr "选择引文级别 3 的颜色"
 
-#: src/prefs_common_dialog.c:3276
+#: src/prefs_common_dialog.c:3277
 msgid "Pick color for URI"
 msgstr "选择URI的颜色"
 
-#: src/prefs_common_dialog.c:3416
+#: src/prefs_common_dialog.c:3417
 msgid "Description of symbols"
 msgstr "符号的描述"
 
-#: src/prefs_common_dialog.c:3472
+#: src/prefs_common_dialog.c:3473
 msgid ""
 "Date\n"
 "From\n"
@@ -5769,11 +5769,11 @@ msgstr ""
 "新闻组\n"
 "邮件标识号"
 
-#: src/prefs_common_dialog.c:3485
+#: src/prefs_common_dialog.c:3486
 msgid "If x is set, displays expr"
 msgstr "如果 x 设置了值则显示 expr"
 
-#: src/prefs_common_dialog.c:3489
+#: src/prefs_common_dialog.c:3490
 msgid ""
 "Message body\n"
 "Quoted message body\n"
@@ -5787,7 +5787,7 @@ msgstr ""
 "没有签名的引文内容\n"
 "%"
 
-#: src/prefs_common_dialog.c:3497
+#: src/prefs_common_dialog.c:3498
 msgid ""
 "Literal backslash\n"
 "Literal question mark\n"
@@ -5799,20 +5799,20 @@ msgstr ""
 "左括号\n"
 "右括号"
 
-#: src/prefs_common_dialog.c:3551
+#: src/prefs_common_dialog.c:3552
 msgid "Key bindings"
 msgstr "键盘关联"
 
-#: src/prefs_common_dialog.c:3564
+#: src/prefs_common_dialog.c:3565
 #, fuzzy
 msgid "Select the preset of key bindings."
 msgstr " 设置键盘关联... "
 
-#: src/prefs_common_dialog.c:3574 src/prefs_common_dialog.c:3898
+#: src/prefs_common_dialog.c:3575 src/prefs_common_dialog.c:3899
 msgid "Default"
 msgstr "默认"
 
-#: src/prefs_common_dialog.c:3577 src/prefs_common_dialog.c:3907
+#: src/prefs_common_dialog.c:3578 src/prefs_common_dialog.c:3908
 msgid "Old Sylpheed"
 msgstr "旧式的Sylpheed"
 
@@ -6866,18 +6866,47 @@ msgstr "无法连接SMTP服务器：%s:%d\n"
 msgid "Can't connect to SMTP server: %s:%d"
 msgstr "无法连接SMTP服务器：%s:%d\n"
 
-#: src/setup.c:43
+#: src/setup.c:82 src/setup.c:106
 msgid "Mailbox setting"
 msgstr "信箱设置"
 
-#: src/setup.c:44
+#: src/setup.c:125
+msgid "This dialog will make initial setup of mailbox."
+msgstr ""
+
+#: src/setup.c:138
 #, fuzzy
+msgid "Create mailbox at the following default location:"
+msgstr "执行下列动作："
+
+#: src/setup.c:154
 msgid ""
-"Specify the location of mailbox.\n"
-"If you are unsure, just select OK."
+"Create mailbox at the following location:\n"
+"(enter folder name or full folder path)"
 msgstr ""
-"输入邮箱位置。\n"
-"如果指定了已存在的邮箱，它将被自动扫描。"
+
+#: src/setup.c:172
+msgid ""
+"If you want to add a mailbox at another location afterward, please select "
+"'File - Mailbox - Add mailbox...' in the menu."
+msgstr ""
+
+#: src/setup.c:205
+msgid "Cancel"
+msgstr "取消"
+
+#: src/setup.c:205
+msgid "Continue without creating mailbox?"
+msgstr ""
+
+#: src/setup.c:215
+msgid "Please input folder name or full folder path."
+msgstr ""
+
+#: src/setup.c:223
+#, fuzzy, c-format
+msgid "The mailbox '%s' already exists."
+msgstr "邮箱“%s”已经存在。"
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -7546,6 +7575,14 @@ msgstr "另外一个 Sylpheed 正在运行。\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "Specify the location of mailbox.\n"
+#~ "If you are unsure, just select OK."
+#~ msgstr ""
+#~ "输入邮箱位置。\n"
+#~ "如果指定了已存在的邮箱，它将被自动扫描。"
+
 #~ msgid "Lookup"
 #~ msgstr "查找"
 
@@ -7892,9 +7929,6 @@ msgstr ""
 #~ msgid "OK"
 #~ msgstr "确定"
 
-#~ msgid "Cancel"
-#~ msgstr "取消"
-
 #~ msgid "Refresh"
 #~ msgstr "刷新"