updated po files.

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

30 files changed, 2083 insertions, 1299 deletions

diff --git a/po/be.po b/po/be.po
index 4022b5bb..19fd0f59 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2008-05-21 21:16+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -290,20 +290,20 @@ msgstr "Экспартаванне паведамленняў з %s у %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "нельга скапіраваць паведамленне %s у %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Нельга адкрыць файл пазнак.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "крынічны каталог ідэнтычны з прызначэннем.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Капіраванне паведамленняў %s/%d у %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -312,7 +312,7 @@ msgstr ""
 "Файл `%s' ужо існуе.\n"
 "Нельга стварыць каталог."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2137,50 +2137,77 @@ msgstr "Змяніць запіс vCard"
 msgid "Add New vCard Entry"
 msgstr "Дадаць новы запіс vCard"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Пошук %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Экспарт"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Памылка здарылася падчас публікавання\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Экспарт"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Укажыце мэтавы файл mbox і каталог прызначэння."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Фармат даты"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Выточны каталог:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Каталог прызначэння:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Выбраць... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Укажыце мэтавы файл mbox і каталог прызначэння."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Выберыце файл экспарту"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Выберыце файл экспарту"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Запісаць як"
@@ -2516,32 +2543,32 @@ msgstr "Стварэнне прагляду рысунка...\n"
 msgid "Can't load the image."
 msgstr "Нельга загрузіць рысунак."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Файл %s не існуе."
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Укажыце мэтавы файл mbox і каталог прызначэння."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Пошук %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Імпарт"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Сканаванне каталога %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Памылка здарылася падчас публікавання\n"
@@ -2550,45 +2577,37 @@ msgstr "Памылка здарылася падчас публікавання\
 msgid "Import"
 msgstr "Імпарт"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Укажыце мэтавы файл mbox і каталог прызначэння."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Фармат даты"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Імпарт файла:"
+#, fuzzy
+msgid "Source:"
+msgstr "Выточны каталог:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Каталог прызначэння:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Выбраць файл"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Новы каталог"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Укажыце мэтавы файл mbox і каталог прызначэння."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Выберыце імпартуемы файл"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Выберыце імпартуемы файл"
 
@@ -7368,6 +7387,13 @@ msgstr "другі экземпляр Сілфід ужо выконваецца
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Імпарт файла:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Выбраць файл"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Задайце мэтавы каталог і файл mbox."
 
diff --git a/po/bg.po b/po/bg.po
index c69e2877..fbaeebe6 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -294,20 +294,20 @@ msgstr "Изнасяне на съобщения от %s във %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "не може да се копира съобщението %s във %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Не може да се отвори файлът с маркировките.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "изходната папка е еднаква с назначението.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -316,7 +316,7 @@ msgstr ""
 "Файлът `%s' вече съществува.\n"
 "Папката не може да се създаде."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2202,50 +2202,77 @@ msgstr "Редакция на vCard запис"
 msgid "Add New vCard Entry"
 msgstr "Добавяне на нов vCard запис"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Изнасяне"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Появи се грешка при публикуване\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Изнасяне"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Укажете mbox файл и папка."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Формат на датата"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Директрия източник:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
-msgstr "Папка назначение:"
+msgid "Destination:"
+msgstr "Назначение"
+
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Избор..."
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Укажете mbox файл и папка."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Избор на изходен файл"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Избор на изходен файл"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Запазване като"
@@ -2589,32 +2616,32 @@ msgstr "Създаване изглед на изображение...\n"
 msgid "Can't load the image."
 msgstr "Не може да се зареди изображението."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Файлът %s не съществува\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Укажете mbox файл и папка."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Внасяне"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Появи се грешка при публикуване\n"
@@ -2623,45 +2650,37 @@ msgstr "Появи се грешка при публикуване\n"
 msgid "Import"
 msgstr "Внасяне"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Укажете mbox файл и папка."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Формат на датата"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Внасяне на файл:"
+#, fuzzy
+msgid "Source:"
+msgstr "Директрия източник:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Папка назначение:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Избор на файл"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Нова папка"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Укажете mbox файл и папка."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Изберете файл за внасяне"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Изберете файл за внасяне"
 
@@ -7584,6 +7603,17 @@ msgstr "друг Sylpheed е стартиран вече.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Внасяне на файл:"
+
+#, fuzzy
+#~ msgid "Destination file:"
+#~ msgstr "Папка назначение:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Избор на файл"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Укажете папка и mbox файл."
 
@@ -7981,9 +8011,6 @@ msgstr ""
 #~ msgid "Keyword"
 #~ msgstr "Ключова дума"
 
-#~ msgid "Destination"
-#~ msgstr "Назначение"
-
 #~ msgid "Use regex"
 #~ msgstr "Използване на регулярен израз"
 
diff --git a/po/cs.po b/po/cs.po
index 7b5e4d19..274eebfa 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2009-06-28 19:39+0200\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -298,20 +298,20 @@ msgstr "Exportování zprávy z %s do %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "nelze zkopírovat zprávu %s do %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Nelze otevřít označený soubor.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojová složka je stejná jako cílová.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopírování zprávy %s/%d do %s...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -320,7 +320,7 @@ msgstr ""
 "Soubor \"%s\" již existuje.\n"
 "Složku nelze vytvořit."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2142,50 +2142,77 @@ msgstr "Upravit záznam vCard"
 msgid "Add New vCard Entry"
 msgstr "Přidat nový záznam vCard"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Prohledává se %s..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Export"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Během odesílání se vyskytla chyba\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Export"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Zadejte prosím zdrojový soubor mbox a cílovou složku."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Formát data"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Zdrojová složka:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Cílová složka:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Vybrat... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Zadejte prosím zdrojový soubor mbox a cílovou složku."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Vybrat soubor k exportu"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Vybrat soubor k exportu"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Uložit jako"
@@ -2520,32 +2547,32 @@ msgstr "Vytváří se náhled obrázku...\n"
 msgid "Can't load the image."
 msgstr "Nelze nahrát obrázek."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Soubor %s neexistuje."
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Zadejte prosím zdrojový soubor mbox a cílovou složku."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Prohledává se %s..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Import"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Prohledává se složka %s..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Během odesílání se vyskytla chyba\n"
@@ -2554,45 +2581,37 @@ msgstr "Během odesílání se vyskytla chyba\n"
 msgid "Import"
 msgstr "Import"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Zadejte prosím zdrojový soubor mbox a cílovou složku."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Formát data"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Importovaný soubor :"
+#, fuzzy
+msgid "Source:"
+msgstr "Zdrojová složka:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Cílová složka:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Vybrat soubor"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nová složka"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Zadejte prosím zdrojový soubor mbox a cílovou složku."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Vybrat soubor k importu"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Vybrat soubor k importu"
 
@@ -7341,6 +7360,13 @@ msgstr "Nejnovější verze aplikace Sylpheed je již nainstalována."
 msgid "Couldn't get the version information."
 msgstr "Nezdařilo se získání informace o verzi."
 
+#~ msgid "Importing file:"
+#~ msgstr "Importovaný soubor :"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Vybrat soubor"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Zadejte prosím zdrojovou složku a soubor mbox."
 
diff --git a/po/da.po b/po/da.po
index afb342f3..81b2655f 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -296,20 +296,20 @@ msgstr "Eksporterer meddelelse fra %s til %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "kan ikke kopiere meddelelse %s til %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Kan ikke åbne markéret fil.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "fra og til mappe er ens.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -318,7 +318,7 @@ msgstr ""
 "Filen `%s' eksisterer allerede.\n"
 "Kan ikke oprette mappe."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2200,50 +2200,77 @@ msgstr "Redigér vCard"
 msgid "Add New vCard Entry"
 msgstr "Tilføj ny VCard"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Eksportere"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Fejl ved afsendelse\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Eksportere"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Indtast mbox fil og mappe."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Dato format"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Fra sti:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
-msgstr "Til sti:"
+msgid "Destination:"
+msgstr "Mål"
+
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Vælg... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Indtast mbox fil og mappe."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Vælg fil til export"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Vælg fil til export"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Gem som"
@@ -2588,32 +2615,32 @@ msgstr "Opretter billed visning...\n"
 msgid "Can't load the image."
 msgstr "Kan ikke læse billede."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Filen %s findes ikke\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Indtast mbox fil og mappe."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Importere"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Fejl ved afsendelse\n"
@@ -2622,45 +2649,37 @@ msgstr "Fejl ved afsendelse\n"
 msgid "Import"
 msgstr "Importere"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Indtast mbox fil og mappe."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Dato format"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Importerer fil:"
+#, fuzzy
+msgid "Source:"
+msgstr "Fra sti:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Til sti:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Vælg fil"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Ny mappe"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Indtast mbox fil og mappe."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Vælg fil til import"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Vælg fil til import"
 
@@ -7589,6 +7608,17 @@ msgstr "sylpheed kører allerede.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Importerer fil:"
+
+#, fuzzy
+#~ msgid "Destination file:"
+#~ msgstr "Til sti:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Vælg fil"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Indtast mål mappe og mbox fil"
 
@@ -7991,9 +8021,6 @@ msgstr ""
 #~ msgid "Keyword"
 #~ msgstr "Stikord"
 
-#~ msgid "Destination"
-#~ msgstr "Mål"
-
 #~ msgid "Use regex"
 #~ msgstr "Benyt regex"
 
diff --git a/po/de.po b/po/de.po
index 045db21a..beecad4d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -294,20 +294,20 @@ msgstr "Exportiere Nachrichten von %s in %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "kann Nachricht %s nicht nach %s kopieren\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Kann markierte Datei nicht öffnen.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "Die Quellablage ist identisch mit dem Ziel.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiere Nachricht %s/%d nach %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -316,7 +316,7 @@ msgstr ""
 "Datei '%s' existiert bereits.\n"
 "Kann Ablage nicht erstellen."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2150,50 +2150,77 @@ msgstr "VCard-Eintrag bearbeiten"
 msgid "Add New vCard Entry"
 msgstr "Neuen vCard-Eintrag hinzufügen"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Suche %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Exportieren"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Fehler beim Senden\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Exportieren"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Datumsformat"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Quellverzeichnis"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Zielverzeichnis:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Auswählen... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Wähle exportierte Datei"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Wähle exportierte Datei"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Speichern als"
@@ -2529,32 +2556,32 @@ msgstr "Erstelle Bilderansicht...\n"
 msgid "Can't load the image."
 msgstr "Kann das Bild nicht laden."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Datei %s existiert nicht."
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Suche %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Importieren"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Durchsuche Ablage %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Fehler beim Senden\n"
@@ -2563,45 +2590,37 @@ msgstr "Fehler beim Senden\n"
 msgid "Import"
 msgstr "Importieren"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Datumsformat"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Importiere Datei:"
+#, fuzzy
+msgid "Source:"
+msgstr "Quellverzeichnis"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Zielverzeichnis:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Wähle Datei"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Neue Ablage"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Mbox-Zieldatei und Zielverzeichnis angeben."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Wähle importierte Datei"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Wähle importierte Datei"
 
@@ -7403,6 +7422,13 @@ msgstr "Ein anderes Sylpheed läuft schon.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Importiere Datei:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Wähle Datei"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Gib Zielverzeichnis und Mbox-Datei an."
 
diff --git a/po/el.po b/po/el.po
index d491b593..ac6973af 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -298,20 +298,20 @@ msgstr "Εξαγωγή μηνυμάτων από το %s στο %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "δεν μπορώ να αντιγράψω το μήνυμα %s στο %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Δεν είναι δυνατή η σημείωση του αρχείου.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "ο φάκελος προορισμού είναι ο ίδιος με τον αρχικό.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Αντιγραφή μηνύματος %s%c%d στο %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -320,7 +320,7 @@ msgstr ""
 "Το αρχείο '%s' υπάρχει ήδη.\n"
 "Δεν είναι δυνατή η δημιουργία του φακέλου."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2192,50 +2192,77 @@ msgstr "Επεξεργασία εγγραφής vCard"
 msgid "Add New vCard Entry"
 msgstr "Προσθήκη νέας εγγραφής vCard"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Αναζήτηση για %s..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Εξαγωγή"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Προέκυψε σφάλμα κατά την αποστολή\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Εξαγωγή"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Μορφοποίηση ημερομηνίας"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Πηγαίος κατάλογος:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Κατάλογος προορισμού:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Επιλογή ... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Επιλογή αρχείου εξαγωγής"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Επιλογή αρχείου εξαγωγής"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Αποθήκευση ως"
@@ -2575,32 +2602,32 @@ msgstr "Δημιουργία προβολής εικόνας...\n"
 msgid "Can't load the image."
 msgstr "Δεν είναι δυνατό το φόρτωμα της εικόνας"
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Το αρχείο %s δεν υπάρχει\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Αναζήτηση για %s..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Εισαγωγή"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Σάρωση φακέλου %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Προέκυψε σφάλμα κατά την αποστολή\n"
@@ -2609,45 +2636,37 @@ msgstr "Προέκυψε σφάλμα κατά την αποστολή\n"
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Μορφοποίηση ημερομηνίας"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Εισαγωγή αρχείου:"
+#, fuzzy
+msgid "Source:"
+msgstr "Πηγαίος κατάλογος:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Κατάλογος προορισμού:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Επιλογή αρχείου"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Νέος φάκελος"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Επέλεξε αρχείο εισαγωγής"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Επέλεξε αρχείο εισαγωγής"
 
@@ -7455,6 +7474,13 @@ msgstr "Τρέχει ήδη ένα Sylpheed.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Εισαγωγή αρχείου:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Επιλογή αρχείου"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Ορίσετε το αρχείο mbox και κατάλογο προορισμού."
 
diff --git a/po/es.po b/po/es.po
index fe253758..9b06add9 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2007-06-09 16:20+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -292,20 +292,20 @@ msgstr "Exportando mensajes de %s a %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "no se puede copiar mensaje %s a %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "No se puede abrir el fichero de marcas.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "las carpetas de origen y destino son idénticas.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiando mensaje %s/%d a %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -314,7 +314,7 @@ msgstr ""
 "El fichero «%s» ya existe.\n"
 "No puedo crear la carpeta."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2145,50 +2145,77 @@ msgstr "Editar entrada vCard"
 msgid "Add New vCard Entry"
 msgstr "Añadir nueva entrada vCard"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Buscando %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Exportar"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Hubo un error mientras se enviaba\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Exportar"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Especifique fichero mbox y carpeta de destino."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Formato de fecha"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Directorio de origen:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Directorio de destino:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Seleccionar..."
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Especifique fichero mbox y carpeta de destino."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Seleccione fichero de exportación"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Seleccione fichero de exportación"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Guardar como"
@@ -2524,32 +2551,32 @@ msgstr "Creando vista de imagen...\n"
 msgid "Can't load the image."
 msgstr "No se puede cargar la imagen."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "El fichero %s no existe."
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Especifique fichero mbox y carpeta de destino."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Buscando %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Importar"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Hubo un error mientras se enviaba\n"
@@ -2558,45 +2585,37 @@ msgstr "Hubo un error mientras se enviaba\n"
 msgid "Import"
 msgstr "Importar"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Especifique fichero mbox y carpeta de destino."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Formato de fecha"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Importando fichero:"
+#, fuzzy
+msgid "Source:"
+msgstr "Directorio de origen:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Directorio de destino:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Seleccionar fichero"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nueva carpeta"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Especifique fichero mbox y carpeta de destino."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Seleccionar fichero a importar"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Seleccionar fichero a importar"
 
@@ -7362,6 +7381,13 @@ msgstr "ya hay otro Sylpheed en ejecución.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Importando fichero:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Seleccionar fichero"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Especificar directorio destino y fichero mbox."
 
diff --git a/po/et.po b/po/et.po
index ea791a95..b0a9c748 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -299,20 +299,20 @@ msgstr "Ekspordime teated %s-ist %s-i ...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "ei saa kirja kopeerida %s-st %s-i\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Ei suutnud avada märgi faili.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "lähtekaust on identne sihtkaustale.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -321,7 +321,7 @@ msgstr ""
 "Fail %s on juba olemas.\n"
 "Ei saa kausta luua."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2209,50 +2209,77 @@ msgstr "Redigeeri vCard sissekannet"
 msgid "Add New vCard Entry"
 msgstr "Lisa uus vCard sissekanne"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Väljasta"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Kirja saatmisel tekkis viga\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Väljasta"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "*Märgi võtav mbox fail ja sihtkaust."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Kuupäeva formaat"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Lähte kataloog"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
-msgstr "Sihtkataloog:"
+msgid "Destination:"
+msgstr "Sihtkaust"
+
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Vali... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "*Märgi võtav mbox fail ja sihtkaust."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Vali väljastatav fail"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Vali väljastatav fail"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Salvesta kui"
@@ -2600,32 +2627,32 @@ msgstr "Loon pildi vaadet...\n"
 msgid "Can't load the image."
 msgstr "Ei suuda lugeda pilti."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Faili %s ei leidu\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "*Märgi võtav mbox fail ja sihtkaust."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Impordi"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Kirja saatmisel tekkis viga\n"
@@ -2634,45 +2661,37 @@ msgstr "Kirja saatmisel tekkis viga\n"
 msgid "Import"
 msgstr "Impordi"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "*Märgi võtav mbox fail ja sihtkaust."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Kuupäeva formaat"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Faili importimine:"
+#, fuzzy
+msgid "Source:"
+msgstr "Lähte kataloog"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Sihtkataloog:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Määra fail"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Uus kaust"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "*Märgi võtav mbox fail ja sihtkaust."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Märgi importiv fail"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Märgi importiv fail"
 
@@ -7588,6 +7607,17 @@ msgstr "üks teine Sylpheed juba töötab.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Faili importimine:"
+
+#, fuzzy
+#~ msgid "Destination file:"
+#~ msgstr "Sihtkataloog:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Määra fail"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Määra sihtkaust ja kirjakasti (mbox) fail"
 
@@ -7979,9 +8009,6 @@ msgstr ""
 #~ msgid "Keyword"
 #~ msgstr "Sõna"
 
-#~ msgid "Destination"
-#~ msgstr "Sihtkaust"
-
 #~ msgid "Use regex"
 #~ msgstr "Kasuta avaldisi"
 
diff --git a/po/fr.po b/po/fr.po
index 5b01f192..8f86b49c 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2008-12-04 00:06+0100\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -302,20 +302,20 @@ msgstr "Exportation des messages de %s vers %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "Impossible de copier le message de %s à %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Impossible d'ouvrir le fichier des marques.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "dossier source identique à la destination.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copie du message %s/%d vers %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -324,7 +324,7 @@ msgstr ""
 "Le fichier « %s » existe déjà.\n"
 "Impossible de créer le dossier."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2163,51 +2163,79 @@ msgstr "Édition d'une entrée vCard"
 msgid "Add New vCard Entry"
 msgstr "Ajouter une entrée vCard"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Recherche %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Exporter"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Erreur lors de l'envoi.\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Exporter"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr ""
 "Veuillez indiquer le fichier mbox à importer et le dossier destinataire"
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Format de la date"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Dossier à exporter :"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Dossier destinataire :"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Choisir... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr ""
+"Veuillez indiquer le fichier mbox à importer et le dossier destinataire"
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Sélection du fichier exporté"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Sélection du fichier exporté"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Enregistrer sous"
@@ -2544,33 +2572,33 @@ 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:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Le fichier %s n'existe pas."
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr ""
 "Veuillez indiquer le fichier mbox à importer et le dossier destinataire"
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Recherche %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Importer"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Erreur lors de l'envoi.\n"
@@ -2579,46 +2607,39 @@ msgstr "Erreur lors de l'envoi.\n"
 msgid "Import"
 msgstr "Importer"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr ""
 "Veuillez indiquer le fichier mbox à importer et le dossier destinataire"
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Format de la date"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Fichier mbox :"
+#, fuzzy
+msgid "Source:"
+msgstr "Dossier à exporter :"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Dossier destinataire :"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Choisissez un fichier"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nouveau dossier"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr ""
+"Veuillez indiquer le fichier mbox à importer et le dossier destinataire"
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Choix du fichier à importer"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Choix du fichier à importer"
 
@@ -7411,6 +7432,13 @@ msgstr "une autre session de Sylpheed existe.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Fichier mbox :"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Choisissez un fichier"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr ""
 #~ "Veuillez indiquer le dossier à exporter et le nom du nouveau fichier mbox."
diff --git a/po/gl.po b/po/gl.po
index 18a53f90..df0562fe 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -298,20 +298,20 @@ msgstr "Exportando mensaxes de %s a %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "non se pode copiar mensaxe %s a %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Non se pode abrir o ficheiro de marcas.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "carpetas de orixen e destiño idénticas.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -320,7 +320,7 @@ msgstr ""
 "o Ficheiro `%s' xa existe.\n"
 "Non podo crear a carpeta."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2208,50 +2208,77 @@ msgstr "Editar entrada vCard"
 msgid "Add New vCard Entry"
 msgstr "Engadir nova entrada vCard"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Exportar"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Ocurríu un erro mentras se enviaba\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Exportar"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Especifique ficheiro mbox e carpeta de destiño."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Formato de data"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Carpeta orixen:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
-msgstr "Carpeta de destiño:"
+msgid "Destination:"
+msgstr "Destiño"
+
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Seleccionar..."
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Especifique ficheiro mbox e carpeta de destiño."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Seleccione ficheiro de exportación"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Seleccione ficheiro de exportación"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Gardar como"
@@ -2596,32 +2623,32 @@ msgstr "Creando vista de imaxen...\n"
 msgid "Can't load the image."
 msgstr "Non se pode cargar a imaxen."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "o ficheiro %s non existe\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Especifique ficheiro mbox e carpeta de destiño."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Importar"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Ocurríu un erro mentras se enviaba\n"
@@ -2630,45 +2657,37 @@ msgstr "Ocurríu un erro mentras se enviaba\n"
 msgid "Import"
 msgstr "Importar"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Especifique ficheiro mbox e carpeta de destiño."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Formato de data"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Ficheiro a importar:"
+#, fuzzy
+msgid "Source:"
+msgstr "Carpeta orixen:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Carpeta de destiño:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Seleccionar ficheiro"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nova carpeta"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Especifique ficheiro mbox e carpeta de destiño."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Seleccionar ficheiro a importar"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Seleccionar ficheiro a importar"
 
@@ -7588,6 +7607,17 @@ msgstr "xa hai outro Sylpheed executándose.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Ficheiro a importar:"
+
+#, fuzzy
+#~ msgid "Destination file:"
+#~ msgstr "Carpeta de destiño:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Seleccionar ficheiro"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Especifique a carpeta orixen e ficheiro mbox."
 
@@ -7978,9 +8008,6 @@ msgstr ""
 #~ msgid "Keyword"
 #~ msgstr "Palabra"
 
-#~ msgid "Destination"
-#~ msgstr "Destiño"
-
 #~ msgid "Use regex"
 #~ msgstr "Usar exp.reg."
 
diff --git a/po/hr.po b/po/hr.po
index 8aefc2d5..7e0ce963 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -300,20 +300,20 @@ msgstr "Izvozim poruke iz %s u %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Ne mogu otvoriti označenu datoteku.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni spis jednak je destinaciji.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -322,7 +322,7 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu stvoriti spis."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2215,50 +2215,77 @@ msgstr "Uredite V-kartica unose"
 msgid "Add New vCard Entry"
 msgstr "Dodaj Novi V-kartica Unos"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Iznesi"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Došlo je do greške prilikom slanja\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Iznesi"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Format datuma"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Izvorni dir:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
-msgstr "Destinacijski dir:"
+msgid "Destination:"
+msgstr "Destinacija"
+
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Odaberite... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Odaberite datoteku za iznošenje"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Odaberite datoteku za iznošenje"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Spremi kao"
@@ -2611,32 +2638,32 @@ msgstr "Kreiram pregled slika...\n"
 msgid "Can't load the image."
 msgstr "Ne mogu prikazati sliku."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Uvezi"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Došlo je do greške prilikom slanja\n"
@@ -2645,45 +2672,37 @@ msgstr "Došlo je do greške prilikom slanja\n"
 msgid "Import"
 msgstr "Uvezi"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Format datuma"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Uvozim datoteku:"
+#, fuzzy
+msgid "Source:"
+msgstr "Izvorni dir:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Destinacijski dir:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Odaberite datoteku"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Novi spis"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Odredite ciljanu mbox datoteku i destinacijski spis."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Odaberite datoteku za uvoz"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Odaberite datoteku za uvoz"
 
@@ -7693,6 +7712,17 @@ msgstr "drugi Sylpheed već radi.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Uvozim datoteku:"
+
+#, fuzzy
+#~ msgid "Destination file:"
+#~ msgstr "Destinacijski dir:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Odaberite datoteku"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Odredite ciljani spis i mbox datoteku."
 
@@ -8034,9 +8064,6 @@ msgstr ""
 #~ msgid "Keyword"
 #~ msgstr "Ključna riječ"
 
-#~ msgid "Destination"
-#~ msgstr "Destinacija"
-
 #~ msgid "Use regex"
 #~ msgstr "Korsiti regex"
 
diff --git a/po/hu.po b/po/hu.po
index 9b18a044..24a9d8f3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2008-12-01 19:42+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: HUNGARIAN <NONE>\n"
@@ -293,20 +293,20 @@ msgstr "Levelek exportálása innen: %s ide: %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "%s levél nem másolható ide: %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "A jelölő fájlt nem lehet megnyitni.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "A forrás- és célmappa azonos.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "%s/%d levél másolása ide: %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -315,7 +315,7 @@ msgstr ""
 "`%s' fájl már létezik.\n"
 "Mappa nem hozható létre."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2144,50 +2144,77 @@ msgstr "vCard bejegyzés szerkesztése"
 msgid "Add New vCard Entry"
 msgstr "Új vCard bejegyzés hozzáadása"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "%s keresése..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Exportálás"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Hiba küldés közben\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Exportálás"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Adja meg a célfájlt és a célmappát!"
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Dátum formátuma"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Forrásmappa:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Célkönyvtár:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Kiválaszt... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Adja meg a célfájlt és a célmappát!"
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Exportálandó fájl választás"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Exportálandó fájl választás"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Mentés másként"
@@ -2523,32 +2550,32 @@ 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:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "A(z) %s fájl nem létezik."
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Adja meg a célfájlt és a célmappát!"
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "%s keresése..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Importálás"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "%s mappa átvizsgálása..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Hiba küldés közben\n"
@@ -2557,45 +2584,37 @@ msgstr "Hiba küldés közben\n"
 msgid "Import"
 msgstr "Importálás"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Adja meg a célfájlt és a célmappát!"
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Dátum formátuma"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Fájl importálás:"
+#, fuzzy
+msgid "Source:"
+msgstr "Forrásmappa:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Célkönyvtár:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Fájl választás"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Új mappa"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Adja meg a célfájlt és a célmappát!"
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Importálandó fájl választása"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Importálandó fájl választása"
 
@@ -7355,6 +7374,13 @@ msgstr "egy másik Sylpheed már fut.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Fájl importálás:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Fájl választás"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Adjon meg célmappát és mbox fájlt!"
 
diff --git a/po/it.po b/po/it.po
index 1e05314d..5241a555 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2008-01-26 09:42+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -293,20 +293,20 @@ msgstr "Esportazione dei messaggi da %s in %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "impossibile copiare il messaggio %s in %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "impossibile aprire il file delle segnature.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "la cartella sorgente é identica a quella di destinazione.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copia del messaggio %s%d in %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -315,7 +315,7 @@ msgstr ""
 "Il file «%s» esiste già.\n"
 "Impossibile creare la cartella."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2156,50 +2156,77 @@ msgstr "Modifica la voce vCard"
 msgid "Add New vCard Entry"
 msgstr "Aggiunta di una nuova voce vCard"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Ricerca in %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Esporta"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Si è verificato un errore durante l'invio dell'articolo\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Esporta"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Specificare il file mbox da importare e la cartella di destinazione."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Formato della data"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Directory di origine:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Directory di destinazione:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Seleziona... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Specificare il file mbox da importare e la cartella di destinazione."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Seleziona il file da esportare"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Seleziona il file da esportare"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Salva come"
@@ -2536,32 +2563,32 @@ msgstr "Creazione della vista dell'immagine...\n"
 msgid "Can't load the image."
 msgstr "Impossibile caricare l'immagine."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Il file %s non esiste."
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Specificare il file mbox da importare e la cartella di destinazione."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Ricerca in %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Importa"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Analisi della cartella %s..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Si è verificato un errore durante l'invio dell'articolo\n"
@@ -2570,45 +2597,37 @@ msgstr "Si è verificato un errore durante l'invio dell'articolo\n"
 msgid "Import"
 msgstr "Importa"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Specificare il file mbox da importare e la cartella di destinazione."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Formato della data"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "File da importare:"
+#, fuzzy
+msgid "Source:"
+msgstr "Directory di origine:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Directory di destinazione:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Selezione del file"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nuova cartella"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Specificare il file mbox da importare e la cartella di destinazione."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Selezione del file da importare"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Selezione del file da importare"
 
@@ -7395,6 +7414,13 @@ msgstr "un altro Sylpheed è già in esecuzione.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "File da importare:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Selezione del file"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Specificare la cartella di origine e il file mbox."
 
diff --git a/po/ja.po b/po/ja.po
index 1aaecb9c..c3bf21e4 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -292,20 +292,20 @@ msgstr "メッセージを %s から %s に書き出しています...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "メッセージ %s を %s にコピーできません\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "マークファイルを開けません。\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "移動元フォルダが移動先と同一です。\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "メッセージ %s/%d を %s にコピーしています...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -314,7 +314,7 @@ msgstr ""
 "ファイル `%s' がすでに存在します。\n"
 "フォルダを作成できません。"
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2139,44 +2139,68 @@ msgstr "vCardエントリの編集"
 msgid "Add New vCard Entry"
 msgstr "新規vCardエントリの追加"
 
-#: src/export.c:175
+#: src/export.c:202
 #, c-format
 msgid "Exporting %s ..."
 msgstr "%s をエクスポート中..."
 
-#: src/export.c:177
+#: src/export.c:204
 msgid "Exporting"
 msgstr "エクスポート中"
 
-#: src/export.c:198
+#: src/export.c:229
 msgid "Error occurred on export."
 msgstr "エクスポート中にエラーが発生しました。"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "エクスポート"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 msgid "Specify source folder and destination file."
 msgstr "エクスポート元のフォルダとエクスポート先のファイルを指定してください。"
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+msgid "File format:"
+msgstr "ファイル形式:"
+
+#: src/export.c:339
 msgid "Source folder:"
 msgstr "エクスポート元フォルダ:"
 
-#: src/export.c:248
-msgid "Destination file:"
-msgstr "エクスポート先ファイル:"
+#: src/export.c:344
+msgid "Destination:"
+msgstr "エクスポート先:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr "UNIX mbox"
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr "eml (番号 + .eml)"
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr "MH (番号のみ)"
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " 選択... "
 
-#: src/export.c:305
+#: src/export.c:412
+msgid "Specify source folder and destination folder."
+msgstr "エクスポート元のフォルダとエクスポート先のフォルダを指定してください。"
+
+#: src/export.c:438
 msgid "Select destination file"
 msgstr "エクスポート先のファイルを選択"
 
+#: src/export.c:442
+msgid "Select destination folder"
+msgstr "エクスポート先のフォルダを選択"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "名前を付けて保存"
@@ -2511,28 +2535,28 @@ msgstr "イメージビューを作成中...\n"
 msgid "Can't load the image."
 msgstr "画像を読み込めません。"
 
-#: src/import.c:181
+#: src/import.c:185
 msgid "The source file does not exist."
 msgstr "インポート元のファイルが存在しません。"
 
-#: src/import.c:192
+#: src/import.c:196
 msgid "Can't find the destination folder."
 msgstr "インポート先のフォルダが見つかりません。"
 
-#: src/import.c:197
+#: src/import.c:201
 #, c-format
 msgid "Importing %s ..."
 msgstr "%s をインポート中..."
 
-#: src/import.c:199
+#: src/import.c:203
 msgid "Importing"
 msgstr "インポート中"
 
-#: src/import.c:221
+#: src/import.c:222
 msgid "Scanning folder..."
 msgstr "フォルダをスキャン中..."
 
-#: src/import.c:232
+#: src/import.c:233
 msgid "Error occurred on import."
 msgstr "インポート中にエラーが発生しました。"
 
@@ -2540,39 +2564,33 @@ msgstr "インポート中にエラーが発生しました。"
 msgid "Import"
 msgstr "インポート"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 msgid "Specify source file and destination folder."
 msgstr "インポート元のファイルとインポート先のフォルダを指定してください。"
 
-#: src/import.c:323
-msgid "File format:"
-msgstr "ファイル形式:"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "インポート元ファイル:"
+msgid "Source:"
+msgstr "インポート元:"
 
 #: src/import.c:333
 msgid "Destination folder:"
 msgstr "インポート先フォルダ:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr "UNIX mbox"
-
-#: src/import.c:344
-msgid "eml (file)"
-msgstr "eml (ファイル)"
-
-#: src/import.c:345
+#: src/import.c:346
 msgid "eml (folder)"
 msgstr "eml (フォルダ)"
 
-#: src/import.c:407
+#: src/import.c:395
+msgid "Specify source folder including eml files and destination folder."
+msgstr ""
+"emlファイルを含むインポート元のフォルダとインポート先のフォルダを指定してくだ"
+"さい。"
+
+#: src/import.c:425
 msgid "Select importing folder"
 msgstr "インポートするフォルダを選択"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "インポートするファイルを選択"
 
diff --git a/po/ko.po b/po/ko.po
index 9e864b5b..58f2d93c 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -299,20 +299,20 @@ msgstr "메시지를 %s에서 %s로 보냅니다...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "메시지 %s을 %s로 복사할 수가 없습니다\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "표시 파일을 열 수가 없습니다.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "옮길 폴더와 옮겨질 폴더가 같습니다.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -321,7 +321,7 @@ msgstr ""
 "파일 `%s'가 이미 존재합니다.\n"
 "폴더를 생성할 수가 없습니다."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2191,50 +2191,77 @@ msgstr "vCard 항목 편집"
 msgid "Add New vCard Entry"
 msgstr "새 vCard 항목 추가"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "가져오기"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "글을 올리는 도중 에러 발생\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr ""
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "대상 mbox 파일과 대상 폴더를 지정하세요."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "날짜 형식"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "새 폴더"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
-msgstr "저장할 폴더:"
+msgid "Destination:"
+msgstr "저장 폴더"
+
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "고르기..."
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "대상 mbox 파일과 대상 폴더를 지정하세요."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "불러올 파일을 선택"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "불러올 파일을 선택"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "새 이름으로"
@@ -2579,32 +2606,32 @@ msgstr "이미지 뷰를 생성합니다...\n"
 msgid "Can't load the image."
 msgstr "이미지를 불러올 수가 없습니다."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "%s파일이 없습니다\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "대상 mbox 파일과 대상 폴더를 지정하세요."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "가져오기"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "글을 올리는 도중 에러 발생\n"
@@ -2613,45 +2640,37 @@ msgstr "글을 올리는 도중 에러 발생\n"
 msgid "Import"
 msgstr "가져오기"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "대상 mbox 파일과 대상 폴더를 지정하세요."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "날짜 형식"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "가져올 파일:"
+#, fuzzy
+msgid "Source:"
+msgstr "새 폴더"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "저장할 폴더:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "파일 선택"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "새 폴더"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "대상 mbox 파일과 대상 폴더를 지정하세요."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "불러올 파일을 선택"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "불러올 파일을 선택"
 
@@ -7529,6 +7548,17 @@ msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "가져올 파일:"
+
+#, fuzzy
+#~ msgid "Destination file:"
+#~ msgstr "저장할 폴더:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "파일 선택"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "대상 폴더와 mbox 파일을 지정하세요."
 
@@ -7857,9 +7887,6 @@ msgstr ""
 #~ msgid "Keyword"
 #~ msgstr "키워드"
 
-#~ msgid "Destination"
-#~ msgstr "저장 폴더"
-
 #~ msgid "Use regex"
 #~ msgstr "정규식 사용"
 
diff --git a/po/lt.po b/po/lt.po
index 78287722..be6afae0 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -292,20 +292,20 @@ msgstr "Eksportuojami laiškai iš %s į %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "negaliu nukopijuoti laiško %s į %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Negaliu atidaryti žymų failo.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "pradinis katalogas identiškas paskirties katalogui.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopijuojamas laiškas %s/%d į %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -314,7 +314,7 @@ msgstr ""
 "Failas „%s“ jau egzistuoja.\n"
 "Negaliu sukurti katalogo."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2137,50 +2137,77 @@ msgstr "Redaguoti „vCard“ įrašą"
 msgid "Add New vCard Entry"
 msgstr "Pridėti naują „vCard“ įrašą"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Ieškoma „%s“..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Eksportuoti"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Klaida skelbiant žinutę\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Eksportuoti"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Nurodykite „mbox“ failą ir paskyrimo katalogą."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Datos formatas"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Pradinis katalogas:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Paskyrimo katalogas:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Pasirinkti... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Nurodykite „mbox“ failą ir paskyrimo katalogą."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Pasirinkti exportuojamą failą"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Pasirinkti exportuojamą failą"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Išsaugoti kaip"
@@ -2516,32 +2543,32 @@ msgstr "Sukuriama paveikslėlio peržiūra...\n"
 msgid "Can't load the image."
 msgstr "Negaliu įkelti paveikslėlio."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Failas %s neegzistuoja\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Nurodykite „mbox“ failą ir paskyrimo katalogą."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Ieškoma „%s“..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Importuoti"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Skanuojamas katalogas „%s“..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Klaida skelbiant žinutę\n"
@@ -2550,45 +2577,37 @@ msgstr "Klaida skelbiant žinutę\n"
 msgid "Import"
 msgstr "Importuoti"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Nurodykite „mbox“ failą ir paskyrimo katalogą."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Datos formatas"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Importuojamas failas:"
+#, fuzzy
+msgid "Source:"
+msgstr "Pradinis katalogas:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Paskyrimo katalogas:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Žymėti failą"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Naujas katalogas"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Nurodykite „mbox“ failą ir paskyrimo katalogą."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Pažymėkite importuojamą failą"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Pažymėkite importuojamą failą"
 
@@ -7344,6 +7363,13 @@ msgstr "Sylpheed jau paleistas.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Importuojamas failas:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Žymėti failą"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Nurodykite katalogą ir „mbox“ failą."
 
diff --git a/po/nl.po b/po/nl.po
index ee5e7e07..e6301868 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -295,20 +295,20 @@ msgstr "Berichten worden geëxporteerd van %s naar %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "kan bericht niet kopiëren van %s naar %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "de bronmap is hetzelfde als de doelmap.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -317,7 +317,7 @@ msgstr ""
 "Bestand '%s' bestaat al.\n"
 "Kan geen map aanmaken."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2167,50 +2167,77 @@ msgstr "Bewerk vCard veld"
 msgid "Add New vCard Entry"
 msgstr "Nieuw vCard veld toevoegen"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Doorzoeken van %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Exporteren"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Er is een fout opgetreden bij het versturen\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Exporteren"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Specificeer mbox bestand (bron) en de doelmap."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Datumopmaak"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Bronmap:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Doelmap:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Selecteer..."
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Specificeer mbox bestand (bron) en de doelmap."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Selecteer doelbestand"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Selecteer doelbestand"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Opslaan als"
@@ -2549,32 +2576,32 @@ msgstr "Plaatje wordt weergegeven...\n"
 msgid "Can't load the image."
 msgstr "Kan plaatje niet weergeven."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Bestand %s bestaat niet\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Specificeer mbox bestand (bron) en de doelmap."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Doorzoeken van %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Importeren"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Er is een fout opgetreden bij het versturen\n"
@@ -2583,45 +2610,37 @@ msgstr "Er is een fout opgetreden bij het versturen\n"
 msgid "Import"
 msgstr "Importeren"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Specificeer mbox bestand (bron) en de doelmap."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Datumopmaak"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Te importeren bestand:"
+#, fuzzy
+msgid "Source:"
+msgstr "Bronmap:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Doelmap:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Selecteer bestand"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nieuwe map"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Specificeer mbox bestand (bron) en de doelmap."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Selecteer het te importeren bestand"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Selecteer het te importeren bestand"
 
@@ -7452,6 +7471,13 @@ msgstr "er draait al een Sylpheed.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Te importeren bestand:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Selecteer bestand"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Geef doelmap en mbox bestand"
 
diff --git a/po/pl.po b/po/pl.po
index d9f78f2f..66e83136 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2008-06-17 22:25+0100\n"
 "Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -290,20 +290,20 @@ msgstr "Eksportowanie wiadomości z %s do %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "nie można skopiować wiadomości %s do %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Nie można otworzyć pliku zaznaczeń.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "katalog źródłowy jest taki sam jak docelowy.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiowanie wiadomości %s/%d do %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -312,7 +312,7 @@ msgstr ""
 "Plik \"%s\" już istnieje.\n"
 "Nie można utworzyć katalogu."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2135,50 +2135,77 @@ msgstr "Edytuj wpis VCard"
 msgid "Add New vCard Entry"
 msgstr "Dodaj nowy wpis VCard"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Eksport"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Wystąpił błąd podczas publikowania\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Eksport"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Określ docelowy plik ze skrzynką oraz docelowy katalog."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Format daty"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Katalog źródłowy:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Katalog docelowy:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Wybierz... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Określ docelowy plik ze skrzynką oraz docelowy katalog."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Wybierz plik eksportu"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Wybierz plik eksportu"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Zapisz jako"
@@ -2514,32 +2541,32 @@ msgstr "Tworzenie widoku obrazu...\n"
 msgid "Can't load the image."
 msgstr "Nie można załadować obrazu."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Plik %s nie istnieje."
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Określ docelowy plik ze skrzynką oraz docelowy katalog."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Importuj"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Wystąpił błąd podczas publikowania\n"
@@ -2548,45 +2575,37 @@ msgstr "Wystąpił błąd podczas publikowania\n"
 msgid "Import"
 msgstr "Importuj"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Określ docelowy plik ze skrzynką oraz docelowy katalog."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Format daty"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Importowanie pliku:"
+#, fuzzy
+msgid "Source:"
+msgstr "Katalog źródłowy:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Katalog docelowy:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Wybierz plik"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nowy katalog"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Określ docelowy plik ze skrzynką oraz docelowy katalog."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Wybierz importowany plik"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Wybierz importowany plik"
 
@@ -7465,6 +7484,13 @@ msgstr "Jest już uruchomiona kopia programu Sylpheed.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Importowanie pliku:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Wybierz plik"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Wybierz katalog docelowy i plik w formacie mbox"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a9d7911c..f1463baa 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2009-07-14 12:28-0400\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -300,20 +300,20 @@ msgstr "Exportando mensagens de %s em %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "não foi possível copiar a mensagem %s para %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Não foi possível abrir o arquivo de marcas.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "pastas de origem e destino são idênticas.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiando mensagem %s/%d para %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -322,7 +322,7 @@ msgstr ""
 "O arquivo `%s' já existe.\n"
 "Não foi possível criar a pasta."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2153,50 +2153,77 @@ msgstr "Editar Entrada vCard"
 msgid "Add New vCard Entry"
 msgstr "Adicionar Nova Entrada vCard"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Procurando %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Exportar"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Ocorreu um erro quando postando\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Exportar"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Especifique o arquivo mbox e a pasta de destino."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Formato de data"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Diretório fonte:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Diretório de destino:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Selecionar..."
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Especifique o arquivo mbox e a pasta de destino."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Selecione o filtro de exportação"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Selecione o filtro de exportação"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Salvar como"
@@ -2531,32 +2558,32 @@ msgstr "Criando visualizador de imagem...\n"
 msgid "Can't load the image."
 msgstr "Não foi possível carregar a imagem."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "O arquivo %s não existe."
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Especifique o arquivo mbox e a pasta de destino."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Procurando %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Importar"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Revisando pasta %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Ocorreu um erro quando postando\n"
@@ -2565,45 +2592,37 @@ msgstr "Ocorreu um erro quando postando\n"
 msgid "Import"
 msgstr "Importar"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Especifique o arquivo mbox e a pasta de destino."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Formato de data"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Importando arquivo:"
+#, fuzzy
+msgid "Source:"
+msgstr "Diretório fonte:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Diretório de destino:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Selecionar arquivo"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nova pasta"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Especifique o arquivo mbox e a pasta de destino."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Selecionar arquivo a importar"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Selecionar arquivo a importar"
 
@@ -7357,6 +7376,13 @@ msgstr "Sylpheed está devidamente atualizado."
 msgid "Couldn't get the version information."
 msgstr "Não foi possível obter a informação sobre versão."
 
+#~ msgid "Importing file:"
+#~ msgstr "Importando arquivo:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Selecionar arquivo"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Especifique a pasta destino e o arquivo mbox"
 
diff --git a/po/ro.po b/po/ro.po
index f571d68a..66bc20bf 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2008-12-05 03:06+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: \n"
@@ -302,20 +302,20 @@ msgstr "Exportare mesaje din %s în %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "nu se poate copia mesajului %s în %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Nu se poate deschide fișierul de marcaj.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "dosarul sursă este identic cu cel de destinație.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Copiere mesaj %s/%d în %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -324,7 +324,7 @@ msgstr ""
 "Fișierul „%s” există deja.\n"
 "Nu se poate crea dosarul."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2178,52 +2178,79 @@ msgstr "Editare înregistrare vCard"
 msgid "Add New vCard Entry"
 msgstr "Adăugare înregistrare vCard"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Căutare %s ..."
 
 # titlu la export mbox
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Export"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "A apărut o eroare în timpul trimiterii\n"
 
 # titlu la export mbox
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Export"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Specificați fișierul mbox sursă și dosarul destinație."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Format dată"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Director sursă:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Director destinație:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Selectare... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Specificați fișierul mbox sursă și dosarul destinație."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Selectați fișierul de exportat"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Selectați fișierul de exportat"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Salvare ca"
@@ -2568,33 +2595,33 @@ msgstr "Creare vizualizare imagine...\n"
 msgid "Can't load the image."
 msgstr "Imaginea nu a putut fi încărcată."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Fișierul %s nu există."
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Specificați fișierul mbox sursă și dosarul destinație."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Căutare %s ..."
 
 # titlu la import mbox
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Import"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Scanare dosar %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "A apărut o eroare în timpul trimiterii\n"
@@ -2604,45 +2631,37 @@ msgstr "A apărut o eroare în timpul trimiterii\n"
 msgid "Import"
 msgstr "Import"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Specificați fișierul mbox sursă și dosarul destinație."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Format dată"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Fișier de import:"
+#, fuzzy
+msgid "Source:"
+msgstr "Director sursă:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Director destinație:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Selectați fișierul"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Dosar nou"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Specificați fișierul mbox sursă și dosarul destinație."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Selectați fișierul de importat"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Selectați fișierul de importat"
 
@@ -7461,6 +7480,13 @@ msgstr "rulează deja o altă sesiune Sylpheed.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Fișier de import:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Selectați fișierul"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Specificați dosarul sursă și fișierul mbox."
 
diff --git a/po/ru.po b/po/ru.po
index dce0a952..58cb02eb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2007-07-22 12:53+0400\n"
 "Last-Translator: Andrey Markelov <andrey@markelov.net>\n"
 "Language-Team: Russian <Project-Id-Version: gtranslato>\n"
@@ -295,20 +295,20 @@ msgstr "Экспорт сообщений из %s в %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "не удалось скопировать сообщение %s в %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Не удалось открыть файл пометок.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "исходная папка совпадает с папкой назначения.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Копирование сообщения %s/%d·to·%s·...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -317,7 +317,7 @@ msgstr ""
 "Файл \"%s\" уже существует.\n"
 "Нельзя создать папку с таким же именем."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2151,50 +2151,77 @@ msgstr "Редактирование записи vCard"
 msgid "Add New vCard Entry"
 msgstr "Добавление новой записи vCard"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Поиск в папке \"%s\"..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Экспорт"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Произошла ошибка при отправке статьи\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Экспорт"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Укажите файл mbox и папку назначения."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Формат даты"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Исходная папка:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Каталог назначения:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Выбор... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Укажите файл mbox и папку назначения."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Выбор файла для экспорта"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Выбор файла для экспорта"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Сохранить как"
@@ -2530,32 +2557,32 @@ msgstr "Создание области просмотра изображени�
 msgid "Can't load the image."
 msgstr "Ошибка загрузки изображения"
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Файл %s не найден\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Укажите файл mbox и папку назначения."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Поиск в папке \"%s\"..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Импорт"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Просмотр папки %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Произошла ошибка при отправке статьи\n"
@@ -2564,45 +2591,37 @@ msgstr "Произошла ошибка при отправке статьи\n"
 msgid "Import"
 msgstr "Импорт"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Укажите файл mbox и папку назначения."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Формат даты"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Импорт файла:"
+#, fuzzy
+msgid "Source:"
+msgstr "Исходная папка:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Каталог назначения:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Выбор файла"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Новая папка"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Укажите файл mbox и папку назначения."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Выбор импортируемого файла"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Выбор импортируемого файла"
 
@@ -7378,6 +7397,13 @@ msgstr "другая копия Sylpheed уже запущена.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Импорт файла:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Выбор файла"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Укажите экспортируемую папку и файл mbox."
 
diff --git a/po/sk.po b/po/sk.po
index 56db28ee..9726ac05 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -296,20 +296,20 @@ msgstr "Exportujem správy z %s do %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "nemôžem kopírovať správu %s do %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Nemôžem označiť súbor so značkami.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojový priečinok je ten istý ako cieľový.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -318,7 +318,7 @@ msgstr ""
 "Súbor '%s' už existuje.\n"
 "Priečinok sa nedá vytvoriť."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2206,50 +2206,77 @@ msgstr "Upraviť vCard záznam"
 msgid "Add New vCard Entry"
 msgstr "Pridať nový vCard záznam"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Exportovať"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Pri odosielaní sa vyskytla chyba\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Exportovať"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Zvoľte importovaný mbox súbor a cieľový priečinok."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Formát dátumu"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Zdrojový priečinok:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
-msgstr "Cieľový priečinok:"
+msgid "Destination:"
+msgstr "Cieľ"
+
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Zvoľte..."
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Zvoľte importovaný mbox súbor a cieľový priečinok."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Zvoľte súbor pre export"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Zvoľte súbor pre export"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Uložiť ako"
@@ -2593,32 +2620,32 @@ 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:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Súbor %s neexistuje\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Zvoľte importovaný mbox súbor a cieľový priečinok."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Importovať"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Pri odosielaní sa vyskytla chyba\n"
@@ -2627,45 +2654,37 @@ msgstr "Pri odosielaní sa vyskytla chyba\n"
 msgid "Import"
 msgstr "Importovať"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Zvoľte importovaný mbox súbor a cieľový priečinok."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Formát dátumu"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Importovaný súbor:"
+#, fuzzy
+msgid "Source:"
+msgstr "Zdrojový priečinok:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Cieľový priečinok:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Vybrať súbor"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nový priečinok"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Zvoľte importovaný mbox súbor a cieľový priečinok."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Zvoľte súbor pre import"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Zvoľte súbor pre import"
 
@@ -7583,6 +7602,17 @@ msgstr "už beží iná kópia Sylpheedu.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Importovaný súbor:"
+
+#, fuzzy
+#~ msgid "Destination file:"
+#~ msgstr "Cieľový priečinok:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Vybrať súbor"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Určite cieľový priečinok a súbor mbox."
 
@@ -7984,9 +8014,6 @@ msgstr ""
 #~ msgid "Keyword"
 #~ msgstr "Reťazec"
 
-#~ msgid "Destination"
-#~ msgstr "Cieľ"
-
 #~ msgid "Use regex"
 #~ msgstr "Použiť regex"
 
diff --git a/po/sl.po b/po/sl.po
index c9d43d63..5b4826b3 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -299,20 +299,20 @@ msgstr "Izvažam sporočila iz %s v %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "ne morem prepisati sporočila %s v %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Ne morem odpreti označene datoteke.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "Izvorna mapa je identična ciljni.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -321,7 +321,7 @@ msgstr ""
 "Datoteka `%s' že obstaja.\n"
 "Ne morem narediti imenika."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2210,50 +2210,77 @@ msgstr "Urejanje vnosa v-kartice"
 msgid "Add New vCard Entry"
 msgstr "Dodaj nov vnos v-kartice"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Izvozi"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Med pošiljanjem je prišlo do napake\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Izvozi"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Določite ciljno datoteko mbox in ciljno mapo."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Oblika datuma"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Izvorni imenik:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
-msgstr "Ciljni imenik:"
+msgid "Destination:"
+msgstr "Cilj"
+
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Izberi... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Določite ciljno datoteko mbox in ciljno mapo."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Izberite datoteko za izvoziti"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Izberite datoteko za izvoziti"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Shrani kot"
@@ -2598,32 +2625,32 @@ msgstr "Delam gledanje slike...\n"
 msgid "Can't load the image."
 msgstr "Ne morem naložiti slike."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Določite ciljno datoteko mbox in ciljno mapo."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Uvozi"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Med pošiljanjem je prišlo do napake\n"
@@ -2632,45 +2659,37 @@ msgstr "Med pošiljanjem je prišlo do napake\n"
 msgid "Import"
 msgstr "Uvozi"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Določite ciljno datoteko mbox in ciljno mapo."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Oblika datuma"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Uvažam datoteko:"
+#, fuzzy
+msgid "Source:"
+msgstr "Izvorni imenik:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Ciljni imenik:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Izberi datoteko"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Nova mapa"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Določite ciljno datoteko mbox in ciljno mapo."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Izberite datoteko za uvoz"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Izberite datoteko za uvoz"
 
@@ -7585,6 +7604,17 @@ msgstr "Sylpheed že teče.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Uvažam datoteko:"
+
+#, fuzzy
+#~ msgid "Destination file:"
+#~ msgstr "Ciljni imenik:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Izberi datoteko"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Določite ciljno mapo in datoteko mbox."
 
@@ -7975,9 +8005,6 @@ msgstr ""
 #~ msgid "Keyword"
 #~ msgstr "Ključna beseda"
 
-#~ msgid "Destination"
-#~ msgstr "Cilj"
-
 #~ msgid "Use regex"
 #~ msgstr "Uporabi regularni izraz"
 
diff --git a/po/sr.po b/po/sr.po
index 14ae0493..248069de 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -300,20 +300,20 @@ msgstr "Izvozim poruke iz %s u %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Ne mogu otvoriti označenu datoteku.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni direktorijum jednak je destinaciji.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -322,7 +322,7 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu napraviti direktorijum."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2205,50 +2205,77 @@ msgstr "Izmeni vCard unose"
 msgid "Add New vCard Entry"
 msgstr "Dodaj novi vCard unos"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Izvezi"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Došlo je do greške prilikom slanja\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Izvezi"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Odredite željenu mbox datoteku i odredišni direktorijum."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Format datuma"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Izvorni dir:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
-msgstr "Odredišni dir:"
+msgid "Destination:"
+msgstr "Odredište"
+
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Odaberite... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Odredite željenu mbox datoteku i odredišni direktorijum."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Odaberite datoteku za izvoz"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Odaberite datoteku za izvoz"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Sačuvaj kao"
@@ -2593,32 +2620,32 @@ msgstr "Kreiram pregled slika...\n"
 msgid "Can't load the image."
 msgstr "Ne mogu prikazati sliku."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Datoteka %s ne postoji\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Odredite željenu mbox datoteku i odredišni direktorijum."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Uvezi"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Došlo je do greške prilikom slanja\n"
@@ -2627,45 +2654,37 @@ msgstr "Došlo je do greške prilikom slanja\n"
 msgid "Import"
 msgstr "Uvezi"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Odredite željenu mbox datoteku i odredišni direktorijum."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Format datuma"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Uvozim datoteku:"
+#, fuzzy
+msgid "Source:"
+msgstr "Izvorni dir:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Odredišni dir:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Odaberite datoteku"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Novi direktorijum"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Odredite željenu mbox datoteku i odredišni direktorijum."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Odaberite datoteku za uvoz"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Odaberite datoteku za uvoz"
 
@@ -7580,6 +7599,17 @@ msgstr "drugi Sylpheed već radi.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Uvozim datoteku:"
+
+#, fuzzy
+#~ msgid "Destination file:"
+#~ msgstr "Odredišni dir:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Odaberite datoteku"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Odredite željeni direktorijum i mbox datoteku."
 
@@ -7970,9 +8000,6 @@ msgstr ""
 #~ msgid "Keyword"
 #~ msgstr "Ključna reč"
 
-#~ msgid "Destination"
-#~ msgstr "Odredište"
-
 #~ msgid "Use regex"
 #~ msgstr "Korsiti regex"
 
diff --git a/po/sv.po b/po/sv.po
index f9f23ca9..b72a7728 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -293,20 +293,20 @@ msgstr "Exporterar meddelanden från %s till %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "kan inte kopiera meddelande %s till %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Kan inte öppna markeringsfil.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "ursprungsmappen är identisk med dest.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Kopierar meddelande %s%c%d till %s...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -315,7 +315,7 @@ msgstr ""
 "Filen \"%s\" finns redan.\n"
 "Kan inte skapa mapp."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2164,50 +2164,77 @@ msgstr "Redigera vCard-post"
 msgid "Add New vCard Entry"
 msgstr "Lägg till ny vCard-post"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Exportera"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Fel uppstod vid postning\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Exportera"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Välj mbox-målfil och destinationskatalog."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Datumformat"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Ursprungskatalog:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Destinationskatalog:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Välj... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Välj mbox-målfil och destinationskatalog."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Välj exportfil"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Välj exportfil"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Spara som"
@@ -2548,32 +2575,32 @@ msgstr "Skapar bildvy...\n"
 msgid "Can't load the image."
 msgstr "Kan inte öppna bilden."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Filen %s finns inte\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Välj mbox-målfil och destinationskatalog."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Importera"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Fel uppstod vid postning\n"
@@ -2582,45 +2609,37 @@ msgstr "Fel uppstod vid postning\n"
 msgid "Import"
 msgstr "Importera"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Välj mbox-målfil och destinationskatalog."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Datumformat"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Fil att importera:"
+#, fuzzy
+msgid "Source:"
+msgstr "Ursprungskatalog:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Destinationskatalog:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Välj fil"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Ny mapp"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Välj mbox-målfil och destinationskatalog."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Välj fil att importera"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Välj fil att importera"
 
@@ -7449,6 +7468,13 @@ msgstr "en annan instans av Sylpheed är redan igång.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Fil att importera:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Välj fil"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Välj målmapp och mbox-fil."
 
diff --git a/po/tr.po b/po/tr.po
index a2e008cb..1d0fe915 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -301,20 +301,20 @@ msgstr "%s daki mesajlar %s a aktarılıyor...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "mesaj %s dan %s a kopyalanamadı\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "işaretli dosya açılamadı.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "kaynak dizini hedef dizinle aynı.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -323,7 +323,7 @@ msgstr ""
 "%s dosyası zaten bulunuyor.\n"
 "Dizin oluşturulamadı."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2198,50 +2198,77 @@ msgstr "vCard Girdisini Düzenle"
 msgid "Add New vCard Entry"
 msgstr "Yeni vCard Girdisi Ekle"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Aktar"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Postalama sırasında hata\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Aktar"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Kaynak ve hedef mbox dosyalarını belirtin."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Tarih biçimi"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Kaynak dizini:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Hedef dizini:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Seç... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Kaynak ve hedef mbox dosyalarını belirtin."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Aktarılacak dosyayı seçin"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Aktarılacak dosyayı seçin"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Farklı kaydet"
@@ -2583,32 +2610,32 @@ msgstr "Resim görüntüsü oluşturuluyor...\n"
 msgid "Can't load the image."
 msgstr "Resim yüklenemedi."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "%s dosyası bulunamadı\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Kaynak ve hedef mbox dosyalarını belirtin."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Dışarıdan Aktar"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "%s dizini taranıyor..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Postalama sırasında hata\n"
@@ -2617,45 +2644,37 @@ msgstr "Postalama sırasında hata\n"
 msgid "Import"
 msgstr "Dışarıdan Aktar"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Kaynak ve hedef mbox dosyalarını belirtin."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Tarih biçimi"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Dosya aktarılıyor:"
+#, fuzzy
+msgid "Source:"
+msgstr "Kaynak dizini:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Hedef dizini:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Dosya seç"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Yeni dizin"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Kaynak ve hedef mbox dosyalarını belirtin."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Eklenecek dosyayı seçin"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Eklenecek dosyayı seçin"
 
@@ -7534,6 +7553,13 @@ msgstr "Başka bir Sylpheed sistemde çalışıyor.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Dosya aktarılıyor:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Dosya seç"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Lütfen hedef dizini ve mbox dosyasını belirtin."
 
diff --git a/po/uk.po b/po/uk.po
index ebc54d07..841f5532 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.6.0rc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+0900\n"
 "PO-Revision-Date: 2008-12-16 15:58+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@il.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -298,20 +298,20 @@ msgstr "Експортуємо листи з %s в %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "не вдалось копіювати %s в %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Не вдалось відкрити файл позначок.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "папка призначення ідентична до вихідної.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Копіюємо лист %s/%d в %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -320,7 +320,7 @@ msgstr ""
 "Файл `%s' вже існує.\n"
 "Неможливо створити папку."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2141,50 +2141,77 @@ msgstr "Редагувати запис vCard"
 msgid "Add New vCard Entry"
 msgstr "Додати новий запис vCard"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Шукаємо %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Експортувати"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Трапилась помилка при відсиланні\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Експортувати"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Визначте цільовий файл mbox і папку призначення."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Формат дати"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Вихідна папка:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Папка призначення:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " Обрати... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Визначте цільовий файл mbox і папку призначення."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Оберіть файл для експорту"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Оберіть файл для експорту"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Зберегти як"
@@ -2520,32 +2547,32 @@ msgstr "Створюємо область перегляду зображенн�
 msgid "Can't load the image."
 msgstr "Не вдалось завантажити зображення."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Файл %s не існує."
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Визначте цільовий файл mbox і папку призначення."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Шукаємо %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Імпортувати"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Перечитуємо папку %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Трапилась помилка при відсиланні\n"
@@ -2554,45 +2581,37 @@ msgstr "Трапилась помилка при відсиланні\n"
 msgid "Import"
 msgstr "Імпортувати"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Визначте цільовий файл mbox і папку призначення."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Формат дати"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Імпортуємо файл:"
+#, fuzzy
+msgid "Source:"
+msgstr "Вихідна папка:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Папка призначення:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Обрати файл"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Нова папка"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Визначте цільовий файл mbox і папку призначення."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Обрати імпортований файл"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Обрати імпортований файл"
 
@@ -7342,6 +7361,13 @@ msgstr "вже запущено інший Sylpheed.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Імпортуємо файл:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Обрати файл"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Визначте папку і файл mbox для запису"
 
diff --git a/po/vi.po b/po/vi.po
index 2e814490..cab8fd0e 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -291,20 +291,20 @@ msgstr "Xuất thư từ %s sang %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "không thể chép thư %s tới %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "Không thể mở tập tin đánh đấu.\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "thư mục nguồn cũng chính là thư mục gốc.\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "Đang chép thư %s%c%d tới %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -313,7 +313,7 @@ msgstr ""
 "Tập tin `%s' đã có trước.\n"
 "Không thể tạo thư mục."
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2140,50 +2140,77 @@ msgstr "Soạn mục vCard"
 msgid "Add New vCard Entry"
 msgstr "Thêm mục vCard mới"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "Đang tìm %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "Xuất khẩu"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "Có lỗi khi gửi\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "Xuất khẩu"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "Chỉ định tập tin mbox đích và thư mục đến."
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "Định dạng thời gian"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "Thư mục nguồn:"
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "Thư mục đến:"
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "Chọn... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "Chỉ định tập tin mbox đích và thư mục đến."
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "Chọn tập tin xuất"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "Chọn tập tin xuất"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "Lưu là"
@@ -2522,32 +2549,32 @@ msgstr "Đang tạo khung xem ảnh...\n"
 msgid "Can't load the image."
 msgstr "Không thể tải anh."
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "Tập tin %s không tồn tại\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "Chỉ định tập tin mbox đích và thư mục đến."
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "Đang tìm %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "Nhập khẩu"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "Đang quét thư mục %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "Có lỗi khi gửi\n"
@@ -2556,45 +2583,37 @@ msgstr "Có lỗi khi gửi\n"
 msgid "Import"
 msgstr "Nhập khẩu"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "Chỉ định tập tin mbox đích và thư mục đến."
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "Định dạng thời gian"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "Tập tin được nhập:"
+#, fuzzy
+msgid "Source:"
+msgstr "Thư mục nguồn:"
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "Thư mục đến:"
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "Chọn tập tin"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "Thư mục mới"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "Chỉ định tập tin mbox đích và thư mục đến."
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "Chọn tập tin nhập khẩu"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "Chọn tập tin nhập khẩu"
 
@@ -7398,6 +7417,13 @@ msgstr "một tiến trình Sylpheed khác đang chạy.\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "Tập tin được nhập:"
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "Chọn tập tin"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "Chỉ định thư mục đích và tập tin mbox."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 047140ea..a1bcd057 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -296,20 +296,20 @@ msgstr "正在从 %s 导出信件到 %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "无法复制邮件 %s 到 %s\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "无法打开标记文件。\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "源文件夹与目的文件夹是同一个。\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -318,7 +318,7 @@ msgstr ""
 "文件“%s”已存在。\n"
 "无法创建文件件。"
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2160,50 +2160,77 @@ msgstr "编辑 vCard 项"
 msgid "Add New vCard Entry"
 msgstr "添加新 vCard 项"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "导出"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "发表文章时发生错误\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "导出"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "指定目标邮箱文件和目标文件夹。"
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "日期格式"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "源目录："
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
-msgstr "目标目录："
+msgid "Destination:"
+msgstr "目标文件夹"
+
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr " 选择... "
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "指定目标邮箱文件和目标文件夹。"
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "选择导出文件"
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "选择导出文件"
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "另存为"
@@ -2545,32 +2572,32 @@ msgstr "正在创建图像视图...\n"
 msgid "Can't load the image."
 msgstr "无法加载该图像。"
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "文件 %s 不存在\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "指定目标邮箱文件和目标文件夹。"
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "导入"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "发表文章时发生错误\n"
@@ -2579,45 +2606,37 @@ msgstr "发表文章时发生错误\n"
 msgid "Import"
 msgstr "导入"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "指定目标邮箱文件和目标文件夹。"
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "日期格式"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "导入文件："
+#, fuzzy
+msgid "Source:"
+msgstr "源目录："
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "目标目录："
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "选择文件"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "新建文件夹"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "指定目标邮箱文件和目标文件夹。"
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "选择导入文件"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "选择导入文件"
 
@@ -7462,6 +7481,17 @@ msgstr "另外一个 Sylpheed 正在运行。\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "导入文件："
+
+#, fuzzy
+#~ msgid "Destination file:"
+#~ msgstr "目标目录："
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "选择文件"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "指定目标文件夹和邮箱文件。"
 
@@ -7861,9 +7891,6 @@ msgstr ""
 #~ msgid "Keyword"
 #~ msgstr "关键词"
 
-#~ msgid "Destination"
-#~ msgstr "目标文件夹"
-
 #~ msgid "Use regex"
 #~ msgstr "使用正则表达式"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7d3a6066..14515a5c 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: 2009-08-11 15:44+0900\n"
+"POT-Creation-Date: 2009-08-12 17:07+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"
@@ -295,20 +295,20 @@ msgstr "將郵件由 %s 匯出到 %s 中...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "無法將郵件從 %s 搬移到 %s。\n"
 
-#: libsylph/mh.c:540 libsylph/mh.c:666
+#: libsylph/mh.c:540 libsylph/mh.c:667
 msgid "Can't open mark file.\n"
 msgstr "無法開啟標記的檔案。\n"
 
-#: libsylph/mh.c:547 libsylph/mh.c:672
+#: libsylph/mh.c:547 libsylph/mh.c:673
 msgid "the src folder is identical to the dest.\n"
 msgstr "來源與目的資料夾相同。\n"
 
-#: libsylph/mh.c:675
+#: libsylph/mh.c:676
 #, fuzzy, c-format
 msgid "Copying message %s/%d to %s ...\n"
 msgstr "正在複製訊息 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:1010 libsylph/mh.c:1023 src/main.c:167
+#: libsylph/mh.c:1011 libsylph/mh.c:1024 src/main.c:167
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -317,7 +317,7 @@ msgstr ""
 "檔案「%s」已存在。\n"
 "無法產生資料夾。"
 
-#: libsylph/mh.c:1556
+#: libsylph/mh.c:1557
 #, c-format
 msgid ""
 "Directory name\n"
@@ -2158,50 +2158,77 @@ msgstr "編輯 vCard 資料"
 msgid "Add New vCard Entry"
 msgstr "新增 vCard 資料"
 
-#: src/export.c:175
+#: src/export.c:202
 #, fuzzy, c-format
 msgid "Exporting %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/export.c:177
+#: src/export.c:204
 #, fuzzy
 msgid "Exporting"
 msgstr "匯出郵件"
 
-#: src/export.c:198
+#: src/export.c:229
 #, fuzzy
 msgid "Error occurred on export."
 msgstr "發表文章時發生錯誤\n"
 
-#: src/export.c:214
+#: src/export.c:305
 msgid "Export"
 msgstr "匯出郵件"
 
-#: src/export.c:233
+#: src/export.c:324 src/export.c:409
 #, fuzzy
 msgid "Specify source folder and destination file."
 msgstr "請指定目標信箱與資料夾。"
 
-#: src/export.c:243
+#: src/export.c:334 src/import.c:323
+#, fuzzy
+msgid "File format:"
+msgstr "日期格式"
+
+#: src/export.c:339
 #, fuzzy
 msgid "Source folder:"
 msgstr "來源資料夾："
 
-#: src/export.c:248
+#: src/export.c:344
 #, fuzzy
-msgid "Destination file:"
+msgid "Destination:"
 msgstr "目標目錄："
 
-#: src/export.c:261 src/export.c:267 src/import.c:357 src/import.c:363
+#: src/export.c:354 src/import.c:343
+msgid "UNIX mbox"
+msgstr ""
+
+#: src/export.c:357
+msgid "eml (number + .eml)"
+msgstr ""
+
+#: src/export.c:360
+msgid "MH (number only)"
+msgstr ""
+
+#: src/export.c:374 src/export.c:380 src/import.c:360 src/import.c:366
 #: src/prefs_account_dialog.c:955
 msgid " Select... "
 msgstr "選擇..."
 
-#: src/export.c:305
+#: src/export.c:412
+#, fuzzy
+msgid "Specify source folder and destination folder."
+msgstr "請指定目標信箱與資料夾。"
+
+#: src/export.c:438
 #, fuzzy
 msgid "Select destination file"
 msgstr "選擇匯出檔案："
 
+#: src/export.c:442
+#, fuzzy
+msgid "Select destination folder"
+msgstr "選擇匯出檔案："
+
 #: src/filesel.c:158
 msgid "Save as"
 msgstr "另存新檔"
@@ -2542,32 +2569,32 @@ msgstr "產生圖片的視窗...\n"
 msgid "Can't load the image."
 msgstr "無法載入圖片。"
 
-#: src/import.c:181
+#: src/import.c:185
 #, fuzzy
 msgid "The source file does not exist."
 msgstr "檔案 %s 不存在\n"
 
-#: src/import.c:192
+#: src/import.c:196
 #, fuzzy
 msgid "Can't find the destination folder."
 msgstr "請指定目標信箱與資料夾。"
 
-#: src/import.c:197
+#: src/import.c:201
 #, fuzzy, c-format
 msgid "Importing %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/import.c:199
+#: src/import.c:203
 #, fuzzy
 msgid "Importing"
 msgstr "匯入"
 
-#: src/import.c:221
+#: src/import.c:222
 #, fuzzy
 msgid "Scanning folder..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/import.c:232
+#: src/import.c:233
 #, fuzzy
 msgid "Error occurred on import."
 msgstr "發表文章時發生錯誤\n"
@@ -2576,45 +2603,37 @@ msgstr "發表文章時發生錯誤\n"
 msgid "Import"
 msgstr "匯入"
 
-#: src/import.c:313
+#: src/import.c:313 src/import.c:398
 #, fuzzy
 msgid "Specify source file and destination folder."
 msgstr "請指定目標信箱與資料夾。"
 
-#: src/import.c:323
-#, fuzzy
-msgid "File format:"
-msgstr "日期格式"
-
 #: src/import.c:328
-msgid "Importing file:"
-msgstr "匯入檔案："
+#, fuzzy
+msgid "Source:"
+msgstr "來源資料夾："
 
 #: src/import.c:333
 #, fuzzy
 msgid "Destination folder:"
 msgstr "目標目錄："
 
-#: src/import.c:343
-msgid "UNIX mbox"
-msgstr ""
-
-#: src/import.c:344
-#, fuzzy
-msgid "eml (file)"
-msgstr "選擇檔案"
-
-#: src/import.c:345
+#: src/import.c:346
 #, fuzzy
 msgid "eml (folder)"
 msgstr "新資料夾"
 
-#: src/import.c:407
+#: src/import.c:395
+#, fuzzy
+msgid "Specify source folder including eml files and destination folder."
+msgstr "請指定目標信箱與資料夾。"
+
+#: src/import.c:425
 #, fuzzy
 msgid "Select importing folder"
 msgstr "選擇匯入檔案"
 
-#: src/import.c:410
+#: src/import.c:428
 msgid "Select importing file"
 msgstr "選擇匯入檔案"
 
@@ -7417,6 +7436,13 @@ msgstr "已經有 Sylpheed 程式正在執行中。\n"
 msgid "Couldn't get the version information."
 msgstr ""
 
+#~ msgid "Importing file:"
+#~ msgstr "匯入檔案："
+
+#, fuzzy
+#~ msgid "eml (file)"
+#~ msgstr "選擇檔案"
+
 #~ msgid "Specify target folder and mbox file."
 #~ msgstr "請指定您要匯出哪個資料夾的郵件，以及匯出檔名。"