added description to the field page of CSV import.

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

1 files changed, 170 insertions, 126 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 793db8a2..e1701814 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-10 11:34+0900\n"
+"POT-Creation-Date: 2007-04-11 11:59+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"
@@ -679,8 +679,8 @@ msgstr ""
 
 #: 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
+#: src/editbook.c:196 src/editgroup.c:272 src/editjpilot.c:270
+#: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:208
 #: src/prefs_filter.c:257 src/prefs_folder_item.c:171 src/select-keys.c:319
 msgid "Name"
 msgstr "名称"
@@ -820,7 +820,7 @@ msgid "Address"
 msgstr "地址"
 
 #: src/addressadd.c:197 src/addressbook.c:522 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:274
+#: src/editaddress.c:695 src/editgroup.c:274 src/importcsv.c:126
 msgid "Remarks"
 msgstr "注释"
 
@@ -1066,19 +1066,19 @@ msgstr "文件夹和地址"
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:2438 src/addressbook.c:2571
+#: src/addressbook.c:2446 src/addressbook.c:2579
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:2442 src/addressbook.c:2575
+#: src/addressbook.c:2450 src/addressbook.c:2583
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1086,7 +1086,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1094,7 +1094,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1102,90 +1102,90 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
 msgid "Addressbook conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
 msgid "Addressbook conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
 msgid "Addressbook Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
 msgid "Addressbook Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
 msgid "Addressbook Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
 msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3240 src/folderview.c:378 src/prefs_account_dialog.c:1771
+#: src/addressbook.c:3248 src/folderview.c:378 src/prefs_account_dialog.c:1771
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "文件夹"
 
-#: src/addressbook.c:3256
+#: src/addressbook.c:3264
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3272 src/addressbook.c:3288
+#: src/addressbook.c:3280 src/addressbook.c:3296
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3304
+#: src/addressbook.c:3312
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -1838,24 +1838,24 @@ msgstr "必须输入名字和值。"
 msgid "Edit Person Data"
 msgstr "编辑联系人信息"
 
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "显示姓名"
 
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "姓氏"
 
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "名字"
 
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "昵称"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:273
+#: src/editgroup.c:273 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
@@ -1872,7 +1872,7 @@ msgstr "上移"
 msgid "Move Down"
 msgstr "下移"
 
-#: src/editaddress.c:722 src/editaddress.c:856 src/importldif.c:644
+#: src/editaddress.c:722 src/editaddress.c:856 src/importldif.c:611
 msgid "Modify"
 msgstr "修改"
 
@@ -1900,7 +1900,7 @@ msgstr "文件是好的。"
 msgid "File does not appear to be a valid address book format."
 msgstr "文件不是正确的地址簿格式。"
 
-#: src/editbook.c:126 src/editjpilot.c:204 src/editvcard.c:108
+#: src/editbook.c:126 src/editjpilot.c:203 src/editvcard.c:107
 msgid "Could not read file."
 msgstr "无法读取文件。"
 
@@ -1908,11 +1908,11 @@ msgstr "无法读取文件。"
 msgid "Edit Addressbook"
 msgstr "编辑地址簿"
 
-#: src/editbook.c:203 src/editjpilot.c:278 src/editvcard.c:191
+#: src/editbook.c:203 src/editjpilot.c:277 src/editvcard.c:190
 msgid " Check File "
 msgstr " 检查文件 "
 
-#: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
+#: src/editbook.c:208 src/editjpilot.c:282 src/editvcard.c:195
 #: src/prefs_account_dialog.c:1284
 msgid "File"
 msgstr "文件"
@@ -1980,29 +1980,29 @@ msgstr "新建文件夹"
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
 msgid "File does not appear to be JPilot format."
 msgstr "文件不象是 JPilot 格式。"
 
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
 msgid "Select JPilot File"
 msgstr "选择 JPilot 文件"
 
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
 msgid "Edit JPilot Entry"
 msgstr "编辑 JPilot 项"
 
-#: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1799
+#: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
+#: src/importcsv.c:675 src/importldif.c:502 src/prefs_account_dialog.c:1799
 #: src/prefs_common_dialog.c:1906
 msgid " ... "
 msgstr " ... "
 
-#: src/editjpilot.c:295
+#: src/editjpilot.c:294
 msgid "Additional e-Mail address item(s)"
 msgstr "其它邮件地址项"
 
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
 msgid "Add New JPilot Entry"
 msgstr "添加新 JPilot 项"
 
@@ -2082,44 +2082,44 @@ msgstr "可用的搜索起点"
 msgid "Could not read Search Base(s) from server - please set manually"
 msgstr "无法从服务器读取搜索起点－请手工设置"
 
-#: src/editvcard.c:105
+#: src/editvcard.c:104
 msgid "File does not appear to be vCard format."
 msgstr "文件不象是 vCard 格式。"
 
-#: src/editvcard.c:117
+#: src/editvcard.c:116
 msgid "Select vCard File"
 msgstr "选择 vCard 文件"
 
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
 msgid "Edit vCard Entry"
 msgstr "编辑 vCard 项"
 
-#: src/editvcard.c:275
+#: src/editvcard.c:274
 msgid "Add New vCard Entry"
 msgstr "添加新 vCard 项"
 
-#: src/export.c:149
+#: src/export.c:148
 msgid "Export"
 msgstr "导出"
 
-#: src/export.c:168
+#: src/export.c:167
 msgid "Specify target folder and mbox file."
 msgstr "指定目标文件夹和邮箱文件。"
 
-#: src/export.c:178
+#: src/export.c:177
 msgid "Source dir:"
 msgstr "源目录："
 
-#: src/export.c:183
+#: src/export.c:182
 msgid "Exporting file:"
 msgstr "导出文件："
 
-#: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
+#: src/export.c:195 src/export.c:201 src/import.c:201 src/import.c:207
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " 选择... "
 
-#: src/export.c:240
+#: src/export.c:239
 msgid "Select exporting file"
 msgstr "选择导出文件"
 
@@ -2450,119 +2450,175 @@ msgstr "正在创建图像视图...\n"
 msgid "Can't load the image."
 msgstr "无法加载该图像。"
 
-#: src/import.c:155
+#: src/import.c:154
 msgid "Import"
 msgstr "导入"
 
-#: src/import.c:174
+#: src/import.c:173
 msgid "Specify target mbox file and destination folder."
 msgstr "指定目标邮箱文件和目标文件夹。"
 
-#: src/import.c:184
+#: src/import.c:183
 msgid "Importing file:"
 msgstr "导入文件："
 
-#: src/import.c:189
+#: src/import.c:188
 msgid "Destination dir:"
 msgstr "目标目录："
 
-#: src/import.c:246
+#: src/import.c:245
 msgid "Select importing file"
 msgstr "选择导入文件"
 
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
 msgid "Please specify address book name and file to import."
 msgstr "请指定要导入的地址簿名和文件。"
 
-#: src/importldif.c:128
-msgid "Select and rename LDIF field names to import."
+#: src/importcsv.c:155
+#, fuzzy
+msgid "Select and reorder CSV field names to import."
 msgstr "选择并重命名要导入的LDIF字段名。"
 
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
 msgid "File imported."
 msgstr "文件已导入。"
 
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
 msgid "Please select a file."
 msgstr "请选择一个文件。"
 
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
 msgid "Address book name must be supplied."
 msgstr "必须输入地址簿名。"
 
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
 msgstr "读取 LDIF 字段时发生错误。"
 
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
 msgstr "成功导入 LDIF 文件。"
 
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "选择 LDIF 文件"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "选择 vCard 文件"
 
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
 msgid "File Name"
 msgstr "文件名"
 
-#: src/importldif.c:567
+#: src/importcsv.c:705 src/importldif.c:534
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:568 src/importldif.c:618
-msgid "LDIF Field"
+#: src/importcsv.c:706
+#, fuzzy
+msgid "CSV Field"
 msgstr "LDIF 字段"
 
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "属性名"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "地址簿："
 
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "属性"
+#: src/importcsv.c:724
+msgid "Reorder address book fields with the Up and Down button."
+msgstr ""
 
-#: src/importldif.c:637 src/select-keys.c:343
-msgid "Select"
-msgstr "选择"
+#: src/importcsv.c:759 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/prefs_display_header.c:287 src/prefs_display_items.c:239
+#: src/prefs_summary_column.c:290
+msgid "Up"
+msgstr "上移"
+
+#: src/importcsv.c:761 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/prefs_display_header.c:293 src/prefs_display_items.c:243
+#: src/prefs_summary_column.c:294
+msgid "Down"
+msgstr "下移"
 
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
 msgid "Address Book :"
 msgstr "地址簿："
 
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
 msgid "File Name :"
 msgstr "文件名："
 
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
 msgid "Records :"
 msgstr "记录："
 
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
 msgstr "导入 LDIF 文件到地址簿"
 
 #. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "上一个"
-
-#: src/importldif.c:770 src/prefs_toolbar.c:69
+#: src/importcsv.c:882 src/importldif.c:736 src/prefs_toolbar.c:69
 msgid "Next"
 msgstr "下一个"
 
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "上一个"
+
+#: src/importcsv.c:915 src/importldif.c:769
 msgid "File Info"
 msgstr "文件信息"
 
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "属性"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "LDIF 字段"
 
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
 msgid "Finish"
 msgstr "完成"
 
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "选择并重命名要导入的LDIF字段名。"
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "读取 LDIF 字段时发生错误。"
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "成功导入 LDIF 文件。"
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "选择 LDIF 文件"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "LDIF 字段"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "属性名"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "属性"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "选择"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "导入 LDIF 文件到地址簿"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "属性"
+
 #: src/inc.c:160
 #, fuzzy, c-format
 msgid "Sylpheed: %d new messages"
@@ -2732,7 +2788,7 @@ msgid "Socket error."
 msgstr "Socket错误。"
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1325 src/send_message.c:601 src/send_message.c:794
 msgid "Connection closed by the remote host."
 msgstr "远程主机关闭了连接。"
 
@@ -2749,11 +2805,11 @@ msgstr ""
 "信箱被锁住：\n"
 "%s"
 
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
 msgid "Authentication failed."
 msgstr "验证失败。"
 
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -2762,15 +2818,15 @@ msgstr ""
 "验证失败：\n"
 "%s"
 
-#: src/inc.c:1351 src/send_message.c:797
+#: src/inc.c:1351 src/send_message.c:798
 msgid "Session timed out."
 msgstr "会话超时。"
 
-#: src/inc.c:1391
+#: src/inc.c:1392
 msgid "Incorporation cancelled\n"
 msgstr "合并新邮件被取消\n"
 
-#: src/inc.c:1485
+#: src/inc.c:1486
 #, c-format
 msgid "Getting new messages from %s into %s...\n"
 msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -3866,15 +3922,15 @@ msgid ""
 "virus or something like a malicious program."
 msgstr ""
 
-#: src/passphrase.c:96
+#: src/passphrase.c:95
 msgid "Passphrase"
 msgstr "口令串"
 
-#: src/passphrase.c:248
+#: src/passphrase.c:247
 msgid "[no user id]"
 msgstr "[没有用户标识]"
 
-#: src/passphrase.c:256
+#: src/passphrase.c:255
 #, c-format
 msgid ""
 "%sPlease enter the passphrase for:\n"
@@ -3887,7 +3943,7 @@ msgstr ""
 "  %.*s  \n"
 "(%.*s)\n"
 
-#: src/passphrase.c:260
+#: src/passphrase.c:259
 msgid ""
 "Bad passphrase! Try again...\n"
 "\n"
@@ -4408,18 +4464,6 @@ msgstr " 语法帮助 "
 msgid "Registered actions"
 msgstr "已注册的动作"
 
-#: src/prefs_actions.c:310 src/prefs_customheader.c:279
-#: src/prefs_display_header.c:287 src/prefs_display_items.c:239
-#: src/prefs_summary_column.c:290
-msgid "Up"
-msgstr "上移"
-
-#: src/prefs_actions.c:316 src/prefs_customheader.c:285
-#: src/prefs_display_header.c:293 src/prefs_display_items.c:243
-#: src/prefs_summary_column.c:294
-msgid "Down"
-msgstr "下移"
-
 #: src/prefs_actions.c:423 src/prefs_template.c:326
 msgid "(New)"
 msgstr "(新建)"
@@ -6240,11 +6284,11 @@ msgstr "正在发送邮件 (%d / %d 字节)"
 msgid "Sending message"
 msgstr "正在发送邮件"
 
-#: src/send_message.c:769 src/send_message.c:789
+#: src/send_message.c:770 src/send_message.c:790
 msgid "Error occurred while sending the message."
 msgstr "发送邮件时发生错误。"
 
-#: src/send_message.c:772
+#: src/send_message.c:773
 #, c-format
 msgid ""
 "Error occurred while sending the message:\n"