modified strings.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1602 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 13c713aa..793db8a2 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-04-06 14:35+0900\n"
+"POT-Creation-Date: 2007-04-10 11:34+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"
@@ -677,7 +677,7 @@ msgstr ""
 "按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
 "时会检查新邮件。"
 
-#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:517
+#: src/account_dialog.c:368 src/addressadd.c:177 src/addressbook.c:520
 #: src/compose.c:4480 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:271
 #: src/editldap.c:307 src/editvcard.c:184 src/mimeview.c:208
@@ -819,7 +819,7 @@ msgstr "将地址添加到地址簿"
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:197 src/addressbook.c:519 src/editaddress.c:629
+#: src/addressadd.c:197 src/addressbook.c:522 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:274
 msgid "Remarks"
 msgstr "注释"
@@ -828,29 +828,29 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressbook.c:349 src/compose.c:546 src/mainwindow.c:517
+#: src/addressbook.c:351 src/compose.c:546 src/mainwindow.c:517
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: src/addressbook.c:350
+#: src/addressbook.c:352
 msgid "/_File/New _Book"
 msgstr "/文件(_F)/新建地址簿(_B)"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:353
 msgid "/_File/New _vCard"
 msgstr "/文件(_F)/新建 vCard(_V)"
 
-#: src/addressbook.c:353
+#: src/addressbook.c:355
 msgid "/_File/New _JPilot"
 msgstr "/文件(_F)/新建 JPilot(_J)"
 
-#: src/addressbook.c:356
+#: src/addressbook.c:358
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:358 src/addressbook.c:361 src/compose.c:551
+#: src/addressbook.c:360 src/addressbook.c:363 src/compose.c:551
 #: src/compose.c:556 src/compose.c:559 src/compose.c:562 src/mainwindow.c:535
 #: src/mainwindow.c:538 src/mainwindow.c:540 src/mainwindow.c:542
 #: src/mainwindow.c:547 src/mainwindow.c:549 src/messageview.c:151
@@ -858,96 +858,101 @@ msgstr "/文件(_F)/新建服务器(_S)"
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
-#: src/addressbook.c:359
+#: src/addressbook.c:361
 msgid "/_File/_Edit"
 msgstr "/文件(_F)/编辑(_E)"
 
-#: src/addressbook.c:360
+#: src/addressbook.c:362
 msgid "/_File/_Delete"
 msgstr "/文件(_F)/删除(_D)"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:364
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:363 src/compose.c:563 src/messageview.c:157
+#: src/addressbook.c:365 src/compose.c:563 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
-#: src/addressbook.c:365 src/addressbook.c:404 src/addressbook.c:414
+#: src/addressbook.c:367 src/addressbook.c:407 src/addressbook.c:417
 #: src/compose.c:565 src/mainwindow.c:553 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:366 src/compose.c:570 src/mainwindow.c:554
+#: src/addressbook.c:368 src/compose.c:570 src/mainwindow.c:554
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/addressbook.c:367 src/compose.c:571
+#: src/addressbook.c:369 src/compose.c:571
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:369
+#: src/addressbook.c:371
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:372
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新建地址(_A)"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:373
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新建组(_G)"
 
-#: src/addressbook.c:372
+#: src/addressbook.c:374
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新建文件夹(_F)"
 
-#: src/addressbook.c:373
+#: src/addressbook.c:375
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:374
+#: src/addressbook.c:376
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:375
+#: src/addressbook.c:377
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:377 src/compose.c:681 src/mainwindow.c:795
+#: src/addressbook.c:379 src/compose.c:681 src/mainwindow.c:795
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:378
+#: src/addressbook.c:380
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:380 src/compose.c:702 src/mainwindow.c:849
+#: src/addressbook.c:381
+#, fuzzy
+msgid "/_Tools/Import _CSV file"
+msgstr "/工具(_T)/导入LDIF文件(_L)"
+
+#: src/addressbook.c:383 src/compose.c:702 src/mainwindow.c:849
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:381 src/compose.c:703 src/mainwindow.c:861
+#: src/addressbook.c:384 src/compose.c:703 src/mainwindow.c:861
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
-#: src/addressbook.c:400 src/addressbook.c:410
+#: src/addressbook.c:403 src/addressbook.c:413
 msgid "/New _Address"
 msgstr "/新建地址(_A)"
 
-#: src/addressbook.c:401 src/addressbook.c:411
+#: src/addressbook.c:404 src/addressbook.c:414
 msgid "/New _Group"
 msgstr "/新建组(_G)"
 
-#: src/addressbook.c:402 src/addressbook.c:412
+#: src/addressbook.c:405 src/addressbook.c:415
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:403 src/addressbook.c:413 src/addressbook.c:416
+#: src/addressbook.c:406 src/addressbook.c:416 src/addressbook.c:419
 #: src/compose.c:540 src/folderview.c:251 src/folderview.c:253
 #: src/folderview.c:258 src/folderview.c:260 src/folderview.c:273
 #: src/folderview.c:275 src/folderview.c:277 src/folderview.c:282
@@ -959,81 +964,81 @@ msgstr "/新建文件夹(_F)"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:405 src/addressbook.c:415 src/summaryview.c:468
+#: src/addressbook.c:408 src/addressbook.c:418 src/summaryview.c:468
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: src/addressbook.c:417
+#: src/addressbook.c:420
 #, fuzzy
 msgid "/_Copy"
 msgstr "/复制(_C)..."
 
-#: src/addressbook.c:418
+#: src/addressbook.c:421
 #, fuzzy
 msgid "/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:518
+#: src/addressbook.c:521
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:522 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
+#: src/addressbook.c:525 src/prefs_common_dialog.c:2274 src/prefs_toolbar.c:85
 msgid "Address book"
 msgstr "地址簿"
 
-#: src/addressbook.c:634 src/prefs_filter_edit.c:249
+#: src/addressbook.c:637 src/prefs_filter_edit.c:249
 #: src/prefs_search_folder.c:187
 msgid "Name:"
 msgstr "姓名："
 
-#: src/addressbook.c:671 src/headerview.c:55 src/prefs_folder_item.c:339
+#: src/addressbook.c:674 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:179
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:675 src/headerview.c:56 src/prefs_folder_item.c:356
+#: src/addressbook.c:678 src/headerview.c:56 src/prefs_folder_item.c:356
 #: src/prefs_template.c:181
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:679 src/prefs_folder_item.c:367 src/prefs_template.c:183
+#: src/addressbook.c:682 src/prefs_folder_item.c:367 src/prefs_template.c:183
 msgid "Bcc:"
 msgstr "密件抄送："
 
 #. Buttons
-#: src/addressbook.c:700 src/addressbook.c:1669 src/editaddress.c:719
+#: src/addressbook.c:703 src/addressbook.c:1672 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:60
 msgid "Delete"
 msgstr "删除"
 
-#: src/addressbook.c:703 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:706 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:1554
 msgid "Add"
 msgstr "添加"
 
-#: src/addressbook.c:706
+#: src/addressbook.c:709
 msgid "Lookup"
 msgstr "查找"
 
-#: src/addressbook.c:709
+#: src/addressbook.c:712
 #, fuzzy
 msgid "_Close"
 msgstr "关闭"
 
 #. Confirm deletion
-#: src/addressbook.c:879
+#: src/addressbook.c:882
 msgid "Delete address(es)"
 msgstr "删除地址"
 
-#: src/addressbook.c:880
+#: src/addressbook.c:883
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:1660
+#: src/addressbook.c:1663
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1042,38 +1047,38 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1663 src/folderview.c:2441
+#: src/addressbook.c:1666 src/folderview.c:2441
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:1663
+#: src/addressbook.c:1666
 #, fuzzy
 msgid "_Folder only"
 msgstr "仅文件夹"
 
-#: src/addressbook.c:1663
+#: src/addressbook.c:1666
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "文件夹和地址"
 
-#: src/addressbook.c:1668
+#: src/addressbook.c:1671
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:2435 src/addressbook.c:2568
+#: src/addressbook.c:2438 src/addressbook.c:2571
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:2439 src/addressbook.c:2572
+#: src/addressbook.c:2442 src/addressbook.c:2575
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:2449 src/addressbook.c:2582
+#: src/addressbook.c:2452 src/addressbook.c:2585
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:2454
+#: src/addressbook.c:2457
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1081,7 +1086,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:2467
+#: src/addressbook.c:2470
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1089,7 +1094,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2473
+#: src/addressbook.c:2476
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1097,90 +1102,90 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2478
+#: src/addressbook.c:2481
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2485
+#: src/addressbook.c:2488
 msgid "Addressbook conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2489
+#: src/addressbook.c:2492
 msgid "Addressbook conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:2524
+#: src/addressbook.c:2527
 msgid "Addressbook Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:2525 src/addressbook.c:2625
+#: src/addressbook.c:2528 src/addressbook.c:2628
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:2587
+#: src/addressbook.c:2590
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:2601
+#: src/addressbook.c:2604
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2607
+#: src/addressbook.c:2610
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2613
+#: src/addressbook.c:2616
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2631
+#: src/addressbook.c:2634
 msgid "Addressbook Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2637
+#: src/addressbook.c:2640
 msgid "Addressbook Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3157 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:3173 src/importldif.c:515
+#: src/addressbook.c:3176 src/importldif.c:515
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:3189
+#: src/addressbook.c:3192
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:3205
+#: src/addressbook.c:3208
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:3221
+#: src/addressbook.c:3224
 msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3237 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3240 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "文件夹"
 
-#: src/addressbook.c:3253
+#: src/addressbook.c:3256
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3269 src/addressbook.c:3285
+#: src/addressbook.c:3272 src/addressbook.c:3288
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3301
+#: src/addressbook.c:3304
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -3452,7 +3457,8 @@ msgid "/_Configuration/_Common preferences..."
 msgstr "/配置(_C)/通用首选项(_C)..."
 
 #: src/mainwindow.c:833
-msgid "/_Configuration/_Filter setting..."
+#, fuzzy
+msgid "/_Configuration/_Filter settings..."
 msgstr "/配置(_C)/过滤设置(_F)..."
 
 #: src/mainwindow.c:835
@@ -5477,7 +5483,8 @@ msgid " Revert to default "
 msgstr " 还原为默认值 "
 
 #: src/prefs_filter.c:208
-msgid "Filter setting"
+#, fuzzy
+msgid "Filter settings"
 msgstr "过滤设定"
 
 #: src/prefs_filter.c:252