aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLog.ja4
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/be.po296
-rw-r--r--po/bg.po296
-rw-r--r--po/cs.po296
-rw-r--r--po/da.po296
-rw-r--r--po/de.po296
-rw-r--r--po/el.po296
-rw-r--r--po/es.po296
-rw-r--r--po/et.po296
-rw-r--r--po/fr.po296
-rw-r--r--po/gl.po296
-rw-r--r--po/hr.po297
-rw-r--r--po/hu.po296
-rw-r--r--po/it.po296
-rw-r--r--po/ja.po298
-rw-r--r--po/ko.po296
-rw-r--r--po/lt.po296
-rw-r--r--po/nl.po296
-rw-r--r--po/pl.po296
-rw-r--r--po/pt_BR.po296
-rw-r--r--po/ro.po301
-rw-r--r--po/ru.po296
-rw-r--r--po/sk.po296
-rw-r--r--po/sl.po296
-rw-r--r--po/sr.po296
-rw-r--r--po/sv.po296
-rw-r--r--po/tr.po296
-rw-r--r--po/uk.po296
-rw-r--r--po/vi.po296
-rw-r--r--po/zh_CN.po296
-rw-r--r--po/zh_TW.po296
-rw-r--r--src/importcsv.c17
34 files changed, 5122 insertions, 3792 deletions
diff --git a/ChangeLog b/ChangeLog
index 35163dad..9a7bdbc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2007-04-11
+ * src/importcsv.c: added description to the field page.
+
+2007-04-11
+
* src/importcsv.c: imp_csv_load_fields(): fixed initially incorrect
scrollbar size.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 5f057440..4f473bc6 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,9 @@
2007-04-11
+ * src/importcsv.c: フィールドのページに説明を追加。
+
+2007-04-11
+
* src/importcsv.c: imp_csv_load_fields(): 初期状態のスクロールバーの
サイズが正しくないのを修正。
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6b2d6c94..fe9e3db3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -53,6 +53,7 @@ src/gtkutils.c
src/headerview.c
src/imageview.c
src/import.c
+src/importcsv.c
src/importldif.c
src/inc.c
src/inputdialog.c
diff --git a/po/be.po b/po/be.po
index 023e2700..c51b3dcd 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 2.4.0 \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: 2007-02-27 22:43+0200\n"
"Last-Translator: Mikalai Udodau <crom dash a at tut dot by>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
@@ -682,8 +682,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 "仄"
@@ -821,7 +821,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 "舒于舒亞"
@@ -1062,19 +1062,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"
@@ -1082,7 +1082,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."
@@ -1090,7 +1090,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."
@@ -1098,7 +1098,7 @@ 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."
@@ -1106,90 +1106,90 @@ msgstr ""
"亠仄舒亞仄舒 从舒仆于亠舒于舒 舒亟舒仆 从仆亞\n"
" 仆亠仍亞舒 于舒 舒亶仍 仆仂于舒亶 舒亟舒仆舒亶 从仆亞."
-#: 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"
@@ -1834,24 +1834,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 "E-Mail 舒亟舒"
@@ -1868,7 +1868,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 "仄礌"
@@ -1896,7 +1896,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 "亠仍亞舒 仗舒舒 舒亶仍."
@@ -1904,11 +1904,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 "个舒亶仍"
@@ -1976,29 +1976,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"
@@ -2078,44 +2078,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 "舒亟舒亶亠 仄舒于 从舒舒仍仂亞 舒亶仍 mbox."
-#: 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 "弍亠亠 舒亶仍 从仗舒"
@@ -2442,119 +2442,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 "丕从舒亢亠 仄舒于 舒亶仍 mbox 从舒舒仍仂亞 仗亰仆舒仆仆."
-#: 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
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2723,7 +2779,7 @@ msgid "Socket error."
msgstr "舒仄仍从舒 仂从亠舒."
#. 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 "仍仆仆亠 亰舒从舒亠 舒亟亟舒仍亠仆仄 亠于亠舒仄."
@@ -2740,11 +2796,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"
@@ -2753,15 +2809,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"
@@ -3870,15 +3926,15 @@ 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 "[弍亠亰 id 从舒舒仍仆从舒]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3891,7 +3947,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4401,18 +4457,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 "(仂于)"
@@ -6183,11 +6227,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"
diff --git a/po/bg.po b/po/bg.po
index 7b78a8dc..9ef9fb09 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 0.9.8\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: 2004-01-09 02:06+0200\n"
"Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
"Language-Team: Bulgarian <bg@li.org>\n"
@@ -680,8 +680,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 "仄亠"
@@ -821,7 +821,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 "舒弍亠仍亠亢从亳"
@@ -1068,19 +1068,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 "仂于 仗仂亠弍亳亠仍, 仆亠 仄仂亢舒 亟舒 ce 亰舒仗舒亰亳 亳仆亟亠从仆亳 舒亶仍."
-#: 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"
@@ -1088,7 +1088,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."
@@ -1096,7 +1096,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."
@@ -1104,7 +1104,7 @@ 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."
@@ -1112,91 +1112,91 @@ msgstr ""
"亠仗 从仂仆于亠亳舒仆亠仂 仆舒 舒亟亠仆舒舒 从仆亳亞舒\n"
"亳 亰亟舒于舒仆亠 仆舒 仆仂于亳 舒亶仍仂于亠 仆舒 舒亟亠仆舒舒 从仆亳亞舒."
-#: 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 "EMail 亟亠"
-#: 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 于"
@@ -1880,24 +1880,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 "E-Mail 舒亟亠"
@@ -1914,7 +1914,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 "仂仄亠仆礌亠"
@@ -1942,7 +1942,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 "亠 仄仂亢亠 亟舒 亠 仗仂亠亠 舒亶仍."
@@ -1950,11 +1950,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 "个舒亶仍"
@@ -2022,29 +2022,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 "仂仗仍仆亳亠仍亠仆 E-Mail 舒亟亠(亳)"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "仂弍舒于礌亠 仆舒 仆仂于 JPilot 亰舒仗亳"
@@ -2124,44 +2124,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 "丕从舒亢亠亠 仗舒仗从舒 亳 mbox 舒亶仍."
-#: 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 "亰弍仂 仆舒 亳亰仂亟亠仆 舒亶仍"
@@ -2494,119 +2494,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 "丕从舒亢亠亠 mbox 舒亶仍 亳 仗舒仗从舒."
-#: 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"
@@ -2777,7 +2833,7 @@ msgid "Socket error."
msgstr "亠从舒 于 仂从亠."
#. 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 "亰从舒舒 亠 仗亠从舒亠仆舒 仂 仂亟舒仍亠亠仆亳 仂."
@@ -2794,11 +2850,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"
@@ -2807,16 +2863,16 @@ msgstr ""
"丕亟仂仂于亠磦舒仆亠仂 亠 仗仂于舒仍亳:\n"
"%s"
-#: src/inc.c:1351 src/send_message.c:797
+#: src/inc.c:1351 src/send_message.c:798
#, fuzzy
msgid "Session timed out."
msgstr "亠亳舒 亠 仗仂仂亠仆舒\n"
-#: 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"
@@ -3944,15 +4000,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 "[仆礆舒 仗仂亠弍亳亠仍从亳 id]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3965,7 +4021,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4491,18 +4547,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 "(仂于)"
@@ -6360,11 +6404,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"
diff --git a/po/cs.po b/po/cs.po
index 02f597e3..0b4c5edc 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,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: 2007-04-03 01:05+0200\n"
"Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -688,8 +688,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 "Jm辿no"
@@ -827,7 +827,7 @@ msgid "Address"
msgstr "Adresa"
#: 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 "Pozn叩mky"
@@ -1067,19 +1067,19 @@ msgstr "Slo転ku a adresy"
msgid "Really delete `%s' ?"
msgstr "Opravdu smazat \"%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 "Nov箪 u転ivatel, nelze ulo転it soubor index."
-#: 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 "Nov箪 u転ivatel, nelze ulo転it soubory s adres叩em."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Konverze star辿ho adres叩e probhla 炭sp邸n."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1087,7 +1087,7 @@ msgstr ""
"Star箪 adres叩 peveden,\n"
"ale nelze ulo転it nov箪 soubor s indexem."
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1095,7 +1095,7 @@ msgstr ""
"Konverze adres叩e nemohla b箪t provedena,\n"
"ale byly vytvoeny nov辿 pr叩zdn辿 soubory adres叩e."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1103,7 +1103,7 @@ msgstr ""
"Nelze prov辿st konverzi adres叩e,\n"
"nelze vytvoit nov辿 soubory adres叩e."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1111,86 +1111,86 @@ msgstr ""
"Nelze prov辿st konverzi adres叩e\n"
"a vytvoit nov辿 soubory adres叩e."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Chyba pi konverzi adres叩e"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Konverze adres叩e"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Chyba v adres叩i"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Nelze na鱈st index adres"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr "Star箪 adres叩 peveden, ale nelze ulo転it nov箪 soubor index s adres叩em"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Konverze adres叩e nemohla b箪t provedena, ale byly vytvoeny nov辿 pr叩zdn辿 "
"soubory adres叩e."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr "Nelze prov辿st konverzi adres叩e a vytvoit nov辿 soubory adres叩e."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr "Nelze prov辿st konverzi adres叩e a vytvoit nov辿 soubory adres叩e."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Chyba pi konverzi adres叩e"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Konverze adres叩e"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Rozhran鱈"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Adres叩"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Osoba"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "E-mailov叩 adresa"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Skupina"
#. 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 "Slo転ka"
-#: 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 "Server LDAP"
@@ -1835,24 +1835,24 @@ msgstr "Nebylo zad叩no jm辿no a hodnota."
msgid "Edit Person Data"
msgstr "Upravit data o osob"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Zobrazen辿 jm辿no"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "P鱈jmen鱈"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Kestn鱈 jm辿no"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Pezd鱈vka"
#: 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 "E-mailov叩 adresa"
@@ -1869,7 +1869,7 @@ msgstr "Posunout nahoru"
msgid "Move Down"
msgstr "Posunout dol哲"
-#: 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 "Zmnit"
@@ -1897,7 +1897,7 @@ msgstr "Soubor se zd叩 b箪t v po叩dku."
msgid "File does not appear to be a valid address book format."
msgstr "Soubor nen鱈 v platn辿m form叩tu adres叩e."
-#: 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 "Nelze na鱈st soubor."
@@ -1905,11 +1905,11 @@ msgstr "Nelze na鱈st soubor."
msgid "Edit Addressbook"
msgstr "Upravit adres叩"
-#: 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 " Otestovat soubor "
-#: 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 "Soubor"
@@ -1978,29 +1978,29 @@ msgstr "Nov叩 slo転ka"
msgid "Input the name of new folder:"
msgstr "Zadejte n叩zev nov辿 slo転ky:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Soubor nen鱈 ve form叩tu JPilot."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Vybrat soubor JPilot"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Upravit z叩znam 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 "Dal邸鱈 polo転ky e-mailov辿 adresy"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Pidat nov箪 z叩znam JPilot"
@@ -2080,44 +2080,44 @@ msgstr "Dostupn辿 vyhled叩vac鱈 b叩ze"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Ze serveru nelze na鱈st vyhled叩vac鱈 b叩ze - zadejte je pros鱈m run"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Soubor nen鱈 ve form叩tu vCard."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Vybrat soubor vCard"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Upravit z叩znam vCard"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Pidat nov箪 z叩znam vCard"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Export"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Zadejte zdrojovou slo転ku a c鱈lov箪 soubor mbox."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Zdrojov叩 slo転ka:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Exportovan箪 soubor:"
-#: 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 " Vybrat... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Vyberte soubor k exportu"
@@ -2444,119 +2444,175 @@ msgstr "Vytv叩鱈 se n叩hled obr叩zku...\n"
msgid "Can't load the image."
msgstr "Nelze nahr叩t obr叩zek."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Import"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Zadejte zdrojov箪 soubor mbox a c鱈lovou slo転ku."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Importovan箪 soubor :"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "C鱈lov叩 slo転ka:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Vybrat soubor k importu"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Zadejte pros鱈m n叩zev adres叩e a soubor k importu."
-#: 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 "Vyberte a pejmenujte n叩zvy pol鱈 LDIF k importu."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Soubor importov叩n."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Vyberte pros鱈m soubor."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Mus鱈 b箪t zad叩n n叩zev adres叩e."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Chyba pi ten鱈 polo転ek LDIF."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "Import souboru LDIF byl 炭sp邸n箪."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Vyberte soubor LDIF"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Vybrat soubor vCard"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "N叩zev souboru"
-#: 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 "Polo転ky LDIF"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "N叩zev atributu"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Adres叩:"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Atribut"
+#: 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 "Vybrat"
+#: 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 "Nahoru"
+
+#: 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 "Dol哲"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Adres叩:"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "N叩zev souboru:"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Z叩znam哲:"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Importovat soubor LDIF do adres叩e"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Pedchoz鱈"
-
-#: 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 "N叩sleduj鱈c鱈"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Pedchoz鱈"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Informace o souboru"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Atributy"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "Polo転ky LDIF"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Dokonit"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Vyberte a pejmenujte n叩zvy pol鱈 LDIF k importu."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Chyba pi ten鱈 polo転ek LDIF."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "Import souboru LDIF byl 炭sp邸n箪."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Vyberte soubor LDIF"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "Polo転ky LDIF"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "N叩zev atributu"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Atribut"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Vybrat"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importovat soubor LDIF do adres叩e"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Atributy"
+
#: src/inc.c:160
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2725,7 +2781,7 @@ msgid "Socket error."
msgstr "Chyba socketu."
#. 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 "Spojen鱈 ukoneno vzd叩len箪m hostitelem."
@@ -2742,11 +2798,11 @@ msgstr ""
"Po邸tovn鱈 schr叩nka je zamena:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "Autentizace selhala."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2755,15 +2811,15 @@ msgstr ""
"Autentizace selhala:\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 "Vypr邸el as relace."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "Zaleov叩n鱈 zru邸eno\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Z鱈sk叩vaj鱈 se nov辿 zpr叩vy z %s do %s...\n"
@@ -3879,15 +3935,15 @@ msgstr ""
"Pokud chcete soubor spustit, nejprve jej ulo転te a ujistte se, 転e nejde o "
"virus i njak箪 nebezpen箪 program."
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Heslo (fr叩ze)"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[bez u転ivatele]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3900,7 +3956,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4410,18 +4466,6 @@ msgstr " N叩povda k syntaxi "
msgid "Registered actions"
msgstr "Pidan辿 akce"
-#: 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 "Nahoru"
-
-#: 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 "Dol哲"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Nov箪)"
@@ -6192,11 +6236,11 @@ msgstr "Pos鱈l叩 se zpr叩va (bajt哲 %d / %d)"
msgid "Sending message"
msgstr "Pos鱈l叩 se zpr叩va"
-#: 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 "Pi pos鱈l叩n鱈 zpr叩vy nastala chyba."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/da.po b/po/da.po
index 4d9d09c3..114b4d5e 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,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: 2003-07-29 09:05+0200\n"
"Last-Translator: Andreas Hinz <news3@acci.dk>\n"
"Language-Team: \n"
@@ -684,8 +684,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 "Navn"
@@ -825,7 +825,7 @@ msgid "Address"
msgstr "Adresse"
#: 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 "Kommentar"
@@ -1071,19 +1071,19 @@ msgstr "Mappe og adresser"
msgid "Really delete `%s' ?"
msgstr "Virklig slette `%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 "Ny bruger, kunne ikke gemme index fil."
-#: 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 "Ny bruger, kunne ikke gemme adressebogs fil."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Gammel adressebog konverteret."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1091,7 +1091,7 @@ msgstr ""
"Gammel adressebog konverteret,\n"
"men kunne ikke gemme index filen"
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1099,7 +1099,7 @@ msgstr ""
"Kunne ikke konvertere adressebog,\n"
"men nye og tomme filer blev oprettet."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1107,7 +1107,7 @@ msgstr ""
"Kunne ikke konvertere adressebog,\n"
"kunne ikke oprette nye filer."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1115,86 +1115,86 @@ msgstr ""
"Kunne ikke konvertere adressebog,\n"
"kunne ikke oprette nye filer."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Adressebog konverterings fejl"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Adressebog konvertering"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Adressebog fejl"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Kunne ikke l脱se adressebog"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr "Gammel adressebog konverteret men kunne ikke gemme ny index fil "
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr "Kunne ikke konvertere adressebog, men har oprettet nye tomme filer "
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Kunne ikke konvertere adressebog, og heller ikke oprette nye tomme filer "
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Kunne ikke konvertere adressebog, og heller ikke oprette nye tomme filer "
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Adressebog konverterings fejl"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Adressebog konvertering"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Brugerflade"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Adressebog"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Person"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "E-post adresse"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Gruppe"
#. 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 "Mappe"
-#: 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 "J-Pilot"
-#: src/addressbook.c:3304
+#: src/addressbook.c:3312
msgid "LDAP Server"
msgstr "LDAP server"
@@ -1878,24 +1878,24 @@ msgstr "Et navn og en v脱rdi skal indtastes."
msgid "Edit Person Data"
msgstr "Redig辿r person data"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Vis navn"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Efternavn"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Fornavn"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Alias"
#: 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 "E-post adresse"
@@ -1912,7 +1912,7 @@ msgstr "Op"
msgid "Move Down"
msgstr "Ned"
-#: 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 "ndre"
@@ -1940,7 +1940,7 @@ msgstr "Fil er OK."
msgid "File does not appear to be a valid address book format."
msgstr "Filen er ikke i korrekt adressebogs format"
-#: 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 "Kunne ikke l脱se fil."
@@ -1948,11 +1948,11 @@ msgstr "Kunne ikke l脱se fil."
msgid "Edit Addressbook"
msgstr "Redig辿r adressbog"
-#: 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 " Check fil "
-#: 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 "Fil"
@@ -2020,29 +2020,29 @@ msgstr "Ny mappe"
msgid "Input the name of new folder:"
msgstr "Indtast ny mappes navn:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Filen er ikke i JPilot format."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "V脱lg JPilot fil"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Redig辿r JPilot indtastning"
-#: 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 "Yderligere e-post adresser"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Tilf淡j ny JPilot indtastning"
@@ -2122,44 +2122,44 @@ msgstr "Vorhandene Suchbasen"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Konnte Suchbasen nicht vom Server lesen - bitte manuell setzen"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Datei ist nicht im VCard-Format."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "VCard-Datei w辰hlen"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Redig辿r vCard"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Tilf淡j ny VCard"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Eksportere"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Indtast m奪l mappe og mbox fil"
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Fra sti:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Eksporterer fil:"
-#: 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 " V脱lg... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "V脱lg fil til export"
@@ -2493,119 +2493,175 @@ msgstr "Opretter billed visning...\n"
msgid "Can't load the image."
msgstr "Kan ikke l脱se billede."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Importere"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Indtast mbox fil og mappe."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Importerer fil:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Til sti:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "V脱lg fil til import"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Indtast adressebog navn og fil til import"
-#: 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 "V脱lg og omd淡b LDIF felt navne til import"
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Fil importeret."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "V脱lg fil."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Adressebogs navn skal angives."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Fej ved l脱sning af LDIF fil."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "LDIF fil blev importeret."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "V脱lg LDIF fil"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "VCard-Datei w辰hlen"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Fil navn"
-#: 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 "V脱lg LDIF felt"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Egensgab Navn"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Adressebog :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Egenskab"
+#: 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 "V脱lg"
+#: 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 "Op"
+
+#: 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 "Ned"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Adressebog :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Fil navn :"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Poster :"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Importer LDIF fil til adressebog"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Forrige"
-
-#: 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 "N脱ste"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Forrige"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Fil info"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Egenskaber"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "V脱lg LDIF felt"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Slut"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "V脱lg og omd淡b LDIF felt navne til import"
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Fej ved l脱sning af LDIF fil."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "LDIF fil blev importeret."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "V脱lg LDIF fil"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "V脱lg LDIF felt"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Egensgab Navn"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Egenskab"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "V脱lg"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importer LDIF fil til adressebog"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Egenskaber"
+
#: src/inc.c:160
#, fuzzy, c-format
msgid "Sylpheed: %d new messages"
@@ -2780,7 +2836,7 @@ msgid "Socket error."
msgstr "Sokkel fejl."
#. 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 ""
@@ -2798,11 +2854,11 @@ msgstr ""
"Mailbox er l奪st:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "Godkendelses fejlede."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2811,16 +2867,16 @@ msgstr ""
"Godkendelsesfejl:\n"
"%s"
-#: src/inc.c:1351 src/send_message.c:797
+#: src/inc.c:1351 src/send_message.c:798
#, fuzzy
msgid "Session timed out."
msgstr "tid udl淡bet\n"
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "Hentning afbrudt\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Modtager nye meddelelser fra %s til %s...\n"
@@ -3947,15 +4003,15 @@ msgid ""
"virus or something like a malicious program."
msgstr ""
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Adganss脱tning"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[ingen bruger ID]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3968,7 +4024,7 @@ msgstr ""
" %.*s \n"
"(%.*s) an\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4491,18 +4547,6 @@ msgstr " Syntaks hj脱lp"
msgid "Registered actions"
msgstr "Registrerede handlinger"
-#: 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 "Op"
-
-#: 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 "Ned"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Nye)"
@@ -6358,14 +6402,14 @@ msgstr "Sender meddelelse (%d / %d bytes)"
msgid "Sending message"
msgstr "Sende Meddelelse"
-#: src/send_message.c:769 src/send_message.c:789
+#: src/send_message.c:770 src/send_message.c:790
#, fuzzy
msgid "Error occurred while sending the message."
msgstr ""
"Fejl ved afsendelse meddelelse:\n"
"%s"
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/de.po b/po/de.po
index 73354ba4..13dafc34 100644
--- a/po/de.po
+++ b/po/de.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: 2006-12-09 08:22+0100\n"
"Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
"Language-Team: German <gnome-de@gnome.org>\n"
@@ -686,8 +686,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 "Name"
@@ -825,7 +825,7 @@ msgid "Address"
msgstr "Adresse"
#: 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 "Kommentar"
@@ -1069,19 +1069,19 @@ msgstr "Ablage und _Adressen"
msgid "Really delete `%s' ?"
msgstr "Wirklich '%s' l旦schen ?"
-#: 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 "Neuer Benutzer, kann Index-Datei nicht speichern."
-#: 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 "Neuer Benutzer, kann Adressbuch-Dateien nicht speichern."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Altes Adressbuch erfolgreich konvertiert."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1089,7 +1089,7 @@ msgstr ""
"Altes Adressbuch konvertiert,\n"
"kann neue Adress-Index-Datei nicht speichern"
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1097,7 +1097,7 @@ msgstr ""
"Konnte Adressbuch nicht konvertieren,\n"
"aber erstellte neue leere Adressbuch-Dateien."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1105,7 +1105,7 @@ msgstr ""
"Konnte Adressbuch nicht konvertieren,\n"
"konnte neue Adressbuch-Dateien nicht erstellen."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1113,92 +1113,92 @@ msgstr ""
"Konnte Adressbuch nicht konvertieren\n"
"und konnte neue Adressbuch-Dateien erstellen."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Adressbuch-Konvertierungs-Fehler"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Adressbuch-Konvertierung"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Adressbuch-Fehler"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Konnte Adress-Index nicht lesen"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"Altes Adressbuch konvertiert, neue Adress-Index-Datei konnte nicht "
"gespeichert werden"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Konnte Adressbuch nicht konvertieren, erstellte aber neue leere Adressbuch "
"Dateien."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Konnte Adressbuch nicht konvertieren, konnte neue Adressbuch Dateien nicht "
"erstellen."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Konnte Adressbuch nicht konvertieren und konnte neue Adressbuch Dateien "
"nicht erstellen."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Adressbuch-Konvertierungs-Fehler"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Adressbuch-Konvertierung"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Benutzerschnittstelle"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Adressbuch"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Person"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "E-Mail Adresse"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Gruppe"
#. 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 "Ablage"
-#: 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-Server"
@@ -1843,24 +1843,24 @@ msgstr "Ein Name und ein Wert m端ssen angegeben werden."
msgid "Edit Person Data"
msgstr "Personen-Daten bearbeiten"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Namen anzeigen"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Nachname"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Vorname"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Spitzname"
#: 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 "E-Mail Adresse"
@@ -1877,7 +1877,7 @@ msgstr "Auf"
msgid "Move Down"
msgstr "Ab"
-#: 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 "ndern"
@@ -1905,7 +1905,7 @@ msgstr "Datei ist O.K."
msgid "File does not appear to be a valid address book format."
msgstr "Datei hat kein korrektes Adressbuchformat"
-#: 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 "Kann Datei nicht lesen."
@@ -1913,11 +1913,11 @@ msgstr "Kann Datei nicht lesen."
msgid "Edit Addressbook"
msgstr "Adressbuch bearbeiten"
-#: 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 " Datei 端berpr端fen "
-#: 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 "Datei"
@@ -1985,29 +1985,29 @@ msgstr "Neue Ablage"
msgid "Input the name of new folder:"
msgstr "Geben Sie den Namen der neuen Ablage ein:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Datei ist nicht im JPilot-Format."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "W辰hle JPilot-Datei"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "JPilot-Eintrag bearbeiten"
-#: 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 "Zus辰tzliche E-Mail-Adresseintr辰ge"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Neuen JPilot-Eintrag hinzuf端gen"
@@ -2087,44 +2087,44 @@ msgstr "Vorhandene Suchbasen"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Konnte Suchbasen nicht vom Server lesen - bitte manuell setzen"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Datei ist nicht im vCard-Format."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "vCard-Datei w辰hlen"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "VCard-Eintrag bearbeiten"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Neuen vCard-Eintrag hinzuf端gen"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Exportieren"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Gib Zielverzeichnis und Mbox-Datei an."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Quellverzeichnis"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Exportiere Datei:"
-#: 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 " Ausw辰hlen... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "W辰hle exportierte Datei"
@@ -2451,120 +2451,176 @@ msgstr "Erstelle Bilderansicht...\n"
msgid "Can't load the image."
msgstr "Kann das Bild nicht laden."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Importieren"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Importiere Datei:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Zielverzeichnis:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "W辰hle importierte Datei"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr ""
"Bitte, geben Sie ein Adressbuchnamen und eine Datei zum Importieren an."
-#: 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 "W辰hle und benenne LDIF-Feldnamen zum Import um."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Datei importiert."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Bitte eine Datei w辰hlen."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Ein Adressbuchname muss angegeben werden."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Fehler beim Lesen der LDIF-Felder."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "LDIF-Datei erfolgreich importiert."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "W辰hle LDIF-Datei"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "vCard-Datei w辰hlen"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Dateiname"
-#: 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-Feld"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Eigenschaftenname"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Adressbuch :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Eigenschaft"
+#: 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 "W辰hlen"
+#: 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 "Auf"
+
+#: 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 "Ab"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Adressbuch :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Dateiname :"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Felder :"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Importiere LDIF-Datei in Adressbuch"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Vorherige"
-
-#: 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 "N辰chste"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Vorherige"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Datei-Info"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Eigenschaften"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "LDIF-Feld"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Ende"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "W辰hle und benenne LDIF-Feldnamen zum Import um."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Fehler beim Lesen der LDIF-Felder."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "LDIF-Datei erfolgreich importiert."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "W辰hle LDIF-Datei"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "LDIF-Feld"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Eigenschaftenname"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Eigenschaft"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "W辰hlen"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importiere LDIF-Datei in Adressbuch"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Eigenschaften"
+
#: src/inc.c:160
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2733,7 +2789,7 @@ msgid "Socket error."
msgstr "Socket-Fehler."
#. 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 "Verbindung geschlossen vom Remote-Host."
@@ -2750,11 +2806,11 @@ msgstr ""
"Mailbox ist gesperrt:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "Beglaubigung fehlgeschlagen."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2763,15 +2819,15 @@ msgstr ""
"Beglaubigung fehlgeschlagen:\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 "Sitzungszeit abgelaufen."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "Empfangen abgebrochen\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Erhalte neue Nachrichten von %s in %s...\n"
@@ -3886,15 +3942,15 @@ msgstr ""
"Wenn Sie es starten m旦chten, speichern Sie es irgendwo und stellen Sie "
"sicher,dass es sich nicht um einen Virus oder anderen Schadcode handelt."
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Mantra"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[keine Benutzer-ID]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3907,7 +3963,7 @@ msgstr ""
" %.*s \n"
"(%.*s) an\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4420,18 +4476,6 @@ msgstr " Syntax Hilfe "
msgid "Registered actions"
msgstr "Registrierte Aktionen"
-#: 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 "Auf"
-
-#: 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 "Ab"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Neue)"
@@ -6232,11 +6276,11 @@ msgstr "Sende Nachricht (%d / %d bytes)"
msgid "Sending message"
msgstr "Sende Nachricht"
-#: 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 "Fehler aufgetreten beim Senden der Nachricht."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/el.po b/po/el.po
index 885b3999..0a331317 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 2.4.0beta5\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: 2007-03-17 00:57+0200\n"
"Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -698,8 +698,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 "僚凌亮留"
@@ -838,7 +838,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 "裡了旅留"
@@ -1078,20 +1078,20 @@ 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
#, fuzzy
msgid ""
"Old address book converted,\n"
@@ -1100,7 +1100,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."
@@ -1108,7 +1108,7 @@ msgstr ""
"竜僚 竜溜僚留旅 隆僚留流 侶 亮竜留凌流 凌 竜竜侶溜凌 隆旅竜慮僚竜僚.\n"
"侶亮旅凌粒流慮侶虜竜 僚劉凌, 虜竜僚 留竜溜凌."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
#, fuzzy
msgid ""
"Could not convert address book,\n"
@@ -1117,7 +1117,7 @@ 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."
@@ -1125,30 +1125,30 @@ msgstr ""
"竜僚 竜溜僚留旅 隆僚留流 侶 亮竜留凌流 凌 竜竜侶溜凌 隆旅竜慮僚竜僚,\n"
"凌竜 侶 隆侶亮旅凌粒溜留 僚劉凌."
-#: 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
#, fuzzy
msgid "Old address book converted, could not save new address index file"
msgstr ""
"里凌 留了旅 硫旅硫了溜凌 隆旅竜慮僚竜僚 亮竜留略侶虜竜 竜旅マ,\n"
"隆竜僚 竜溜僚留旅 隆僚留流 侶 留凌慮流虜竜侶 凌 僚劉凌 竜竜侶溜凌 隆旅竜慮僚竜僚"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
#, fuzzy
msgid ""
"Could not convert address book, but created empty new address book files."
@@ -1156,7 +1156,7 @@ msgstr ""
"竜僚 竜溜僚留旅 隆僚留流 侶 亮竜留凌流 凌 硫旅硫了溜凌 隆旅竜慮僚竜僚.\n"
"侶亮旅凌粒流慮侶虜竜 僚劉凌, 虜竜僚 留竜溜凌."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
#, fuzzy
msgid ""
"Could not convert address book, could not create new address book files."
@@ -1164,7 +1164,7 @@ msgstr ""
"竜僚 竜溜僚留旅 隆僚留流 侶 亮竜留凌流 凌 硫旅硫了溜凌 隆旅竜慮僚竜僚,\n"
"凌竜 侶 隆侶亮旅凌粒溜留 僚劉凌."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
#, fuzzy
msgid ""
"Could not convert address book and could not create new address book files."
@@ -1172,51 +1172,51 @@ msgstr ""
"竜僚 竜溜僚留旅 隆僚留流 侶 亮竜留凌流 凌 硫旅硫了溜凌 隆旅竜慮僚竜僚,\n"
"凌竜 侶 隆侶亮旅凌粒溜留 僚劉凌."
-#: 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 "陸略虜竜了凌"
# Untrans.
-#: src/addressbook.c:3256
+#: src/addressbook.c:3264
msgid "vCard"
msgstr "vCard"
# Untans.
-#: 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"
@@ -1868,24 +1868,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 "旅竜慮僚侶 侶了竜虜凌僚旅虜流 留了了侶了凌粒留溜留"
@@ -1902,7 +1902,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 "里凌凌凌溜侶侶 "
@@ -1930,7 +1930,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 "竜僚 竜溜僚留旅 隆僚留流 侶 留僚略粒僚侶 凌 留竜溜凌."
@@ -1938,11 +1938,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 "竜溜凌"
@@ -2010,29 +2010,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"
@@ -2114,44 +2114,44 @@ 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 "溜竜竜 凌 留竜溜凌 mbox 虜留旅 虜留略了凌粒凌 凌凌旅亮凌."
-#: 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 "旅了凌粒流 留竜溜凌 竜両留粒粒流"
@@ -2480,121 +2480,177 @@ 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
#, fuzzy
msgid "Specify target mbox file and destination folder."
msgstr "溜竜竜 凌 留竜溜凌 mbox 虜留旅 虜留略了凌粒凌 凌凌旅亮凌."
-#: 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 ""
-#: 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
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2764,7 +2820,7 @@ msgid "Socket error."
msgstr "裡略了亮留 僚隆竜侶."
#. 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 " 僚隆竜侶 劉虜了竜旅竜 留 凌僚 留凌亮留虜亮劉僚凌 凌了凌粒旅流."
@@ -2781,11 +2837,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"
@@ -2794,15 +2850,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"
@@ -3917,15 +3973,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 "[溜 user id]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3938,7 +3994,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4450,18 +4506,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 "(劉凌)"
@@ -6242,11 +6286,11 @@ msgstr "裡劉了僚 凌 亮流僚亮留 (%d / %d bytes)"
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"
diff --git a/po/es.po b/po/es.po
index ca468488..d6c287cf 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,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: 2006-12-02 13:12+0100\n"
"Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
"Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -684,8 +684,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 "Nombre"
@@ -823,7 +823,7 @@ msgid "Address"
msgstr "Direcci坦n"
#: 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 "Notas"
@@ -1066,19 +1066,19 @@ msgstr "La carpeta y las _direcciones"
msgid "Really delete `%s' ?"
msgstr "多Borrar realmente 束%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 "Nuevo usuario, no se pudo guardar el fichero 鱈ndice."
-#: 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 "Nuevo usuario, no se pudo guardar los ficheros de direcciones"
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Antigua agenda de direcciones convertida con 辿xito"
-#: 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 ""
"Antigua agenda de direcciones convertida,\n"
"no se pudo guardar el nuevo fichero 鱈ndice"
-#: 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 ""
"No se pudo convertir la antigua agenda,\n"
"pero se crearon nuevos ficheros vac鱈os."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1102,7 +1102,7 @@ msgstr ""
"No se pudo convertir la antigua agenda,\n"
"no se pudieron crear los ficheros para la nueva."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1110,92 +1110,92 @@ msgstr ""
"No se pudo convertir la antigua agenda\n"
"y no se pudieron crear ficheros para una nueva."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Error en la conversi坦n de la agenda"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Conversi坦n de la agenda"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Error en la agenda"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "No se pudo leer el 鱈ndice de direcciones"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"Antigua agenda de direcciones convertida, no se pudo guardar el nuevo "
"fichero 鱈ndice"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"No se pudo convertir la antigua agenda, pero se crearon nuevos ficheros "
"vac鱈os."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"No se pudo convertir la antigua agenda, no se pudieron crear los ficheros "
"para la nueva."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"No se pudo convertir la antigua agenda y no se pudieron crear ficheros para "
"una nueva."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Error en la conversi坦n de la agenda"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Conversi坦n de la agenda"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Interfaz"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Agenda de direcciones"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Persona"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "Direcci坦n de correo"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Grupo"
#. 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 "Carpeta"
-#: 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 "Servidor LDAP"
@@ -1837,24 +1837,24 @@ msgstr "Debe especificarse un nombre y un valor"
msgid "Edit Person Data"
msgstr "Editar datos personales"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Nombre mostrado"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Apellidos"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Nombre"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Apodo"
#: 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 "Direcci坦n de correo"
@@ -1871,7 +1871,7 @@ msgstr "Arriba"
msgid "Move Down"
msgstr "Abajo"
-#: 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 "Modificar"
@@ -1899,7 +1899,7 @@ msgstr "El fichero parece correcto."
msgid "File does not appear to be a valid address book format."
msgstr "No parece que el fichero est辿 en el formato de la agenda."
-#: 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 "No se pudo leer del fichero."
@@ -1907,11 +1907,11 @@ msgstr "No se pudo leer del fichero."
msgid "Edit Addressbook"
msgstr "Editar agenda"
-#: 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 " Comprobar fichero "
-#: 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 "Fichero"
@@ -1979,29 +1979,29 @@ msgstr "Nueva carpeta"
msgid "Input the name of new folder:"
msgstr "Nombre de la nueva carpeta:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "No parece que ese fichero est辿 en formato JPilot."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Seleccionar fichero JPilot"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Editar entrada 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 "Elemento(s) adicional(es) de la direcci坦n"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "A単adir nueva entrada JPilot"
@@ -2083,44 +2083,44 @@ msgstr ""
"No se pudo leer la base de b炭squeda del servidor - por favor, config炭rela "
"manualmente"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "No parece que el fichero est辿 en formato vCard."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Seleccionar fichero vCard"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Editar entrada vCard"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "A単adir nueva entrada vCard"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Exportar"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Especificar directorio destino y fichero mbox."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Directorio de origen:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Fichero de exportaci坦n:"
-#: 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 " Seleccionar..."
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Seleccione fichero de exportaci坦n"
@@ -2447,119 +2447,175 @@ msgstr "Creando vista de imagen...\n"
msgid "Can't load the image."
msgstr "No se puede cargar la imagen."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Importar"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Especifique fichero mbox y carpeta de destino."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Importando fichero:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Directorio de destino:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Seleccionar fichero a importar"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Especifique el nombre de la agenda y el fichero a importar."
-#: 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 "Seleccione y renombre los campos LDIF a importar."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Fichero importado."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Seleccione un fichero."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Debe proporcionar un nombre de agenda de direcciones."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Error leyendo los campos LDIF."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "Fichero LDIF importado con 辿xito."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Seleccionar fichero LDIF"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Seleccionar fichero vCard"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Nombre del fichero"
-#: 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 "Campo LDIF"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Nombre de atributo"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Agenda de direcciones :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Atributo"
+#: 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 "Seleccionar"
+#: 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 "Arriba"
+
+#: 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 "Abajo"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Agenda de direcciones :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Nombre de fichero :"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Registros :"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Importar fichero LDIF a la agenda"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Anterior"
-
-#: 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 "Siguiente"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Anterior"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Informaci坦n de fichero"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Atributos"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "Campo LDIF"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Finalizar"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Seleccione y renombre los campos LDIF a importar."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Error leyendo los campos LDIF."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "Fichero LDIF importado con 辿xito."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Seleccionar fichero LDIF"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "Campo LDIF"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Nombre de atributo"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Atributo"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Seleccionar"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importar fichero LDIF a la agenda"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Atributos"
+
#: src/inc.c:160
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2729,7 +2785,7 @@ msgid "Socket error."
msgstr "Error de 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 "Conexi坦n cerrada por la m叩quina remota."
@@ -2746,11 +2802,11 @@ msgstr ""
"El buz坦n est叩 bloqueado:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "La autentificaci坦n fall坦."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2759,15 +2815,15 @@ msgstr ""
"La autentificaci坦n fall坦:\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 "Se agot坦 el tiempo de espera de la sesi坦n."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "Incorporaci坦n cancelada\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Obteniendo nuevos mensajes desde %s en %s...\n"
@@ -3883,15 +3939,15 @@ msgstr ""
"Si quiere lanzarlo, gu叩rdelo en alg炭n lugar y aseg炭rese de que no es un "
"virus u otro tipo de software malintencionado."
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Frase contrase単a"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[sin id de usuario]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3904,7 +3960,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4418,18 +4474,6 @@ msgstr " Ayuda sintaxis "
msgid "Registered actions"
msgstr "Acciones registradas"
-#: 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 "Arriba"
-
-#: 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 "Abajo"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Nueva)"
@@ -6215,11 +6259,11 @@ msgstr "Enviando mensaje (%d / %d bytes)"
msgid "Sending message"
msgstr "Enviando mensaje"
-#: 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 "Hubo un error enviando el mensaje."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/et.po b/po/et.po
index 6e6066af..1b06dc8e 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,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: 2002-10-02 09:08+0300\n"
"Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -688,8 +688,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 "Nimi"
@@ -827,7 +827,7 @@ msgid "Address"
msgstr "Aadress"
#: 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 "M辰rkused"
@@ -1073,19 +1073,19 @@ msgstr "Kaust ja aadressid"
msgid "Really delete `%s' ?"
msgstr "Kas t探esti kustutada `%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 "Uus kasutaja, ei saanud salvestada indeksifaili."
-#: 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 "Uus kasutaja, ei saanud salvestada aadressiraamatu faile."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Vana aadressiraamat uuendati edukalt."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1093,7 +1093,7 @@ msgstr ""
"Vana aadressiraamat uuendati.\n"
"ei saanud salvestada uut aadresside indeksifaili"
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1101,7 +1101,7 @@ msgstr ""
"Ei saanud uuendada aadressiraamatut,\n"
"kuid loodi uued ja t端hjad aadressiraamatu failid."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1109,7 +1109,7 @@ msgstr ""
"Ei suutnud uuendada aadressiraamatut,\n"
"ei suutnud luua uusi aadressiraamatu faile."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1117,91 +1117,91 @@ msgstr ""
"Ei suutnud uuendada aadressiraamatut,\n"
"ja ei suutnud luua uut aadressiraamatu faile."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Aadressiraamatu uuendamise viga"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Aadressiraamat viiakse uude formaati"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Aadressiraamatu viga"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Ei suutnud lugeda aadresside indeksit"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"Uuendati vana aadressiraamat, kuid ei suudetud salvestada uut indeksifaili"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Ei suutnud uuendada aadressiraamatut, kuid loodi t端hjad ja uued "
"aadressiraamatu failid."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Ei suutnud uuendada aadressiraamatut, ei suutnud luua uusi aadressiraamatu "
"faile."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Ei suutnud uuendada aadressiraamatut ja ei suutnud luua uusi aadressiraamatu "
"faile."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Aadressiraamatu uuendamise viga"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Aadressiraamatu uuendamine"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Kasutajaliides"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Aadressiraamat"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Persoon"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "EPosti Aadress"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Grupp"
#. 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 "Kaust"
-#: src/addressbook.c:3256
+#: src/addressbook.c:3264
msgid "vCard"
msgstr "V-Kaart"
-#: src/addressbook.c:3272 src/addressbook.c:3288
+#: src/addressbook.c:3280 src/addressbook.c:3296
msgid "JPilot"
msgstr "JPiloot"
-#: src/addressbook.c:3304
+#: src/addressbook.c:3312
msgid "LDAP Server"
msgstr "LDAP Server"
@@ -1887,24 +1887,24 @@ msgstr "Nimi ja V辰辰rtus tulevad lisada."
msgid "Edit Person Data"
msgstr "Muuda persooni andmeid"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Ekraani nimi"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Perekonnanimi"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Eesnii"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "H端端dnimi"
#: 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 "E-Posti aadress"
@@ -1921,7 +1921,7 @@ msgstr "Liiguta 端lesse"
msgid "Move Down"
msgstr "Liiguta alla"
-#: 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 "Muuda"
@@ -1949,7 +1949,7 @@ msgstr "Fail paistab olevad korras."
msgid "File does not appear to be a valid address book format."
msgstr "Failid ei paista olevat 探iges aadressiraamatu formaadis."
-#: 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 "Ei suutnud lugeda faili."
@@ -1957,11 +1957,11 @@ msgstr "Ei suutnud lugeda faili."
msgid "Edit Addressbook"
msgstr "Redigeeri aadressiraamatut"
-#: 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 " Kontrolli faili "
-#: 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 "Fail"
@@ -2029,29 +2029,29 @@ msgstr "Uus kaust"
msgid "Input the name of new folder:"
msgstr "Sisesta uue kausta nimi:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Fail ei paista olevat jPilot formaadis."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Vali JPilot Fail"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Redigeeri JPilot sissekannet"
-#: 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 "Lisanduv E-Posti aadressi sissekanded"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Lisa uus JPilot'i sissekanne"
@@ -2131,44 +2131,44 @@ msgstr "V探imalikud otsingu baasid"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Ei suutnud lugeda otsingu baase serverist - palu m辰辰ra k辰sitsi"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Fail ei paista olevat vCard formaadis"
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Vali vCard Fail"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Redigeeri vCard sissekannet"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Lisa uus vCard sissekanne"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "V辰ljasta"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "M辰辰ra sihtkaust ja kirjakasti (mbox) fail"
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "L辰hte kataloog"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "V辰ljastatav fail:"
-#: 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 " Vali... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Vali v辰ljastatav fail"
@@ -2505,119 +2505,175 @@ msgstr "Loon pildi vaadet...\n"
msgid "Can't load the image."
msgstr "Ei suuda lugeda pilti."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Impordi"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "*M辰rgi v探tav mbox fail ja sihtkaust."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Faili importimine:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Sihtkataloog:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "M辰rgi importiv fail"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Palun m辰辰ra aadressiraamatu nimi ja fail mida importida."
-#: 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 "M辰rgi ja nimeta LDIF v辰lja nimed 端mber, mida importida."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Fail imporditud."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Palun valige fail."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Aadressiraamatu nimi peab olema antud."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Viga LDIF faili lugemisel."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "LDIF fail sisestati edukalt."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Vali LDIF fail"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Vali vCard Fail"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Faili Nimi"
-#: 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 V辰li"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Atribuudi nimi"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Aadressiraamat :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Atribuudid"
+#: 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 "Vali"
+#: 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 "les"
+
+#: 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 "Alla"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Aadressiraamat :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Faili nimi:"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Salvestisi :"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Impordi LDIF fail aadressiraamatusse"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Eelm"
-
-#: 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 "J辰rgmine"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Eelm"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Faili-info"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Atribuudid"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "LDIF V辰li"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Soome"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "M辰rgi ja nimeta LDIF v辰lja nimed 端mber, mida importida."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Viga LDIF faili lugemisel."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "LDIF fail sisestati edukalt."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Vali LDIF fail"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "LDIF V辰li"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Atribuudi nimi"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Atribuudid"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Vali"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Impordi LDIF fail aadressiraamatusse"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Atribuudid"
+
#: src/inc.c:160
#, fuzzy, c-format
msgid "Sylpheed: %d new messages"
@@ -2789,7 +2845,7 @@ msgid "Socket error."
msgstr "Soketi viga\n"
#. 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 ""
@@ -2804,27 +2860,27 @@ msgid ""
"%s"
msgstr "Kirjakast on lukus."
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
#, fuzzy
msgid "Authentication failed."
msgstr "Autoriseerimise meetod"
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, fuzzy, c-format
msgid ""
"Authentication failed:\n"
"%s"
msgstr "Autoriseerimise meetod"
-#: 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 "Sissekanne peatatud\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "V探tame uued teated %s-ist %s-i.\n"
@@ -3951,15 +4007,15 @@ msgid ""
"virus or something like a malicious program."
msgstr ""
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Paroolifraas"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[pole kasutaja id-t]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3972,7 +4028,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4495,18 +4551,6 @@ msgstr " S端ntaksi abi "
msgid "Registered actions"
msgstr "Registreeritud tegevused"
-#: 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 "les"
-
-#: 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 "Alla"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Uus)"
@@ -6367,11 +6411,11 @@ msgstr "Saadan kirja (%d / %d baiti)"
msgid "Sending message"
msgstr "Saadan kirja"
-#: 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 "Kirja saatmisel tekkis viga."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, fuzzy, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/fr.po b/po/fr.po
index dd1714f3..d7b0c979 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,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: 2007-04-03 13:24+0200\n"
"Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
"Language-Team: French <gnomefr@traduc.org>\n"
@@ -698,8 +698,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 "Nom"
@@ -837,7 +837,7 @@ msgid "Address"
msgstr "Adresse"
#: 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 "Remarques"
@@ -1078,20 +1078,20 @@ msgstr "Dossier et _adresses"
msgid "Really delete `%s' ?"
msgstr "Voulez-vous vraiment supprimer 束 %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 "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
-#: 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 ""
"Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Ancien carnet d'adresses converti avec succ竪s."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1099,7 +1099,7 @@ msgstr ""
"Ancien carnet d'adresses converti,\n"
"mais impossible d'enregistrer le nouveau fichier index."
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1107,7 +1107,7 @@ msgstr ""
"chec lors de la conversion de l'ancien carnet d'adresses.\n"
"Cr辿ation d'un nouveau carnet d'adresses vide."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1115,7 +1115,7 @@ msgstr ""
"chec lors de la conversion du carnet d'adresses.\n"
"Impossible de cr辿er un nouveau carnet d'adresses vide."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1123,92 +1123,92 @@ msgstr ""
"chec lors de la conversion du carnet d'adresses\n"
"et lors de la cr辿ation d'un nouveau carnet d'adresses."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Erreur de conversion du carnet d'adresses"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Conversion de carnets d'adresses"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Erreur dans le carnet d'adresses"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "chec lors de la lecture de l'index des adresses"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"Ancien carnet d'adresses converti, mais 辿chec lors de l'辿criture du fichier "
"index"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"chec lors de la conversion du carnet d'adresses. Cr辿ation d'un nouveau "
"carnet d'adresses vide."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"chec lors de la conversion du carnet d'adresses et lors de la cr辿ation d'un "
"nouveau carnet d'adresses vide."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"chec lors de la conversion du carnet d'adresses et lors de la cr辿ation d'un "
"nouveau carnet d'adresses vide."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Erreur de conversion du carnet d'adresses"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Conversion de carnets d'adresses"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Interface"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Carnet d'adresses"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Personne"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "Adresse 辿lectronique"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Groupe"
#. 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 "Dossier"
-#: 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 "Serveur LDAP"
@@ -1856,24 +1856,24 @@ msgstr "Un nom et une valeur doivent 棚tre donn辿s."
msgid "Edit Person Data"
msgstr "dition des coordonn辿es d'une personne"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Nom affich辿"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Nom"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Pr辿nom"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Surnom"
#: 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 "Adresse 辿lectronique"
@@ -1890,7 +1890,7 @@ msgstr "Plus haut"
msgid "Move Down"
msgstr "Plus bas"
-#: 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 "Modifier"
@@ -1918,7 +1918,7 @@ msgstr "Le fichier semble correct."
msgid "File does not appear to be a valid address book format."
msgstr "Le fichier ne semble pas avoir le format du carnet d'adresses."
-#: 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 "Impossible de lire le fichier."
@@ -1926,11 +1926,11 @@ msgstr "Impossible de lire le fichier."
msgid "Edit Addressbook"
msgstr "dition du carnet d'adresses"
-#: 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 " V辿rifier le fichier "
-#: 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 "Fichier"
@@ -2000,29 +2000,29 @@ msgstr "Nouveau dossier"
msgid "Input the name of new folder:"
msgstr "Saisissez le nom du nouveau dossier :"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Le fichier ne semble pas avoir le format JPilot."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Choisir le fichier importer"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "dition de donn辿es 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 "Adresses 辿lectroniques suppl辿mentaires"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Ajouter une donn辿e JPilot"
@@ -2102,45 +2102,45 @@ msgstr "Base(s) disponible(s)"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Impossible d'obtenir les bases du serveur - d辿finir manuellement"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Le fichier ne semble pas avoir le format vCard."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "S辿lection d'un fichier vCard"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "dition d'une entr辿e vCard"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Ajouter une entr辿e vCard"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Exporter"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr ""
"Veuillez indiquer le dossier exporter et le nom du nouveau fichier mbox."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Dossier exporter :"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Fichier mbox :"
-#: 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 " Choisir... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "S辿lection du fichier export辿"
@@ -2468,121 +2468,177 @@ msgstr "Cr辿ation de la vue de l'image...\n"
msgid "Can't load the image."
msgstr "Impossible de charger l'image."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Importer"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr ""
"Veuillez indiquer le fichier mbox importer et le dossier destinataire"
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Fichier mbox :"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Dossier destinataire :"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Choix du fichier importer"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr ""
"Entrer le nom du nouveau carnet d'adresses et celui du fichier importer."
-#: 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 "S辿lectionner et renommer les champs LDIF importer."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Fichier import辿."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Veuillez s辿lectionner une fichier."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Le nom du carnet d'adresses doit 棚tre indiqu辿."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Erreur lors de la lecture des champs LDIF."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "Fichier LDIF import辿 avec succ竪s."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "S辿lection d'un fichier LDIF"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "S辿lection d'un fichier vCard"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Nom du fichier"
-#: 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 "Champ LDIF"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Attribut"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Carnet d'adresses :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Attribut"
+#: 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 "S辿lectionner"
+#: 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 "Plus haut"
+
+#: 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 "Plus bas"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Carnet d'adresses :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Nom de fichier :"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Enregistrements :"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Importation d'un fichier LDIF dans un carnet d'adresses"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Pr辿c辿dent"
-
-#: 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 "Suivant"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Pr辿c辿dent"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Propri辿t辿s du fichier"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Attributs"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "Champ LDIF"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Termin辿"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "S辿lectionner et renommer les champs LDIF importer."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Erreur lors de la lecture des champs LDIF."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "Fichier LDIF import辿 avec succ竪s."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "S辿lection d'un fichier LDIF"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "Champ LDIF"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Attribut"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Attribut"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "S辿lectionner"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importation d'un fichier LDIF dans un carnet d'adresses"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Attributs"
+
#: src/inc.c:160
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2751,7 +2807,7 @@ msgid "Socket error."
msgstr "Erreur de protocole."
#. 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 "La connexion a 辿t辿 ferm辿e par le serveur."
@@ -2768,11 +2824,11 @@ msgstr ""
"Bo樽te verrouill辿e :\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "L'authentification 辿chou辿."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2781,15 +2837,15 @@ msgstr ""
"L'authentification a 辿chou辿 :\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 "D辿passement du d辿lai de r辿ponse (timeout) de la session."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "Rel竪ve du courrier annul辿e\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "R辿cup辿ration des nouveaux messages de %s dans %s...\n"
@@ -3910,15 +3966,15 @@ msgstr ""
"Vous pouvez l'enregistrer quelque part pour le lancer vous-m棚me, mais prenez "
"les pr辿cautions d'usage (anti-virus, etc.)."
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Phrase secr竪te"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[pas d'ID utilisateur]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3931,7 +3987,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4445,18 +4501,6 @@ msgstr " Aide "
msgid "Registered actions"
msgstr "Actions enregistr辿es"
-#: 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 "Plus haut"
-
-#: 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 "Plus bas"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Nouveau)"
@@ -6238,11 +6282,11 @@ msgstr "Envoi du message (%d / %d octets)"
msgid "Sending message"
msgstr "Envoi de message"
-#: 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 "Une erreur est survenue pendant l'envoi de message."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/gl.po b/po/gl.po
index 70f89a2d..2fcb9438 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,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: 2003-01-17 10:05+0100\n"
"Last-Translator: Jorge Rivas\n"
"Language-Team: Jorge Rivas\n"
@@ -686,8 +686,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 "Nome"
@@ -825,7 +825,7 @@ msgid "Address"
msgstr "Enderezo"
#: 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 "Notas"
@@ -1071,19 +1071,19 @@ msgstr "Carpeta e enderezos"
msgid "Really delete `%s' ?"
msgstr "多Borrar realmente `%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 "Novo usuario, non se puido gardar o ficheiro 鱈ndice."
-#: 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 "Novo usuario, non se puido gardar os ficheiros de enderezos"
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Antiga axenda de enderezos convertida con 辿xito"
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1091,7 +1091,7 @@ msgstr ""
"Antiga axenda de enderezos convertida,\n"
"non se puido gardar o novo ficheiro 鱈ndice"
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1099,7 +1099,7 @@ msgstr ""
"Non se puido convertir a antiga axenda,\n"
"pero crearonse novos ficheiros valeiros."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1107,7 +1107,7 @@ msgstr ""
"Non se puido convertir a antiga axenda,\n"
"Non se puideron crear os ficheiros para a nova."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1115,92 +1115,92 @@ msgstr ""
"Non se puido convertir a antiga axenda\n"
"e non se puideron crear ficheiros para unha nova."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Error na conversi坦n da axenda"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Conversi坦n da axenda"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Error na axenda"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Non se puido ler o 鱈ndice de enderezos"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"Antiga axenda de enderezos convertida, non se puido gardar o novo ficheiro "
"鱈ndice"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Non se puido convertir a antiga axenda, pero se crearon novos ficheiros "
"valeiros."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Non se puido convertir a antiga axenda, non se puideron crear os ficheiros "
"para a nova."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Non se puido convertir a antiga axenda e non se puideron crear ficheiros "
"para unha nova."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Erro na conversi坦n da axenda"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Conversi坦n da axenda"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Interfaz"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Axenda de enderezos"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Persoa"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "Enderezo e-mail"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Grupo"
#. 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 "Carpeta"
-#: 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 "Servidor LDAP"
@@ -1885,24 +1885,24 @@ msgstr "Debe especificarse un Nome e un Valor"
msgid "Edit Person Data"
msgstr "Editar datos persoais"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Nome mostrado"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Apelidos"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Nome"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Alcume"
#: 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 "Enderezo e-mail"
@@ -1919,7 +1919,7 @@ msgstr "Arriba"
msgid "Move Down"
msgstr "Abaixo"
-#: 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 "Modificar"
@@ -1947,7 +1947,7 @@ msgstr "O ficheiro parece correcto."
msgid "File does not appear to be a valid address book format."
msgstr "Non parece que o ficheiro est辿 no formato da axenda."
-#: 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 "Non se puido leer do ficheiro."
@@ -1955,11 +1955,11 @@ msgstr "Non se puido leer do ficheiro."
msgid "Edit Addressbook"
msgstr "Editar axenda"
-#: 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 " Comprobar ficheiro "
-#: 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 "Ficheiro"
@@ -2027,29 +2027,29 @@ msgstr "Nova carpeta"
msgid "Input the name of new folder:"
msgstr "Nome da nova carpeta:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Non parece que ese ficheiro est辿 en formato JPilot."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Seleccionar ficheiro JPilot"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Editar entrada 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 "Elemento(s) adicional(is) do enderezo"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Engadir nova entrada JPilot"
@@ -2130,44 +2130,44 @@ msgid "Could not read Search Base(s) from server - please set manually"
msgstr ""
"Non puiden ler a base de b炭squeda do servidor - config炭re-a manualmente"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Non parece que o ficheiro est辿 en formato vCard."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Seleccionar Ficheiro vCard"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Editar entrada vCard"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Engadir nova entrada vCard"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Exportar"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Especifique a carpeta orixen e ficheiro mbox."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Carpeta orixen:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Ficheiro de exportaci坦n:"
-#: 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 "Seleccionar..."
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Seleccione ficheiro de exportaci坦n"
@@ -2501,119 +2501,175 @@ msgstr "Creando vista de imaxen...\n"
msgid "Can't load the image."
msgstr "Non se pode cargar a imaxen."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Importar"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Especifique ficheiro mbox e carpeta de desti単o."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Ficheiro a importar:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Carpeta de desti単o:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Seleccionar ficheiro a importar"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Especifique o nome da axenda e o ficheiro a importar."
-#: 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 "Seleccione e renomee os campos LDIF a importar."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Ficheiro importado."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Seleccione un ficheiro."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Debe proporcionar un nome de axenda de enderezos."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Erro lendo os campos LDIF."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "Ficheiro LDIF importado con 辿xito."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Seleccionar ficheiro LDIF"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Seleccionar Ficheiro vCard"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Nome do ficheiro"
-#: 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 "Campo LDIF"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Nome de atributo"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Axenda de enderezos :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Atributo"
+#: 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 "Seleccionar"
+#: 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 "Arriba"
+
+#: 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 "Abaixo"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Axenda de enderezos :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Nome de ficheiro :"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Rexistros :"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Importar ficheiro LDIF na axenda"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Anterior"
-
-#: 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 "Seguinte"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Anterior"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Informaci坦n de ficheiro"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Atributos"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "Campo LDIF"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Finalizar"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Seleccione e renomee os campos LDIF a importar."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Erro lendo os campos LDIF."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "Ficheiro LDIF importado con 辿xito."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Seleccionar ficheiro LDIF"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "Campo LDIF"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Nome de atributo"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Atributo"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Seleccionar"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importar ficheiro LDIF na axenda"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Atributos"
+
#: src/inc.c:160
#, fuzzy, c-format
msgid "Sylpheed: %d new messages"
@@ -2785,7 +2841,7 @@ msgid "Socket error."
msgstr "Error de 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 ""
@@ -2802,12 +2858,12 @@ msgstr ""
"a caixa de correo esta bloqueada:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
#, fuzzy
msgid "Authentication failed."
msgstr "Fallo de autenticaci坦n"
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, fuzzy, c-format
msgid ""
"Authentication failed:\n"
@@ -2816,15 +2872,15 @@ msgstr ""
"Fallo de autenticaci坦n:\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 "Incorporaci坦n cancelada\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Obtendo novos mensaxes dende %s en %s...\n"
@@ -3952,15 +4008,15 @@ msgid ""
"virus or something like a malicious program."
msgstr ""
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Frase contrasinal"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[sin id usuario]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3973,7 +4029,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4493,18 +4549,6 @@ msgstr " Axuda sintaxis "
msgid "Registered actions"
msgstr "Accions rexistradas"
-#: 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 "Arriba"
-
-#: 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 "Abaixo"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Nova)"
@@ -6361,11 +6405,11 @@ msgstr "Enviando mensaxe (%d / %d bytes)"
msgid "Sending message"
msgstr "Enviando mensaxe"
-#: 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 "Ocurriu un erro enviando as mensaxes."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/hr.po b/po/hr.po
index c78ead92..2bee2941 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,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: 2001-09-17 13:22+0100\n"
"Last-Translator: Ante Karamati <ante@cdnet.com.hr>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -693,8 +693,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 "Ime"
@@ -829,7 +829,7 @@ msgid "Address"
msgstr "Adresa"
#: 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 "Bilje邸ke"
@@ -1076,19 +1076,19 @@ msgstr "Spis i adrese"
msgid "Really delete `%s' ?"
msgstr "Uistinu obrisati `%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 "Novi korisnik, ne mogu spretmiti index datoteku."
-#: 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 "Novi korisnik, ne mogu spremiti datoteke adresara."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Stari adresar uspje邸no une邸en."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1096,7 +1096,7 @@ msgstr ""
"Stari adresar ne mo転e biti une邸en,\n"
"ne mogu spremiti novu index datoteku adresara."
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1104,7 +1104,7 @@ msgstr ""
"Ne mogu unjeti adesar,\n"
"ali sam kreirao nove prazne datoteke adresara."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1112,7 +1112,7 @@ msgstr ""
"Ne mogu unjeti adresar,\n"
"ne mogu kreirati nove datoteke adresara."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1120,85 +1120,85 @@ msgstr ""
"Ne mogu unjeti adresar,\n"
"i ne mogu stvoriti nove datoteke adresara."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Gre邸ka pri unosu adresara"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Unos adresara"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Gre邸ka adresara"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Ne mogu itati index adresara"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr "Stari adresar une邸en, ne mogu spremiti index datoteke novih adresa"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr "Ne mogu unjeti adresar, kreiram prazne datoteke novog adresara."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr "Ne mogu unjeti adresar, ne mogu kreirati nove datoteke adresara."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr "Ne mogu unjeti adresar i ne mogu kreirati nove datoteke adresara."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Gre邸ka pri unosu adresara"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Unos adresara"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Suelje"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Adresar"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Osoba"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "E-mail adresa"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Grupa"
#. 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 "Spis"
-#: src/addressbook.c:3256
+#: src/addressbook.c:3264
msgid "vCard"
msgstr "V-kartica"
-#: src/addressbook.c:3272 src/addressbook.c:3288
+#: src/addressbook.c:3280 src/addressbook.c:3296
#, fuzzy
msgid "JPilot"
msgstr "J-Pilot"
-#: src/addressbook.c:3304
+#: src/addressbook.c:3312
msgid "LDAP Server"
msgstr "LDAP Poslu転itelj"
@@ -1893,24 +1893,24 @@ msgstr "Ime i iznos moraju biti upisani."
msgid "Edit Person Data"
msgstr "Uredi osobne podatke"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Prikaz imena"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Prezime"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Ime"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Nadimak"
#: 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 "E-mail adresa"
@@ -1927,7 +1927,7 @@ msgstr "Pomakni gore"
msgid "Move Down"
msgstr "Pomakni dolje"
-#: 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 "Promjeni"
@@ -1955,7 +1955,7 @@ msgstr "Datoteka je U redu"
msgid "File does not appear to be a valid address book format."
msgstr "Datoteka nije u formatu adresara."
-#: 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 "Ne mogu itati datoteku."
@@ -1963,11 +1963,11 @@ msgstr "Ne mogu itati datoteku."
msgid "Edit Addressbook"
msgstr "Uredi adresar"
-#: 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 " Provjeri datoteku "
-#: 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 "Datoteka"
@@ -2035,29 +2035,29 @@ msgstr "Novi spis"
msgid "Input the name of new folder:"
msgstr "Unesite ime novog spisa:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Datoteka nije JPilot formata."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Odaberite JPilot datoteku"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Uredite JPilot unos"
-#: 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 "Dodatne pojedinosti e-Mail adrese"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Dodajte novi JPilot unos"
@@ -2137,44 +2137,44 @@ msgstr "Dostupne Baze"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Ne mogu itati Baze Potrage sa servera - molim postavite runo"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Datoteka nije V-kartica formata."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Odaberite V-kartica datoteku"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Uredite V-kartica unose"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Dodaj Novi V-kartica Unos"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Iznesi"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Odredite ciljani spis i mbox datoteku."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Izvorni dir:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Iznosim datoteku:"
-#: 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 " Odaberite... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Odaberite datoteku za izno邸enje"
@@ -2516,131 +2516,186 @@ msgstr "Kreiram pregled slika...\n"
msgid "Can't load the image."
msgstr "Ne mogu prikazati sliku."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Uvezi"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Uvozim datoteku:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Destinacijski dir:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Odaberite datoteku za uvoz"
-#: 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
+msgid "Select and reorder CSV field names to import."
msgstr ""
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
#, fuzzy
msgid "File imported."
msgstr "Ime datoteke"
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Molim, odaberite datoteku."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Ime adresara mora biti une邸eno."
-#: src/importldif.c:341
+#: src/importcsv.c:515
#, fuzzy
-msgid "Error reading LDIF fields."
+msgid "Error reading CSV fields."
msgstr "Gre邸ka pri unosu LDIF datoteke."
-#: src/importldif.c:364
+#: src/importcsv.c:541
#, fuzzy
-msgid "LDIF file imported successfully."
+msgid "CSV file imported successfully."
msgstr "Stari adresar uspje邸no une邸en."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Odaberite LDIF datoteku"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Odaberite V-kartica datoteku"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
#, fuzzy
msgid "File Name"
msgstr "Ime datoteke"
-#: src/importldif.c:567
+#: src/importcsv.c:705 src/importldif.c:534
msgid "S"
msgstr ""
-#: src/importldif.c:568 src/importldif.c:618
+#: src/importcsv.c:706
#, fuzzy
-msgid "LDIF Field"
+msgid "CSV Field"
msgstr "Odaberite LDIF datoteku"
-#: src/importldif.c:569
+#: src/importcsv.c:707
#, fuzzy
-msgid "Attribute Name"
-msgstr "Atributi korisnika"
+msgid "Address Book Field"
+msgstr "Adresar"
-#: src/importldif.c:628
-#, fuzzy
-msgid "Attribute"
-msgstr "Atributi korisnika"
+#: 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 "Odaberi"
+#: 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 "Gore"
-#: src/importldif.c:690
+#: 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 "Dolje"
+
+#: src/importcsv.c:803 src/importldif.c:657
#, fuzzy
msgid "Address Book :"
msgstr "Adresar"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
#, fuzzy
msgid "File Name :"
msgstr "Ime datoteke"
-#: 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 "Unesi LDIF datoteku u Adresar"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
+#: src/importcsv.c:882 src/importldif.c:736 src/prefs_toolbar.c:69
+msgid "Next"
+msgstr "Slijedea"
+
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
#, fuzzy
msgid "Prev"
msgstr "Postav"
-#: src/importldif.c:770 src/prefs_toolbar.c:69
-msgid "Next"
-msgstr "Slijedea"
-
-#: src/importldif.c:799
+#: src/importcsv.c:915 src/importldif.c:769
#, fuzzy
msgid "File Info"
msgstr "Ime datoteke"
-#: src/importldif.c:800
+#: src/importcsv.c:916
#, fuzzy
-msgid "Attributes"
-msgstr "Atributi korisnika"
+msgid "Fields"
+msgstr "Odaberite LDIF datoteku"
-#: 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 ""
+
+#: src/importldif.c:345
+#, fuzzy
+msgid "Error reading LDIF fields."
+msgstr "Gre邸ka pri unosu LDIF datoteke."
+
+#: src/importldif.c:368
+#, fuzzy
+msgid "LDIF file imported successfully."
+msgstr "Stari adresar uspje邸no une邸en."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Odaberite LDIF datoteku"
+
+#: src/importldif.c:535 src/importldif.c:585
+#, fuzzy
+msgid "LDIF Field"
+msgstr "Odaberite LDIF datoteku"
+
+#: src/importldif.c:536
+#, fuzzy
+msgid "Attribute Name"
+msgstr "Atributi korisnika"
+
+#: src/importldif.c:595
+#, fuzzy
+msgid "Attribute"
+msgstr "Atributi korisnika"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Odaberi"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Unesi LDIF datoteku u Adresar"
+
+#: src/importldif.c:770
+#, fuzzy
+msgid "Attributes"
+msgstr "Atributi korisnika"
+
#: src/inc.c:160
#, fuzzy, c-format
msgid "Sylpheed: %d new messages"
@@ -2815,7 +2870,7 @@ msgid "Socket error."
msgstr "protokol gre邸ka\n"
#. 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 ""
@@ -2831,28 +2886,28 @@ msgid ""
"%s"
msgstr "Postavke sanduia"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
#, fuzzy
msgid "Authentication failed."
msgstr "Autorizacija"
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, fuzzy, c-format
msgid ""
"Authentication failed:\n"
"%s"
msgstr "Autorizacija"
-#: 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
#, fuzzy
msgid "Incorporation cancelled\n"
msgstr "Prima novu po邸tu"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Primam nove poruke s %s u %s...\n"
@@ -4049,15 +4104,15 @@ msgid ""
"virus or something like a malicious program."
msgstr ""
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Lozinka"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[nema ID korinika]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -4070,7 +4125,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4586,18 +4641,6 @@ msgstr ""
msgid "Registered actions"
msgstr "Registrirani obrasci"
-#: 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 "Gore"
-
-#: 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 "Dolje"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Novo)"
@@ -6462,11 +6505,11 @@ msgstr "aljem poruku (%d / %d bytea)"
msgid "Sending message"
msgstr "aljem poruku"
-#: 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 "Do邸lo je do gre邸ke prilikom slanja poruke."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, fuzzy, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/hu.po b/po/hu.po
index 0959608a..20206a20 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,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: 2007-02-17 19:22+0100\n"
"Last-Translator: N辿meth Tam叩s <ntomasz@vipmail.hu>\n"
"Language-Team: HUNGARIAN <NONE>\n"
@@ -687,8 +687,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 "N辿v"
@@ -827,7 +827,7 @@ msgid "Address"
msgstr "C鱈m"
#: 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 "Megjegyz辿sek"
@@ -1067,19 +1067,19 @@ msgstr "Mappa 辿s _c鱈mek"
msgid "Really delete `%s' ?"
msgstr "T辿nyleg t旦rli `%s' elemet?"
-#: 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 "Az 炭j felhaszn叩l坦 nem tudja menteni az index f叩jlt."
-#: 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 "Az 炭j felhaszn叩l坦 nem tudja menteni a c鱈mjegyz辿k f叩jlt."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "A r辿gi c鱈mjegyz辿k konvert叩l叩sa siker端lt."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1087,7 +1087,7 @@ msgstr ""
"A r辿gi c鱈mjegyz辿k konvert叩lva,\n"
"nem siker端lt menteni az 炭j c鱈m index f叩jlt."
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1095,7 +1095,7 @@ msgstr ""
"Nem siker端lt a c鱈mjegyz辿k konvert叩l叩sa,\n"
"de l辿trehoztam egy 端res 炭j c鱈mjegyz辿ket."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1103,7 +1103,7 @@ msgstr ""
"Nem siker端lt a c鱈mjegyz辿k konvert叩l叩sa,\n"
"辿s nem siker端lt az 炭j c鱈mjegyz辿k l辿trehoz叩sa sem."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1111,88 +1111,88 @@ msgstr ""
"Nem siker端lt a c鱈mjegyz辿k konvert叩l叩sa,\n"
"辿s nem siker端lt az 炭j c鱈mjegyz辿k l辿trehoz叩sa sem."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "C鱈mjegyz辿k konvert叩l叩si hiba"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "C鱈mjegyz辿k konvert叩l叩sa"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "C鱈mjegyz辿k hiba"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "C鱈m index olvas叩sa nem siker端lt"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"A r辿gi c鱈mjegyz辿k konvert叩lva, nem siker端lt menteni az 炭j c鱈m index f叩jlt."
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Nem konvert叩lhat坦 a c鱈mjegyz辿k, de l辿trehoztam egy 炭j 端res c鱈mjegyz辿ket."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Nem konvert叩lhat坦 a c鱈mjegyz辿k, 辿s nem hozhat坦 l辿tre 炭j c鱈mjegyz辿k sem."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Nem konvert叩lhat坦 a c鱈mjegyz辿k, 辿s nem hozhat坦 l辿tre 炭j c鱈mjegyz辿k sem."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "C鱈mjegyz辿k konverzi坦s hiba"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "C鱈mjegyz辿k konverzi坦"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Illeszt"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "C鱈mjegyz辿k"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Szem辿ly"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "Email c鱈m"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Csoport"
#. 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 "Mappa"
-#: 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 Szerver"
@@ -1838,24 +1838,24 @@ msgstr "Egy nevet 辿s 辿rt辿ket meg kell adnia."
msgid "Edit Person Data"
msgstr "Szem辿ly adatainak szerkeszt辿se"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "N辿v kijelz辿se"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Vezet辿kn辿v"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Keresztn辿v"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Becen辿v"
#: 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 "Email c鱈m"
@@ -1872,7 +1872,7 @@ msgstr "Mozgat叩s fel"
msgid "Move Down"
msgstr "Mozgat叩s le"
-#: 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 "M坦dos鱈t"
@@ -1900,7 +1900,7 @@ msgstr "A f叩jl j坦nak t撤nik."
msgid "File does not appear to be a valid address book format."
msgstr "A f叩jl nem t撤nik 辿rv辿nyes c鱈mjegyz辿knek."
-#: 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 "A f叩jl nem olvashat坦."
@@ -1908,11 +1908,11 @@ msgstr "A f叩jl nem olvashat坦."
msgid "Edit Addressbook"
msgstr "C鱈mjegyz辿k szerkeszt辿se"
-#: 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 " F叩jl ellenrz辿se"
-#: 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 "F叩jl"
@@ -1980,29 +1980,29 @@ msgstr "j mappa"
msgid "Input the name of new folder:"
msgstr "Az 炭j mappa neve:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "A f叩jl nem t撤nik JPilot form叩tum炭nak."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "JPilot f叩jl v叩laszt叩sa"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "JPilot bejegyz辿s szerkeszt辿se"
-#: 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 "Tov叩bbi Email c鱈mek"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "j JPilot bejegyz辿s hozz叩ad叩sa"
@@ -2082,44 +2082,44 @@ msgstr "El辿rhet keres辿si b叩zis(ok)"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Keres辿si b叩zis(ok) nem olvashat坦(k) a szerverrl - 叩ll鱈tsa be k辿zzel"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "A f叩jl nem t撤nik vCard form叩tum炭nak."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "vCard f叩jl kiv叩laszt叩sa"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "vCard bejegyz辿s szerkeszt辿se"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "j vCard bejegyz辿s hozz叩ad叩sa"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Export叩l叩s"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Adjon meg c辿lmapp叩t 辿s mbox f叩jlt!"
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Forr叩smappa:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Export叩l叩s f叩jlba:"
-#: 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 " Kiv叩laszt... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Export叩land坦 f叩jl v叩laszt叩s"
@@ -2446,119 +2446,175 @@ msgstr "K辿p n辿zet l辿trehoz叩sa...\n"
msgid "Can't load the image."
msgstr "Nem lehet bet旦lteni a k辿pet."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Import叩l叩s"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Adja meg a c辿lf叩jlt 辿s a c辿lmapp叩t!"
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "F叩jl import叩l叩s:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "C辿lk旦nyvt叩r:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Import叩land坦 f叩jl v叩laszt叩sa"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Adja meg a c鱈mjegyz辿k mappa 辿s f叩jl nev辿t az import叩l叩shoz."
-#: 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 meznevek kiv叩laszt叩sa 辿s 叩tnevez辿se az importhoz."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "F叩jl import叩lva."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "V叩lasszon egy f叩jlt."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "C鱈mjegyz辿k nevet meg kell adnia."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Hiba az LDIF mezk olvas叩sakor."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "LDIF f叩jl import叩l叩sa siker端lt."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "LDIF f叩jl v叩laszt叩s"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "vCard f叩jl kiv叩laszt叩sa"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "F叩jln辿v"
-#: 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 mez"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Tulajdons叩g n辿v"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "C鱈mjegyz辿k:"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Tulajdons叩g"
+#: 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 "V叩laszt"
+#: 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 "Fel"
+
+#: 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 "Le"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "C鱈mjegyz辿k:"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "F叩jln辿v:"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Rekordok:"
-#: 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 f叩jl import叩l叩sa a c鱈mjegyz辿kbe"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Elz"
-
-#: 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 "K旦vetkez"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Elz"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "F叩jl inform叩ci坦"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Tulajdons叩gok"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "LDIF mez"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "V辿ge"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "LDIF meznevek kiv叩laszt叩sa 辿s 叩tnevez辿se az importhoz."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Hiba az LDIF mezk olvas叩sakor."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "LDIF f叩jl import叩l叩sa siker端lt."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "LDIF f叩jl v叩laszt叩s"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "LDIF mez"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Tulajdons叩g n辿v"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Tulajdons叩g"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "V叩laszt"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "LDIF f叩jl import叩l叩sa a c鱈mjegyz辿kbe"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Tulajdons叩gok"
+
#: src/inc.c:160
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2727,7 +2783,7 @@ msgid "Socket error."
msgstr "Socket hiba."
#. 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 "A t叩voli f辿l bez叩rta a kapcsolatot."
@@ -2744,11 +2800,11 @@ msgstr ""
"A postafi坦k z叩rolt:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "Az azonos鱈t叩s nem siker端lt."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2757,15 +2813,15 @@ msgstr ""
"Az azonos鱈t叩s nem siker端lt:\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 "Menet idt炭ll辿p辿se."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "Fogad叩s megszak鱈tva\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "%s 炭j leveleinek let旦lt辿se a(z) %s mapp叩ba...\n"
@@ -3877,15 +3933,15 @@ msgstr ""
"Ha futtatni szeretn辿, mentse el valahov叩, 辿s gyzdj旦n meg r坦la, hogy nem "
"egy v鱈rus vagy m叩s k叩rt辿kony program."
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Jelmondat"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[nincs felhaszn叩l坦i azonos鱈t坦]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3898,7 +3954,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4409,18 +4465,6 @@ msgstr " Szintaxis s炭g坦 "
msgid "Registered actions"
msgstr "Regisztr叩lt m撤veletek"
-#: 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 "Fel"
-
-#: 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 "Le"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(j)"
@@ -6196,11 +6240,11 @@ msgstr "Lev辿l k端ld辿se (%d / %d b叩jt)"
msgid "Sending message"
msgstr "Lev辿l k端ld辿se"
-#: 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 "Hiba t旦rt辿nt a lev辿lk端ld辿s k旦zben."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/it.po b/po/it.po
index 31ca1b4c..1df7efcb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 2.2.9\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: 2006-10-14 11:32+0200\n"
"Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
@@ -687,8 +687,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 "Nome"
@@ -826,7 +826,7 @@ msgid "Address"
msgstr "Indirizzo"
#: 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 "Note"
@@ -1070,19 +1070,19 @@ msgstr "Cartella e _indirizzi"
msgid "Really delete `%s' ?"
msgstr "Eliminare 束%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 "Nuovo utente, impossibile salvare il file indice."
-#: 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 "Nuovo utente, impossibile salvare i file della rubrica."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "La vecchia rubrica 竪 stata convertita con successo."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1090,7 +1090,7 @@ msgstr ""
"Vecchia rubrica convertita,\n"
"impossibile salvare il nuovo file indice dell'indirizzo"
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1098,7 +1098,7 @@ msgstr ""
"Impossibile convertire la rubrica,\n"
"ma ho creato nuovi file vuoti della rubrica."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1106,7 +1106,7 @@ msgstr ""
"Impossibile convertire la rubrica,\n"
"impossibile creare i nuovi file della rubrica."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1114,92 +1114,92 @@ msgstr ""
"Impossibile convertire la rubrica,\n"
"e impossibile creare i nuovi file della rubrica."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Errore di conversione della rubrica"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Conversione della rubrica"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Errore nella rubrica"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Impossibile leggere l'indice dell'indirizzo"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"Vecchia rubrica convertita, impossibile salvare il nuovo file indice "
"dell'indirizzo"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Impossibile convertire la rubrica, ma ho creato nuovi file vuoti della "
"rubrica."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Impossibile convertire la rubrica, impossibile creare i nuovi file della "
"rubrica."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Impossibile convertire la rubrica e impossibile creare i nuovi file della "
"rubrica."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Errore di conversione della rubrica"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Conversione della rubrica"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Interfaccia"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Rubrica"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Persona"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "Indirizzo email"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Gruppo"
#. 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 "Cartella"
-#: 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 "Server LDAP"
@@ -1848,24 +1848,24 @@ msgstr "Devono essere forniti un nome e un valore."
msgid "Edit Person Data"
msgstr "Modifica i dati della persona"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Nome da visualizzare"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Ultimo nome"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Primo nome"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Nick"
#: 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 "Indirizzo e-mail"
@@ -1882,7 +1882,7 @@ msgstr "Sposta su"
msgid "Move Down"
msgstr "Sposta gi湛"
-#: 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 "Modifica"
@@ -1910,7 +1910,7 @@ msgstr "Il file sembra essere ok."
msgid "File does not appear to be a valid address book format."
msgstr "Il file non sembra essere un formato valido della rubrica."
-#: 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 "Impossibile leggere il file."
@@ -1918,11 +1918,11 @@ msgstr "Impossibile leggere il file."
msgid "Edit Addressbook"
msgstr "Modifica la rubrica"
-#: 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 " Controllo file "
-#: 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 "File"
@@ -1991,29 +1991,29 @@ msgstr "Nuova cartella"
msgid "Input the name of new folder:"
msgstr "Inserire il nome della nuova cartella:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Il file non sembra essere in formato JPilot."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Seleziona il file JPilot"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Modifica la voce 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 "Voce(i) addizionale dell'indirizzo e-mail"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Aggiunta di una nuova voce JPilot"
@@ -2094,44 +2094,44 @@ msgid "Could not read Search Base(s) from server - please set manually"
msgstr ""
"Impossibile leggere la ricerca base(i) dal server - impostarla manualmente"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Il file non sembra essere in formato VCard."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Selezione del file VCard"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Modifica la voce vCard"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Aggiunta di una nuova voce vCard"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Esporta"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Specificare la cartella di origine e il file mbox."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Directory di origine:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "File su cui esportare:"
-#: 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 " Seleziona... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Seleziona il file da esportare"
@@ -2459,119 +2459,175 @@ msgstr "Creazione della vista dell'immagine...\n"
msgid "Can't load the image."
msgstr "Impossibile caricare l'immagine."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Importa"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Specificare il file mbox da importare e la cartella di destinazione."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "File da importare:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Directory di destinazione:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Selezione del file da importare"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Specificare il nome della rubrica e del file da importare."
-#: 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 "Seleziona e rinomina i nomi del campo LDIF da importare."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "File importato."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Seleziona un file."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Deve essere fornito un nome per la rubrica."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Errore leggendo i campi LDIF."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "File LDIF importato con successo."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Seleziona il file LDIF"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Selezione del file VCard"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Nome del file"
-#: 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 "Campo LDIF"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Nome dell'attributo"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Rubrica :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Attibuto"
+#: 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 "Seleziona"
+#: 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 "Su"
+
+#: 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 "Gi湛"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Rubrica :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Nome del file:"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Record :"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Importazione del file LDIF nella rubrica"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Precedente"
-
-#: 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 "Successivo"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Precedente"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Info sul file"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Attibuti"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "Campo LDIF"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Fine"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Seleziona e rinomina i nomi del campo LDIF da importare."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Errore leggendo i campi LDIF."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "File LDIF importato con successo."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Seleziona il file LDIF"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "Campo LDIF"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Nome dell'attributo"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Attibuto"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Seleziona"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importazione del file LDIF nella rubrica"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Attibuti"
+
#: src/inc.c:160
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2741,7 +2797,7 @@ msgid "Socket error."
msgstr "Errore del 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 "Connessione chiusa dall'host remoto."
@@ -2758,11 +2814,11 @@ msgstr ""
"La casella postale 竪 bloccata:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "Autenticazione fallita."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2771,15 +2827,15 @@ msgstr ""
"Autenticazione fallita:\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 "La sessione 竪 andata in timeout."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "Incorporazione cancellata\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Ricezione in %s dei nuovi messaggi da %s...\n"
@@ -3895,15 +3951,15 @@ msgstr ""
"Se volete lanciarlo, salvatelo da qualche parte e assicuratevi che non sia "
"un virus o qualcosa di simile a un programma malizioso."
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Passphrase"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[nessun user id]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3916,7 +3972,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4432,18 +4488,6 @@ msgstr " Aiuto sintassi "
msgid "Registered actions"
msgstr "Azioni registrate"
-#: 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 "Su"
-
-#: 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 "Gi湛"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Nuovo)"
@@ -6238,11 +6282,11 @@ msgstr "Invio del messaggio (%d di %d byte)"
msgid "Sending message"
msgstr "Invio del messaggio"
-#: 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 "Si 竪 verificato un errore durante l'invio del messaggio."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/ja.po b/po/ja.po
index abf59eb5..0824814d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,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: 1999-10-12\n"
"Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
"Language-Team: Japanese <ja@li.org>\n"
@@ -684,8 +684,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 ""
@@ -823,7 +823,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 ""
@@ -1062,19 +1062,19 @@ msgstr "≪(_A)"
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 "у就綣≪劫験罩c鎀障"
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1082,7 +1082,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."
@@ -1090,7 +1090,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."
@@ -1098,7 +1098,7 @@ 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."
@@ -1106,90 +1106,90 @@ msgstr ""
"≪劫験紊с障\n"
"域≪劫験<ゃ篏с障"
-#: 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泣若"
@@ -1831,24 +1831,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 "糸<若 ≪"
@@ -1865,7 +1865,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 "紊"
@@ -1893,7 +1893,7 @@ msgstr "<ゃOkс"
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 "<ゃ茯粋昭障"
@@ -1901,11 +1901,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 "<ゃ"
@@ -1973,29 +1973,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潟菴遵"
@@ -2075,44 +2075,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 "絲乗院mbox<ゃ絎"
-#: 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 "鴻若<ゃ御"
@@ -2439,119 +2439,167 @@ 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 "絲乗院mbox<ゃゃ潟若絎"
-#: 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."
-msgstr "ゃ潟若LDIFc若御腱違紊眼"
+#: src/importcsv.c:155
+msgid "Select and reorder CSV field names to import."
+msgstr "ゃ潟若CSVc若御筝号帥"
-#: 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."
-msgstr "LDIF<ゃ茯粋昭推賢若榊障"
+#: src/importcsv.c:515
+msgid "Error reading CSV fields."
+msgstr "CSV<ゃ茯粋昭推賢若榊障"
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
-msgstr "LDIF<ゃ罩c鎀障"
+#: src/importcsv.c:541
+msgid "CSV file imported successfully."
+msgstr "CSV<ゃ罩c顄粋昭障障"
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "LDIF<ゃ御"
+#: src/importcsv.c:603
+msgid "Select CSV File"
+msgstr "CSV<ゃ御"
-#: 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"
-msgstr "LDIFc若"
+#: src/importcsv.c:706
+msgid "CSV Field"
+msgstr "CSVc若"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "絮у"
+#: src/importcsv.c:707
+msgid "Address Book Field"
+msgstr "≪劫験c若"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "絮"
+#: src/importcsv.c:724
+msgid "Reorder address book fields with the Up and Down button."
+msgstr "≪劫験c若筝私帥潟т研号帥"
-#: 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"
-msgstr "LDIF<ゃ≪劫験吾ゃ潟若"
+#: src/importcsv.c:851
+msgid "Import CSV file into Address Book"
+msgstr "CSV<ゃ≪劫験吾ゃ潟若"
#. 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
+msgid "Fields"
+msgstr "c若"
-#: 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 "ゃ潟若LDIFc若御腱違紊眼"
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "LDIF<ゃ茯粋昭推賢若榊障"
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "LDIF<ゃ罩c鎀障"
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "LDIF<ゃ御"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "LDIFc若"
+
+#: 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
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2722,7 +2770,7 @@ msgid "Socket error."
msgstr "純宴若с"
#. 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 "≪若鴻c・膓障"
@@ -2739,11 +2787,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"
@@ -2752,15 +2800,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 "篆<c潟祉障\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "違<祉若吾 %s %s 莨若с障...\n"
@@ -3867,15 +3915,15 @@ msgstr ""
"莎桁翫<ゃ綵贋篆絖緇c鴻篁"
"違с腆肴"
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "鴻若"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[若ID]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3888,7 +3936,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4397,18 +4445,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 "(域)"
@@ -6175,11 +6211,11 @@ msgstr "<祉若吾篆>賢 (%d / %d bytes)"
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"
diff --git a/po/ko.po b/po/ko.po
index 40cb5d41..363669a6 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 0.8.6\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: 2002-12-02 11:09+0900\n"
"Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
"Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -677,8 +677,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 "企"
@@ -816,7 +816,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 "覃覈"
@@ -1062,19 +1062,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"
@@ -1082,7 +1082,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."
@@ -1090,7 +1090,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."
@@ -1098,7 +1098,7 @@ 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."
@@ -1106,85 +1106,85 @@ msgstr ""
"譯殊襦 覲讌 覈詩螻\n"
" 譯殊襦 朱 燕讌 覈詩給."
-#: 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 "蠏碁9"
#. 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 覯"
@@ -1869,24 +1869,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 "企 譯殊"
@@ -1903,7 +1903,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 ""
@@ -1931,7 +1931,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 "殊 曙 螳 給."
@@ -1939,11 +1939,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 ""
@@ -2011,29 +2011,29 @@ msgstr " 启"
msgid "Input the name of new folder:"
msgstr " 启 企 l殊語:"
-#: 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 覈 豢螳"
@@ -2113,44 +2113,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 " 启 mbox 殊 讌語."
-#: 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 ""
@@ -2484,119 +2484,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 " mbox 手骸 启襯 讌語."
-#: 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 field襯 暑り 螳 覦給."
-#: 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 Field"
-#: 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 Field"
-#: 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 field襯 暑り 螳 覦給."
+
+#: 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 Field"
+
+#: 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"
@@ -2765,7 +2821,7 @@ msgid "Socket error."
msgstr "貅 ."
#. 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 ""
@@ -2780,27 +2836,27 @@ msgid ""
"%s"
msgstr "覃朱り 蟆給."
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
#, fuzzy
msgid "Authentication failed."
msgstr "語 覦覯"
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, fuzzy, c-format
msgid ""
"Authentication failed:\n"
"%s"
msgstr "語 覦覯"
-#: 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"
@@ -3924,15 +3980,15 @@ msgid ""
"virus or something like a malicious program."
msgstr ""
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Passphrase"
-#: 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"
@@ -3945,7 +4001,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4450,18 +4506,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 "( 蠏豺)"
@@ -6304,11 +6348,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
#, fuzzy, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/lt.po b/po/lt.po
index 6ab0cd16..600892d5 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,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-06-09 13:51+0300\n"
"Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -684,8 +684,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 "Vardas"
@@ -823,7 +823,7 @@ msgid "Address"
msgstr "Adresas"
#: 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 "Pastabos"
@@ -1066,19 +1066,19 @@ msgstr "Katalog ir _adresus jame"
msgid "Really delete `%s' ?"
msgstr "Tikrai pa邸alinti %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 "Naujas vartotojas, negaliu i邸saugoti index failo."
-#: 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 "Naujas vartotojas, negaliu i邸saugoti adres迭 knygos fail迭."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Adres迭 knyga skmingai konvertuota"
-#: 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 ""
"Sena adres迭 knyga konvertuota,\n"
"negaliu i邸saugoti naujo adres迭 indekso failo"
-#: 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 ""
"Negaliu konvertuoti adres迭 knygos,\n"
"bet suk笛riau tu邸ius naujos knygos failus."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1102,7 +1102,7 @@ msgstr ""
"Negaliu konvertuoti adres迭 knygos,\n"
"negaliu sukurti naujos knygos fail迭."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1110,88 +1110,88 @@ msgstr ""
"Negaliu konvertuoti adres迭 knygos,\n"
"ir negaliu sukurti naujos knygos fail迭."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Adres迭 knygos konvertavimo klaida"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Adres迭 knygos konvertavimas"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Adres迭 knygos klaida"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Negaliu perskaityti adres迭 indekso"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr "Sena knyga konvertuota, negaliu i邸saugoti naujo adres迭 indekso failo"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Negaliu konvertuoti adres迭 knygos, bet suk笛riau naujus tu邸ius adres迭 knygos "
"failus."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Negaliu konvertuoti adres迭 knygos, negaliu sukurti nauj迭 adres迭 knygos fail迭."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Negaliu konvertuoti adres迭 knygos ir sukurti nauj迭 adres迭 knygos fail迭."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Adres迭 knygos konvertavimo klaida"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Adres迭 knygos konvertavimas"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Ssaja"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Adres迭 knyga"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Asmuo"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "El. pa邸to adresas"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Grup"
#. 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 "Katalogas"
-#: 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 serveris"
@@ -1832,24 +1832,24 @@ msgstr "Pavadinimas ir reik邸m turi b笛ti nurodyti."
msgid "Edit Person Data"
msgstr "Redaguoti asmens duomenis"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Rodomas vardas"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Pavard"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Vardas"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Slapyvardis"
#: 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 "El. pa邸to adresas"
@@ -1866,7 +1866,7 @@ msgstr "Auk邸tyn"
msgid "Move Down"
msgstr "貼emyn"
-#: 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 "Taisyti"
@@ -1894,7 +1894,7 @@ msgstr "Failas atrodo geras."
msgid "File does not appear to be a valid address book format."
msgstr "Failas nra teisingo adres迭 knygos formato."
-#: 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 "Negaliu perskaityti failo."
@@ -1902,11 +1902,11 @@ msgstr "Negaliu perskaityti failo."
msgid "Edit Addressbook"
msgstr "Redaguoti Adres迭 knyg"
-#: 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 " Patikrinti fail "
-#: 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 "Failas"
@@ -1974,29 +1974,29 @@ msgstr "Naujas katalogas"
msgid "Input the name of new folder:"
msgstr "町veskite naujo katalogo pavadinim:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Failas nra teisingo JPilot formato."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Pasirinkite JPilot fail"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Redaguoti JPilot 眺ra邸"
-#: 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 "Papildomi el. pa邸to adresai"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Pridti nauj JPilot 眺ra邸"
@@ -2076,44 +2076,44 @@ msgstr "Prieinamos paie邸kos bazs"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Negaliu perskaityti paie邸kos bazi迭 i邸 serverio - nustatykite jas"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Failas nra vCard formato"
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Pa転ymti vCard fail"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Redaguoti vCard 眺ra邸"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Pridti nauj vCard 眺ra邸"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Eksportuoti"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Nurodykite katalog ir mbox fail."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Pradinis katalogas:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Eksportuojamas failas:"
-#: 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 " Pasirinkti... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Pasirinkti exportuojam fail"
@@ -2440,119 +2440,175 @@ msgstr "Sukuriama paveiksllio per転i笛ra...\n"
msgid "Can't load the image."
msgstr "Negaliu 眺kelti paveiksllio."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Importuoti"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Nurodykite mbox fail ir paskyrimo katalog."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Importuojamas failas:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Paskyrimo katalogas:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Pa転ymkite importuojam fail"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Nurodykite adres迭 knyg ir importuojam fail."
-#: 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 "Pasirinkite ir pervedinkite LDIF lauk迭 vardus importavimui."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Failas importuotas."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Pasirinkite fail."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Turi b笛ti nurodytas adres迭 knygos pavadinimas."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Klaida skaitant LDIF laukus."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "LDIF failas importuota skmingai."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Pasirinkite LDIF fail"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Pa転ymti vCard fail"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Failo vardas"
-#: 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 Laukas"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Atributo vardas"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Adres迭 knyga :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Atributas"
+#: 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 "Pasirinkti"
+#: 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 "Auk邸tyn"
+
+#: 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 "貼emyn"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Adres迭 knyga :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Failo vardas :"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "町ra邸ai :"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Importuoti LDIF fail 眺 adres迭 knyg"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Atgal"
-
-#: 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 "Kitas"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Atgal"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Failo informacija"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Atributai"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "LDIF Laukas"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Baigti"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Pasirinkite ir pervedinkite LDIF lauk迭 vardus importavimui."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Klaida skaitant LDIF laukus."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "LDIF failas importuota skmingai."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Pasirinkite LDIF fail"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "LDIF Laukas"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Atributo vardas"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Atributas"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Pasirinkti"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importuoti LDIF fail 眺 adres迭 knyg"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Atributai"
+
#: src/inc.c:160
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2722,7 +2778,7 @@ msgid "Socket error."
msgstr "Socket error."
#. 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 "Prisijungimas u転darytas nuotolinio serverio."
@@ -2739,11 +2795,11 @@ msgstr ""
"D転ut u転rakinta:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "Nepavyko patvirtinti autenti邸kumo."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2752,15 +2808,15 @@ msgstr ""
"Nepavyko patvirtinti autenti邸kumo:\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 "Baigsi sesijos laikas."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "Prijungimas nutrauktas\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Gaunami nauji lai邸kai i邸 %s 眺 %s...\n"
@@ -3874,15 +3930,15 @@ msgstr ""
"Jei norite j眺 paleisti, i邸saugokite j眺 ir 眺sitikinkite ar tai ne virusas ar "
"pana邸i kenkji邸ka programa."
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Slapta fraz"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[nra vartotojo id]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3895,7 +3951,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4409,18 +4465,6 @@ msgstr " Sintaks "
msgid "Registered actions"
msgstr "Registruoti veiksmai"
-#: 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 "Auk邸tyn"
-
-#: 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 "貼emyn"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Naujas)"
@@ -6206,11 +6250,11 @@ msgstr "Siuniu lai邸k (%d / %d baitai)"
msgid "Sending message"
msgstr "Siuniu lai邸k"
-#: 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 "Klaida siuniant lai邸k."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/nl.po b/po/nl.po
index 365ac0f2..19987541 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 0.8\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: 2006-04-30 01:11+0100\n"
"Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
"Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -692,8 +692,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 "Naam"
@@ -831,7 +831,7 @@ msgid "Address"
msgstr "Adres"
#: 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 "Opmerkingen"
@@ -1075,19 +1075,19 @@ msgstr "Map en _adressen"
msgid "Really delete `%s' ?"
msgstr "Wilt u '%s' werkelijk verwijderen?"
-#: 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 "Nieuwe gebruiker: Kon indexbestand niet opslaan."
-#: 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 "Nieuwe gebruiker: Kon adresboekbestanden niet opslaan."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Oude adresboekgegevens succesvol omgezet."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1095,7 +1095,7 @@ msgstr ""
"Oude adresboekgegevens omgezet.\n"
"Kon het nieuwe adresboek indexbestand niet opslaan."
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1103,7 +1103,7 @@ msgstr ""
"Kon adresboekgegevens niet omzetten.\n"
"Nieuw leeg adresboek is gemaakt."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1111,7 +1111,7 @@ msgstr ""
"Kon adresboekgegevens niet omzetten.\n"
"Kon geen nieuwe adresboek bestanden aanmaken."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1119,90 +1119,90 @@ msgstr ""
"Kon adresboekgegevens niet omzetten.\n"
"Kon ook geen nieuwe adresboekbestanden aanmaken."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Adresboek omzetprobleem"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Adresboek omzetting"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Adresboekprobleem"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Kon adresboek index niet lezen"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"Oude adresboekgegevens omgezet. Kon het nieuwe adresboek indexbestand niet "
"opslaan."
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr "Kon adresboekgegevens niet omzetten. Nieuw leeg adresboek is gemaakt."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Kon adresboekgegevens niet omzetten. Kon geen nieuwe adresboek bestanden "
"aanmaken."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Kon adresboekgegevens niet omzetten. Kon ook geen nieuwe adresboek bestanden "
"aanmaken."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Adresboek omzetprobleem"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Adresboek Omzetting"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Interface"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Adresboek"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Persoon"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "E-mail adres"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Groep"
#. 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 "Accounts"
-#: 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 Server"
@@ -1843,24 +1843,24 @@ msgstr "Een naam en waarde moeten worden gegeven."
msgid "Edit Person Data"
msgstr "Persoonsgegevens bewerken"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Naam in de lijst"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Achternaam"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Voornaam"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Alias"
#: 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 "E-mail adres"
@@ -1877,7 +1877,7 @@ msgstr "Omhoog"
msgid "Move Down"
msgstr "Omlaag"
-#: 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 "Bewerken"
@@ -1905,7 +1905,7 @@ msgstr "Bestand ziet er goed uit."
msgid "File does not appear to be a valid address book format."
msgstr "Bestand ziet er niet uit als een geldig adresboek."
-#: 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 "Kon niet uit bestand lezen."
@@ -1913,11 +1913,11 @@ msgstr "Kon niet uit bestand lezen."
msgid "Edit Addressbook"
msgstr "Adresboek bewerken"
-#: 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 " Controleer bestand"
-#: 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 "Bestand"
@@ -1986,29 +1986,29 @@ msgstr "Nieuwe map"
msgid "Input the name of new folder:"
msgstr "Geef de naam van de nieuwe map:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Bestand ziet er niet uit als een JPilot bestand."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Selecteer JPilot bestand"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Bewerk JPilot veld"
-#: 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 "Bladeren..."
-#: src/editjpilot.c:295
+#: src/editjpilot.c:294
msgid "Additional e-Mail address item(s)"
msgstr "Extra e-mail adressen"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Voeg nieuw JPilot veld toe"
@@ -2089,44 +2089,44 @@ msgid "Could not read Search Base(s) from server - please set manually"
msgstr ""
"Kon de zoekbasis niet inlezen vanaf de server - Kies alstublieft met de hand"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Bestand ziet er niet uit als een vCard bestand."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Selecteer vCard bestand"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Bewerk vCard veld"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Nieuw vCard veld toevoegen"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Exporteren"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Geef doelmap en mbox bestand"
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Bronmap:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Doelbestand:"
-#: 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 "Selecteer..."
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Selecteer doelbestand"
@@ -2454,120 +2454,176 @@ msgstr "Plaatje wordt weergegeven...\n"
msgid "Can't load the image."
msgstr "Kan plaatje niet weergeven."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Importeren"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Specificeer mbox bestand (bron) en de doelmap."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Te importeren bestand:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Doelmap:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Selecteer het te importeren bestand"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr ""
"Geef alstublieft de naam van het adresboek en het te importeren bestand."
-#: 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 "Kies en hernoem LDIF veldnamen om te importeren."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Bestand ge誰mporteerd."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Selecteer een bestand."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "U moet wel een adresboek naam geven."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Fout bij lezen LDIF velden."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "LDIF bestand succesvol ge誰mporteerd."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Selecteer LDIF bestand"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Selecteer vCard bestand"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Bestandsnaam"
-#: 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 Veld"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Attribuutnaam"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Adresboek :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Attribuut"
+#: 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 "Selecteer"
+#: 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 "Omhoog"
+
+#: 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 "Omlaag"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Adresboek :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Bestandsnaam :"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Kaarten :"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Importeer LDIF bestand in het adresboek"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Vorig"
-
-#: 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 "Volgende"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Vorig"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Bestandsinfo"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Attributen"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "LDIF Veld"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Afronden"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Kies en hernoem LDIF veldnamen om te importeren."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Fout bij lezen LDIF velden."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "LDIF bestand succesvol ge誰mporteerd."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Selecteer LDIF bestand"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "LDIF Veld"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Attribuutnaam"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Attribuut"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Selecteer"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importeer LDIF bestand in het adresboek"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Attributen"
+
#: src/inc.c:160
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2738,7 +2794,7 @@ msgstr "Socket-fout."
# consider EOF right after QUIT successful
#. 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 "Verbinding verbroken door verbindingspartner."
@@ -2755,11 +2811,11 @@ msgstr ""
"Mailbox is vergrendeld:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "Identificatie mislukt."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2768,15 +2824,15 @@ msgstr ""
"Identificatie mislukt:\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 "Sessie is verlopen."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "E-mail verwerken geannuleerd\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Nieuwe berichten worden opgehaald van %s naar %s ...\n"
@@ -3899,15 +3955,15 @@ msgstr ""
"Als u het wilt uitvoeren, dient u het bestand ergens op te slaan en te "
"controleren om virussen geen kans te geven."
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Wachtwoord"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[geen gebruikersnaam]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3920,7 +3976,7 @@ msgstr ""
" %.*s\n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4432,18 +4488,6 @@ msgstr " Syntaxhulp"
msgid "Registered actions"
msgstr "Ingestelde acties"
-#: 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 "Omhoog"
-
-#: 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 "Omlaag"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(nieuw)"
@@ -6243,11 +6287,11 @@ msgstr "Bezig met verzenden van bericht (%d / %d bytes)"
msgid "Sending message"
msgstr "Bezig met verzenden van bericht"
-#: 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 "Er is een fout opgetreden bij het verzenden."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/pl.po b/po/pl.po
index c1ed6f09..9527db82 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 1.9.8 \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-05 18:57+0100\n"
"Last-Translator: Wit Wilinski <madman at linux dot bydg dot org>\n"
"Language-Team: POLISH <pl@li.org>\n"
@@ -681,8 +681,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 "Nazwa"
@@ -821,7 +821,7 @@ msgid "Address"
msgstr "Adres"
#: 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 "Uwagi"
@@ -1068,19 +1068,19 @@ msgstr "Katalog i adresy"
msgid "Really delete `%s' ?"
msgstr "Czy naprawd usun \"%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 "Nowy u甜ytkownik, nie mo甜na byo zapisa pliku indeksu."
-#: 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 "Nowy u甜ytkownik, nie mo甜na byo zapisa plik坦w ksi甜ki adresowej."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Konwersja starej ksi甜ki adresowej zostaa zakoczona pomylnie."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1088,7 +1088,7 @@ msgstr ""
"Stara ksi甜ka adresowa zostaa skonwertowana,\n"
"nie mo甜na byo zapisa nowego pliku indeksu adres坦w."
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1096,7 +1096,7 @@ msgstr ""
"Nie mo甜na byo skonwertowa ksi甜ki adresowej,\n"
"utworzono puste pliki nowej ksi甜ki adresowej."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1104,7 +1104,7 @@ msgstr ""
"Nie mo甜na byo skonwertowa ksi甜ki adresowej,\n"
"nie mo甜na byo utworzy nowych plik坦w ksi甜ki adresowej."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1112,92 +1112,92 @@ msgstr ""
"Nie mo甜na byo skonwertowa ksi甜ki adresowej\n"
"oraz utworzy nowych plik坦w ksi甜ki adresowej."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Bd konwersji ksi甜ki adresowej"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Konwersja ksi甜ki adresowej"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Bd ksi甜ki adresowej"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Nie mo甜na odczyta ksi甜ki adresowej"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"Stara ksi甜ka adresowa zostaa skonwertowana, nie mo甜na byo zapisa nowego "
"pliku indeks坦w adresowych."
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Nie mo甜na byo skonwertowa ksi甜ki adresowej lecz utworzono puste pliki "
"nowej ksi甜ki adresowej."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Nie mo甜na byo skonwertowa ksi甜ki adresowej oraz utworzy nowych plik坦w "
"ksi甜ki adresowej."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Nie mo甜na byo skonwertowa ksi甜ki adresowej i utworzy nowych plik坦w "
"ksi甜ki adresowej"
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Bd konwersji ksi甜ki adresowej"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Konwersja ksi甜ki adresowej"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Interfejs"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Ksi甜ka adresowa"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Osoba"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "Adres e-mail"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Grupa"
#. 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 "Katalog"
-#: 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 "Serwer LDAP"
@@ -1846,24 +1846,24 @@ msgstr "Nale甜y poda nazw i warto."
msgid "Edit Person Data"
msgstr "Edytuj dane osoby"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Wywietlana nazwa"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Nazwisko"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Imi"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Pseudonim"
#: 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 "Adres e-mail"
@@ -1880,7 +1880,7 @@ msgstr "W g坦r"
msgid "Move Down"
msgstr "W d坦"
-#: 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 "Zmie"
@@ -1908,7 +1908,7 @@ msgstr "Plik wyglda na dobry."
msgid "File does not appear to be a valid address book format."
msgstr "Plik nie wyglda na poprawny plik ksi甜ki adresowej."
-#: 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 "Nie mo甜na odczyta pliku."
@@ -1916,11 +1916,11 @@ msgstr "Nie mo甜na odczyta pliku."
msgid "Edit Addressbook"
msgstr "Edytuj ksi甜k adresow"
-#: 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 " Sprawd添 plik"
-#: 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 "Plik"
@@ -1988,29 +1988,29 @@ msgstr "Nowy katalog"
msgid "Input the name of new folder:"
msgstr "Podaj nazw nowego katalogu:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Plik nie wyglda na plik formatu JPilot."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Wybierz plik JPilot"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Edytuj wpis 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 "Dodatkowe elementy adresu email"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Dodaj nowy wpis JPilot"
@@ -2090,44 +2090,44 @@ msgstr "Dostpne bazy wyszukiwania"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Nie mo甜na odczyta baz wyszukiwania z serwera - ustaw j rcznie"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Plik nie wyglda na plik w formacie VCard."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Wybierz plik VCard"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Edytuj wpis VCard"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Dodaj nowy wpis VCard"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Eksport"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Wybierz katalog docelowy i plik w formacie mbox"
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Katalog 添r坦dowy:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Eksportowanie pliku:"
-#: 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 " Wybierz... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Wybierz plik eksportu"
@@ -2458,119 +2458,175 @@ msgstr "Tworzenie widoku obrazu...\n"
msgid "Can't load the image."
msgstr "Nie mo甜na zaadowa obrazu."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Importuj"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Okrel docelowy plik ze skrzynk oraz docelowy katalog."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Importowanie pliku:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Katalog docelowy:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Wybierz importowany plik"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Okrel nazw ksi甜ki adresowej i pliku do importu."
-#: 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 "Wybierz i zmie nazwy p坦l LDIF do importu."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Plik zaimportowano."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Wybierz plik."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Nale甜y poda nazw ksi甜ki adresowej."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Bd przy odczycie p坦l LDIF."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "Plik LDIF zosta pomylnie zaimportowany."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Wybierz plik LDIF"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Wybierz plik VCard"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Nazwa pliku"
-#: 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 "Pole LDIF"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Nazwa atrybutu"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Ksi甜ka adresowa :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Atrybut"
+#: 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 "Wybierz"
+#: 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 "W g坦r"
+
+#: 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 "W d坦"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Ksi甜ka adresowa :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Nazwa pliku :"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Rekordy :"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Importuj plik LDIF do ksi甜ki adresowej"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Poprzednia"
-
-#: 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 "Nastpna"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Poprzednia"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Informacja o pliku"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Atrybuty"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "Pole LDIF"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Koniec"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Wybierz i zmie nazwy p坦l LDIF do importu."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Bd przy odczycie p坦l LDIF."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "Plik LDIF zosta pomylnie zaimportowany."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Wybierz plik LDIF"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "Pole LDIF"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Nazwa atrybutu"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Atrybut"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Wybierz"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importuj plik LDIF do ksi甜ki adresowej"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Atrybuty"
+
#: src/inc.c:160
#, fuzzy, c-format
msgid "Sylpheed: %d new messages"
@@ -2740,7 +2796,7 @@ msgid "Socket error."
msgstr "Bd gniazda."
#. 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 "Poczenie zamknite przez zdalny komputer."
@@ -2757,11 +2813,11 @@ msgstr ""
"Skrzynka jest zablokowana:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "Bd uwierzytelniania."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2770,15 +2826,15 @@ msgstr ""
"Bd uwierzytelniania:\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 "Sesja wygasa."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "Odbieranie anulowano\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Pobieranie wiadomoci z %s do %s...\n"
@@ -3872,15 +3928,15 @@ msgid ""
"virus or something like a malicious program."
msgstr ""
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Haso"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[ brak identyfikatora ]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3893,7 +3949,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4417,18 +4473,6 @@ msgstr " Pomoc skadni "
msgid "Registered actions"
msgstr "Zarejestrowane polecenia"
-#: 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 "W g坦r"
-
-#: 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 "W d坦"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Nowy)"
@@ -6244,11 +6288,11 @@ msgstr "Wysyanie wiadomoci (%d / %d)"
msgid "Sending message"
msgstr "Wysyanie wiadomoci"
-#: 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 "Bd podczas wysyania wiadomoci."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d0f0e546..2fb661d7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,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: 2007-03-01 15:01-0300\n"
"Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
"Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -691,8 +691,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 "Nome"
@@ -830,7 +830,7 @@ msgid "Address"
msgstr "Endere巽o"
#: 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 "Notas"
@@ -1070,19 +1070,19 @@ msgstr "Pasta e _endere巽os"
msgid "Really delete `%s' ?"
msgstr "Apagar realmente `%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 "Novo usu叩rio, n達o foi poss鱈vel salvar arquivo de 鱈ndice."
-#: 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 "Novo usu叩rio, n達o foi poss鱈vel salvar arquivos de livro de endere巽os."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Cat叩logo de endere巽os antigo convertido com sucesso."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1090,7 +1090,7 @@ msgstr ""
"Cat叩logo de endere巽os antigo convertido,\n"
"n達o foi poss鱈vel salvar o arquivo de 鱈ndice de endere巽os "
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1098,7 +1098,7 @@ msgstr ""
"N達o foi poss鱈vel converter o cat叩logo de endere巽os,\n"
"mas arquivos vazios para o cat叩logo de endere巽os foram criados."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1106,7 +1106,7 @@ msgstr ""
"N達o foi poss鱈vel converter o cat叩logo de endere巽os,\n"
"n達o foi poss鱈vel criar arquivos novos para o cat叩logo de endere巽os."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1114,92 +1114,92 @@ msgstr ""
"N達o foi poss鱈vel converter o cat叩logo de endere巽os\n"
"nem criar arquivos novos para o cat叩logo de endere巽os."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Erro convertendo cat叩logo de endere巽os"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Convers達o do cat叩logo de endere巽os"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Erro no Cat叩logo de Endere巽os"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "N達o foi poss鱈vel ler o 鱈ndice do endere巽o"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"Cat叩logo de endere巽os antigo convertido, n達o foi poss鱈vel salvar o arquivo "
"de ind鱈ce do novo endere巽o"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"N達o foi poss鱈vel converter o cat叩logo de endere巽os, mas arquivos vazios para "
"o cat叩logo de endere巽os foram criados."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"N達o foi poss鱈vel converter o cat叩logo de endere巽os, n達o foi poss鱈vel criar "
"arquivos novos para o cat叩logo de endere巽os."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"N達o foi poss鱈vel converter o cat叩logo de endere巽os e n達o foi poss鱈vel criar "
"arquivos novos para o cat叩logo de endere巽os."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Erro na convers達o do cat叩logo de endere巽os"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Convers達o do Cat叩logo de Endere巽os"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Interface"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Cat叩logo de Endere巽os"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Pessoa"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "Endere巽o de e-mail"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Grupo"
#. 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 "Pasta"
-#: 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 "Servidor LDAP"
@@ -1844,24 +1844,24 @@ msgstr "Um Nome e um Valor devem ser informados"
msgid "Edit Person Data"
msgstr "Editar dados pessoais"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Exibir Nome"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "ltimo Nome"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Primeiro Nome"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Apelido"
#: 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 "Endere巽o de e-mail"
@@ -1878,7 +1878,7 @@ msgstr "Mover para cima"
msgid "Move Down"
msgstr "Mover para Baixo"
-#: 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 "Modificar"
@@ -1906,7 +1906,7 @@ msgstr "O arquivo parece estar OK."
msgid "File does not appear to be a valid address book format."
msgstr "O arquivo n達o parece estar no formato v叩lido de cat叩logo de endere巽os."
-#: 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 "N達o foi poss鱈vel ler o arquivo"
@@ -1914,11 +1914,11 @@ msgstr "N達o foi poss鱈vel ler o arquivo"
msgid "Edit Addressbook"
msgstr "Editar Cat叩logo de Endere巽os"
-#: 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 " Verificar Arquivo "
-#: 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 "Arquivo"
@@ -1987,29 +1987,29 @@ msgstr "Nova pasta"
msgid "Input the name of new folder:"
msgstr "Digite o nome da nova pasta:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "O arquivo n達o parece estar no formato JPilot."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Selecionar Arquivo JPilot"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Editar entrada 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 "Item(s) de endere巽o e e-mail adicionais"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Adicionar nova entrada JPilot"
@@ -2091,44 +2091,44 @@ msgstr ""
"N達o foi sposs鱈vel ler a(s) Base(s) de Procura do servidor - por favor defina "
"manualmente"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "O arquivo n達o parece estar no formato vCard."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Selecionar Arquivo vCard"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Editar Entrada vCard"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Adicionar Nova Entrada vCard"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Exportar"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Especifique a pasta destino e o arquivo mbox"
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Diret坦rio fonte:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Arquivo a exportar:"
-#: 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 "Selecionar..."
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Selecione o filtro de exporta巽達o"
@@ -2455,120 +2455,176 @@ msgstr "Criando visualizador de imagem...\n"
msgid "Can't load the image."
msgstr "N達o foi poss鱈vel carregar a imagem."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Importar"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Especifique o arquivo mbox e a pasta de destino."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Importando arquivo:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Diret坦rio de destino:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Selecionar arquivo a importar"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr ""
"Por favor especifique o nome do livro de endere巽os e o arquivo para importar."
-#: 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 "Selecione e renomeie os nomes dos campos LDIF para importar."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Arquivo importado."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Por favor selecione um arquivo."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Um nome deve ser informado para o Livro de Endere巽os."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Erro lendo campos do LDIF."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "Arquivo LDIF importado com sucesso."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Selecione arquivo LDIF"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Selecionar Arquivo vCard"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Nome do arquivo"
-#: 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 "Campo LDIF"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Nome do Atributo"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Livro de Endere巽os :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Atributo"
+#: 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 "Selecione"
+#: 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 "Acima"
+
+#: 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 "Abaixo"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Livro de Endere巽os :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Nome do arquivo :"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Registros :"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Importar arquivo LDIF para o Livro de Endere巽os"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Anterior"
-
-#: 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 "Pr坦xima"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Anterior"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Informa巽達o do Arquivo"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Atributos"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "Campo LDIF"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Terminar"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Selecione e renomeie os nomes dos campos LDIF para importar."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Erro lendo campos do LDIF."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "Arquivo LDIF importado com sucesso."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Selecione arquivo LDIF"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "Campo LDIF"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Nome do Atributo"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Atributo"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Selecione"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importar arquivo LDIF para o Livro de Endere巽os"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Atributos"
+
#: src/inc.c:160
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2737,7 +2793,7 @@ msgid "Socket error."
msgstr "erro de 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 "Conex達o remota finalizada pela esta巽達o remota."
@@ -2754,11 +2810,11 @@ msgstr ""
"Caixa de correio est叩 trancada:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "Falha de autentica巽達o."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2767,15 +2823,15 @@ msgstr ""
"Falha de autentica巽達o:\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 "Tempo limite da sess達o."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "Incorpora巽達o cancelada\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Obtendo novas mensagens de %s at辿 %s...\n"
@@ -3887,15 +3943,15 @@ msgstr ""
"Se voc棚 quer execut叩-lo, salve-o em algum diret坦rio e certifique-se de que "
"n達o seja um v鱈rus ou programa malicioso."
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Passphrase"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[sem id de usu叩rio]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3908,7 +3964,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4418,18 +4474,6 @@ msgstr "Ajuda com sintaxe"
msgid "Registered actions"
msgstr "A巽探es registradas"
-#: 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 "Acima"
-
-#: 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 "Abaixo"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Novo)"
@@ -6205,11 +6249,11 @@ msgstr "Enviando mensagem (%d / %d bytes)"
msgid "Sending message"
msgstr "Enviando mensagem"
-#: 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 "Ocorreu um erro ao enviar suas mensagens."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/ro.po b/po/ro.po
index 2a35b09c..1aff05f3 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 2.2.0\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: 2007-02-09 09:49+0200\n"
"Last-Translator: Cristian Secar <cristi@secarica.ro>\n"
"Language-Team: \n"
@@ -697,8 +697,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 "Nume"
@@ -844,7 +844,7 @@ msgid "Address"
msgstr "Agend"
#: 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 "Observaii"
@@ -1089,19 +1089,19 @@ msgstr "Folder i _adrese"
msgid "Really delete `%s' ?"
msgstr "Sigur tergei '%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 "Utilizator nou, fiierul index nu a putut fi salvat."
-#: 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 "Utilizator nou, fiierele agendei nu au putut fi salvate."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Agenda veche a fost convertit cu succes."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1109,7 +1109,7 @@ msgstr ""
"Agenda veche a fost convertit, iar\n"
"fiierul index al noii agende nu a putut fi salvat."
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1117,7 +1117,7 @@ msgstr ""
"Agenda nu a putut fi convertit, dar\n"
"au fost create fiierele noi de agend goal."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1125,7 +1125,7 @@ msgstr ""
"Agenda nu a putut fi convertit, iar\n"
"fiierele noi de agend nu au putut fi create."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1133,92 +1133,92 @@ msgstr ""
"Agenda nu a putut fi convertit\n"
"i fiierele noi de agend nu au putut fi create."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Eroare de conversie a agendei"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Conversie agend"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Eroare agend"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Fiierul index al agendei nu a putut fi citit"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"Agenda veche a fost convertit, iar fiierul index al noii agende nu a putut "
"fi salvat."
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Agenda nu a putut fi convertit, dar au fost create fiierele noi de agend "
"goal."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Agenda nu a putut fi convertit, iar fiierele noi de agend nu au putut fi "
"create."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Agenda nu a putut fi convertit i fiierele noi de agend nu au putut fi "
"create."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Eroare de conversie a agendei"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Conversie agend"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Interfa"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Agend"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Persoan"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "Adres e-mail"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Grup"
#. 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 "Folder"
-#: 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 "Server LDAP"
@@ -1868,24 +1868,24 @@ msgstr "Trebuiesc furnizate un nume i o valoare."
msgid "Edit Person Data"
msgstr "Editeaz date personale"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Nume afiat"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Nume"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Prenume"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Pseudonim"
#: 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 "Adres e-mail"
@@ -1902,7 +1902,7 @@ msgstr "Mut sus"
msgid "Move Down"
msgstr "Mut jos"
-#: 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 "Modific"
@@ -1930,7 +1930,7 @@ msgstr "Fiierul pare a fi 樽n regul."
msgid "File does not appear to be a valid address book format."
msgstr "Fiierul nu pare a fi un format de agend valid."
-#: 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 "Fiierul nu a putut fi citit."
@@ -1938,11 +1938,11 @@ msgstr "Fiierul nu a putut fi citit."
msgid "Edit Addressbook"
msgstr "Editeaz agend"
-#: 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 " Verific fiier "
-#: 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 "Fiier"
@@ -2011,29 +2011,29 @@ msgstr "Folder nou"
msgid "Input the name of new folder:"
msgstr "Introducei numele noului folder:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Fiierul nu pare a fi 樽n format JPilot."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Selecteaz fiier JPilot"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Editeaz 樽nregistrare 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 "Adrese e-mail adiionale"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Adaug 樽nregistrare JPilot"
@@ -2115,46 +2115,46 @@ msgid "Could not read Search Base(s) from server - please set manually"
msgstr ""
"Baza de cutare de pe server nu a putut fi citit - v rugm s setai manual"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Fiierul nu pare a fi 樽n format vCard."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Selecteaz fiier vCard"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Editeaz 樽nregistrare vCard"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Adaug 樽nregistrare vCard"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Export"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Specificai folderul destinaie i fiierul mbox."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Director surs:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Exportare fiier:"
-#: 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 " Selecteaz... "
# hm ? sau selecteaz fiier de exportat ?
# sau selecteaz fiierul de exportat ?
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Selectare fiier de exportat"
@@ -2485,125 +2485,182 @@ msgstr "Creare vedere imagine...\n"
msgid "Can't load the image."
msgstr "Imaginea nu a putut fi 樽ncrcat."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Import"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Specificai fiierul mbox int i folderul destinaie."
# hm ? sau import fiier ?
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Importare fiier:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Director destinaie:"
# hm ? sau selecteaz fiier de importat ?
# sau selecteaz fiierul de importat ?
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Selectare fiier de importat"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Specificai numele agendei i a fiierului ce trebuie importat."
-#: 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 "Selecteaz i redenumete c但mpurile LDIF de importat."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Fiier importat."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Selectai un fiier."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Trebuie furnizat numele agendei."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Eroare la citirea c但mpurilor LDIF."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "Fiier LDIF importat cu succes."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Selecteaz fiier LDIF"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Selecteaz fiier vCard"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Nume Fiier"
-#: 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 "C但mp LDIF"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Nume atribut"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Agend:"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Atribut"
+#: 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 "Selecteaz"
+#: 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 "Sus"
-#: src/importldif.c:690
+#: 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 "Jos"
+
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Agend:"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Nume Fiier:"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "nregistrri:"
# hm ? asta e comand sau 樽ntiinare ?
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Import fiier LDIF 樽n agend"
-# hm ? sau anterior ? sau 樽napoi ?
-#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Precedent"
-
# hm ? sau 樽nainte ?
-#: src/importldif.c:770 src/prefs_toolbar.c:69
+#. Button panel
+#: src/importcsv.c:882 src/importldif.c:736 src/prefs_toolbar.c:69
msgid "Next"
msgstr "Urmtor"
-#: src/importldif.c:799
+# hm ? sau anterior ? sau 樽napoi ?
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Precedent"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Informaii despre Fiier"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Atribute"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "C但mp LDIF"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Terminat"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Selecteaz i redenumete c但mpurile LDIF de importat."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Eroare la citirea c但mpurilor LDIF."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "Fiier LDIF importat cu succes."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Selecteaz fiier LDIF"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "C但mp LDIF"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Nume atribut"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Atribut"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Selecteaz"
+
+# hm ? asta e comand sau 樽ntiinare ?
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Import fiier LDIF 樽n agend"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Atribute"
+
#: src/inc.c:160
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2772,7 +2829,7 @@ msgid "Socket error."
msgstr "Eroare 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 "Conexiune 樽nchis de serverul de la distan."
@@ -2789,11 +2846,11 @@ msgstr ""
"Csua potal este blocat:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "Autentificarea a euat."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2802,15 +2859,15 @@ msgstr ""
"Autentificarea a euat:\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 "Timpul sesiunii a expirat."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "ncorporarea a fost anulat\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Obinere mesaje noi de la %s 樽n %s...\n"
@@ -3942,15 +3999,15 @@ msgstr ""
"Dac dorii s 樽l lansai 樽n execuie, salvai-l undeva i asigurai-v c "
"nu este un virus sau un alt tip de program maliios."
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Fraz secret"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[nici un id utilizator]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3963,7 +4020,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4482,18 +4539,6 @@ msgstr " Ajutor sintax "
msgid "Registered actions"
msgstr "Aciuni 樽nregistrate"
-#: 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 "Sus"
-
-#: 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 "Jos"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Nou)"
@@ -6291,11 +6336,11 @@ msgstr "Trimitere mesaj (%d / %d octei)"
msgid "Sending message"
msgstr "Trimitere mesaj"
-#: 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 "A aprut o eroare 樽n timpul trimiterii mesajului."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/ru.po b/po/ru.po
index 569b1522..ae81d764 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: sylpheed 2.2.6\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: 2006-06-09 14:30+0400\n"
"Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -689,8 +689,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 "仄"
@@ -828,7 +828,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 "亳仄亠舒仆亳亠"
@@ -1071,19 +1071,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"
@@ -1091,7 +1091,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."
@@ -1099,7 +1099,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."
@@ -1107,7 +1107,7 @@ 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."
@@ -1115,91 +1115,91 @@ msgstr ""
"亠 亟舒仍仂 仗亠仂弍舒亰仂于舒 舒亟亠仆 从仆亳亞,\n"
"从仂仄亠 仂亞仂, 仗仂亳亰仂仍舒 仂亳弍从舒 仗亳 仂亰亟舒仆亳亳 舒亶仍仂于 仆仂于仂亶 舒亟亠仆仂亶 从仆亳亞亳."
-#: 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 "亟亠 E-Mail"
-#: 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"
@@ -1841,24 +1841,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 "亟亠 E-Mail"
@@ -1875,7 +1875,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 "亰仄亠仆亳"
@@ -1903,7 +1903,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 "亳弍从舒 亠仆亳 亳亰 舒亶仍舒."
@@ -1911,11 +1911,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 "个舒亶仍"
@@ -1983,29 +1983,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 "仂仗仂仍仆亳亠仍仆亠 仍亠仄亠仆 舒亟亠舒 E-Mail"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "仂弍舒于仍亠仆亳亠 仆仂于仂亶 亰舒仗亳亳 JPilot"
@@ -2086,44 +2086,44 @@ 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 "丕从舒亢亳亠 从仗仂亳亠仄 仗舒仗从 亳 舒亶仍 mbox."
-#: 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 "弍仂 舒亶仍舒 亟仍 从仗仂舒"
@@ -2451,119 +2451,175 @@ msgstr "弌仂亰亟舒仆亳亠 仂弍仍舒亳 仗仂仄仂舒 亳亰仂弍舒亢亠仆亳
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 "丕从舒亢亳亠 舒亶仍 mbox 亳 仗舒仗从 仆舒亰仆舒亠仆亳."
-#: 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 ""
-#: 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
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2733,7 +2789,7 @@ msgid "Socket error."
msgstr "亳弍从舒 仂从亠舒."
#. 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 "弌亠于亠 亰舒从仍 仂亠亟亳仆亠仆亳亠."
@@ -2750,11 +2806,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"
@@ -2763,15 +2819,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"
@@ -3888,15 +3944,15 @@ 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"
@@ -3909,7 +3965,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4423,18 +4479,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 "(仂于仂亠)"
@@ -6229,11 +6273,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"
diff --git a/po/sk.po b/po/sk.po
index dc4a8afe..cb0d4cb6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,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: 2004-01-22 17:46+0100\n"
"Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
"Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -682,8 +682,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 "Meno"
@@ -823,7 +823,7 @@ msgid "Address"
msgstr "Adres叩r"
#: 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 "Pozn叩mky"
@@ -1069,19 +1069,19 @@ msgstr "Prieinok aj adresy"
msgid "Really delete `%s' ?"
msgstr "Naozaj zmaza泥 '%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 "Nov箪 u転ivate直; nepodarilo sa ulo転i泥 indexov箪 s炭bor."
-#: 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 "Nov箪 u転ivate直; nedaj炭 sa ulo転i泥 s炭bory adres叩ra."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Konverzia star辿ho adres叩ra prebehla 炭spe邸ne."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1089,7 +1089,7 @@ msgstr ""
"Konverzia star辿ho adres叩ra prebehla,\n"
"ned叩 sa ulo転i泥 indexov箪 s炭bor nov辿ho adres叩ra"
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1097,7 +1097,7 @@ msgstr ""
"Ned叩 sa konvertova泥 star箪 adres叩r,\n"
"ale boli vytvoren辿 pr叩zdne s炭bory nov辿ho adres叩ra."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1105,7 +1105,7 @@ msgstr ""
"Ned叩 sa konvertova泥 star箪 adres叩r,\n"
"nedaj炭 sa ani vytvori泥 s炭bory nov辿ho adres叩ra."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1113,92 +1113,92 @@ msgstr ""
"Ned叩 sa konvertova泥 star箪 adres叩r\n"
"a nedaj炭 sa ani vytvori泥 s炭bory nov辿ho adres叩ra."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Chyba pri konverzii adres叩ra"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Konverzia adres叩ra"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Chyba v adres叩ri"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Ned叩 sa na鱈ta泥 zoznam adries"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"Konverzia star辿ho adres叩ra prebehla, ned叩 sa ulo転i泥 indexov箪 s炭bor nov辿ho "
"adres叩ra"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Ned叩 sa konvertova泥 star箪 adres叩r, ale boli vytvoren辿 pr叩zdne s炭bory nov辿ho "
"adres叩ra."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Ned叩 sa konvertova泥 star箪 adres叩r, nedaj炭 sa ani vytvori泥 s炭bory nov辿ho "
"adres叩ra."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Ned叩 sa konvertova泥 star箪 adres叩r a nedaj炭 sa ani vytvori泥 s炭bory nov辿ho "
"adres叩ra."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Chyba pri konverzii adres叩ra"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Konverzia adres叩ra"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Ovl叩danie"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Adres叩r"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Osoba"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "E-mailov叩 adresa"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Skupina"
#. 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 "Prieinok"
-#: 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 server"
@@ -1882,24 +1882,24 @@ msgstr "Mus鱈te zada泥 n叩zov a hodnotu."
msgid "Edit Person Data"
msgstr "Upravi泥 炭daje o kontakte"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Zobrazi泥 meno"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Priezvisko"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Krstn辿 meno"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Prez箪vka"
#: 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 "E-mailov叩 adresa"
@@ -1916,7 +1916,7 @@ msgstr "Posun炭泥 nahor"
msgid "Move Down"
msgstr "Posun炭泥 nadol"
-#: 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 "Zmeni泥"
@@ -1944,7 +1944,7 @@ msgstr "S炭bor je v poriadku."
msgid "File does not appear to be a valid address book format."
msgstr "S炭bor nem叩 platn箪 form叩t adres叩ra."
-#: 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 "S炭bor sa ned叩 鱈ta泥."
@@ -1952,11 +1952,11 @@ msgstr "S炭bor sa ned叩 鱈ta泥."
msgid "Edit Addressbook"
msgstr "Upravi泥 adres叩r"
-#: 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 "Testova泥 s炭bor"
-#: 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 "S炭bor"
@@ -2025,29 +2025,29 @@ msgstr "Nov箪 prieinok"
msgid "Input the name of new folder:"
msgstr "Zadajte n叩zov nov辿ho prieinka:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "S炭bor nem叩 JPilot form叩t."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Vyberte s炭bor JPilot"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Upravi泥 z叩znam 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 "al邸ie e-mailov辿 adresy"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Prida泥 nov箪 z叩znam JPilot"
@@ -2128,44 +2128,44 @@ msgid "Could not read Search Base(s) from server - please set manually"
msgstr ""
"Nem担転em na鱈ta泥 b叩zy pre vyh直ad叩vanie zo servera - pros鱈m zadajte rune"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "S炭bor nie je vo form叩te vCard."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Vyberte s炭bor vCard"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Upravi泥 vCard z叩znam"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Prida泥 nov箪 vCard z叩znam"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Exportova泥"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Urite cie直ov箪 prieinok a s炭bor mbox."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Zdrojov箪 prieinok:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Exportovan箪 s炭bor:"
-#: 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 "Zvo直te..."
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Zvo直te s炭bor pre export"
@@ -2498,119 +2498,175 @@ msgstr "Vytv叩ram n叩h直ad obr叩zku...\n"
msgid "Can't load the image."
msgstr "Ned叩 sa na鱈ta泥 obr叩zok."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Importova泥"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Zvo直te importovan箪 mbox s炭bor a cie直ov箪 prieinok."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Importovan箪 s炭bor:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Cie直ov箪 prieinok:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Zvo直te s炭bor pre import"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Pros鱈m zvo直te n叩zov adres叩ra a s炭boru pre import."
-#: 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 "Zvo直te a premenujte n叩zvy LDIF pol鱈 pre import."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "S炭bor importovan箪."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Proz鱈m zvo直te s炭bor."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Nebol zadan箪 n叩zov adres叩ra."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Chyba pri 鱈tan鱈 LDIF pol鱈."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "S炭bor LDIFbol 炭spe邸ne importovan箪."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Zvo直te s炭bor LDIF"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Vyberte s炭bor vCard"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "N叩zov s炭boru"
-#: 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 pole"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "N叩zov atrib炭tu"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Adres叩r :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Atrib炭t"
+#: 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 "Zvo直te"
+#: 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 "Nahor"
+
+#: 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 "Nadol"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Adres叩r :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "N叩zov s炭boru :"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Z叩znamy:"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Importova泥 s炭bor LDIF do adres叩ra"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Predch叩dzaj炭ci"
-
-#: 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 "Nasleduj炭ca"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Predch叩dzaj炭ci"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "daje o s炭bore"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Atrib炭ty"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "LDIF pole"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Dokoni泥"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Zvo直te a premenujte n叩zvy LDIF pol鱈 pre import."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Chyba pri 鱈tan鱈 LDIF pol鱈."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "S炭bor LDIFbol 炭spe邸ne importovan箪."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Zvo直te s炭bor LDIF"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "LDIF pole"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "N叩zov atrib炭tu"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Atrib炭t"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Zvo直te"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importova泥 s炭bor LDIF do adres叩ra"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Atrib炭ty"
+
#: src/inc.c:160
#, fuzzy, c-format
msgid "Sylpheed: %d new messages"
@@ -2781,7 +2837,7 @@ msgid "Socket error."
msgstr "Chyba socketu."
#. 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 "Vzdialen箪 hostite直 ukonil spojenie."
@@ -2798,11 +2854,11 @@ msgstr ""
"Mailbox je zamknut箪:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "Autentiz叩cia bola ne炭spe邸n叩."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2811,16 +2867,16 @@ msgstr ""
"Autentiz叩cia bola ne炭spe邸n叩:\n"
"%s"
-#: src/inc.c:1351 src/send_message.c:797
+#: src/inc.c:1351 src/send_message.c:798
#, fuzzy
msgid "Session timed out."
msgstr "as spojenia vypr邸al\n"
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "Zaleovanie zru邸en辿\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Prij鱈mam nov辿 spr叩vy z %s do %s...\n"
@@ -3944,15 +4000,15 @@ msgid ""
"virus or something like a malicious program."
msgstr ""
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Heslo"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[転iadny user id]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3965,7 +4021,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4491,18 +4547,6 @@ msgstr " N叩poveda syntaxe "
msgid "Registered actions"
msgstr "Registrovan辿 akcie"
-#: 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 "Nahor"
-
-#: 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 "Nadol"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Nov辿)"
@@ -6358,11 +6402,11 @@ msgstr "Odosielam spr叩vu (%d / %d bajtov)"
msgid "Sending message"
msgstr "Odosielam spr叩vu"
-#: 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 "Pri odosielan鱈 spr叩vy nastala chyba."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/sl.po b/po/sl.po
index 614ee722..62950e4d 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,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: 2003-01-24 20:39CET\n"
"Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
"Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -690,8 +690,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 "Ime"
@@ -829,7 +829,7 @@ msgid "Address"
msgstr "Naslov"
#: 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 "Opombe"
@@ -1075,19 +1075,19 @@ msgstr "Mapa in naslovi"
msgid "Really delete `%s' ?"
msgstr "Res 転elite izbrisati '%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 "Nov uporabnik, ne morem shraniti indeksne datoteke."
-#: 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 "Nov uporabnik, ne morem shraniti datotek z iminiki naslovov."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Star imenik naslovov je bil uspe邸no pretvorjen."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1095,7 +1095,7 @@ msgstr ""
"Stari imenik naslovov pretvorjen,\n"
"ne morem shraniti nove indeksne datoteke naslovov"
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1103,7 +1103,7 @@ msgstr ""
"Ne morem pretvoriti imenika naslovov,\n"
"sem pa naredil prazne nove datoteke imenikov naslovov."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1111,7 +1111,7 @@ msgstr ""
"Ne morem pretvoriti imenika naslovov,\n"
"ne morem narediti novih datotek z imeniki naslovov."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1119,91 +1119,91 @@ msgstr ""
"Ne morem pretvoriti imenika naslovov\n"
"in ne morem narediti novih datotek z imeniki naslovov"
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Napaka pri pretvorbi imenika naslovov"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Pretvarjam imenik naslovov"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Napaka v imeniku naslovov"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Ne morem prebrati indeksa naslovov"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"Star imenik naslovov pretvorjen, ne morem shraniti nove indeksne datoteke "
"naslovov"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Ne morem pretvoriti imenika naslovov, sem pa naredil prazno datoteko z "
"imenikom naslovov."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Ne morem pretvoriti imenika naslovov, ne morem narediti novih datotek z "
"imeniki naslovov."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Ne morem pretvoriti imenika naslovov in ne morem narediti novih datotek."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Napaka pri pretvorbi imenika naslovov"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Pretvorba imenika naslovov"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Vmesnik"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Imenik naslovov"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Oseba"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "Elektronski naslov"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Skupina"
#. 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 "Mapa"
-#: src/addressbook.c:3256
+#: src/addressbook.c:3264
msgid "vCard"
msgstr "v-kartica"
-#: 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 "Stre転nik LDAP"
@@ -1888,24 +1888,24 @@ msgstr "Ime in vrednost morata biti podana."
msgid "Edit Person Data"
msgstr "Urejanje podatkov o osebi"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Prika転i ime"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Priimek"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Ime"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Vzdevek"
#: 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 "Elektronski Naslov"
@@ -1922,7 +1922,7 @@ msgstr "Premakni navzgor"
msgid "Move Down"
msgstr "Premakni navzdol"
-#: 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 "Spremeni"
@@ -1950,7 +1950,7 @@ msgstr "Datoteka se zdi v redu."
msgid "File does not appear to be a valid address book format."
msgstr "Datoteka se ne zdi veljaven imenik naslovov."
-#: 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 "Datoteke ni mogoe prebrati."
@@ -1958,11 +1958,11 @@ msgstr "Datoteke ni mogoe prebrati."
msgid "Edit Addressbook"
msgstr "Uredi adresar"
-#: 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 " Preveri Datoteko "
-#: 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 "Datoteka"
@@ -2030,29 +2030,29 @@ msgstr "Nova mapa"
msgid "Input the name of new folder:"
msgstr "Vnesite ime nove mape:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Ka転e, da datoteka nima oblike JPilot."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Izberite datoteko JPilot"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Urejanje vnosa 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 "Dodatni kos(i) elektronskega naslova"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Dodaj nov vnos JPilot"
@@ -2132,44 +2132,44 @@ msgstr "Razpolo転ljive baze iskanja"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Ne morem prebrati iskalnih baz s stre転nika. Prosim, vnesite jih rono"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Datoteka se ne zdi veljaven zapis v-kartice."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Izberite datoteko v-kartice"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Urejanje vnosa v-kartice"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Dodaj nov vnos v-kartice"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Izvozi"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Doloite ciljno mapo in datoteko mbox."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Izvorni imenik:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Izvozi datoteko:"
-#: 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 " Izberi... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Izberite datoteko za izvoziti"
@@ -2503,119 +2503,175 @@ msgstr "Delam gledanje slike...\n"
msgid "Can't load the image."
msgstr "Ne morem nalo転iti slike."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Uvozi"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Doloite ciljno datoteko mbox in ciljno mapo."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Uva転am datoteko:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Ciljni imenik:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Izberite datoteko za uvoz"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Prosim, doloite ime adresarja in datoteko za uvoz."
-#: 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 "Izberite in preimenujte ime polj LDIF za uvoz"
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Datoteka uvo転ena."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Prosim, izberite datoteko."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Ime imenika naslovov mora biti podano."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Napaka pri branju polj LDIF."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "Datoteka LDIF uspe邸no uvo転ena."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Izberite datoteko LDIF"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Izberite datoteko v-kartice"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Ime datoteke"
-#: 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 "Polje LDIF"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Ime atributa"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Adresar :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Atribut"
+#: 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 "Izberi"
+#: 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 "Gor"
+
+#: 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 "Dol"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Adresar :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Ime datoteke :"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Zapisi :"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Uvozi datoteko LDIF v imenik naslovov"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Prej邸nji"
-
-#: 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 "Naslednji"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Prej邸nji"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Podatki o datoteki"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Atributi"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "Polje LDIF"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Konaj"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Izberite in preimenujte ime polj LDIF za uvoz"
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Napaka pri branju polj LDIF."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "Datoteka LDIF uspe邸no uvo転ena."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Izberite datoteko LDIF"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "Polje LDIF"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Ime atributa"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Atribut"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Izberi"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Uvozi datoteko LDIF v imenik naslovov"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Atributi"
+
#: src/inc.c:160
#, fuzzy, c-format
msgid "Sylpheed: %d new messages"
@@ -2785,7 +2841,7 @@ msgid "Socket error."
msgstr "napaka v prikljuku."
#. 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 ""
@@ -2800,27 +2856,27 @@ msgid ""
"%s"
msgstr "Po邸tni predal je zaklenjen."
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
#, fuzzy
msgid "Authentication failed."
msgstr "Overovitvena metoda"
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, fuzzy, c-format
msgid ""
"Authentication failed:\n"
"%s"
msgstr "Overovitvena metoda"
-#: 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 "Pripojitev odpovedana\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Pobiram nova sporoila iz %s v %s...\n"
@@ -3947,15 +4003,15 @@ msgid ""
"virus or something like a malicious program."
msgstr ""
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "ifrirna fraza"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[ni uporabnikovega id]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3968,7 +4024,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4491,18 +4547,6 @@ msgstr " Pomo pri skladnji "
msgid "Registered actions"
msgstr "Registrirana dejanja"
-#: 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 "Gor"
-
-#: 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 "Dol"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Nov)"
@@ -6359,11 +6403,11 @@ msgstr "Po邸iljam sporoilo (%d / %d zlogov)"
msgid "Sending message"
msgstr "Po邸iljam sporoilo"
-#: 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 "Med po邸iljanjem sporoila je pri邸lo do napake."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, fuzzy, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/sr.po b/po/sr.po
index cf285b09..0576e2cb 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,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: 2002-11-29 21:08+0100\n"
"Last-Translator: garret <garret@garrets.tk>\n"
"Language-Team: Serbian\n"
@@ -690,8 +690,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 "Ime"
@@ -829,7 +829,7 @@ msgid "Address"
msgstr "Adresa"
#: 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 "Bele邸ke"
@@ -1076,19 +1076,19 @@ msgstr "Direktorijum i adrese"
msgid "Really delete `%s' ?"
msgstr "Zaista obrisati `%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 "Novi korisnik, ne mogu sauvati index datoteku."
-#: 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 "Novi korisnik, ne mogu sauvati datoteke adresara."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Stari adresar uspe邸no prebaen."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1096,7 +1096,7 @@ msgstr ""
"Stari adresar ne mo転e biti prebaen,\n"
"ne mogu sauvati novu index datoteku adresara."
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1104,7 +1104,7 @@ msgstr ""
"Ne mogu prebaciti adesar,\n"
"ali sam kreirao nove prazne datoteke adresara."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1112,7 +1112,7 @@ msgstr ""
"Ne mogu prebaciti adresar,\n"
"ne mogu napraviti nove datoteke adresara."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1120,84 +1120,84 @@ msgstr ""
"Ne mogu prebaciti adresar,\n"
"i ne mogu napraviti nove datoteke adresara."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Gre邸ka pri prebacivanju adresara"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Prebacivanje adresara"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Gre邸ka adresara"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Ne mogu itati index adresara"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr "Stari adresar une邸en, ne mogu napraviti index datoteke novih adresa"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr "Ne mogu uneti adresar, pravim prazne datoteke novog adresara."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr "Ne mogu uneti adresar, ne mogu napraviti nove datoteke adresara."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr "Ne mogu uneti adresar i ne mogu napraviti nove datoteke adresara."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Gre邸ka pri unosu adresara"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Unos adresara"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Izgled programa"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Adresar"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Osoba"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "Adresa e-po邸te"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Grupa"
#. 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 "Direktorijum"
-#: 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 Server"
@@ -1883,24 +1883,24 @@ msgstr "Ime i iznos moraju biti navedeni."
msgid "Edit Person Data"
msgstr "Izmeni line podatke"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Prikaz imena"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Prezime"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Ime"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Nadimak"
#: 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 "Adresa e-po邸te"
@@ -1917,7 +1917,7 @@ msgstr "Pomeri gore"
msgid "Move Down"
msgstr "Pomeri dole"
-#: 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 "Izmeni"
@@ -1945,7 +1945,7 @@ msgstr "Datoteka je u redu"
msgid "File does not appear to be a valid address book format."
msgstr "Datoteka nije u formatu adresara."
-#: 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 "Ne mogu proitati datoteku."
@@ -1953,11 +1953,11 @@ msgstr "Ne mogu proitati datoteku."
msgid "Edit Addressbook"
msgstr "Izmeni adresar"
-#: 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 " Proveri datoteku "
-#: 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 "Datoteka"
@@ -2025,29 +2025,29 @@ msgstr "Novi direktorijum"
msgid "Input the name of new folder:"
msgstr "Unesite ime novog direktorijuma:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Datoteka nije u JPilot formatu."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Odaberite JPilot datoteku"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Izmenite JPilot unos"
-#: 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 "Dodatne pojedinosti adrese e-po邸te"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Dodajte novi JPilot unos"
@@ -2127,44 +2127,44 @@ msgstr "Dostupne baze pretrage"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Ne mogu proitati Baze Pretrage sa servera - postavite runo"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Datoteka nije vCard formata."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Odaberite vCard datoteku"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Izmeni vCard unose"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Dodaj novi vCard unos"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Izvezi"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Odredite 転eljeni direktorijum i mbox datoteku."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Izvorni dir:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Izvozim datoteku:"
-#: 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 " Odaberite... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Odaberite datoteku za izvoz"
@@ -2498,119 +2498,175 @@ msgstr "Kreiram pregled slika...\n"
msgid "Can't load the image."
msgstr "Ne mogu prikazati sliku."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Uvezi"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Odredite 転eljenu mbox datoteku i odredi邸ni direktorijum."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Uvozim datoteku:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Odredi邸ni dir:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Odaberite datoteku za uvoz"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Odredite ime adresara i datoteku za uvoz."
-#: 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 "Oznaite i promenite ime LDIF polja za izvoz."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Datoteka uve転ena."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Odaberite datoteku."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Ime adresara mora biti navedeno."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Gre邸ka pri itanju LDIF polja."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "LDIF datoteka je uspe転no uve転ena."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Odaberite LDIF datoteku"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Odaberite vCard datoteku"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Ime datoteke"
-#: 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 polje"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Ime Atributa"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Adresar :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Atribut"
+#: 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 "Odaberi"
+#: 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 "Gore"
+
+#: 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 "Dole"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Adresar :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Ime datoteke :"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Bele邸ke :"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Unesi LDIF datoteku u Adresar"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Preth."
-
-#: 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 "Sled."
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Preth."
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Info datoteke"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Atributi"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "LDIF polje"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Gotovo"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Oznaite i promenite ime LDIF polja za izvoz."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Gre邸ka pri itanju LDIF polja."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "LDIF datoteka je uspe転no uve転ena."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Odaberite LDIF datoteku"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "LDIF polje"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Ime Atributa"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Atribut"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Odaberi"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Unesi LDIF datoteku u Adresar"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Atributi"
+
#: src/inc.c:160
#, fuzzy, c-format
msgid "Sylpheed: %d new messages"
@@ -2780,7 +2836,7 @@ msgid "Socket error."
msgstr "Protokol gre邸ka."
#. 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 ""
@@ -2795,27 +2851,27 @@ msgid ""
"%s"
msgstr "Sandue je zakljuano."
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
#, fuzzy
msgid "Authentication failed."
msgstr "Nain provere identieta"
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, fuzzy, c-format
msgid ""
"Authentication failed:\n"
"%s"
msgstr "Nain provere identieta"
-#: 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 "Incorporation otkazano\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "Primam nove poruke od %s u %s...\n"
@@ -3943,15 +3999,15 @@ msgid ""
"virus or something like a malicious program."
msgstr ""
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Lozinka"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[nema ID korinika]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3964,7 +4020,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4487,18 +4543,6 @@ msgstr "Sintaksna pomo"
msgid "Registered actions"
msgstr "Registrovane akcije"
-#: 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 "Gore"
-
-#: 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 "Dole"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Novo)"
@@ -6358,11 +6402,11 @@ msgstr "aljem poruku (%d / %d bajtova)"
msgid "Sending message"
msgstr "aljem poruku"
-#: 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 "Do邸lo je do gre邸ke prilikom slanja poruke."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, fuzzy, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/sv.po b/po/sv.po
index ba4c8d46..45ec8a4d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,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: 2004-12-05 14:40+0100\n"
"Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -687,8 +687,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 "Namn"
@@ -826,7 +826,7 @@ msgid "Address"
msgstr "Adress"
#: 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 "Kommentarer"
@@ -1071,19 +1071,19 @@ msgstr "Mapp och _adresser"
msgid "Really delete `%s' ?"
msgstr "Vill du verkligen ta bort \"%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 "Ny anv辰ndare, kunde inte spara indexfil."
-#: 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 "Ny anv辰ndare, kunde inte spara adressboksfiler."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Den gamla adressboken 辰r konverterad."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1091,7 +1091,7 @@ msgstr ""
"Gammal adressbok konverterad,\n"
"kunde inte spara ny adressindexfil"
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1099,7 +1099,7 @@ msgstr ""
"Kunde inte konvertera adressbok,\n"
"men skapade nya tomma adressboksfiler."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1107,7 +1107,7 @@ msgstr ""
"Kunde inte konvertera adressbok,\n"
"kunde inte skapa nya adressboksfiler."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1115,86 +1115,86 @@ msgstr ""
"Kunde inte konvertera adressbok,\n"
"och kunde inte skapa nya adressboksfiler."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Fel vid konvertering av adressbok"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Adressbokskonvertering"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Adressboksfel"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Kunde inte l辰sa adressindex"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr "Gammal adressbok konverterad, kunde inte skapa ny adressindexfil"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Kunde inte konvertera adressbok, men skapade nya tomma adressboksfiler."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr "Kunde inte konvertera adressbok, kunde inte skapa nya adressboksfiler."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Kunde inte konvertera adressbok och kunde inte skapa nya adressboksfiler."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Fel vid konvertering av adressbok"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Adressbokskonvertering"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Gr辰nssnitt"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Adressbok"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Person"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "E-postadress"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Grupp"
#. 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 "Mapp"
-#: 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-server"
@@ -1842,24 +1842,24 @@ msgstr "Namn och V辰rde m奪ste anges."
msgid "Edit Person Data"
msgstr "Redigera persondata"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "Visat namn"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Efternamn"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "F旦rnamn"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Smeknamn"
#: 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 "E-postadress"
@@ -1876,7 +1876,7 @@ msgstr "Flytta upp"
msgid "Move Down"
msgstr "Flytta ner"
-#: 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 "ndra"
@@ -1904,7 +1904,7 @@ msgstr "Filen verkar vara OK."
msgid "File does not appear to be a valid address book format."
msgstr "Filen verkar inte vara i ett giltigt adressboksformat."
-#: 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 "Kunde inte l辰sa fil."
@@ -1912,11 +1912,11 @@ msgstr "Kunde inte l辰sa fil."
msgid "Edit Addressbook"
msgstr "Redigera adressbok"
-#: 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 " Kontrollera fil "
-#: 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 "Fil"
@@ -1984,29 +1984,29 @@ msgstr "Ny mapp"
msgid "Input the name of new folder:"
msgstr "Skriv in namnet p奪 den nya mappen:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Filen verkar inte vara i JPilot-format."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "V辰lj JPilot-fil"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "Redigera JPilot-post"
-#: 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 "Ytterligare e-postadressobjekt"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "L辰gg till ny JPilot-post"
@@ -2086,44 +2086,44 @@ msgstr "Tillg辰nglig(a) s旦kbas(er)"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Kunde inte l辰sa s旦kbas(er) fr奪n server - st辰ll in dem manuellt"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Filen verkar inte vara i giltigt vCard-format."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "V辰lj vCard-fil"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "Redigera vCard-post"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "L辰gg till ny vCard-post"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Exportera"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "V辰lj m奪lmapp och mbox-fil."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Ursprungskatalog:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Exporterar fil:"
-#: 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 " V辰lj... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "V辰lj exportfil"
@@ -2453,119 +2453,175 @@ msgstr "Skapar bildvy...\n"
msgid "Can't load the image."
msgstr "Kan inte 旦ppna bilden."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Importera"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "V辰lj mbox-m奪lfil och destinationskatalog."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Fil att importera:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Destinationskatalog:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "V辰lj fil att importera"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "Ange adressboksnamn och fil att importera."
-#: 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 "V辰lj och byt namn p奪 LDIF-f辰ltnamn att importera."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Fil importerad."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "V辰lj en fil."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Adressboksnamn m奪ste anges."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "Fel vid inl辰sning av LDIF-f辰lt."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "LDIF-fil importerad."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "V辰lj LDIF-fil"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "V辰lj vCard-fil"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Filnamn"
-#: 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-f辰lt"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "Attributnamn"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Adressbok:"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Attribut"
+#: 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 "V辰lj"
+#: 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 "Upp"
+
+#: 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 "Ner"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Adressbok:"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Filnamn:"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Register:"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Importera LDIF-fil till adressboken"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "F旦reg奪ende"
-
-#: 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 "N辰sta"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "F旦reg奪ende"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Filinfo"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Attribut"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "LDIF-f辰lt"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Avsluta"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "V辰lj och byt namn p奪 LDIF-f辰ltnamn att importera."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Fel vid inl辰sning av LDIF-f辰lt."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "LDIF-fil importerad."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "V辰lj LDIF-fil"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "LDIF-f辰lt"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "Attributnamn"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Attribut"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "V辰lj"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importera LDIF-fil till adressboken"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Attribut"
+
#: src/inc.c:160
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2735,7 +2791,7 @@ msgid "Socket error."
msgstr "Fel p奪 uttag (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 "Anslutningen st辰ngdes av fj辰rrv辰rden."
@@ -2752,11 +2808,11 @@ msgstr ""
"Brevl奪dan 辰r l奪st:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "Autentisering misslyckades."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2765,15 +2821,15 @@ msgstr ""
"Autentisering misslyckades:\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 "Sessionens v辰ntetid tog slut."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "Inkorporering avbruten\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "H辰mtar nya meddelanden fr奪n %s till %s...\n"
@@ -3873,15 +3929,15 @@ msgstr ""
"Om du vil k旦ra den, spara den n奪gonstans och kolla att det inte 辰r ett virus "
"eller n奪got illasinnat program."
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "L旦senfras"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[inget anv辰ndarid]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3894,7 +3950,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4412,18 +4468,6 @@ msgstr " Syntaxhj辰lp "
msgid "Registered actions"
msgstr "Registrerade 奪tg辰rder"
-#: 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 "Upp"
-
-#: 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 "Ner"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Ny)"
@@ -6234,11 +6278,11 @@ msgstr "Skickar meddelande (%d / %d byte)"
msgid "Sending message"
msgstr "Skickar meddelande"
-#: 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 "Fel uppstod n辰r meddelandet skickades."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/tr.po b/po/tr.po
index 41d3866f..99913824 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tr\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: 2004-12-03 11:44+0200\n"
"Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
"Language-Team: <gnome-turk@gnome.org>\n"
@@ -685,8 +685,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 "聴sim"
@@ -826,7 +826,7 @@ msgid "Address"
msgstr "Adres"
#: 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 "Notlar"
@@ -1073,19 +1073,19 @@ msgstr "Dizin ve Adresler"
msgid "Really delete `%s' ?"
msgstr "`%s' silinsin mi?"
-#: 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 "Yeni kullan脹c脹, indeks dosyas脹 kaydedilemedi."
-#: 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 "Yeni kullan脹c脹, adres defteri dosyalar脹 kaydedilemedi."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "Eski adres defteri baar脹yla 巽evrildi."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1093,7 +1093,7 @@ msgstr ""
"Eski adres defteri 巽evrildi,\n"
"yeni adres indeks dosyas脹 kaydedilemedi"
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1101,7 +1101,7 @@ msgstr ""
"Adres defteri 巽evrilemedi,\n"
"ancak bo bir adres defteri dosyas脹 oluturuldu."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1109,7 +1109,7 @@ msgstr ""
"Adres defteri ve yeni adres defteri \n"
"dosyas脹 oluturulamad脹."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1117,89 +1117,89 @@ msgstr ""
"Adres defteri ve yeni adres defteri \n"
"dosyas脹 oluturulamad脹."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Adres defteri 巽evrim hatas脹"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Adres defteri 巽evrimi"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "Adres Defteri Hatas脹"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Adres indeksi okunamad脹"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"Eski adres defteri 巽evrildi, ancak yeni adres indeks dosyas脹 kaydedilemedi"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Adres defteri 巽evrilemedi, ancak yeni ve bo bir adres defteri dosyas脹 "
"oluturuldu."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Adres defteri 巽evrilemedi ve yeni adres defteri dosyas脹 oluturulamad脹."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Adres defteri 巽evrilemedi ve yeni adres defteri dosyas脹 oluturulamad脹."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Adres Defteri evrim Hatas脹"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Adres Defteri evrimi"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Aray端z"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "Adres Defteri"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "Kii"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "聴leti Adresi"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Grup"
#. 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 "Dizin"
-#: 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 Sunucu"
@@ -1875,24 +1875,24 @@ msgstr "Bir isim ve deer girilmelidir."
msgid "Edit Person Data"
msgstr "Kii Verilerini D端zenle"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "G旦r端nt端lenecek 聴sim"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "Soyad脹"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "Ad脹"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Lakab脹"
#: 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 "E-posta Adresi"
@@ -1909,7 +1909,7 @@ msgstr "Yukar脹"
msgid "Move Down"
msgstr "Aa脹"
-#: 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 "D端zenle"
@@ -1937,7 +1937,7 @@ msgstr "Dosya sorunsuz g旦r端n端yor."
msgid "File does not appear to be a valid address book format."
msgstr "Bu dosya ge巽erli bir adres defteri bi巽imi i巽ermiyor."
-#: 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 "Dosya okunamad脹."
@@ -1945,11 +1945,11 @@ msgstr "Dosya okunamad脹."
msgid "Edit Addressbook"
msgstr "Adres Defterini D端zenle"
-#: 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 " Dosyay脹 Denetle "
-#: 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 "Dosya"
@@ -2018,29 +2018,29 @@ msgstr "Yeni dizin"
msgid "Input the name of new folder:"
msgstr "Yeni dizinin ad脹n脹 verin:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Bu dosya JPilot bi巽iminde deil."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "JPilot Dosyas脹n脹 Se巽"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "JPilot Girdisini D端zenle"
-#: 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 "Ek e-posta adres(ler)i"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Yeni JPilot Girdisi Ekle"
@@ -2120,44 +2120,44 @@ msgstr "Kullan脹labilir Arama Taban(lar)脹"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Sunucudan Arama Taban(lar)脹 okunamad脹 - l端tfen elle d端zenleyin"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Bu dosya vCard bi巽iminde deil."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "vCard Dosyas脹n脹 Se巽"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "vCard Girdisini D端zenle"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Yeni vCard Girdisi Ekle"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Aktar"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "L端tfen hedef dizini ve mbox dosyas脹n脹 belirtin."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Kaynak dizini:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "Dosya aktar脹l脹yor:"
-#: 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 " Se巽... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Aktar脹lacak dosyay脹 se巽in"
@@ -2488,119 +2488,175 @@ msgstr "Resim g旦r端nt端s端 oluturuluyor...\n"
msgid "Can't load the image."
msgstr "Resim y端klenemedi."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "D脹ar脹dan Aktar"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Kaynak ve hedef mbox dosyalar脹n脹 belirtin."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Dosya aktar脹l脹yor:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Hedef dizini:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Eklenecek dosyay脹 se巽in"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "L端tfen adres defteri ad脹n脹 ve aktar脹lacak dosyas脹 se巽in."
-#: 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 "Aktar脹lacak dosyalar脹n adlar脹n脹 LDIF alanlar脹ndan se巽iniz"
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Dosya aktar脹ld脹."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "L端tfen bir dosya se巽in."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Adres defteri ad脹 verilmelidir."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "LDIF alanlar脹 okunurken hata."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "Eski adres defteri baar脹yla d脹ar脹dan aktar脹ld脹."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "LDIF Dosyas脹n脹 Se巽in"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "vCard Dosyas脹n脹 Se巽"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Dosya Ad脹"
-#: 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 Alan脹"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "zellik Ad脹"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "Adres Defteri :"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "zellik"
+#: 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 "Se巽"
+#: 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 "Yukar脹"
+
+#: 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 "Aa脹"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "Adres Defteri :"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "Dosya Ad脹 :"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Kay脹tlar :"
-#: 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 dosyas脹n脹 Adres Defterine aktar"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "nceki"
-
-#: 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 "Sonraki"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "nceki"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Dosya Bilgisi"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "zellikler"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "LDIF Alan脹"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Bitir"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Aktar脹lacak dosyalar脹n adlar脹n脹 LDIF alanlar脹ndan se巽iniz"
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "LDIF alanlar脹 okunurken hata."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "Eski adres defteri baar脹yla d脹ar脹dan aktar脹ld脹."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "LDIF Dosyas脹n脹 Se巽in"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "LDIF Alan脹"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "zellik Ad脹"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "zellik"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Se巽"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "LDIF dosyas脹n脹 Adres Defterine aktar"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "zellikler"
+
#: src/inc.c:160
#, fuzzy, c-format
msgid "Sylpheed: %d new messages"
@@ -2770,7 +2826,7 @@ msgid "Socket error."
msgstr "protokol hatas脹"
#. 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 "Balant脹 kar脹 taraftan kesildi."
@@ -2787,11 +2843,11 @@ msgstr ""
"Posta kutusu kilitli:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "Yetkilendirmede hata olutu."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2800,15 +2856,15 @@ msgstr ""
"Yetkilendirme baar脹s脹z:\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 "Oturum zaman a脹m脹na urad脹."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "聴ptal edildi\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "%s'den yeni mesajlar %s e al脹n脹yor...\n"
@@ -3916,15 +3972,15 @@ msgid ""
"virus or something like a malicious program."
msgstr ""
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "Parola"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[kullan脹c脹 ad脹 yok]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3937,7 +3993,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4463,18 +4519,6 @@ msgstr " Yaz脹m Yard脹m脹"
msgid "Registered actions"
msgstr "Kay脹tl脹 eylemler"
-#: 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 "Yukar脹"
-
-#: 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 "Aa脹"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(Yeni)"
@@ -6303,11 +6347,11 @@ msgstr "聴leti g旦nderiliyor (%d / %d bayt)"
msgid "Sending message"
msgstr "聴leti g旦nderiliyor"
-#: 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 "聴leti g旦nderilirken hata olutu."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
diff --git a/po/uk.po b/po/uk.po
index 8f1a4a29..89df3b53 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Sylpheed 2.3.0\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: 2007-01-05 13:58+0300\n"
"Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
"Language-Team: Ukrainian\n"
@@ -691,8 +691,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 "仄'"
@@ -830,7 +830,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 "仂舒从亳"
@@ -1073,19 +1073,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"
@@ -1093,7 +1093,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."
@@ -1101,7 +1101,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."
@@ -1109,7 +1109,7 @@ 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."
@@ -1117,85 +1117,85 @@ msgstr ""
"亠 于亟舒仍仂 仆 从仂仆于亠于舒亳 舒亟亠仆 从仆亳亞,\n"
"仆 于仂亳亳 仆仂于 舒亶仍亳 舒亟亠仆仂 从仆亳亞亳."
-#: 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 "亟亠舒 e-mail"
-#: 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"
@@ -1840,24 +1840,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 "亟亠舒 e-mail"
@@ -1874,7 +1874,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 "仄仆亳亳"
@@ -1902,7 +1902,7 @@ msgstr "亟舒, 亰 舒亶仍仂仄 于亠 OK."
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 "亠 于亟舒仍仂 仗仂亳舒亳 舒亶仍."
@@ -1910,11 +1910,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 "个舒亶仍"
@@ -1982,29 +1982,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 "仂亟舒从仂于 仗仆从亳 舒亟亠亳 e-mail"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "仂亟舒亳 仆仂于亳亶 亰舒仗亳 JPilot"
@@ -2084,44 +2084,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 "亳亰仆舒亠 仗舒仗从 舒亶仍 mbox 亟仍 亰舒仗亳"
-#: 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 "弍亠 舒亶仍 亟仍 亠从仗仂"
@@ -2448,119 +2448,175 @@ msgstr "弌于仂ム仄仂 仂弍仍舒 仗亠亠亞仍磲 亰仂弍舒亢亠仆仆
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 "亳亰仆舒亠 仍仂于亳亶 舒亶仍 mbox 仗舒仗从 仗亳亰仆舒亠仆仆."
-#: 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
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2729,7 +2785,7 @@ msgid "Socket error."
msgstr "仂仄亳仍从舒 仂从亠舒."
#. 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 "'亟仆舒仆仆 亰舒从亳仂 于亟亟舒仍亠仆亳仄 仂仂仄."
@@ -2746,11 +2802,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"
@@ -2759,15 +2815,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"
@@ -3879,15 +3935,15 @@ 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 "[仆亠仄舒 id 从仂亳于舒舒]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3900,7 +3956,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4413,18 +4469,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 "(仂于亳亶)"
@@ -6203,11 +6247,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"
diff --git a/po/vi.po b/po/vi.po
index 233d110d..f4600792 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,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: 2006-04-16 22:05+0700\n"
"Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
"Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -669,8 +669,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 "T棚n"
@@ -808,7 +808,7 @@ msgid "Address"
msgstr "畛a ch畛"
#: 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 "Ghi ch炭"
@@ -1051,19 +1051,19 @@ msgstr "Th動 m畛c v 畛a c_h畛"
msgid "Really delete `%s' ?"
msgstr "Th畛c s畛 mu畛n xo叩 `%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 "Ng動畛i d湛ng m畛i, kh担ng th畛 l動u t畉p tin m畛c l畛c."
-#: 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 "Ng動畛i d湛ng m畛i, kh担ng th畛 l動u c叩c t畉p tin s畛 畛a ch畛."
-#: src/addressbook.c:2452 src/addressbook.c:2585
+#: src/addressbook.c:2460 src/addressbook.c:2593
msgid "Old address book converted successfully."
msgstr "S畛 畛a ch畛 c滴 達 動畛c chuy畛n 畛i thnh c担ng."
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1071,7 +1071,7 @@ msgstr ""
"S畛 畛a ch畛 c滴 達 動畛c chuy畛n,\n"
"kh担ng th畛 l動u t畉p tin 畛a ch畛 m畛i"
-#: src/addressbook.c:2470
+#: src/addressbook.c:2478
msgid ""
"Could not convert address book,\n"
"but created empty new address book files."
@@ -1079,7 +1079,7 @@ msgstr ""
"Kh担ng th畛 chuy畛n 畛i s畛 畛a ch畛,\n"
"nh動ng 達 t畉o c叩c t畉p tin s畛 畛a ch畛 tr畛ng m畛i."
-#: src/addressbook.c:2476
+#: src/addressbook.c:2484
msgid ""
"Could not convert address book,\n"
"could not create new address book files."
@@ -1087,7 +1087,7 @@ msgstr ""
"Kh担ng th畛 chuy畛n 畛i s畛 畛a ch畛,\n"
"kh担ng th畛 t畉o c叩c t畉p tin s畛 畛a ch畛 m畛i."
-#: src/addressbook.c:2481
+#: src/addressbook.c:2489
msgid ""
"Could not convert address book\n"
"and could not create new address book files."
@@ -1095,89 +1095,89 @@ msgstr ""
"Kh担ng th畛 chuy畛n 畛i s畛 畛a ch畛\n"
"v kh担ng th畛 c叩c t畉p tin s畛 畛a ch畛 m畛i."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "L畛i chuy畛n 畛i s畛 畛a ch畛"
-#: src/addressbook.c:2492
+#: src/addressbook.c:2500
msgid "Addressbook conversion"
msgstr "Chuy畛n 畛i s畛 畛a ch畛"
-#: src/addressbook.c:2527
+#: src/addressbook.c:2535
msgid "Addressbook Error"
msgstr "L畛i s畛 畛a ch畛"
-#: src/addressbook.c:2528 src/addressbook.c:2628
+#: src/addressbook.c:2536 src/addressbook.c:2636
msgid "Could not read address index"
msgstr "Kh担ng th畛 畛c m畛c l畛c 畛a ch畛"
-#: src/addressbook.c:2590
+#: src/addressbook.c:2598
msgid "Old address book converted, could not save new address index file"
msgstr ""
"S畛 畛a ch畛 c滴 達 動畛c chuy畛n 畛i, kh担ng th畛 l動u t畉p tin m畛c l畛c 畛a ch畛 m畛i"
-#: src/addressbook.c:2604
+#: src/addressbook.c:2612
msgid ""
"Could not convert address book, but created empty new address book files."
msgstr ""
"Kh担ng th畛 chuy畛n 畛i s畛 畛a ch畛, nh動ng 達 t畉o c叩c t畉p tin s畛 畛a ch畛 tr畛ng "
"m畛i."
-#: src/addressbook.c:2610
+#: src/addressbook.c:2618
msgid ""
"Could not convert address book, could not create new address book files."
msgstr ""
"Kh担ng th畛 chuy畛n 畛i s畛 畛a ch畛, kh担ng th畛 t畉o c叩c t畉p tin s畛 畛a ch畛 m畛i."
-#: src/addressbook.c:2616
+#: src/addressbook.c:2624
msgid ""
"Could not convert address book and could not create new address book files."
msgstr ""
"Kh担ng th畛 chuy畛n 畛i s畛 畛a ch畛 v kh担ng th畛 t畉o c叩c t畉p tin s畛 畛a ch畛 m畛i."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "L畛i chuy畛n 畛i s畛 畛a ch畛"
-#: src/addressbook.c:2640
+#: src/addressbook.c:2648
msgid "Addressbook Conversion"
msgstr "Chuy畛n 畛i s畛 畛a ch畛"
-#: src/addressbook.c:3160 src/prefs_common_dialog.c:2103
+#: src/addressbook.c:3168 src/prefs_common_dialog.c:2103
msgid "Interface"
msgstr "Giao di畛n"
-#: src/addressbook.c:3176 src/importldif.c:515
+#: src/addressbook.c:3184 src/importcsv.c:655 src/importldif.c:482
msgid "Address Book"
msgstr "S畛 畛a ch畛"
-#: src/addressbook.c:3192
+#: src/addressbook.c:3200
msgid "Person"
msgstr "C叩 nh但n"
-#: src/addressbook.c:3208
+#: src/addressbook.c:3216
msgid "EMail Address"
msgstr "畛a ch畛 email"
-#: src/addressbook.c:3224
+#: src/addressbook.c:3232
msgid "Group"
msgstr "Nh坦m"
#. 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 "Th動 m畛c"
-#: 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 "M叩y ch畛 LDAP"
@@ -1818,24 +1818,24 @@ msgstr "Ph畉i cung c畉p m畛t T棚n v Gi叩 tr畛."
msgid "Edit Person Data"
msgstr "So畉n d畛 li畛u v畛 c叩 nh但n"
-#: src/editaddress.c:578
+#: src/editaddress.c:578 src/importcsv.c:123
msgid "Display Name"
msgstr "T棚n hi畛n th畛"
-#: src/editaddress.c:584 src/editaddress.c:588
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
msgid "Last Name"
msgstr "H畛"
-#: src/editaddress.c:585 src/editaddress.c:587
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
msgid "First Name"
msgstr "T棚n"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Bi畛t danh"
#: 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 "畛a ch畛 email"
@@ -1852,7 +1852,7 @@ msgstr "Chuy畛n l棚n"
msgid "Move Down"
msgstr "Chuy畛n xu畛ng"
-#: 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 "Thay 畛i"
@@ -1880,7 +1880,7 @@ msgstr "T畉p tin c坦 v畉 畛n"
msgid "File does not appear to be a valid address book format."
msgstr "T畉p tin c坦 v畉 kh担ng 炭ng 畛nh d畉ng s畛 畛a ch畛."
-#: 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 "Kh担ng th畛 畛c t畉p tin."
@@ -1888,11 +1888,11 @@ msgstr "Kh担ng th畛 畛c t畉p tin."
msgid "Edit Addressbook"
msgstr "So畉n S畛 畛a ch畛"
-#: 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 " Ki畛m tra t畉p tin "
-#: 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 "T畉p tin"
@@ -1960,29 +1960,29 @@ msgstr "Th動 m畛c m畛i"
msgid "Input the name of new folder:"
msgstr "畉t t棚n cho th動 m畛c m畛i:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "T畉p tin c坦 v畉 kh担ng d湛ng 畛nh d畉ng JPilot."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Ch畛n t畉p tin JPilot"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "So畉n m畛c 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 "C叩c 畛a ch畛 email b畛 sung"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "Th棚m m畛c JPilot m畛i"
@@ -2062,44 +2062,44 @@ msgstr "Search Base hi畛n c坦"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "Kh担ng th畛 畛c Search Base t畛 m叩y ch畛 - h達y 畉t theo c叩ch th畛 c担ng"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "T畉p tin c坦 v畉 kh担ng d湛ng 畛nh d畉ng vCard."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Ch畛n t畉p tin vCard"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "So畉n m畛c vCard"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "Th棚m m畛c vCard m畛i"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "Xu畉t kh畉u"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "Ch畛 畛nh th動 m畛c 鱈ch v t畉p tin mbox."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Th動 m畛c ngu畛n:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "ang xu畉t t畉p tin:"
-#: 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 "Ch畛n... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Ch畛n t畉p tin xu畉t"
@@ -2427,119 +2427,175 @@ msgstr "ang t畉o khung xem 畉nh...\n"
msgid "Can't load the image."
msgstr "Kh担ng th畛 t畉i anh."
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "Nh畉p kh畉u"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "Ch畛 畛nh t畉p tin mbox 鱈ch v th動 m畛c 畉n."
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "T畉p tin 動畛c nh畉p:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Th動 m畛c 畉n:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Ch畛n t畉p tin nh畉p kh畉u"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "H達y ch畛 畛nh t棚n s畛 畛a ch畛 v t畉p tin 畛 nh畉p kh畉u."
-#: 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 "Ch畛n v 畛i t棚n c叩c tr動畛ng LDIF 畛 nh畉p kh畉u."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "T畉p tin 達 動畛c nh畉p."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "H達y ch畛n m畛t t畉p tin."
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "Ph畉i cung c畉p t棚n s畛 畛a ch畛."
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "L畛i khi 畛c c叩c tr動畛ng LDIF."
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "Nh畉p kh畉u thnh c担ng t畉p tin LDIF."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Ch畛n t畉p tin LDIF"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Ch畛n t畉p tin vCard"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "T棚n t畉p tin"
-#: 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 "Tr動畛ng LDIF"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "T棚n thu畛c t鱈nh"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "S畛 畛a ch畛:"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "Thu畛c t鱈nh"
+#: 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 "Ch畛n"
+#: 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 "L棚n"
+
+#: 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 "Xu畛ng"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "S畛 畛a ch畛:"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "T棚n t畉p tin:"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "M畉ng:"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "Nh畉p kh畉u t畉p tin LDIF vo s畛 畛a ch畛"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "Tr動畛c"
-
-#: 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 "Ti畉p"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "Tr動畛c"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "Th担ng tin t畉p tin"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "Thu畛c t鱈nh"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "Tr動畛ng LDIF"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "Hon thnh"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Ch畛n v 畛i t棚n c叩c tr動畛ng LDIF 畛 nh畉p kh畉u."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "L畛i khi 畛c c叩c tr動畛ng LDIF."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "Nh畉p kh畉u thnh c担ng t畉p tin LDIF."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Ch畛n t畉p tin LDIF"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "Tr動畛ng LDIF"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "T棚n thu畛c t鱈nh"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "Thu畛c t鱈nh"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "Ch畛n"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Nh畉p kh畉u t畉p tin LDIF vo s畛 畛a ch畛"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "Thu畛c t鱈nh"
+
#: src/inc.c:160
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2709,7 +2765,7 @@ msgid "Socket error."
msgstr "L畛i 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 "K畉t n畛i b畛 ng畉t b畛i m叩y t畛 xa."
@@ -2726,11 +2782,11 @@ msgstr ""
"H畛p th動 b畛 kho叩:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "X叩c th畛c th畉t b畉i."
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2739,15 +2795,15 @@ msgstr ""
"X叩c th畛c th畉t b畉i:\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 "Phi棚n lm vi畛c h畉t gi畛."
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "S叩p nh畉p b畛 hu畛 b畛\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "ang l畉y th動 t畛 %s vo %s...\n"
@@ -3860,15 +3916,15 @@ msgstr ""
"N畉u b畉n mu畛n ch畉y t畉p tin, l動u n坦 vo 但u 坦 v 畉m b畉o n坦 kh担ng b畛 nhi畛m vi-"
"r炭t hay l ch動董ng tr狸nh c坦 h畉i."
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "M畉t kh畉u"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[kh担ng c坦 id ng動畛i d湛ng]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3881,7 +3937,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4394,18 +4450,6 @@ msgstr " H畛 tr畛 c炭 ph叩p "
msgid "Registered actions"
msgstr "Hnh 畛ng 達 ng k鱈"
-#: 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 "L棚n"
-
-#: 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 "Xu畛ng"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "M畛i"
@@ -6191,11 +6235,11 @@ msgstr "ang g畛i th動 (%d / %d byte)"
msgid "Sending message"
msgstr "ang g畛i th動"
-#: 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 "C坦 l畛i khi g畛i th動."
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
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 "篁銀罩g`医膂炊弱"
-#: 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 "罩e綮阪上頵...\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 "罩e篁 %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 "d擦筝"
-#: 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 "罩e篁 (%d / %d 絖)"
msgid "Sending message"
msgstr "罩e篁"
-#: 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"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e4369492..34080c25 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: 2007-04-10 11:34+0900\n"
+"POT-Creation-Date: 2007-04-11 11:59+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"
@@ -684,8 +684,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 "腮"
@@ -823,7 +823,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 "荐"
@@ -1067,21 +1067,21 @@ msgstr "(_A)"
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 ""
"莉荐弱鎘\n"
"篁ラ紮篏睡亥荐"
-#: src/addressbook.c:2457
+#: src/addressbook.c:2465
msgid ""
"Old address book converted,\n"
"could not save new address index file"
@@ -1089,7 +1089,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."
@@ -1097,7 +1097,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."
@@ -1105,7 +1105,7 @@ 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."
@@ -1113,84 +1113,84 @@ msgstr ""
"≧莉荐弱鐚\n"
"篋≧∝亥荐"
-#: 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 篌堺"
@@ -1836,24 +1836,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 "E-Mail 医"
@@ -1870,7 +1870,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 "莅"
@@ -1898,7 +1898,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 "≧莅罟罅"
@@ -1906,11 +1906,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 "罟罅"
@@ -1978,29 +1978,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 莖"
@@ -2080,44 +2080,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 "御堺罅鐚"
@@ -2447,119 +2447,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
#, c-format
msgid "Sylpheed: %d new messages"
@@ -2729,7 +2785,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 "腴筝紙g"
@@ -2744,11 +2800,11 @@ msgid ""
"%s"
msgstr "篆∞怨群茴絎鐚%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"
@@ -2757,15 +2813,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"
@@ -3855,15 +3911,15 @@ 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"
@@ -3876,7 +3932,7 @@ msgstr ""
"(%.*s)\n"
"絲腆主茯\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4388,18 +4444,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 "鐚逸"
@@ -6202,11 +6246,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"
diff --git a/src/importcsv.c b/src/importcsv.c
index 4863c36f..9f26e8ff 100644
--- a/src/importcsv.c
+++ b/src/importcsv.c
@@ -405,10 +405,10 @@ static gint imp_csv_import_data( gchar *csvFile, AddressCache *cache ) {
fullName = address;
person = addritem_create_item_person();
- addritem_person_set_common_name( person, fullName);
- addritem_person_set_first_name( person, firstName);
- addritem_person_set_last_name( person, lastName);
- addritem_person_set_nick_name( person, nickName);
+ addritem_person_set_common_name( person, fullName );
+ addritem_person_set_first_name( person, firstName );
+ addritem_person_set_last_name( person, lastName );
+ addritem_person_set_nick_name( person, nickName );
addrcache_id_person( cache, person );
addrcache_add_person( cache, person );
@@ -717,6 +717,15 @@ static void imp_csv_page_fields( gint pageNum, gchar *pageLbl ) {
gtk_notebook_get_nth_page(GTK_NOTEBOOK( impcsv_dlg.notebook ), pageNum ),
label );
+ hbox = gtk_hbox_new( FALSE, 0 );
+ gtk_box_pack_start( GTK_BOX( vbox ), hbox, FALSE, FALSE, 4 );
+
+ label = gtk_label_new
+ ( _("Reorder address book fields with the Up and Down button.") );
+ gtk_box_pack_start( GTK_BOX( hbox ), label, FALSE, FALSE, 0 );
+ gtk_label_set_justify( GTK_LABEL( label ), GTK_JUSTIFY_LEFT );
+ gtk_label_set_line_wrap( GTK_LABEL( label ), TRUE );
+
hbox = gtk_hbox_new( FALSE, 4 );
gtk_box_pack_start( GTK_BOX( vbox ), hbox, TRUE, TRUE, 0 );