added message label to the folder selection dialog.

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

1 files changed, 82 insertions, 67 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 07d29909..61b5d560 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-11-20 11:38+0900\n"
+"POT-Creation-Date: 2008-11-25 15:13+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"
@@ -314,7 +314,7 @@ msgstr "源文件夹与目的文件夹是同一个。\n"
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:1002 libsylph/mh.c:1015 src/main.c:160
+#: libsylph/mh.c:1002 libsylph/mh.c:1015 src/main.c:161
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -1205,11 +1205,11 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:740
+#: src/alertpanel.c:142 src/compose.c:6438 src/main.c:741
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:155 src/main.c:857
+#: src/alertpanel.c:155 src/main.c:858
 msgid "Warning"
 msgstr "警告"
 
@@ -1256,7 +1256,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4940
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4942
 msgid "None"
 msgstr "没有"
 
@@ -1791,7 +1791,7 @@ msgstr "MIME 类型"
 #. S_COL_DATE
 #: src/compose.c:5100 src/mimeview.c:217 src/prefs_filter_edit.c:503
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5089
+#: src/summaryview.c:5091
 msgid "Size"
 msgstr "大小"
 
@@ -2038,12 +2038,12 @@ msgstr "编辑文件夹"
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:540 src/foldersel.c:553 src/folderview.c:2234
+#: src/editgroup.c:540 src/foldersel.c:576 src/folderview.c:2234
 #: src/folderview.c:2240
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:541 src/foldersel.c:554 src/folderview.c:2241
+#: src/editgroup.c:541 src/foldersel.c:577 src/folderview.c:2241
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -2208,46 +2208,46 @@ msgstr ""
 msgid "Select directory"
 msgstr "邮件池目录"
 
-#: src/foldersel.c:232
+#: src/foldersel.c:250
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: src/foldersel.c:365 src/folderview.c:1215 src/prefs_folder_item.c:235
+#: src/foldersel.c:388 src/folderview.c:1215 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "收件箱"
 
-#: src/foldersel.c:369 src/folderview.c:1221 src/prefs_folder_item.c:236
+#: src/foldersel.c:392 src/folderview.c:1221 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "已发送"
 
-#: src/foldersel.c:373 src/folderview.c:1227 src/prefs_folder_item.c:238
+#: src/foldersel.c:396 src/folderview.c:1227 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "队列"
 
-#: src/foldersel.c:377 src/folderview.c:1233 src/prefs_folder_item.c:239
+#: src/foldersel.c:400 src/folderview.c:1233 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "废件箱"
 
-#: src/foldersel.c:381 src/folderview.c:1239 src/prefs_folder_item.c:237
+#: src/foldersel.c:404 src/folderview.c:1239 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿箱"
 
-#: src/foldersel.c:555 src/folderview.c:2238 src/folderview.c:2242
+#: src/foldersel.c:578 src/folderview.c:2238 src/folderview.c:2242
 msgid "NewFolder"
 msgstr "新文件夹"
 
-#: src/foldersel.c:563 src/folderview.c:2250 src/folderview.c:2311
+#: src/foldersel.c:586 src/folderview.c:2250 src/folderview.c:2311
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
-#: src/foldersel.c:573 src/folderview.c:2260 src/folderview.c:2319
+#: src/foldersel.c:596 src/folderview.c:2260 src/folderview.c:2319
 #: src/query_search.c:1052
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
 
-#: src/foldersel.c:581 src/folderview.c:2267
+#: src/foldersel.c:604 src/folderview.c:2267
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "无法创建文件夹“%s”。"
@@ -2337,12 +2337,12 @@ msgstr "正在设置文件夹信息...\n"
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:882 src/mainwindow.c:4026 src/setup.c:80
+#: src/folderview.c:882 src/mainwindow.c:4027 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:886 src/mainwindow.c:4031 src/setup.c:85
+#: src/folderview.c:886 src/mainwindow.c:4032 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
@@ -2837,7 +2837,7 @@ msgstr "正在退出"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4501
+#: src/inc.c:1203 src/inc.c:1223 src/summaryview.c:4503
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -2930,20 +2930,20 @@ msgstr "输入密码"
 msgid "Protocol log"
 msgstr "协议记录"
 
-#: src/main.c:215
+#: src/main.c:216
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib 不支持 g_thread。\n"
 
-#: src/main.c:517
+#: src/main.c:518
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/main.c:520
+#: src/main.c:521
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    打开撰写窗口"
 
-#: src/main.c:521
+#: src/main.c:522
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -2952,23 +2952,23 @@ msgstr ""
 "  --attach 文件1 [文件2]...\n"
 "                         打开撰写窗口并添加指定的附件"
 
-#: src/main.c:524
+#: src/main.c:525
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 
-#: src/main.c:525
+#: src/main.c:526
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 
-#: src/main.c:526
+#: src/main.c:527
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送队列中的邮件"
 
-#: src/main.c:527
+#: src/main.c:528
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [文件夹]...   显示邮件总数"
 
-#: src/main.c:528
+#: src/main.c:529
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -2976,49 +2976,49 @@ msgstr ""
 "  --status-full [文件夹]...\n"
 "                         显示每个文件夹的状态"
 
-#: src/main.c:530
+#: src/main.c:531
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:531
+#: src/main.c:532
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:533
+#: src/main.c:534
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:535
+#: src/main.c:536
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:536
+#: src/main.c:537
 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:537
+#: src/main.c:538
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 显示该帮助并退出"
 
-#: src/main.c:538
+#: src/main.c:539
 msgid "  --version              output version information and exit"
 msgstr "  --version              输出版本信息并退出"
 
-#: src/main.c:542
+#: src/main.c:543
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "或按下“y”键。\n"
 "\n"
 
-#: src/main.c:684
+#: src/main.c:685
 #, fuzzy
 msgid "Filename encoding"
 msgstr "发送时使用的字符编码"
 
-#: src/main.c:685
+#: src/main.c:686
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3032,19 +3032,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:741
+#: src/main.c:742
 msgid "Composing message exists. Really quit?"
 msgstr "正在撰写邮件。真的要退出吗？"
 
-#: src/main.c:752
+#: src/main.c:753
 msgid "Queued messages"
 msgstr "队列中的邮件"
 
-#: src/main.c:753
+#: src/main.c:754
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "一些未发送的信件被放入队列。现在退出吗？"
 
-#: src/main.c:858
+#: src/main.c:859
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3053,15 +3053,15 @@ msgstr ""
 "已禁用 OpenPGP 支持。"
 
 #. remote command mode
-#: src/main.c:1134
+#: src/main.c:1135
 msgid "another Sylpheed is already running.\n"
 msgstr "另外一个 Sylpheed 正在运行。\n"
 
-#: src/main.c:1404
+#: src/main.c:1405
 msgid "Migration of configuration"
 msgstr "正在迁移配置"
 
-#: src/main.c:1405
+#: src/main.c:1406
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3718,7 +3718,7 @@ msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
 #: src/mainwindow.c:1189 src/summaryview.c:2423 src/summaryview.c:2508
-#: src/summaryview.c:4066 src/summaryview.c:4195 src/summaryview.c:4572
+#: src/summaryview.c:4068 src/summaryview.c:4197 src/summaryview.c:4574
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3854,17 +3854,22 @@ msgstr "退出"
 msgid "Exit this program?"
 msgstr "要退出本程序吗？"
 
-#: src/mainwindow.c:3942
+#: src/mainwindow.c:3793
+#, fuzzy
+msgid "Select folder to open"
+msgstr "选择文件夹"
+
+#: src/mainwindow.c:3943
 #, fuzzy
 msgid "Command line options"
 msgstr "没有设置命令行。"
 
-#: src/mainwindow.c:3955
+#: src/mainwindow.c:3956
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/mainwindow.c:3963
+#: src/mainwindow.c:3964
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3881,7 +3886,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:3980
+#: src/mainwindow.c:3981
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -3951,7 +3956,7 @@ msgstr "附件"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3624
+#: src/messageview.c:765 src/summaryview.c:3626
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
@@ -6008,19 +6013,19 @@ msgstr "附件"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5082
+#: src/summaryview.c:5084
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5085
+#: src/summaryview.c:5087
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5087
+#: src/summaryview.c:5089
 msgid "Date"
 msgstr "日期"
 
@@ -6030,7 +6035,7 @@ msgid "Number"
 msgstr "序号"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5093
+#: src/prefs_summary_column.c:74 src/summaryview.c:5095
 #, fuzzy
 msgid "To"
 msgstr "收件人："
@@ -6439,7 +6444,7 @@ msgstr "关于"
 msgid "%s - POP3 Remote mailbox"
 msgstr "删除邮箱"
 
-#: src/rpop3.c:414 src/summaryview.c:5091
+#: src/rpop3.c:414 src/summaryview.c:5093
 msgid "No."
 msgstr "No."
 
@@ -7154,41 +7159,51 @@ msgstr "邮件 %d 被设置为移到 %s\n"
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:3456
+#: src/summaryview.c:3427
+#, fuzzy
+msgid "Select folder to move"
+msgstr "选择文件夹"
+
+#: src/summaryview.c:3457
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:3487
+#: src/summaryview.c:3488
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:3667
+#: src/summaryview.c:3524
+#, fuzzy
+msgid "Select folder to copy"
+msgstr "选择文件夹"
+
+#: src/summaryview.c:3669
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:3973 src/summaryview.c:3974
+#: src/summaryview.c:3975 src/summaryview.c:3976
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:4124 src/summaryview.c:4125
+#: src/summaryview.c:4126 src/summaryview.c:4127
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:4418 src/summaryview.c:4479
+#: src/summaryview.c:4420 src/summaryview.c:4481
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4541
+#: src/summaryview.c:4543
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4542
+#: src/summaryview.c:4544
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4579
+#: src/summaryview.c:4581
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"