aboutsummaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2007-04-11 03:32:13 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2007-04-11 03:32:13 +0000
commitfd7f4c285e35f01683efd4bdb60fa400f3393847 (patch)
tree4e682bd072c986b0c880da1f0e6580e465490c2d /po
parent86de127683c025e785cdd8e323bfa17447a218bd (diff)
added description to the field page of CSV import.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1613 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'po')
-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
31 files changed, 5101 insertions, 3788 deletions
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 proběhla ú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ář převeden,\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 vytvořeny 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 vytvořit 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 vytvořit nové soubory adresáře."
-#: src/addressbook.c:2488
+#: src/addressbook.c:2496
msgid "Addressbook conversion error"
msgstr "Chyba při 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ář převeden, 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 vytvořeny 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 vytvořit 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 vytvořit nové soubory adresáře."
-#: src/addressbook.c:2634
+#: src/addressbook.c:2642
msgid "Addressbook Conversion Error"
msgstr "Chyba při 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 "Křestní jméno"
-#: src/editaddress.c:590
+#: src/editaddress.c:590 src/importcsv.c:124
msgid "Nick Name"
msgstr "Přezdí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 "Změnit"
@@ -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 "Přidat 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 ručně"
-#: 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 "Přidat 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 přejmenujte 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 při č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 "Předchozí"
-
-#: 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 "Předchozí"
+
+#: 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 "Dokončit"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "Vyberte a přejmenujte názvy polí LDIF k importu."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Chyba při č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í ukončeno vzdáleným hostitelem."
@@ -2742,11 +2798,11 @@ msgstr ""
"Poštovní schránka je zamčena:\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 "Začleňová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 ujistěte se, že nejde o "
"virus či nějaký nebezpečný 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ápověda k syntaxi "
msgid "Registered actions"
msgstr "Přidané 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 "Při 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 "Sučelje"
-#: 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 ručno"
-#: 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 "Slijedeća"
+
+#: 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 "Slijedeća"
-
-#: 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 sandučića"
-#: 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 ellenőrzé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 szerverről - á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 mezőnevek 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 mezők 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 "Előző"
-
-#: 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 "Előző"
+
+#: 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 mezőnevek kiválasztása és átnevezése az importhoz."
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "Hiba az LDIF mezők 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 időtú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 győződjö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 "旧形式のアドレス帳は正しく変換されました。"
-#: 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 "インポートするLDIFフィールド名を選択して名称を変更してください。"
+#: src/importcsv.c:155
+msgid "Select and reorder CSV field names to import."
+msgstr "インポートするCSVフィールド名を選択して並べ替えてください。"
-#: 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ファイルは正しく変換されました。"
+#: src/importcsv.c:541
+msgid "CSV file imported successfully."
+msgstr "CSVファイルは正しく読み込まれました。"
-#: 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 "LDIFフィールド"
+#: src/importcsv.c:706
+msgid "CSV Field"
+msgstr "CSVフィールド"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "属性名"
+#: src/importcsv.c:707
+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"
-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 "フィールド"
-#: 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"
@@ -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 "リモートホストによって接続を切断されました。"
@@ -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 "受信をキャンセルしました\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 ""
"起動したい場合は、ファイルを適当な場所に保存した後、それがウィルスやその他の"
"悪意のあるプログラムでないことを確認してください。"
-#: 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 "그룹"
#. 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 "새 폴더의 이름을 넣으세요:"
-#: 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 sėkmingai 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 "Sąsaja"
-#: 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 nėra 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 nėra 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 "Pridėti naują JPilot įrašą"
@@ -2076,44 +2076,44 @@ msgstr "Prieinamos paieškos bazės"
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 nėra „vCard“ formato"
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Pažymėti „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 "Pridėti 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 paveikslėlio peržiūra...\n"
msgid "Can't load the image."
msgstr "Negaliu įkelti paveikslėlio."
-#: 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žymėkite 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 sėkmingai."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Pasirinkite LDIF failą"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Pažymėti „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 sėkmingai."
+
+#: 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 "Baigėsi 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 kenkėjiš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 "[nėra 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 "Siunčiu laišką (%d / %d baitai)"
msgid "Sending message"
msgstr "Siunčiu 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 siunčiant 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 było 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 było 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 została zakończona pomyślnie."
-#: 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 została skonwertowana,\n"
"nie można było 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 było 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 było skonwertować książki adresowej,\n"
"nie można było 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 było 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 "Błąd 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 "Błąd 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 została skonwertowana, nie można było 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 było 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 było 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 było 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 "Błąd 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 "Wyświetlana 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 wygląda na dobry."
msgid "File does not appear to be a valid address book format."
msgstr "Plik nie wygląda 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 wygląda 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 "Dostępne 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ą ręcznie"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Plik nie wygląda 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ódłowy:"
-#: 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 załadować 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 "Określ 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 "Określ 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 "Błąd 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ł pomyślnie 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 "Następna"
-#: 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 "Błąd przy odczycie pól LDIF."
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "Plik LDIF został pomyślnie 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 "Błąd 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 "Połączenie zamknięte 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 "Błąd 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 ""
"Błąd 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 wygasła."
-#: 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 wiadomości 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 "Hasło"
-#: 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 składni "
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 "Wysyłanie wiadomości (%d / %d)"
msgid "Sending message"
msgstr "Wysyłanie wiadomości"
-#: 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 "Błąd podczas wysyłania wiadomości."
-#: 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 "Observații"
@@ -1089,19 +1089,19 @@ msgstr "Folder și _adrese"
msgid "Really delete `%s' ?"
msgstr "Sigur ștergeți '%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, fișierul 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, fișierele 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"
"fișierul 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 fișierele 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"
"fișierele 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 fișierele 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 "Fișierul 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 fișierul 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 fișierele 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 fișierele 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 fișierele 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 afișat"
-#: 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 "Fișierul pare a fi în regulă."
msgid "File does not appear to be a valid address book format."
msgstr "Fișierul 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 "Fișierul nu a putut fi citit."
@@ -1938,11 +1938,11 @@ msgstr "Fișierul 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ă fișier "
-#: 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 "Fișier"
@@ -2011,29 +2011,29 @@ msgstr "Folder nou"
msgid "Input the name of new folder:"
msgstr "Introduceți numele noului folder:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "Fișierul nu pare a fi în format JPilot."
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "Selectează fișier 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 adiționale"
-#: 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 căutare de pe server nu a putut fi citită - vă rugăm să setați manual"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "Fișierul nu pare a fi în format vCard."
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "Selectează fișier 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 "Specificați folderul destinație și fișierul 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 fișier:"
-#: 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ă fișier de exportat ?
# sau selectează fișierul de exportat ?
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "Selectare fișier de exportat"
@@ -2485,125 +2485,182 @@ msgstr "Creare vedere imagine...\n"
msgid "Can't load the image."
msgstr "Imaginea nu a putut fi încărcată."
-#: 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 "Specificați fișierul mbox țintă și folderul destinație."
# hm ? sau import fișier ?
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "Importare fișier:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "Director destinație:"
# hm ? sau selectează fișier de importat ?
# sau selectează fișierul de importat ?
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "Selectare fișier 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 "Specificați numele agendei și a fișierului 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 redenumește câmpurile LDIF de importat."
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "Fișier importat."
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "Selectați un fișier."
-#: 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 "Fișier LDIF importat cu succes."
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "Selectează fișier LDIF"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "Selectează fișier vCard"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "Nume Fișier"
-#: 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 Fișier:"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "Înregistrări:"
# hm ? asta e comandă sau înștiințare ?
-#: 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ă fișier 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 "Următor"
-#: 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 "Informații despre Fișier"
-#: 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 redenumește 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 "Fișier LDIF importat cu succes."
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "Selectează fișier 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 înștiințare ?
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "Importă fișier 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 ""
"Căsuța poștală 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 eșuat."
-#: 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 eșuat:\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 "Obținere mesaje noi de la %s în %s...\n"
@@ -3942,15 +3999,15 @@ msgstr ""
"Dacă doriți să îl lansați în execuție, salvați-l undeva și asigurați-vă că "
"nu este un virus sau un alt tip de program malițios."
-#: 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 "Acțiuni î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 octeți)"
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 apărut 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 "Priečinok 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 "Priečinok"
-#: 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ý priečinok"
msgid "Input the name of new folder:"
msgstr "Zadajte názov nového priečinka:"
-#: 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 ručne"
-#: 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 "Určite cieľový priečinok a súbor mbox."
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "Zdrojový priečinok:"
-#: 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ý priečinok."
-#: 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ý priečinok:"
-#: 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 "Dokončiť"
+#: 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ľ ukončil 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 "Začleňovanie 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 mogoće prebrati."
@@ -1958,11 +1958,11 @@ msgstr "Datoteke ni mogoće 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 ročno"
-#: 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 "Določite 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 "Določite 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, določite 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 "Končaj"
+#: 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 priključku."
#. 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 sporočila 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 sporočilo (%d / %d zlogov)"
msgid "Sending message"
msgstr "Pošiljam sporočilo"
-#: 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 sporočila 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 sačuvati 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 sačuvati 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 prebač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 prebačen,\n"
"ne mogu sačuvati 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 lične 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 pročitati datoteku."
@@ -1953,11 +1953,11 @@ msgstr "Ne mogu pročitati 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 pročitati Baze Pretrage sa servera - postavite ručno"
-#: 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 "Označite 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 "Označite 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 "Sanduče je zaključano."
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
#, fuzzy
msgid "Authentication failed."
msgstr "Način 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 "Način 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 başarı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ı oluşturuldu."
-#: 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ı oluşturulamadı."
-#: 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ı oluşturulamadı."
-#: 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ı "
"oluşturuldu."
-#: 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ı oluşturulamadı."
-#: 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ı oluşturulamadı."
-#: 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 "Kişi"
-#: 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 değer girilmelidir."
msgid "Edit Person Data"
msgstr "Kişi 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 "Aşağı"
-#: 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 değil."
-#: 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 değil."
-#: 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ü oluşturuluyor...\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 başarı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 "Aşağı"
-#: 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 başarı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 "Bağlantı 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 oluştu."
-#: 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 başarı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 uğradı."
-#: 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 "Aşağı"
-
#: 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 oluştu."
-#: 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 thành 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 thành 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 vào 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 "Hoàn thành"
+#: 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 thành 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 vào 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 làm 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 vào %s...\n"
@@ -3860,15 +3916,15 @@ msgstr ""
"Nếu bạn muốn chạy tập tin, lưu nó vào đâ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 "Hành độ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 "文件不是正确的地址簿格式。"
-#: src/editbook.c:126 src/editjpilot.c:204 src/editvcard.c:108
+#: src/editbook.c:126 src/editjpilot.c:203 src/editvcard.c:107
msgid "Could not read file."
msgstr "无法读取文件。"
@@ -1908,11 +1908,11 @@ msgstr "无法读取文件。"
msgid "Edit Addressbook"
msgstr "编辑地址簿"
-#: src/editbook.c:203 src/editjpilot.c:278 src/editvcard.c:191
+#: src/editbook.c:203 src/editjpilot.c:277 src/editvcard.c:190
msgid " Check File "
msgstr " 检查文件 "
-#: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
+#: src/editbook.c:208 src/editjpilot.c:282 src/editvcard.c:195
#: src/prefs_account_dialog.c:1284
msgid "File"
msgstr "文件"
@@ -1980,29 +1980,29 @@ msgstr "新建文件夹"
msgid "Input the name of new folder:"
msgstr "输入新建文件夹的名字:"
-#: src/editjpilot.c:201
+#: src/editjpilot.c:200
msgid "File does not appear to be JPilot format."
msgstr "文件不象是 JPilot 格式。"
-#: src/editjpilot.c:213
+#: src/editjpilot.c:212
msgid "Select JPilot File"
msgstr "选择 JPilot 文件"
-#: src/editjpilot.c:249 src/editjpilot.c:381
+#: src/editjpilot.c:248 src/editjpilot.c:380
msgid "Edit JPilot Entry"
msgstr "编辑 JPilot 项"
-#: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
-#: src/importldif.c:535 src/prefs_account_dialog.c:1799
+#: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
+#: src/importcsv.c:675 src/importldif.c:502 src/prefs_account_dialog.c:1799
#: src/prefs_common_dialog.c:1906
msgid " ... "
msgstr " ... "
-#: src/editjpilot.c:295
+#: src/editjpilot.c:294
msgid "Additional e-Mail address item(s)"
msgstr "其它邮件地址项"
-#: src/editjpilot.c:388
+#: src/editjpilot.c:387
msgid "Add New JPilot Entry"
msgstr "添加新 JPilot 项"
@@ -2082,44 +2082,44 @@ msgstr "可用的搜索起点"
msgid "Could not read Search Base(s) from server - please set manually"
msgstr "无法从服务器读取搜索起点-请手工设置"
-#: src/editvcard.c:105
+#: src/editvcard.c:104
msgid "File does not appear to be vCard format."
msgstr "文件不象是 vCard 格式。"
-#: src/editvcard.c:117
+#: src/editvcard.c:116
msgid "Select vCard File"
msgstr "选择 vCard 文件"
-#: src/editvcard.c:162 src/editvcard.c:270
+#: src/editvcard.c:161 src/editvcard.c:269
msgid "Edit vCard Entry"
msgstr "编辑 vCard 项"
-#: src/editvcard.c:275
+#: src/editvcard.c:274
msgid "Add New vCard Entry"
msgstr "添加新 vCard 项"
-#: src/export.c:149
+#: src/export.c:148
msgid "Export"
msgstr "导出"
-#: src/export.c:168
+#: src/export.c:167
msgid "Specify target folder and mbox file."
msgstr "指定目标文件夹和邮箱文件。"
-#: src/export.c:178
+#: src/export.c:177
msgid "Source dir:"
msgstr "源目录:"
-#: src/export.c:183
+#: src/export.c:182
msgid "Exporting file:"
msgstr "导出文件:"
-#: src/export.c:196 src/export.c:202 src/import.c:202 src/import.c:208
+#: src/export.c:195 src/export.c:201 src/import.c:201 src/import.c:207
#: src/prefs_account_dialog.c:955
msgid " Select... "
msgstr " 选择... "
-#: src/export.c:240
+#: src/export.c:239
msgid "Select exporting file"
msgstr "选择导出文件"
@@ -2450,119 +2450,175 @@ msgstr "正在创建图像视图...\n"
msgid "Can't load the image."
msgstr "无法加载该图像。"
-#: src/import.c:155
+#: src/import.c:154
msgid "Import"
msgstr "导入"
-#: src/import.c:174
+#: src/import.c:173
msgid "Specify target mbox file and destination folder."
msgstr "指定目标邮箱文件和目标文件夹。"
-#: src/import.c:184
+#: src/import.c:183
msgid "Importing file:"
msgstr "导入文件:"
-#: src/import.c:189
+#: src/import.c:188
msgid "Destination dir:"
msgstr "目标目录:"
-#: src/import.c:246
+#: src/import.c:245
msgid "Select importing file"
msgstr "选择导入文件"
-#: src/importldif.c:125
+#: src/importcsv.c:152 src/importldif.c:126
msgid "Please specify address book name and file to import."
msgstr "请指定要导入的地址簿名和文件。"
-#: src/importldif.c:128
-msgid "Select and rename LDIF field names to import."
+#: src/importcsv.c:155
+#, fuzzy
+msgid "Select and reorder CSV field names to import."
msgstr "选择并重命名要导入的LDIF字段名。"
-#: src/importldif.c:131
+#: src/importcsv.c:158 src/importldif.c:132
msgid "File imported."
msgstr "文件已导入。"
-#: src/importldif.c:320
+#: src/importcsv.c:500 src/importldif.c:321
msgid "Please select a file."
msgstr "请选择一个文件。"
-#: src/importldif.c:326
+#: src/importcsv.c:506 src/importldif.c:327
msgid "Address book name must be supplied."
msgstr "必须输入地址簿名。"
-#: src/importldif.c:341
-msgid "Error reading LDIF fields."
+#: src/importcsv.c:515
+#, fuzzy
+msgid "Error reading CSV fields."
msgstr "读取 LDIF 字段时发生错误。"
-#: src/importldif.c:364
-msgid "LDIF file imported successfully."
+#: src/importcsv.c:541
+#, fuzzy
+msgid "CSV file imported successfully."
msgstr "成功导入 LDIF 文件。"
-#: src/importldif.c:450
-msgid "Select LDIF File"
-msgstr "选择 LDIF 文件"
+#: src/importcsv.c:603
+#, fuzzy
+msgid "Select CSV File"
+msgstr "选择 vCard 文件"
-#: src/importldif.c:526
+#: src/importcsv.c:666 src/importldif.c:493
msgid "File Name"
msgstr "文件名"
-#: src/importldif.c:567
+#: src/importcsv.c:705 src/importldif.c:534
msgid "S"
msgstr "S"
-#: src/importldif.c:568 src/importldif.c:618
-msgid "LDIF Field"
+#: src/importcsv.c:706
+#, fuzzy
+msgid "CSV Field"
msgstr "LDIF 字段"
-#: src/importldif.c:569
-msgid "Attribute Name"
-msgstr "属性名"
+#: src/importcsv.c:707
+#, fuzzy
+msgid "Address Book Field"
+msgstr "地址簿:"
-#: src/importldif.c:628
-msgid "Attribute"
-msgstr "属性"
+#: src/importcsv.c:724
+msgid "Reorder address book fields with the Up and Down button."
+msgstr ""
-#: src/importldif.c:637 src/select-keys.c:343
-msgid "Select"
-msgstr "选择"
+#: src/importcsv.c:759 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/prefs_display_header.c:287 src/prefs_display_items.c:239
+#: src/prefs_summary_column.c:290
+msgid "Up"
+msgstr "上移"
+
+#: src/importcsv.c:761 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/prefs_display_header.c:293 src/prefs_display_items.c:243
+#: src/prefs_summary_column.c:294
+msgid "Down"
+msgstr "下移"
-#: src/importldif.c:690
+#: src/importcsv.c:803 src/importldif.c:657
msgid "Address Book :"
msgstr "地址簿:"
-#: src/importldif.c:700
+#: src/importcsv.c:813 src/importldif.c:667
msgid "File Name :"
msgstr "文件名:"
-#: src/importldif.c:710
+#: src/importcsv.c:823 src/importldif.c:677
msgid "Records :"
msgstr "记录:"
-#: src/importldif.c:738
-msgid "Import LDIF file into Address Book"
+#: src/importcsv.c:851
+#, fuzzy
+msgid "Import CSV file into Address Book"
msgstr "导入 LDIF 文件到地址簿"
#. Button panel
-#: src/importldif.c:769 src/prefs_toolbar.c:72
-msgid "Prev"
-msgstr "上一个"
-
-#: src/importldif.c:770 src/prefs_toolbar.c:69
+#: src/importcsv.c:882 src/importldif.c:736 src/prefs_toolbar.c:69
msgid "Next"
msgstr "下一个"
-#: src/importldif.c:799
+#: src/importcsv.c:883 src/importldif.c:737 src/prefs_toolbar.c:72
+msgid "Prev"
+msgstr "上一个"
+
+#: src/importcsv.c:915 src/importldif.c:769
msgid "File Info"
msgstr "文件信息"
-#: src/importldif.c:800
-msgid "Attributes"
-msgstr "属性"
+#: src/importcsv.c:916
+#, fuzzy
+msgid "Fields"
+msgstr "LDIF 字段"
-#: src/importldif.c:801
+#: src/importcsv.c:917 src/importldif.c:771
msgid "Finish"
msgstr "完成"
+#: src/importldif.c:129
+msgid "Select and rename LDIF field names to import."
+msgstr "选择并重命名要导入的LDIF字段名。"
+
+#: src/importldif.c:345
+msgid "Error reading LDIF fields."
+msgstr "读取 LDIF 字段时发生错误。"
+
+#: src/importldif.c:368
+msgid "LDIF file imported successfully."
+msgstr "成功导入 LDIF 文件。"
+
+#: src/importldif.c:430
+msgid "Select LDIF File"
+msgstr "选择 LDIF 文件"
+
+#: src/importldif.c:535 src/importldif.c:585
+msgid "LDIF Field"
+msgstr "LDIF 字段"
+
+#: src/importldif.c:536
+msgid "Attribute Name"
+msgstr "属性名"
+
+#: src/importldif.c:595
+msgid "Attribute"
+msgstr "属性"
+
+#: src/importldif.c:604 src/select-keys.c:343
+msgid "Select"
+msgstr "选择"
+
+#: src/importldif.c:705
+msgid "Import LDIF file into Address Book"
+msgstr "导入 LDIF 文件到地址簿"
+
+#: src/importldif.c:770
+msgid "Attributes"
+msgstr "属性"
+
#: src/inc.c:160
#, fuzzy, c-format
msgid "Sylpheed: %d new messages"
@@ -2732,7 +2788,7 @@ msgid "Socket error."
msgstr "Socket错误。"
#. consider EOF right after QUIT successful
-#: src/inc.c:1325 src/send_message.c:601 src/send_message.c:793
+#: src/inc.c:1325 src/send_message.c:601 src/send_message.c:794
msgid "Connection closed by the remote host."
msgstr "远程主机关闭了连接。"
@@ -2749,11 +2805,11 @@ msgstr ""
"信箱被锁住:\n"
"%s"
-#: src/inc.c:1341 src/send_message.c:778
+#: src/inc.c:1341 src/send_message.c:779
msgid "Authentication failed."
msgstr "验证失败。"
-#: src/inc.c:1346 src/send_message.c:781
+#: src/inc.c:1346 src/send_message.c:782
#, c-format
msgid ""
"Authentication failed:\n"
@@ -2762,15 +2818,15 @@ msgstr ""
"验证失败:\n"
"%s"
-#: src/inc.c:1351 src/send_message.c:797
+#: src/inc.c:1351 src/send_message.c:798
msgid "Session timed out."
msgstr "会话超时。"
-#: src/inc.c:1391
+#: src/inc.c:1392
msgid "Incorporation cancelled\n"
msgstr "合并新邮件被取消\n"
-#: src/inc.c:1485
+#: src/inc.c:1486
#, c-format
msgid "Getting new messages from %s into %s...\n"
msgstr "正在从 %s 获取新邮件到 %s...\n"
@@ -3866,15 +3922,15 @@ msgid ""
"virus or something like a malicious program."
msgstr ""
-#: src/passphrase.c:96
+#: src/passphrase.c:95
msgid "Passphrase"
msgstr "口令串"
-#: src/passphrase.c:248
+#: src/passphrase.c:247
msgid "[no user id]"
msgstr "[没有用户标识]"
-#: src/passphrase.c:256
+#: src/passphrase.c:255
#, c-format
msgid ""
"%sPlease enter the passphrase for:\n"
@@ -3887,7 +3943,7 @@ msgstr ""
" %.*s \n"
"(%.*s)\n"
-#: src/passphrase.c:260
+#: src/passphrase.c:259
msgid ""
"Bad passphrase! Try again...\n"
"\n"
@@ -4408,18 +4464,6 @@ msgstr " 语法帮助 "
msgid "Registered actions"
msgstr "已注册的动作"
-#: src/prefs_actions.c:310 src/prefs_customheader.c:279
-#: src/prefs_display_header.c:287 src/prefs_display_items.c:239
-#: src/prefs_summary_column.c:290
-msgid "Up"
-msgstr "上移"
-
-#: src/prefs_actions.c:316 src/prefs_customheader.c:285
-#: src/prefs_display_header.c:293 src/prefs_display_items.c:243
-#: src/prefs_summary_column.c:294
-msgid "Down"
-msgstr "下移"
-
#: src/prefs_actions.c:423 src/prefs_template.c:326
msgid "(New)"
msgstr "(新建)"
@@ -6240,11 +6284,11 @@ msgstr "正在发送邮件 (%d / %d 字节)"
msgid "Sending message"
msgstr "正在发送邮件"
-#: src/send_message.c:769 src/send_message.c:789
+#: src/send_message.c:770 src/send_message.c:790
msgid "Error occurred while sending the message."
msgstr "发送邮件时发生错误。"
-#: src/send_message.c:772
+#: src/send_message.c:773
#, c-format
msgid ""
"Error occurred while sending the message:\n"
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 "遠端主機關閉連線。"
@@ -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"