Update translation files

Updated by Update PO files to match POT (msgmerge) hook in Weblate.

(cherry picked from commit fec0c2e39f1269d50c7c93dc3669989bca7b8295)

61 files changed, 24429 insertions, 26767 deletions

diff --git a/tde-i18n-af/messages/tdepim/kmailcvt.po b/tde-i18n-af/messages/tdepim/kmailcvt.po
index 5f21e2b2acb..7d44fab9713 100644
--- a/tde-i18n-af/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-af/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2002-11-07 11:35+0200\n"
 "Last-Translator: WEB-Translator <http://kde.af.org.za>\n"
 "Language-Team: AFRIKAANS <AF@lia.org.za>\n"
@@ -14,19 +14,78 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: filter_outlook.cxx:28
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "WEB-Vertaler (http://kde.af.org.za)"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "frix@expertron.co.za"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr ""
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: kmailcvt.cpp:34
 #, fuzzy
-msgid "Import Outlook Emails"
+msgid "Step 2: Importing..."
+msgstr "In voer..."
+
+#: kmailcvt.cpp:76
+#, fuzzy
+msgid "Import in progress"
 msgstr "In voer Outlook Express 4"
 
-#: filter_outlook.cxx:30
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr ""
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr ""
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr ""
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr ""
+
+#: main.cpp:36
+msgid "Original author"
+msgstr ""
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr ""
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
@@ -38,31 +97,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Nee gids gekose"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Tel lêers..."
-
-#: filter_outlook.cxx:46
-#, fuzzy
-msgid "Counting mail..."
-msgstr "Tel lêers..."
-
-#: filter_outlook.cxx:47
-#, fuzzy
-msgid "Counting directories..."
-msgstr "Tel lêers..."
-
-#: filter_outlook.cxx:48
-#, fuzzy
-msgid "Counting folders..."
-msgstr "Tel lêers..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-#, fuzzy
-msgid "Importing new mail files..."
-msgstr "Met die invoering van nuwe pos lêers ('.txt')..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -70,6 +104,23 @@ msgstr "Met die invoering van nuwe pos lêers ('.txt')..."
 msgid "No files found for import."
 msgstr ""
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr ""
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#, fuzzy
+msgid "Unable to open %1, skipping"
+msgstr "Nie moontlik na open lêer '%1'"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 #, fuzzy
@@ -86,34 +137,30 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "Kan nie voeg by boodskap na kabinet %1 in Kpos"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-#, fuzzy
-msgid "Unable to open %1, skipping"
-msgstr "Nie moontlik na open lêer '%1'"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr ""
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
 #: filter_kmail_archive.cxx:24
@@ -122,108 +169,24 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-#, fuzzy
-msgid "Import Folders From Pegasus-Mail"
-msgstr "In voer Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Met die invoering van nuwe pos lêers ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Met die invoering van pos gidse ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Met die invoering van 'UNIX' pos gidse ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr ""
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr ""
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr ""
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
-
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "In voer Outlook Express 4"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:64
-#, fuzzy, c-format
-msgid "Importing emails from %1"
-msgstr "Met die invoering van pos gidse ('.pmm')..."
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
@@ -238,167 +201,44 @@ msgstr "Met die invoering van pos gidse ('.pmm')..."
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr ""
-
-#: filter_opera.cxx:28
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid "Import Opera Emails"
-msgstr "In voer Outlook Express 4"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, fuzzy, no-c-format
-msgid "From:"
-msgstr "Van: %1"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Na"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Huidige:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "Importing in progress..."
+msgid "Import Lotus Notes Emails"
 msgstr "In voer Outlook Express 4"
 
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr ""
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr ""
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr ""
-
-#: main.cpp:36
-msgid "Original author"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
 msgstr ""
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
+#: filter_lnotes.cxx:64
+#, fuzzy, c-format
+msgid "Importing emails from %1"
+msgstr "Met die invoering van pos gidse ('.pmm')..."
 
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "WEB-Vertaler (http://kde.af.org.za)"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "frix@expertron.co.za"
-
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
 msgstr ""
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
@@ -408,26 +248,21 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "Kan nie voeg by boodskap na kabinet %1 in Kpos"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
 msgstr ""
 
-#: kmailcvt.cpp:34
-#, fuzzy
-msgid "Step 2: Importing..."
-msgstr "In voer..."
-
-#: kmailcvt.cpp:76
-#, fuzzy
-msgid "Import in progress"
-msgstr "In voer Outlook Express 4"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
 msgstr ""
 
 #: filter_oe.cxx:40
@@ -437,13 +272,11 @@ msgstr "In voer Outlook Express 4"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
@@ -483,25 +316,160 @@ msgstr ""
 msgid "Importing OE5+ Folder file %1"
 msgstr "Met die invoering van pos gidse ('.pmm')..."
 
+#: filter_opera.cxx:28
+#, fuzzy
+msgid "Import Opera Emails"
+msgstr "In voer Outlook Express 4"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Tel lêers..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#, fuzzy
+msgid "Importing new mail files..."
+msgstr "Met die invoering van nuwe pos lêers ('.txt')..."
+
+#: filter_outlook.cxx:28
+#, fuzzy
+msgid "Import Outlook Emails"
+msgstr "In voer Outlook Express 4"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+
+#: filter_outlook.cxx:46
+#, fuzzy
+msgid "Counting mail..."
+msgstr "Tel lêers..."
+
+#: filter_outlook.cxx:47
+#, fuzzy
+msgid "Counting directories..."
+msgstr "Tel lêers..."
+
+#: filter_outlook.cxx:48
+#, fuzzy
+msgid "Counting folders..."
+msgstr "Tel lêers..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "In voer Eenvoudig Teks Epos adresse"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+
+#: filter_pmail.cxx:31
+#, fuzzy
+msgid "Import Folders From Pegasus-Mail"
+msgstr "In voer Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Met die invoering van nuwe pos lêers ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Met die invoering van pos gidse ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Met die invoering van 'UNIX' pos gidse ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr ""
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 #, fuzzy
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "Fatale: Nie moontlik na begin Kpos vir Dcop kommunikasie.\n"
 "       Maak seker 'Kpos' is in jou gids soeklys."
@@ -518,49 +486,54 @@ msgstr "Kan nie voeg by boodskap na kabinet %1 in Kpos"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fout terwyl bygesit boodskap na kabinet %1 in Kpos"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "In voer Eenvoudig Teks Epos adresse"
+#: kimportpagedlg.ui:91
+#, fuzzy, no-c-format
+msgid "From:"
+msgstr "Van: %1"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
+#: kimportpagedlg.ui:99
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Na"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr ""
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Huidige:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, fuzzy, no-c-format
+msgid "Importing in progress..."
+msgstr "In voer Outlook Express 4"
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
 msgstr ""
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
 msgstr ""
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
 
 #, fuzzy
@@ -599,14 +572,16 @@ msgstr ""
 #~ "\n"
 #~ "Hierdie in voer filter sal soektog vir gidse (die '.mbx' lêers).\n"
 #~ "\n"
-#~ "Nota: Jy sal nie wees in staat na ongedaan maak na jou oorspronklike kabinet\n"
+#~ "Nota: Jy sal nie wees in staat na ongedaan maak na jou oorspronklike "
+#~ "kabinet\n"
 #~ "struktuur, slegs die gidse hulleself word ingevoer. Maar Jy sal\n"
 #~ "waarskynlik slegs doen Hierdie een tyd.\n"
 #~ "\n"
 #~ "Nota: Kmailcvt neem die selfde kabinet name as die Outlook Express\n"
 #~ "kabinet name, Maar voorvoeg hulle met 'oe4-'. As Hierdie veroorsaak\n"
 #~ "probleme vir Jy (Jy het Kpos gidse begin met 'oe4-'),\n"
-#~ "kanseleer Hierdie in voer funksie (die volgende dialoog sal toelaat Jy na doen\n"
+#~ "kanseleer Hierdie in voer funksie (die volgende dialoog sal toelaat Jy na "
+#~ "doen\n"
 #~ "wat) en herbenaam die bestaande Kpos gidse."
 
 #~ msgid "No '.mbx' folders found!"
@@ -658,14 +633,16 @@ msgstr ""
 #~ "\n"
 #~ "Hierdie in voer filter sal soektog vir gidse (die '.mbx' lêers).\n"
 #~ "\n"
-#~ "Nota: Jy sal nie wees in staat na ongedaan maak na jou oorspronklike kabinet\n"
+#~ "Nota: Jy sal nie wees in staat na ongedaan maak na jou oorspronklike "
+#~ "kabinet\n"
 #~ "struktuur, slegs die gidse hulleself word ingevoer. Maar Jy sal\n"
 #~ "waarskynlik slegs doen Hierdie een tyd.\n"
 #~ "\n"
 #~ "Nota: Kmailcvt neem die selfde kabinet name as die Outlook Express\n"
 #~ "kabinet name, Maar voorvoeg hulle met 'OE5-'. As Hierdie veroorsaak\n"
 #~ "probleme vir Jy (Jy het Kpos gidse begin met 'OE5-'),\n"
-#~ "kanseleer Hierdie in voer funksie (die volgende dialoog sal toelaat Jy na doen\n"
+#~ "kanseleer Hierdie in voer funksie (die volgende dialoog sal toelaat Jy na "
+#~ "doen\n"
 #~ "wat) en herbenaam die bestaande Kpos gidse."
 
 #~ msgid "Searching for Outlook Express 5 '.dbx' folders in directory %1"
@@ -738,8 +715,10 @@ msgstr ""
 #~ "formate. As Jy wil hê na bydrae te lewer, asseblief kontak my.\n"
 #~ "Vertalings word welkom te!"
 
-#~ msgid "A little tool to convert mail boxes and address books to KMail format"
-#~ msgstr "'n klein program na skakel om pos bokse en adres boeke na Kpos formaat"
+#~ msgid ""
+#~ "A little tool to convert mail boxes and address books to KMail format"
+#~ msgstr ""
+#~ "'n klein program na skakel om pos bokse en adres boeke na Kpos formaat"
 
 #~ msgid "Kmailcvt2"
 #~ msgstr "Kmailcvt2"
@@ -845,7 +824,8 @@ msgstr ""
 #~ "\n"
 #~ "Nota: Kmailcvt skep gidse met die voorvoegsel 'pmail-'.\n"
 #~ "As Hierdie veroorsaak probleme vir jy (jy het Kpos gidse\n"
-#~ "met wat voorvoegsel), kanseleer Hierdie in voer funksie (die volgende dialoog\n"
+#~ "met wat voorvoegsel), kanseleer Hierdie in voer funksie (die volgende "
+#~ "dialoog\n"
 #~ "sal toelaat jy na doen wat) en herbenaam die bestaande Kpos\n"
 #~ "gidse."
 
@@ -858,5 +838,7 @@ msgstr ""
 #~ msgid "Importing new mail files ('.msg')..."
 #~ msgstr "Met die invoering van nuwe pos lêers ('.msg')..."
 
-#~ msgid "FATAL: Unable to open for reading the TEMP file that was just created"
-#~ msgstr "Fatale: Nie moontlik na open vir lees die Temp lêer wat was net geskep"
+#~ msgid ""
+#~ "FATAL: Unable to open for reading the TEMP file that was just created"
+#~ msgstr ""
+#~ "Fatale: Nie moontlik na open vir lees die Temp lêer wat was net geskep"
diff --git a/tde-i18n-ar/messages/tdepim/kmailcvt.po b/tde-i18n-ar/messages/tdepim/kmailcvt.po
index 14b1a42d856..f7dc70af334 100644
--- a/tde-i18n-ar/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ar/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-12-30 03:18+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -13,77 +13,64 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
 msgstr ""
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
-msgid "No directory selected."
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
 msgstr ""
 
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
 msgstr ""
 
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
+#: kmailcvt.cpp:76
+msgid "Import in progress"
 msgstr ""
 
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
+#: kmailcvt.cpp:79
+msgid "Import finished"
 msgstr ""
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
 msgstr ""
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
-msgid "No files found for import."
+#: main.cpp:33
+msgid "KMailCVT"
 msgstr ""
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
-msgid "Importing emails from %1..."
+#: main.cpp:34
+msgid "KMail Import Filters"
 msgstr ""
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
-#, c-format
-msgid ""
-"_n: 1 duplicate message not imported\n"
-"%n duplicate messages not imported"
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
+#: main.cpp:36
+msgid "Original author"
+msgstr ""
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
 msgstr ""
 
 #: filter_evolution.cxx:31
@@ -92,11 +79,25 @@ msgstr ""
 
 #: filter_evolution.cxx:33
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
+msgstr ""
+
+#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
+#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
+#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
+#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
+#: filter_thunderbird.cxx:65
+msgid "No directory selected."
+msgstr ""
+
+#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
+#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
+#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
+#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+msgid "No files found for import."
 msgstr ""
 
 #: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
@@ -107,64 +108,90 @@ msgstr ""
 msgid "Finished importing emails from %1"
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
-msgid "Import KMail Archive File"
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
+#: filter_opera.cxx:89 filter_outlook.cxx:57
+msgid "Importing emails from %1..."
+msgstr ""
+
+#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
+#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
+#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
+#: filter_thunderbird.cxx:101
+#, c-format
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"_n: 1 duplicate message not imported\n"
+"%n duplicate messages not imported"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_pmail.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
+#: filter_kmail_archive.cxx:26
+msgid ""
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
+#: filter_kmail_maildir.cxx:28
+msgid ""
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+msgid "Import folder %1..."
 msgstr ""
 
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
+#, c-format
+msgid "Could not import %1"
 msgstr ""
 
 #: filter_lnotes.cxx:30
@@ -173,14 +200,13 @@ msgstr ""
 
 #: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 
 #: filter_lnotes.cxx:55
@@ -192,296 +218,238 @@ msgstr ""
 msgid "Importing emails from %1"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr ""
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+#: filter_mailapp.cxx:32
+msgid "Import From OS X Mail"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-msgid "Import folder %1..."
+#: filter_mailapp.cxx:34
+msgid ""
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
-#, c-format
-msgid "Could not import %1"
+#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+msgid ""
+"_n: 1 duplicate message not imported to folder %1 in KMail\n"
+"%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_mbox.cxx:30
 msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
 msgstr ""
 
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
+#: filter_oe.cxx:40
+msgid "Import Outlook Express Emails"
 msgstr ""
 
-#: filter_opera.cxx:30
+#: filter_oe.cxx:42
 msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
+"your local folder.</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
+#: filter_oe.cxx:67
+#, c-format
+msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
+#: filter_oe.cxx:82
+msgid "Import folder structure..."
 msgstr ""
 
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
+#: filter_oe.cxx:101
+msgid "Finished importing Outlook Express emails"
 msgstr ""
 
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
+#: filter_oe.cxx:119
+#, c-format
+msgid "Unable to open mailbox %1"
 msgstr ""
 
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
+#: filter_oe.cxx:130
+#, c-format
+msgid "Importing OE4 Mailbox %1"
 msgstr ""
 
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
+#: filter_oe.cxx:144
+#, c-format
+msgid "Importing OE5+ Mailbox %1"
 msgstr ""
 
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
+#: filter_oe.cxx:150
+#, c-format
+msgid "Importing OE5+ Folder file %1"
 msgstr ""
 
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
 msgstr ""
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_opera.cxx:30
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
 
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
 msgstr ""
 
-#: main.cpp:33
-msgid "KMailCVT"
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
 msgstr ""
 
-#: main.cpp:34
-msgid "KMail Import Filters"
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
 msgstr ""
 
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
 
-#: main.cpp:36
-msgid "Original author"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
 msgstr ""
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
 msgstr ""
 
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
 msgstr ""
 
-#: _translatorinfo.cpp:3
+#: filter_plain.cxx:29
 msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 
-#: filter_mailapp.cxx:32
-msgid "Import From OS X Mail"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
 msgstr ""
 
-#: filter_mailapp.cxx:34
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_pmail.cxx:69
 msgid ""
-"_n: 1 duplicate message not imported to folder %1 in KMail\n"
-"%n duplicate messages not imported to folder %1 in KMail"
-msgstr ""
-
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
 msgstr ""
 
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr ""
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr ""
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
 msgstr ""
 
-#: filter_oe.cxx:40
-msgid "Import Outlook Express Emails"
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
 msgstr ""
 
-#: filter_oe.cxx:42
-msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
-"your local folder.</p>"
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr ""
 
-#: filter_oe.cxx:67
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
 #, c-format
-msgid "No Outlook Express mailboxes found in directory %1."
-msgstr ""
-
-#: filter_oe.cxx:82
-msgid "Import folder structure..."
+msgid "Importing %1"
 msgstr ""
 
-#: filter_oe.cxx:101
-msgid "Finished importing Outlook Express emails"
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
 msgstr ""
 
-#: filter_oe.cxx:119
-#, c-format
-msgid "Unable to open mailbox %1"
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_oe.cxx:130
-#, c-format
-msgid "Importing OE4 Mailbox %1"
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 msgstr ""
 
-#: filter_oe.cxx:144
-#, c-format
-msgid "Importing OE5+ Mailbox %1"
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
 msgstr ""
 
-#: filter_oe.cxx:150
-#, c-format
-msgid "Importing OE5+ Folder file %1"
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
 msgstr ""
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_thunderbird.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 
 #: filters.cxx:153 filters.cxx:188
@@ -496,47 +464,52 @@ msgstr ""
 msgid "Error while adding message to folder %1 in KMail"
 msgstr ""
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
 msgstr ""
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
 msgstr ""
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
 msgstr ""
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
 msgstr ""
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
 msgstr ""
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
diff --git a/tde-i18n-az/messages/tdepim/kmailcvt.po b/tde-i18n-az/messages/tdepim/kmailcvt.po
index 6f0ace7e17d..ed002395005 100644
--- a/tde-i18n-az/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-az/messages/tdepim/kmailcvt.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2004-03-18 00:19+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -13,77 +13,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr ""
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Mətin Əmirov"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "metin@karegen.com"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
-msgid "No directory selected."
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
 msgstr ""
 
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
+#: kmailcvt.cpp:76
+msgid "Import in progress"
 msgstr ""
 
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
+#: kmailcvt.cpp:79
+msgid "Import finished"
 msgstr ""
 
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
 msgstr ""
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
+#: main.cpp:33
+msgid "KMailCVT"
 msgstr ""
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
-msgid "No files found for import."
+#: main.cpp:34
+msgid "KMail Import Filters"
 msgstr ""
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
-msgid "Importing emails from %1..."
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
 msgstr ""
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
-#, c-format
-msgid ""
-"_n: 1 duplicate message not imported\n"
-"%n duplicate messages not imported"
+#: main.cpp:36
+msgid "Original author"
+msgstr "Əsl müəllif"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
 msgstr ""
 
 #: filter_evolution.cxx:31
@@ -92,11 +79,25 @@ msgstr ""
 
 #: filter_evolution.cxx:33
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
+msgstr ""
+
+#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
+#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
+#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
+#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
+#: filter_thunderbird.cxx:65
+msgid "No directory selected."
+msgstr ""
+
+#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
+#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
+#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
+#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+msgid "No files found for import."
 msgstr ""
 
 #: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
@@ -107,64 +108,90 @@ msgstr ""
 msgid "Finished importing emails from %1"
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
-msgid "Import KMail Archive File"
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
+#: filter_opera.cxx:89 filter_outlook.cxx:57
+msgid "Importing emails from %1..."
+msgstr ""
+
+#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
+#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
+#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
+#: filter_thunderbird.cxx:101
+#, c-format
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"_n: 1 duplicate message not imported\n"
+"%n duplicate messages not imported"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_pmail.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
+#: filter_kmail_archive.cxx:26
+msgid ""
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
+#: filter_kmail_maildir.cxx:28
+msgid ""
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+msgid "Import folder %1..."
 msgstr ""
 
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
+#, c-format
+msgid "Could not import %1"
 msgstr ""
 
 #: filter_lnotes.cxx:30
@@ -173,14 +200,13 @@ msgstr ""
 
 #: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 
 #: filter_lnotes.cxx:55
@@ -192,276 +218,191 @@ msgstr ""
 msgid "Importing emails from %1"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr ""
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+#: filter_mailapp.cxx:32
+msgid "Import From OS X Mail"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-msgid "Import folder %1..."
+#: filter_mailapp.cxx:34
+msgid ""
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
-#, c-format
-msgid "Could not import %1"
+#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+msgid ""
+"_n: 1 duplicate message not imported to folder %1 in KMail\n"
+"%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_mbox.cxx:30
 msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
 msgstr ""
 
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
+#: filter_oe.cxx:40
+msgid "Import Outlook Express Emails"
 msgstr ""
 
-#: filter_opera.cxx:30
+#: filter_oe.cxx:42
 msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
+"your local folder.</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
+#: filter_oe.cxx:67
+#, c-format
+msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Göndərən:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Alıcı:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Hazırkı:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
+#: filter_oe.cxx:82
+msgid "Import folder structure..."
 msgstr ""
 
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Toplam:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
+#: filter_oe.cxx:101
+msgid "Finished importing Outlook Express emails"
 msgstr ""
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+#: filter_oe.cxx:119
+#, c-format
+msgid "Unable to open mailbox %1"
 msgstr ""
 
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
+#: filter_oe.cxx:130
+#, c-format
+msgid "Importing OE4 Mailbox %1"
 msgstr ""
 
-#: main.cpp:33
-msgid "KMailCVT"
+#: filter_oe.cxx:144
+#, c-format
+msgid "Importing OE5+ Mailbox %1"
 msgstr ""
 
-#: main.cpp:34
-msgid "KMail Import Filters"
+#: filter_oe.cxx:150
+#, c-format
+msgid "Importing OE5+ Folder file %1"
 msgstr ""
 
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
 msgstr ""
 
-#: main.cpp:36
-msgid "Original author"
-msgstr "Əsl müəllif"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
 
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Mətin Əmirov"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "metin@karegen.com"
-
-#: filter_mailapp.cxx:32
-msgid "Import From OS X Mail"
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
 msgstr ""
 
-#: filter_mailapp.cxx:34
-msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_outlook.cxx:30
 msgid ""
-"_n: 1 duplicate message not imported to folder %1 in KMail\n"
-"%n duplicate messages not imported to folder %1 in KMail"
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
 msgstr ""
 
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
 msgstr ""
 
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
 msgstr ""
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
 msgstr ""
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 
-#: filter_oe.cxx:40
-msgid "Import Outlook Express Emails"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
 msgstr ""
 
-#: filter_oe.cxx:42
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
-"your local folder.</p>"
-msgstr ""
-
-#: filter_oe.cxx:67
-#, c-format
-msgid "No Outlook Express mailboxes found in directory %1."
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
 
-#: filter_oe.cxx:82
-msgid "Import folder structure..."
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
 msgstr ""
 
-#: filter_oe.cxx:101
-msgid "Finished importing Outlook Express emails"
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
 msgstr ""
 
-#: filter_oe.cxx:119
-#, c-format
-msgid "Unable to open mailbox %1"
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
 msgstr ""
 
-#: filter_oe.cxx:130
-#, c-format
-msgid "Importing OE4 Mailbox %1"
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr ""
 
-#: filter_oe.cxx:144
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
 #, c-format
-msgid "Importing OE5+ Mailbox %1"
+msgid "Importing %1"
 msgstr ""
 
-#: filter_oe.cxx:150
-#, c-format
-msgid "Importing OE5+ Folder file %1"
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
 msgstr ""
 
 #: filter_sylpheed.cxx:27
@@ -470,18 +411,45 @@ msgstr ""
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 
 #: filters.cxx:153 filters.cxx:188
@@ -496,47 +464,52 @@ msgstr ""
 msgid "Error while adding message to folder %1 in KMail"
 msgstr ""
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr ""
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Göndərən:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Alıcı:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr ""
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Hazırkı:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
 msgstr ""
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr ""
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Toplam:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
diff --git a/tde-i18n-bg/messages/tdepim/kmailcvt.po b/tde-i18n-bg/messages/tdepim/kmailcvt.po
index 0dedd4747b3..e8628052ed7 100644
--- a/tde-i18n-bg/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-bg/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-10-06 20:05+0000\n"
 "Last-Translator: Zlatko Popov <zlatkopopov@fsa-bg.org>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -18,26 +18,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Импортиране на писмата от Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Радостин Раднев"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "radnev@yahoo.com"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Инструмент за импортиране KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "1: Изберете филтър"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "2: Импортиране..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Импортиране"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Импортирането завърши"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Автор %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Филтри за импортиране в KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, екипът на KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Original author"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Maintainer & New filters"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "New GUI & cleanups"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Импортиране на писмата и структурата на папките от Evolution 1.x"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Филтър за импортиране на Outlook</b></p>"
-"<p>Трябва да зададете директорията, в която се намират файловете с данни с "
-"разширение pst. Трябва да зададете директорията, в която се намират тези "
-"файлове (обикновено <i>C:\\Documents and Settings</i> "
-"за Windows 2000 или по-нови версии).</p>"
-"<p><b>Забележка:</b> писмата ще бъдат импортирани в папка с името на файла, от "
-"който идват, и ще имат представка \"OUTLOOK-\".</p>"
+"<p><b>Филтър за импортиране от Evolution 1.x</b></p><p>Изберете базовата "
+"директория на Evolution 1.x (обикновено ~/evolution/local).</"
+"p><p>Структурата на папките може да се пресъздаде и тя ще бъде записана в "
+"папката \"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -47,27 +102,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Не е избрана директория."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Преброяване на файловете..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Преброяване на писмата..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Преброяване на директориите..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Преброяване на папките..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Импортиране на нови пощенски файлове..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -75,6 +109,22 @@ msgstr "Импортиране на нови пощенски файлове..."
 msgid "No files found for import."
 msgstr "Не са намерени файлове за импортиране."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Импортирането на писмата от %1 завърши"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Невъзможно отваряне на %1, игнориране"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -92,39 +142,37 @@ msgstr ""
 "1 дублирано съобщение не бе добавено\n"
 "%n дублирани съобщения не бяха добавени"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Невъзможно отваряне на %1, игнориране"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Импортиране на писмата и структурата на папките от Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Импортиране на писмата и структурата на папките от Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Филтър за импортиране от Evolution 1.x</b></p>"
-"<p>Изберете базовата директория на Evolution 1.x (обикновено "
-"~/evolution/local).</p>"
-"<p>Структурата на папките може да се пресъздаде и тя ще бъде записана в папката "
-"\"Evolution-Import\".</p>"
+"<p><b>Филтър за импортиране от Evolution 2.x</b></p><p>Изберете базовата "
+"директория, където се намират писмата на Evolution (обикновено ~/.evolution/"
+"mail/local/).</p><p><b>Забележа:</b> Никога не избирайте папка, която не е "
+"във формат mbox-files. Ако го направите въпреки това, ще получите много нови "
+"папки.</p><p>Структурата на папките може да се пресъздаде и тя ще бъде "
+"записана в папката \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Импортирането на писмата от %1 завърши"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Импортирането е прекъснато от потребителя."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Начало на импортирането на файла %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -132,130 +180,31 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Импортирането на папките от Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p><b>Филтър за импортиране от Pegasus-Mail</b></p>"
-"<p>Изберете базовата директория на Pegasus-Mail, която съдържа файлове CNM, PMM "
-"и MBX. Обикновено това е C:\\PMail\\mail</p>"
-"<p>Структурата на папките може да се пресъздаде и тя ще бъде записана в папката "
-"\"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Грешка при анализа структурата на папките. Импортирането ще бъде продължено без "
-"подпапките."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Импортиране на файловете за нова е-поща (.cnm)..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Импортирането на папките (.pmm)..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Импортирането на папките на UNIX (.mbx)..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Импортиране на %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Съобщение %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Анализ на структурата на папките..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Автор %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Импортиране на писмата от Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Филтър за импортиране на файлове структурни файлове на Lotus Notes</b></p>"
-"<p>Филтърът ще импортира структурни текстови файлове, които са експортирани "
-"преди това от Lotus Notes в KMail. Използвайте филтъра, ако искате да "
-"импортирате писма от Lotus Notes или от други програми, които използват същия "
-"формат.</p>"
-"<p><b>Забележка:</b> след като е невъзможно да се пресъздаде структурата на "
-"папките, писмата ще бъдат импортирани в подпапки с името на файла, от който "
-"идват, и ще бъдат записани във папката \"LNotes-Import\" във вашата локална "
-"папка.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Всички файлове (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Импортиране на писмата от %1"
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Импортиране на писмата и структурата на папките от KMail"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Филтър за импортиране от KMail</b></p>"
-"<p>Изберете базовата директория, където се намират писмата на \"KMail\".</p>"
-"<p><b>Забележа:</b> Никога не избирайте вашата локална директория, която "
-"ползвате в момента. Ако я изберете това може да доведе до безкраен цикъл.</p> "
-"<p>Филтърът не поддържа файлове mbox.</p>"
-"<p>Структурата на папките може да се пресъздаде и тя ще бъде записана в папката "
-"\"KMail-Import\".</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Импортирането е прекъснато от потребителя."
+"<p><b>Филтър за импортиране от KMail</b></p><p>Изберете базовата директория, "
+"където се намират писмата на \"KMail\".</p><p><b>Забележа:</b> Никога не "
+"избирайте вашата локална директория, която ползвате в момента. Ако я "
+"изберете това може да доведе до безкраен цикъл.</p> <p>Филтърът не поддържа "
+"файлове mbox.</p><p>Структурата на папките може да се пресъздаде и тя ще "
+"бъде записана в папката \"KMail-Import\".</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -268,187 +217,42 @@ msgstr "Импортиране на папка %1..."
 msgid "Could not import %1"
 msgstr "Грешка при импортиране от %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Импортиране на писмата и структурата на папките от Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Филтър за импортиране от Thunderbird/Mozilla</b></p>"
-"<p>Изберете базовата директория на е-пощата на Thunderbird/Mozilla (обикновено "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Забележа:</b> Никога не избирайте папка, която не е във формат "
-"mbox-files. Ако го направите ще получите много нови папки.</p>"
-"<p>Структурата на папките може да се пресъздаде и тя ще бъде записана в папката "
-"\"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Начало на импортирането на файла %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Импортиране на писмата от Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Филтър за импортиране от Opera</b></p>"
-"<p>Филтърът ще импортира е-пощата от Opera. </p>"
-"<p>Изберете директория, в която се намират писмата (обикновено "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Забележка:</b> Писмата ще бъдат импортирани в папка с името на сметката "
-"от която идват и с представка \"OPERA-\".</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Импортиране на писмата и структурата на папките от Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Филтър за импортиране от Evolution 2.x</b></p>"
-"<p>Изберете базовата директория, където се намират писмата на Evolution "
-"(обикновено ~/.evolution/mail/local/).</p>"
-"<p><b>Забележа:</b> Никога не избирайте папка, която не е във формат "
-"mbox-files. Ако го направите въпреки това, ще получите много нови папки.</p>"
-"<p>Структурата на папките може да се пресъздаде и тя ще бъде записана в папката "
-"\"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "От:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "До:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Текущо:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Импортиране..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Общо:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Моля, щракнете бутона \"Назад\", за да импортирате още писма или контакти"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Импортиране на писмата от Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Добре дошли в KMailCVT - инструмент за импортиране в KMail</b>"
-"<br>"
-"<br>Програмата ще ви помогне да импортирате писмата си от пощенския клиент, "
-"който сте използвали преди в KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>Моля, изберете от коя програма искате да бъдат импортирани данни и "
-"натиснете бутона \"Напред\"."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Премахване на &дублираните съобщения при импортиране"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
+"<p><b>Филтър за импортиране на файлове структурни файлове на Lotus Notes</"
+"b></p><p>Филтърът ще импортира структурни текстови файлове, които са "
+"експортирани преди това от Lotus Notes в KMail. Използвайте филтъра, ако "
+"искате да импортирате писма от Lotus Notes или от други програми, които "
+"използват същия формат.</p><p><b>Забележка:</b> след като е невъзможно да се "
+"пресъздаде структурата на папките, писмата ще бъдат импортирани в подпапки с "
+"името на файла, от който идват, и ще бъдат записани във папката \"LNotes-"
+"Import\" във вашата локална папка.</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Филтри за импортиране в KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, екипът на KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Original author"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Maintainer & New filters"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "New GUI & cleanups"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Всички файлове (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Радостин Раднев"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Импортиране на писмата от %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "radnev@yahoo.com"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Съобщение %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -456,11 +260,11 @@ msgstr "Импортиране на папките от OS X Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Импортиране на папките от OS X Mail</b></p>"
-"<p>Импортиране на папките с писма от пощенския клиент на Apple Mac OS X.</p>"
+"<p><b>Импортиране на папките от OS X Mail</b></p><p>Импортиране на папките с "
+"писма от пощенския клиент на Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -470,25 +274,27 @@ msgstr ""
 "1 дублирано съобщение не бе добавено в папката %1 на KMail\n"
 "%n дублирани съобщения не бяха добавени в папката %1 на KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Инструмент за импортиране KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "1: Изберете филтър"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "2: Импортиране..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Импортиране на файлове mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Импортиране"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Филтър за импортиране на файлове mbox</b></p><p>Филтърът ще импортира "
+"файловете mbox в KMail. Използвайте филтъра, ако искате да импортирате писма "
+"от Ximian Evolution или от други програми, които използват традиционния "
+"формат на UNIX.</p><p><b>Забележка:</b> писмата ще бъдат импортирани в папка "
+"с името на файла от който идват и ще имат представка \"MBOX-\".</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Импортирането завърши"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Файлове mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -496,25 +302,21 @@ msgstr "Импортиране на писмата от Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Филтър за импортиране на Outlook Express версии 4/5/6</b></p>"
-"<p>Трябва да зададете директорията, в която се намират файловете с данни. За "
-"целта търсете файлове разширение \".dbx\" или \".mbx\" в следните директории:"
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> за Windows 9x</li>"
-"<li><i>Documents and Settings</i> за Windows 2000 или по-нови версии</li></ul>"
-"</p>"
-"<p>Структурата на папките може да се пресъздаде и тя ще бъде записана в папката "
-"\"OE-Import\".</p>"
+"<p><b>Филтър за импортиране на Outlook Express версии 4/5/6</b></p><p>Трябва "
+"да зададете директорията, в която се намират файловете с данни. За целта "
+"търсете файлове разширение \".dbx\" или \".mbx\" в следните директории:"
+"<ul><li><i>C:\\Windows\\Application Data</i> за Windows 9x</"
+"li><li><i>Documents and Settings</i> за Windows 2000 или по-нови версии</"
+"li></ul></p><p>Структурата на папките може да се пресъздаде и тя ще бъде "
+"записана в папката \"OE-Import\".</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -549,30 +351,190 @@ msgstr "Импортиране на пощенска кутия %1 на OE5+"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Импортиране на файл с папки %1 на OE5+"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Импортиране на писмата от Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Филтър за импортиране от Opera</b></p><p>Филтърът ще импортира е-"
+"пощата от Opera. </p><p>Изберете директория, в която се намират писмата "
+"(обикновено ~/.opera/mail/store/account*).</p><p><b>Забележка:</b> Писмата "
+"ще бъдат импортирани в папка с името на сметката от която идват и с "
+"представка \"OPERA-\".</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Преброяване на файловете..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Импортиране на нови пощенски файлове..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Импортиране на писмата от Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Филтър за импортиране на Outlook</b></p><p>Трябва да зададете "
+"директорията, в която се намират файловете с данни с разширение pst. Трябва "
+"да зададете директорията, в която се намират тези файлове (обикновено <i>C:"
+"\\Documents and Settings</i> за Windows 2000 или по-нови версии).</"
+"p><p><b>Забележка:</b> писмата ще бъдат импортирани в папка с името на "
+"файла, от който идват, и ще имат представка \"OUTLOOK-\".</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Преброяване на писмата..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Преброяване на директориите..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Преброяване на папките..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Импортиране на писма в текстов формат"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Изберете директорията, която съдържа писмата.</p><p>Филтърът ще импортира "
+"всички файлове с разширения \".msg\", \".eml\" и \".txt\".</"
+"p><p><b>Забележка:</b> писмата ще бъдат импортирани в папка с името на "
+"директорията, от която идват и ще имат представка \"PLAIN-\".</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Импортирането на папките от Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p><b>Филтър за импортиране от Pegasus-Mail</b></p><p>Изберете базовата "
+"директория на Pegasus-Mail, която съдържа файлове CNM, PMM и MBX. Обикновено "
+"това е C:\\PMail\\mail</p><p>Структурата на папките може да се пресъздаде и "
+"тя ще бъде записана в папката \"PegasusMail-Import\".</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Грешка при анализа структурата на папките. Импортирането ще бъде продължено "
+"без подпапките."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Импортиране на файловете за нова е-поща (.cnm)..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Импортирането на папките (.pmm)..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Импортирането на папките на UNIX (.mbx)..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Импортиране на %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Анализ на структурата на папките..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Импортиране на писмата и структурата на папките от Sylpheed"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 msgstr ""
-"<p><b>Филтър за импортиране от Sylpheed</b></p>"
-"<p>Изберете базовата директория на Sylpheed (обикновено ~/Mail).</p>"
-"<p>Структурата на папките може да се пресъздаде и тя ще бъде записана в папката "
-"\"Sylpheed-Import\".</p>"
-"<p>Също така, филтърът импортира и състоянието на съобщенията - ново, "
+"<p><b>Филтър за импортиране от Sylpheed</b></p><p>Изберете базовата "
+"директория на Sylpheed (обикновено ~/Mail).</p><p>Структурата на папките "
+"може да се пресъздаде и тя ще бъде записана в папката \"Sylpheed-Import\".</"
+"p><p>Също така, филтърът импортира и състоянието на съобщенията - ново, "
 "препратено, отговорено и пр.</p>"
 
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Импортиране на писмата и структурата на папките от Bat"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Филтър за импортиране от Bat</b></p><p>Изберете базовата директория, "
+"където се намират писмата на \"The Bat!\".</p><p><b>Забележа:</b> Филтърът "
+"импортира писмата от специалните файлове *.tbb от локалната директория на "
+"\"The Bat!\". Т.е. само от сметки POP3, IMAP/DIMAP не се поддържат за "
+"момента.</p><p>Структурата на папките може да се пресъздаде и тя ще бъде "
+"записана в папката \"TheBat-Import\".</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Импортиране на писмата и структурата на папките от Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Филтър за импортиране от Thunderbird/Mozilla</b></p><p>Изберете "
+"базовата директория на е-пощата на Thunderbird/Mozilla (обикновено ~/."
+"thunderbird/*.default/Mail/Local Folders/).</p><p><b>Забележа:</b> Никога не "
+"избирайте папка, която не е във формат mbox-files. Ако го направите ще "
+"получите много нови папки.</p><p>Структурата на папките може да се "
+"пресъздаде и тя ще бъде записана в папката \"Thunderbird-Import\".</p>"
+
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Фатална грешка:</b> Програмата KMail не може да бъде стартирана за "
 "комуникация с DCOP. Моля, проверете дали програмата е инсталирана."
@@ -589,65 +551,57 @@ msgstr "Добавянето на съобщения в папката %1 в KMa
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Грешка при добавяне на съобщение в папката %1 в KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Импортиране на писма в текстов формат"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "От:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Изберете директорията, която съдържа писмата.</p>"
-"<p>Филтърът ще импортира всички файлове с разширения \".msg\", \".eml\" и "
-"\".txt\".</p>"
-"<p><b>Забележка:</b> писмата ще бъдат импортирани в папка с името на "
-"директорията, от която идват и ще имат представка \"PLAIN-\".</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "До:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Импортиране на файлове mbox (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Текущо:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Филтър за импортиране на файлове mbox</b></p>"
-"<p>Филтърът ще импортира файловете mbox в KMail. Използвайте филтъра, ако "
-"искате да импортирате писма от Ximian Evolution или от други програми, които "
-"използват традиционния формат на UNIX.</p>"
-"<p><b>Забележка:</b> писмата ще бъдат импортирани в папка с името на файла от "
-"който идват и ще имат представка \"MBOX-\".</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Импортиране..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Файлове mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Импортиране на писмата и структурата на папките от Bat"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Общо:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Моля, щракнете бутона \"Назад\", за да импортирате още писма или контакти"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Филтър за импортиране от Bat</b></p>"
-"<p>Изберете базовата директория, където се намират писмата на \"The Bat!\".</p>"
-"<p><b>Забележа:</b> Филтърът импортира писмата от специалните файлове *.tbb от "
-"локалната директория на \"The Bat!\". Т.е. само от сметки POP3, IMAP/DIMAP не "
-"се поддържат за момента.</p>"
-"<p>Структурата на папките може да се пресъздаде и тя ще бъде записана в папката "
-"\"TheBat-Import\".</p>"
+"<b>Добре дошли в KMailCVT - инструмент за импортиране в KMail</"
+"b><br><br>Програмата ще ви помогне да импортирате писмата си от пощенския "
+"клиент, който сте използвали преди в KMail.<br><br><br><br>Моля, изберете от "
+"коя програма искате да бъдат импортирани данни и натиснете бутона \"Напред\"."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Премахване на &дублираните съобщения при импортиране"
diff --git a/tde-i18n-br/messages/tdepim/kmailcvt.po b/tde-i18n-br/messages/tdepim/kmailcvt.po
index 6a40843b510..0d2bb6e664b 100644
--- a/tde-i18n-br/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-br/messages/tdepim/kmailcvt.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepim/kmailcvt.po\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2004-09-20 15:44+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Breton <LL@li.org>\n"
@@ -12,18 +12,76 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Enporzh ar posteloù eus Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Thierry Vignaud, Jañ-Mai Drapier"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "tvignaud@mandriva.com, jdrapier@club-internet.fr"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Ostilh enporzh KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Prantad 1 : Dibabit ur sil"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Prantad 2 : Oc'h enporzh ..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "O enporzhañ"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Echu eo an enporzh"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Skrivet gant %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Siloù enporzh KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, Diorroerien KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Oberour kentañ"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Ratreer & siloù nevez"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr ""
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
@@ -34,27 +92,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "N'eus renkell dibabet ebet."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Emaon o niveriñ ar restroù ..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Emaon o niveriñ ar posteloù ..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Emaon o niveriñ ar renkelloù ..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Emaon o niveriñ ar renkelloù ..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Emaon oc'h enporzh ar restroùà..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -62,6 +99,22 @@ msgstr "Emaon oc'h enporzh ar restroùà..."
 msgid "No files found for import."
 msgstr "N'eus restr da enporzh ebet."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr ""
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr ""
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -77,33 +130,30 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:31
+msgid ""
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:33
-msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
 #: filter_kmail_archive.cxx:24
@@ -112,59 +162,36 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_kmail_maildir.cxx:28
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Emaon oc'h enporzh ar restroù ('.cnm')à..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Emaon oc'h enporzh ar renkelloù ('.pmm')à..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr ""
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Emaon oc'h enporzh %1"
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+msgid "Import folder %1..."
+msgstr "Enporzhañ ar renkell %1à..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
 #, c-format
-msgid "Message %1"
-msgstr "Kemennad %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "O lenn skeledenn ar renkellà..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Skrivet gant %1.</i></p>"
+msgid "Could not import %1"
+msgstr "Ne m'eus ket enporzh %1"
 
 #: filter_lnotes.cxx:30
 msgid "Import Lotus Notes Emails"
@@ -172,14 +199,13 @@ msgstr "Enporzh ar posteloù eus Lotus Notes"
 
 #: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 
 #: filter_lnotes.cxx:55
@@ -191,191 +217,10 @@ msgstr "Pep restr (*)"
 msgid "Importing emails from %1"
 msgstr "Emaon oc'h enporzh al lizhiri eus %1"
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr ""
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr ""
-
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-msgid "Import folder %1..."
-msgstr "Enporzhañ ar renkell %1à..."
-
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
-msgid "Could not import %1"
-msgstr "Ne m'eus ket enporzh %1"
-
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr ""
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Enporzh ar posteloù eus Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Digant :"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Da :"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Hini red :"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Emaon oc'h enporzh ..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr " ..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Hollek :"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr ""
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Siloù enporzh KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, Diorroerien KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Oberour kentañ"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Ratreer & siloù nevez"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr ""
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Thierry Vignaud, Jañ-Mai Drapier"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "tvignaud@mandriva.com, jdrapier@club-internet.fr"
+msgid "Message %1"
+msgstr "Kemennad %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -383,8 +228,8 @@ msgstr "Enporzh eus OS X Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
@@ -393,25 +238,22 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Ostilh enporzh KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Prantad 1 : Dibabit ur sil"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Prantad 2 : Oc'h enporzh ..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr ""
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "O enporzhañ"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Echu eo an enporzh"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Restroù mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -419,13 +261,11 @@ msgstr "Enporzh ar posteloù eus Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
@@ -463,24 +303,152 @@ msgstr "Emaon oc'h enporzh ar voest-lizheroù OE5+ %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Emaon oc'h enporzh ar restr renkell OE5+ %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Enporzh ar posteloù eus Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Emaon o niveriñ ar restroù ..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Emaon oc'h enporzh ar restroùà..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Enporzh ar posteloù eus Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Emaon o niveriñ ar posteloù ..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Emaon o niveriñ ar renkelloù ..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Emaon o niveriñ ar renkelloù ..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Enporzhañ ar postelloù skrid leun"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr ""
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Emaon oc'h enporzh ar restroù ('.cnm')à..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Emaon oc'h enporzh ar renkelloù ('.pmm')à..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr ""
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Emaon oc'h enporzh %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "O lenn skeledenn ar renkellà..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 
 #: filters.cxx:153 filters.cxx:188
@@ -495,49 +463,54 @@ msgstr ""
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fazi en ur ouzhpennañ ar c'hemennad d'ar renkell %1 e KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Enporzhañ ar postelloù skrid leun"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Digant :"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Da :"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr ""
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Hini red :"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Emaon oc'h enporzh ..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Restroù mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr " ..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Hollek :"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
 
 #~ msgid "No file found for import."
diff --git a/tde-i18n-bs/messages/tdepim/kmailcvt.po b/tde-i18n-bs/messages/tdepim/kmailcvt.po
index ebcdb2e4202..124425bf1dd 100644
--- a/tde-i18n-bs/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-bs/messages/tdepim/kmailcvt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-03-22 12:50+0100\n"
 "Last-Translator: Amila Akagić <bono@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -21,29 +21,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Uvoz poštu iz Outlook-a"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Amila Akagić"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "bono@linux.org.ba"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT alat za uvoz"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Korak 1: Odaberite filter"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Korak 2: Uvoženje..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Uvoz je u toku"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Uvoz je završen"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Napisao %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail-ovi filteri za uvoz"
+
+#: main.cpp:35
+#, fuzzy
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2003, razvojni tim KMailCVT-a"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Prvobitni autor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Novi GUI i čistke"
+
+#: filter_evolution.cxx:31
 #, fuzzy
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Uvezi poštu i strukturu direktorija iz lokalnog Evolution 2.x"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 filter za uvoz</b></p>"
-"<p>Potrebno je da locirate direktorij u kojem Outlook Express čuva poštansko "
-"sanduče, tako što ćete tražiti datoteke sa imenom .dbx ili .mbx pod "
-"direktorijem "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> za Windows 9x "
-"<li><i>Documents and Settings</i> za Windows 2000 ili noviji</ul></p>"
-"<p><b>Napomena:</b> Poruke će biti uvezene u direktorije sa imenom istim kao "
-"što se zove datoteka iz koje su uvezene, sa prefiksom 'OE-'</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -53,27 +103,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Nije odabran nijedan direktorij."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Brojim datoteke..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Brojim poštu..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Brojim direktorije..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Brojim direktorije..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Uvozim nove poštanske datoteke..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -81,6 +110,22 @@ msgstr "Uvozim nove poštanske datoteke..."
 msgid "No files found for import."
 msgstr "Nisu pronađene datoteke za uvoz."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Uvoz poruka iz %1 je završen"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Ne mogu da otvorim %1, preskačem"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -96,35 +141,31 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "%n dvostrukih datoteka nije uvezeno"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Ne mogu da otvorim %1, preskačem"
-
-#: filter_evolution.cxx:31
-#, fuzzy
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Uvezi poštu i strukturu direktorija iz lokalnog Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Uvoz poruka iz %1 je završen"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr ""
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Počni uvoz datoteke %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -132,100 +173,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Uvoz direktorija iz Pegasus-Mail-a"
-
-#: filter_pmail.cxx:33
-#, fuzzy
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p> Odaberite direktorij Pegasus-Mail-a na vašem sistemu (sadrži CNM, PMM i MBX "
-"datoteke). Na mnogim sistemima je smješten u C:\\PMail\\mail</p>"
-"<p><b>Napomena:</b> Ovaj filter za unos će uvesti vaše direktorije, ali ne i "
-"njihovu strukturu. Ovo ćete vjerotatno raditi samo jednom.</p>"
-"<p><b>Napomena:</b> Poruke će biti uvezene u direktorij sa prefiksom "
-"'pmail-'</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Uvozim nove poštanske datoteke ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Uvozim poštanske direktorije ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Uvozim 'UNIX' poštanske direktorije ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Uvozim %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Poruka %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr ""
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Napisao %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "Uvoz poštu iz Outlook-a"
-
-#: filter_lnotes.cxx:32
-#, fuzzy
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>mbox filter za uvoz</b></p>"
-"<p>Ovaj filter će uvesti mbox datoteke u KMail. Koristite ovaj filter ako "
-"želite da uvezete poštu iz Ximian-ovog Evolution-a ili drugih programa koji "
-"koristire tradicionalni Unix-ov format.</p> "
-"<p><b>Napomena:</b> Poruke će biti uvezene u direktorije sa istim imenom kao "
-"što se zove datoteka iz koga su uvezene sa prefiksom 'MBOX-'</p>"
-
-#: filter_lnotes.cxx:55
-#, fuzzy
-msgid "All Files (*)"
-msgstr "mbox datoteke (*)"
-
-#: filter_lnotes.cxx:64
-#, fuzzy, c-format
-msgid "Importing emails from %1"
-msgstr "Uvozim e-mailove iz %1..."
 
 #: filter_kmail_maildir.cxx:26
 #, fuzzy
@@ -234,21 +185,13 @@ msgstr "Uvezi mailove i strukturu direktorija iz Evolution"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
@@ -263,176 +206,42 @@ msgstr "Počni uvoz datoteke %1..."
 msgid "Could not import %1"
 msgstr "Ne mogu uvesti %1"
 
-#: filter_thunderbird.cxx:28
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Uvezi poštu i strukturu direktorija iz lokalnog Thunderbird-a"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Počni uvoz datoteke %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Uvoz poruka iz Opera pošte"
+msgid "Import Lotus Notes Emails"
+msgstr "Uvoz poštu iz Outlook-a"
 
-#: filter_opera.cxx:30
+#: filter_lnotes.cxx:32
 #, fuzzy
 msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>mbox filter za uvoz</b></p>"
-"<p>Ovaj filter će uvesti mbox datoteke u KMail. Koristite ovaj filter ako "
-"želite da uvezete poštu iz Ximian-ovog Evolution-a ili drugih programa koji "
-"koristire tradicionalni Unix-ov format.</p> "
-"<p><b>Napomena:</b> Poruke će biti uvezene u direktorije sa istim imenom kao "
-"što se zove datoteka iz koga su uvezene sa prefiksom 'MBOX-'</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Uvezi poštu i strukturu direktorija iz lokalnog Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Od:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Za:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Tekući:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "Importing in progress..."
-msgstr "Uvoz je u toku"
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Ukupno:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Kliknite na 'Nazad' da biste uvezli još poruka ili kontakata"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Dobrodošli u KMailCVT ' KMail-ov alat za uvoz</b>\n"
-"<br>"
-"<br>\n"
-"Ovaj program će vam pomoći da uvezete poruke iz vašeg prethodnog programa za "
-"e-mail u KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Izaberite program iz koga želite da uvozite, pa onda kliknite na 'Sljedeći'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, fuzzy, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Ukloni dvostruke poruke prilikom uvoza"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
+"<p><b>mbox filter za uvoz</b></p><p>Ovaj filter će uvesti mbox datoteke u "
+"KMail. Koristite ovaj filter ako želite da uvezete poštu iz Ximian-ovog "
+"Evolution-a ili drugih programa koji koristire tradicionalni Unix-ov format."
+"</p> <p><b>Napomena:</b> Poruke će biti uvezene u direktorije sa istim "
+"imenom kao što se zove datoteka iz koga su uvezene sa prefiksom 'MBOX-'</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail-ovi filteri za uvoz"
-
-#: main.cpp:35
+#: filter_lnotes.cxx:55
 #, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2003, razvojni tim KMailCVT-a"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Prvobitni autor"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Novi GUI i čistke"
+msgid "All Files (*)"
+msgstr "mbox datoteke (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Amila Akagić"
+#: filter_lnotes.cxx:64
+#, fuzzy, c-format
+msgid "Importing emails from %1"
+msgstr "Uvozim e-mailove iz %1..."
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "bono@linux.org.ba"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Poruka %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -440,11 +249,11 @@ msgstr "Uvoz direktorija iz OS X pošte"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Filter za uvoz pošte sa OS X-a</b></p>"
-"<p>Ovaj filter uvozi el. poštu iz poštanskog klijenta sa Apple Mac OS X-a.</p>"
+"<p><b>Filter za uvoz pošte sa OS X-a</b></p><p>Ovaj filter uvozi el. poštu "
+"iz poštanskog klijenta sa Apple Mac OS X-a.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 #, fuzzy
@@ -453,25 +262,27 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n dvostrukih poruka nije uvezeno u direktorij %1 u KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT alat za uvoz"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Korak 1: Odaberite filter"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Korak 2: Uvoženje..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Uvoz mbox datoteka (Unix, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Uvoz je u toku"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox filter za uvoz</b></p><p>Ovaj filter će uvesti mbox datoteke u "
+"KMail. Koristite ovaj filter ako želite da uvezete poštu iz Ximian-ovog "
+"Evolution-a ili drugih programa koji koristire tradicionalni Unix-ov format."
+"</p> <p><b>Napomena:</b> Poruke će biti uvezene u direktorije sa istim "
+"imenom kao što se zove datoteka iz koga su uvezene sa prefiksom 'MBOX-'</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Uvoz je završen"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox datoteke (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -480,25 +291,21 @@ msgstr "Uvoz poruka iz Outlook Express-a"
 #: filter_oe.cxx:42
 #, fuzzy
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 filter za uvoz</b></p>"
-"<p>Potrebno je da locirate direktorij u kojem Outlook Express čuva poštansko "
-"sanduče, tako što ćete tražiti datoteke sa imenom .dbx ili .mbx pod "
-"direktorijem "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> za Windows 9x "
-"<li><i>Documents and Settings</i> za Windows 2000 ili noviji</ul></p>"
-"<p><b>Napomena:</b> Poruke će biti uvezene u direktorije sa imenom istim kao "
-"što se zove datoteka iz koje su uvezene, sa prefiksom 'OE-'</p>"
+"<p><b>Outlook Express 4/5/6 filter za uvoz</b></p><p>Potrebno je da locirate "
+"direktorij u kojem Outlook Express čuva poštansko sanduče, tako što ćete "
+"tražiti datoteke sa imenom .dbx ili .mbx pod direktorijem <ul><li><i>C:"
+"\\Windows\\Application Data</i> za Windows 9x <li><i>Documents and Settings</"
+"i> za Windows 2000 ili noviji</ul></p><p><b>Napomena:</b> Poruke će biti "
+"uvezene u direktorije sa imenom istim kao što se zove datoteka iz koje su "
+"uvezene, sa prefiksom 'OE-'</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -535,40 +342,68 @@ msgstr "Uvozim OE5+ poštansko sanduče %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Ignorišem OE5+ direktorij sa datotekama %1"
 
-#: filter_sylpheed.cxx:27
-#, fuzzy
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "Uvezi mailove i strukturu direktorija iz Evolution"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Uvoz poruka iz Opera pošte"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
+#, fuzzy
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
+"<p><b>mbox filter za uvoz</b></p><p>Ovaj filter će uvesti mbox datoteke u "
+"KMail. Koristite ovaj filter ako želite da uvezete poštu iz Ximian-ovog "
+"Evolution-a ili drugih programa koji koristire tradicionalni Unix-ov format."
+"</p> <p><b>Napomena:</b> Poruke će biti uvezene u direktorije sa istim "
+"imenom kao što se zove datoteka iz koga su uvezene sa prefiksom 'MBOX-'</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Brojim datoteke..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Uvozim nove poštanske datoteke..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Uvoz poštu iz Outlook-a"
+
+#: filter_outlook.cxx:30
+#, fuzzy
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>Fatalna greška:</b> Ne mogu da pokrenem KMail za DCOP komunikaciju. Uvjerite "
-"se da je <i>kmail</i> instaliran."
+"<p><b>Outlook Express 4/5/6 filter za uvoz</b></p><p>Potrebno je da locirate "
+"direktorij u kojem Outlook Express čuva poštansko sanduče, tako što ćete "
+"tražiti datoteke sa imenom .dbx ili .mbx pod direktorijem <ul><li><i>C:"
+"\\Windows\\Application Data</i> za Windows 9x <li><i>Documents and Settings</"
+"i> za Windows 2000 ili noviji</ul></p><p><b>Napomena:</b> Poruke će biti "
+"uvezene u direktorije sa imenom istim kao što se zove datoteka iz koje su "
+"uvezene, sa prefiksom 'OE-'</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "Ne mogu da napravim direktorij %1 u KMail-u"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Brojim poštu..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "Ne mogu da dodam poruku u direktorij %1 u KMail-u"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Brojim direktorije..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Greška prilikom dodavanja poruke u direktorij %1 u KMail-u"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Brojim direktorije..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -577,38 +412,75 @@ msgstr "Uvoz običnih tekstualnih e-mailova"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 "<p> Odaberite direktorij koji sadrži poruke na vašem sistemu. Poruke će biti "
 "smještene u direktorij sa istim imenom kao što je i direktorij u kojem su sa "
-"prefiksom 'PLAIN-'</p>"
-"<p>Ovaj filter će uvesti sve .msg, .eml i .txt poruke.</p>"
+"prefiksom 'PLAIN-'</p><p>Ovaj filter će uvesti sve .msg, .eml i .txt poruke."
+"</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Uvoz mbox datoteka (Unix, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Uvoz direktorija iz Pegasus-Mail-a"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
+#, fuzzy
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>mbox filter za uvoz</b></p>"
-"<p>Ovaj filter će uvesti mbox datoteke u KMail. Koristite ovaj filter ako "
-"želite da uvezete poštu iz Ximian-ovog Evolution-a ili drugih programa koji "
-"koristire tradicionalni Unix-ov format.</p> "
-"<p><b>Napomena:</b> Poruke će biti uvezene u direktorije sa istim imenom kao "
-"što se zove datoteka iz koga su uvezene sa prefiksom 'MBOX-'</p>"
+"<p> Odaberite direktorij Pegasus-Mail-a na vašem sistemu (sadrži CNM, PMM i "
+"MBX datoteke). Na mnogim sistemima je smješten u C:\\PMail\\mail</"
+"p><p><b>Napomena:</b> Ovaj filter za unos će uvesti vaše direktorije, ali ne "
+"i njihovu strukturu. Ovo ćete vjerotatno raditi samo jednom.</"
+"p><p><b>Napomena:</b> Poruke će biti uvezene u direktorij sa prefiksom "
+"'pmail-'</p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox datoteke (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Uvozim nove poštanske datoteke ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Uvozim poštanske direktorije ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Uvozim 'UNIX' poštanske direktorije ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Uvozim %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
+#: filter_sylpheed.cxx:27
+#, fuzzy
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "Uvezi mailove i strukturu direktorija iz Evolution"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
 
 #: filter_thebat.cxx:33
 #, fuzzy
@@ -617,17 +489,118 @@ msgstr "Uvezi poštu i strukturu direktorija iz lokalnog Thunderbird-a"
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+#, fuzzy
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Uvezi poštu i strukturu direktorija iz lokalnog Thunderbird-a"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
+"<b>Fatalna greška:</b> Ne mogu da pokrenem KMail za DCOP komunikaciju. "
+"Uvjerite se da je <i>kmail</i> instaliran."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "Ne mogu da napravim direktorij %1 u KMail-u"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "Ne mogu da dodam poruku u direktorij %1 u KMail-u"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Greška prilikom dodavanja poruke u direktorij %1 u KMail-u"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Od:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Za:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Tekući:"
+
+#: kimportpagedlg.ui:115
+#, fuzzy, no-c-format
+msgid "Importing in progress..."
+msgstr "Uvoz je u toku"
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Ukupno:"
+
+#: kimportpagedlg.ui:199
+#, fuzzy, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Kliknite na 'Nazad' da biste uvezli još poruka ili kontakata"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Dobrodošli u KMailCVT ' KMail-ov alat za uvoz</b>\n"
+"<br><br>\n"
+"Ovaj program će vam pomoći da uvezete poruke iz vašeg prethodnog programa za "
+"e-mail u KMail.<br><br><br><br>\n"
+"Izaberite program iz koga želite da uvozite, pa onda kliknite na 'Sljedeći'."
+
+#: kselfilterpagedlg.ui:133
+#, fuzzy, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Ukloni dvostruke poruke prilikom uvoza"
 
-#~ msgid "<p>Select the base directory of Evolution's mails (usually ~/evolution/local).</p><p>As it is currently impossible to recreate the folder structure, it will be \"contained\" in the generated folder's names.</p><p>For instance, if you have a \"foo\" folder in Evolution, with a \"bar\" subfolder, two folders will be created in KMail : \"foo\" and \"foo-bar\"</p>"
-#~ msgstr "<p>Izaberite osnovni direktorij Evolution mailova (obično ~/evolution/local).</p><p>Pošto je trenutno nemoguće rekreirati strukturu direktorija, ona će biti \"sadržrana\" u imenima direktorija.</p><p>Na primjer, ako u Evolutionu imate direktorij \"foo\" sa poddirektorijem \"bar\", novo-stvoreni direktoriji u KMailu će imati imena \"foo\" i \"foo-bar\"</p>"
+#~ msgid ""
+#~ "<p>Select the base directory of Evolution's mails (usually ~/evolution/"
+#~ "local).</p><p>As it is currently impossible to recreate the folder "
+#~ "structure, it will be \"contained\" in the generated folder's names.</"
+#~ "p><p>For instance, if you have a \"foo\" folder in Evolution, with a \"bar"
+#~ "\" subfolder, two folders will be created in KMail : \"foo\" and \"foo-bar"
+#~ "\"</p>"
+#~ msgstr ""
+#~ "<p>Izaberite osnovni direktorij Evolution mailova (obično ~/evolution/"
+#~ "local).</p><p>Pošto je trenutno nemoguće rekreirati strukturu "
+#~ "direktorija, ona će biti \"sadržrana\" u imenima direktorija.</p><p>Na "
+#~ "primjer, ako u Evolutionu imate direktorij \"foo\" sa poddirektorijem "
+#~ "\"bar\", novo-stvoreni direktoriji u KMailu će imati imena \"foo\" i "
+#~ "\"foo-bar\"</p>"
 
 #~ msgid "File %1 does not seem to be an Outlook Express mailbox"
 #~ msgstr "Datoteka %1 ne izgleda kao poštansko sanduče Outlook Express-a"
diff --git a/tde-i18n-ca/messages/tdepim/kmailcvt.po b/tde-i18n-ca/messages/tdepim/kmailcvt.po
index 9e445353f72..4bc6c1117df 100644
--- a/tde-i18n-ca/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ca/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-02-19 01:57+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -18,25 +18,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Importa correus de l'Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Antoni Bella Perez"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "bella5@teleline.es"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Eina d'importació KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Passa 1: Seleccionar el filtre"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Passa 2: Importar..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importació en progrés"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Importació finalitzada"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Escrit per %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Filtres d'importació del KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, els desenvolupadors del KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Autor original"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Mantenidor i filtres nous"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nou IGU i neteges en el codi"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
-"<p><b>Filtre d'importació per a l'Outlook</b></p>"
-"<p>Aquest filtre importarà correus d'un fitxer pst d'Outlook. Cal que "
-"localitzeu la carpeta on és el fitxer pst buscant fitxers .pst a: <i>"
-"C:\\Documents and Settings</i> a Windows 2000 o posterior</p>"
-"<p><b>Nota:</b> Els correus electrònics seran importats a carpetes amb el nom "
-"del compte del que vénen, prefixades amb OUTLOOK-</p>"
+"Importa els correus locals i l'estructura de carpetes de l'Evolution 1.x"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
+msgstr ""
+"<p><b>Filtre d'importació de l'Evolution 1.x</b></p><p>Seleccioneu el "
+"directori base dels correus de l'Evolution (normalment ~/evolution/local).</"
+"p><p>Com que és possible recrear l'estructura de carpetes, aquestes "
+"s'emmagatzemaran sota de: \"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -46,27 +103,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "No hi ha cap directori seleccionat."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "S'estan comptant els fitxers..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "S'estan comptant els correus..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "S'estan comptant els directoris..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "S'estan comptant les carpetes..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "S'estan important els nous fitxers de correu..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -74,6 +110,22 @@ msgstr "S'estan important els nous fitxers de correu..."
 msgid "No files found for import."
 msgstr "No s'ha trobat cap fitxer a importar."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "S'ha finalitzat la importació de missatges des de %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "No es pot obrir %1, s'omet"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -91,40 +143,39 @@ msgstr ""
 "1 missatge duplicat no s'ha importat\n"
 "%n missatges duplicats no s'han importat"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "No es pot obrir %1, s'omet"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
-"Importa els correus locals i l'estructura de carpetes de l'Evolution 1.x"
+"Importa els correus locals i l'estructura de carpetes de l'Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Filtre d'importació de l'Evolution 1.x</b></p>"
-"<p>Seleccioneu el directori base dels correus de l'Evolution (normalment "
-"~/evolution/local).</p>"
-"<p>Com que és possible recrear l'estructura de carpetes, aquestes "
-"s'emmagatzemaran sota de: \"Evolution-Import\".</p>"
+"<p><b>Filtre d'importació de l'Evolution 2.x</b></p><p>Seleccioneu el "
+"directori base de la vostra bústia de correu local de l'Evolution "
+"(normalment ~/.evolution/mail/local/).</p><p><b>Nota:</b> No trieu mai una "
+"carpeta que <u>no</u> contingui fitxers mbox (per exemple un maildir): si ho "
+"feu, generareu moltes carpetes noves.</p><p>Com que és possible recrear "
+"l'estructura de carpetes, aquestes s'emmagatzemen sota de: \"Evolution-Import"
+"\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "S'ha finalitzat la importació de missatges des de %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Ha acabat la importació, cancel·lada per l'usuari."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Comença la importació del fitxer %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -132,132 +183,33 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importa les carpetes des del Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Seleccioneu el directori del Pegasus-Mail al vostre sistema (el que continga "
-"els fitxers *.CNM, *.PMN i *.MBX). En molts sistemes estan emmagatzemats a "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Nota:</b> Com que és possible recrear l'estructura de carpetes, aquestes "
-"semmagatzemaran sota de: \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"No s'ha pogut analitzar l'estructura de carpetes, la importació continua sense "
-"poder treballar amb subcarpetes."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "S'estan important els nous fitxers de correu ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "S'estan important les carpetes de correu ('.pmm') ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "S'estan important les carpetes de correu 'UNIX' ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "S'està important %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Missatge %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "S'està analitzant l'estructura de carpetes..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Escrit per %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Importa correus del Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Filtre d'importació del correu de Text Estructurat del Lotus Notes</b></p>"
-"<p>Aquest filtre importarà fitxers de Text Estructurat des de un client de "
-"correu exportat del Lotus Notes cap el KMail. Useu aquest filtre si desitgeu "
-"importar correus des del Lotus o altres clients de correu que emprin el format "
-"de Text Estructurat del Lotus Notes.</p>"
-"<p><b>Nota:</b> Com que és possible recrear l'estructura de carpetes, els "
-"missatges importats s'emmagatzemaran en subcarpetes sota de: \"LNotes-Import\", "
-"en la vostra carpeta local, anomenades a partir del nom del fitxer del que "
-"prové el missatge.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Tots els fitxers (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "S'estan important correus des de %1"
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importa els directoris de correu i l'estructura de carpetes del KMail"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Filtre d'importació del KMail</b></p>"
-"<p>Seleccioneu el directori base de la bústia de correu del KMail que desitgeu "
-"importar.</p>"
-"<p><b>Nota:</b> No seleccioneu mai el vostre directori de correu actual del "
-"KMail (normalment ~/Mail o ~/.trinity/share/apps/kmail/mail ): en aquest cas el "
-"KMailCVT pot arribar a entrar en un bucle continuat. </p>"
-"<p>Aquest filtre no importa directoris de correu del KMail amb fitxers mbox.</p>"
-"<p>Com que és possible recrear l'estructura de carpetes, aquestes "
-"s'emmagatzemaran sota de: \"KMail-Import\" de la vostra carpeta local.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Ha acabat la importació, cancel·lada per l'usuari."
+"<p><b>Filtre d'importació del KMail</b></p><p>Seleccioneu el directori base "
+"de la bústia de correu del KMail que desitgeu importar.</p><p><b>Nota:</b> "
+"No seleccioneu mai el vostre directori de correu actual del KMail "
+"(normalment ~/Mail o ~/.trinity/share/apps/kmail/mail ): en aquest cas el "
+"KMailCVT pot arribar a entrar en un bucle continuat. </p><p>Aquest filtre no "
+"importa directoris de correu del KMail amb fitxers mbox.</p><p>Com que és "
+"possible recrear l'estructura de carpetes, aquestes s'emmagatzemaran sota "
+"de: \"KMail-Import\" de la vostra carpeta local.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -270,194 +222,43 @@ msgstr "S'està important la carpeta %1..."
 msgid "Could not import %1"
 msgstr "No s'ha pogut importar %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-"Importa els correus locals i l'estructura de carpetes del Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Filtre d'importació del Thunderbird/Mozilla</b></p>"
-"<p>Seleccioneu la vostra carpeta de correu base del Thunderbird/Mozilla "
-"(normalment ~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Nota:</b> No seleccioneu mai una carpeta que <u>no</u> "
-"contingui fitxers mbox (per exemple, un maildir): si ho feu, generareu moltes "
-"carpetes noves.</p>"
-"<p>Com que és possible recrear l'estructura de carpetes, aquestes "
-"s'emmagatzemaran sota de: \"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Comença la importació del fitxer %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Importa els correus de l'Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Filtre d'importació dels correus de l'Opera</b></p>"
-"<p>Aquest filtre importarà els correus de la carpeta de correu de l'Opera. Useu "
-"aquest filtre si desitgeu importar tots els correus d'un compte del directori "
-"de correu de l'Opera.</p> "
-"<p>Escolliu el directori del compte (normalment "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Nota:</b> Els correus seran importats cap a carpetes amb el nom del "
-"compte origen, prefixades amb OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
-"Importa els correus locals i l'estructura de carpetes de l'Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Filtre d'importació de l'Evolution 2.x</b></p>"
-"<p>Seleccioneu el directori base de la vostra bústia de correu local de "
-"l'Evolution (normalment ~/.evolution/mail/local/).</p>"
-"<p><b>Nota:</b> No trieu mai una carpeta que <u>no</u> "
-"contingui fitxers mbox (per exemple un maildir): si ho feu, generareu moltes "
-"carpetes noves.</p>"
-"<p>Com que és possible recrear l'estructura de carpetes, aquestes "
-"s'emmagatzemen sota de: \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Des de:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Cap a:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Actual:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Importació en progrés..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Total:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Si us plau, cliqueu 'Enrere' per importar més correus o contactes"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Importa correus del Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Benvingut al KMailCVT - L'eina d'importació del KMail</b>\n"
-"<br>"
-"<br>\n"
-"Aquest programa us ajudarà a importar el vostre correu del vostre programa de "
-"correu anterior al KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Seleccioneu el programa des del qual us agradaria importar-lo, llavors cliqueu "
-"'Següent'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Elimina els missatges &duplicats en importar"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Filtres d'importació del KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, els desenvolupadors del KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Autor original"
+"<p><b>Filtre d'importació del correu de Text Estructurat del Lotus Notes</"
+"b></p><p>Aquest filtre importarà fitxers de Text Estructurat des de un "
+"client de correu exportat del Lotus Notes cap el KMail. Useu aquest filtre "
+"si desitgeu importar correus des del Lotus o altres clients de correu que "
+"emprin el format de Text Estructurat del Lotus Notes.</p><p><b>Nota:</b> Com "
+"que és possible recrear l'estructura de carpetes, els missatges importats "
+"s'emmagatzemaran en subcarpetes sota de: \"LNotes-Import\", en la vostra "
+"carpeta local, anomenades a partir del nom del fitxer del que prové el "
+"missatge.</p>"
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Mantenidor i filtres nous"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nou IGU i neteges en el codi"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Tots els fitxers (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Antoni Bella Perez"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "S'estan important correus des de %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "bella5@teleline.es"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Missatge %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -465,12 +266,12 @@ msgstr "Importa des del Mail del OS X"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Filtre d'importació per al Mail del OS X</b></p>"
-"<p>Aquest filtre importa els correus electrònics del client de correu del Mac "
-"OS X d'Apple.</p>"
+"<p><b>Filtre d'importació per al Mail del OS X</b></p><p>Aquest filtre "
+"importa els correus electrònics del client de correu del Mac OS X d'Apple.</"
+"p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -480,25 +281,28 @@ msgstr ""
 "1 missatge duplicat no ha estat importat a la carpeta %1 del KMail\n"
 "%n missatges duplicats no han estat importats a la carpeta %1 del KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Eina d'importació KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Passa 1: Seleccionar el filtre"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Passa 2: Importar..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importa fitxers mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importació en progrés"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Filtre d'importació per a mbox</b></p><p>Aquest filtre importarà els "
+"vostres fitxers mbox al KMail. Useu aquest filtre si desitgeu importar "
+"correus des de l'Evolution de Ximian o des d'altres clients de correu que "
+"emprin el format tradicional de UNIX.</p><p><b>Nota:</b> Els correus seran "
+"importats cap a carpetes amb un nom que mostrarà el seu origen, prefixades "
+"amb MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Importació finalitzada"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "fitxers mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -506,25 +310,21 @@ msgstr "Importa els correus de l'Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Filtre d'importació per a l'Outlook Express 4/5/6</b></p>"
-"<p>Cal que localitzeu la carpeta on és la bústia de correu buscant els fitxers "
-".dbx o .mbx a "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> a Windows 9x"
-"<li><i>Documents and Settings</i> a Windows 2000 o posterior</ul></p>"
-"<p><b>Nota:</b> Com que és possible recrear l'estructura de carpetes, les "
-"carpetes de l'Outlook Express 5 i 6 s'emmagatzemaran sota de: \"OE-Import\" de "
-"la vostra carpeta local.</p>"
+"<p><b>Filtre d'importació per a l'Outlook Express 4/5/6</b></p><p>Cal que "
+"localitzeu la carpeta on és la bústia de correu buscant els fitxers .dbx o ."
+"mbx a <ul><li><i>C:\\Windows\\Application Data</i> a Windows "
+"9x<li><i>Documents and Settings</i> a Windows 2000 o posterior</ul></"
+"p><p><b>Nota:</b> Com que és possible recrear l'estructura de carpetes, les "
+"carpetes de l'Outlook Express 5 i 6 s'emmagatzemaran sota de: \"OE-Import\" "
+"de la vostra carpeta local.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -559,6 +359,130 @@ msgstr "S'està important la bústia %1 de OE5+"
 msgid "Importing OE5+ Folder file %1"
 msgstr "S'està important el fitxer de carpeta %1 del OE5+"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Importa els correus de l'Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Filtre d'importació dels correus de l'Opera</b></p><p>Aquest filtre "
+"importarà els correus de la carpeta de correu de l'Opera. Useu aquest filtre "
+"si desitgeu importar tots els correus d'un compte del directori de correu de "
+"l'Opera.</p> <p>Escolliu el directori del compte (normalment ~/.opera/mail/"
+"store/account*).</p><p><b>Nota:</b> Els correus seran importats cap a "
+"carpetes amb el nom del compte origen, prefixades amb OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "S'estan comptant els fitxers..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "S'estan important els nous fitxers de correu..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Importa correus de l'Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Filtre d'importació per a l'Outlook</b></p><p>Aquest filtre importarà "
+"correus d'un fitxer pst d'Outlook. Cal que localitzeu la carpeta on és el "
+"fitxer pst buscant fitxers .pst a: <i>C:\\Documents and Settings</i> a "
+"Windows 2000 o posterior</p><p><b>Nota:</b> Els correus electrònics seran "
+"importats a carpetes amb el nom del compte del que vénen, prefixades amb "
+"OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "S'estan comptant els correus..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "S'estan comptant els directoris..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "S'estan comptant les carpetes..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Importa els missatges de text pla"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Seleccioneu el directori del vostre sistema que continga els correus "
+"electrònics. Els correus s'emplaçaran en una carpeta amb el mateix nom que "
+"el directori en què són, prefixades amb PLAIN-</p><p>Aquest filtre importarà "
+"tots els correus electrònics .msg, .eml i .txt.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importa les carpetes des del Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Seleccioneu el directori del Pegasus-Mail al vostre sistema (el que "
+"continga els fitxers *.CNM, *.PMN i *.MBX). En molts sistemes estan "
+"emmagatzemats a C:\\pmail\\mail\\admin</p><p><b>Nota:</b> Com que és "
+"possible recrear l'estructura de carpetes, aquestes semmagatzemaran sota de: "
+"\"PegasusMail-Import\".</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"No s'ha pogut analitzar l'estructura de carpetes, la importació continua "
+"sense poder treballar amb subcarpetes."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "S'estan important els nous fitxers de correu ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "S'estan important les carpetes de correu ('.pmm') ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "S'estan important les carpetes de correu 'UNIX' ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "S'està important %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "S'està analitzant l'estructura de carpetes..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
@@ -566,24 +490,66 @@ msgstr ""
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 msgstr ""
-"<p><b>Filtre d'importació del Sylpheed</b></p>"
-"<p>Seleccioneu el directori base de la bústia de correu del Sylpheed que "
-"desitgeu importar (normalment: ~/Mail ).</p>"
-"<p>Com que és possible recrear l'estructura de carpetes, aquestes "
-"s'emmagatzemaran sota de: \"Sylpheed-Import\" de la vostra carpeta local.</p>"
-"<p>Aquest filtre també recrea l'estat del missatge, p.ex. nou o reenviat."
+"<p><b>Filtre d'importació del Sylpheed</b></p><p>Seleccioneu el directori "
+"base de la bústia de correu del Sylpheed que desitgeu importar (normalment: "
+"~/Mail ).</p><p>Com que és possible recrear l'estructura de carpetes, "
+"aquestes s'emmagatzemaran sota de: \"Sylpheed-Import\" de la vostra carpeta "
+"local.</p><p>Aquest filtre també recrea l'estat del missatge, p.ex. nou o "
+"reenviat."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Importa els correus i l'estructura de carpetesdel The Bat!"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Filtre d'importació del The Bat!</b></p><p>Seleccioneu el directori "
+"base de la bústia de correu local del 'The Bat!' que desitgeu importar.</"
+"p><p><b>Nota:</b> Aquest filtre importa el fitxers *.tbb des de la carpeta "
+"local del 'The Bat!', p.ex. des dels comptes POP, però no des dels comptes "
+"IMAP/DIMAP.</p><p>Com que és possible recrear l'estructura de carpetes, "
+"aquestes s'emmagatzemaran sota de: \"TheBat-Import\" del vostre compte local."
+"</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+"Importa els correus locals i l'estructura de carpetes del Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Filtre d'importació del Thunderbird/Mozilla</b></p><p>Seleccioneu la "
+"vostra carpeta de correu base del Thunderbird/Mozilla (normalment ~/."
+"thunderbird/*.default/Mail/Local Folders/).</p><p><b>Nota:</b> No "
+"seleccioneu mai una carpeta que <u>no</u> contingui fitxers mbox (per "
+"exemple, un maildir): si ho feu, generareu moltes carpetes noves.</p><p>Com "
+"que és possible recrear l'estructura de carpetes, aquestes s'emmagatzemaran "
+"sota de: \"Thunderbird-Import\".</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Fatal:</b> No es pot engegar el KMail per a la comunicació DCOP. "
 "Assegureu-vos que el <i>KMail</i> està instal·lat."
@@ -601,65 +567,58 @@ msgid "Error while adding message to folder %1 in KMail"
 msgstr ""
 "S'ha produït un error en afegir el missatge a la carpeta %1 en el KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Importa els missatges de text pla"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Des de:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Seleccioneu el directori del vostre sistema que continga els correus "
-"electrònics. Els correus s'emplaçaran en una carpeta amb el mateix nom que el "
-"directori en què són, prefixades amb PLAIN-</p>"
-"<p>Aquest filtre importarà tots els correus electrònics .msg, .eml i .txt.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Cap a:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importa fitxers mbox (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Actual:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Filtre d'importació per a mbox</b></p>"
-"<p>Aquest filtre importarà els vostres fitxers mbox al KMail. Useu aquest "
-"filtre si desitgeu importar correus des de l'Evolution de Ximian o des d'altres "
-"clients de correu que emprin el format tradicional de UNIX.</p>"
-"<p><b>Nota:</b> Els correus seran importats cap a carpetes amb un nom que "
-"mostrarà el seu origen, prefixades amb MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Importació en progrés..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "fitxers mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Importa els correus i l'estructura de carpetesdel The Bat!"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Total:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Si us plau, cliqueu 'Enrere' per importar més correus o contactes"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Filtre d'importació del The Bat!</b></p>"
-"<p>Seleccioneu el directori base de la bústia de correu local del 'The Bat!' "
-"que desitgeu importar.</p>"
-"<p><b>Nota:</b> Aquest filtre importa el fitxers *.tbb des de la carpeta local "
-"del 'The Bat!', p.ex. des dels comptes POP, però no des dels comptes "
-"IMAP/DIMAP.</p>"
-"<p>Com que és possible recrear l'estructura de carpetes, aquestes "
-"s'emmagatzemaran sota de: \"TheBat-Import\" del vostre compte local.</p>"
+"<b>Benvingut al KMailCVT - L'eina d'importació del KMail</b>\n"
+"<br><br>\n"
+"Aquest programa us ajudarà a importar el vostre correu del vostre programa "
+"de correu anterior al KMail.<br><br><br><br>\n"
+" Seleccioneu el programa des del qual us agradaria importar-lo, llavors "
+"cliqueu 'Següent'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Elimina els missatges &duplicats en importar"
diff --git a/tde-i18n-cs/messages/tdepim/kmailcvt.po b/tde-i18n-cs/messages/tdepim/kmailcvt.po
index 5c240ccf292..f6a32435f2b 100644
--- a/tde-i18n-cs/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-cs/messages/tdepim/kmailcvt.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-01-16 13:33+0100\n"
 "Last-Translator: Jakub Friedl <jfriedl@suse.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -24,25 +24,81 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Importovat emaily z Outlooku"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Milan Hejpetr,Ivo Jánský"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "mhejpetr@iss.cz,Ivo.Jansky@seznam.cz"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Importovací nástroje KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Krok 1: Vybrat filtr"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Krok 2: Importování..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importování v průběhu"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Importování skončilo"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Napsal %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail importovat filtry"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005,  vývojáři KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Původní autor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Správce, nové filtry"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nové GUI & upravení"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Importovat zprávy a strukturu složek z Evolution 1.x"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 import filtr</b></p>"
-"<p>Tento filtr importuje emaily z 'pst' souboru aplikace Outlook. Budete muset "
-"najít složku, ve které se tento soubor nachází: <i>C:\\Dokumenty a nastavení</i> "
-"ve Windows 2000 nebo novějších.</p>"
-"<p><b>Poznámka:</b> Emaily budou importovány do složek pojmenovaných po "
-"souboru, ze kterého vzešly; s OUTLOOK na začátku.</p>"
+"<p><b>Importní filtr z Evolution 1.x</b></p><p>Zadejte základní adresář "
+"zpráv aplikace Evolution (obvykle ~/evolution/local).</p> <p>Protože je v "
+"současnosti možné znovu vytvořit strukturu složek, bude tato uložena pod "
+"\"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -52,27 +108,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Žádný adresář není vybrán."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Jsou počítány soubory ..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Jsou počítány emaily..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Jsou počítány adresáře..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Jsou počítány složky..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Importují se nové emailové soubory..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -80,6 +115,22 @@ msgstr "Importují se nové emailové soubory..."
 msgid "No files found for import."
 msgstr "Nenalezeny žádné soubory pro import."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Dokončeno importování emailů z %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Nelze otevřít %1, přeskakuji"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -98,39 +149,37 @@ msgstr ""
 "%n duplikované zprávy nebyly importovány.\n"
 "%n duplikovaných zpráv nebylo importováno."
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Nelze otevřít %1, přeskakuji"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Importovat zprávy a strukturu složek z Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Importovat zprávy a strukturu složek z Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Importní filtr z Evolution 1.x</b></p>"
-"<p>Zadejte základní adresář zpráv aplikace Evolution (obvykle "
-"~/evolution/local).</p> "
+"<p><b>Importní filtr z Evolution 2.x</b></p><p>Zadejte základní adresář "
+"zpráv aplikace Evolution (obvykle ~/evolution/mail/local).</p> "
+"<p><b>Poznámka:</b> nikdy nevolte složku, která <u>neobsahuje</u> mbox "
+"soubory (např. maildir). Pokud tak učiníte, obdržíte spoustu nových složek. "
 "<p>Protože je v současnosti možné znovu vytvořit strukturu složek, bude tato "
 "uložena pod \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Dokončeno importování emailů z %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Import dokončen, přerušeno uživatelem."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Spustit importní soubor %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -138,99 +187,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importovat složky z Pegasus-Mailu"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Vyberte adresář Pegasus Mail na vašem systému (obsahující CNM, PMM a MBX "
-"soubory. Na mnoha systémech je uložen v C:\\pmail\\mail nebo "
-"C:\\pmail\\mail\\admin.</p>"
-"<p><b>Poznámka:</b> Protože je v současnosti možné znovu vytvořit strukturu "
-"složek, bude tato uložena pod \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Nelze analyzovat strukturu složek; pokračuje import bez podpory podřízených "
-"složek."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importují se nové soubory s poštou ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importují se složky pošty ('.pmm')"
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importují se unixové složky pošty ('.mbx') ..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importování %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Zpráva %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Analyzuje se struktura složek..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Napsal %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Importovat emaily z Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Importní filtr pro strukturovaný text Lotus Notes</b></p>"
-"<p>Tento filtr importuje strukturovaný text exportovaný z poštovního klienta "
-"Lotus Notes do KMailu. Použijte tento filtr, pokud chcete importovat poštu z "
-"Lotus Notes nebo programů používajících formát strukturovaného textu Lotus "
-"Notes.</p>"
-"<p><b>Poznámka:</b> Protože je možné obnovit adresářovou strukturu, bude pošta "
-"uložena do podsložek ve složce \"LNotes-Import\" ve vaší lokální složce. Budou "
-"použita jména souborů, ze kterých pošta pochází.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Všechny soubory (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Importování emailů z %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -238,28 +198,20 @@ msgstr "Importovat zprávy a strukturu složek z KMail"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>KMail importní filtr</b></p> <P>Zvolte výchozí adresář lokální schránky "
-"KMail, kterou chcete importovat.</p>"
-"<p><b>Poznámka:</b> Nikdy nevolte svou lokální schránku (obvykle ~/Mail nebo "
-"~/.trinity/share/apps/kmail/mail ). KMailCVT by se mohl dostat do smyčky.</p> "
-"<p>Tento filtr neslouží k importu mbox souborů.</p>"
-"<p>Emaily budou importovány do podsložek ve složce \"KMail-Import\".</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Import dokončen, přerušeno uživatelem."
+"<p><b>KMail importní filtr</b></p> <P>Zvolte výchozí adresář lokální "
+"schránky KMail, kterou chcete importovat.</p><p><b>Poznámka:</b> Nikdy "
+"nevolte svou lokální schránku (obvykle ~/Mail nebo ~/.trinity/share/apps/"
+"kmail/mail ). KMailCVT by se mohl dostat do smyčky.</p> <p>Tento filtr "
+"neslouží k importu mbox souborů.</p><p>Emaily budou importovány do podsložek "
+"ve složce \"KMail-Import\".</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -272,189 +224,41 @@ msgstr "Importovat složku %1..."
 msgid "Could not import %1"
 msgstr "Nelze importovat %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Importovat zprávy a strukturu složek z Mozilla/Thunderbird"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Importní filtr z Mozilla/Thunderbird</b></p>"
-"<p>Zadejte základní adresář zpráv aplikace Thunderbird (obvykle "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p> "
-"<p><b>Poznámka:</b> nikdy nevolte složku, která <u>neobsahuje</u> "
-"mbox soubory (např. maildir). Pokud tak učiníte, obdržíte spoustu nových "
-"složek."
-"<p>Protože je v současnosti nemožné znovu vytvořit strukturu složek, bude tato "
-"\"obsažena\" ve vygenerovaném názvu složky.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Spustit importní soubor %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Importovat emaily z Opery"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Importní filtr pro emaily z Opery</b></p>"
-"<p>Tento filtr importuje emaily z poštovní složky Opery. Použijte tento filtr k "
-"importu všech emailů z jednoho účtu.</p> "
-"<p>Zvolte adresář účtu, většinou ~/.opera/mail/store/account*).</p>"
-"<p><b>Poznámka:</b> Emaily budou importovány do složek pojmenovaných po složce, "
-"ze které vzešly a s OPERA- na začátku.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Importovat zprávy a strukturu složek z Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Importní filtr z Evolution 2.x</b></p>"
-"<p>Zadejte základní adresář zpráv aplikace Evolution (obvykle "
-"~/evolution/mail/local).</p> "
-"<p><b>Poznámka:</b> nikdy nevolte složku, která <u>neobsahuje</u> "
-"mbox soubory (např. maildir). Pokud tak učiníte, obdržíte spoustu nových "
-"složek. "
-"<p>Protože je v současnosti možné znovu vytvořit strukturu složek, bude tato "
-"uložena pod \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Z:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Do:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Současný:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Probíhá import..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Celkem:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Kliknutím na 'Zpět' importujete další emaily nebo kontakty"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Importovat emaily z Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Vítejte do KMailCVT - Importovací nástroj pro KMail</b>\n"
-"<br>"
-"<br>\n"
-"Tento program Vám pomůže importovat emaily z vašich předchozích emailových "
-"klientů do KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Vyberte prosím program, ze kterého chcete importovat a klikněte na 'Další'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Odstranit &duplicitní zprávy během importu"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
+"<p><b>Importní filtr pro strukturovaný text Lotus Notes</b></p><p>Tento "
+"filtr importuje strukturovaný text exportovaný z poštovního klienta Lotus "
+"Notes do KMailu. Použijte tento filtr, pokud chcete importovat poštu z Lotus "
+"Notes nebo programů používajících formát strukturovaného textu Lotus Notes.</"
+"p><p><b>Poznámka:</b> Protože je možné obnovit adresářovou strukturu, bude "
+"pošta uložena do podsložek ve složce \"LNotes-Import\" ve vaší lokální "
+"složce. Budou použita jména souborů, ze kterých pošta pochází.</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail importovat filtry"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005,  vývojáři KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Původní autor"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Správce, nové filtry"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nové GUI & upravení"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Všechny soubory (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Milan Hejpetr,Ivo Jánský"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Importování emailů z %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "mhejpetr@iss.cz,Ivo.Jansky@seznam.cz"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Zpráva %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -462,11 +266,11 @@ msgstr "Importovat z aplikace OS X Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Importní filtr pro OS X Mail</b></p> "
-"<p>Tento filtr importuje emaily z poštovního klienta Apple Mac OS X.</p>"
+"<p><b>Importní filtr pro OS X Mail</b></p> <p>Tento filtr importuje emaily z "
+"poštovního klienta Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -477,25 +281,27 @@ msgstr ""
 "%n duplikované zprávy nebyly importovány do složky '%1' v KMailu.\n"
 "%n duplikovaných zpráv nebylo importováno do složky '%1' v KMailu."
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Importovací nástroje KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Krok 1: Vybrat filtr"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Krok 2: Importování..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importovat soubory mbox (Unix, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importování v průběhu"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox importní filtr</b></p><p>Tento filtr importuje soubory mbox do "
+"KMailu. Použijte tento filtr, pokud chcete importovat poštu z Ximian "
+"Evolution nebo jiných emailových agentů, kteří používají tento tradiční "
+"Unixový formát.</p><p><b>Poznámka:</b> Emaily budou importovány do složek "
+"pojmenovaných po souboru, ze kterého vzešly a s MBOX na začátku.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Importování skončilo"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Soubory mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -503,24 +309,20 @@ msgstr "Importovat emaily z Outlook Expressu"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 import filtr</b></p>"
-"<p>Je třeba nalézt složku, kde jsou uloženy soubory .dbx nebo .mbx, a to v: "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> pro Windows 9x"
-"<li><i>Documents and Settings</i> pro Windows 2000 nebo pozdější</ul></p>"
-"<p><b>Poznámka:</b> "
-"<p>Protože je v současnosti možné znovu vytvořit strukturu složek, bude tato "
-"uložena pod \"OE-Import\".</p></p>"
+"<p><b>Outlook Express 4/5/6 import filtr</b></p><p>Je třeba nalézt složku, "
+"kde jsou uloženy soubory .dbx nebo .mbx, a to v: <ul><li><i>C:\\Windows"
+"\\Application Data</i> pro Windows 9x<li><i>Documents and Settings</i> pro "
+"Windows 2000 nebo pozdější</ul></p><p><b>Poznámka:</b> <p>Protože je v "
+"současnosti možné znovu vytvořit strukturu složek, bude tato uložena pod "
+"\"OE-Import\".</p></p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -555,29 +357,187 @@ msgstr "Importování OE5+ složky %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importuji OE5+soubor složky %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Importovat emaily z Opery"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Importní filtr pro emaily z Opery</b></p><p>Tento filtr importuje "
+"emaily z poštovní složky Opery. Použijte tento filtr k importu všech emailů "
+"z jednoho účtu.</p> <p>Zvolte adresář účtu, většinou ~/.opera/mail/store/"
+"account*).</p><p><b>Poznámka:</b> Emaily budou importovány do složek "
+"pojmenovaných po složce, ze které vzešly a s OPERA- na začátku.</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Jsou počítány soubory ..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Importují se nové emailové soubory..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Importovat emaily z Outlooku"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Outlook Express 4/5/6 import filtr</b></p><p>Tento filtr importuje "
+"emaily z 'pst' souboru aplikace Outlook. Budete muset najít složku, ve které "
+"se tento soubor nachází: <i>C:\\Dokumenty a nastavení</i> ve Windows 2000 "
+"nebo novějších.</p><p><b>Poznámka:</b> Emaily budou importovány do složek "
+"pojmenovaných po souboru, ze kterého vzešly; s OUTLOOK na začátku.</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Jsou počítány emaily..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Jsou počítány adresáře..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Jsou počítány složky..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Importovat prosté textové emaily"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Vyberte adresář s emaily ve vašem systému. Emaily jsou uloženy ve složce "
+"se stejným jménem jako adresář ve kterém byly, ale před názvem je PLAIN-</"
+"p><p>Tento filtr importuje všechny .msg, .eml a .txt emaily.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importovat složky z Pegasus-Mailu"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Vyberte adresář Pegasus Mail na vašem systému (obsahující CNM, PMM a MBX "
+"soubory. Na mnoha systémech je uložen v C:\\pmail\\mail nebo C:\\pmail\\mail"
+"\\admin.</p><p><b>Poznámka:</b> Protože je v současnosti možné znovu "
+"vytvořit strukturu složek, bude tato uložena pod \"PegasusMail-Import\".</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Nelze analyzovat strukturu složek; pokračuje import bez podpory podřízených "
+"složek."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importují se nové soubory s poštou ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importují se složky pošty ('.pmm')"
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importují se unixové složky pošty ('.mbx') ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importování %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Analyzuje se struktura složek..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importovat zprávy a strukturu složek ze Sylpheed"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 msgstr ""
-"<p><b>Importní filtr ze Sylpheed</b></p>"
-"<p>Zadejte základní adresář zpráv aplikace Sylpheed (obvykle ~/Mail).</p> "
-"<p>Protože je v současnosti možné znovu vytvořit strukturu složek, bude tato "
-"\"obsažena\" ve vygenerovaném názvu složky.</p> "
-"<p>Tento filtr rovněž obnovuje stav zprávy, např. \"nová\" nebo \"přeposlaná\""
+"<p><b>Importní filtr ze Sylpheed</b></p><p>Zadejte základní adresář zpráv "
+"aplikace Sylpheed (obvykle ~/Mail).</p> <p>Protože je v současnosti možné "
+"znovu vytvořit strukturu složek, bude tato \"obsažena\" ve vygenerovaném "
+"názvu složky.</p> <p>Tento filtr rovněž obnovuje stav zprávy, např. \"nová\" "
+"nebo \"přeposlaná\""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Importovat zprávy a strukturu složek z The Bat!"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Bat! importní filtr</b></p> <P>Zvolte výchozí adresář lokální schránky "
+"'The Bat!', kterou chcete importovat.</p><p><b>Poznámka:</b> Tento filtr "
+"importuje *.tbb soubory z lokální složky, např.z POP účtů, ale ne z IMAP/"
+"DIMAP účtů.</p><p>Emaily budou importovány do podsložek ve složce \"TheBat-"
+"Import\".</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Importovat zprávy a strukturu složek z Mozilla/Thunderbird"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Importní filtr z Mozilla/Thunderbird</b></p><p>Zadejte základní "
+"adresář zpráv aplikace Thunderbird (obvykle ~/.thunderbird/*.default/Mail/"
+"Local Folders/).</p> <p><b>Poznámka:</b> nikdy nevolte složku, která "
+"<u>neobsahuje</u> mbox soubory (např. maildir). Pokud tak učiníte, obdržíte "
+"spoustu nových složek.<p>Protože je v současnosti nemožné znovu vytvořit "
+"strukturu složek, bude tato \"obsažena\" ve vygenerovaném názvu složky.</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>VÁŽNÉ:</b> Nelze spustit KMail pro komunikaci DCOP.\n"
 "Ujistěte se, zda máte <i>kmail</i> v cestě."
@@ -594,61 +554,57 @@ msgstr "Nelze přidat zprávu do složky %1 v KMailu"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Chyba při přidávání zprávy do složky %1 v KMailu"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Importovat prosté textové emaily"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Z:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Vyberte adresář s emaily ve vašem systému. Emaily jsou uloženy ve složce se "
-"stejným jménem jako adresář ve kterém byly, ale před názvem je PLAIN-</p>"
-"<p>Tento filtr importuje všechny .msg, .eml a .txt emaily.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Do:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importovat soubory mbox (Unix, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Současný:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>mbox importní filtr</b></p>"
-"<p>Tento filtr importuje soubory mbox do KMailu. Použijte tento filtr, pokud "
-"chcete importovat poštu z Ximian Evolution nebo jiných emailových agentů, kteří "
-"používají tento tradiční Unixový formát.</p>"
-"<p><b>Poznámka:</b> Emaily budou importovány do složek pojmenovaných po "
-"souboru, ze kterého vzešly a s MBOX na začátku.</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Probíhá import..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Soubory mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Importovat zprávy a strukturu složek z The Bat!"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Celkem:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Kliknutím na 'Zpět' importujete další emaily nebo kontakty"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Bat! importní filtr</b></p> <P>Zvolte výchozí adresář lokální schránky "
-"'The Bat!', kterou chcete importovat.</p>"
-"<p><b>Poznámka:</b> Tento filtr importuje *.tbb soubory z lokální složky, "
-"např.z POP účtů, ale ne z IMAP/DIMAP účtů.</p>"
-"<p>Emaily budou importovány do podsložek ve složce \"TheBat-Import\".</p>"
+"<b>Vítejte do KMailCVT - Importovací nástroj pro KMail</b>\n"
+"<br><br>\n"
+"Tento program Vám pomůže importovat emaily z vašich předchozích emailových "
+"klientů do KMail.<br><br><br><br>\n"
+" Vyberte prosím program, ze kterého chcete importovat a klikněte na 'Další'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Odstranit &duplicitní zprávy během importu"
diff --git a/tde-i18n-cy/messages/tdepim/kmailcvt.po b/tde-i18n-cy/messages/tdepim/kmailcvt.po
index 62fb4bb11ff..7bf1f0dc4b1 100644
--- a/tde-i18n-cy/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-cy/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2004-01-08 21:25+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -18,28 +18,78 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2\n"
 
-#: filter_outlook.cxx:28
-#, fuzzy
-msgid "Import Outlook Emails"
-msgstr "Mewnforio Ebostau Outlook Express"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Owain Green drwy KGyfieithu - Meddalwedd Gymraeg"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kyfieithu@dotmon.com"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Erfyn Mewnforio KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Cam 1: Dewis Hidlen"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Cam 2: Mewnforio..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Mewnforio ar waith"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Mewnforio wedi gorffen"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Ysgrifennwyd gan %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Hidlenni Mewnforio KMail"
+
+#: main.cpp:35
 #, fuzzy
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2003, Y Datblygwyr KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Awdur gwreiddiol"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "GUI newydd a glanhadau"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
-msgstr ""
-"<p><b>Hidlen Mewnforio Outlook Express 4/5/6 Newydd</b></p>"
-"<p>Hidlen Outlook Express newydd yw hon, sy'n cynnal yn gyflawn fersiynau 4 i "
-"6.</p>"
-"<p>Mae Outlook Express yn cadw ei flychau post yn C:\\Windows\\Application "
-"Data\\Identities\\?????\\Microsoft\\Outlook Express yn gyffredinol</p>"
-"<p><b>Noder:</b>Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
-"daethont ohoni, â'r rhagddodiad OE-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
+msgstr ""
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -49,30 +99,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Dim cyfeiriadur wedi'i ddewis."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Yn cyfri ffeiliau..."
-
-#: filter_outlook.cxx:46
-#, fuzzy
-msgid "Counting mail..."
-msgstr "Yn cyfri ffeiliau..."
-
-#: filter_outlook.cxx:47
-#, fuzzy
-msgid "Counting directories..."
-msgstr "Yn cyfri ffeiliau..."
-
-#: filter_outlook.cxx:48
-#, fuzzy
-msgid "Counting folders..."
-msgstr "Yn cyfri ffeiliau..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Yn mewnforio ffeiliau ebost newydd..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -80,6 +106,22 @@ msgstr "Yn mewnforio ffeiliau ebost newydd..."
 msgid "No files found for import."
 msgstr ""
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Gorffennwyd mewnforio ebostau o %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Methwyd agor %1, yn hepgor"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -95,156 +137,56 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Methwyd agor %1, yn hepgor"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Gorffennwyd mewnforio ebostau o %1"
-
-#: filter_kmail_archive.cxx:24
-msgid "Import KMail Archive File"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
-msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Mewnforio Plygelli o Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-#, fuzzy
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
 msgstr ""
-"<p>Dewiswch y cyfeiriadur Pegasus-Mail ar eich cysawd (sy'n cynnwys ffeiliau "
-"CNM, PMM, ac MBX). Ar sawl cysawd mae hwn wedi'i gadw yn C:\\PMail\\mail</p>"
-"<p><b>Noder:</b> Bydd yr hidlen fewnforio yma'n mewnforio'ch plygelli, ond nid "
-"yr adeiledd plygelli. Ond mae'n debyg taw dim ond unwaith y gwnewch hyn.</p>"
-"<p><b>Noder:</b> Mewnforir ebostau i blygell â'r rhagddodiad pmail-</p>"
 
-#: filter_pmail.cxx:69
+#: filter_kmail_archive.cxx:26
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Yn mewnforio ffeiliau ebost newydd ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Yn mewnforio plygelli ebost ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Yn mewnforio plygelli ebost 'UNIX' ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Yn mewnforio %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Neges %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr ""
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Ysgrifennwyd gan %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "Mewnforio Ebostau Outlook Express"
-
-#: filter_lnotes.cxx:32
-#, fuzzy
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>hidlen mewnforio mbox</b></p>"
-"<p>Bydd yr hidlen hon yn mewnforio ffeiliau mbox i KMail.  Defnyddiwch yr "
-"hidlen yma os hoffech fewnforio o Ximian Evolution neu ebostyddion eraill sy'n "
-"defnyddio'r ffromat traddodiadaol UNIX yma.</p>"
-"<p><b>Noder:</b> Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
-"daethont ohoni, â'r rhagddodiad MBOX.</p>"
-
-#: filter_lnotes.cxx:55
-#, fuzzy
-msgid "All Files (*)"
-msgstr "ffeiliau mbox (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Yn mewnforio ebostau o %1"
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
@@ -259,177 +201,42 @@ msgstr "Yn mewnforio ebostau o %1"
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr ""
-
-#: filter_opera.cxx:28
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid "Import Opera Emails"
+msgid "Import Lotus Notes Emails"
 msgstr "Mewnforio Ebostau Outlook Express"
 
-#: filter_opera.cxx:30
+#: filter_lnotes.cxx:32
 #, fuzzy
 msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>hidlen mewnforio mbox</b></p>"
-"<p>Bydd yr hidlen hon yn mewnforio ffeiliau mbox i KMail.  Defnyddiwch yr "
-"hidlen yma os hoffech fewnforio o Ximian Evolution neu ebostyddion eraill sy'n "
-"defnyddio'r ffromat traddodiadaol UNIX yma.</p>"
-"<p><b>Noder:</b> Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
-"daethont ohoni, â'r rhagddodiad MBOX.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
+msgstr ""
+"<p><b>hidlen mewnforio mbox</b></p><p>Bydd yr hidlen hon yn mewnforio "
+"ffeiliau mbox i KMail.  Defnyddiwch yr hidlen yma os hoffech fewnforio o "
+"Ximian Evolution neu ebostyddion eraill sy'n defnyddio'r ffromat "
+"traddodiadaol UNIX yma.</p><p><b>Noder:</b> Mewnforir ebostau i blygelli "
+"wedi'u henwi ar ôl y ffeil y daethont ohoni, â'r rhagddodiad MBOX.</p>"
 
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "O:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "I:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Cyfredol:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Mewnforio ar waith ..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Cyfanswm:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Cliciwch 'Yn ôl' i fewnforio rhagor o ebostau neu gysylltau"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>Croeso i KMailCVT - Erfyn Mewnforio KMail</b>\n"
-"<br>"
-"<br>\n"
-" Cynorthwya'r raglen hon i chi fewnforio'ch ebost o'ch rhaglen ebost blaenorol "
-"i KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Dewiswch y rhaglen yr hoffech fewnforio ohoni, os gwelwch yn dda, a chliciwch "
-"'Nesaf'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr ""
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Hidlenni Mewnforio KMail"
-
-#: main.cpp:35
+#: filter_lnotes.cxx:55
 #, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2003, Y Datblygwyr KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Awdur gwreiddiol"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "GUI newydd a glanhadau"
+msgid "All Files (*)"
+msgstr "ffeiliau mbox (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Owain Green drwy KGyfieithu - Meddalwedd Gymraeg"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Yn mewnforio ebostau o %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kyfieithu@dotmon.com"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Neges %1"
 
 #: filter_mailapp.cxx:32
 #, fuzzy
@@ -438,8 +245,8 @@ msgstr "Mewnforio Plygelli o Pegasus-Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
@@ -449,25 +256,28 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Erfyn Mewnforio KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Cam 1: Dewis Hidlen"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Cam 2: Mewnforio..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Mewnforio Ffeiliau mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Mewnforio ar waith"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>hidlen mewnforio mbox</b></p><p>Bydd yr hidlen hon yn mewnforio "
+"ffeiliau mbox i KMail.  Defnyddiwch yr hidlen yma os hoffech fewnforio o "
+"Ximian Evolution neu ebostyddion eraill sy'n defnyddio'r ffromat "
+"traddodiadaol UNIX yma.</p><p><b>Noder:</b> Mewnforir ebostau i blygelli "
+"wedi'u henwi ar ôl y ffeil y daethont ohoni, â'r rhagddodiad MBOX.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Mewnforio wedi gorffen"
+#: filter_mbox.cxx:48
+#, fuzzy
+msgid "mbox Files (*)"
+msgstr "ffeiliau mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -476,22 +286,19 @@ msgstr "Mewnforio Ebostau Outlook Express"
 #: filter_oe.cxx:42
 #, fuzzy
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Hidlen Mewnforio Outlook Express 4/5/6 Newydd</b></p>"
-"<p>Hidlen Outlook Express newydd yw hon, sy'n cynnal yn gyflawn fersiynau 4 i "
-"6.</p>"
-"<p>Mae Outlook Express yn cadw ei flychau post yn C:\\Windows\\Application "
-"Data\\Identities\\?????\\Microsoft\\Outlook Express yn gyffredinol</p>"
-"<p><b>Noder:</b>Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
+"<p><b>Hidlen Mewnforio Outlook Express 4/5/6 Newydd</b></p><p>Hidlen Outlook "
+"Express newydd yw hon, sy'n cynnal yn gyflawn fersiynau 4 i 6.</p><p>Mae "
+"Outlook Express yn cadw ei flychau post yn C:\\Windows\\Application Data"
+"\\Identities\\?????\\Microsoft\\Outlook Express yn gyffredinol</"
+"p><p><b>Noder:</b>Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
 "daethont ohoni, â'r rhagddodiad OE-</p>"
 
 #: filter_oe.cxx:67
@@ -528,27 +335,183 @@ msgstr "Yn mewnforio blwch ebost OE5+ %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Yn anwybyddu ffeil Blygelli OE5+ %1"
 
+#: filter_opera.cxx:28
+#, fuzzy
+msgid "Import Opera Emails"
+msgstr "Mewnforio Ebostau Outlook Express"
+
+#: filter_opera.cxx:30
+#, fuzzy
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>hidlen mewnforio mbox</b></p><p>Bydd yr hidlen hon yn mewnforio "
+"ffeiliau mbox i KMail.  Defnyddiwch yr hidlen yma os hoffech fewnforio o "
+"Ximian Evolution neu ebostyddion eraill sy'n defnyddio'r ffromat "
+"traddodiadaol UNIX yma.</p><p><b>Noder:</b> Mewnforir ebostau i blygelli "
+"wedi'u henwi ar ôl y ffeil y daethont ohoni, â'r rhagddodiad MBOX.</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Yn cyfri ffeiliau..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Yn mewnforio ffeiliau ebost newydd..."
+
+#: filter_outlook.cxx:28
+#, fuzzy
+msgid "Import Outlook Emails"
+msgstr "Mewnforio Ebostau Outlook Express"
+
+#: filter_outlook.cxx:30
+#, fuzzy
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Hidlen Mewnforio Outlook Express 4/5/6 Newydd</b></p><p>Hidlen Outlook "
+"Express newydd yw hon, sy'n cynnal yn gyflawn fersiynau 4 i 6.</p><p>Mae "
+"Outlook Express yn cadw ei flychau post yn C:\\Windows\\Application Data"
+"\\Identities\\?????\\Microsoft\\Outlook Express yn gyffredinol</"
+"p><p><b>Noder:</b>Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
+"daethont ohoni, â'r rhagddodiad OE-</p>"
+
+#: filter_outlook.cxx:46
+#, fuzzy
+msgid "Counting mail..."
+msgstr "Yn cyfri ffeiliau..."
+
+#: filter_outlook.cxx:47
+#, fuzzy
+msgid "Counting directories..."
+msgstr "Yn cyfri ffeiliau..."
+
+#: filter_outlook.cxx:48
+#, fuzzy
+msgid "Counting folders..."
+msgstr "Yn cyfri ffeiliau..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Mewnforio Ebostau Testun Plaen"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Dewiswch y cyfeiriadur sy'n cynnwys yr ebostau ar eich cysawd. Rhoddir yr "
+"ebostau mewn plygell â'r un enw a'r cyfeiriadur roeddent ynddi, â'r "
+"rhagddodiad PLAIN-</p><p>Bydd yr hidlen hon yn mewnforio pob ebost .msg, ."
+"eml, a .txt.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Mewnforio Plygelli o Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+#, fuzzy
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Dewiswch y cyfeiriadur Pegasus-Mail ar eich cysawd (sy'n cynnwys ffeiliau "
+"CNM, PMM, ac MBX). Ar sawl cysawd mae hwn wedi'i gadw yn C:\\PMail\\mail</"
+"p><p><b>Noder:</b> Bydd yr hidlen fewnforio yma'n mewnforio'ch plygelli, ond "
+"nid yr adeiledd plygelli. Ond mae'n debyg taw dim ond unwaith y gwnewch hyn."
+"</p><p><b>Noder:</b> Mewnforir ebostau i blygell â'r rhagddodiad pmail-</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Yn mewnforio ffeiliau ebost newydd ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Yn mewnforio plygelli ebost ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Yn mewnforio plygelli ebost 'UNIX' ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Yn mewnforio %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<b>Marwol:</b> Methu cychwyn KMail ar gyfer cyfathrebu DCOP. Sicrhewch bod <i>"
-"kmail</i> wedi'i sefydlu."
+"<b>Marwol:</b> Methu cychwyn KMail ar gyfer cyfathrebu DCOP. Sicrhewch bod "
+"<i>kmail</i> wedi'i sefydlu."
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -562,60 +525,60 @@ msgstr "Methu ychwanegu neges at blygell %1 yng KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Gwall tra'n ychwanegu neges at blygell %1 yng KMail."
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Mewnforio Ebostau Testun Plaen"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "O:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Dewiswch y cyfeiriadur sy'n cynnwys yr ebostau ar eich cysawd. Rhoddir yr "
-"ebostau mewn plygell â'r un enw a'r cyfeiriadur roeddent ynddi, â'r rhagddodiad "
-"PLAIN-</p>"
-"<p>Bydd yr hidlen hon yn mewnforio pob ebost .msg, .eml, a .txt.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "I:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Mewnforio Ffeiliau mbox (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Cyfredol:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>hidlen mewnforio mbox</b></p>"
-"<p>Bydd yr hidlen hon yn mewnforio ffeiliau mbox i KMail.  Defnyddiwch yr "
-"hidlen yma os hoffech fewnforio o Ximian Evolution neu ebostyddion eraill sy'n "
-"defnyddio'r ffromat traddodiadaol UNIX yma.</p>"
-"<p><b>Noder:</b> Mewnforir ebostau i blygelli wedi'u henwi ar ôl y ffeil y "
-"daethont ohoni, â'r rhagddodiad MBOX.</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Mewnforio ar waith ..."
 
-#: filter_mbox.cxx:48
-#, fuzzy
-msgid "mbox Files (*)"
-msgstr "ffeiliau mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr ""
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Cyfanswm:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, fuzzy, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Cliciwch 'Yn ôl' i fewnforio rhagor o ebostau neu gysylltau"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Croeso i KMailCVT - Erfyn Mewnforio KMail</b>\n"
+"<br><br>\n"
+" Cynorthwya'r raglen hon i chi fewnforio'ch ebost o'ch rhaglen ebost "
+"blaenorol i KMail.<br><br><br><br>\n"
+" Dewiswch y rhaglen yr hoffech fewnforio ohoni, os gwelwch yn dda, a "
+"chliciwch 'Nesaf'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
 
 #, fuzzy
diff --git a/tde-i18n-da/messages/tdepim/kmailcvt.po b/tde-i18n-da/messages/tdepim/kmailcvt.po
index b5e6c5bf717..3efa08f0b22 100644
--- a/tde-i18n-da/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-da/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-12-30 09:24-0500\n"
 "Last-Translator: Erik Kjær Pedersen <erik@binghamton.edu>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -15,25 +15,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Import Outlook e-mail"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Erik Kjær Pedersen"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "erik@binghamton.edu"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT Import-værktøj"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Trin 1: Vælg filter"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Trin 2: Importerer..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Import i fremgang"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import afsluttet"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Skrevet af %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail Import-filtre"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, KMailCVT-udviklerne"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Oprindelig forfatter"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Vedligeholder & Nye filtre"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Ny GUI & oprydning"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Importér Evolution1.x lokal post- og mappestruktur"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Importfilter for Outlook e-mail</b></p>"
-"<p>Dette filter importerer breve fra en Outlook pst-fil. Du skal finde mappen "
-"hvor pst-filen er opbevaret ved at søge efter .pst-filer under <i>"
-"C:\\Documents and Settings</i> i Windows 2000 eller senere</p>"
-"<p><b>Bemærk:</b> E-mail importeres til en mappe som får navn efter kontoen de "
-"kom fra, med præfikset OUTLOOK-.</p>"
+"<p><b>Importfilter for Evolution 1.x</b></p><p>Vælg basismappe for "
+"Evolutions e-mail (oftest ~/evolution/local).</p><p>Eftersom det er muligt "
+"at genoprette mappestrukturen, opbevares alle mapper under: \"Evolution "
+"import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -43,27 +99,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Ingen mappe valgt."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Tæller filer..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Tæller posten..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Tæller mapper..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Tæller mapper..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Importerer nye post-filer..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -71,6 +106,22 @@ msgstr "Importerer nye post-filer..."
 msgid "No files found for import."
 msgstr "Ingen filer fundet at importere."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Færdig med at importere e-mail fra %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Kan ikke åbne %1, skipper"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -88,38 +139,37 @@ msgstr ""
 "1 dobbelt brev ikke importeret\n"
 "%n dobbelte breve ikke importeret"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Kan ikke åbne %1, skipper"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Importér Evolution1.x lokal post- og mappestruktur"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Importér Evolution 2.x lokal post- og mappestruktur"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Importfilter for Evolution 1.x</b></p>"
-"<p>Vælg basismappe for Evolutions e-mail (oftest ~/evolution/local).</p>"
-"<p>Eftersom det er muligt at genoprette mappestrukturen, opbevares alle mapper "
-"under: \"Evolution import\".</p>"
+"<p><b>Importfilter for Evolution 2.x</b></p><p>Vælg basismappen for den "
+"lokale brevmappe i Evolution (oftest ~/.evolution/mail/local/).</"
+"p><p><b>Bemærk:</b> Vælg aldrig en mappe som <u>ikke</u> indeholder mbox-"
+"filer (for eksempel en brevmappe). Hvis du gør det alligevel, får du mange "
+"nye mapper.</p> <p>Eftersom det for muligt at genoprette mappestrukturen, "
+"opbevares alle mapper under: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Færdig med at importere e-mail fra %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Afsluttede import, annulleret af brugeren."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Starte import af filen %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -127,130 +177,32 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importér mapper fra Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Vælg Pegasus-Mail-mappen på systemet (som indeholder CNM-, PMM- og "
-"MBX-filer). I mange systemer opbevares denne fil på C:\\pmail\\mail eller "
-"C:\\pmail\\mail\\admin.</p>"
-"<p><b>Bemærk:</b> Eftersom det er muligt at genoprette mappestrukturen, "
-"opbevares alle mapper under \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Kan ikke tolke mappestrukturen. Fortsætter import uden understøttelse for "
-"undermapper."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importerer nye post filer ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importerer postmapper ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importerer 'UNIX' postmapper ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importerer %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Brev %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Tolker mappestrukturen..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Skrevet af %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Importér e-mail fra Outlook"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Importfilter for Lotus Notes struktureret tekst e-mail</b></p>"
-"<p>Dette filter importerer strukturerede tekstfiler fra eksport af en Lotus "
-"Notes e-mail-klient til Kmail. Brug filtret hvis du vil importere post fra "
-"Lotus eller andre e-mail-programmer som benytter Lotus Notes struktureret "
-"tekstformat.</p> "
-"<p><b>Bemærk:</b> Eftersom det er muligt at genoprette mappestrukturen, "
-"opbevares importerede breve i undermapper som navngives af filerne de kom fra "
-"under \"Sylpheed-Import\" i din lokale mappe.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Alle filer (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Importerer e-mail fra %1"
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importér Kmails brevmapper og mappestruktur"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Importfilter for Kmail</b></p>"
-"<p>Vælg basismappen for den Kmail brevmappe som du vil importere.</p>"
-"<p><b>Bemærk:</b> Vælg aldrig din nuværende lokale brevmappe for Kmail (oftest "
-"~/Mail eller ~/.trinity/share/apps/kmail/mail). I dette tilfælde kan Kmailcvt "
-"havne i en kontinuert løkke.</p>"
-"<p>Dette filter importerer ikke Kmail brevmapper med mbox-filer.</p>"
-"<p>Eftersom det er muligt at genoprette mappestrukturen, opbevares alle mapper "
-"under: \"KMail-Import\" i din lokale mappe.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Afsluttede import, annulleret af brugeren."
+"<p><b>Importfilter for Kmail</b></p><p>Vælg basismappen for den Kmail "
+"brevmappe som du vil importere.</p><p><b>Bemærk:</b> Vælg aldrig din "
+"nuværende lokale brevmappe for Kmail (oftest ~/Mail eller ~/.trinity/share/"
+"apps/kmail/mail). I dette tilfælde kan Kmailcvt havne i en kontinuert løkke."
+"</p><p>Dette filter importerer ikke Kmail brevmapper med mbox-filer.</"
+"p><p>Eftersom det er muligt at genoprette mappestrukturen, opbevares alle "
+"mapper under: \"KMail-Import\" i din lokale mappe.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -263,189 +215,41 @@ msgstr "Importér mappe %1..."
 msgid "Could not import %1"
 msgstr "Kunne ikke importere %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Importér Thunderbird/Mozilla lokale post og -mappestruktur"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Importfilter for Thunderbird/Mozilla</b></p>"
-"<p>Vælg basismappen for e-mail i Thunderbird/Mozilla (oftest "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Bemærk:</b> Vælg aldrig en mappe som <u>ikke</u> "
-"indeholder mbox-filer (for eksempel en brevmappe). Hvis du gør det alligevel, "
-"får du mange nye mapper.</p> "
-"<p>Eftersom det for muligt at genoprette mappestrukturen, opbevares alle mapper "
-"under \"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Starte import af filen %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Import Opera e-mail"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Importfilter for e-mail fra Opera</b></p>"
-"<p>Dette filter importerer breve fra Operas brevmapper. Brug filtret hvis du "
-"vil importere alle breve fra en konto i Operas brevmapper.</p>"
-"<p>Vælg kontoens mappe (sædvanligvis ~/.opera/mail/store/account*).</p>"
-"<p><b>Bemærk:</b> E-mail importeres til en mappe som får navn efter kontoen de "
-"kom fra, med præfikset OPERA-.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Importér Evolution 2.x lokal post- og mappestruktur"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Importfilter for Evolution 2.x</b></p>"
-"<p>Vælg basismappen for den lokale brevmappe i Evolution (oftest "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Bemærk:</b> Vælg aldrig en mappe som <u>ikke</u> "
-"indeholder mbox-filer (for eksempel en brevmappe). Hvis du gør det alligevel, "
-"får du mange nye mapper.</p> "
-"<p>Eftersom det for muligt at genoprette mappestrukturen, opbevares alle mapper "
-"under: \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Fra:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Til:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Denne:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Import i fremgang..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "I alt:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Klik på 'Tilbage' for at importere flere e-mail eller kontakter"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Importér e-mail fra Outlook"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Velkommen til KMailCVT - KMail's importværktøj</b>\n"
-"<br>"
-"<br>\n"
-"Dette program vil hjælpe dig med at importere din e-mail fra dit tidligere "
-"e-mail-program til KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Vælg venligst det program du vil importere fra, klik så på 'Næste'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Fjern &duplikerede brev under import"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
+"<p><b>Importfilter for Lotus Notes struktureret tekst e-mail</b></p><p>Dette "
+"filter importerer strukturerede tekstfiler fra eksport af en Lotus Notes e-"
+"mail-klient til Kmail. Brug filtret hvis du vil importere post fra Lotus "
+"eller andre e-mail-programmer som benytter Lotus Notes struktureret "
+"tekstformat.</p> <p><b>Bemærk:</b> Eftersom det er muligt at genoprette "
+"mappestrukturen, opbevares importerede breve i undermapper som navngives af "
+"filerne de kom fra under \"Sylpheed-Import\" i din lokale mappe.</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail Import-filtre"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, KMailCVT-udviklerne"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Oprindelig forfatter"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Vedligeholder & Nye filtre"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Ny GUI & oprydning"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Alle filer (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Erik Kjær Pedersen"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Importerer e-mail fra %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "erik@binghamton.edu"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Brev %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -453,11 +257,11 @@ msgstr "Importér OS X post"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X Mail Importfilter</b></p>"
-"<p>Dette filter importerer e-mail fra e-mail-klienten i Apple Mac OS X.</p>"
+"<p><b>OS X Mail Importfilter</b></p><p>Dette filter importerer e-mail fra e-"
+"mail-klienten i Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -467,25 +271,27 @@ msgstr ""
 "1 dobbelt brev ikke importeret til mappen %1 i KMail\n"
 "%n dobbelte breve ikke importeret til mappen %1 i KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT Import-værktøj"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Trin 1: Vælg filter"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Trin 2: Importerer..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importér mbox-filer (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Import i fremgang"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox importfilter</b></p><p>Dette filter vil importere mbox-filer til "
+"KMail. Brug dette filter hvis du ønsker at importere post fra Ximian "
+"Evolution eller andre postprogrammer der bruger dette traditionelle UNIX-"
+"format.</p><p><b>Bemærk:</b> E-mail vil blive importeret til mapper opkaldt "
+"efter filen de kom fra, med præfiks MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import afsluttet"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox-filer (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -493,23 +299,19 @@ msgstr "Import Outlook Express e-mail"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 importfilter</b></p>"
-"<p>Du vil skulle finde mappen hvor postkassen er blevet opbevaret ved at søge "
-"efter .dbx or .mbx filer i "
-"<ul> "
-"<li><i>C:\\Windows\\Application Data</i> i Windows 9x"
-"<li><i>Dokumenter og Opsætning</i> i Windows 2000 eller senere</ul></p>"
-"<p><b>Bemærk:</b> Eftersom det for muligt at genoprette mappestrukturen, "
+"<p><b>Outlook Express 4/5/6 importfilter</b></p><p>Du vil skulle finde "
+"mappen hvor postkassen er blevet opbevaret ved at søge efter .dbx or .mbx "
+"filer i <ul> <li><i>C:\\Windows\\Application Data</i> i Windows "
+"9x<li><i>Dokumenter og Opsætning</i> i Windows 2000 eller senere</ul></"
+"p><p><b>Bemærk:</b> Eftersom det for muligt at genoprette mappestrukturen, "
 "opbevares alle mapper fra Outlook Express 5 0g 6 under: \"OE-Import\" i din "
 "lokale mappe.</p>"
 
@@ -546,46 +348,64 @@ msgstr "Importerer OE5+ postkasse %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importerer OE5+ mappefil %1"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "Importér brevmapper og mappestruktur fra Sylpheed"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Import Opera e-mail"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
-"<p><b>Importerfilter for Sylpheed</b></p>"
-"<p>Vælg basismappe for den Sylphed brevmappe som du vil importere (oftest "
-"~/Mail).</p>"
-"<p>Eftersom det er muligt at genoprette mappestrukturen, opbevares alle mapper "
-"under: \"Sylpheed-Import\" i din lokale mappe.</p> "
-"<p>Dette filter genopretter også status på et brev, f.eks. nyt eller "
-"videresendt."
+"<p><b>Importfilter for e-mail fra Opera</b></p><p>Dette filter importerer "
+"breve fra Operas brevmapper. Brug filtret hvis du vil importere alle breve "
+"fra en konto i Operas brevmapper.</p><p>Vælg kontoens mappe (sædvanligvis ~/."
+"opera/mail/store/account*).</p><p><b>Bemærk:</b> E-mail importeres til en "
+"mappe som får navn efter kontoen de kom fra, med præfikset OPERA-.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Tæller filer..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Importerer nye post-filer..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Import Outlook e-mail"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>FATALT:</b> Kan ikke starte KMail for DCOP-kommunikation. Sørg for <i>"
-"kmail</i> er i installeret."
+"<p><b>Importfilter for Outlook e-mail</b></p><p>Dette filter importerer "
+"breve fra en Outlook pst-fil. Du skal finde mappen hvor pst-filen er "
+"opbevaret ved at søge efter .pst-filer under <i>C:\\Documents and Settings</"
+"i> i Windows 2000 eller senere</p><p><b>Bemærk:</b> E-mail importeres til en "
+"mappe som får navn efter kontoen de kom fra, med præfikset OUTLOOK-.</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "Kan ikke lave mappe %1 i KMail"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Tæller posten..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "Kan ikke tilføje brev til mappe %1 i KMail"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Tæller mapper..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Fejl ved tilføjelse af brev til mappe %1 i KMail"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Tæller mapper..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -594,37 +414,78 @@ msgstr "Importér almindelig tekst e-mail"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 "<p>Vælg mappen der indeholder dine e-mail. Disse e-mail bliver placeret i en "
-"mappe med samme navn som den mappe de var i, med præfiks PLAIN-</p>"
-"<p>Dette filter vil importere alle .msg, .eml og .txt e-mail.</p>"
+"mappe med samme navn som den mappe de var i, med præfiks PLAIN-</p><p>Dette "
+"filter vil importere alle .msg, .eml og .txt e-mail.</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importér mbox-filer (UNIX, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importér mapper fra Pegasus-Mail"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>mbox importfilter</b></p>"
-"<p>Dette filter vil importere mbox-filer til KMail. Brug dette filter hvis du "
-"ønsker at importere post fra Ximian Evolution eller andre postprogrammer der "
-"bruger dette traditionelle UNIX-format.</p>"
-"<p><b>Bemærk:</b> E-mail vil blive importeret til mapper opkaldt efter filen de "
-"kom fra, med præfiks MBOX-</p>"
+"<p>Vælg Pegasus-Mail-mappen på systemet (som indeholder CNM-, PMM- og MBX-"
+"filer). I mange systemer opbevares denne fil på C:\\pmail\\mail eller C:"
+"\\pmail\\mail\\admin.</p><p><b>Bemærk:</b> Eftersom det er muligt at "
+"genoprette mappestrukturen, opbevares alle mapper under \"PegasusMail-Import"
+"\".</p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox-filer (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Kan ikke tolke mappestrukturen. Fortsætter import uden understøttelse for "
+"undermapper."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importerer nye post filer ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importerer postmapper ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importerer 'UNIX' postmapper ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importerer %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Tolker mappestrukturen..."
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "Importér brevmapper og mappestruktur fra Sylpheed"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Importerfilter for Sylpheed</b></p><p>Vælg basismappe for den Sylphed "
+"brevmappe som du vil importere (oftest ~/Mail).</p><p>Eftersom det er muligt "
+"at genoprette mappestrukturen, opbevares alle mapper under: \"Sylpheed-Import"
+"\" i din lokale mappe.</p> <p>Dette filter genopretter også status på et "
+"brev, f.eks. nyt eller videresendt."
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -632,17 +493,111 @@ msgstr "Importér Bat!-post mappestruktur"
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
 msgstr ""
-"<p><b>Importfilter for Bat!</b></p>"
-"<p>Vælg basismappen for den lokale Bat! brevmappe som du vil importere.</p>"
-"<p><b>Bemærk:</b> Filtret importerer  *.tbb-filer fra lokale mapper i Bat!, "
-"f.eks. fra POP-konti og ikke fra IMAP/DIMAP-konti.</p>"
-"<p>Eftersom det er muligt at genoprette mappestrukturen, opbevares alle mapper "
-"under: \"TheBat-Import\" i din lokale mappe.</p>"
+"<p><b>Importfilter for Bat!</b></p><p>Vælg basismappen for den lokale Bat! "
+"brevmappe som du vil importere.</p><p><b>Bemærk:</b> Filtret importerer  *."
+"tbb-filer fra lokale mapper i Bat!, f.eks. fra POP-konti og ikke fra IMAP/"
+"DIMAP-konti.</p><p>Eftersom det er muligt at genoprette mappestrukturen, "
+"opbevares alle mapper under: \"TheBat-Import\" i din lokale mappe.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Importér Thunderbird/Mozilla lokale post og -mappestruktur"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Importfilter for Thunderbird/Mozilla</b></p><p>Vælg basismappen for e-"
+"mail i Thunderbird/Mozilla (oftest ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Bemærk:</b> Vælg aldrig en mappe som <u>ikke</u> "
+"indeholder mbox-filer (for eksempel en brevmappe). Hvis du gør det "
+"alligevel, får du mange nye mapper.</p> <p>Eftersom det for muligt at "
+"genoprette mappestrukturen, opbevares alle mapper under \"Thunderbird-Import"
+"\".</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b>FATALT:</b> Kan ikke starte KMail for DCOP-kommunikation. Sørg for "
+"<i>kmail</i> er i installeret."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "Kan ikke lave mappe %1 i KMail"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "Kan ikke tilføje brev til mappe %1 i KMail"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Fejl ved tilføjelse af brev til mappe %1 i KMail"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Fra:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Til:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Denne:"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Import i fremgang..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "I alt:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Klik på 'Tilbage' for at importere flere e-mail eller kontakter"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Velkommen til KMailCVT - KMail's importværktøj</b>\n"
+"<br><br>\n"
+"Dette program vil hjælpe dig med at importere din e-mail fra dit tidligere e-"
+"mail-program til KMail.<br><br><br><br>\n"
+" Vælg venligst det program du vil importere fra, klik så på 'Næste'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Fjern &duplikerede brev under import"
diff --git a/tde-i18n-de/messages/tdepim/kmailcvt.po b/tde-i18n-de/messages/tdepim/kmailcvt.po
index 2e87bdc1f59..4ef6a9a02bf 100644
--- a/tde-i18n-de/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-de/messages/tdepim/kmailcvt.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-01-13 21:27+0100\n"
 "Last-Translator: Thomas Reitelbach <tr@erdfunkstelle.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -21,25 +21,81 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "E-Mails von Outlook importieren"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Matthias Kiefer, Frank Schütte"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kiefer@kde.org, F.Schuette@t-online.de"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Dienstprogramm KMailCVT zum Importieren"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "1. Schritt: Filter auswählen"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "2. Schritt: Importieren ..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importvorgang läuft"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import abgeschlossen"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Geschrieben von %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Importfilter für KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, Die Entwickler von KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Ursprünglicher Autor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Betreuer & Neue Filter"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Neue Oberfläche & Überarbeitungen"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Importieren von Evolution 1.x E-Mails und Ordnerlisten"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook E-Mail-Importfilter</b></p> "
-"<p>Dieser Filter importiert E-Mails aus einer pst-Datei von Outlook. Suchen Sie "
-"nach einem Ordner unter <i>C:\\Documents and Settings</i> "
-"in Windows 2000 oder später, der pst-Dateien enthält.</p> "
-"<p><b>Hinweis:</b> E-Mails werden in einen Ordner mit dem Kontonamen und dem "
-"Präfix OUTLOOK- importiert.</p>"
+"<p><b>Evolution 1.x Importfilter</b></p> <p>Wählen Sie den Hauptordner ihrer "
+"lokalen Evolution-Mailordner (üblicherweise ~/.evolution/local).</p> <p>Da "
+"die Ordnerstruktur rekonstruiert werden kann, erscheinen die importierten "
+"Ordner unterhalb von \"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -49,27 +105,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Kein Ordner ausgewählt."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Dateien werden gezählt ..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Nachrichten werden gezählt ..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Ordner werden gezählt ..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Ordner werden gezählt ..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Neue Maildateien werden importiert ..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -77,6 +112,22 @@ msgstr "Neue Maildateien werden importiert ..."
 msgid "No files found for import."
 msgstr "Keine Dateien zum Importieren gefunden."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Der Import von E-Mails aus %1 ist abgeschlossen"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "%1 lässt sich nicht zum Lesen öffnen, Datei wird übergangen"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -94,39 +145,38 @@ msgstr ""
 "1 doppelte Nachricht wurde nicht importiert\n"
 "%n doppelte Nachrichten wurden nicht importiert"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "%1 lässt sich nicht zum Lesen öffnen, Datei wird übergangen"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Importieren von Evolution 1.x E-Mails und Ordnerlisten"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Importieren von E-Mails und Ordnerlisten aus Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x Importfilter</b></p> "
-"<p>Wählen Sie den Hauptordner ihrer lokalen Evolution-Mailordner (üblicherweise "
-"~/.evolution/local).</p> "
-"<p>Da die Ordnerstruktur rekonstruiert werden kann, erscheinen die importierten "
-"Ordner unterhalb von \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x Importfilter</b></p> <p>Wählen Sie den Hauptordner ihrer "
+"lokalen Evolution Mailordner (üblicherweise ~/.evolution/mail/local/) aus.</"
+"p> <p><b>Hinweis:</b> Wählen Sie <u>nie</u> einen Ordner, der keine mbox-"
+"Dateien enthält (also z. B. einen Maildir-Ordner). Ansonsten bekommen Sie "
+"viele neue Ordner.</p> <p>Da die Ordnerstruktur rekonstruiert werden kann, "
+"erscheinen die importierten Ordner unterhalb des Basisordners \"Evolution-"
+"Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Der Import von E-Mails aus %1 ist abgeschlossen"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Import abgeschlossen, Abbruch durch Benutzer."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Import von Datei %1 wird gestartet ..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -134,100 +184,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Ordner von Pegasus-Mail importieren"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Wählen Sie auf ihrem System den Mailordner von Pegasus Mail aus (er enthält "
-"*.CNM, *.PMM- und *.MBX-Dateien). Häufig befindet er sich in C:\\pmail\\mail "
-"oder C:\\pmail\\mail\\admin</p> "
-"<p>Da die Ordnerstruktur rekonstruiert werden kann, erscheinen die importierten "
-"Ordner unterhalb von \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Die Ordnerstruktur kann nicht untersucht werden; der Import wird ohne die "
-"Unterstützung von Unterordnern fortgesetzt."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Neue Maildateien werden importiert ('.cnm') ..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Mailordner ('.pmm') werden importiert ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "'UNIX'-Mailordner ('.mbx') werden importiert ..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "%1 wird importiert"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Nachricht %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Untersuchen der Ordnerstruktur ..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Geschrieben von %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "E-Mails von Lotus Notes importieren"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Importfilter für Lotus Notes Strukturtext-Mails</b></p> "
-"<p>Dieser Filter dient zum Import von Strukturtext-Dateien aus einem "
-"exportierten Lotus Notes Client in KMail. Verwenden Sie diesen Filter zum "
-"Import von E-Mails aus Lotus Notes oder anderen Programmen, die das Lotus Notes "
-"Strukturtext-Format verwenden.</p>"
-"<p><b>Hinweis:</b> Da die Ordnerstruktur rekonstruiert werden kann, erscheinen "
-"die importierten Nachrichten in Lokale Ordner unterhalb des Hauptordners "
-"\"LNotes-Import\" in Unterordnern, die die Namen der zugrundeliegenden "
-"Notesdateien tragen.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Alle Dateien (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "E-Mails von %1 werden importiert"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -235,31 +195,22 @@ msgstr "Importieren von E-Mails und Ordnerlisten aus KMail"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>KMail Importfilter</b></p>"
-"<p>Wählen Sie den Hauptordner für die aus KMail zu importierenden E-Mails "
-"aus.</p>"
-"<p><b>Hinweis:</b> Wählen Sie nie Ihren momentan benutzten KMail Hauptordner "
-"aus (normalerweise ~/Mail oder ~/.trinity/share/apps/kmail/mail ), andernfalls "
-"kann KMailCVT in einer Endlosschleife stecken bleiben. </p>"
-"<p>Dieser Filter importiert keine KMail Ordner mit mbox-Dateien.</p>"
-"<p>Da die Ordnerstruktur rekonstruiert werden kann, erscheinen diese unterhalb "
-"des Basisordners \"KMail-Import\" in Ihren lokalen Ordnern.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Import abgeschlossen, Abbruch durch Benutzer."
+"<p><b>KMail Importfilter</b></p><p>Wählen Sie den Hauptordner für die aus "
+"KMail zu importierenden E-Mails aus.</p><p><b>Hinweis:</b> Wählen Sie nie "
+"Ihren momentan benutzten KMail Hauptordner aus (normalerweise ~/Mail oder ~/."
+"trinity/share/apps/kmail/mail ), andernfalls kann KMailCVT in einer "
+"Endlosschleife stecken bleiben. </p><p>Dieser Filter importiert keine KMail "
+"Ordner mit mbox-Dateien.</p><p>Da die Ordnerstruktur rekonstruiert werden "
+"kann, erscheinen diese unterhalb des Basisordners \"KMail-Import\" in Ihren "
+"lokalen Ordnern.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -272,194 +223,42 @@ msgstr "Import von Ordner %1 ..."
 msgid "Could not import %1"
 msgstr "%1 kann nicht importiert werden"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-"Importieren der lokalen Mails und der Ordnerstruktur von Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird/Mozilla-Importfilter</b></p> "
-"<p>Wählen Sie den Haupt-Mailordner von Thunderbird/Mozilla (üblicherweise "
-"~/.thunderbird/*.default/Mail/Local Folders/) aus.</p> "
-"<p><b>Hinweis:</b>Wählen Sie nie einen Ordner, der <u>keine</u> "
-"mbox-Dateien enthält (also z. B. einen Maildir-Ordner). Falls Sie das dennoch "
-"tun, erscheinen viele neue Ordner.</p> "
-"<p>Da die Ordnerstruktur rekonstruiert werden kann, erscheinen die Ordner unter "
-"unter \"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Import von Datei %1 wird gestartet ..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Import von Opera E-Mails"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera E-Mail-Importfilter</b></p> "
-"<p>Dieser Filter importiert E-Mails aus dem Mail-Ordner von Opera. Verwenden "
-"Sie diesen Filter, wenn Sie alle Mails eines Kontos aus dem Maildir-Ordner von "
-"Opera importieren möchten.</p> "
-"<p>Wählen Sie den Ordner des Kontos (üblicherweise "
-"~/.opera/mail/store/account*).</p> "
-"<p><b>Hinweis:</b>Die E-Mails werden in einen Ordner mit dem Kontonamen und dem "
-"Präfix OPERA- importiert.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Importieren von E-Mails und Ordnerlisten aus Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x Importfilter</b></p> "
-"<p>Wählen Sie den Hauptordner ihrer lokalen Evolution Mailordner (üblicherweise "
-"~/.evolution/mail/local/) aus.</p> "
-"<p><b>Hinweis:</b> Wählen Sie <u>nie</u> einen Ordner, der keine mbox-Dateien "
-"enthält (also z. B. einen Maildir-Ordner). Ansonsten bekommen Sie viele neue "
-"Ordner.</p> "
-"<p>Da die Ordnerstruktur rekonstruiert werden kann, erscheinen die importierten "
-"Ordner unterhalb des Basisordners \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Von:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Bis:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Aktuell:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Importvorgang läuft ..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Gesamt:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Für den Import von weiteren E-Mails oder Kontakten auf \"Zurück\" klicken"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "E-Mails von Lotus Notes importieren"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Willkommen bei KMailCVT - dem Import-Dienstprogramm von KMail</b>\n"
-"<br>"
-"<br>\n"
-"Dieses Programm unterstützt Sie beim Importieren Ihrer E-Mails aus Ihrem "
-"früheren E-Mail-Programm."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Bitte wählen Sie das Programm aus, von dem Ihre E-Mails importiert werden soll "
-"und klicken Sie auf \"Weiter\"."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "&Doppelte Nachrichten beim Importieren entfernen"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Importfilter für KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, Die Entwickler von KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Ursprünglicher Autor"
+"<p><b>Importfilter für Lotus Notes Strukturtext-Mails</b></p> <p>Dieser "
+"Filter dient zum Import von Strukturtext-Dateien aus einem exportierten "
+"Lotus Notes Client in KMail. Verwenden Sie diesen Filter zum Import von E-"
+"Mails aus Lotus Notes oder anderen Programmen, die das Lotus Notes "
+"Strukturtext-Format verwenden.</p><p><b>Hinweis:</b> Da die Ordnerstruktur "
+"rekonstruiert werden kann, erscheinen die importierten Nachrichten in Lokale "
+"Ordner unterhalb des Hauptordners \"LNotes-Import\" in Unterordnern, die die "
+"Namen der zugrundeliegenden Notesdateien tragen.</p>"
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Betreuer & Neue Filter"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Neue Oberfläche & Überarbeitungen"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Alle Dateien (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Matthias Kiefer, Frank Schütte"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "E-Mails von %1 werden importiert"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kiefer@kde.org, F.Schuette@t-online.de"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Nachricht %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -467,12 +266,11 @@ msgstr "Von OS X Mail importieren"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X Mail-Importfilter</b></p> "
-"<p>Dieser Filter importiert E-Mails des in Apple Mac OS X mitgelieferten "
-"Mail-Programms.</p>"
+"<p><b>OS X Mail-Importfilter</b></p> <p>Dieser Filter importiert E-Mails des "
+"in Apple Mac OS X mitgelieferten Mail-Programms.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -482,25 +280,28 @@ msgstr ""
 "1 doppelte Nachricht wurde nicht in den Ordner %1 von KMail importiert\n"
 "%n doppelte Nachrichten wurden nicht in den Ordner %1 von KMail importiert"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Dienstprogramm KMailCVT zum Importieren"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "1. Schritt: Filter auswählen"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "2. Schritt: Importieren ..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importieren von mbox-Dateien (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importvorgang läuft"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Importfilter für mbox-Dateien</b></p> <p>Dieser Filter dient zum "
+"Import von mbox-Dateien in KMail. Verwenden Sie diesen Filter zum Import von "
+"E-Mails aus Ximian Evolution und anderen Programmen, die das traditionelle "
+"UNIX-Format verwenden.</p><p><b>Hinweis:</b> Die importierten E-Mails "
+"befinden sich hinterher in Ordnern mit dem ursprünglichen Dateinamen und dem "
+"Präfix MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import abgeschlossen"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox-Dateien (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -508,25 +309,21 @@ msgstr "E-Mails von Outlook Express importieren"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Importfilter für Outlook Express 4/5/6</b></p> "
-"<p>Sie müssen den Ordner angeben, in dem die E-Mails von Outlook Express "
-"gespeichert wurden. Suchen Sie hierzu nach .dbx oder .mbx Dateien in "
-"<ul> "
-"<li><i>C:\\Windows\\Application Data</i> unter Windows 9x"
-"<li><i>Documents and Settings</i> unter Windows 2000 oder späteren "
-"Versionen</ul></p>"
-"<p><b>Hinweis:</b> Da die Ordnerstruktur rekonstruiert werden kann, erscheinen "
-"die Ordner von Outlook Express 5 und 6 unter dem Basisordner \"OE-Import\".</p>"
+"<p><b>Importfilter für Outlook Express 4/5/6</b></p> <p>Sie müssen den "
+"Ordner angeben, in dem die E-Mails von Outlook Express gespeichert wurden. "
+"Suchen Sie hierzu nach .dbx oder .mbx Dateien in <ul> <li><i>C:\\Windows"
+"\\Application Data</i> unter Windows 9x<li><i>Documents and Settings</i> "
+"unter Windows 2000 oder späteren Versionen</ul></p><p><b>Hinweis:</b> Da die "
+"Ordnerstruktur rekonstruiert werden kann, erscheinen die Ordner von Outlook "
+"Express 5 und 6 unter dem Basisordner \"OE-Import\".</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -561,32 +358,195 @@ msgstr "OE5+-Postfach %1 wird importiert"
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+-Postfach %1 wird importiert"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Import von Opera E-Mails"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Opera E-Mail-Importfilter</b></p> <p>Dieser Filter importiert E-Mails "
+"aus dem Mail-Ordner von Opera. Verwenden Sie diesen Filter, wenn Sie alle "
+"Mails eines Kontos aus dem Maildir-Ordner von Opera importieren möchten.</p> "
+"<p>Wählen Sie den Ordner des Kontos (üblicherweise ~/.opera/mail/store/"
+"account*).</p> <p><b>Hinweis:</b>Die E-Mails werden in einen Ordner mit dem "
+"Kontonamen und dem Präfix OPERA- importiert.</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Dateien werden gezählt ..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Neue Maildateien werden importiert ..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "E-Mails von Outlook importieren"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Outlook E-Mail-Importfilter</b></p> <p>Dieser Filter importiert E-"
+"Mails aus einer pst-Datei von Outlook. Suchen Sie nach einem Ordner unter "
+"<i>C:\\Documents and Settings</i> in Windows 2000 oder später, der pst-"
+"Dateien enthält.</p> <p><b>Hinweis:</b> E-Mails werden in einen Ordner mit "
+"dem Kontonamen und dem Präfix OUTLOOK- importiert.</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Nachrichten werden gezählt ..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Ordner werden gezählt ..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Ordner werden gezählt ..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Einfache Text-E-Mail importieren"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Wählen Sie den Ordner auf ihrem System, der die E-Mails enthält. Die E-"
+"Mails werden in einen Ordner mit dem ursprünglichen Ordnernamen und dem "
+"Präfix \"PLAIN-\" importiert.</p> <p>Dieser Filter importiert alle \".msg"
+"\"-, \".eml\"- und \".txt\"-E-Mails.</p> "
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Ordner von Pegasus-Mail importieren"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Wählen Sie auf ihrem System den Mailordner von Pegasus Mail aus (er "
+"enthält *.CNM, *.PMM- und *.MBX-Dateien). Häufig befindet er sich in C:"
+"\\pmail\\mail oder C:\\pmail\\mail\\admin</p> <p>Da die Ordnerstruktur "
+"rekonstruiert werden kann, erscheinen die importierten Ordner unterhalb von "
+"\"PegasusMail-Import\".</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Die Ordnerstruktur kann nicht untersucht werden; der Import wird ohne die "
+"Unterstützung von Unterordnern fortgesetzt."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Neue Maildateien werden importiert ('.cnm') ..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Mailordner ('.pmm') werden importiert ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "'UNIX'-Mailordner ('.mbx') werden importiert ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "%1 wird importiert"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Untersuchen der Ordnerstruktur ..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importieren von E-Mails und Ordnerlisten aus Sylpheed"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Sylpheed-Importfilter</b></p><p>Wählen Sie das Hauptverzeichnis des zu "
+"importierenden Sylpheed-Mailordners aus (normalerweise: ~/Mail ).</p><p>Da "
+"die Ordnerstruktur wiederhergestellt werden kann, werden die Ordner unter "
+"dem Basisordner \"Sylpheed-Import\" zu Ihren lokalen Mailordnern hinzugefügt."
+"</p><p>Dieser Importfilter erkennt auch den Status der Nachrichten, z. B. "
+"Neu oder Weitergeleitet."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Importieren von The Bat! E-Mails und Ordnern"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>The Bat! Importfilter</b></p><p>Wählen Sie das Hauptverzeichnis des "
+"Mailordners von \"The Bat!\" aus, den Sie importieren möchten.</"
+"p><p><b>Hinweis:</b>Dieser Filter importiert die *.tbb Dateienaus den "
+"lokalen Ordnern von \"The Bat!\", z. B. von POP-Zugängen, jedoch nicht von "
+"IMAP/DIMAP Zugängen.</p><p><b>Hinweis:</b> Da die Ordnerstruktur "
+"rekonstruiert werden kann, erscheinen die importierten Nachrichten in Lokale "
+"Ordner unterhalb des Hauptordners \"TheBat-Import\".</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+"Importieren der lokalen Mails und der Ordnerstruktur von Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Sylpheed-Importfilter</b></p>"
-"<p>Wählen Sie das Hauptverzeichnis des zu importierenden Sylpheed-Mailordners "
-"aus (normalerweise: ~/Mail ).</p>"
-"<p>Da die Ordnerstruktur wiederhergestellt werden kann, werden die Ordner unter "
-"dem Basisordner \"Sylpheed-Import\" zu Ihren lokalen Mailordnern "
-"hinzugefügt.</p>"
-"<p>Dieser Importfilter erkennt auch den Status der Nachrichten, z. B. Neu oder "
-"Weitergeleitet."
+"<p><b>Thunderbird/Mozilla-Importfilter</b></p> <p>Wählen Sie den Haupt-"
+"Mailordner von Thunderbird/Mozilla (üblicherweise ~/.thunderbird/*.default/"
+"Mail/Local Folders/) aus.</p> <p><b>Hinweis:</b>Wählen Sie nie einen Ordner, "
+"der <u>keine</u> mbox-Dateien enthält (also z. B. einen Maildir-Ordner). "
+"Falls Sie das dennoch tun, erscheinen viele neue Ordner.</p> <p>Da die "
+"Ordnerstruktur rekonstruiert werden kann, erscheinen die Ordner unter unter "
+"\"Thunderbird-Import\".</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Kritisch:</b> KMail kann nicht zur DCOP-Kommunikation gestartet werden. "
 "Vergewissern Sie sich, dass <i>kmail</i> installiert ist."
@@ -603,66 +563,59 @@ msgstr "Nachricht kann nicht zu Ordner %1 in KMail hinzugefügt werden"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fehler beim Hinzufügen der Nachricht zu Ordner %1 in KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Einfache Text-E-Mail importieren"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Von:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Wählen Sie den Ordner auf ihrem System, der die E-Mails enthält. Die E-Mails "
-"werden in einen Ordner mit dem ursprünglichen Ordnernamen und dem Präfix "
-"\"PLAIN-\" importiert.</p> "
-"<p>Dieser Filter importiert alle \".msg\"-, \".eml\"- und \".txt\"-E-Mails.</p> "
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Bis:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importieren von mbox-Dateien (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Aktuell:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Importfilter für mbox-Dateien</b></p> "
-"<p>Dieser Filter dient zum Import von mbox-Dateien in KMail. Verwenden Sie "
-"diesen Filter zum Import von E-Mails aus Ximian Evolution und anderen "
-"Programmen, die das traditionelle UNIX-Format verwenden.</p>"
-"<p><b>Hinweis:</b> Die importierten E-Mails befinden sich hinterher in Ordnern "
-"mit dem ursprünglichen Dateinamen und dem Präfix MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Importvorgang läuft ..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox-Dateien (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Importieren von The Bat! E-Mails und Ordnern"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Gesamt:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Für den Import von weiteren E-Mails oder Kontakten auf \"Zurück\" klicken"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>The Bat! Importfilter</b></p>"
-"<p>Wählen Sie das Hauptverzeichnis des Mailordners von \"The Bat!\" aus, den "
-"Sie importieren möchten.</p>"
-"<p><b>Hinweis:</b>Dieser Filter importiert die *.tbb Dateienaus den lokalen "
-"Ordnern von \"The Bat!\", z. B. von POP-Zugängen, jedoch nicht von IMAP/DIMAP "
-"Zugängen.</p>"
-"<p><b>Hinweis:</b> Da die Ordnerstruktur rekonstruiert werden kann, erscheinen "
-"die importierten Nachrichten in Lokale Ordner unterhalb des Hauptordners "
-"\"TheBat-Import\".</p>"
+"<b>Willkommen bei KMailCVT - dem Import-Dienstprogramm von KMail</b>\n"
+"<br><br>\n"
+"Dieses Programm unterstützt Sie beim Importieren Ihrer E-Mails aus Ihrem "
+"früheren E-Mail-Programm.<br><br><br><br>\n"
+"Bitte wählen Sie das Programm aus, von dem Ihre E-Mails importiert werden "
+"soll und klicken Sie auf \"Weiter\"."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "&Doppelte Nachrichten beim Importieren entfernen"
diff --git a/tde-i18n-el/messages/tdepim/kmailcvt.po b/tde-i18n-el/messages/tdepim/kmailcvt.po
index ebdb283386a..c8d5b57aa82 100644
--- a/tde-i18n-el/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-el/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-01-09 18:52+0200\n"
 "Last-Translator: Spiros Georgaras <sng@hellug.gr>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -14,26 +14,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας του Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Σπύρος Γεωργαράς"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "sng@hellug.gr"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Εργαλείο εισαγωγής KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Βήμα 1: Επιλογή φίλτρου"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Βήμα 2: Εισαγωγή..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Εισαγωγή σε εξέλιξη"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Η εισαγωγή ολοκληρώθηκε"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Γράφτηκε από τον %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Φίλτρα εισαγωγής του KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, Οι προγραμματιστές του KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Αρχικός συγγραφέας"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Συντηρητής & Νέα φίλτρα"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Νέο γραφικό περιβάλλον & καθαρισμός κώδικα"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Εισαγωγή τοπικής αλληλογραφίας και δομής φακέλων του Evolution 1.x"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του Outlook</b></p>"
-"<p>Αυτό το φίλτρο θα εισάγει μηνύματα αλληλογραφίας από ένα αρχείο pst του "
-"Outlook. Θα πρέπει να βρείτε το φάκελο όπου βρίσκεται το αρχείο pst αναζητώντας "
-"αρχεία .pst στο: <i>C:\\Documents and Settings</i> στα Windows 2000 ή "
-"νεότερα</p>"
-"<p><b>Σημείωση:</b> Τα μηνύματα θα εισαχθούν σε ένα φάκελο με όνομα αντίστοιχο "
-"του λογαριασμού από τον οποίο προήλθαν, με πρόθεμα OUTLOOK-</p>"
+"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του Evolution 1.x</b></"
+"p><p>Επιλέξτε το βασικό κατάλογο αλληλογραφίας του Evolution 1.x(συνήθως: ~/"
+"evolution/local).</p> <p>Εφόσον είναι δυνατή η αντιγραφή της δομής των "
+"φακέλων, αυτοί θα αποθηκευτούν στο : \"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -43,27 +98,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Δεν επιλέχθηκε κατάλογος."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Μέτρηση αρχείων..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Μέτρηση μηνυμάτων..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Μέτρηση καταλόγων..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Μέτρηση φακέλων..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Εισαγωγή νέων αρχείων μηνυμάτων..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -71,6 +105,22 @@ msgstr "Εισαγωγή νέων αρχείων μηνυμάτων..."
 msgid "No files found for import."
 msgstr "Δε βρέθηκαν αρχεία για εισαγωγή."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Η εισαγωγή μηνυμάτων αλληλογραφίας από το %1 ολοκληρώθηκε"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Αδύνατο το άνοιγμα του %1, παράβλεψη"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -88,39 +138,37 @@ msgstr ""
 "1 διπλό μήνυμα δεν εισήχθη\n"
 "%n διπλά μηνύματα δεν εισήχθησαν"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Αδύνατο το άνοιγμα του %1, παράβλεψη"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Εισαγωγή τοπικής αλληλογραφίας και δομής φακέλων του Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Εισαγωγή τοπικής αλληλογραφίας και δομής φακέλων του Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του Evolution 1.x</b></p>"
-"<p>Επιλέξτε το βασικό κατάλογο αλληλογραφίας του Evolution 1.x(συνήθως: "
-"~/evolution/local).</p> "
-"<p>Εφόσον είναι δυνατή η αντιγραφή της δομής των φακέλων, αυτοί θα αποθηκευτούν "
-"στο : \"Evolution-Import\".</p>"
+"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του Evolution 2.x</b></"
+"p><p>Επιλέξτε το βασικό κατάλογο αλληλογραφίας του Evolution (συνήθως: ~/"
+"evolution/local).</p> <p><b>Σημείωση:</b> Ποτέ μην επιλέξετε ένα Φάκελο που "
+"<u>δεν</u> περιέχει αρχεία mbox (για παράδειγμα, ένα maildir): αν το κάνετε, "
+"θα πάρετε πολλούς νέους φακέλους.</p><p>Εφόσον είναι δυνατή η αντιγραφή της "
+"δομής των φακέλων, αυτοί θα αποθηκευτούν στο : \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Η εισαγωγή μηνυμάτων αλληλογραφίας από το %1 ολοκληρώθηκε"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Η εισαγωγή ακυρώθηκε από το χρήστη."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Έναρξη της εισαγωγής του αρχείου %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -128,66 +176,43 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Εισαγωγή φακέλων από το Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Επιλέξτε τον κατάλογο του Pegasus-Mail στο σύστημά σας (που περιέχει *.CNM, "
-"*.PMM και *.MBX αρχεία). Σε πολλά συστήματα αυτός βρίσκεται στο C:\\pmail\\mail "
-"ή C:\\pmail\\mail\\admin</p>"
-"<p><b>Σημείωση:</b> Εφόσον είναι δυνατή η αντιγραφή της δομής των φακέλων, "
-"αυτοί θα αποθηκευτούν στο : \"PegasusMail-Import\".</p>"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
+msgstr "Εισαγωγή maildirs και δομή φακέλων του KMail"
 
-#: filter_pmail.cxx:69
+#: filter_kmail_maildir.cxx:28
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"Αδύνατη η ανάλυση της δομής φακέλων. Η εισαγωγή θα συνεχιστεί χωρίς υποστήριξη "
-"υποφακέλων."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Εισαγωγή νέων αρχείων αλληλογραφίας ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Εισαγωγή φακέλων αλληλογραφίας ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Εισαγωγή φακέλων αλληλογραφίας 'UNIX' ('.mbx')..."
+"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του KMail</b></p><p>Επιλέξτε "
+"το βασικό κατάλογο αλληλογραφίας του KMail που θέλετε να εισάγετε.</p> "
+"<p><b>Σημείωση:</b> Μην επιλέξετε το τρέχον τοπικό maildir του KMail "
+"(συνήθως ~/Mail ή ~/.trinity/share/apps/kmail/mail ): σε αυτή την περίπτωση "
+"το KMailCVT μπορεί να κολλήσει. </p> <p>Αυτό το φίλτρο δεν εισάγει φακέλους "
+"του KMail με αρχεία mbox.</p><p>Εφόσον είναι δυνατή η αντιγραφή της δομής "
+"των φακέλων, αυτοί θα αποθηκευτούν στο : \"KMail-Import\".</p>"
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Εισαγωγή του %1"
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+msgid "Import folder %1..."
+msgstr "Εισαγωγή του φακέλου %1..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
 #, c-format
-msgid "Message %1"
-msgstr "Μήνυμα %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Ανάλυση της δομής φακέλων..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Γράφτηκε από τον %1.</i></p>"
+msgid "Could not import %1"
+msgstr "Αδύνατη η εισαγωγή του %1"
 
 #: filter_lnotes.cxx:30
 msgid "Import Lotus Notes Emails"
@@ -195,24 +220,22 @@ msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας του Lo
 
 #: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 "<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας Δομημένου Κειμένου του Lotus "
-"Notes</b></p>"
-"<p>Αυτό το φίλτρο θα εισάγει αρχεία Δομημένου Κειμένου από ένα πελάτη "
-"αλληλογραφίας Lotus Notes στο KMail. Χρησιμοποιήστε αυτό το φίλτρο για να "
-"εισάγετε μηνύματα από τον πελάτη Lotus ή άλλους που χρησιμοποιούν τη μορφή "
-"Δομημένου Κειμένου του Lotus Notes.</p>"
-"<p><b>Σημείωση:</b> Εφόσον είναι δυνατή η αντιγραφή της δομής των φακέλων, "
-"αυτοί θα αποθηκευτούν σε υποφακέλους με όνομα αντίστοιχο με τα αρχεία από τα "
-"οποία προήλθαν στο : \"LNotes-Import\" στον τοπικό  σας φάκελο.</p>"
+"Notes</b></p><p>Αυτό το φίλτρο θα εισάγει αρχεία Δομημένου Κειμένου από ένα "
+"πελάτη αλληλογραφίας Lotus Notes στο KMail. Χρησιμοποιήστε αυτό το φίλτρο "
+"για να εισάγετε μηνύματα από τον πελάτη Lotus ή άλλους που χρησιμοποιούν τη "
+"μορφή Δομημένου Κειμένου του Lotus Notes.</p><p><b>Σημείωση:</b> Εφόσον "
+"είναι δυνατή η αντιγραφή της δομής των φακέλων, αυτοί θα αποθηκευτούν σε "
+"υποφακέλους με όνομα αντίστοιχο με τα αρχεία από τα οποία προήλθαν στο : "
+"\"LNotes-Import\" στον τοπικό  σας φάκελο.</p>"
 
 #: filter_lnotes.cxx:55
 msgid "All Files (*)"
@@ -223,239 +246,10 @@ msgstr "Όλα τα αρχεία (*)"
 msgid "Importing emails from %1"
 msgstr "Εισαγωγή μηνυμάτων από το %1"
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr "Εισαγωγή maildirs και δομή φακέλων του KMail"
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του KMail</b></p>"
-"<p>Επιλέξτε το βασικό κατάλογο αλληλογραφίας του KMail που θέλετε να "
-"εισάγετε.</p> "
-"<p><b>Σημείωση:</b> Μην επιλέξετε το τρέχον τοπικό maildir του KMail (συνήθως "
-"~/Mail ή ~/.trinity/share/apps/kmail/mail ): σε αυτή την περίπτωση το KMailCVT "
-"μπορεί να κολλήσει. </p> "
-"<p>Αυτό το φίλτρο δεν εισάγει φακέλους του KMail με αρχεία mbox.</p>"
-"<p>Εφόσον είναι δυνατή η αντιγραφή της δομής των φακέλων, αυτοί θα αποθηκευτούν "
-"στο : \"KMail-Import\".</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Η εισαγωγή ακυρώθηκε από το χρήστη."
-
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-msgid "Import folder %1..."
-msgstr "Εισαγωγή του φακέλου %1..."
-
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
-msgid "Could not import %1"
-msgstr "Αδύνατη η εισαγωγή του %1"
-
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-"Εισαγωγή τοπικών μηνυμάτων αλληλογραφίας και δομής φακέλων από το "
-"Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας από το Thunderbird/Mozilla</b>"
-"</p>"
-"<p>Επιλέξτε το βασικό φάκελο ηλ. ταχυδρομείου του Thunderbird/Mozilla (συνήθως "
-"το ~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Σημείωση:</b> Ποτέ μην επιλέξετε ένα Φάκελο που <u>δεν</u> "
-"περιέχει αρχεία mbox (για παράδειγμα, ένα maildir): αν το κάνετε, θα πάρετε "
-"πολλούς νέους φακέλους.</p>"
-"<p>Εφόσον είναι δυνατή η αντιγραφή της δομής των φακέλων, αυτοί θα αποθηκευτούν "
-"στο : \"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Έναρξη της εισαγωγής του αρχείου %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Εισαγωγή αλληλογραφίας του Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του Opera</b></p> "
-"<p>Αυτό το φίλτρο θα εισάγει τα μηνύματα από το φάκελο αλληλογραφίας του Opera. "
-"Χρησιμοποιήστε το αν θέλετε να εισάγετε όλα τα μηνύματα ενός λογαριασμού στο "
-"maildir του Opera.</p>"
-"<p>Επιλέξτε τον κατάλογο του λογαριασμού (συνήθως: "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Σημείωση:</b>Τα μηνύματα θα εισαχθούν σε ένα φάκελο με το όνομα του "
-"λογαριασμού από τον οποίο προήλθαν, και με πρόθεμα OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Εισαγωγή τοπικής αλληλογραφίας και δομής φακέλων του Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του Evolution 2.x</b></p>"
-"<p>Επιλέξτε το βασικό κατάλογο αλληλογραφίας του Evolution (συνήθως: "
-"~/evolution/local).</p> "
-"<p><b>Σημείωση:</b> Ποτέ μην επιλέξετε ένα Φάκελο που <u>δεν</u> "
-"περιέχει αρχεία mbox (για παράδειγμα, ένα maildir): αν το κάνετε, θα πάρετε "
-"πολλούς νέους φακέλους.</p>"
-"<p>Εφόσον είναι δυνατή η αντιγραφή της δομής των φακέλων, αυτοί θα αποθηκευτούν "
-"στο : \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Από:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Προς:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Τρέχον:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Εισαγωγή σε εξέλιξη..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Σύνολο:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Κάντε κλικ στο 'Πίσω' για να εισάγετε περισσότερα μηνύματα ή επαφές"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>Καλώς ήλθατε στο KMailCVT - Το εργαλείο εισαγωγής αλληλογραφίας του KMail</b>"
-"\n"
-"<br>"
-"<br>\n"
-"Αυτό το πρόγραμμα θα σας βοηθήσει να εισάγετε τα μηνύματα ηλ. ταχυδρομείου σας "
-"από το προηγούμενο πρόγραμμα ηλ. ταχυδρομείου σας στο KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Επιλέξτε το πρόγραμμα από το οποίο θα γίνει η εισαγωγή, και μετά κάντε κλικ "
-"στο 'Επόμενο'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Αφαίρεση &διπλών μηνυμάτων κατά την εισαγωγή"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Φίλτρα εισαγωγής του KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, Οι προγραμματιστές του KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Αρχικός συγγραφέας"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Συντηρητής & Νέα φίλτρα"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Νέο γραφικό περιβάλλον & καθαρισμός κώδικα"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Σπύρος Γεωργαράς"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "sng@hellug.gr"
+msgid "Message %1"
+msgstr "Μήνυμα %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -463,12 +257,12 @@ msgstr "Εισαγωγή από το OS X Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας OS X Mail</b></p>"
-"<p>Αυτό το φίλτρο εισάγει μηνύματα από τον πελάτη ηλ. ταχυδρομείου του Apple "
-"Mac OS X.</p>"
+"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας OS X Mail</b></p><p>Αυτό το "
+"φίλτρο εισάγει μηνύματα από τον πελάτη ηλ. ταχυδρομείου του Apple Mac OS X.</"
+"p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -478,25 +272,28 @@ msgstr ""
 "1 διπλό μήνυμα δεν εισήχθη από το φάκελο %1 στο KMail\n"
 "%n διπλά μηνύματα δεν εισήχθησαν από το φάκελο %1 στο KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Εργαλείο εισαγωγής KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Βήμα 1: Επιλογή φίλτρου"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Βήμα 2: Εισαγωγή..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Εισαγωγή αρχείων mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Εισαγωγή σε εξέλιξη"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας mbox</b></p><p>Αυτό το φίλτρο "
+"θα εισάγει αρχεία mbox στο KMail. Χρησιμοποιήστε το αν θέλετε να εισάγετε "
+"μηνύματα από το Ximian Evolution ή άλλα προγράμματα που χρησιμοποιούν αυτή "
+"την παραδοσιακή μορφή αποθήκευσης μηνυμάτων του UNIX.</p><p><b>Σημείωση:</b> "
+"Τα μηνύματα θα εισαχθούν σε φακέλους με όνομα αντίστοιχο των αρχείων από τα "
+"οποία προήλθαν, με πρόθεμα MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Η εισαγωγή ολοκληρώθηκε"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Αρχεία mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -504,23 +301,19 @@ msgstr "Εισαγωγή αλληλογραφίας του Outlook"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του Outlook Express 4/5/6</b></p>"
-"<p>Θα πρέπει να βρείτε το φάκελο που περιέχει το mailbox αναζητώντας αρχεία "
-".dbx ή .mbx στο "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> στα Windows 9x"
-"<li><i>Documents and Settings</i> στα Windows 2000 ή νεότερα</ul></p>"
-"<p><b>Σημείωση:</b> Εφόσον είναι δυνατή η αντιγραφή της δομής των φακέλων, "
+"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του Outlook Express 4/5/6</"
+"b></p><p>Θα πρέπει να βρείτε το φάκελο που περιέχει το mailbox αναζητώντας "
+"αρχεία .dbx ή .mbx στο <ul><li><i>C:\\Windows\\Application Data</i> στα "
+"Windows 9x<li><i>Documents and Settings</i> στα Windows 2000 ή νεότερα</ul></"
+"p><p><b>Σημείωση:</b> Εφόσον είναι δυνατή η αντιγραφή της δομής των φακέλων, "
 "αυτοί θα αποθηκευτούν στο : \"OE-Import\" στον τοπικό  σας φάκελο.</p>"
 
 #: filter_oe.cxx:67
@@ -556,31 +349,199 @@ msgstr "Εισαγωγή του mailbox του OE5+ %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Εισαγωγή του φακέλου αρχείων του OE5+ %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Εισαγωγή αλληλογραφίας του Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του Opera</b></p> <p>Αυτό το "
+"φίλτρο θα εισάγει τα μηνύματα από το φάκελο αλληλογραφίας του Opera. "
+"Χρησιμοποιήστε το αν θέλετε να εισάγετε όλα τα μηνύματα ενός λογαριασμού στο "
+"maildir του Opera.</p><p>Επιλέξτε τον κατάλογο του λογαριασμού (συνήθως: ~/."
+"opera/mail/store/account*).</p><p><b>Σημείωση:</b>Τα μηνύματα θα εισαχθούν "
+"σε ένα φάκελο με το όνομα του λογαριασμού από τον οποίο προήλθαν, και με "
+"πρόθεμα OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Μέτρηση αρχείων..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Εισαγωγή νέων αρχείων μηνυμάτων..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας του Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του Outlook</b></p><p>Αυτό το "
+"φίλτρο θα εισάγει μηνύματα αλληλογραφίας από ένα αρχείο pst του Outlook. Θα "
+"πρέπει να βρείτε το φάκελο όπου βρίσκεται το αρχείο pst αναζητώντας αρχεία ."
+"pst στο: <i>C:\\Documents and Settings</i> στα Windows 2000 ή νεότερα</"
+"p><p><b>Σημείωση:</b> Τα μηνύματα θα εισαχθούν σε ένα φάκελο με όνομα "
+"αντίστοιχο του λογαριασμού από τον οποίο προήλθαν, με πρόθεμα OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Μέτρηση μηνυμάτων..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Μέτρηση καταλόγων..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Μέτρηση φακέλων..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας Απλού Κειμένου"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Επιλέξτε τον κατάλογο που περιέχει τα μηνύματα στο σύστημά σας. Τα "
+"μηνύματα θα αποθηκευτούν σε ένα φάκελο με όνομα αντίστοιχο του καταλόγου από "
+"τον οποίο προήλθαν, με πρόθεμα PLAIN-</p><p>Αυτό το φίλτρο θα εισάγει όλα τα "
+"μηνύματα .msg, .eml και .txt.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Εισαγωγή φακέλων από το Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Επιλέξτε τον κατάλογο του Pegasus-Mail στο σύστημά σας (που περιέχει *."
+"CNM, *.PMM και *.MBX αρχεία). Σε πολλά συστήματα αυτός βρίσκεται στο C:"
+"\\pmail\\mail ή C:\\pmail\\mail\\admin</p><p><b>Σημείωση:</b> Εφόσον είναι "
+"δυνατή η αντιγραφή της δομής των φακέλων, αυτοί θα αποθηκευτούν στο : "
+"\"PegasusMail-Import\".</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Αδύνατη η ανάλυση της δομής φακέλων. Η εισαγωγή θα συνεχιστεί χωρίς "
+"υποστήριξη υποφακέλων."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Εισαγωγή νέων αρχείων αλληλογραφίας ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Εισαγωγή φακέλων αλληλογραφίας ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Εισαγωγή φακέλων αλληλογραφίας 'UNIX' ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Εισαγωγή του %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Ανάλυση της δομής φακέλων..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Εισαγωγή Maildir και δομής φακέλων του Sylpheed"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 msgstr ""
-"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του Sylpheed</b></p>"
-"<p>Επιλέξτε το βασικό κατάλογο αλληλογραφίας του Sylpheed που θέλετε να "
-"εισάγετε(συνήθως: ~/Mail).</p> "
-"<p>Εφόσον είναι δυνατή η αντιγραφή της δομής των φακέλων, αυτοί θα αποθηκευτούν "
-"στο : \"Sylpheed-Import\".</p>"
-"<p>Αυτό το φίλτρο αντιγράφει επίσης και την κατάσταση των μηνυμάτων. π.χ. νέο η "
+"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του Sylpheed</b></"
+"p><p>Επιλέξτε το βασικό κατάλογο αλληλογραφίας του Sylpheed που θέλετε να "
+"εισάγετε(συνήθως: ~/Mail).</p> <p>Εφόσον είναι δυνατή η αντιγραφή της δομής "
+"των φακέλων, αυτοί θα αποθηκευτούν στο : \"Sylpheed-Import\".</p><p>Αυτό το "
+"φίλτρο αντιγράφει επίσης και την κατάσταση των μηνυμάτων. π.χ. νέο η "
 "προωθημένο."
 
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας και δομής φακέλων του The Bat!"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του The Bat!</b></"
+"p><p>Επιλέξτε το βασικό κατάλογο αλληλογραφίας του 'The Bat!' που θέλετε να "
+"εισάγετε.</p> <p><b>Σημείωση:</b> Αυτό το φίλτρο εισάγει τα αρχεία *.tbb από "
+"τον τοπικό φάκελο του 'The Bat!' local, π.χ. από λογαριασμούς POP, αλλά όχι "
+"και από IMAP/DIMAP.</p><p>Εφόσον είναι δυνατή η αντιγραφή της δομής των "
+"φακέλων, αυτοί θα αποθηκευτούν σε υποφακέλους με όνομα αντίστοιχο με τα "
+"αρχεία από τα οποία προήλθαν στο : \"TheBat-Import\" στον τοπικό σας "
+"λογαριασμό.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+"Εισαγωγή τοπικών μηνυμάτων αλληλογραφίας και δομής φακέλων από το "
+"Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας από το Thunderbird/Mozilla</"
+"b></p><p>Επιλέξτε το βασικό φάκελο ηλ. ταχυδρομείου του Thunderbird/Mozilla "
+"(συνήθως το ~/.thunderbird/*.default/Mail/Local Folders/).</p><p><b>Σημείωση:"
+"</b> Ποτέ μην επιλέξετε ένα Φάκελο που <u>δεν</u> περιέχει αρχεία mbox (για "
+"παράδειγμα, ένα maildir): αν το κάνετε, θα πάρετε πολλούς νέους φακέλους.</"
+"p><p>Εφόσον είναι δυνατή η αντιγραφή της δομής των φακέλων, αυτοί θα "
+"αποθηκευτούν στο : \"Thunderbird-Import\".</p>"
+
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Κρίσιμο:</b> Αδύνατη η εκκίνηση της επικοινωνίας DCOP του KMail. "
 "Επιβεβαιώστε ότι το <i>kmail</i> είναι εγκατεστημένο."
@@ -597,66 +558,60 @@ msgstr "Αδύνατη η προσθήκη μηνυμάτων στο φάκελ�
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Σφάλμα κατά την προσθήκη μηνυμάτων στο φάκελο %1 του KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας Απλού Κειμένου"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Από:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Επιλέξτε τον κατάλογο που περιέχει τα μηνύματα στο σύστημά σας. Τα μηνύματα "
-"θα αποθηκευτούν σε ένα φάκελο με όνομα αντίστοιχο του καταλόγου από τον οποίο "
-"προήλθαν, με πρόθεμα PLAIN-</p>"
-"<p>Αυτό το φίλτρο θα εισάγει όλα τα μηνύματα .msg, .eml και .txt.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Προς:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Εισαγωγή αρχείων mbox (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Τρέχον:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας mbox</b></p>"
-"<p>Αυτό το φίλτρο θα εισάγει αρχεία mbox στο KMail. Χρησιμοποιήστε το αν θέλετε "
-"να εισάγετε μηνύματα από το Ximian Evolution ή άλλα προγράμματα που "
-"χρησιμοποιούν αυτή την παραδοσιακή μορφή αποθήκευσης μηνυμάτων του UNIX.</p>"
-"<p><b>Σημείωση:</b> Τα μηνύματα θα εισαχθούν σε φακέλους με όνομα αντίστοιχο "
-"των αρχείων από τα οποία προήλθαν, με πρόθεμα MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Εισαγωγή σε εξέλιξη..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Αρχεία mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας και δομής φακέλων του The Bat!"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Σύνολο:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Κάντε κλικ στο 'Πίσω' για να εισάγετε περισσότερα μηνύματα ή επαφές"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Φίλτρο εισαγωγής μηνυμάτων αλληλογραφίας του The Bat!</b></p>"
-"<p>Επιλέξτε το βασικό κατάλογο αλληλογραφίας του 'The Bat!' που θέλετε να "
-"εισάγετε.</p> "
-"<p><b>Σημείωση:</b> Αυτό το φίλτρο εισάγει τα αρχεία *.tbb από τον τοπικό "
-"φάκελο του 'The Bat!' local, π.χ. από λογαριασμούς POP, αλλά όχι και από "
-"IMAP/DIMAP.</p>"
-"<p>Εφόσον είναι δυνατή η αντιγραφή της δομής των φακέλων, αυτοί θα αποθηκευτούν "
-"σε υποφακέλους με όνομα αντίστοιχο με τα αρχεία από τα οποία προήλθαν στο : "
-"\"TheBat-Import\" στον τοπικό σας λογαριασμό.</p>"
+"<b>Καλώς ήλθατε στο KMailCVT - Το εργαλείο εισαγωγής αλληλογραφίας του "
+"KMail</b>\n"
+"<br><br>\n"
+"Αυτό το πρόγραμμα θα σας βοηθήσει να εισάγετε τα μηνύματα ηλ. ταχυδρομείου "
+"σας από το προηγούμενο πρόγραμμα ηλ. ταχυδρομείου σας στο KMail."
+"<br><br><br><br>\n"
+" Επιλέξτε το πρόγραμμα από το οποίο θα γίνει η εισαγωγή, και μετά κάντε κλικ "
+"στο 'Επόμενο'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Αφαίρεση &διπλών μηνυμάτων κατά την εισαγωγή"
diff --git a/tde-i18n-en_GB/messages/tdepim/kmailcvt.po b/tde-i18n-en_GB/messages/tdepim/kmailcvt.po
index 98c51b5e3b7..b559b9c9d9c 100644
--- a/tde-i18n-en_GB/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-en_GB/messages/tdepim/kmailcvt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-12-30 13:44+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -16,25 +16,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Import Outlook Emails"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Malcolm Hunter"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "malcolm.hunter@gmx.co.uk"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT Import Tool"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Step 1: Select Filter"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Step 2: Importing..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Import in progress"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import finished"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Written by %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail Import Filters"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, The KMailCVT developers"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Original author"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Maintainer & New filters"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "New GUI & cleanups"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Import Evolution 1.x Local Mails and Folder Structure"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -44,27 +100,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "No directory selected."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Counting files..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Counting mail..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Counting directories..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Counting folders..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Importing new mail files..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -72,6 +107,22 @@ msgstr "Importing new mail files..."
 msgid "No files found for import."
 msgstr "No files found for import."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Finished importing emails from %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Unable to open %1, skipping"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -89,39 +140,37 @@ msgstr ""
 "1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Unable to open %1, skipping"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Import Evolution 2.x Local Mails and Folder Structure"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Finished importing emails from %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Finished import, cancelled by user."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Start import file %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -129,129 +178,32 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Import Folders From Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importing new mail files ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importing mail folders ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importing 'UNIX' mail folders ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importing %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Message %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Parsing the folder structure..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Written by %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Import Lotus Notes Emails"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "All Files (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Importing emails from %1"
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Import KMail Maildirs and Folder Structure"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Finished import, cancelled by user."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -264,190 +216,41 @@ msgstr "Import folder %1..."
 msgid "Could not import %1"
 msgstr "Could not import %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Start import file %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Import Opera Emails"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Import Evolution 2.x Local Mails and Folder Structure"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "From:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "To:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Current:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Importing in progress..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Total:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Click 'Back' to import more emails or contacts"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Import Lotus Notes Emails"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Remove &duplicate messages during import"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail Import Filters"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, The KMailCVT developers"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Original author"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Maintainer & New filters"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "New GUI & cleanups"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "All Files (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Malcolm Hunter"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Importing emails from %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "malcolm.hunter@gmx.co.uk"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Message %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -455,11 +258,11 @@ msgstr "Import From OS X Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -469,25 +272,27 @@ msgstr ""
 "1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT Import Tool"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Step 1: Select Filter"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Step 2: Importing..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Import mbox Files (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Import in progress"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import finished"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox Files (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -495,23 +300,19 @@ msgstr "Import Outlook Express Emails"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 
@@ -548,45 +349,66 @@ msgstr "Importing OE5+ Mailbox %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importing OE5+ Folder file %1"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "Import Sylpheed Maildirs and Folder Structure"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Import Opera Emails"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Counting files..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Importing new mail files..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Import Outlook Emails"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "Cannot make folder %1 in KMail"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Counting mail..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "Cannot add message to folder %1 in KMail"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Counting directories..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Error while adding message to folder %1 in KMail"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Counting folders..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -595,38 +417,79 @@ msgstr "Import Plain Text Emails"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Import mbox Files (UNIX, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Import Folders From Pegasus-Mail"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox Files (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importing new mail files ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importing mail folders ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importing 'UNIX' mail folders ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importing %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Parsing the folder structure..."
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "Import Sylpheed Maildirs and Folder Structure"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -634,18 +497,111 @@ msgstr "Import The Bat! Mails and Folder Structure"
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "Cannot make folder %1 in KMail"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "Cannot add message to folder %1 in KMail"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Error while adding message to folder %1 in KMail"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "From:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "To:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Current:"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Importing in progress..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Total:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Click 'Back' to import more emails or contacts"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Remove &duplicate messages during import"
diff --git a/tde-i18n-eo/messages/tdepim/kmailcvt.po b/tde-i18n-eo/messages/tdepim/kmailcvt.po
index e0537581e94..576efc70d87 100644
--- a/tde-i18n-eo/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-eo/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2002-05-05 01:09GMT\n"
 "Last-Translator: Steffen Pietsch <Steffen.Pietsch@berlinonline.de>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
@@ -15,19 +15,78 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: filter_outlook.cxx:28
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Wolfram Diestel Steffen Pietsch"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "wolfram@steloj.de Steffen.Pietsch@BerlinOnline.de"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr ""
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: kmailcvt.cpp:34
 #, fuzzy
-msgid "Import Outlook Emails"
+msgid "Step 2: Importing..."
+msgstr "&Importu"
+
+#: kmailcvt.cpp:76
+#, fuzzy
+msgid "Import in progress"
 msgstr "Importo de Aŭtluko Ekspresa 4"
 
-#: filter_outlook.cxx:30
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr ""
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr ""
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr ""
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr ""
+
+#: main.cpp:36
+msgid "Original author"
+msgstr ""
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr ""
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
@@ -38,31 +97,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Nombrante dosierojn..."
-
-#: filter_outlook.cxx:46
-#, fuzzy
-msgid "Counting mail..."
-msgstr "Nombrante dosierojn..."
-
-#: filter_outlook.cxx:47
-#, fuzzy
-msgid "Counting directories..."
-msgstr "Nombrante dosierojn..."
-
-#: filter_outlook.cxx:48
-#, fuzzy
-msgid "Counting folders..."
-msgstr "Nombrante dosierojn..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-#, fuzzy
-msgid "Importing new mail files..."
-msgstr "Importante novajn retpoŝtdosierojn ('.cnm')..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -70,6 +104,23 @@ msgstr "Importante novajn retpoŝtdosierojn ('.cnm')..."
 msgid "No files found for import."
 msgstr ""
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr ""
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#, fuzzy
+msgid "Unable to open %1, skipping"
+msgstr "Ne eblis malfermi %1 por legado"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 #, fuzzy
@@ -86,34 +137,30 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "Eraro dum aldono de mesaĝo al mesaĝujo %1 en Retpoŝtilo"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-#, fuzzy
-msgid "Unable to open %1, skipping"
-msgstr "Ne eblis malfermi %1 por legado"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr ""
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
 #: filter_kmail_archive.cxx:24
@@ -122,108 +169,24 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-#, fuzzy
-msgid "Import Folders From Pegasus-Mail"
-msgstr "IMporto de Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importante novajn retpoŝtdosierojn ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importante mesaĝujojn ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importante 'unix'-mesaĝujojn ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr ""
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr ""
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr ""
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
-
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "Importo de Aŭtluko Ekspresa 4"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:64
-#, fuzzy, c-format
-msgid "Importing emails from %1"
-msgstr "Importante mesaĝujojn ('.pmm')..."
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
@@ -238,159 +201,36 @@ msgstr "Importante mesaĝujojn ('.pmm')..."
 msgid "Could not import %1"
 msgstr "Ne eblas legi poŝtkeston %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr ""
-
-#: filter_opera.cxx:28
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid "Import Opera Emails"
-msgstr "Importo de Aŭtluko Ekspresa 4"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, fuzzy, no-c-format
-msgid "From:"
-msgstr "De: %1"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Al"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, fuzzy, no-c-format
-msgid "Current:"
-msgstr "nuna:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "Importing in progress..."
+msgid "Import Lotus Notes Emails"
 msgstr "Importo de Aŭtluko Ekspresa 4"
 
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, fuzzy, no-c-format
-msgid "Total:"
-msgstr "Al"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr ""
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr ""
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr ""
-
-#: main.cpp:36
-msgid "Original author"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
 msgstr ""
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
+#: filter_lnotes.cxx:64
+#, fuzzy, c-format
+msgid "Importing emails from %1"
+msgstr "Importante mesaĝujojn ('.pmm')..."
 
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Wolfram Diestel Steffen Pietsch"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "wolfram@steloj.de Steffen.Pietsch@BerlinOnline.de"
-
 #: filter_mailapp.cxx:32
 #, fuzzy
 msgid "Import From OS X Mail"
@@ -398,8 +238,8 @@ msgstr "IMporto de Pegasus-Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
@@ -409,26 +249,21 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "Eraro dum aldono de mesaĝo al mesaĝujo %1 en Retpoŝtilo"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
 msgstr ""
 
-#: kmailcvt.cpp:34
-#, fuzzy
-msgid "Step 2: Importing..."
-msgstr "&Importu"
-
-#: kmailcvt.cpp:76
-#, fuzzy
-msgid "Import in progress"
-msgstr "Importo de Aŭtluko Ekspresa 4"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
 msgstr ""
 
 #: filter_oe.cxx:40
@@ -438,13 +273,11 @@ msgstr "Importo de Aŭtluko Ekspresa 4"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
@@ -484,25 +317,160 @@ msgstr ""
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importante mesaĝujojn ('.pmm')..."
 
+#: filter_opera.cxx:28
+#, fuzzy
+msgid "Import Opera Emails"
+msgstr "Importo de Aŭtluko Ekspresa 4"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Nombrante dosierojn..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#, fuzzy
+msgid "Importing new mail files..."
+msgstr "Importante novajn retpoŝtdosierojn ('.cnm')..."
+
+#: filter_outlook.cxx:28
+#, fuzzy
+msgid "Import Outlook Emails"
+msgstr "Importo de Aŭtluko Ekspresa 4"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+
+#: filter_outlook.cxx:46
+#, fuzzy
+msgid "Counting mail..."
+msgstr "Nombrante dosierojn..."
+
+#: filter_outlook.cxx:47
+#, fuzzy
+msgid "Counting directories..."
+msgstr "Nombrante dosierojn..."
+
+#: filter_outlook.cxx:48
+#, fuzzy
+msgid "Counting folders..."
+msgstr "Nombrante dosierojn..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr ""
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+
+#: filter_pmail.cxx:31
+#, fuzzy
+msgid "Import Folders From Pegasus-Mail"
+msgstr "IMporto de Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importante novajn retpoŝtdosierojn ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importante mesaĝujojn ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importante 'unix'-mesaĝujojn ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr ""
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 #, fuzzy
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "GRAVA ERARO: Ne eblis lanĉi Retpoŝtilon cele al DCOP-komunikado\n"
 "             certigu, ke Retpoŝtilo 'KMail' estas trovebla en via pado."
@@ -522,49 +490,54 @@ msgstr "Ne eblas aldoni mesaĝon al mesaĝujo %1 en Retpoŝtilo"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Eraro dum aldono de mesaĝo al mesaĝujo %1 en Retpoŝtilo"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr ""
+#: kimportpagedlg.ui:91
+#, fuzzy, no-c-format
+msgid "From:"
+msgstr "De: %1"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
+#: kimportpagedlg.ui:99
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Al"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr ""
+#: kimportpagedlg.ui:107
+#, fuzzy, no-c-format
+msgid "Current:"
+msgstr "nuna:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
+#: kimportpagedlg.ui:115
+#, fuzzy, no-c-format
+msgid "Importing in progress..."
+msgstr "Importo de Aŭtluko Ekspresa 4"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
 msgstr ""
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
+#: kimportpagedlg.ui:158
+#, fuzzy, no-c-format
+msgid "Total:"
+msgstr "Al"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
 
 #, fuzzy
@@ -762,8 +735,10 @@ msgstr ""
 #~ "Tradukoj estas same bonvenaj!"
 
 #, fuzzy
-#~ msgid "A little tool to convert mail boxes and address books to KMail format"
-#~ msgstr "Ileto por konverti leterujojn kaj adresarojn por uzo kun TDEa Retpoŝtilo"
+#~ msgid ""
+#~ "A little tool to convert mail boxes and address books to KMail format"
+#~ msgstr ""
+#~ "Ileto por konverti leterujojn kaj adresarojn por uzo kun TDEa Retpoŝtilo"
 
 #~ msgid "Kmailcvt2"
 #~ msgstr "Retpoŝtimportilo 2"
diff --git a/tde-i18n-es/messages/tdepim/kmailcvt.po b/tde-i18n-es/messages/tdepim/kmailcvt.po
index 5e4d6163a8e..da61af20bd6 100644
--- a/tde-i18n-es/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-es/messages/tdepim/kmailcvt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-10-03 13:05+0200\n"
 "Last-Translator: Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>\n"
 "Language-Team: Spanish <kde-es@kybs.de>\n"
@@ -19,26 +19,82 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Importar correos de Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Juan Manuel García Molina,Jaime Robles"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "juanma@superiodico.net,jaime@kde.org"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Herramienta de importación de KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Paso 1: Seleccione el filtro"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Step 2: Importando..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importación en curso"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Importación terminada"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Escrito por %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Filtros de importación de KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, los desarrolladores de KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Autor original"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Encargado y filtros nuevos"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nueva interfaz gráfica y limpiezas"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+"Importar los correos y la estructura local de carpetas de Evolution 1.x"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Filtro de importación de correo de Outlook</b></p>"
-"<p>Este filtro importará los correos desde un archivo pst de Outlook. Tendrá "
-"que localizar la carpeta en la que esté almacenado el archivo pst, buscando "
-"archivos «.pst» en: <i>C:\\Documents and Settings</i> "
-"en Windows 2000 o posteriores.</p>"
-"<p><b>Aviso:</b> los correos se importarán a una carpeta con el mismo nombre "
-"que la cuenta de la que provienen, con el prefijo «OUTLOOK-».</p>"
+"<p><b>Filtro de importación de Evolution 1.x</b></p><p>Seleccione el "
+"directorio base de los correos de Evolution (normalmente, ~/evolution/local)."
+"</p><p>Dado que es posible recrear la estructura de carpetas, dichas "
+"carpetas se almacenarán en «Evolution-Import».</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -48,27 +104,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "No hay ningún directorio seleccionado."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Contando archivos..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Contando los mensajes..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Contando los directorios..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Contando las carpetas..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Importando nuevos archivos de correo..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -76,6 +111,22 @@ msgstr "Importando nuevos archivos de correo..."
 msgid "No files found for import."
 msgstr "No se encontró ningún archivo para importar."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Terminó la importación de mensajes de %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "No se puede abrir %1, se ignora"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -93,40 +144,39 @@ msgstr ""
 "1 mensaje duplicado no importado\n"
 "%n mensajes duplicados no importados"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "No se puede abrir %1, se ignora"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
-"Importar los correos y la estructura local de carpetas de Evolution 1.x"
+"Importar los correos y la estructura local de carpetas de Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Filtro de importación de Evolution 1.x</b></p>"
-"<p>Seleccione el directorio base de los correos de Evolution (normalmente, "
-"~/evolution/local).</p>"
-"<p>Dado que es posible recrear la estructura de carpetas, dichas carpetas se "
-"almacenarán en «Evolution-Import».</p>"
+"<p><b>Filtro de importación de Evolution 2.x</b></p><p>Seleccione el "
+"directorio base de su carpeta de correo local de Evolution (generalmente, ~/."
+"evolution/mail/local/).</p><p><b>Aviso:</b> no seleccione nunca una carpeta "
+"que <u>no</u> contenga archivos mbox (por ejemplo, un directorio de correo), "
+"puesto que si lo hace tendrá muchas carpetas nuevas.</p><p>Dado que es "
+"posible recrear la estructura de carpetas, dichas carpetas se almacenarán en "
+"«Evolution-Import».</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Terminó la importación de mensajes de %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Importación finalizada, cancelada por el usuario."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Iniciar la importación del archivo %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -134,132 +184,33 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importar las carpetas de Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Seleccione el directorio de Pegasus-Mail en su sistema (el que contenga los "
-"archivos *.CNM, *.PMN y *.MBX). En muchos sistemas están almacenados en "
-"C:\\pmail\\mail o C:\\pmail\\mail\\admin</p>"
-"<p><b>Nota:</b> Dado que es posible recrear la estructura de carpetas, dichas "
-"carpetas se almacenarán en «PegasusMail-Import».</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"No se puede analizar la estructura de carpetas. Se continúa la importación sin "
-"soporte para subcarpetas."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importando nuevos archivos de correo ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importando carpetas de correo ('.pmm') ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importando carpetas de correo 'UNIX' ('.mbx') ..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importando %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Mensaje %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Analizando la estructura de carpetas..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Escrito por %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Importar correos de Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Filtro de importación de correos de texto estructurado de Lotus Notes</b>"
-"</p>"
-"<p>Este filtro importará los archivos de texto estructurado del cliente de "
-"correo electronico de Lotus Notes a KMail. Use este filtro si quiere importar "
-"mensajes desde Lotus o desde otros clientes que usen el formato de texto "
-"estructurado de Lotus Notes.</p>"
-"<p><b>Nota:</b> Dado que es posible recrear la estructura de carpetas, los "
-"mensajes importados se almacenarán en subcarpetas de la carpeta local "
-"«LNotes-Import», con los nombres de los archivos de los que provienen.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Todos los archivos (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Importando mensajes de %1"
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importar carpetas de correo y estructura de carpetas de KMail"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Filtro de importación de KMail</b></p>"
-"<p>Seleccione el directorio base de la carpeta de correo de KMail que quiera "
-"importar.</p>"
-"<p><b>Nota:</b> No seleccione su carpeta de correo local de KMail (normalmente "
-"~/Mail o ~/.trinity/share/apps/kmail/mail ). En este caso, KMailCVT puede "
-"entrar en un bucle infinito. </p>"
-"<p>Este filtro no importa las carpetas de correo de KMail con archivos mbox.</p>"
-"<p>Dado que es posible recrear la estructura de carpetas, dichas carpetas se "
-"almacenan en «KMail-Import», en su carpeta local.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Importación finalizada, cancelada por el usuario."
+"<p><b>Filtro de importación de KMail</b></p><p>Seleccione el directorio base "
+"de la carpeta de correo de KMail que quiera importar.</p><p><b>Nota:</b> No "
+"seleccione su carpeta de correo local de KMail (normalmente ~/Mail o ~/."
+"trinity/share/apps/kmail/mail ). En este caso, KMailCVT puede entrar en un "
+"bucle infinito. </p><p>Este filtro no importa las carpetas de correo de "
+"KMail con archivos mbox.</p><p>Dado que es posible recrear la estructura de "
+"carpetas, dichas carpetas se almacenan en «KMail-Import», en su carpeta "
+"local.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -272,193 +223,42 @@ msgstr "Importar la carpeta %1..."
 msgid "Could not import %1"
 msgstr "No se pudo importar %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-"Importar los correos y la estructura de carpetas de Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Filtro de importación de Thunderbird/Mozilla</b></p>"
-"<p>Seleccione su carpeta de correo base de Thunderbird/Mozilla (normalmente, "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Aviso:</b> No seleccione nunca una carpeta que <u>no</u> "
-"contenga archivos mbox (por ejemplo, una maildir). Si lo hace, obtendrá muchas "
-"carpetas nuevas.</p>"
-"<p>Dado que es posible recrear la estructura de carpetas, dichas carpetas se "
-"almacenarán en «Thunderbird-Import».</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Iniciar la importación del archivo %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Importar correos de Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Filtro de importación de correo de Opera</b></p>"
-"<p>Este filtro importará correos desde carpetas de correo de Opera. Use este "
-"filtro si quiere importar todos los correos de una cuenta del directorio de "
-"correo de Opera.</p>"
-"<p>Seleccione el directorio de la cuenta (normalmente "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Aviso:</b> los correos se importarán a una carpeta con el mismo nombre de "
-"cuenta del que procedan, con el prefijo «OPERA-».</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
-"Importar los correos y la estructura local de carpetas de Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Filtro de importación de Evolution 2.x</b></p>"
-"<p>Seleccione el directorio base de su carpeta de correo local de Evolution "
-"(generalmente, ~/.evolution/mail/local/).</p>"
-"<p><b>Aviso:</b> no seleccione nunca una carpeta que <u>no</u> "
-"contenga archivos mbox (por ejemplo, un directorio de correo), puesto que si lo "
-"hace tendrá muchas carpetas nuevas.</p>"
-"<p>Dado que es posible recrear la estructura de carpetas, dichas carpetas se "
-"almacenarán en «Evolution-Import».</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "De:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Para:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Actual:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Importación en curso..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Total:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Haga clic en «Atrás» para importar más correos o contactos"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Importar correos de Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Bienvenido a KMailCVT - la herramienta de importación de KMail</b>\n"
-"<br>"
-"<br>\n"
-"Este programa le ayudará a importar los correos electrónicos de su anterior "
-"programa de correo a KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Seleccione el programa desde el que quiera importar y luego pulse «Siguiente»."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Eliminar los mensajes &duplicados durante la importación"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
+"<p><b>Filtro de importación de correos de texto estructurado de Lotus Notes</"
+"b></p><p>Este filtro importará los archivos de texto estructurado del "
+"cliente de correo electronico de Lotus Notes a KMail. Use este filtro si "
+"quiere importar mensajes desde Lotus o desde otros clientes que usen el "
+"formato de texto estructurado de Lotus Notes.</p><p><b>Nota:</b> Dado que es "
+"posible recrear la estructura de carpetas, los mensajes importados se "
+"almacenarán en subcarpetas de la carpeta local «LNotes-Import», con los "
+"nombres de los archivos de los que provienen.</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Filtros de importación de KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, los desarrolladores de KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Autor original"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Encargado y filtros nuevos"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nueva interfaz gráfica y limpiezas"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Todos los archivos (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Juan Manuel García Molina,Jaime Robles"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Importando mensajes de %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "juanma@superiodico.net,jaime@kde.org"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Mensaje %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -466,12 +266,11 @@ msgstr "Importar de OS X Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Filtro de importación de OS X Mail</b></p>"
-"<p>Este filtro importa los correos electrónicos del cliente de correo de Apple "
-"Mac OS X.</p>"
+"<p><b>Filtro de importación de OS X Mail</b></p><p>Este filtro importa los "
+"correos electrónicos del cliente de correo de Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -481,25 +280,27 @@ msgstr ""
 "1 mensaje duplicado no importado a la carpeta %1 de KMail\n"
 "%n mensajes duplicados no importados a la carpeta %1 de KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Herramienta de importación de KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Paso 1: Seleccione el filtro"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Step 2: Importando..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importar archivos mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importación en curso"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Filtro de importación de mbox</b></p><p>Este filtro importará sus "
+"archivos mbox a KMail. Use este filtro si quiere importar mensajes de Ximian "
+"Evolution u otros programas de correo que usen este formato tradicional de "
+"Unix.</p><p><b>Nota:</b> Los correos electrónicos se importarán en carpetas "
+"con un nombre que muestre su origen, con el prefijo MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Importación terminada"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Archivos mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -507,25 +308,21 @@ msgstr "Importar correos de Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Filtro de importación para Outlook Express 4/5/6</b></p>"
-"<p>Tiene que localizar la carpeta en la que se guarda el buzón. Busque archivos "
-".dbx o .mbx en "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> en Windows 9x</li>"
-"<li><i>Documents and Settings</i> en Windows 2000 y posteriores</li></ul></p>"
-"<p><b>Aviso:</b> Dado que es posible recrear la estructura de carpetas de "
-"Outlook Express 5 y 6, dichas carpetas se almacenarán en «OE-Import», en su "
-"carpeta local.</p>"
+"<p><b>Filtro de importación para Outlook Express 4/5/6</b></p><p>Tiene que "
+"localizar la carpeta en la que se guarda el buzón. Busque archivos .dbx o ."
+"mbx en <ul><li><i>C:\\Windows\\Application Data</i> en Windows 9x</"
+"li><li><i>Documents and Settings</i> en Windows 2000 y posteriores</li></"
+"ul></p><p><b>Aviso:</b> Dado que es posible recrear la estructura de "
+"carpetas de Outlook Express 5 y 6, dichas carpetas se almacenarán en «OE-"
+"Import», en su carpeta local.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -561,46 +358,67 @@ msgstr "Importando el buzón de OE5+ %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importando el archivo %1 de la carpeta de OE5+"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "Importar los correos y la estructura de carpetas de Sylpheed"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Importar correos de Opera"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
-"<p><b>Filtro de importación de Sylpheed</b></p>"
-"<p>Seleccione el directorio base de la carpeta de correo de Sylpheed que quiera "
-"importar (normalmente, ~/Mail).</p>"
-"<p>Dado que es posible recrear la estructura de carpetas, dichas carpetas se "
-"almacenarán en «Sylpheed-Import», en su carpeta local.</p>"
-"<p>Este filtro también recrea el estado del mensaje, por ejemplo nuevo o "
-"reenviado."
+"<p><b>Filtro de importación de correo de Opera</b></p><p>Este filtro "
+"importará correos desde carpetas de correo de Opera. Use este filtro si "
+"quiere importar todos los correos de una cuenta del directorio de correo de "
+"Opera.</p><p>Seleccione el directorio de la cuenta (normalmente ~/.opera/"
+"mail/store/account*).</p><p><b>Aviso:</b> los correos se importarán a una "
+"carpeta con el mismo nombre de cuenta del que procedan, con el prefijo "
+"«OPERA-».</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Contando archivos..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Importando nuevos archivos de correo..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Importar correos de Outlook"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>Fatal:</b> No se puede comenzar KMail para una comunicación DCOP. Asegúrese "
-"de que <i>kmail</i> está instalado."
+"<p><b>Filtro de importación de correo de Outlook</b></p><p>Este filtro "
+"importará los correos desde un archivo pst de Outlook. Tendrá que localizar "
+"la carpeta en la que esté almacenado el archivo pst, buscando archivos «."
+"pst» en: <i>C:\\Documents and Settings</i> en Windows 2000 o posteriores.</"
+"p><p><b>Aviso:</b> los correos se importarán a una carpeta con el mismo "
+"nombre que la cuenta de la que provienen, con el prefijo «OUTLOOK-».</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "No es posible crear la carpeta %1 en KMail"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Contando los mensajes..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "No es posible añadir el mensaje a la carpeta %1 en KMail"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Contando los directorios..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Error al añadir el mensaje a la carpeta %1 en KMail"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Contando las carpetas..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -609,38 +427,80 @@ msgstr "Importar mensajes de texto plano"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 "<p>Seleccione el directorio que contenga los correos electrónicos en su "
 "sistema. Los correos se ubican en una carpeta con el mismo nombre que el "
-"directorio en el que están, poniendo como prefijo PLAIN-</p> "
-"<p>Este filtro importará todos los correos electrónicos .msg, .eml y .txt.</p>"
+"directorio en el que están, poniendo como prefijo PLAIN-</p> <p>Este filtro "
+"importará todos los correos electrónicos .msg, .eml y .txt.</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importar archivos mbox (UNIX, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importar las carpetas de Pegasus-Mail"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>Filtro de importación de mbox</b></p>"
-"<p>Este filtro importará sus archivos mbox a KMail. Use este filtro si quiere "
-"importar mensajes de Ximian Evolution u otros programas de correo que usen este "
-"formato tradicional de Unix.</p>"
-"<p><b>Nota:</b> Los correos electrónicos se importarán en carpetas con un "
-"nombre que muestre su origen, con el prefijo MBOX-</p>"
+"<p>Seleccione el directorio de Pegasus-Mail en su sistema (el que contenga "
+"los archivos *.CNM, *.PMN y *.MBX). En muchos sistemas están almacenados en "
+"C:\\pmail\\mail o C:\\pmail\\mail\\admin</p><p><b>Nota:</b> Dado que es "
+"posible recrear la estructura de carpetas, dichas carpetas se almacenarán en "
+"«PegasusMail-Import».</p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Archivos mbox (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"No se puede analizar la estructura de carpetas. Se continúa la importación "
+"sin soporte para subcarpetas."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importando nuevos archivos de correo ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importando carpetas de correo ('.pmm') ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importando carpetas de correo 'UNIX' ('.mbx') ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importando %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Analizando la estructura de carpetas..."
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "Importar los correos y la estructura de carpetas de Sylpheed"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Filtro de importación de Sylpheed</b></p><p>Seleccione el directorio "
+"base de la carpeta de correo de Sylpheed que quiera importar (normalmente, ~/"
+"Mail).</p><p>Dado que es posible recrear la estructura de carpetas, dichas "
+"carpetas se almacenarán en «Sylpheed-Import», en su carpeta local.</"
+"p><p>Este filtro también recrea el estado del mensaje, por ejemplo nuevo o "
+"reenviado."
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -648,18 +508,114 @@ msgstr "Importar los correos y la estructura de carpetas de The Bat!"
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>El filtro de importación de The Bat!</b></p><p>Seleccione el "
+"directorio base de las carpetas de correo local de «The Bat!» que quiera "
+"importar.</p><p><b>Aviso:</b> Este filtro importa los archivos *.ttb de la "
+"carpeta local de «The Bat!», por ejemplo, de cuentas POP y no de cuentas "
+"IMAP/DIMAP.</p><p>Dado que es posible recrear la estructura de carpetas, "
+"dichas carpetas se almacenarán en «TheBat-Import», en su cuenta local.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
 msgstr ""
-"<p><b>El filtro de importación de The Bat!</b></p>"
-"<p>Seleccione el directorio base de las carpetas de correo local de «The Bat!» "
-"que quiera importar.</p>"
-"<p><b>Aviso:</b> Este filtro importa los archivos *.ttb de la carpeta local de "
-"«The Bat!», por ejemplo, de cuentas POP y no de cuentas IMAP/DIMAP.</p>"
-"<p>Dado que es posible recrear la estructura de carpetas, dichas carpetas se "
-"almacenarán en «TheBat-Import», en su cuenta local.</p>"
+"Importar los correos y la estructura de carpetas de Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Filtro de importación de Thunderbird/Mozilla</b></p><p>Seleccione su "
+"carpeta de correo base de Thunderbird/Mozilla (normalmente, ~/.thunderbird/*."
+"default/Mail/Local Folders/).</p><p><b>Aviso:</b> No seleccione nunca una "
+"carpeta que <u>no</u> contenga archivos mbox (por ejemplo, una maildir). Si "
+"lo hace, obtendrá muchas carpetas nuevas.</p><p>Dado que es posible recrear "
+"la estructura de carpetas, dichas carpetas se almacenarán en «Thunderbird-"
+"Import».</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b>Fatal:</b> No se puede comenzar KMail para una comunicación DCOP. "
+"Asegúrese de que <i>kmail</i> está instalado."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "No es posible crear la carpeta %1 en KMail"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "No es posible añadir el mensaje a la carpeta %1 en KMail"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Error al añadir el mensaje a la carpeta %1 en KMail"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "De:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Para:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Actual:"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Importación en curso..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Total:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Haga clic en «Atrás» para importar más correos o contactos"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Bienvenido a KMailCVT - la herramienta de importación de KMail</b>\n"
+"<br><br>\n"
+"Este programa le ayudará a importar los correos electrónicos de su anterior "
+"programa de correo a KMail.<br><br><br><br>\n"
+" Seleccione el programa desde el que quiera importar y luego pulse "
+"«Siguiente»."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Eliminar los mensajes &duplicados durante la importación"
diff --git a/tde-i18n-et/messages/tdepim/kmailcvt.po b/tde-i18n-et/messages/tdepim/kmailcvt.po
index e8f229c90ac..3ba74278be3 100644
--- a/tde-i18n-et/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-et/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-12-30 11:39+0300\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -15,25 +15,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.2beta2\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Outlooki kirjade import"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Peeter Russak"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "pezz@tkwcy.ee"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT impordivahend"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "1. samm: filtri valimine"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "2. samm: importimine..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Import käib"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import lõpetatud"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Kirjutanud %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMaili impordifiltrid"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005: KMailCVT arendajad"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Algne autor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Hooldaja ja uued filtrid"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Uus GUI ja puhastustegevus"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Evolution 1.x kohalike kirjade ja kaustastruktuuri import"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlooki kirjade importfilter</b></p>"
-"<p>See filter impordib kirjad Outlooki pst-failist. Selleks tuleb tuvastada "
-"kataloog, kuhu pst-fail on salvestatud - otsides .pst-faile kataloogis <i>"
-"C:\\Documents and Settings</i> Windows 2000 või uuema puhul.</p>"
-"<p><b>Märkus:</b> kirjad imporditakse kaustadesse, mis saavad nime faili järgi, "
-"millest nad imporditi, ning lisaks prefiksi OUTLOOK-.</p>"
+"<p><b>Evolution 1.x impordifilter</b></p><p>Vali Evolutioni kirjade "
+"baaskaust (tavaliselt ~/evolution/local).</p><p>Kaustastruktuuri taasloomise "
+"huvides salvestatakse kaustad kausta \"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -43,27 +98,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Kataloogi pole valitud."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Failide loendamine..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Kirjade loendamine..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Kataloogide loendamine..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Kaustade loendamine..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Uute kirjafailide importimine..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -71,6 +105,22 @@ msgstr "Uute kirjafailide importimine..."
 msgid "No files found for import."
 msgstr "Importimiseks ei leitud ühtki faili."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Kirjade import %1-st lõpetatud"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "%1 avamine ebaõnnestus, jäetakse vahele"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -88,38 +138,36 @@ msgstr ""
 "1 topeltkiri jäi importimata\n"
 "%n topeltkirja jäi importimata"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "%1 avamine ebaõnnestus, jäetakse vahele"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Evolution 1.x kohalike kirjade ja kaustastruktuuri import"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Evolution 2.x kohalike kirjade ja kaustastruktuuri import"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x impordifilter</b></p>"
-"<p>Vali Evolutioni kirjade baaskaust (tavaliselt ~/evolution/local).</p>"
-"<p>Kaustastruktuuri taasloomise huvides salvestatakse kaustad kausta "
-"\"Evolution-Import\".</p>"
+"<p><b>Evolutin 2.x importfilter</b></p><p>Vali Evolutioni kohalike kirjade "
+"baaskaust (tavaliselt ~/.evolution/mail/local/).</p><p><b>Märkus:</b> ära "
+"vali kunagi kausta, mis <u>ei sisalda</u> mbox-faile (näiteks maildir). Kui "
+"sa seda siiski teed, saad õige palju uusi kaustu.</p><p>Kaustastruktuuri "
+"taasloomise huvides salvestatakse kaustad kausta \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Kirjade import %1-st lõpetatud"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Import lõpetatud - kasutaja katkestas."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Faili %1 impordi alustamine..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -127,98 +175,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Pegasus-Maili kaustade import"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Vali Pegasus-Maili kataloog (sisaldab *.CNM, *.PMM ja *.MBX faile). Paljudes "
-"süsteemides on selle asukoht C:\\pmail\\mail või C:\\pmail\\mail\\admin</p>"
-"<p><b>Märkus:</b> kaustastruktuuri taasloomise huvides salvestatakse kaustad "
-"kausta \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"Kaustastruktuuri parsimine ebaõnnestus. Importi jätkatakse ilma alamkaustade "
-"toetuseta."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Uute kirjade ('.cnm') importimine..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Kaustade importimine ('.pmm') ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "'unix' kaustade importimine ('.mbx') ..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "%1 import"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Kiri %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Kaustastruktuuri parsimine..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Kirjutanud %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Lotus Notesi kirjade import"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Lotus Notesi struktureeritud tekstiga kirjade importfilter</b></p>"
-"<p>See filter impordib struktureeritud tekstiga failid eksporditud Lotus Notesi "
-"e-posti kliendist KMaili. Kasuta seda, kui soovid importida kirju Lotus "
-"Notesist või mõnest muust e-posti rakendusest, mis kasutab Lotus Notesi "
-"struktureeritud teksti vormingut.</p>"
-"<p><b>Märkus:</b> võimalik on taasluua ka kaustastruktuur, mistõttu kirjad "
-"imporditakse alamkaustadesse, mis saavad nime faili järgi, millest nad "
-"imporditi, ning lisaks prefiksi \"LNotes-Import\".</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Kõik failid (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Kirjade importimine: %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -226,31 +186,22 @@ msgstr "KMaili kirjakaustade ja kaustastruktuuri import"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>KMaili importfilter</b></p>"
-"<p>Vali KMaili kohalike kirjade baaskaust.</p>"
-"<p><b>Märkus:</b> ära vali kunagi oma aktiivset kohalikku KMaili kirjakausta "
-"(tavaliselt ~/Mail või ~/.trinity/share/apps/kmail/mail ). Sellisel juhul tekib "
-"importimistööriistal lahendamatu probleem ja see hangub.</p>"
-"<p>Filter ei impordi KMaili kirjakaustu mbox-failidega.</p>"
-"<p>Kaustastruktuuri taasloomise huvides salvestatakse kaustad kausta "
+"<p><b>KMaili importfilter</b></p><p>Vali KMaili kohalike kirjade baaskaust.</"
+"p><p><b>Märkus:</b> ära vali kunagi oma aktiivset kohalikku KMaili "
+"kirjakausta (tavaliselt ~/Mail või ~/.trinity/share/apps/kmail/mail ). "
+"Sellisel juhul tekib importimistööriistal lahendamatu probleem ja see hangub."
+"</p><p>Filter ei impordi KMaili kirjakaustu mbox-failidega.</"
+"p><p>Kaustastruktuuri taasloomise huvides salvestatakse kaustad kausta "
 "\"KMail-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Import lõpetatud - kasutaja katkestas."
-
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
 msgstr "Kausta %1 import..."
@@ -262,190 +213,42 @@ msgstr "Kausta %1 import..."
 msgid "Could not import %1"
 msgstr "%1 import ebaõnnestus"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Thunderbirdi/Mozilla kohalike kirjade ja kaustastruktuuri import"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbirdi/Mozilla importfilter</b></p>"
-"<p>Vali Thunderbirdi/Mozilla baaskaust (tavaliselt "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Märkus:</b> ära vali kunagi kausta, mis <u>ei sisalda</u> "
-"mbox-faile (näiteks maildir). Kui sa seda siiski teed, saad õige palju uusi "
-"kaustu.</p>"
-"<p>Kaustastruktuuri taasloomise huvides luuakse kaustad kausta "
-"\"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Faili %1 impordi alustamine..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Opera kirjade import"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera kirjade importfilter</b></p>"
-"<p>See filter impordib Opera kirjakaustas leiduvad kirjad. Kasuta seda, kui "
-"soovid importida kõik oma kirjad Opera maildir-kaustast.</p>"
-"<p>Vali konto kaust (tavaliselt ~/.opera/mail/store/account*).</p>"
-"<p><b>Märkus:</b> kirjad imporditakse kaustadesse, mis saavad nime faili järgi, "
-"millest nad imporditi, ning lisaks prefiksi OPERA-.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Evolution 2.x kohalike kirjade ja kaustastruktuuri import"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolutin 2.x importfilter</b></p>"
-"<p>Vali Evolutioni kohalike kirjade baaskaust (tavaliselt "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Märkus:</b> ära vali kunagi kausta, mis <u>ei sisalda</u> "
-"mbox-faile (näiteks maildir). Kui sa seda siiski teed, saad õige palju uusi "
-"kaustu.</p>"
-"<p>Kaustastruktuuri taasloomise huvides salvestatakse kaustad kausta "
-"\"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Kust:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Kuhu:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Praegune:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Import käib..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Kokku:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Palun klõpsa nupule 'Tagasi', et importida rohkem kirju või kontakte"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Lotus Notesi kirjade import"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Tere tulemast kasutama KMaili impordivahendit KMailCVT!</b>\n"
-"<br>"
-"<br>\n"
-"See rakendus aitab sul importida oma kirjad varasemast e-posti rakendusest "
-"KMaili."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Palun vali rakendus, millest soovid kirju importida, ja klõpsa siis nupule "
-"'Järgmine'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Topeltkirja&de eemaldamine impordil"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
+"<p><b>Lotus Notesi struktureeritud tekstiga kirjade importfilter</b></"
+"p><p>See filter impordib struktureeritud tekstiga failid eksporditud Lotus "
+"Notesi e-posti kliendist KMaili. Kasuta seda, kui soovid importida kirju "
+"Lotus Notesist või mõnest muust e-posti rakendusest, mis kasutab Lotus "
+"Notesi struktureeritud teksti vormingut.</p><p><b>Märkus:</b> võimalik on "
+"taasluua ka kaustastruktuur, mistõttu kirjad imporditakse alamkaustadesse, "
+"mis saavad nime faili järgi, millest nad imporditi, ning lisaks prefiksi "
+"\"LNotes-Import\".</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMaili impordifiltrid"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005: KMailCVT arendajad"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Algne autor"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Hooldaja ja uued filtrid"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Uus GUI ja puhastustegevus"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Kõik failid (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Peeter Russak"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Kirjade importimine: %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "pezz@tkwcy.ee"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Kiri %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -453,11 +256,11 @@ msgstr "OS X kirjakaustade import"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X kirjade impordifilter</b></p>"
-"<p>See filter impordib e-kirju Apple Mac OS X e-posti kliendilt.</p>"
+"<p><b>OS X kirjade impordifilter</b></p><p>See filter impordib e-kirju Apple "
+"Mac OS X e-posti kliendilt.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -467,25 +270,27 @@ msgstr ""
 "1 topeltkiri jäi KMaili kausta %1 importimata.\n"
 "%n topeltkirja jäi KMaili kausta %1 importimata"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT impordivahend"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "1. samm: filtri valimine"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "2. samm: importimine..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Mbox failide import (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Import käib"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox importfilter</b></p><p>See filter impordib mbox-failid KMaili. "
+"Kasuta seda, kui soovid importida kirju Ximian Evolutionist või mõnest muust "
+"e-posti rakendusest, mis kasutab seda tavapärast UNIXi vormingut.</"
+"p><p><b>Märkus:</b> kirjad imporditakse kaustadesse, mis saavad nime faili "
+"järgi, millest nad imporditi, ning lisaks prefiksi 'MBOX-'.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import lõpetatud"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox failid (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -493,24 +298,20 @@ msgstr "Outlook Expressi kirjade import"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 importfilter</b></p>"
-"<p>Sul tuleb tuvastada kataloog, kuhu postkast on salvestatud - otsides .dbx- "
-"või .mbx-faile kataloogis"
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> Windows 9x ja"
-"<li><i>Documents and Settings</i> Windows 2000 või uuema puhul</ul></p>"
-"<p><b>Märkus:</b> kaustastruktuuri taasloomise huvides salvestatakse Outlook "
-"Express 5 ja 6 kaustad kausta \"OE-Import\".</p>"
+"<p><b>Outlook Express 4/5/6 importfilter</b></p><p>Sul tuleb tuvastada "
+"kataloog, kuhu postkast on salvestatud - otsides .dbx- või .mbx-faile "
+"kataloogis<ul><li><i>C:\\Windows\\Application Data</i> Windows 9x "
+"ja<li><i>Documents and Settings</i> Windows 2000 või uuema puhul</ul></"
+"p><p><b>Märkus:</b> kaustastruktuuri taasloomise huvides salvestatakse "
+"Outlook Express 5 ja 6 kaustad kausta \"OE-Import\".</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -545,43 +346,66 @@ msgstr "OE5+ postkasti %1 importimine"
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ kaustafaili %1 importimine"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "Sylpheedi kirjakaustade ja kaustastruktuuri import"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Opera kirjade import"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
-"<p>Vali Sylpheedi kirjade baaskaust (tavaliselt ~/Mail).</p>"
-"<p>Kaustastruktuuri taasloomise huvides salvestatakse kaustad kausta "
-"\"Sylpheed-Import\".</p>"
-"<p>Filter kannab üle ka kirjade oleku (näiteks uus või edastatud).</p>"
+"<p><b>Opera kirjade importfilter</b></p><p>See filter impordib Opera "
+"kirjakaustas leiduvad kirjad. Kasuta seda, kui soovid importida kõik oma "
+"kirjad Opera maildir-kaustast.</p><p>Vali konto kaust (tavaliselt ~/.opera/"
+"mail/store/account*).</p><p><b>Märkus:</b> kirjad imporditakse kaustadesse, "
+"mis saavad nime faili järgi, millest nad imporditi, ning lisaks prefiksi "
+"OPERA-.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Failide loendamine..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Uute kirjafailide importimine..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Outlooki kirjade import"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>Saatuslik viga:</b> KMaili käivitamine DCOP kommunikatsiooniks ebaõnnestus. "
-"Palun kontrolli, et <i>kmail</i> on ikka paigaldatud."
+"<p><b>Outlooki kirjade importfilter</b></p><p>See filter impordib kirjad "
+"Outlooki pst-failist. Selleks tuleb tuvastada kataloog, kuhu pst-fail on "
+"salvestatud - otsides .pst-faile kataloogis <i>C:\\Documents and Settings</"
+"i> Windows 2000 või uuema puhul.</p><p><b>Märkus:</b> kirjad imporditakse "
+"kaustadesse, mis saavad nime faili järgi, millest nad imporditi, ning lisaks "
+"prefiksi OUTLOOK-.</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "KMaili kausta %1 loomine ebaõnnestus"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Kirjade loendamine..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "Kirja lisamine KMaili kausta %1 ebaõnnestus"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Kataloogide loendamine..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Kirja lisamisel KMaili kausta '%1' tekkis viga."
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Kaustade loendamine..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -590,37 +414,76 @@ msgstr "Lihttekstikirjade importimine"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
-"<p>Vali kirjade kataloog. Kirjad imporditakse kausta, mille nimi on sama, mis "
-"kataloogil, kust nad imporditi, ainult et prefiksiga 'PLAIN-'.</p>"
-"<p>See filter impordib kõik .msg, .eml ja .txt kirjad.</p>"
+"<p>Vali kirjade kataloog. Kirjad imporditakse kausta, mille nimi on sama, "
+"mis kataloogil, kust nad imporditi, ainult et prefiksiga 'PLAIN-'.</p><p>See "
+"filter impordib kõik .msg, .eml ja .txt kirjad.</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Mbox failide import (UNIX, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Pegasus-Maili kaustade import"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>mbox importfilter</b></p>"
-"<p>See filter impordib mbox-failid KMaili. Kasuta seda, kui soovid importida "
-"kirju Ximian Evolutionist või mõnest muust e-posti rakendusest, mis kasutab "
-"seda tavapärast UNIXi vormingut.</p>"
-"<p><b>Märkus:</b> kirjad imporditakse kaustadesse, mis saavad nime faili järgi, "
-"millest nad imporditi, ning lisaks prefiksi 'MBOX-'.</p>"
+"<p>Vali Pegasus-Maili kataloog (sisaldab *.CNM, *.PMM ja *.MBX faile). "
+"Paljudes süsteemides on selle asukoht C:\\pmail\\mail või C:\\pmail\\mail"
+"\\admin</p><p><b>Märkus:</b> kaustastruktuuri taasloomise huvides "
+"salvestatakse kaustad kausta \"PegasusMail-Import\".</p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox failid (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Kaustastruktuuri parsimine ebaõnnestus. Importi jätkatakse ilma alamkaustade "
+"toetuseta."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Uute kirjade ('.cnm') importimine..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Kaustade importimine ('.pmm') ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "'unix' kaustade importimine ('.mbx') ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "%1 import"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Kaustastruktuuri parsimine..."
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "Sylpheedi kirjakaustade ja kaustastruktuuri import"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p>Vali Sylpheedi kirjade baaskaust (tavaliselt ~/Mail).</"
+"p><p>Kaustastruktuuri taasloomise huvides salvestatakse kaustad kausta "
+"\"Sylpheed-Import\".</p><p>Filter kannab üle ka kirjade oleku (näiteks uus "
+"või edastatud).</p>"
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -628,17 +491,111 @@ msgstr "The Bat! kirjade ja kaustastruktuuri import"
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
 msgstr ""
-"<p><b>The Bat! importfilter</b></p>"
-"<p>Vali The Bat! kohalike kirjade baaskaust.</p>"
-"<p><b>Märkus:</b> see filter impordib *.tbb-failid The Bat! kohalikust "
-"kaustast, nt. POP-kontod, aga mitte IMAP/DIMAP-kontod.</p>"
-"<p>Kaustastruktuuri taasloomise huvides salvestatakse kaustad kausta "
+"<p><b>The Bat! importfilter</b></p><p>Vali The Bat! kohalike kirjade "
+"baaskaust.</p><p><b>Märkus:</b> see filter impordib *.tbb-failid The Bat! "
+"kohalikust kaustast, nt. POP-kontod, aga mitte IMAP/DIMAP-kontod.</"
+"p><p>Kaustastruktuuri taasloomise huvides salvestatakse kaustad kausta "
 "\"TheBat-Import\".</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Thunderbirdi/Mozilla kohalike kirjade ja kaustastruktuuri import"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Thunderbirdi/Mozilla importfilter</b></p><p>Vali Thunderbirdi/Mozilla "
+"baaskaust (tavaliselt ~/.thunderbird/*.default/Mail/Local Folders/).</"
+"p><p><b>Märkus:</b> ära vali kunagi kausta, mis <u>ei sisalda</u> mbox-faile "
+"(näiteks maildir). Kui sa seda siiski teed, saad õige palju uusi kaustu.</"
+"p><p>Kaustastruktuuri taasloomise huvides luuakse kaustad kausta "
+"\"Thunderbird-Import\".</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b>Saatuslik viga:</b> KMaili käivitamine DCOP kommunikatsiooniks "
+"ebaõnnestus. Palun kontrolli, et <i>kmail</i> on ikka paigaldatud."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "KMaili kausta %1 loomine ebaõnnestus"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "Kirja lisamine KMaili kausta %1 ebaõnnestus"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Kirja lisamisel KMaili kausta '%1' tekkis viga."
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Kust:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Kuhu:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Praegune:"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Import käib..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Kokku:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Palun klõpsa nupule 'Tagasi', et importida rohkem kirju või kontakte"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Tere tulemast kasutama KMaili impordivahendit KMailCVT!</b>\n"
+"<br><br>\n"
+"See rakendus aitab sul importida oma kirjad varasemast e-posti rakendusest "
+"KMaili.<br><br><br><br>\n"
+"Palun vali rakendus, millest soovid kirju importida, ja klõpsa siis nupule "
+"'Järgmine'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Topeltkirja&de eemaldamine impordil"
diff --git a/tde-i18n-eu/messages/tdepim/kmailcvt.po b/tde-i18n-eu/messages/tdepim/kmailcvt.po
index 747f4458fd4..03ee3f6f0c4 100644
--- a/tde-i18n-eu/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-eu/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-01-07 20:15+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>\n"
 "Language-Team: Basque <itzulpena@euskalgnu.org>\n"
@@ -19,28 +19,87 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Inportatu Outlook postak"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+"Marcos Goienetxe\n"
+"Ion Gaztañaga\n"
+"Iñaki Larrañaga Murgoitio"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
 msgstr ""
-"<p><b>Outlook-en posta inportatzeko iragazkia</b></p> "
-"<p>Honek Outlook-eko posta-fitxategiak (.pst luzapenarekin) inportatuko ditu. "
-"Posta-fitxategia gorde den karpeta kokatu behar duzu, .pst fitxategiak hemen "
-"bilatuz:"
-"<ul>Windows 9x-en"
-"<li><i>C:\\Windows\\Application Data</i> eta Windows 2000 edo berriagoetan"
-"<li><i>Documents and Settings</i> </ul> aurki ditzakezu</p>"
-"<p><b>Oharra:</b> postak dagokien fitxategiaren izen bera duten, \"OUTLOOK-\" "
-"aurrizkidun karpetetara inportatuko dira.</p>"
+"marcos@euskalgnu.org\n"
+"igaztanaga@gmail.com\n"
+"dooteo@euskalgnu.org"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT-en inportatzeko tresna"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "1. urratsa: hautatu iragazkia"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "2. urratsa: inportatzea..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Inportazioa martxan"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Inportazioa bukatuta"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>%1(e)k idatzita.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail-en inportatzeko iragazkiak"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, KMailCVT-en garatzaileak"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Jatorrizko egilea"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Mantentzailea eta iragazki berriak"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "GUI berria eta txukunketak"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Inportatu Evolution 1.x bertsioko posta eta karpeta-egitura"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
+msgstr ""
+"<p><b>Evolution 1.x bertsiotik inportatzeko iragazkia</b></p><p>Hautatu "
+"Evolution postaren oinarrizko direktorioa (normalean ~/.evolution/mail/"
+"local/).</p><p>Karpeten egitura berriro sor daitekeenez, karpetak "
+"\"Evolution-Import\"-en gordeko dira.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -50,27 +109,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Ez da direktoriorik hautatu."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Fitxategiak zenbatzen..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Mezuak zenbatzen..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Direktorioak zenbatzen..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Karpetak zenbatzen..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Posta berriaren fitxategiak inportatzen..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -78,6 +116,22 @@ msgstr "Posta berriaren fitxategiak inportatzen..."
 msgid "No files found for import."
 msgstr "Ez da inportatzeko fitxategirik aurkitu."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "%1(e)tik posta inportatzea burututa"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Ezin da %1 ireki, sahiesten"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -95,39 +149,37 @@ msgstr ""
 "Bikoiztutako mezu 1 ez da inportatu\n"
 "Bikoiztutako %n mezu ez dira inportatu"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Ezin da %1 ireki, sahiesten"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Inportatu Evolution 1.x bertsioko posta eta karpeta-egitura"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Inportatu Evolution 2.x bertsiotik posta eta karpeta-egitura"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x bertsiotik inportatzeko iragazkia</b></p>"
-"<p>Hautatu Evolution postaren oinarrizko direktorioa (normalean "
-"~/.evolution/mail/local/).</p>"
-"<p>Karpeten egitura berriro sor daitekeenez, karpetak \"Evolution-Import\"-en "
-"gordeko dira.</p>"
+"<p><b>Evolution 2.x bertsiotik inportatzeko iragazkia</b></p><p>Hautatu "
+"Evolution posta-karpetaren oinarrizko direktorioa (~/.evolution/mail/local/)."
+"</p><p><b>Oharra:</b> inoiz ez aukeratu mbox-fitxategirik <u>ez duen</u> "
+"karpetarik (adibidez posta-direktorio bat). Hau egiten baduzu karpeta berri "
+"asko izango dituzu.</p><p>Karpeta-egitura berregin daitekeenez, karpetak "
+"\"Evolution-Import\"-en gordeko dira.</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "%1(e)tik posta inportatzea burututa"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Inportazioa amaitu da, erabiltzaileak ezeztatuta."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Hasi %1 fitxategia inportatzen..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -135,131 +187,32 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Inportatu karpetak 'Pegasus-Mail'etik"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Hautatu Pegasus-Mail direktorioa (*.CNM, *.PMM eta *.MBX fitxategiak "
-"dituena). Sistema askotan C:\\PMail\\mail edo C:\\pmail\\mail\\admin "
-"direktorioetan egon ohi dira</p>"
-"<p><b>Oharra:</b> karpeta-egitura berregin daitekenez karpetak "
-"\"PegasusMail-Import\"-en gordeko dira.</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Ezin da karpeta-egitura prozesatu, inportazioak azpi-karpeten euskarririk gabe "
-"jarraituko du."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Posta-fitxategi berriak ('.cnm') inportatzen..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Posta-karpetak ('.pnm') inportatzen..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "'UNIX' posta-karpetak ('.mbx') inportatzen..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "%1 inportatzen"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "%1 mezua"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Karpeta-egitura prozesatzen..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>%1(e)k idatzita.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Inportatu Lotus Notes postak"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Lotus Notes-eko testu-egiturako postak inportatzeko iragazkia</b></p>"
-"<p>Iragazki honek testu-egiturako fitxategiak inportatuko ditu Lotus Notes-eko "
-"bezero batetik KMail-era. Erabili iragazki hau Lotus edo Lotus Notes-en "
-"testu-egiturako formatua darabilten beste posta-bezeroen postak "
-"inportatzeko.</p> "
-"<p><b>Oharra:</b> karpeta-egitura berregin daitekeenez, inportatutako mezuak "
-"datozen fitxategien izenak dituzte \"LNotes-Import\"direktoriopean gordeko "
-"dira, eta hauen izenak mezuak datozen fitxategienak izango dira.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Fitxategi guztiak (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "%1(e)tik postak inportatzen..."
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Inportatu KMail-en posta-direktorioak eta karpeta-egitura"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>KMail-eko inportatzeko iragazkia</b></p>"
-"<p>Hautatu inportatu KMail-en posta-karpetaren oinarrizko direktorioa.</p>"
-"<p><b>Oharra:</b> inoiz ez hautatu KMail-eko uneko posta-direktorioa (~/Mail "
-"edo~/.trinity/share/apps/kmail/mail ). Kasu honetan, KMailCVT amaierarik gabeko "
-"begizta batean blokeatuko baita. </p>"
-"<p>Iragazki honek ez ditu KMail-eko mbox fitxategidun posta-karpetak "
-"inportatzen.</p>"
-"<p>Karpeta-egitura berregin daitekeenez, karpetak \"KMail-Import\"-en gordeko "
-"dira.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Inportazioa amaitu da, erabiltzaileak ezeztatuta."
+"<p><b>KMail-eko inportatzeko iragazkia</b></p><p>Hautatu inportatu KMail-en "
+"posta-karpetaren oinarrizko direktorioa.</p><p><b>Oharra:</b> inoiz ez "
+"hautatu KMail-eko uneko posta-direktorioa (~/Mail edo~/.trinity/share/apps/"
+"kmail/mail ). Kasu honetan, KMailCVT amaierarik gabeko begizta batean "
+"blokeatuko baita. </p><p>Iragazki honek ez ditu KMail-eko mbox fitxategidun "
+"posta-karpetak inportatzen.</p><p>Karpeta-egitura berregin daitekeenez, "
+"karpetak \"KMail-Import\"-en gordeko dira.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -272,195 +225,41 @@ msgstr "Inportatu %1 karpeta..."
 msgid "Could not import %1"
 msgstr "Ezin izan da %1 inportatu"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Inportatu Thunderbird/Mozilla-ren posta lokala eta karpeta egitura"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird/Mozilla-tik inportatzeko iragazkia</b></p>"
-"<p>Hautatu Thunderbird/Mozilla-ren oinarrizko posta-karpeta (normalean "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Oharra:</b> ez hautatu inoiz mbox fitxategirik <u>ez duen</u>"
-"karpetarik (adibidez posta direktorio bat). Hau egiten baduzu karpeta berri "
-"asko eskuratuko dituzu.</p>"
-"<p>Karpeten egitura berriro sortu daitekeenez karpetak "
-"\"Thunderbird-Import\"-en barruan gordeko dira.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Hasi %1 fitxategia inportatzen..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Inportatu Opera-ko postak"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera-tik posta inportatzeko iragazkia</b></p>"
-"<p>Iragazki honek Opera-ren posta-karpeta inportatuko du. Opera-tik kontu "
-"bateko posta guztiak inportatzea nahi izanez gero.</p>"
-"<p>Hautatu kontuaren karpeta (normalean ~/.opera/mail/store/account*).</p>"
-"<p><b>Oharra:</b> postak kontuaren izen bera duen \"OPERA-\" aurrizkidun "
-"karpeta batera inportatuko dira</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Inportatu Evolution 2.x bertsiotik posta eta karpeta-egitura"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x bertsiotik inportatzeko iragazkia</b></p>"
-"<p>Hautatu Evolution posta-karpetaren oinarrizko direktorioa "
-"(~/.evolution/mail/local/).</p>"
-"<p><b>Oharra:</b> inoiz ez aukeratu mbox-fitxategirik <u>ez duen</u> "
-"karpetarik (adibidez posta-direktorio bat). Hau egiten baduzu karpeta berri "
-"asko izango dituzu.</p>"
-"<p>Karpeta-egitura berregin daitekeenez, karpetak \"Evolution-Import\"-en "
-"gordeko dira.</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Nork:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Nori:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Unekoa:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Inportazioa martxan..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Guztira:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Egin klikatu \"Atzera\" botoian kontaktu edo posta gehiago inportatzeko"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Inportatu Lotus Notes postak"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Ongi etorri KMailCVT-ra - KMail-en inportazio-tresna</b>\n"
-"<br>"
-"<br>\n"
-"Programa honek beste programetatik posta KMail-era inportatzen lagunduko dizu."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Hautatu inportatu nahi duzun programa eta egin klik 'Hurrengoa'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Kendu &bikoiztutako mezuak inportatzean"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
+"<p><b>Lotus Notes-eko testu-egiturako postak inportatzeko iragazkia</b></"
+"p><p>Iragazki honek testu-egiturako fitxategiak inportatuko ditu Lotus Notes-"
+"eko bezero batetik KMail-era. Erabili iragazki hau Lotus edo Lotus Notes-en "
+"testu-egiturako formatua darabilten beste posta-bezeroen postak inportatzeko."
+"</p> <p><b>Oharra:</b> karpeta-egitura berregin daitekeenez, inportatutako "
+"mezuak datozen fitxategien izenak dituzte \"LNotes-Import\"direktoriopean "
+"gordeko dira, eta hauen izenak mezuak datozen fitxategienak izango dira.</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail-en inportatzeko iragazkiak"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, KMailCVT-en garatzaileak"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Jatorrizko egilea"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Mantentzailea eta iragazki berriak"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "GUI berria eta txukunketak"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Fitxategi guztiak (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-"Marcos Goienetxe\n"
-"Ion Gaztañaga\n"
-"Iñaki Larrañaga Murgoitio"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "%1(e)tik postak inportatzen..."
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"marcos@euskalgnu.org\n"
-"igaztanaga@gmail.com\n"
-"dooteo@euskalgnu.org"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "%1 mezua"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -468,12 +267,11 @@ msgstr "Inportatu OS X Mail-etik"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X Mail-etik inportatzeko iragazkia</b></p>"
-"<p>Iragazki honek Apple Mac OS X-en posta bezereko e-postak inportatzen "
-"ditu.</p>"
+"<p><b>OS X Mail-etik inportatzeko iragazkia</b></p><p>Iragazki honek Apple "
+"Mac OS X-en posta bezereko e-postak inportatzen ditu.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -483,25 +281,27 @@ msgstr ""
 "Bikoiztutako mezu 1 ez da KMail-en %1 karpetara inportatu\n"
 "Bikoiztutako %n mezu ez da KMail-en %1 karpetara inportatu"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT-en inportatzeko tresna"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "1. urratsa: hautatu iragazkia"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "2. urratsa: inportatzea..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Inportatu mbox fitxategiak (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Inportazioa martxan"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox inportatzeko iragazkia</b></p><p>Iragazki honek mbox fitxategiak "
+"KMail-era inportatuko ditu. Erabili iragazki hau formatu zahar hau "
+"darabilten Ximian Evolution edo beste bezeroetatik postak inportatzeko.</"
+"p><p><b>Oharra:</b> postak dagokien fitxategiaren izen bera duten, \"MBOX-\" "
+"aurrizkidun karpetetara inportatuko dira.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Inportazioa bukatuta"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox fitxategiak (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -509,24 +309,21 @@ msgstr "Inportatu Outlook Express postak"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 inportatzeko iragazkia</b></p>"
-"<p>Postontzia gorde den karpeta kokatu behar duzu, .dbx, eta .mbx fitxategiak "
-"fitxategiak hemen bilatuz:"
-"<ul>Windows 9x-en"
-"<li><i>C:\\Windows\\Application Data</i> eta Windows 2000 edo berriagoetan"
-"<li><i>Documents and Settings</i> </ul> aurki ditzakezu</p>"
-"<p><b>Oharra:</b> karpeta-egitura berregin daitekeenez, Outlook Express 5 eta "
-"6-ko karpetak zure karpeta lokaleko \"OE-Import\"-en sortuko dira.</p>"
+"<p><b>Outlook Express 4/5/6 inportatzeko iragazkia</b></p><p>Postontzia "
+"gorde den karpeta kokatu behar duzu, .dbx, eta .mbx fitxategiak fitxategiak "
+"hemen bilatuz:<ul>Windows 9x-en<li><i>C:\\Windows\\Application Data</i> eta "
+"Windows 2000 edo berriagoetan<li><i>Documents and Settings</i> </ul> aurki "
+"ditzakezu</p><p><b>Oharra:</b> karpeta-egitura berregin daitekeenez, Outlook "
+"Express 5 eta 6-ko karpetak zure karpeta lokaleko \"OE-Import\"-en sortuko "
+"dira.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -561,46 +358,66 @@ msgstr "OE5+ %1 postontzia inportatzen"
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ %1 karpeta fitxategia inportatzen"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "Inportatu Sylpheed-en posta-direktorioak eta karpeta-egitura"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Inportatu Opera-ko postak"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
-"<p><b>Sylpheed-etik inportatzeko iragazkia</b></p>"
-"<p>Hautatu Sylpheed posta-karpetaren oinarrizko direktorioa (normalean "
-"~/Mail).</p>"
-"<p>Karpeten egitura berregin daitekeenez, karpetak \"Sylpheed-Import\"-en "
-"azpian gordeko dira.</p> "
-"<p>Iragazki honek mezuaren egoera berregiten du, adibidez, berria edo "
-"birbidalia."
+"<p><b>Opera-tik posta inportatzeko iragazkia</b></p><p>Iragazki honek Opera-"
+"ren posta-karpeta inportatuko du. Opera-tik kontu bateko posta guztiak "
+"inportatzea nahi izanez gero.</p><p>Hautatu kontuaren karpeta (normalean ~/."
+"opera/mail/store/account*).</p><p><b>Oharra:</b> postak kontuaren izen bera "
+"duen \"OPERA-\" aurrizkidun karpeta batera inportatuko dira</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Fitxategiak zenbatzen..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Posta berriaren fitxategiak inportatzen..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Inportatu Outlook postak"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>Larria:</b> ezin da KMail-ekin DCOP komunikazioa abiatu. Ziurtatu <i>"
-"KMail</i> instalatuta dagoela."
+"<p><b>Outlook-en posta inportatzeko iragazkia</b></p> <p>Honek Outlook-eko "
+"posta-fitxategiak (.pst luzapenarekin) inportatuko ditu. Posta-fitxategia "
+"gorde den karpeta kokatu behar duzu, .pst fitxategiak hemen bilatuz:"
+"<ul>Windows 9x-en<li><i>C:\\Windows\\Application Data</i> eta Windows 2000 "
+"edo berriagoetan<li><i>Documents and Settings</i> </ul> aurki ditzakezu</"
+"p><p><b>Oharra:</b> postak dagokien fitxategiaren izen bera duten, \"OUTLOOK-"
+"\" aurrizkidun karpetetara inportatuko dira.</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "Ezin da %1 karpeta KMail-en sortu"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Mezuak zenbatzen..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "Ezin da mezua KMail-eko %1 karpetan gehitu"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Direktorioak zenbatzen..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Errorea KMail-eko %1 karpetan mezua gehitzean"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Karpetak zenbatzen..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -609,37 +426,77 @@ msgstr "Inportatu testu arrunteko postak"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 "<p> Hautatu postak dituen direktorioa. Postak dauden direktorioaren izen "
-"berbera duen, \"PLAIN-\" aurrizkidun karpeta batean jarriko dira.</p>"
-"<p>Iragazki honek .msg, .eml and .txt mezuak inportatuko ditu.</p>"
+"berbera duen, \"PLAIN-\" aurrizkidun karpeta batean jarriko dira.</"
+"p><p>Iragazki honek .msg, .eml and .txt mezuak inportatuko ditu.</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Inportatu mbox fitxategiak (UNIX, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Inportatu karpetak 'Pegasus-Mail'etik"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>mbox inportatzeko iragazkia</b></p>"
-"<p>Iragazki honek mbox fitxategiak KMail-era inportatuko ditu. Erabili iragazki "
-"hau formatu zahar hau darabilten Ximian Evolution edo beste bezeroetatik postak "
-"inportatzeko.</p>"
-"<p><b>Oharra:</b> postak dagokien fitxategiaren izen bera duten, \"MBOX-\" "
-"aurrizkidun karpetetara inportatuko dira.</p>"
+"<p>Hautatu Pegasus-Mail direktorioa (*.CNM, *.PMM eta *.MBX fitxategiak "
+"dituena). Sistema askotan C:\\PMail\\mail edo C:\\pmail\\mail\\admin "
+"direktorioetan egon ohi dira</p><p><b>Oharra:</b> karpeta-egitura berregin "
+"daitekenez karpetak \"PegasusMail-Import\"-en gordeko dira.</p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox fitxategiak (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Ezin da karpeta-egitura prozesatu, inportazioak azpi-karpeten euskarririk "
+"gabe jarraituko du."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Posta-fitxategi berriak ('.cnm') inportatzen..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Posta-karpetak ('.pnm') inportatzen..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "'UNIX' posta-karpetak ('.mbx') inportatzen..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "%1 inportatzen"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Karpeta-egitura prozesatzen..."
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "Inportatu Sylpheed-en posta-direktorioak eta karpeta-egitura"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Sylpheed-etik inportatzeko iragazkia</b></p><p>Hautatu Sylpheed posta-"
+"karpetaren oinarrizko direktorioa (normalean ~/Mail).</p><p>Karpeten egitura "
+"berregin daitekeenez, karpetak \"Sylpheed-Import\"-en azpian gordeko dira.</"
+"p> <p>Iragazki honek mezuaren egoera berregiten du, adibidez, berria edo "
+"birbidalia."
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -647,19 +504,113 @@ msgstr "Inportatu The Bat! postak eta karpeta-egitura"
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
 msgstr ""
-"<p><b>The Bat! inportatzeko iragazkia</b></p>"
-"<p>Hautatu inportatu nahi duzun \"The Bat!\" posta-karpeta lokalaren oinarrizko "
-"direktorioa.</p>"
-"<p><b>Oharra:</b> iragazki honek *.tbb fitxategiak \"The Bat!\"-en karpeta "
-"lokaletik inportatuko ditu, hau da POP kontuetatik eta ez IMAP/DIMAP "
-"kontuetatik.</p>"
-"<p>Karpeta-egitura berregin daitekeenez, karpetak zure kontu lokaleko "
+"<p><b>The Bat! inportatzeko iragazkia</b></p><p>Hautatu inportatu nahi duzun "
+"\"The Bat!\" posta-karpeta lokalaren oinarrizko direktorioa.</p><p><b>Oharra:"
+"</b> iragazki honek *.tbb fitxategiak \"The Bat!\"-en karpeta lokaletik "
+"inportatuko ditu, hau da POP kontuetatik eta ez IMAP/DIMAP kontuetatik.</"
+"p><p>Karpeta-egitura berregin daitekeenez, karpetak zure kontu lokaleko "
 "\"TheBat-Import\" gordeko dira.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Inportatu Thunderbird/Mozilla-ren posta lokala eta karpeta egitura"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Thunderbird/Mozilla-tik inportatzeko iragazkia</b></p><p>Hautatu "
+"Thunderbird/Mozilla-ren oinarrizko posta-karpeta (normalean ~/.thunderbird/*."
+"default/Mail/Local Folders/).</p><p><b>Oharra:</b> ez hautatu inoiz mbox "
+"fitxategirik <u>ez duen</u>karpetarik (adibidez posta direktorio bat). Hau "
+"egiten baduzu karpeta berri asko eskuratuko dituzu.</p><p>Karpeten egitura "
+"berriro sortu daitekeenez karpetak \"Thunderbird-Import\"-en barruan gordeko "
+"dira.</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b>Larria:</b> ezin da KMail-ekin DCOP komunikazioa abiatu. Ziurtatu "
+"<i>KMail</i> instalatuta dagoela."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "Ezin da %1 karpeta KMail-en sortu"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "Ezin da mezua KMail-eko %1 karpetan gehitu"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Errorea KMail-eko %1 karpetan mezua gehitzean"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Nork:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Nori:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Unekoa:"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Inportazioa martxan..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Guztira:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Egin klikatu \"Atzera\" botoian kontaktu edo posta gehiago inportatzeko"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Ongi etorri KMailCVT-ra - KMail-en inportazio-tresna</b>\n"
+"<br><br>\n"
+"Programa honek beste programetatik posta KMail-era inportatzen lagunduko "
+"dizu.<br><br><br><br>\n"
+"Hautatu inportatu nahi duzun programa eta egin klik 'Hurrengoa'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Kendu &bikoiztutako mezuak inportatzean"
diff --git a/tde-i18n-fa/messages/tdepim/kmailcvt.po b/tde-i18n-fa/messages/tdepim/kmailcvt.po
index 60d0220c2a6..99a3d80c166 100644
--- a/tde-i18n-fa/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-fa/messages/tdepim/kmailcvt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-01-01 09:06+0330\n"
 "Last-Translator: Nasim Daniarzadeh <daniarzadeh@itland.ir>\n"
 "Language-Team: Persian <kde-i18n-fa@kde.org>\n"
@@ -17,25 +17,80 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "واردات رایانامه‌های اوت‌لوک‌"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "مریم سادات رضوی"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "razavi@itland.ir"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "ابزار واردات KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "گام ۱: برگزیدن پالایه"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "گام ۲: واردات..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "واردات در حال پیشرفت"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "واردات تمام شد"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>نوشتۀ %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr ""
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "پالایه‌های واردات KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr ""
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "نویسندۀ اصلی"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "نگه‌دارنده و پالایه‌های جدید"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "ونک جدید و پاک‌سازیها"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "واردات نامه‌های محلی اوولوشن ۱.x و ساختار پوشه"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>پالایۀ واردات رایانامۀ اوت‌لوک</b></p>"
-"<p>این پالایه، نامه‌ها را از یک پرونده-پست اوت‌لوک وارد می‌کند. لازم است "
-"پوشه‌ای که پرونده-پست در آن ذخیره شده است را با جستجوی پرونده‌های .pst تحت: <i>"
-"C:\\Documents and Settings</i> در ویندوز ۲۰۰۰ یا قبلی</p>قرار دهید."
-"<p><b>نکته:</b> رایانامه‌ها در پوشه‌ای که پس از حسابی که از آن می‌آیند و "
-"نام‌دار شده و پیشوند OUTLOOK- دارند، وارد می‌شوند.</p>"
+"<p><b>پالایۀ واردات اوولوشن ۱.x</b></p><p>فهرست راهنمای پایه‌ای نامه‌های "
+"اوولوشن )معمولاً ~/evolution/local(. </p><p>از زمانی که ایجاد مجدد ساختار "
+"پوشه ممکن است، پوشه‌ها تحت: »اوولوشن-واردات« ذخیره می‌شوند.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -45,27 +100,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "فهرست راهنمایی برگزیده نشد."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "در حال شمارش پرونده‌ها..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "در حال شمارش نامه..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "در حال شمارش فهرستهای راهنما..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "در حال شمارش پوشه‌ها..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "واردات پروندۀ نامه‌های جدید..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -73,6 +107,22 @@ msgstr "واردات پروندۀ نامه‌های جدید..."
 msgid "No files found for import."
 msgstr "برای واردات، پرونده‌ای یافت نشد."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "واردات تمام‌شده رایانامه‌ها از %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "قادر به باز کردن %1 نیست، در حال پرش"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -88,38 +138,37 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "%n پیام دو نسخه‌ای وارد نشد"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "قادر به باز کردن %1 نیست، در حال پرش"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "واردات نامه‌های محلی اوولوشن ۱.x و ساختار پوشه"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "واردات نامه‌های محلی اوولوشن ۲.x و ساختار پوشه"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>پالایۀ واردات اوولوشن ۱.x</b></p>"
-"<p>فهرست راهنمای پایه‌ای نامه‌های اوولوشن )معمولاً ~/evolution/local(. </p>"
-"<p>از زمانی که ایجاد مجدد ساختار پوشه ممکن است، پوشه‌ها تحت: »اوولوشن-واردات« "
-"ذخیره می‌شوند.</p>"
+"<p><b>پالایۀ واردات  اوولوشن ۲.x </b></p><p>فهرست راهنمای پایه‌ای پوشۀ نامۀ "
+"محلی اوولوشن خود )معمولاً ~/.evolution/mail/local/( را برگزینید.</"
+"p><p><b>نکته:</b> هرگز پوشه‌ای که حاوی پرونده‌های mbox (مثلاً یک فهرست راهنمای "
+"نامه)<u>نیست</u> را انتخاب نکنید: اگر چنین کنید، چندین پوشۀ جدید دریافت "
+"می‌کنید.</p><p>هنگامی که ایجاد مجدد ساختار پوشه ممکن شد، پوشه تحت: »اوولوشن-"
+"واردات« ذخیره می‌شود.</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "واردات تمام‌شده رایانامه‌ها از %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "واردات تمام شد، توسط کاربر لغو گردید."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "آغاز واردات پروندۀ %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -127,98 +176,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "واردات پوشه‌ها از Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>فهرست راهنمای Pegasus-Mail  روی سیستم خود )که حاوی پرونده‌های *.CNM، *.PMM و "
-"*.MBX می‌باشد( را برگزینید. در بیشتر سیستمها، در C:\\pmail\\mail یا "
-"C:\\pmail\\mail\\admin ذخیره می‌شود.</p>"
-"<p><b>نکته:</b> از زمانی که ایجاد مجدد ساختار پوشه ممکن باشد، پوشه‌ها تحت: "
-"»PegasusMail-واردات« ذخیره می‌شوند.</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr "ساختار پوشه را نمی‌توان تجزیه کرد؛ ادامۀ واردات بدون پشتیبانی زیرپوشه."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "واردات پروندۀ نامه‌های جدید )».cnm«(..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "واردات پوشۀ نامه‌ها )».pmm«(..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "واردات پوشۀ نامه‌ها »یونیکس« )».mbx«(..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "واردات %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "پیام %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "در حال تجزیۀ ساختار پوشه..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>نوشتۀ %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "واردات  رایانامه‌های لوتوس نوتز"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>پالایۀ واردات نامۀ متن دارای ساختار لوتوس نوتز</b></p>"
-"<p>این پالایه پرونده‌های متن دارای ساختار را از یک کارخواه رایانامۀ صادرشدۀ "
-"لوتوس نوتز به KMail صادر می‌کند. اگر می‌خواهید نامه‌ها را از لوتوس یا "
-"نامه‌رسانهای دیگری که از قالب متن دارای ساختار لوتوس نوتز استفاده می‌کنند وارد "
-"کنید، از این پالایه استفاده نمایید."
-"<p>"
-"<p><b>نکته:</b> هنگامی که ایجاد مجدد ساختار پوشه ممکن شد، پیامهای واردشده تحت: "
-"»واردات LNotes« در پوشۀ محلی شما، که با استفاده از نامهای پرونده‌هایی که پیامها "
-"از آنجا می‌آیند، ذخیره می‌شوند.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "همۀ پرونده‌ها )*("
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "واردات رایانامه‌ها از %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -226,30 +187,21 @@ msgstr "واردات فهرستهای راهنمای KMail و ساختار پو�
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>پالایۀ واردات KMail</b></p>"
-"<p>فهرست راهنمای پایه‌ای پوشۀ نامۀ KMail که می‌خواهید وارد کنید را برگزینید.</p>"
-"<p><b>نکته:</b> هرگز فهرست راهنمای نامۀ محلی جاری KMail (معمولاً ~/Mail یا "
-"~/.trinity/share/apps/kmail/mail) را برنگزینید: در این مورد، ممکن است KMailCVT "
-"به یک حلقۀ ادامه‌دار بچسبد. </p>"
-"<p>این پالایه پوشۀ نامه‌های KMail را با پرونده‌های mbox وارد نمی‌کند.</p>"
-"<p>هنگامی که ایجاد مجدد ساختار پوشه ممکن باشد، پوشه‌ها تحت: »KMail-واردات«به "
-"پوشۀ محلی شما ذخیره می‌شوند.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "واردات تمام شد، توسط کاربر لغو گردید."
+"<p><b>پالایۀ واردات KMail</b></p><p>فهرست راهنمای پایه‌ای پوشۀ نامۀ KMail که "
+"می‌خواهید وارد کنید را برگزینید.</p><p><b>نکته:</b> هرگز فهرست راهنمای نامۀ "
+"محلی جاری KMail (معمولاً ~/Mail یا ~/.trinity/share/apps/kmail/mail) را "
+"برنگزینید: در این مورد، ممکن است KMailCVT به یک حلقۀ ادامه‌دار بچسبد. </"
+"p><p>این پالایه پوشۀ نامه‌های KMail را با پرونده‌های mbox وارد نمی‌کند.</"
+"p><p>هنگامی که ایجاد مجدد ساختار پوشه ممکن باشد، پوشه‌ها تحت: »KMail-"
+"واردات«به پوشۀ محلی شما ذخیره می‌شوند.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -262,191 +214,41 @@ msgstr "واردات پوشۀ %1..."
 msgid "Could not import %1"
 msgstr "%1 را نتوانست وارد کند"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "واردات نامه‌های محلی تاندربرد/موزیلا و ساختار پوشه"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>پالایۀ واردات تاندربرد/موزیلا</b></p>"
-"<p>پوشۀ نامۀ پایه‌ای تاندربرد/موزیلای خود را برگزینید )معمولاً "
-"~/.thunderbird/*.default/Mail/Local Folders/(. </p>"
-"<p><b>نکته:</b> هرگز پوشه‌ای که حاوی پرونده‌های mbox (مثلاً یک maildir)  <u>"
-"نیست</u> را انتخاب نکنید: اگر چنین کنید، پوشه‌های جدید فراوانی دریافت "
-"می‌کنید.</p>"
-"<p>هنگامی که ایجاد مجدد ساختار پوشه ممکن شد، پوشه‌ها تحت: »تاندربرد-واردات« "
-"ذخیره می‌شوند.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "آغاز واردات پروندۀ %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "واردات رایانامه‌های اُپرا"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>پالایۀ واردات رایانامۀ اُپرا</b></p>"
-"<p>این پالایه، نامه‌ها را از پوشۀ نامۀ اُپرا وارد می‌کند. اگر می‌خواهید همۀ "
-"نامه‌ها را به یک حساب در فهرست راهنمای نامۀ اُپرا وارد کنید، از این پالایه "
-"استفاده کنید.</p>"
-"<p>فهرست راهنمای حساب )معمولاً ~/.opera/mail/store/account*( را برگزینید.</p>"
-"<p><b>نکته:</b> رایانامه‌ها به پوشه‌ای وارد می‌شوند که پس از حسابی که از آن "
-"می‌آیند نامیده شده و پیشوند OPERA- به آنها اضافه می‌شود.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "واردات نامه‌های محلی اوولوشن ۲.x و ساختار پوشه"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>پالایۀ واردات  اوولوشن ۲.x </b></p>"
-"<p>فهرست راهنمای پایه‌ای پوشۀ نامۀ محلی اوولوشن خود )معمولاً "
-"~/.evolution/mail/local/( را برگزینید.</p>"
-"<p><b>نکته:</b> هرگز پوشه‌ای که حاوی پرونده‌های mbox (مثلاً یک فهرست راهنمای "
-"نامه)<u>نیست</u> را انتخاب نکنید: اگر چنین کنید، چندین پوشۀ جدید دریافت "
-"می‌کنید.</p>"
-"<p>هنگامی که ایجاد مجدد ساختار پوشه ممکن شد، پوشه تحت: »اوولوشن-واردات« ذخیره "
-"می‌شود.</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "از:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "به:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "جاری:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "واردات در حال پیشرفت..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "کل:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "»پس‌سو« را فشار دهید تا رایانامه‌ها یا تماسهای بیشتری وارد شود"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "واردات  رایانامه‌های لوتوس نوتز"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>به KMailCVT - ابزار واردات  KMail - خوش آمدید</b>\n"
-"<br>"
-"<br>\n"
-"این برنامه، به شما کمک می‌کند که رایانامۀ خود را از برنامۀ رایانامۀ قبلی در "
-"KMail وارد کنید."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" لطفاً، برنامه‌ای که می‌خواهید از آن وارد کنید را برگزینید، سپس »بعدی« را فشار "
-"دهید."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "حذف &پیامهای دو نسخه‌ای طی واردات‌"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr ""
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "پالایه‌های واردات KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
+"<p><b>پالایۀ واردات نامۀ متن دارای ساختار لوتوس نوتز</b></p><p>این پالایه "
+"پرونده‌های متن دارای ساختار را از یک کارخواه رایانامۀ صادرشدۀ لوتوس نوتز به "
+"KMail صادر می‌کند. اگر می‌خواهید نامه‌ها را از لوتوس یا نامه‌رسانهای دیگری که از "
+"قالب متن دارای ساختار لوتوس نوتز استفاده می‌کنند وارد کنید، از این پالایه "
+"استفاده نمایید.<p><p><b>نکته:</b> هنگامی که ایجاد مجدد ساختار پوشه ممکن شد، "
+"پیامهای واردشده تحت: »واردات LNotes« در پوشۀ محلی شما، که با استفاده از "
+"نامهای پرونده‌هایی که پیامها از آنجا می‌آیند، ذخیره می‌شوند.</p>"
 
-#: main.cpp:36
-msgid "Original author"
-msgstr "نویسندۀ اصلی"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "نگه‌دارنده و پالایه‌های جدید"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "ونک جدید و پاک‌سازیها"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "همۀ پرونده‌ها )*("
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "مریم سادات رضوی"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "واردات رایانامه‌ها از %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "razavi@itland.ir"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "پیام %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -454,12 +256,11 @@ msgstr "واردات از نامۀ سیستم عامل X"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>پالایۀ واردات نامۀ سیستم عامل X</b></p>"
-"<p>این پالایه، رایانامه‌ها را از کارخواه‌نامه به برنامک سیستم عامل مکینتاش X  "
-"وارد می‌کند.</p>"
+"<p><b>پالایۀ واردات نامۀ سیستم عامل X</b></p><p>این پالایه، رایانامه‌ها را از "
+"کارخواه‌نامه به برنامک سیستم عامل مکینتاش X  وارد می‌کند.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -467,25 +268,27 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n پیام دو نسخه‌ای به پوشۀ %1 در KMail وارد نشد"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "ابزار واردات KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "گام ۱: برگزیدن پالایه"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "گام ۲: واردات..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "واردات پرونده‌های mbox )یونیکس، اوولوشن("
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "واردات در حال پیشرفت"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>پالایۀ واردات mbox</b></p><p>این پالایه، پرونده‌های mbox را به KMail "
+"وارد می‌کند. اگر می‌خواهید نامه‌ها را از اوولوشن اکسیمیان یا نامه‌رسانان دیگر که "
+"از این قالب سنتی یونیکس استفاده می‌کنند وارد کنید، این پالایه را به ‌کار برید."
+"</p><p><b>نکته:</b> رایانامه‌ها به پوشه‌هایی وارد می‌شوند که پس از پرونده‌هایی "
+"که از آنجا می‌آیند نام‌دار شده و پیشوند MBOX- دارند.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "واردات تمام شد"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "پرونده‌های mbox )*("
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -493,24 +296,20 @@ msgstr "واردات رایانامه‌های اوت‌لوک اکسپرس"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>پالایۀ واردات اوت‌لوک اکسپرس ۴/۵/۶</b></p>"
-"<p>لازم است که پوشه‌ای که نامه‌دان با جستجو برای پرونده‌های  .dbx یا .mbx ذخیره "
-"شده‌اند، را تحت "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> در ویندوز۹x"
-"<li><i>اسناد و تنظیمات</i> در ویندوز ۲۰۰۰ یا قبلی</ul></p> قرار دهید."
-"<p><b>نکته:</b> هنگامی که ایجاد مجدد ساختار پوشه ممکن شد، پوشه‌های اوت‌لوک "
-"اکسپرس ۵ و ۶ تحت: »واردات OE« در پوشۀ محلی شما ذخیره می‌شوند.</p>"
+"<p><b>پالایۀ واردات اوت‌لوک اکسپرس ۴/۵/۶</b></p><p>لازم است که پوشه‌ای که "
+"نامه‌دان با جستجو برای پرونده‌های  .dbx یا .mbx ذخیره شده‌اند، را تحت "
+"<ul><li><i>C:\\Windows\\Application Data</i> در ویندوز۹x<li><i>اسناد و "
+"تنظیمات</i> در ویندوز ۲۰۰۰ یا قبلی</ul></p> قرار دهید.<p><b>نکته:</b> هنگامی "
+"که ایجاد مجدد ساختار پوشه ممکن شد، پوشه‌های اوت‌لوک اکسپرس ۵ و ۶ تحت: »واردات "
+"OE« در پوشۀ محلی شما ذخیره می‌شوند.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -545,31 +344,189 @@ msgstr "واردات اوت‌لوک اکسپرس ۵+ نامه‌دان %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "واردات اوت‌لوک اکسپرس ۵+ پرونده پوشۀ %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "واردات رایانامه‌های اُپرا"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>پالایۀ واردات رایانامۀ اُپرا</b></p><p>این پالایه، نامه‌ها را از پوشۀ "
+"نامۀ اُپرا وارد می‌کند. اگر می‌خواهید همۀ نامه‌ها را به یک حساب در فهرست راهنمای "
+"نامۀ اُپرا وارد کنید، از این پالایه استفاده کنید.</p><p>فهرست راهنمای "
+"حساب )معمولاً ~/.opera/mail/store/account*( را برگزینید.</p><p><b>نکته:</b> "
+"رایانامه‌ها به پوشه‌ای وارد می‌شوند که پس از حسابی که از آن می‌آیند نامیده شده و "
+"پیشوند OPERA- به آنها اضافه می‌شود.</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "در حال شمارش پرونده‌ها..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "واردات پروندۀ نامه‌های جدید..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "واردات رایانامه‌های اوت‌لوک‌"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>پالایۀ واردات رایانامۀ اوت‌لوک</b></p><p>این پالایه، نامه‌ها را از یک "
+"پرونده-پست اوت‌لوک وارد می‌کند. لازم است پوشه‌ای که پرونده-پست در آن ذخیره شده "
+"است را با جستجوی پرونده‌های .pst تحت: <i>C:\\Documents and Settings</i> در "
+"ویندوز ۲۰۰۰ یا قبلی</p>قرار دهید.<p><b>نکته:</b> رایانامه‌ها در پوشه‌ای که پس "
+"از حسابی که از آن می‌آیند و نام‌دار شده و پیشوند OUTLOOK- دارند، وارد می‌شوند.</"
+"p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "در حال شمارش نامه..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "در حال شمارش فهرستهای راهنما..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "در حال شمارش پوشه‌ها..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "واردات رایانامه‌های متن ساده"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>فهرست راهنمایی را که حاوی رایانامه‌های روی سیستم شماست را برگزینید. "
+"رایانامه‌ها در یک پوشه با نامی مشابه فهرست راهنمایی که در آن بوده‌اند و با "
+"پیشوند PLAIN- قرار می‌گیرند.</p><p>این پالایه همۀ رایانامه‌های .msg، .eml و ."
+"txt  را وارد می‌کند.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "واردات پوشه‌ها از Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>فهرست راهنمای Pegasus-Mail  روی سیستم خود )که حاوی پرونده‌های *.CNM، *.PMM "
+"و *.MBX می‌باشد( را برگزینید. در بیشتر سیستمها، در C:\\pmail\\mail یا C:"
+"\\pmail\\mail\\admin ذخیره می‌شود.</p><p><b>نکته:</b> از زمانی که ایجاد مجدد "
+"ساختار پوشه ممکن باشد، پوشه‌ها تحت: »PegasusMail-واردات« ذخیره می‌شوند.</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr "ساختار پوشه را نمی‌توان تجزیه کرد؛ ادامۀ واردات بدون پشتیبانی زیرپوشه."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "واردات پروندۀ نامه‌های جدید )».cnm«(..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "واردات پوشۀ نامه‌ها )».pmm«(..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "واردات پوشۀ نامه‌ها »یونیکس« )».mbx«(..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "واردات %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "در حال تجزیۀ ساختار پوشه..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "واردات فهرستهای راهنمای نامۀ Sylpheed و ساختار پوشه"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>پالایۀ واردات Sylpheed</b></p><p>فهرست راهنمای پایه‌ای پوشۀ نامۀ "
+"Sylpheed که می‌خواهید وارد کنید )معمولاً~/Mail( را برگزینید.</p><p>از زمانی که "
+"ایجاد مجدد ساختار پوشه ممکن باشد، پوشه‌ها تحت: »Sylpheed-واردات« در پوشۀ محلی "
+"شما ذخیره می‌شوند.</p><p>همچنین، این پالایه وضعیت پیام، مثلاً جدید یا "
+"forwarded را مجدداً ایجاد می‌کند."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "واردات نامه‌های Bat! و ساختار پوشه"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>پالایۀ واردات Bat!</b></p><p>فهرست راهنمای پایه‌ای پوشۀ نامۀ محلی »The "
+"Bat!« که می‌خواهید وارد کنید را برگزینید.</p><p><b>نکته:</b> این پالایه، "
+"پرونده‌های  *.tbb را از پوشۀ محلی »The Bat!«، مثلاً از حسابهای قرارداد دفتر "
+"پست، و نه از حسابهای IMAP/DIMAP وارد می‌کند.</p><p>هنگامی که ایجاد مجدد "
+"ساختار پوشه ممکن شد، پوشه‌ها تحت: »TheBat-واردات« در حساب محلی شما ذخیره "
+"می‌شوند.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "واردات نامه‌های محلی تاندربرد/موزیلا و ساختار پوشه"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>پالایۀ واردات Sylpheed</b></p>"
-"<p>فهرست راهنمای پایه‌ای پوشۀ نامۀ Sylpheed که می‌خواهید وارد کنید "
-")معمولاً~/Mail( را برگزینید.</p>"
-"<p>از زمانی که ایجاد مجدد ساختار پوشه ممکن باشد، پوشه‌ها تحت: »Sylpheed-واردات« "
-"در پوشۀ محلی شما ذخیره می‌شوند.</p>"
-"<p>همچنین، این پالایه وضعیت پیام، مثلاً جدید یا forwarded را مجدداً ایجاد "
-"می‌کند."
+"<p><b>پالایۀ واردات تاندربرد/موزیلا</b></p><p>پوشۀ نامۀ پایه‌ای تاندربرد/"
+"موزیلای خود را برگزینید )معمولاً ~/.thunderbird/*.default/Mail/Local Folders/"
+"(. </p><p><b>نکته:</b> هرگز پوشه‌ای که حاوی پرونده‌های mbox (مثلاً یک maildir)  "
+"<u>نیست</u> را انتخاب نکنید: اگر چنین کنید، پوشه‌های جدید فراوانی دریافت "
+"می‌کنید.</p><p>هنگامی که ایجاد مجدد ساختار پوشه ممکن شد، پوشه‌ها تحت: "
+"»تاندربرد-واردات« ذخیره می‌شوند.</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>مهلک:</b> قادر به آغاز  KMail برای ارتباط DCOP نیست. از نصب <i>kmail</i> "
 "مطمئن شوید."
@@ -586,64 +543,58 @@ msgstr "به پوشۀ %1 در KMail نمی‌توان پیام اضافه کرد
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "خطا هنگام افزودن پیام به پوشۀ %1 در KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "واردات رایانامه‌های متن ساده"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "از:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>فهرست راهنمایی را که حاوی رایانامه‌های روی سیستم شماست را برگزینید. "
-"رایانامه‌ها در یک پوشه با نامی مشابه فهرست راهنمایی که در آن بوده‌اند و با "
-"پیشوند PLAIN- قرار می‌گیرند.</p>"
-"<p>این پالایه همۀ رایانامه‌های .msg، .eml و .txt  را وارد می‌کند.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "به:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "واردات پرونده‌های mbox )یونیکس، اوولوشن("
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "جاری:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "واردات در حال پیشرفت..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
 msgstr ""
-"<p><b>پالایۀ واردات mbox</b></p>"
-"<p>این پالایه، پرونده‌های mbox را به KMail وارد می‌کند. اگر می‌خواهید نامه‌ها "
-"را از اوولوشن اکسیمیان یا نامه‌رسانان دیگر که از این قالب سنتی یونیکس استفاده "
-"می‌کنند وارد کنید، این پالایه را به ‌کار برید.</p>"
-"<p><b>نکته:</b> رایانامه‌ها به پوشه‌هایی وارد می‌شوند که پس از پرونده‌هایی که "
-"از آنجا می‌آیند نام‌دار شده و پیشوند MBOX- دارند.</p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "پرونده‌های mbox )*("
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "کل:"
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "واردات نامه‌های Bat! و ساختار پوشه"
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "»پس‌سو« را فشار دهید تا رایانامه‌ها یا تماسهای بیشتری وارد شود"
 
-#: filter_thebat.cxx:35
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>پالایۀ واردات Bat!</b></p>"
-"<p>فهرست راهنمای پایه‌ای پوشۀ نامۀ محلی »The Bat!« که می‌خواهید وارد کنید را "
-"برگزینید.</p>"
-"<p><b>نکته:</b> این پالایه، پرونده‌های  *.tbb را از پوشۀ محلی »The Bat!«، مثلاً "
-"از حسابهای قرارداد دفتر پست، و نه از حسابهای IMAP/DIMAP وارد می‌کند.</p>"
-"<p>هنگامی که ایجاد مجدد ساختار پوشه ممکن شد، پوشه‌ها تحت: »TheBat-واردات« در "
-"حساب محلی شما ذخیره می‌شوند.</p>"
+"<b>به KMailCVT - ابزار واردات  KMail - خوش آمدید</b>\n"
+"<br><br>\n"
+"این برنامه، به شما کمک می‌کند که رایانامۀ خود را از برنامۀ رایانامۀ قبلی در "
+"KMail وارد کنید.<br><br><br><br>\n"
+" لطفاً، برنامه‌ای که می‌خواهید از آن وارد کنید را برگزینید، سپس »بعدی« را فشار "
+"دهید."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "حذف &پیامهای دو نسخه‌ای طی واردات‌"
diff --git a/tde-i18n-fi/messages/tdepim/kmailcvt.po b/tde-i18n-fi/messages/tdepim/kmailcvt.po
index f719e431605..34477a7f720 100644
--- a/tde-i18n-fi/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-fi/messages/tdepim/kmailcvt.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-09-15 00:59+0300\n"
 "Last-Translator: Ilpo Kantonen <ilpo@iki.fi>\n"
 "Language-Team: finnish <fi@li.org>\n"
@@ -21,25 +21,81 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Tuo sähköposteja Outlookista"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Teemu Rytilahti,Kim Enkovaara,Mikko Ikola"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "teemu.rytilahti@kde-fi.org,kim.enkovaara@iki.fi,ikola@iki.fi"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT-tuontityökalu"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Vaihe 1: Valitse suodin"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Vaihe 2: Tuodaan..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Tuonti käynnissä"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Tuonti valmis"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Tehnyt %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail-tuontisuotimet"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, KMailCVT-kehittäjät"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Alkuperäinen tekijä"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Ylläpitäjä ja uudet suotimet"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Uusi käyttöliittymä ja koodinpuhdistuksia"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Tuo Evolution 1.x paikalliset sähköpostit ja kansiorakenne."
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook-tuontisuodin</b></p>"
-"<p>Tämä suodin tuo sähköpostit Outlookin pst-tiedostosta. Paikallista aluksi "
-"missä pst-tiedosto sijaitsee etsimällä tiedostoja kohteesta <i>"
-"C:\\Documents and Settings</i> Windows 2000:ssa tai uudemmassa.</p>"
-"<p><b>Huom:</b>Sähköpostit tuodaan kansioon, jonka nimi muodostuu tilin nimestä "
-"ja \"OUTLOOK-\"-etuliitteestä.</p>"
+"<p><b>Evolution 1.x tuontisuodin</b></p> <p>Valitse Evolutionin "
+"sähköpostikansio (yleensä ~/evolution/local).</p> <p>Koska kansiorakenteen "
+"uudelleenluominen on mahdollista, kansiot säilytetään kohteessa \"Evolution-"
+"Import\".</p> "
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -49,27 +105,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Kansioita ei ole valittuna."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Lasketaan tiedostoja..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Lasketaan posteja..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Lasketaan kansioita..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Lasketaan kansioita..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Tuodaan uusia posteja..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -77,6 +112,22 @@ msgstr "Tuodaan uusia posteja..."
 msgid "No files found for import."
 msgstr "Tuotavia tiedostoja ei löytynyt."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Sähköpostien tuonti kohteesta %1 valmistui"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Ei voitu avata tiedostoa %1, ohitetaan tiedosto"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -94,38 +145,37 @@ msgstr ""
 "Yhtä kaksoiskappaleviestiä ei tuotu kansioon\n"
 "%n kaksoiskappaleviestiä ei tuotu kansioon"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Ei voitu avata tiedostoa %1, ohitetaan tiedosto"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Tuo Evolution 1.x paikalliset sähköpostit ja kansiorakenne."
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Tuo Evolution 2.x paikalliset sähköpostit ja kansiorakenne"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x tuontisuodin</b></p> "
-"<p>Valitse Evolutionin sähköpostikansio (yleensä ~/evolution/local).</p> "
-"<p>Koska kansiorakenteen uudelleenluominen on mahdollista, kansiot säilytetään "
-"kohteessa \"Evolution-Import\".</p> "
+"<p><b>Evolution 2.x -tuontisuodin</b></p><p>Valitse Evolutionin "
+"sähköpostikansio (yleensä ~/evolution/mail/local).</p><p><b>Huom:</b>Älä "
+"valitse kansiota, joka ei sisällä mbox-tiedostoja (esim. maildir). Jos "
+"valitset, saat paljon uusia kansioita.</p><p>Koska kansiorakenteen "
+"uudelleenluominen on mahdollista, kansiot säilytetään kohteessa \"Evolution-"
+"Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Sähköpostien tuonti kohteesta %1 valmistui"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Tuonti valmistui, käyttäjä keskeytti tuonnin."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Aloita tiedoston %1 vienti..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -133,99 +183,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Tuo kansioita Pegasus Mailista"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Valitse Pegasus-Mail-kansio tietokoneelta (sisältää tiedostoja *.CNM, *.PMM "
-"ja *.MBX). Yleensä nämä löytyvät kansiosta C:\\pmail\\mail tai "
-"C:\\pmail\\mail\\admin</p> "
-"<p><b>Huom:</b> Koska kansiorakenteen uudelleenluominen on mahdollista, kansiot "
-"säilytetään kohteessa \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"Kansiorakennetta ei voida jäsentää, jatketaan tuomista ilman alikansioiden "
-"tukea"
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Tuodaan uusia posteja ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Tuodaan postikansioita ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Tuodaan Unix-postikansioita (\".mbx\")..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Tuodaan %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Viesti %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Jäsennetään kansiorakennetta..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Tehnyt %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Tuo sähköposteja Lotus Notesista"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Lotus Notes Structured Text -tuontisuodin</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Kaikki tiedostot (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Tuodaan sähköposteja kohteesta %1..."
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -233,30 +194,21 @@ msgstr "Tuo KMailin sähköpostikansiot ja kansiorakenne"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>KMail-tuontisuodin</b></p>"
-"<p>Valitse KMailin sähköpostikansio, jonka haluat tuoda.</p>"
-"<p><b>Huom:</b> Älä valitse nykyistä paikallista KMail-sähköpostikansiota "
-"(yleensä ~/Mail tai ~/.trinity/share/apps/kmail/mail). KMailCVT saattaa "
-"jumiutua ikuiseen silmukkaan </p>"
-"<p>Tämä suodin ei tuo KMail-sähköpostikansion mbox-tiedostoja</p>"
-"<p>Koska kansiorakenteen uudelleenluominen on mahdollista, kansiot säilytetään "
-"paikallisen kansion kohteessa \"KMail-Import\".</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Tuonti valmistui, käyttäjä keskeytti tuonnin."
+"<p><b>KMail-tuontisuodin</b></p><p>Valitse KMailin sähköpostikansio, jonka "
+"haluat tuoda.</p><p><b>Huom:</b> Älä valitse nykyistä paikallista KMail-"
+"sähköpostikansiota (yleensä ~/Mail tai ~/.trinity/share/apps/kmail/mail). "
+"KMailCVT saattaa jumiutua ikuiseen silmukkaan </p><p>Tämä suodin ei tuo "
+"KMail-sähköpostikansion mbox-tiedostoja</p><p>Koska kansiorakenteen "
+"uudelleenluominen on mahdollista, kansiot säilytetään paikallisen kansion "
+"kohteessa \"KMail-Import\".</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -269,186 +221,41 @@ msgstr "Tuo kansio %1..."
 msgid "Could not import %1"
 msgstr "Ei voitu tuoda %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Tuo Thunderbirdin/Mozillan paikalliset sähköpostit ja kansiorakenne"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbirdin/Mozillan tuontisuodin</b></p>"
-"<p>Valitse Thunderbirdin/Mozillan sähköpostikansio (yleensä "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Huom:</b> Älä valitse kansiota, joka ei sisällä mbox-tiedostoja (esim. "
-"maildir). Jos valitset, saat paljon uusia kansioita.</p>"
-"<p>Koska kansiorakenteen uudelleenluominen on mahdollista, kansioita "
-"asäilytetään kohteessa: \"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Aloita tiedoston %1 vienti..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Tuo sähköposteja Operasta"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Operan sähköpostien tuontisuodin</b></p> "
-"<p>Tämä suodin tuo sähköpostit Operan sähköpostikansiosta. Käytä tätä suodinta "
-"jos haluat tuoda kaikki sähköpostit Operan sähköpostitililtä.</p> "
-"<p>Valitse tilin kansio (yleensä ~/.opera/mail/store/account*).</p> "
-"<p><b>Huom:</b>Sähköpostit tuodaan kansioon, jonka nimi muodostuu tilin nimestä "
-"ja \"OPERA-\"-etuliitteestä.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Tuo Evolution 2.x paikalliset sähköpostit ja kansiorakenne"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x -tuontisuodin</b></p>"
-"<p>Valitse Evolutionin sähköpostikansio (yleensä ~/evolution/mail/local).</p>"
-"<p><b>Huom:</b>Älä valitse kansiota, joka ei sisällä mbox-tiedostoja (esim. "
-"maildir). Jos valitset, saat paljon uusia kansioita.</p>"
-"<p>Koska kansiorakenteen uudelleenluominen on mahdollista, kansiot säilytetään "
-"kohteessa \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Lähettäjä:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Vastaanottaja:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Nykyinen:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Tuonti käynnissä..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Yhteensä:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Napsauta \"takaisin\"-painiketta tuodaksesi lisää sähköpostejä tai kontakteja"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Tuo sähköposteja Lotus Notesista"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Tervetuloa ohjelmaan KMailCVT - KMailin tuontityökaluun</b>\n"
-"<br>"
-"<br> Tämä ohjelma mahdollistaa sähköpostisi tuomisen edellisestä "
-"sähköpostiohjelmastasi KMailiin."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Valitse ohjelma, josta haluat tuoda sähköpostisi ja valitse \"Seuraava\"."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Poista &kaksoiskappaleviestit tuonnin ollessa käynnissä"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
+"<p><b>Lotus Notes Structured Text -tuontisuodin</b></p><p>This filter will "
+"import Structured Text files from an exported Lotus Notes email client into "
+"KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail-tuontisuotimet"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, KMailCVT-kehittäjät"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Alkuperäinen tekijä"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Ylläpitäjä ja uudet suotimet"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Uusi käyttöliittymä ja koodinpuhdistuksia"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Kaikki tiedostot (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Teemu Rytilahti,Kim Enkovaara,Mikko Ikola"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Tuodaan sähköposteja kohteesta %1..."
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "teemu.rytilahti@kde-fi.org,kim.enkovaara@iki.fi,ikola@iki.fi"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Viesti %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -456,11 +263,11 @@ msgstr "Tuo kansioita OS X Mailista"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X Mail -tuontisuodin</b></p>"
-"<p>Tämä suodin tuo Apple Mac OS X sähköpostiohjelman kansioita.</p>"
+"<p><b>OS X Mail -tuontisuodin</b></p><p>Tämä suodin tuo Apple Mac OS X "
+"sähköpostiohjelman kansioita.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -470,25 +277,27 @@ msgstr ""
 "Yhtä kaksoiskappaleviestiä ei tuotu kansioon %1 Kmailissa\n"
 "%n kaksoiskappaleviestiä ei tuotu kansioon %1 Kmailissa"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT-tuontityökalu"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Vaihe 1: Valitse suodin"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Vaihe 2: Tuodaan..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Tuo mbox-tiedostoja (Unix, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Tuonti käynnissä"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Mbox-tuontisuodin</b></p> <p>Tämä suodin tuo mbox-tiedostot KMailiin. "
+"Tämä suodin mahdollistaa sähköpostien tuomisen Ximian Evolutionista tai "
+"muista ohjelmista, jotka käyttävät perinteistä Unix-muotoa.</p> <p><b>Huom:</"
+"b> Sähköpostit tuodaan kansioon, jonka nimi muodostuu tilin nimestä ja "
+"\"MBOX-\"-etuliitteestä.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Tuonti valmis"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Mbox-tiedostot (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -496,25 +305,21 @@ msgstr "Tuo sähköposteja Outlook Expressistä"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 -tuontisuodin</b></p>"
-"<p>Paikallista aluksi mihin kansioon sähköpostit on tallennettu etsimällä .dbx- "
-"tai .mbx-tiedostoja seuraavien kansioiden alta:"
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> Windows 9x:ssä"
-"<li><i>Documents and Settings</i> Windows 2000:ssa tai uudemmassa</ul></p>"
-"<p><b>Huom:</b> Koska kansiorakenteen uudelleenluominen on mahdollista, Outlook "
-"Express 5:n ja 6:n kansiot säilytetään paikallisen kansion kohteessa "
-"\"OE-Import\".</p>"
+"<p><b>Outlook Express 4/5/6 -tuontisuodin</b></p><p>Paikallista aluksi mihin "
+"kansioon sähköpostit on tallennettu etsimällä .dbx- tai .mbx-tiedostoja "
+"seuraavien kansioiden alta:<ul><li><i>C:\\Windows\\Application Data</i> "
+"Windows 9x:ssä<li><i>Documents and Settings</i> Windows 2000:ssa tai "
+"uudemmassa</ul></p><p><b>Huom:</b> Koska kansiorakenteen uudelleenluominen "
+"on mahdollista, Outlook Express 5:n ja 6:n kansiot säilytetään paikallisen "
+"kansion kohteessa \"OE-Import\".</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -549,30 +354,189 @@ msgstr "Tuodaan OE5+-postilaatikkoa %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Tuodaan OE5+-kansion tiedostoa %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Tuo sähköposteja Operasta"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Operan sähköpostien tuontisuodin</b></p> <p>Tämä suodin tuo "
+"sähköpostit Operan sähköpostikansiosta. Käytä tätä suodinta jos haluat tuoda "
+"kaikki sähköpostit Operan sähköpostitililtä.</p> <p>Valitse tilin kansio "
+"(yleensä ~/.opera/mail/store/account*).</p> <p><b>Huom:</b>Sähköpostit "
+"tuodaan kansioon, jonka nimi muodostuu tilin nimestä ja \"OPERA-\"-"
+"etuliitteestä.</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Lasketaan tiedostoja..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Tuodaan uusia posteja..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Tuo sähköposteja Outlookista"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Outlook-tuontisuodin</b></p><p>Tämä suodin tuo sähköpostit Outlookin "
+"pst-tiedostosta. Paikallista aluksi missä pst-tiedosto sijaitsee etsimällä "
+"tiedostoja kohteesta <i>C:\\Documents and Settings</i> Windows 2000:ssa tai "
+"uudemmassa.</p><p><b>Huom:</b>Sähköpostit tuodaan kansioon, jonka nimi "
+"muodostuu tilin nimestä ja \"OUTLOOK-\"-etuliitteestä.</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Lasketaan posteja..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Lasketaan kansioita..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Lasketaan kansioita..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Tuo puhdastekstisiä sähköposteja"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Valitse sähköpostit sisältävä kansio järjestelmässäsi. Sähköpostit on "
+"sijoitettu kansioon samalla nimellä kuin kansio, jossa ne ovat prefiksoituna "
+"PLAIN-</p><p>Tämä suodin tuo kaikki .msg, .eml ja .txt sähköpostit.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Tuo kansioita Pegasus Mailista"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Valitse Pegasus-Mail-kansio tietokoneelta (sisältää tiedostoja *.CNM, *."
+"PMM ja *.MBX). Yleensä nämä löytyvät kansiosta C:\\pmail\\mail tai C:\\pmail"
+"\\mail\\admin</p> <p><b>Huom:</b> Koska kansiorakenteen uudelleenluominen on "
+"mahdollista, kansiot säilytetään kohteessa \"PegasusMail-Import\".</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Kansiorakennetta ei voida jäsentää, jatketaan tuomista ilman alikansioiden "
+"tukea"
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Tuodaan uusia posteja ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Tuodaan postikansioita ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Tuodaan Unix-postikansioita (\".mbx\")..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Tuodaan %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Jäsennetään kansiorakennetta..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Tuo Sylpheedin sähköpostihakemistot ja kansiorakenteet"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Sylpheedin tuontisuodin</b></p> <p>Valitse Sylpheedin "
+"sähköpostikansio, jonka haluat tuoda (yleensä: ~/Mail).</p> <p>Koska "
+"kansiorakenteen uudelleenluominen on mahdollista, kansiot säilytetään "
+"kohteessa \"Sylpheed-Import\" kotikansioissasi.</p> <p>Tämä suodin luo myös "
+"viestin tilan uudelleen, esim. uusi tai vastattu."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Tuo The Bat! -sähköpostit ja kansiorakenne"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>The Bat! -tuontisuodin</b></p><p>Valitse The Batin paikallinen "
+"sähköpostikansio, jonka haluat tuoda.</p><p><b>Huom:</b> Tämä suodin tuo "
+"kaikki .tbb-tiedostot The Batin paikallisesta kansiosta, eli esimerkiksi POP-"
+"tileistä, mutta ei IMAP/DIMAP-tileistä.</p><p>Koska kansiorakenteen "
+"uudelleenluominen on mahdollista, kansiot säilytetään kohteessa\"TheBat-"
+"Import\" omalla tililläsi.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Tuo Thunderbirdin/Mozillan paikalliset sähköpostit ja kansiorakenne"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Sylpheedin tuontisuodin</b></p> "
-"<p>Valitse Sylpheedin sähköpostikansio, jonka haluat tuoda (yleensä: "
-"~/Mail).</p> "
-"<p>Koska kansiorakenteen uudelleenluominen on mahdollista, kansiot säilytetään "
-"kohteessa \"Sylpheed-Import\" kotikansioissasi.</p> "
-"<p>Tämä suodin luo myös viestin tilan uudelleen, esim. uusi tai vastattu."
+"<p><b>Thunderbirdin/Mozillan tuontisuodin</b></p><p>Valitse Thunderbirdin/"
+"Mozillan sähköpostikansio (yleensä ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Huom:</b> Älä valitse kansiota, joka ei sisällä mbox-"
+"tiedostoja (esim. maildir). Jos valitset, saat paljon uusia kansioita.</"
+"p><p>Koska kansiorakenteen uudelleenluominen on mahdollista, kansioita "
+"asäilytetään kohteessa: \"Thunderbird-Import\".</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Kohtalokas virhe</b> Ei voitu käynnistää KMailia DCOP-viestintää varten.\n"
 "Varmista, että <i>KMail</i> on asennettuna."
@@ -589,63 +553,57 @@ msgstr "Ei voida lisätä viestejä kansioon %1 KMailissa"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Virhe lisättäessä viestiä kansioon %1 KMailissa"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Tuo puhdastekstisiä sähköposteja"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Lähettäjä:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Valitse sähköpostit sisältävä kansio järjestelmässäsi. Sähköpostit on "
-"sijoitettu kansioon samalla nimellä kuin kansio, jossa ne ovat prefiksoituna "
-"PLAIN-</p>"
-"<p>Tämä suodin tuo kaikki .msg, .eml ja .txt sähköpostit.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Vastaanottaja:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Tuo mbox-tiedostoja (Unix, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Nykyinen:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Mbox-tuontisuodin</b></p> "
-"<p>Tämä suodin tuo mbox-tiedostot KMailiin. Tämä suodin mahdollistaa "
-"sähköpostien tuomisen Ximian Evolutionista tai muista ohjelmista, jotka "
-"käyttävät perinteistä Unix-muotoa.</p> "
-"<p><b>Huom:</b> Sähköpostit tuodaan kansioon, jonka nimi muodostuu tilin "
-"nimestä ja \"MBOX-\"-etuliitteestä.</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Tuonti käynnissä..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Mbox-tiedostot (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Tuo The Bat! -sähköpostit ja kansiorakenne"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Yhteensä:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Napsauta \"takaisin\"-painiketta tuodaksesi lisää sähköpostejä tai kontakteja"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>The Bat! -tuontisuodin</b></p>"
-"<p>Valitse The Batin paikallinen sähköpostikansio, jonka haluat tuoda.</p>"
-"<p><b>Huom:</b> Tämä suodin tuo kaikki .tbb-tiedostot The Batin paikallisesta "
-"kansiosta, eli esimerkiksi POP-tileistä, mutta ei IMAP/DIMAP-tileistä.</p>"
-"<p>Koska kansiorakenteen uudelleenluominen on mahdollista, kansiot säilytetään "
-"kohteessa\"TheBat-Import\" omalla tililläsi.</p>"
+"<b>Tervetuloa ohjelmaan KMailCVT - KMailin tuontityökaluun</b>\n"
+"<br><br> Tämä ohjelma mahdollistaa sähköpostisi tuomisen edellisestä "
+"sähköpostiohjelmastasi KMailiin.<br><br><br><br>\n"
+" Valitse ohjelma, josta haluat tuoda sähköpostisi ja valitse \"Seuraava\"."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Poista &kaksoiskappaleviestit tuonnin ollessa käynnissä"
diff --git a/tde-i18n-fr/messages/tdepim/kmailcvt.po b/tde-i18n-fr/messages/tdepim/kmailcvt.po
index 29cfdfc0543..dbd9c45ab7f 100644
--- a/tde-i18n-fr/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-fr/messages/tdepim/kmailcvt.po
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2008-08-12 16:17+0200\n"
 "Last-Translator: Pierre Buard <pierre.buard@gmail.com>\n"
 "Language-Team: Français <kde-francophone@kde.org>\n"
@@ -26,26 +26,83 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Importer les courriers électroniques d'Outlook Express"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Gilles Caulier,Gérard Delafond,Simon Depiets,Nicolas Ternisien"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
 msgstr ""
-"<p><b>Filtre d'importation pour Outlook</b></p>"
-"<p>Ce filtre va importer le courriel d'un fichier « pst » d'Outlook. Vous "
-"devrez indiquer le dossier dans lequel est situé votre boîte électronique, en "
-"recherchant des fichiers « .pst » dans <i>C:\\Documents and Settings</i> "
-"sous Windows 2000 ou supérieur.</p>"
-"<p><b>Remarque :</b> les courriels seront importés dans des dossiers du même "
-"nom, mais néanmoins préfixés par « OUTLOOK- »</p>"
+"caulier.gilles@free.fr,gerard@delafond.org,2df@tuxfamily.org,nicolas."
+"ternisien@gmail.com"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Outils d'importation de KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Étape 1 : sélection d'un filtre"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Étape 2 : importation..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importation en cours"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Importation terminée"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Écrit par %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Filtres d'importation de KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, Les développeurs de KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Auteur initial"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Mainteneur et nouveaux filtres"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nouvelle interface graphique et des nettoyages"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Importer les messages et la structure des dossiers d'Evolution 1.x"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
+msgstr ""
+"<p><b>Filtre d'importation pour Evolution 1.x</b></p><p>Sélectionnez votre "
+"dossier de boîtes aux lettres Evolution (toujours « ~/evolution/local »).</"
+"p><p>La structure des dossiers est en mesure d'être recréée, et sera "
+"contenue dans « Evolution-Import ».</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -55,27 +112,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Aucun dossier sélectionné."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Décompte des fichiers..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Décompte du courrier électronique..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Décompte des répertoires..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Décompte des dossiers..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Importation des fichiers au format « new mail »..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -83,6 +119,22 @@ msgstr "Importation des fichiers au format « new mail »..."
 msgid "No files found for import."
 msgstr "Aucun fichier trouvé pour l'importation."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Importation des courriers électroniques de « %1 » terminée"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Impossible d'ouvrir « %1 ». Il sera ignoré."
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -100,39 +152,38 @@ msgstr ""
 "%n message en double non importé\n"
 "%n messages en double non importés"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Impossible d'ouvrir « %1 ». Il sera ignoré."
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Importer les messages et la structure des dossiers d'Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Importer les messages et la structure des dossiers d'Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Filtre d'importation pour Evolution 1.x</b></p>"
-"<p>Sélectionnez votre dossier de boîtes aux lettres Evolution (toujours "
-"« ~/evolution/local »).</p>"
-"<p>La structure des dossiers est en mesure d'être recréée, et sera contenue "
-"dans « Evolution-Import ».</p>"
+"<p><b>Filtre d'importation pour Evolution 2.x</b></p><p>Sélectionnez le "
+"dossier de base de votre boîte électronique Evolution locale (toujours dans "
+"« ~/.evolution/mail/local/ »).</p><p><b>Remarque : </b>Ne choisissez jamais "
+"un dossier qui <u>ne</u> contient pas de fichiers « mbox » (notamment un "
+"« maildir »). Si vous le faites tout de même, vous obtiendrez alors de "
+"nombreux nouveaux dossiers.</p><p>La structure des dossiers est en mesure "
+"d'être recréée, et sera contenue dans le dossier « Evolution-Import ».</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Importation des courriers électroniques de « %1 » terminée"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Importation terminée, annulation par l'utilisateur."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Démarrer l'importation du fichier « %1 »..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -140,102 +191,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importation des dossiers de Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Sélectionnez le dossier de Pegasus-Mail de votre système.(contenant les "
-"fichiers « *.CNM », « *.PMM » et « *.MBX »). Sur certains systèmes, ces "
-"fichiers sont stockés dans le dossier « C:\\pmail\\mail » ou "
-"« C:\\pmail\\mail\\admin »</p>"
-"<p><b>Remarque : </b>La structure des dossiers est en mesure d'être recréée, et "
-"sera contenue dans « PegasusMail-Import ».</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Impossible d'analyser la structure des dossiers, poursuite de l'importation en "
-"ignorant les sous-dossiers."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importation des nouveaux fichiers de courriels au format « .cnm »..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importation des dossiers de courriels au format « .pmm » en cours..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr ""
-"Importer des dossiers de courriers au format UNIX (« .mbx ») en cours..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importation de « %1 »"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Message %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Analyse de la structure des dossiers..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Écrit par %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Importer les courriers électroniques de Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Filtre d'importation des courriels en texte structuré de Lotus Notes</b>"
-"</p>"
-"<p>Ce filtre va importer les fichiers en texte structuré d'un client Lotus "
-"Notes dans KMail. Utilisez ce filtre si vous souhaitez importer votre courriel "
-"depuis Lotus ou tout autre logiciel utilisant le format de texte structuré de "
-"Lotus Notes.</p>"
-"<p><b>Remarque : </b>la structure des dossiers est en mesure d'être recréée, et "
-"sera contenue dans le dossier « LNotes-Import » de votre compte local. Les "
-"messages seront nommés selon les fichiers dont ils proviennent.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Tous les fichiers (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Importation des courriers électroniques de « %1 »"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -243,30 +202,21 @@ msgstr "Importer les messages et la structure des dossiers de KMail"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Filtre d'importation pour KMail</b></p>"
-"<p>Sélectionnez le dossier de base de votre boîte électronique KMail à "
-"importer."
-"<p><b>Remarque : </b>Ne sélectionnez jamais le dossier de votre boîte "
-"électronique locale (dans « ~/Mail » ou « ~/.trinity/share/apps/kmail/mail »), "
-"sinon KMailCVT va tomber dans une boucle infinie.</p>"
-"<p>La structure des dossiers est en mesure d'être recréée, et sera contenue "
-"dans « KMail-Import » de votre dossier local.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Importation terminée, annulation par l'utilisateur."
+"<p><b>Filtre d'importation pour KMail</b></p><p>Sélectionnez le dossier de "
+"base de votre boîte électronique KMail à importer.<p><b>Remarque : </b>Ne "
+"sélectionnez jamais le dossier de votre boîte électronique locale (dans « ~/"
+"Mail » ou « ~/.trinity/share/apps/kmail/mail »), sinon KMailCVT va tomber "
+"dans une boucle infinie.</p><p>La structure des dossiers est en mesure "
+"d'être recréée, et sera contenue dans « KMail-Import » de votre dossier "
+"local.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -279,196 +229,42 @@ msgstr "Importation du dossier « %1 »..."
 msgid "Could not import %1"
 msgstr "Impossible d'importer %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-"Importer les messages et la structure des dossiers de Thunderbird / Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Filtre d'importation pour Thunderbird / Mozilla</b></p>"
-"<p>Sélectionnez votre dossier de boîtes aux lettres Thunderbird / Mozilla "
-"(toujours « ~/.thunderbird/*.default/Mail/Local Folders/ »).</p>"
-"<p><b>Remarque : </b>Ne choisissez jamais un dossier qui <u>ne</u> "
-"contient pas de fichiers « mbox » (notamment un « maildir »). Si vous le faites "
-"tout de même, vous obtiendrez alors de nombreux nouveaux dossiers.</p>"
-"<p>La structure des dossiers est en mesure d'être recréée, et sera contenue "
-"dans « Thunderbird-Import ».</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Démarrer l'importation du fichier « %1 »..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Importer les courriers électroniques d'Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Filtre d'importation pour Opera</b></p>"
-"<p>Ce filtre importera les fichiers d'une boîte aux lettres Opera. Utilisez ce "
-"filtre si vous souhaitez importer tous les messages d'un compte du client de "
-"messagerie Opera.</p> "
-"<p>Sélectionnez le dossier de votre compte (toujours "
-"« ~/.opera/mail/store/account* »).</p>"
-"<p><b>Remarque : </b>les courriers électroniques seront importés dans un "
-"dossier du nom du compte de provenance, mais précédé du préfixe « OPERA- ».</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Importer les messages et la structure des dossiers d'Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Filtre d'importation pour Evolution 2.x</b></p>"
-"<p>Sélectionnez le dossier de base de votre boîte électronique Evolution locale "
-"(toujours dans « ~/.evolution/mail/local/ »).</p>"
-"<p><b>Remarque : </b>Ne choisissez jamais un dossier qui <u>ne</u> "
-"contient pas de fichiers « mbox » (notamment un « maildir »). Si vous le faites "
-"tout de même, vous obtiendrez alors de nombreux nouveaux dossiers.</p>"
-"<p>La structure des dossiers est en mesure d'être recréée, et sera contenue "
-"dans le dossier « Evolution-Import ».</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "De :"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Vers :"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Actuel :"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Importation en cours..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Total :"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Veuillez cliquer sur « Précédent » pour importer plus de courriers "
-"électroniques ou de contacts"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Importer les courriers électroniques de Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Bienvenue dans KMailCVT - L'outil d'importation de KMail</b>\n"
-"<br>"
-"<br>\n"
-"Ce programme vous aidera à importer vos anciens courriels dans KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Veuillez choisir le programme dont vous voulez importer le courriel, puis "
-"cliquez sur « Suivant »."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Supprimer les messages en &double lors de l'importation"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Filtres d'importation de KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, Les développeurs de KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Auteur initial"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Mainteneur et nouveaux filtres"
+"<p><b>Filtre d'importation des courriels en texte structuré de Lotus Notes</"
+"b></p><p>Ce filtre va importer les fichiers en texte structuré d'un client "
+"Lotus Notes dans KMail. Utilisez ce filtre si vous souhaitez importer votre "
+"courriel depuis Lotus ou tout autre logiciel utilisant le format de texte "
+"structuré de Lotus Notes.</p><p><b>Remarque : </b>la structure des dossiers "
+"est en mesure d'être recréée, et sera contenue dans le dossier « LNotes-"
+"Import » de votre compte local. Les messages seront nommés selon les "
+"fichiers dont ils proviennent.</p>"
 
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nouvelle interface graphique et des nettoyages"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Tous les fichiers (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Gilles Caulier,Gérard Delafond,Simon Depiets,Nicolas Ternisien"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Importation des courriers électroniques de « %1 »"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"caulier.gilles@free.fr,gerard@delafond.org,2df@tuxfamily.org,"
-"nicolas.ternisien@gmail.com"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Message %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -476,12 +272,11 @@ msgstr "Importer du courriel OS X"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Filtre d'importation du courrier OS X</b></p> "
-"<p>Ce filtre importe les courriers électroniques du client mail du Mac OS X "
-"d'Apple.</p>"
+"<p><b>Filtre d'importation du courrier OS X</b></p> <p>Ce filtre importe les "
+"courriers électroniques du client mail du Mac OS X d'Apple.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -491,25 +286,29 @@ msgstr ""
 "1 message en double non importé vers le dossier « %1 » de KMail\n"
 "%n messages en double non importés vers le dossier « %1 » de KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Outils d'importation de KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Étape 1 : sélection d'un filtre"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Étape 2 : importation..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importer des fichiers « mbox » (Unix, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importation en cours"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>filtre d'importation pour boîte aux lettres UNIX « mbox »</b></p><p>Ce "
+"filtre importera les fichiers d'une boîte aux lettres « mbox » dans KMail. "
+"Utilisez ce filtre si vous voulez importer des messages du client de "
+"messagerie Evolution de la société Ximian ou d'un autre client de messagerie "
+"qui utilise le format Unix traditionnel.</p><p><b>Remarque : </b>les "
+"courriers électroniques seront importés dans des dossiers nommés selon leur "
+"fichier de provenance, mais précédés du préfixe « MBOX- »</p>."
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Importation terminée"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Fichiers mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -517,25 +316,21 @@ msgstr "Importer des courriers électroniques de Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Filtre d'importation pour Outlook Express version 4 / 5 / 6</b></p>"
-"<p>Vous devrez localiser le dossier dans lequel votre boîte de courriels a été "
-"stockée en cherchant des fichiers « .dbx » ou « .mbx » dans "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> sous Windows 9x"
-"<li><i>Documents and Settings</i> sous Windows 2000 et supérieur</ul></p>"
-"<p><b>Remarque : </b>la structure des dossiers est en mesure d'être recréée "
-"pour Outlook Express 5 et 6, et sera contenue dans « OE-Import » de votre "
-"dossier local.</p>"
+"<p><b>Filtre d'importation pour Outlook Express version 4 / 5 / 6</b></"
+"p><p>Vous devrez localiser le dossier dans lequel votre boîte de courriels a "
+"été stockée en cherchant des fichiers « .dbx » ou « .mbx » dans <ul><li><i>C:"
+"\\Windows\\Application Data</i> sous Windows 9x<li><i>Documents and "
+"Settings</i> sous Windows 2000 et supérieur</ul></p><p><b>Remarque : </b>la "
+"structure des dossiers est en mesure d'être recréée pour Outlook Express 5 "
+"et 6, et sera contenue dans « OE-Import » de votre dossier local.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -572,46 +367,67 @@ msgstr "Importation des boîtes aux lettres Outlook Express 5+ « %1 »"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importation du fichier de dossiers Outlook Express 5+ « %1 »"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "Importer les messages et la structure des dossiers de Sylpheed"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Importer les courriers électroniques d'Opera"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
-"<p><b>Filtre d'importation pour Sylpheed</b></p>"
-"<p>Sélectionnez votre dossier de boîtes aux lettres Sylpheed à importer "
-"(toujours « ~/.Mail »).</p>"
-"<p>La structure des dossiers est en mesure d'être recréée, et sera contenue "
-"dans « Sylpheed-Import » dans votre dossier local.</p> "
-"<p>Ce filtre recrée également l'état des messages, par exemple nouveau ou "
-"transmis."
+"<p><b>Filtre d'importation pour Opera</b></p><p>Ce filtre importera les "
+"fichiers d'une boîte aux lettres Opera. Utilisez ce filtre si vous souhaitez "
+"importer tous les messages d'un compte du client de messagerie Opera.</p> "
+"<p>Sélectionnez le dossier de votre compte (toujours « ~/.opera/mail/store/"
+"account* »).</p><p><b>Remarque : </b>les courriers électroniques seront "
+"importés dans un dossier du nom du compte de provenance, mais précédé du "
+"préfixe « OPERA- ».</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Décompte des fichiers..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Importation des fichiers au format « new mail »..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Importer les courriers électroniques d'Outlook Express"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>Erreur fatale :</b> impossible de démarrer KMail pour la communication DCOP. "
-"Assurez-vous que le programme « KMail » est installé."
+"<p><b>Filtre d'importation pour Outlook</b></p><p>Ce filtre va importer le "
+"courriel d'un fichier « pst » d'Outlook. Vous devrez indiquer le dossier "
+"dans lequel est situé votre boîte électronique, en recherchant des fichiers "
+"« .pst » dans <i>C:\\Documents and Settings</i> sous Windows 2000 ou "
+"supérieur.</p><p><b>Remarque :</b> les courriels seront importés dans des "
+"dossiers du même nom, mais néanmoins préfixés par « OUTLOOK- »</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "Impossible de créer le dossier « %1 » dans KMail"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Décompte du courrier électronique..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "Impossible d'ajouter le message au dossier « %1 » dans KMail"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Décompte des répertoires..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Problème en ajoutant le message au dossier « %1 » dans KMail"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Décompte des dossiers..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -620,41 +436,80 @@ msgstr "Importation des courriers électroniques au format texte"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 "<p>Choisissez le dossier contenant les courriers électroniques de votre "
-"système. Les courriers électroniques sont placés dans un dossier utilisant le "
-"préfixe « PLAIN- »</p>"
-"<p>Ce filtre importera tous les fichiers avec les extensions « .msg », « .eml » "
-"et « .txt ».</p>"
+"système. Les courriers électroniques sont placés dans un dossier utilisant "
+"le préfixe « PLAIN- »</p><p>Ce filtre importera tous les fichiers avec les "
+"extensions « .msg », « .eml » et « .txt ».</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importer des fichiers « mbox » (Unix, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importation des dossiers de Pegasus-Mail"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>filtre d'importation pour boîte aux lettres UNIX « mbox »</b></p>"
-"<p>Ce filtre importera les fichiers d'une boîte aux lettres « mbox » dans "
-"KMail. Utilisez ce filtre si vous voulez importer des messages du client de "
-"messagerie Evolution de la société Ximian ou d'un autre client de messagerie "
-"qui utilise le format Unix traditionnel.</p>"
-"<p><b>Remarque : </b>les courriers électroniques seront importés dans des "
-"dossiers nommés selon leur fichier de provenance, mais précédés du préfixe "
-"« MBOX- »</p>."
+"<p>Sélectionnez le dossier de Pegasus-Mail de votre système.(contenant les "
+"fichiers « *.CNM », « *.PMM » et « *.MBX »). Sur certains systèmes, ces "
+"fichiers sont stockés dans le dossier « C:\\pmail\\mail » ou « C:\\pmail"
+"\\mail\\admin »</p><p><b>Remarque : </b>La structure des dossiers est en "
+"mesure d'être recréée, et sera contenue dans « PegasusMail-Import ».</p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Fichiers mbox (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Impossible d'analyser la structure des dossiers, poursuite de l'importation "
+"en ignorant les sous-dossiers."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importation des nouveaux fichiers de courriels au format « .cnm »..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importation des dossiers de courriels au format « .pmm » en cours..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr ""
+"Importer des dossiers de courriers au format UNIX (« .mbx ») en cours..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importation de « %1 »"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Analyse de la structure des dossiers..."
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "Importer les messages et la structure des dossiers de Sylpheed"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Filtre d'importation pour Sylpheed</b></p><p>Sélectionnez votre "
+"dossier de boîtes aux lettres Sylpheed à importer (toujours « ~/.Mail »).</"
+"p><p>La structure des dossiers est en mesure d'être recréée, et sera "
+"contenue dans « Sylpheed-Import » dans votre dossier local.</p> <p>Ce filtre "
+"recrée également l'état des messages, par exemple nouveau ou transmis."
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -662,19 +517,117 @@ msgstr "Importer les messages et la structure des dossiers de The Bat!"
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Filtre d'importation pour The Bat!</b></p><p>Sélectionnez le dossier "
+"de base de votre boîte électronique The Bat! à importer.</p><p><b>Remarque : "
+"</b>ce filtre importe les fichiers « *.tbb » du dossier local de The Bat!, "
+"comme les comptes POP. Cependant, les comptes IMAP / DIMAP ne sont pas "
+"inclus.</p><p>La structure des dossiers est en mesure d'être recréée, et "
+"sera contenue dans « TheBat-Import » de votre compte local.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+"Importer les messages et la structure des dossiers de Thunderbird / Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Filtre d'importation pour Thunderbird / Mozilla</b></p><p>Sélectionnez "
+"votre dossier de boîtes aux lettres Thunderbird / Mozilla (toujours « ~/."
+"thunderbird/*.default/Mail/Local Folders/ »).</p><p><b>Remarque : </b>Ne "
+"choisissez jamais un dossier qui <u>ne</u> contient pas de fichiers "
+"« mbox » (notamment un « maildir »). Si vous le faites tout de même, vous "
+"obtiendrez alors de nombreux nouveaux dossiers.</p><p>La structure des "
+"dossiers est en mesure d'être recréée, et sera contenue dans « Thunderbird-"
+"Import ».</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<p><b>Filtre d'importation pour The Bat!</b></p>"
-"<p>Sélectionnez le dossier de base de votre boîte électronique The Bat! à "
-"importer.</p>"
-"<p><b>Remarque : </b>ce filtre importe les fichiers « *.tbb » du dossier local "
-"de The Bat!, comme les comptes POP. Cependant, les comptes IMAP / DIMAP ne sont "
-"pas inclus.</p>"
-"<p>La structure des dossiers est en mesure d'être recréée, et sera contenue "
-"dans « TheBat-Import » de votre compte local.</p>"
+"<b>Erreur fatale :</b> impossible de démarrer KMail pour la communication "
+"DCOP. Assurez-vous que le programme « KMail » est installé."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "Impossible de créer le dossier « %1 » dans KMail"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "Impossible d'ajouter le message au dossier « %1 » dans KMail"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Problème en ajoutant le message au dossier « %1 » dans KMail"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "De :"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Vers :"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Actuel :"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Importation en cours..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Total :"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Veuillez cliquer sur « Précédent » pour importer plus de courriers "
+"électroniques ou de contacts"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Bienvenue dans KMailCVT - L'outil d'importation de KMail</b>\n"
+"<br><br>\n"
+"Ce programme vous aidera à importer vos anciens courriels dans KMail."
+"<br><br><br><br>\n"
+"Veuillez choisir le programme dont vous voulez importer le courriel, puis "
+"cliquez sur « Suivant »."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Supprimer les messages en &double lors de l'importation"
diff --git a/tde-i18n-fy/messages/tdepim/kmailcvt.po b/tde-i18n-fy/messages/tdepim/kmailcvt.po
index bfc9998e69b..16f4b00bdad 100644
--- a/tde-i18n-fy/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-fy/messages/tdepim/kmailcvt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-03-16 19:45+0100\n"
 "Last-Translator: Rinse de Vries <rinsedevries@home.nl>\n"
 "Language-Team:  <nl@li.org>\n"
@@ -22,25 +22,81 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Bejochten fan Outlook ymportearje"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ","
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ","
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT Ymporthelpprogramma"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Stap 1: selektearje it filter"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Stap 2: Ymportearje..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Dwaande mei ymportearjen"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Ymport is klear"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Skreaun troch %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail ymportfilters"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, de ûntwikkelders fan KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Oarspronklike skriuwer"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Underhâlder & nije filters"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nije GUI en ferbetterings"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Berjochten en mappestruktuer fan Evolution 1.x ymportearje"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook ymportfilter</b></p> "
-"<p>Dit filter ymportearret berjochten út in pst-bestand fan Outlook. Jo moatte "
-"de map opsykje mei it pst-triem ûnder: <i>C:\\Documents and Settings</i> "
-"yn Windows 2000 of letter.</p> "
-"<p><b>Opmerking:</b> E-mailberjochten wurde yn in map dien dy't nei it account "
-"ferneamd wurdt, foarôfgien mei OUTLOOK-.</p>"
+"<p><b>Evolution 1.x ymportfilter</b></p> <p>Selektearje de haadmap mei "
+"berjochten fan Thunderbird (ornaris is dat ~/.evolution/local).</p> <p>Omdat "
+"it mooglik is om in nije mappestruktuer oan te meitsjen wurde alle mappen "
+"ûnder \"Evolution-Import\" setten.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -50,27 +106,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Gjin map selektearre."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Triemmen wurde teld..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Berjochten wurde teld..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Mappen wurde teld..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Mappen wurde teld..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Nije e-mailtriemmen wurde ymportearre..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -78,6 +113,22 @@ msgstr "Nije e-mailtriemmen wurde ymportearre..."
 msgid "No files found for import."
 msgstr "Gjin triemmen fûn om te ymportearjen."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Ymport fan e-mailberjochten út %1 is klear"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "%1 kin net iepene wurde en wurdt dêrom oerslein"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -95,39 +146,38 @@ msgstr ""
 "1 dûbel berjocht net ymportearre\n"
 "%n dûbele berjochten net ymportearre"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "%1 kin net iepene wurde en wurdt dêrom oerslein"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Berjochten en mappestruktuer fan Evolution 1.x ymportearje"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Berjochten en mappestruktuer fan Evolution 2.x ymportearje"
 
-#: filter_evolution.cxx:33
+# Import feroare yn Ymport, mar der steane wol " "" omhinne..
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x ymportfilter</b></p> "
-"<p>Selektearje de haadmap mei berjochten fan Thunderbird (ornaris is dat "
-"~/.evolution/local).</p> "
-"<p>Omdat it mooglik is om in nije mappestruktuer oan te meitsjen wurde alle "
-"mappen ûnder \"Evolution-Import\" setten.</p>"
+"<p><b>Evolution 2.x ymportfilter</b></p> <p>Selektearje de haadmap mei "
+"berjochten fan Thunderbird (ornaris is dat ~/.evolution/mail/local).</p> "
+"<p><b>Opmerking:</b> Kies noait in map dêr't <u>gjin</u> mbox-triemmen yn "
+"sitte (bygelyks maildir). At jo dit dochs dogge krije jo in soad nije mappen."
+"</p> <p>Omdat de mappestruktuer opnij oanmakke wurde kin, sille de mappen "
+"opslein wurde ûnder: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Ymport fan e-mailberjochten út %1 is klear"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Ymportearjen is klear, annulearre troch brûker."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Begûn mei triem%1 te ymportearjen..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -135,99 +185,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Mappen fan Pegasus Mail ymportearje"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Selektearje de map mei Pegasus Mail op jo systeem. Yn dizze map sitte de "
-"CNM-, PMM- en MBX-triemmen. Op in soad kompjûters sitten dizze triemmen yn "
-"C:\\PMail\\mail\\admin</p> "
-"<p><b>Opmerking:</b> Omdat de mappestruktuer opnij oanmakke wurde kin, sille de "
-"mappen ûnderbrocht wurde yn: \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Koe de mappestruktuer net ûntlede, de ymport wurdt fuortset sûnder stypjen foar "
-"submappen."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Nije e-mailbestannen wurde ymportearre ('.cnm') ..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "E-mailmappen wurde ymportearre ( '.pmm') ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "UNIX e-mailmappen wurden ymportearre ('.mbx') ..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Dwaande mei it ymportearjen fan %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Berjocht %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "De mappestruktuer wurdt ûntlede..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Skreaun troch %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "E-mailberjochten fan Lotus Notes ymportearje"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Ymportfilter foar Lotus Notes Structured Text</b></p> "
-"<p>Dit filter sil Structured Text-triemmen fan Lotus Notes nei KMail "
-"ymportearje. Brûk dit filter at jo e-mailberjochten fan Lotus Notes, of oare "
-"programma's dy't dit triemformaat stypje, ymportearje wolle en foar oare "
-"e-mailprogramma's dy't dit standert UNIX-formaat brûke.</p> "
-"<p><b>Opmerking:</b> Omdat it mooglik is om de mappestruktuer opnij oan te "
-"meitsjen sille de ymportearre berjochten yn submappen setten wurde ûnder: "
-"\"LNotes-Import\".</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Alle triemmen (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "E-mailberjochten fan %1 wurde ymportearre"
 
 # maildir=?
 #: filter_kmail_maildir.cxx:26
@@ -236,30 +197,21 @@ msgstr "Maildirs en mappestruktuer fan KMail ymportearje"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Ymportfilter foar KMail</b></p> "
-"<p>Selektearje de haadmap fan de berjochtmappen fan KMail dy't jo ymportearje "
-"wolle.</p> "
-"<p><b>Opmerking:</b> Jo meie nea de KMail maildir brûke (ornaris is dat ~/Mail "
-"of ~/.trinity/share/apps/kmail/mail), omdat KMailCVT oars fêstrint.</p> "
-"<p>Dit filter stipet gjin berjochtmappen fan KMail yn it mbox-formaat.</p> "
-"<p>Omdat de mappestruktuer opnij oanmakke wurde kin, sille de mappen opslein "
-"wurde yn jo lokale map ûnder: \"KMail-Import\".</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Ymportearjen is klear, annulearre troch brûker."
+"<p><b>Ymportfilter foar KMail</b></p> <p>Selektearje de haadmap fan de "
+"berjochtmappen fan KMail dy't jo ymportearje wolle.</p> <p><b>Opmerking:</b> "
+"Jo meie nea de KMail maildir brûke (ornaris is dat ~/Mail of ~/.trinity/"
+"share/apps/kmail/mail), omdat KMailCVT oars fêstrint.</p> <p>Dit filter "
+"stipet gjin berjochtmappen fan KMail yn it mbox-formaat.</p> <p>Omdat de "
+"mappestruktuer opnij oanmakke wurde kin, sille de mappen opslein wurde yn jo "
+"lokale map ûnder: \"KMail-Import\".</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -272,195 +224,41 @@ msgstr "Map %1 ymportearje..."
 msgid "Could not import %1"
 msgstr "Koe %1 net ymportearje"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Berjochten en mappestruktuer fan Thunderbird/Mozilla ymportearje"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird/Mozilla ymportfilter</b></p> "
-"<p>Selektearje de haadmap mei berjochten fan Thunderbird/Mozilla (ornaris is "
-"dat ~/.thunderbird/*.default/Mail/Local Folders/).</p> "
-"<p><b>Opmerking:</b> Kies noait in map wêryn't <u>gjin</u> "
-"mbox-triemmen sitte (bygelyks maildir). At jo dit dochs dogge krije jo in soad "
-"nije mappen.</p> "
-"<p>It is mooglik om in nije mappestruktuer oan te meitsjen, de mappen sille yn "
-"\"Thunderbird-Import\" setten wurde.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Begûn mei triem%1 te ymportearjen..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Berjochten fan Opera ymportearje"
-
-# account=?
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera ymportfilter</b></p> "
-"<p>Dit filter ymportearret e-mailberjochten fan in Opera berjochtemap. Brûk dit "
-"filter om alle berjochten te ymportearjen fan in beskate account yn de maildir "
-"fan Opera.</p> "
-"<p>Selektearje de map fan it akkount (ornaris ûnder "
-"~/.opera/mail/store/account*).</p> "
-"<p><b>Opmerking:</b> De e-mailberjochten wurde yn in map setten mei in namme "
-"oan de hân fan it account dêr't se by hearre, foarôfgien troch OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Berjochten en mappestruktuer fan Evolution 2.x ymportearje"
-
-# Import feroare yn Ymport, mar der steane wol " "" omhinne..
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x ymportfilter</b></p> "
-"<p>Selektearje de haadmap mei berjochten fan Thunderbird (ornaris is dat "
-"~/.evolution/mail/local).</p> "
-"<p><b>Opmerking:</b> Kies noait in map dêr't <u>gjin</u> "
-"mbox-triemmen yn sitte (bygelyks maildir). At jo dit dochs dogge krije jo in "
-"soad nije mappen.</p> "
-"<p>Omdat de mappestruktuer opnij oanmakke wurde kin, sille de mappen opslein "
-"wurde ûnder: \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Fan:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Oan:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "No:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Ymport wurdt útfierd..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Totaal:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Klik op de knop 'Tebek' om mear e-mailberjochten of kontaktpersoanen te "
-"ymportearjen"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "E-mailberjochten fan Lotus Notes ymportearje"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Wolkom by KMailCVT, in ymportprogramma foar KMail.</b>\n"
-"<br>"
-"<br> Dit programma sil jo helpe by it ymportearjen fan e-mailberjochten út jo "
-"foarige e-mailprogramma nei KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Selektearje it programma dêr't jo de berjochten út ymportearje wolle, en klik "
-"op \"Folgjende\"."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "&Dûbele bejochten fuortsmite by it ymportearjen"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail ymportfilters"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, de ûntwikkelders fan KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Oarspronklike skriuwer"
+"<p><b>Ymportfilter foar Lotus Notes Structured Text</b></p> <p>Dit filter "
+"sil Structured Text-triemmen fan Lotus Notes nei KMail ymportearje. Brûk dit "
+"filter at jo e-mailberjochten fan Lotus Notes, of oare programma's dy't dit "
+"triemformaat stypje, ymportearje wolle en foar oare e-mailprogramma's dy't "
+"dit standert UNIX-formaat brûke.</p> <p><b>Opmerking:</b> Omdat it mooglik "
+"is om de mappestruktuer opnij oan te meitsjen sille de ymportearre "
+"berjochten yn submappen setten wurde ûnder: \"LNotes-Import\".</p>"
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Underhâlder & nije filters"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nije GUI en ferbetterings"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Alle triemmen (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ","
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "E-mailberjochten fan %1 wurde ymportearre"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ","
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Berjocht %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -468,12 +266,11 @@ msgstr "Fan OS X Mail ymportearje"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Ymportfilter foar OS X Mail</b></p>"
-"<p> Dit filter ymportearret e-mailberjochten fan it e-mailprogramma fan Apple "
-"Mac OS X.</p>"
+"<p><b>Ymportfilter foar OS X Mail</b></p><p> Dit filter ymportearret e-"
+"mailberjochten fan it e-mailprogramma fan Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -483,25 +280,28 @@ msgstr ""
 "1 dûbel berjocht waard net ymportearre yn de map %1 fan KMail.\n"
 "%n dûbele berjochten waarden net ymportearre yn de map %1 fan KMail."
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT Ymporthelpprogramma"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Stap 1: selektearje it filter"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Stap 2: Ymportearje..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "mbox-triemmen ymportearje (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Dwaande mei ymportearjen"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox ymportfilter</b></p> <p>Dit filter sil mbox-triemmen yn KMail "
+"ymportearje. Brûk dit filter as jo e-mailberjochten fan Ximian Evolution "
+"ymportearje wolle en foar oare e-mailprogramma's dy't dit standert UNIX-"
+"formaat brûke.</p> <p><b>Opmerking:</b> De berjochten sille ymportearre "
+"wurde nei mappen dy't neamd wurde nei de triem dêr't de berjochten úthelle "
+"wurde, mei as foarheaksel MBOX-.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Ymport is klear"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox Triemmen (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -509,25 +309,21 @@ msgstr "Berjochten fan Outlook Express ymportearje"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 ymportfilter</b></p> "
-"<p>Jo moatte de map opfreegje wêr't jo postvak opslein is troch nei .dbx- of "
-".mbx-triemmen te sykjen ûnder "
-"<ul> "
-"<li><i>C:\\Windows\\Application Data</i> yn Windows 9x "
-"<li><i>Documents and Settings</i> yn Windows 2000 of nijer</ul></p>"
-"<p><b>Opmerking:</b> Omdat it mooglik is om de mappestruktuer opnij oan te "
-"meitsjen, sille de mappen fan Outlook Express 5 en 6 setten wurde ûnder "
-"\"OE-Import\" yn jo lokale map.</p>"
+"<p><b>Outlook Express 4/5/6 ymportfilter</b></p> <p>Jo moatte de map "
+"opfreegje wêr't jo postvak opslein is troch nei .dbx- of .mbx-triemmen te "
+"sykjen ûnder <ul> <li><i>C:\\Windows\\Application Data</i> yn Windows 9x "
+"<li><i>Documents and Settings</i> yn Windows 2000 of nijer</ul></"
+"p><p><b>Opmerking:</b> Omdat it mooglik is om de mappestruktuer opnij oan te "
+"meitsjen, sille de mappen fan Outlook Express 5 en 6 setten wurde ûnder \"OE-"
+"Import\" yn jo lokale map.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -562,31 +358,195 @@ msgstr "OE5-postfak %1 wurdt ymportearre"
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5 wurdt ymportearre mei  maptriem %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Berjochten fan Opera ymportearje"
+
+# account=?
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Opera ymportfilter</b></p> <p>Dit filter ymportearret e-mailberjochten "
+"fan in Opera berjochtemap. Brûk dit filter om alle berjochten te "
+"ymportearjen fan in beskate account yn de maildir fan Opera.</p> "
+"<p>Selektearje de map fan it akkount (ornaris ûnder ~/.opera/mail/store/"
+"account*).</p> <p><b>Opmerking:</b> De e-mailberjochten wurde yn in map "
+"setten mei in namme oan de hân fan it account dêr't se by hearre, foarôfgien "
+"troch OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Triemmen wurde teld..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Nije e-mailtriemmen wurde ymportearre..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Bejochten fan Outlook ymportearje"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Outlook ymportfilter</b></p> <p>Dit filter ymportearret berjochten út "
+"in pst-bestand fan Outlook. Jo moatte de map opsykje mei it pst-triem ûnder: "
+"<i>C:\\Documents and Settings</i> yn Windows 2000 of letter.</p> "
+"<p><b>Opmerking:</b> E-mailberjochten wurde yn in map dien dy't nei it "
+"account ferneamd wurdt, foarôfgien mei OUTLOOK-.</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Berjochten wurde teld..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Mappen wurde teld..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Mappen wurde teld..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "E-mailberjochten yn platte-tekst ymportearje"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p> Selektearje de map op jo kompjûter mei de e-mailberjochten. De e-"
+"mailbejochten wurde opslein yn in triem dat deselde namme hat as de map "
+"dêr't se útkomme, mei as foarheaksel PLAIN-</p> <p>Dit filter ymportearret "
+"alle .msg .eml en .txt-e-mailberjochten.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Mappen fan Pegasus Mail ymportearje"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Selektearje de map mei Pegasus Mail op jo systeem. Yn dizze map sitte de "
+"CNM-, PMM- en MBX-triemmen. Op in soad kompjûters sitten dizze triemmen yn C:"
+"\\PMail\\mail\\admin</p> <p><b>Opmerking:</b> Omdat de mappestruktuer opnij "
+"oanmakke wurde kin, sille de mappen ûnderbrocht wurde yn: \"PegasusMail-"
+"Import\".</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Koe de mappestruktuer net ûntlede, de ymport wurdt fuortset sûnder stypjen "
+"foar submappen."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Nije e-mailbestannen wurde ymportearre ('.cnm') ..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "E-mailmappen wurde ymportearre ( '.pmm') ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "UNIX e-mailmappen wurden ymportearre ('.mbx') ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Dwaande mei it ymportearjen fan %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "De mappestruktuer wurdt ûntlede..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Berjochten en mappestruktuer fan Sylpheed ymportearje"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Sylpheed ymportfilter</b></p> <p>Selektearje de map mei berjochten "
+"dy't jo ymportearje wolle (ornaris: ~/Mail ).</p> <p>Omdat it mooglik is om "
+"in nije mappestruktuer te meitsjen sille de mappen teplak setten wurde ûnder "
+"\"Sylpheed-Import\" in jo lokale map.</p> <p>Dizze map makket ek in nije "
+"status oan foar berjochten, bygelyks 'nij' of 'trochstjoerd'."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Berjochten en mappestruktuer fan The Bat! ymportearje"
+
+# is der in Frysk alternatyf foar account?
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Ymportfilter foar The Bat!</b></p> <p>Selektearje de haadmap fan de "
+"berjochtemappen fan The Bat! dy't jo ymportearje wolle.</p> "
+"<p><b>Opmerkingen:</b> Dit filter ymportearret de *.tbb-triemmen út de "
+"lokale mappen fan The Bat! lykas dy fan POP-accounts. Dizze wurde net "
+"ymportearre foar IMAP/DIMAP-accounts.</p> <p>Omdat it mooglik is om in nije "
+"mappestruktuer oan te meitsjen wurde de mappen yn de map \"TheBat-Ymport\" "
+"yn jo lokale akkount setten.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Berjochten en mappestruktuer fan Thunderbird/Mozilla ymportearje"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Sylpheed ymportfilter</b></p> "
-"<p>Selektearje de map mei berjochten dy't jo ymportearje wolle (ornaris: ~/Mail "
-").</p> "
-"<p>Omdat it mooglik is om in nije mappestruktuer te meitsjen sille de mappen "
-"teplak setten wurde ûnder \"Sylpheed-Import\" in jo lokale map.</p> "
-"<p>Dizze map makket ek in nije status oan foar berjochten, bygelyks 'nij' of "
-"'trochstjoerd'."
+"<p><b>Thunderbird/Mozilla ymportfilter</b></p> <p>Selektearje de haadmap mei "
+"berjochten fan Thunderbird/Mozilla (ornaris is dat ~/.thunderbird/*.default/"
+"Mail/Local Folders/).</p> <p><b>Opmerking:</b> Kies noait in map wêryn't "
+"<u>gjin</u> mbox-triemmen sitte (bygelyks maildir). At jo dit dochs dogge "
+"krije jo in soad nije mappen.</p> <p>It is mooglik om in nije mappestruktuer "
+"oan te meitsjen, de mappen sille yn \"Thunderbird-Import\" setten wurde.</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Fataal:</b> Kmail kin net opstarten wurde foar DCOP-kommunikaasje. "
 "Kontrolearje oft <i>kmail</i>ynstallearre is."
@@ -603,67 +563,59 @@ msgstr "It berjocht kin net oan de map %1 yn KMail tafoege wurde"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fout by it tafoegjen fan berjocht oan de map %1 yn KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "E-mailberjochten yn platte-tekst ymportearje"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Fan:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p> Selektearje de map op jo kompjûter mei de e-mailberjochten. De "
-"e-mailbejochten wurde opslein yn in triem dat deselde namme hat as de map dêr't "
-"se útkomme, mei as foarheaksel PLAIN-</p> "
-"<p>Dit filter ymportearret alle .msg .eml en .txt-e-mailberjochten.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Oan:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "mbox-triemmen ymportearje (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "No:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>mbox ymportfilter</b></p> "
-"<p>Dit filter sil mbox-triemmen yn KMail ymportearje. Brûk dit filter as jo "
-"e-mailberjochten fan Ximian Evolution ymportearje wolle en foar oare "
-"e-mailprogramma's dy't dit standert UNIX-formaat brûke.</p> "
-"<p><b>Opmerking:</b> De berjochten sille ymportearre wurde nei mappen dy't "
-"neamd wurde nei de triem dêr't de berjochten úthelle wurde, mei as foarheaksel "
-"MBOX-.</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Ymport wurdt útfierd..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox Triemmen (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Berjochten en mappestruktuer fan The Bat! ymportearje"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Totaal:"
 
-# is der in Frysk alternatyf foar account?
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Klik op de knop 'Tebek' om mear e-mailberjochten of kontaktpersoanen te "
+"ymportearjen"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Ymportfilter foar The Bat!</b></p> "
-"<p>Selektearje de haadmap fan de berjochtemappen fan The Bat! dy't jo "
-"ymportearje wolle.</p> "
-"<p><b>Opmerkingen:</b> Dit filter ymportearret de *.tbb-triemmen út de lokale "
-"mappen fan The Bat! lykas dy fan POP-accounts. Dizze wurde net ymportearre foar "
-"IMAP/DIMAP-accounts.</p> "
-"<p>Omdat it mooglik is om in nije mappestruktuer oan te meitsjen wurde de "
-"mappen yn de map \"TheBat-Ymport\" yn jo lokale akkount setten.</p>"
+"<b>Wolkom by KMailCVT, in ymportprogramma foar KMail.</b>\n"
+"<br><br> Dit programma sil jo helpe by it ymportearjen fan e-mailberjochten "
+"út jo foarige e-mailprogramma nei KMail.<br><br><br><br>\n"
+" Selektearje it programma dêr't jo de berjochten út ymportearje wolle, en "
+"klik op \"Folgjende\"."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "&Dûbele bejochten fuortsmite by it ymportearjen"
diff --git a/tde-i18n-ga/messages/tdepim/kmailcvt.po b/tde-i18n-ga/messages/tdepim/kmailcvt.po
index ad3ac4aac55..e59a8c3b0e7 100644
--- a/tde-i18n-ga/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ga/messages/tdepim/kmailcvt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdepim/kmailcvt.po\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2004-12-03 14:52-0500\n"
 "Last-Translator: Kevin Patrick Scannell <scannell@SLU.EDU>\n"
 "Language-Team: ga <LL@li.org>\n"
@@ -10,48 +10,85 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Iompórtáil Ríomhphost ó Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Séamus Ó Ciardhuáin,Kevin Scannell"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
-msgstr ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "seoc at iolfree dot ie,scannell at slu dot edu"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
-msgid "No directory selected."
-msgstr ""
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Uirlis Iompórtála KMailCVT"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr ""
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Céim a haon: Roghnaigh Scagaire"
 
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Céim a dó: Á nIompórtáil"
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Iompórtáil ar siúl"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
 msgstr ""
 
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Scríofa ag %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Scagairí Iompórtála KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "© 2000-2005, Forbróirí KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "An chéad údar"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Cothaitheoir & Scagairí nua"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Comhéadan nua & glanadh"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Comhaid nua ríomhphoist á n-iompórtáil..."
+#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
+#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
+#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
+#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
+#: filter_thunderbird.cxx:65
+msgid "No directory selected."
+msgstr ""
 
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
@@ -60,6 +97,22 @@ msgstr "Comhaid nua ríomhphoist á n-iompórtáil..."
 msgid "No files found for import."
 msgstr ""
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr ""
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr ""
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -75,33 +128,30 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:31
+msgid ""
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:33
-msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
 #: filter_kmail_archive.cxx:24
@@ -110,59 +160,36 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Iompórtáil Fillteáin ó Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_kmail_maildir.cxx:28
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Comhaid nua poist á n-iompórtáil ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Fillteáin phoist á n-iompórtáil ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Fillteáin phoist 'UNIX' á n-iompórtáil ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "%1 á iompórtáil"
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+msgid "Import folder %1..."
+msgstr ""
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
 #, c-format
-msgid "Message %1"
-msgstr "Teachtaireacht %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Struchtúr an fhillteáin á pharsáil..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Scríofa ag %1.</i></p>"
+msgid "Could not import %1"
+msgstr "Ní féidir %1 a iompórtáil"
 
 #: filter_lnotes.cxx:30
 msgid "Import Lotus Notes Emails"
@@ -170,14 +197,13 @@ msgstr "Iompórtáil Ríomhphost ó Lotus Notes"
 
 #: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 
 #: filter_lnotes.cxx:55
@@ -189,191 +215,10 @@ msgstr "Gach Comhad (*)"
 msgid "Importing emails from %1"
 msgstr "Ríomhphost á iompórtáil ó %1"
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr ""
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr ""
-
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-msgid "Import folder %1..."
-msgstr ""
-
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
-msgid "Could not import %1"
-msgstr "Ní féidir %1 a iompórtáil"
-
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr ""
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Iompórtáil Ríomhphost ó Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Ó:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Go:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Reatha:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Iompórtáil ar siúl..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Iomlán:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr ""
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Scagairí Iompórtála KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "© 2000-2005, Forbróirí KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "An chéad údar"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Cothaitheoir & Scagairí nua"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Comhéadan nua & glanadh"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Séamus Ó Ciardhuáin,Kevin Scannell"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "seoc at iolfree dot ie,scannell at slu dot edu"
+msgid "Message %1"
+msgstr "Teachtaireacht %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -381,8 +226,8 @@ msgstr "Iompórtáil Ó Phost OS X"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
@@ -391,39 +236,34 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Uirlis Iompórtála KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Céim a haon: Roghnaigh Scagaire"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Céim a dó: Á nIompórtáil"
-
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Iompórtáil ar siúl"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Iompórtáil Comhaid mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
 msgstr ""
 
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Comhaid mbox (*)"
+
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
 msgstr "Iompórtáil Ríomhphost ó Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
@@ -461,24 +301,152 @@ msgstr "Bosca poist OE5+ %1 á iompórtáil"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Comhad fillteáin OE5+ %1 á iompórtáil"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Iompórtáil Ríomhphost ó Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr ""
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Comhaid nua ríomhphoist á n-iompórtáil..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Iompórtáil Ríomhphost ó Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr ""
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr ""
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr ""
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Iompórtáil Ríomhphost Gnáth-Théacs"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Iompórtáil Fillteáin ó Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Comhaid nua poist á n-iompórtáil ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Fillteáin phoist á n-iompórtáil ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Fillteáin phoist 'UNIX' á n-iompórtáil ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "%1 á iompórtáil"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Struchtúr an fhillteáin á pharsáil..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 
 #: filters.cxx:153 filters.cxx:188
@@ -493,49 +461,54 @@ msgstr "Ní féidir teachtaireacht a chur leis an fhillteán %1 i KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr ""
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Iompórtáil Ríomhphost Gnáth-Théacs"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Ó:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Go:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Iompórtáil Comhaid mbox (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Reatha:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Iompórtáil ar siúl..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Comhaid mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Iomlán:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
 
 #~ msgid "Alt+D"
diff --git a/tde-i18n-gl/messages/tdepim/kmailcvt.po b/tde-i18n-gl/messages/tdepim/kmailcvt.po
index 3e848bc536d..7f7b26cc028 100644
--- a/tde-i18n-gl/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-gl/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-12-30 13:50+0100\n"
 "Last-Translator: Xabi G. Feal <xabigf@gmx.net>\n"
 "Language-Team: Galician <trasno@ceu.fi.udc.es>\n"
@@ -14,25 +14,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Importar Correos-e de Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Xabi García"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "xabigf@gmx.net"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Ferramenta de importación de KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Paso 1: Escoller filtro"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Paso 2: Importando..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importación en progreso"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Importación rematada"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Escrito por %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Filtros de Importación de KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, Os desenvolvedores de KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Autor orixinal"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Mantedor & Novos Filtros"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Pulementos e nova interface"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Importar correos-e e estructura de cartafoles de Evolution 1.x"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Filtro de importación de correo-e de Outlook</b></p>"
-"<p>Este filtro importará os correos dun ficheiro pst Outlook. Precisará "
-"localizar o cartafol onde se gardaron os ficheiros pst procurando por estos "
-"baixo: <i>C:\\Documents and Settings</i> en Windows 2000 ou posterior</p>"
-"<p><b>Nota:</b> Os correos-e importaranse nun cartafol de nome a conta da que "
-"proveñan e precedido de OUTLOOK-</p>"
+"<p><b>Filtro de importación de Evolution 1.x</b></p><p>Escolla o directorio "
+"base dos correos de Evolution (normalmente ~/evolution/local).</p><p>Xa que "
+"é posíbel recrear a estructura de cartafoles, os cartafoles gardaranse "
+"baixo: \"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -42,27 +98,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Non se seleccionou un directorio."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Contando ficheiros..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Contando o correo..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Contando os directorios..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Contando os cartafoles..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Importando novos ficheiros de correo..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -70,6 +105,22 @@ msgstr "Importando novos ficheiros de correo..."
 msgid "No files found for import."
 msgstr "Non se atoparon ficheiros para se importar."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Rematou a importación de correos-e dende %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Imposíbel abrir %1, omitindo"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -87,39 +138,37 @@ msgstr ""
 "1 mensaxe duplicada non importada\n"
 "%n mensaxe duplicadas non importadas"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Imposíbel abrir %1, omitindo"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Importar correos-e e estructura de cartafoles de Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Importar esctructura de cartafoles e correos dende Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Filtro de importación de Evolution 1.x</b></p>"
-"<p>Escolla o directorio base dos correos de Evolution (normalmente "
-"~/evolution/local).</p>"
-"<p>Xa que é posíbel recrear a estructura de cartafoles, os cartafoles "
-"gardaranse baixo: \"Evolution-Import\".</p>"
+"<p><b>Filtro de importación de Evolution 2.x</b></p> <p>Escolla o cartafol "
+"base do seu cartafol de correo-e de Evolution (normalmente ~/.evolution/mail/"
+"local/).</p><p><b>Nota:</b> Nunca escolla un Cartafol que <u>non</u> conteña "
+"ficheiros mbox (por exemplo un maildir): se o fai, terá moitos novos "
+"cartafoles.</p> <p>Xa que é posíbel recrear a estructura de cartafoles, os "
+"cartafoles gravaranse baixo:  \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Rematou a importación de correos-e dende %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Rematou a importación, cancelada polo usuario"
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Inicar a importación do ficheiro %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -127,133 +176,33 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importar cartafoles de Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Escolla o cartafol de Pegasus-Mail do seu sistema (contendo os ficheiros "
-"*.CNM, *.PNM e *.MBX). En moitos sistemas grávase en C:\\pmail\\mail ou "
-"C:\\pmail\\mail\\admin</p> "
-"<p><b>Nota:</b> Xa que é posíbel recrear a estructura de cartafoles, os "
-"cartafoles grávanse baixo: \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Non se pode interpretar a estructura de cartafoles; cotinuar a importación sen "
-"o soporte de subcartafoles."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importando novos ficheiros de correo ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importando cartafoles de correo ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importando cartafoles de correo UNIX ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importando %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Mensaxe %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Interpretando a estructura de cartafoles..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Escrito por %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Importando correos-e de Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Filtro de importación de correo-e de Lotus Notes Structured Text</b></p> "
-"<p>Este filtro importará os ficheiros Structured Text dende un cliente de "
-"correo-e exportado a Lotus Notes en KMail. Use este filtro se quere importar os "
-"correos-e dende Lotus ou de outros axentes de correo-e que empreguen dito "
-"formato.</p> "
-"<p><b>Nota:</b> Xa que é posíbel recrear a estructura de cartafoles, as "
-"mensaxes importadas gravaranse nos subcartafoles baixo \"LNotes-Import\", no "
-"seu cartafol persoal, nomeado usando os nomes dos ficheiros dos que proveñan as "
-"mensaxes.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Todos os ficheiros (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Importando correos-e dende %1"
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importar estructura de cartafoles e maildirs de KMail"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Filtro de importación de KMail</b></p> "
-"<p>Escolla o cartafol base do directorio de correo-e de KMail que queira "
-"importar.</p> "
-"<p><b>Nota:</b> Nunca escolla o seu maildir de KMail actual (normalmente ~/Mail "
-"ou ~/.trinity/share/apps/kmail/mail: neste caso, KMailCVT podería meterse nun "
-"bucle infinito. </p> "
-"<p>Este fitro non importa os cartafoles de correo de KMail con ficheiros "
-"mbox.</p> "
-"<p>Xa que é posíbel recrear a estructura de cartafoles, os cartafoles "
-"gravaranse baixo: \"KMail-Import\" no seu cartafol local.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Rematou a importación, cancelada polo usuario"
+"<p><b>Filtro de importación de KMail</b></p> <p>Escolla o cartafol base do "
+"directorio de correo-e de KMail que queira importar.</p> <p><b>Nota:</b> "
+"Nunca escolla o seu maildir de KMail actual (normalmente ~/Mail ou ~/."
+"trinity/share/apps/kmail/mail: neste caso, KMailCVT podería meterse nun "
+"bucle infinito. </p> <p>Este fitro non importa os cartafoles de correo de "
+"KMail con ficheiros mbox.</p> <p>Xa que é posíbel recrear a estructura de "
+"cartafoles, os cartafoles gravaranse baixo: \"KMail-Import\" no seu cartafol "
+"local.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -266,193 +215,42 @@ msgstr "Importar cartafol %1..."
 msgid "Could not import %1"
 msgstr "Non se puido importar %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-"Importar correos locais e estructura de cartafoles de Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Filtro de importación de Thunderbird/Mozilla</b></p>"
-"<p>Escolla o seu cartafol de correo base de Thunderbird/Mozilla (normalmente "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Nota:</b> Nunca escolla un cartafol que <u>non</u> "
-"conteña ficheiros mbox (por exemplo, un maildir): se o fai, obterá moitos novos "
-"cartafoles.</p>"
-"<p>Xa que non é posíbel recrear unha estructura de cartafoles, os cartafoles "
-"almacenaranse baixo: \"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Inicar a importación do ficheiro %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Importar correos-e de Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Filtro de importación de correo-e dende Opera</b></p> "
-"<p>Este filtro importará correos-e dende o cartafol de correo de Opera. Use "
-"este filtro se quere importar todos os correos dentro dunha conta do maildir de "
-"Opera.</p> "
-"<p>Seleccione o cartafol da conta (normalmente "
-"~/.opera/mail/store/account*).</p> "
-"<p><b>Nota:</b> Os correos-e importaranse nun cartafol de nome OPERA- e mailo "
-"nome da conta da que proveñene.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Importar esctructura de cartafoles e correos dende Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Filtro de importación de Evolution 2.x</b></p> "
-"<p>Escolla o cartafol base do seu cartafol de correo-e de Evolution "
-"(normalmente ~/.evolution/mail/local/).</p>"
-"<p><b>Nota:</b> Nunca escolla un Cartafol que <u>non</u> "
-"conteña ficheiros mbox (por exemplo un maildir): se o fai, terá moitos novos "
-"cartafoles.</p> "
-"<p>Xa que é posíbel recrear a estructura de cartafoles, os cartafoles "
-"gravaranse baixo:  \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Dende:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "A:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Actual:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Importación en progreso..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Total:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Prema en 'Atrás' para importar máis correos-e ou contactos"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Importando correos-e de Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Benvido/a a KMailCVT - A ferramenta de importación de KMail</b>\n"
-"<br>"
-"<br>\n"
-"Este programa axudaralle a importar a KMail o seu correo-e dende o seu anterior "
-"programa de correo."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Por favor, escolla o programa dende o que quere importar o correo, logo prema "
-"en 'Vindeiro'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Borrar as mensaxes &duplicadas mentres e importan"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
+"<p><b>Filtro de importación de correo-e de Lotus Notes Structured Text</b></"
+"p> <p>Este filtro importará os ficheiros Structured Text dende un cliente de "
+"correo-e exportado a Lotus Notes en KMail. Use este filtro se quere importar "
+"os correos-e dende Lotus ou de outros axentes de correo-e que empreguen dito "
+"formato.</p> <p><b>Nota:</b> Xa que é posíbel recrear a estructura de "
+"cartafoles, as mensaxes importadas gravaranse nos subcartafoles baixo "
+"\"LNotes-Import\", no seu cartafol persoal, nomeado usando os nomes dos "
+"ficheiros dos que proveñan as mensaxes.</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Filtros de Importación de KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, Os desenvolvedores de KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Autor orixinal"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Mantedor & Novos Filtros"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Pulementos e nova interface"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Todos os ficheiros (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Xabi García"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Importando correos-e dende %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "xabigf@gmx.net"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Mensaxe %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -460,12 +258,11 @@ msgstr "Importar dende OS X Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Filtro de importación de OS X Mail</b></p>"
-"<p>Este filtro importa os correos-e dende o cliente de correo de Apple MacOS "
-"X.</p>"
+"<p><b>Filtro de importación de OS X Mail</b></p><p>Este filtro importa os "
+"correos-e dende o cliente de correo de Apple MacOS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -475,25 +272,27 @@ msgstr ""
 "1 mensaxe duplicada non importada ao cartafol %1 en KMail\n"
 "%n mensaxes duplicadas non importadas ao cartafol %1 en KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Ferramenta de importación de KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Paso 1: Escoller filtro"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Paso 2: Importando..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importar ficheiros mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importación en progreso"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Filtro de importación de mbox</b></p> <p>Este filtro importará os "
+"ficheiros mbox a KMail. Use este filtro se quere importar os correos-e dende "
+"Ximian Evolution ou outros axentes de correo-e que usen este formato "
+"tradicional de UNIX.</p> <p><b>Nota:</b> Os corrreos-e importaranse en "
+"cartafoles nomeados con MBOX- e mail ficheiro do que proveñan.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Importación rematada"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Ficheiros mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -501,22 +300,18 @@ msgstr "Importar correos de Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Filtro de importación de Outlook Express 4/5/6</b></p> "
-"<p>Precisará localizar o cartafol onde se gravaron os mailbox procurando por "
-"ficheiros .dbx ou .mbx baixo "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> enWindows 9x"
-"<li><i>Documents and Settings</i> en Windows 2000 ou posterior</ul></p> "
+"<p><b>Filtro de importación de Outlook Express 4/5/6</b></p> <p>Precisará "
+"localizar o cartafol onde se gravaron os mailbox procurando por ficheiros ."
+"dbx ou .mbx baixo <ul><li><i>C:\\Windows\\Application Data</i> enWindows "
+"9x<li><i>Documents and Settings</i> en Windows 2000 ou posterior</ul></p> "
 "<p><b>Nota:</b> Xa que é posíbel recrear a estructura de cartafoles, os "
 "cartafoles de Outlook Express 5 e 6 gravaranse baixo: \"OE-Import\" no seu "
 "cartafol local.</p>"
@@ -554,45 +349,66 @@ msgstr "Importando bución de correo de OE5 %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importando o ficheiro de cartafol OE5+ %1"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "Importar estructura de cartafoles e maildirs de Sylpheed"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Importar correos-e de Opera"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
-"<p><b>Filtro de importación Sylpheed</b></p>"
-"<p>Escolla o directorio base do cartafol de correo de Sylpheed que quere "
-"importar (normalmente: ~/Mail ).</p>"
-"<p>Xa que é posíbel recrear a estructura de cartafoles, os cartafoles "
-"gardaranse baixo: \"Sylpheed-Import\" no seu cartafol local.</p>"
-"<p>Este filtro tamén recrea o estado da mensaxe, e.g. nova ou reenviada."
+"<p><b>Filtro de importación de correo-e dende Opera</b></p> <p>Este filtro "
+"importará correos-e dende o cartafol de correo de Opera. Use este filtro se "
+"quere importar todos os correos dentro dunha conta do maildir de Opera.</p> "
+"<p>Seleccione o cartafol da conta (normalmente ~/.opera/mail/store/account*)."
+"</p> <p><b>Nota:</b> Os correos-e importaranse nun cartafol de nome OPERA- e "
+"mailo nome da conta da que proveñene.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Contando ficheiros..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Importando novos ficheiros de correo..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Importar Correos-e de Outlook"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>Fatal:</b> Imposíbel iniciar KMail para comunicación DCOP. Cerciórese de que "
-"<i>kmail</i> está instalado."
+"<p><b>Filtro de importación de correo-e de Outlook</b></p><p>Este filtro "
+"importará os correos dun ficheiro pst Outlook. Precisará localizar o "
+"cartafol onde se gardaron os ficheiros pst procurando por estos baixo: <i>C:"
+"\\Documents and Settings</i> en Windows 2000 ou posterior</p><p><b>Nota:</b> "
+"Os correos-e importaranse nun cartafol de nome a conta da que proveñan e "
+"precedido de OUTLOOK-</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "Non se pode crear o cartafol %1 en KMail"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Contando o correo..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "Non se pode engadir a mensaxe ao cartafol %1 en KMail"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Contando os directorios..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Erro ao engadir a mensaxe ao cartafol %1 en KMail"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Contando os cartafoles..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -601,38 +417,79 @@ msgstr "Importar Correos-e de Texto Plano"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 "<p>Escolla o directorio que contén os correos no seu sistema. Os correos "
-"emprázanse nun cartafol co mesmo nome que o directorio onde están, precedido de "
-"PLAIN-</p>"
-"<p>Este filtro importará todos os correos-e .msg, .eml e .txt.</p>"
+"emprázanse nun cartafol co mesmo nome que o directorio onde están, precedido "
+"de PLAIN-</p><p>Este filtro importará todos os correos-e .msg, .eml e .txt.</"
+"p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importar ficheiros mbox (UNIX, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importar cartafoles de Pegasus-Mail"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>Filtro de importación de mbox</b></p> "
-"<p>Este filtro importará os ficheiros mbox a KMail. Use este filtro se quere "
-"importar os correos-e dende Ximian Evolution ou outros axentes de correo-e que "
-"usen este formato tradicional de UNIX.</p> "
-"<p><b>Nota:</b> Os corrreos-e importaranse en cartafoles nomeados con MBOX- e "
-"mail ficheiro do que proveñan.</p>"
+"<p>Escolla o cartafol de Pegasus-Mail do seu sistema (contendo os ficheiros "
+"*.CNM, *.PNM e *.MBX). En moitos sistemas grávase en C:\\pmail\\mail ou C:"
+"\\pmail\\mail\\admin</p> <p><b>Nota:</b> Xa que é posíbel recrear a "
+"estructura de cartafoles, os cartafoles grávanse baixo: \"PegasusMail-Import"
+"\".</p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Ficheiros mbox (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Non se pode interpretar a estructura de cartafoles; cotinuar a importación "
+"sen o soporte de subcartafoles."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importando novos ficheiros de correo ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importando cartafoles de correo ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importando cartafoles de correo UNIX ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importando %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Interpretando a estructura de cartafoles..."
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "Importar estructura de cartafoles e maildirs de Sylpheed"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Filtro de importación Sylpheed</b></p><p>Escolla o directorio base do "
+"cartafol de correo de Sylpheed que quere importar (normalmente: ~/Mail ).</"
+"p><p>Xa que é posíbel recrear a estructura de cartafoles, os cartafoles "
+"gardaranse baixo: \"Sylpheed-Import\" no seu cartafol local.</p><p>Este "
+"filtro tamén recrea o estado da mensaxe, e.g. nova ou reenviada."
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -640,18 +497,114 @@ msgstr "Importando a estructura de cartafoles e correos-e de The Bat!"
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>O filtro de importación de Bat!</b></p><p>Escolla o directorio base do "
+"cartafol de correo local de 'The Bat!' que quere importar.</p><p><b>Nota:</"
+"b> Este giltro importa os ficheiros *.tb dende o cartafol local de 'The "
+"Bat', e.g. dende as contas POP, e non dende as contas IMAP/DIMAP.</p><p>Xa "
+"que é posíbel recrear a estructura de cartafoles, os cartafoles gardaranse "
+"baixo \"TheBat-Import\" na súa conta local.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+"Importar correos locais e estructura de cartafoles de Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Filtro de importación de Thunderbird/Mozilla</b></p><p>Escolla o seu "
+"cartafol de correo base de Thunderbird/Mozilla (normalmente ~/.thunderbird/*."
+"default/Mail/Local Folders/).</p><p><b>Nota:</b> Nunca escolla un cartafol "
+"que <u>non</u> conteña ficheiros mbox (por exemplo, un maildir): se o fai, "
+"obterá moitos novos cartafoles.</p><p>Xa que non é posíbel recrear unha "
+"estructura de cartafoles, os cartafoles almacenaranse baixo: \"Thunderbird-"
+"Import\".</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<p><b>O filtro de importación de Bat!</b></p>"
-"<p>Escolla o directorio base do cartafol de correo local de 'The Bat!' que "
-"quere importar.</p>"
-"<p><b>Nota:</b> Este giltro importa os ficheiros *.tb dende o cartafol local de "
-"'The Bat', e.g. dende as contas POP, e non dende as contas IMAP/DIMAP.</p>"
-"<p>Xa que é posíbel recrear a estructura de cartafoles, os cartafoles "
-"gardaranse baixo \"TheBat-Import\" na súa conta local.</p>"
+"<b>Fatal:</b> Imposíbel iniciar KMail para comunicación DCOP. Cerciórese de "
+"que <i>kmail</i> está instalado."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "Non se pode crear o cartafol %1 en KMail"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "Non se pode engadir a mensaxe ao cartafol %1 en KMail"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Erro ao engadir a mensaxe ao cartafol %1 en KMail"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Dende:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "A:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Actual:"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Importación en progreso..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Total:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Prema en 'Atrás' para importar máis correos-e ou contactos"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Benvido/a a KMailCVT - A ferramenta de importación de KMail</b>\n"
+"<br><br>\n"
+"Este programa axudaralle a importar a KMail o seu correo-e dende o seu "
+"anterior programa de correo.<br><br><br><br>\n"
+"Por favor, escolla o programa dende o que quere importar o correo, logo "
+"prema en 'Vindeiro'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Borrar as mensaxes &duplicadas mentres e importan"
diff --git a/tde-i18n-he/messages/tdepim/kmailcvt.po b/tde-i18n-he/messages/tdepim/kmailcvt.po
index 2519d0decbc..a44bea9813b 100644
--- a/tde-i18n-he/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-he/messages/tdepim/kmailcvt.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2003-11-15 19:45+0200\n"
 "Last-Translator: Shlomi Loubaton <shlomil@hotmail.com>\n"
 "Language-Team: hebrew <en@li.org>\n"
@@ -23,19 +23,79 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: filter_outlook.cxx:28
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "צוות התרגום של TDE-IL"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "kde-il@yahoogroups.com"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr ""
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: kmailcvt.cpp:34
 #, fuzzy
-msgid "Import Outlook Emails"
+msgid "Step 2: Importing..."
+msgstr "יי&בוא..."
+
+#: kmailcvt.cpp:76
+#, fuzzy
+msgid "Import in progress"
 msgstr "ייבוא מ-Outlook Express 4"
 
-#: filter_outlook.cxx:30
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr ""
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr ""
+
+#: main.cpp:34
+#, fuzzy
+msgid "KMail Import Filters"
+msgstr "מסנני ייבוא ל-KMail ו-KAddressBook"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr ""
+
+#: main.cpp:36
+msgid "Original author"
+msgstr ""
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr ""
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
@@ -47,31 +107,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "לא נבחרה אף ספריה"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "סופר קבצים..."
-
-#: filter_outlook.cxx:46
-#, fuzzy
-msgid "Counting mail..."
-msgstr "סופר קבצים..."
-
-#: filter_outlook.cxx:47
-#, fuzzy
-msgid "Counting directories..."
-msgstr "סופר קבצים..."
-
-#: filter_outlook.cxx:48
-#, fuzzy
-msgid "Counting folders..."
-msgstr "סופר קבצים..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-#, fuzzy
-msgid "Importing new mail files..."
-msgstr "מייבא קבצי דואר חדשים (\"txt.\")..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -79,6 +114,23 @@ msgstr "מייבא קבצי דואר חדשים (\"txt.\")..."
 msgid "No files found for import."
 msgstr ""
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr ""
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#, fuzzy
+msgid "Unable to open %1, skipping"
+msgstr "אין אפשרות לפתוח את הקובץ \"%1\""
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 #, fuzzy
@@ -95,34 +147,30 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "שגיאה בהוספת הודעה לתיקיה %1 ב-KMail"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-#, fuzzy
-msgid "Unable to open %1, skipping"
-msgstr "אין אפשרות לפתוח את הקובץ \"%1\""
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr ""
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
 #: filter_kmail_archive.cxx:24
@@ -131,108 +179,24 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-#, fuzzy
-msgid "Import Folders From Pegasus-Mail"
-msgstr "ייבוא מ-Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "מייבא קבצי דואר חדשים (\"cnm.\")..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "מייבא תיקיות דואר (\"pmm.\")..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "מייבא תיקיות דואר \"יוניקס\" (\"mbx.\")..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr ""
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr ""
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr ""
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
-
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "ייבוא מ-Outlook Express 4"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:64
-#, fuzzy, c-format
-msgid "Importing emails from %1"
-msgstr "מייבא תיקיות דואר (\"pmm.\")..."
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
@@ -247,160 +211,36 @@ msgstr "מייבא תיקיות דואר (\"pmm.\")..."
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr ""
-
-#: filter_opera.cxx:28
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid "Import Opera Emails"
-msgstr "ייבוא מ-Outlook Express 4"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, fuzzy, no-c-format
-msgid "From:"
-msgstr "מתבנית: %1"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "לתבנית: %1"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "כרגע:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "Importing in progress..."
+msgid "Import Lotus Notes Emails"
 msgstr "ייבוא מ-Outlook Express 4"
 
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, fuzzy, no-c-format
-msgid "Total:"
-msgstr "לתבנית: %1"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr ""
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr ""
-
-#: main.cpp:34
-#, fuzzy
-msgid "KMail Import Filters"
-msgstr "מסנני ייבוא ל-KMail ו-KAddressBook"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr ""
-
-#: main.cpp:36
-msgid "Original author"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
 msgstr ""
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
+#: filter_lnotes.cxx:64
+#, fuzzy, c-format
+msgid "Importing emails from %1"
+msgstr "מייבא תיקיות דואר (\"pmm.\")..."
 
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "צוות התרגום של TDE-IL"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "kde-il@yahoogroups.com"
-
 #: filter_mailapp.cxx:32
 #, fuzzy
 msgid "Import From OS X Mail"
@@ -408,8 +248,8 @@ msgstr "ייבוא מ-Pegasus-Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
@@ -419,26 +259,21 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "שגיאה בהוספת הודעה לתיקיה %1 ב-KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
 msgstr ""
 
-#: kmailcvt.cpp:34
-#, fuzzy
-msgid "Step 2: Importing..."
-msgstr "יי&בוא..."
-
-#: kmailcvt.cpp:76
-#, fuzzy
-msgid "Import in progress"
-msgstr "ייבוא מ-Outlook Express 4"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
 msgstr ""
 
 #: filter_oe.cxx:40
@@ -448,13 +283,11 @@ msgstr "ייבוא מ-Outlook Express 4"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
@@ -494,25 +327,160 @@ msgstr ""
 msgid "Importing OE5+ Folder file %1"
 msgstr "מייבא תיקיות דואר (\"pmm.\")..."
 
+#: filter_opera.cxx:28
+#, fuzzy
+msgid "Import Opera Emails"
+msgstr "ייבוא מ-Outlook Express 4"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "סופר קבצים..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#, fuzzy
+msgid "Importing new mail files..."
+msgstr "מייבא קבצי דואר חדשים (\"txt.\")..."
+
+#: filter_outlook.cxx:28
+#, fuzzy
+msgid "Import Outlook Emails"
+msgstr "ייבוא מ-Outlook Express 4"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+
+#: filter_outlook.cxx:46
+#, fuzzy
+msgid "Counting mail..."
+msgstr "סופר קבצים..."
+
+#: filter_outlook.cxx:47
+#, fuzzy
+msgid "Counting directories..."
+msgstr "סופר קבצים..."
+
+#: filter_outlook.cxx:48
+#, fuzzy
+msgid "Counting folders..."
+msgstr "סופר קבצים..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "ייבא הודעות טקסט רגיל"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+
+#: filter_pmail.cxx:31
+#, fuzzy
+msgid "Import Folders From Pegasus-Mail"
+msgstr "ייבוא מ-Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "מייבא קבצי דואר חדשים (\"cnm.\")..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "מייבא תיקיות דואר (\"pmm.\")..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "מייבא תיקיות דואר \"יוניקס\" (\"mbx.\")..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr ""
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 #, fuzzy
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "שגיאה: אין אפשרות להפעיל את KMail לצורך התקשרות DCOP.\n"
 "       ודא ש-\"kmail\" נמצא בנתיב שלך."
@@ -529,49 +497,54 @@ msgstr "אין אפשרות להוסיף הודעה לתיקיה %1 ב-KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "שגיאה בהוספת הודעה לתיקיה %1 ב-KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "ייבא הודעות טקסט רגיל"
+#: kimportpagedlg.ui:91
+#, fuzzy, no-c-format
+msgid "From:"
+msgstr "מתבנית: %1"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
+#: kimportpagedlg.ui:99
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "לתבנית: %1"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr ""
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "כרגע:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
+#: kimportpagedlg.ui:115
+#, fuzzy, no-c-format
+msgid "Importing in progress..."
+msgstr "ייבוא מ-Outlook Express 4"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
 msgstr ""
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
+#: kimportpagedlg.ui:158
+#, fuzzy, no-c-format
+msgid "Total:"
+msgstr "לתבנית: %1"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
 
 #, fuzzy
@@ -606,8 +579,12 @@ msgstr ""
 #~ "סטפאן ב. נדרגארד הואיל בטובו לתרום את קוד הייבוא מ-Outlook Express 4/5.\n"
 #~ "בחר את התיקיה של Outlook Express 4 במערכת שלך.\n"
 #~ "מסנן ייבוא זה יחפש אחר תיקיות (קבצי \"mbx.\").\n"
-#~ "שים לב: לא תוכל לשחזר את מבנה התיקיות המקורי שלך. רק התיקיות עצמן ייובאו, אך בכל מקרה כנראה שתעשה זאת פעם אחת בלבד.\n"
-#~ "שים לב: Kmailcvt ישתמש באותם שמות של תיקיות כמו Outlook Express, אלא שהוא יקדים להם את הצירוף \"oe4-\". אם דבר זה גורם לך לבעיות (אם יש לך תיקיות של KMail שמתחילות ב-\"oe4-\"), בטל אפשרות ייבוא זו (הדו-שיח הבא יאפשר לך לעשות זאת) ושנה את השם של התיקיות הקיימות של KMail."
+#~ "שים לב: לא תוכל לשחזר את מבנה התיקיות המקורי שלך. רק התיקיות עצמן ייובאו, "
+#~ "אך בכל מקרה כנראה שתעשה זאת פעם אחת בלבד.\n"
+#~ "שים לב: Kmailcvt ישתמש באותם שמות של תיקיות כמו Outlook Express, אלא שהוא "
+#~ "יקדים להם את הצירוף \"oe4-\". אם דבר זה גורם לך לבעיות (אם יש לך תיקיות "
+#~ "של KMail שמתחילות ב-\"oe4-\"), בטל אפשרות ייבוא זו (הדו-שיח הבא יאפשר לך "
+#~ "לעשות זאת) ושנה את השם של התיקיות הקיימות של KMail."
 
 #~ msgid "Can't open directory %1"
 #~ msgstr "אין אפשרות לפתוח את הספריה %1"
@@ -657,8 +634,12 @@ msgstr ""
 #~ "סטפאן ב. נדרגארד הואיל בטובו לתרום את קוד הייבוא מ-Outlook Express 4/5.\n"
 #~ "בחר את התיקיה של Outlook Express 5 במערכת שלך.\n"
 #~ "מסנן ייבוא זה יחפש אחר תיקיות (קבצי \"mbx.\").\n"
-#~ "שים לב: לא תוכל לשחזר את מבנה התיקיות המקורי שלך. רק התיקיות עצמן ייובאו, אך בכל מקרה כנראה שתעשה זאת פעם אחת בלבד.\n"
-#~ "שים לב: Kmailcvt ישתמש באותם שמות של תיקיות כמו Outlook Express, אלא שהוא יקדים להם את הצירוף \"OE5-\". אם דבר זה גורם לך לבעיות (אם יש לך תיקיות של KMail שמתחילות ב-\"OE5-\"), בטל אפשרות ייבוא זו (הדו-שיח הבא יאפשר לך לעשות זאת) ושנה את השם של התיקיות הקיימות של KMail."
+#~ "שים לב: לא תוכל לשחזר את מבנה התיקיות המקורי שלך. רק התיקיות עצמן ייובאו, "
+#~ "אך בכל מקרה כנראה שתעשה זאת פעם אחת בלבד.\n"
+#~ "שים לב: Kmailcvt ישתמש באותם שמות של תיקיות כמו Outlook Express, אלא שהוא "
+#~ "יקדים להם את הצירוף \"OE5-\". אם דבר זה גורם לך לבעיות (אם יש לך תיקיות "
+#~ "של KMail שמתחילות ב-\"OE5-\"), בטל אפשרות ייבוא זו (הדו-שיח הבא יאפשר לך "
+#~ "לעשות זאת) ושנה את השם של התיקיות הקיימות של KMail."
 
 #~ msgid "Searching for Outlook Express 5 '.dbx' folders in directory %1"
 #~ msgstr "מחפש תיקיות \"dbx.\" של Outlook Express 5 בספריה %1"
@@ -730,7 +711,8 @@ msgstr ""
 #~ "נוספות. אם ברצונך לתרום, צור איתי\n"
 #~ "קשר. גם תרגומים יתקבלו בברכה."
 
-#~ msgid "A little tool to convert mail boxes and address books to KMail format"
+#~ msgid ""
+#~ "A little tool to convert mail boxes and address books to KMail format"
 #~ msgstr "כלי קטן להמרת תיבות דואר ופנקסי כתובות לתבנית של KMail"
 
 #~ msgid "Kmailcvt2"
@@ -846,8 +828,11 @@ msgstr ""
 #~ "folders."
 #~ msgstr ""
 #~ "בחר את התיקיה של Pegasus-Mail במערכת שלך.\n"
-#~ "מסנן ייבוא זה ייבא את התיקיות שלך, אבל לא את מבנה התיקיות. בכל מקרה כנראה שתעשה זאת פעם אחת בלבד.\n"
-#~ "שים לב: Kmailcvt ייצור תיקיות עם הקידומת \"-pmail\". אם דבר זה גורם לך לבעיות (אם יש לך תיקיות של KMail עם קידומת זו), בטל אפשרות ייבוא זו (הדו-שיח הבא יאפשר לך לעשות זאת) ושנה את השם של התיקיות הקיימות ב-KMail."
+#~ "מסנן ייבוא זה ייבא את התיקיות שלך, אבל לא את מבנה התיקיות. בכל מקרה כנראה "
+#~ "שתעשה זאת פעם אחת בלבד.\n"
+#~ "שים לב: Kmailcvt ייצור תיקיות עם הקידומת \"-pmail\". אם דבר זה גורם לך "
+#~ "לבעיות (אם יש לך תיקיות של KMail עם קידומת זו), בטל אפשרות ייבוא זו (הדו-"
+#~ "שיח הבא יאפשר לך לעשות זאת) ושנה את השם של התיקיות הקיימות ב-KMail."
 
 #~ msgid ""
 #~ "Select the directory containing the emails on your system.\n"
@@ -863,7 +848,11 @@ msgstr ""
 #~ msgstr ""
 #~ "בחר את התיקיה המכילה את הודעות הדוא\"ל במערכת שלך.\n"
 #~ "הודעות הדוא\"ל ימוקמו בתיקיה בעלת אותו שם כמו הספריה בה הן היו.\n"
-#~ "מסנן ייבוא זה ייבא את כל הודעות הדוא\"ל שסיומותיהן msg ,.eml. ו-txt. אם דבר זה גורם לך לבעיות (אם יש לך תיקיות של KMail עם שם זה, או אם יש לך קבצי txt שאינם הודעות דוא\"ל), בטל אפשרות ייבוא זו (הדו-שיח הבא יאפשר לך לעשות זאת) ושנה את השם של התיקיות הקיימות ב-KMail, או העבר את קבצי הטקסט שאינם הודעות דוא\"ל."
+#~ "מסנן ייבוא זה ייבא את כל הודעות הדוא\"ל שסיומותיהן msg ,.eml. ו-txt. אם "
+#~ "דבר זה גורם לך לבעיות (אם יש לך תיקיות של KMail עם שם זה, או אם יש לך "
+#~ "קבצי txt שאינם הודעות דוא\"ל), בטל אפשרות ייבוא זו (הדו-שיח הבא יאפשר לך "
+#~ "לעשות זאת) ושנה את השם של התיקיות הקיימות ב-KMail, או העבר את קבצי הטקסט "
+#~ "שאינם הודעות דוא\"ל."
 
 #~ msgid "Unable to start KMail"
 #~ msgstr "אין אפשרות להפעיל את KMail"
@@ -874,5 +863,6 @@ msgstr ""
 #~ msgid "Importing new mail files ('.eml')..."
 #~ msgstr "מייבא קבצי דואר חדשים (\"eml.\")..."
 
-#~ msgid "FATAL: Unable to open for reading the TEMP file that was just created"
+#~ msgid ""
+#~ "FATAL: Unable to open for reading the TEMP file that was just created"
 #~ msgstr "שגיאה: אין אפשרות לפתוח לקריאה את הקובץ הזמני שנוצר זה עתה"
diff --git a/tde-i18n-hi/messages/tdepim/kmailcvt.po b/tde-i18n-hi/messages/tdepim/kmailcvt.po
index cb163c2111d..ec5cf6557ae 100644
--- a/tde-i18n-hi/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-hi/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2004-08-24 10:24+0530\n"
 "Last-Translator: Ravishankar Shrivastava <raviratlami@yahoo.com>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
@@ -13,19 +13,77 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: filter_outlook.cxx:28
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "रविशंकर श्रीवास्तव"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "raviratlami@yahoo.com , http://www.geocities.com/raviratlami/"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "के-मेल-सीवीटी आयात औज़ार"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "चरण 1: फ़िल्टर चुनें"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "चरण 2: आयात किया जा रहा है..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "आयात प्रगति में"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "आयात सम्पन्न"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>%1 के द्वारा लिखा गया.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "के-मेल-सीवीटी"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "के-मेल आयात फ़िल्टर्स"
+
+#: main.cpp:35
 #, fuzzy
-msgid "Import Outlook Emails"
-msgstr "आउटलुक एक्सप्रेस ई-मेल आयात करें"
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000 - 2003, के-मेल-सीवीटी डेवलपर्स"
 
-#: filter_outlook.cxx:30
+#: main.cpp:36
+msgid "Original author"
+msgstr "मूल लेखक"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "नया जीयूआई व साफसफाई"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
@@ -36,30 +94,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "कोई डिरेक्ट्री चुना नहीं गया."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "फ़ाइलें गिन रहे"
-
-#: filter_outlook.cxx:46
-#, fuzzy
-msgid "Counting mail..."
-msgstr "फ़ाइलें गिन रहे"
-
-#: filter_outlook.cxx:47
-#, fuzzy
-msgid "Counting directories..."
-msgstr "फ़ाइलें गिन रहे"
-
-#: filter_outlook.cxx:48
-#, fuzzy
-msgid "Counting folders..."
-msgstr "फ़ाइलें गिन रहे"
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "नई डाक फ़ाइलों का आयात किया जा रहा है..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -67,6 +101,22 @@ msgstr "नई डाक फ़ाइलों का आयात किया
 msgid "No files found for import."
 msgstr ""
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "%1 से ई-मेल आयात करना सम्पन्न"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "%1 खोलने में अक्षम, छोड़ रहे"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -82,143 +132,56 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "फ़ोल्डर %1 में के-मेल में संदेश जोड़ने में त्रुटि"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "%1 खोलने में अक्षम, छोड़ रहे"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_evolution.cxx:33
-msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "%1 से ई-मेल आयात करना सम्पन्न"
-
-#: filter_kmail_archive.cxx:24
-msgid "Import KMail Archive File"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "पीगासस-मेल से फ़ोल्डर आयात करें"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "नई डाक फ़ाइलें आयात किया जा रहा है ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "डाक फ़ाइलें आयात किया जा रहा है ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "यूनिक्स डाक फ़ाइलें आयात किया जा रहा है ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "%1 आयात किया जा रहा है"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "संदेश %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
 msgstr ""
 
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>%1 के द्वारा लिखा गया.</i></p>"
-
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "आउटलुक एक्सप्रेस ई-मेल आयात करें"
-
-#: filter_lnotes.cxx:32
+#: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
-#, fuzzy
-msgid "All Files (*)"
-msgstr "एम-बॉक्स फ़ाइलें (*)"
-
-#: filter_lnotes.cxx:64
-#, fuzzy, c-format
-msgid "Importing emails from %1"
-msgstr "%1 से ई-मेल आयात किया जा रहा है..."
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
@@ -233,159 +196,36 @@ msgstr "%1 से ई-मेल आयात किया जा रहा ह�
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr ""
-
-#: filter_opera.cxx:28
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid "Import Opera Emails"
+msgid "Import Lotus Notes Emails"
 msgstr "आउटलुक एक्सप्रेस ई-मेल आयात करें"
 
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "सेः"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "प्रति:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "मौज़ूदा:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "Importing in progress..."
-msgstr "आयात प्रगति में"
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "कुलः"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "और अधिक ई-मेल तथा सम्पर्क आयात करने के लिए कृपया 'पीछे' पर क्लिक करें"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr ""
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "के-मेल-सीवीटी"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "के-मेल आयात फ़िल्टर्स"
-
-#: main.cpp:35
+#: filter_lnotes.cxx:55
 #, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000 - 2003, के-मेल-सीवीटी डेवलपर्स"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "मूल लेखक"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "नया जीयूआई व साफसफाई"
+msgid "All Files (*)"
+msgstr "एम-बॉक्स फ़ाइलें (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "रविशंकर श्रीवास्तव"
+#: filter_lnotes.cxx:64
+#, fuzzy, c-format
+msgid "Importing emails from %1"
+msgstr "%1 से ई-मेल आयात किया जा रहा है..."
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "raviratlami@yahoo.com , http://www.geocities.com/raviratlami/"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "संदेश %1"
 
 #: filter_mailapp.cxx:32
 #, fuzzy
@@ -394,8 +234,8 @@ msgstr "पीगासस-मेल से फ़ोल्डर आयात �
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
@@ -405,25 +245,23 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "फ़ोल्डर %1 में के-मेल में संदेश जोड़ने में त्रुटि"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "के-मेल-सीवीटी आयात औज़ार"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "चरण 1: फ़िल्टर चुनें"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "चरण 2: आयात किया जा रहा है..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "एम-बॉक्स फ़ाइलें आयात करें (यूनिक्स, एवॉल्यूशन)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "आयात प्रगति में"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "आयात सम्पन्न"
+#: filter_mbox.cxx:48
+#, fuzzy
+msgid "mbox Files (*)"
+msgstr "एम-बॉक्स फ़ाइलें (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -431,13 +269,11 @@ msgstr "आउटलुक एक्सप्रेस ई-मेल आया�
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
@@ -476,24 +312,157 @@ msgstr "ओई5+ मेलबॉक्स %1 आयात किया जा �
 msgid "Importing OE5+ Folder file %1"
 msgstr "ओई5+ फ़ोल्डर फ़ाइल %1 आयात किया जा रहा है"
 
+#: filter_opera.cxx:28
+#, fuzzy
+msgid "Import Opera Emails"
+msgstr "आउटलुक एक्सप्रेस ई-मेल आयात करें"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "फ़ाइलें गिन रहे"
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "नई डाक फ़ाइलों का आयात किया जा रहा है..."
+
+#: filter_outlook.cxx:28
+#, fuzzy
+msgid "Import Outlook Emails"
+msgstr "आउटलुक एक्सप्रेस ई-मेल आयात करें"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+
+#: filter_outlook.cxx:46
+#, fuzzy
+msgid "Counting mail..."
+msgstr "फ़ाइलें गिन रहे"
+
+#: filter_outlook.cxx:47
+#, fuzzy
+msgid "Counting directories..."
+msgstr "फ़ाइलें गिन रहे"
+
+#: filter_outlook.cxx:48
+#, fuzzy
+msgid "Counting folders..."
+msgstr "फ़ाइलें गिन रहे"
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "सादा पाठ ई-मेल आयात करें"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "पीगासस-मेल से फ़ोल्डर आयात करें"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "नई डाक फ़ाइलें आयात किया जा रहा है ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "डाक फ़ाइलें आयात किया जा रहा है ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "यूनिक्स डाक फ़ाइलें आयात किया जा रहा है ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "%1 आयात किया जा रहा है"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 
 #: filters.cxx:153 filters.cxx:188
@@ -508,50 +477,54 @@ msgstr "फ़ोल्डर %1 में के-मेल में संद�
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "फ़ोल्डर %1 में के-मेल में संदेश जोड़ने में त्रुटि"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "सादा पाठ ई-मेल आयात करें"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "सेः"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "प्रति:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "एम-बॉक्स फ़ाइलें आयात करें (यूनिक्स, एवॉल्यूशन)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "मौज़ूदा:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
+#: kimportpagedlg.ui:115
+#, fuzzy, no-c-format
+msgid "Importing in progress..."
+msgstr "आयात प्रगति में"
 
-#: filter_mbox.cxx:48
-#, fuzzy
-msgid "mbox Files (*)"
-msgstr "एम-बॉक्स फ़ाइलें (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr ""
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "कुलः"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, fuzzy, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "और अधिक ई-मेल तथा सम्पर्क आयात करने के लिए कृपया 'पीछे' पर क्लिक करें"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
 
 #, fuzzy
diff --git a/tde-i18n-hr/messages/tdepim/kmailcvt.po b/tde-i18n-hr/messages/tdepim/kmailcvt.po
index 259cbd3dff9..fbd99918aa3 100644
--- a/tde-i18n-hr/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-hr/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt 0\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2004-04-20 13:26+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -12,91 +12,79 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 :  n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
 "X-Generator: TransDict server\n"
 
-#: filter_outlook.cxx:28
-#, fuzzy
-msgid "Import Outlook Emails"
-msgstr "Uvoz poruka iz Outlook Express-a"
-
-#: filter_outlook.cxx:30
+#: _translatorinfo:1
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: NAME OF TRANSLATORS\n"
+"Your names"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "lokalizacija@linux.hr"
+
+#: kmailcvt.cpp:28
 #, fuzzy
-msgid "No directory selected."
-msgstr "Nije odabran nijedan direktorij."
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT alat za uvoz"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: kmailcvt.cpp:31
 #, fuzzy
-msgid "Counting files..."
-msgstr "Brojim datotekaove..."
+msgid "Step 1: Select Filter"
+msgstr "Korak 1: Odaberite filter"
 
-#: filter_outlook.cxx:46
+#: kmailcvt.cpp:34
 #, fuzzy
-msgid "Counting mail..."
-msgstr "Brojim datotekaove..."
+msgid "Step 2: Importing..."
+msgstr "Korak 2: Uvoženje..."
 
-#: filter_outlook.cxx:47
+#: kmailcvt.cpp:76
 #, fuzzy
-msgid "Counting directories..."
-msgstr "Brojim datotekaove..."
+msgid "Import in progress"
+msgstr "Uvoz je u toku"
 
-#: filter_outlook.cxx:48
+#: kmailcvt.cpp:79
 #, fuzzy
-msgid "Counting folders..."
-msgstr "Brojim datotekaove..."
+msgid "Import finished"
+msgstr "Uvoz je završen"
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: kselfilterpage.cpp:78
 #, fuzzy
-msgid "Importing new mail files..."
-msgstr "Uvozim nove poštanske datotekaove..."
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Napisao %1.</i></p>"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
-msgid "No files found for import."
-msgstr ""
+#: main.cpp:33
+#, fuzzy
+msgid "KMailCVT"
+msgstr "KMailCVT"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: main.cpp:34
 #, fuzzy
-msgid "Importing emails from %1..."
-msgstr "Uvozim e-poruke iz %1..."
+msgid "KMail Import Filters"
+msgstr "KMail-ovi filteri za uvoz"
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
-#, fuzzy, c-format
-msgid ""
-"_n: 1 duplicate message not imported\n"
-"%n duplicate messages not imported"
-msgstr "Greška prilikom dodavanja poruke u mapu %1 u KMail-u"
+#: main.cpp:35
+#, fuzzy
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2003, razvojni tim KMailCVT-a"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: main.cpp:36
+msgid "Original author"
+msgstr "Autor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
 #, fuzzy
-msgid "Unable to open %1, skipping"
-msgstr "Ne mogu otvoriti %1, preskačem"
+msgid "New GUI & cleanups"
+msgstr "Nov GUI i čistke"
 
 #: filter_evolution.cxx:31
 msgid "Import Evolution 1.x Local Mails and Folder Structure"
@@ -104,11 +92,26 @@ msgstr ""
 
 #: filter_evolution.cxx:33
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
+msgstr ""
+
+#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
+#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
+#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
+#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
+#: filter_thunderbird.cxx:65
+#, fuzzy
+msgid "No directory selected."
+msgstr "Nije odabran nijedan direktorij."
+
+#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
+#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
+#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
+#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+msgid "No files found for import."
 msgstr ""
 
 #: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
@@ -119,119 +122,81 @@ msgstr ""
 msgid "Finished importing emails from %1"
 msgstr "Uvoz poruka iz %1 je završen"
 
-#: filter_kmail_archive.cxx:24
-msgid "Import KMail Archive File"
-msgstr ""
-
-#: filter_kmail_archive.cxx:26
-msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#, fuzzy
+msgid "Unable to open %1, skipping"
+msgstr "Ne mogu otvoriti %1, preskačem"
 
-#: filter_pmail.cxx:31
+#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
+#: filter_opera.cxx:89 filter_outlook.cxx:57
 #, fuzzy
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Uvoz mapi iz Pegasus-Mail-a"
+msgid "Importing emails from %1..."
+msgstr "Uvozim e-poruke iz %1..."
 
-#: filter_pmail.cxx:33
+#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
+#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
+#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
+#: filter_thunderbird.cxx:101
+#, fuzzy, c-format
 msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+"_n: 1 duplicate message not imported\n"
+"%n duplicate messages not imported"
+msgstr "Greška prilikom dodavanja poruke u mapu %1 u KMail-u"
+
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_evolution_v2.cxx:31
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_pmail.cxx:72
-#, fuzzy
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Uvozim nove poštanske datotekaove („.cnm“)..."
-
-#: filter_pmail.cxx:74
-#, fuzzy
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Uvozim poštanske mape („.pmm“)..."
-
-#: filter_pmail.cxx:76
-#, fuzzy
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Uvozim „UNIX“ poštanske mape („.mbx“)..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, fuzzy, c-format
-msgid "Importing %1"
-msgstr "Uvozim %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, fuzzy, c-format
-msgid "Message %1"
-msgstr "Poruka %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
 msgstr ""
 
-#: kselfilterpage.cpp:78
-#, fuzzy
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Napisao %1.</i></p>"
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr ""
 
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "Uvoz poruka iz Outlook Express-a"
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
+msgstr ""
 
-#: filter_lnotes.cxx:32
+#: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
-#, fuzzy
-msgid "All Files (*)"
-msgstr "mbox datoteke (*)"
-
-#: filter_lnotes.cxx:64
-#, fuzzy, c-format
-msgid "Importing emails from %1"
-msgstr "Uvozim e-poruke iz %1..."
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
@@ -246,172 +211,36 @@ msgstr "Uvozim e-poruke iz %1..."
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr ""
-
-#: filter_opera.cxx:28
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid "Import Opera Emails"
+msgid "Import Lotus Notes Emails"
 msgstr "Uvoz poruka iz Outlook Express-a"
 
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "od:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "do:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Trenutno:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "Importing in progress..."
-msgstr "Uvoz je u toku"
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Ukupno:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Kliknite na „Nazad“ da biste uvezli još poruka ili kontakata"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, fuzzy, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>Dobrodošli u KMailCVT — KMail-ov alat za uvoz</b>\n"
-"<br>"
-"<br>\n"
-"Ovaj program će vam pomoći da uvezete poruke iz vašeg prethodnog programa za "
-"e-poštu u KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Odaberite program iz koga želite da uvozite, pa onda kliknite na „Sljedeći“."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: main.cpp:33
-#, fuzzy
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-#, fuzzy
-msgid "KMail Import Filters"
-msgstr "KMail-ovi filteri za uvoz"
-
-#: main.cpp:35
-#, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2003, razvojni tim KMailCVT-a"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Autor"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
-
-#: main.cpp:38 main.cpp:39
+#: filter_lnotes.cxx:55
 #, fuzzy
-msgid "New GUI & cleanups"
-msgstr "Nov GUI i čistke"
+msgid "All Files (*)"
+msgstr "mbox datoteke (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
+#: filter_lnotes.cxx:64
+#, fuzzy, c-format
+msgid "Importing emails from %1"
+msgstr "Uvozim e-poruke iz %1..."
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "lokalizacija@linux.hr"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, fuzzy, c-format
+msgid "Message %1"
+msgstr "Poruka %1"
 
 #: filter_mailapp.cxx:32
 #, fuzzy
@@ -420,8 +249,8 @@ msgstr "Uvoz mapi iz Pegasus-Mail-a"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
@@ -431,30 +260,24 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "Greška prilikom dodavanja poruke u mapu %1 u KMail-u"
 
-#: kmailcvt.cpp:28
-#, fuzzy
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT alat za uvoz"
-
-#: kmailcvt.cpp:31
-#, fuzzy
-msgid "Step 1: Select Filter"
-msgstr "Korak 1: Odaberite filter"
-
-#: kmailcvt.cpp:34
+#: filter_mbox.cxx:28
 #, fuzzy
-msgid "Step 2: Importing..."
-msgstr "Korak 2: Uvoženje..."
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Uvoz mbox datotekaova (Unix, Evolution)"
 
-#: kmailcvt.cpp:76
-#, fuzzy
-msgid "Import in progress"
-msgstr "Uvoz je u toku"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
 
-#: kmailcvt.cpp:79
+#: filter_mbox.cxx:48
 #, fuzzy
-msgid "Import finished"
-msgstr "Uvoz je završen"
+msgid "mbox Files (*)"
+msgstr "mbox datoteke (*)"
 
 #: filter_oe.cxx:40
 #, fuzzy
@@ -463,13 +286,11 @@ msgstr "Uvoz poruka iz Outlook Express-a"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
@@ -510,43 +331,61 @@ msgstr "Uvozim OE5+ poštansko sanduče %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Ignorišem OE5+ datoteka sa mapama %1"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr ""
+#: filter_opera.cxx:28
+#, fuzzy
+msgid "Import Opera Emails"
+msgstr "Uvoz poruka iz Outlook Express-a"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+#, fuzzy
+msgid "Counting files..."
+msgstr "Brojim datotekaove..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#, fuzzy
+msgid "Importing new mail files..."
+msgstr "Uvozim nove poštanske datotekaove..."
+
+#: filter_outlook.cxx:28
 #, fuzzy
+msgid "Import Outlook Emails"
+msgstr "Uvoz poruka iz Outlook Express-a"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>Fatalna greška:</b> Ne mogu pokrenuti KMail za DCOP komunikaciju. Uvjerite "
-"se da je <i>kmail</i> instaliran."
 
-#: filters.cxx:153 filters.cxx:188
+#: filter_outlook.cxx:46
 #, fuzzy
-msgid "Cannot make folder %1 in KMail"
-msgstr "Ne mogu napraviti mapu %1 u KMail-u"
+msgid "Counting mail..."
+msgstr "Brojim datotekaove..."
 
-#: filters.cxx:156 filters.cxx:191
+#: filter_outlook.cxx:47
 #, fuzzy
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "Ne mogu dodati poruku u mapu %1 u KMail-u"
+msgid "Counting directories..."
+msgstr "Brojim datotekaove..."
 
-#: filters.cxx:162 filters.cxx:194
+#: filter_outlook.cxx:48
 #, fuzzy
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Greška prilikom dodavanja poruke u mapu %1 u KMail-u"
+msgid "Counting folders..."
+msgstr "Brojim datotekaove..."
 
 #: filter_plain.cxx:27
 #, fuzzy
@@ -556,30 +395,67 @@ msgstr "Uvoz običnih tekstualnih e-poruka"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 
-#: filter_mbox.cxx:28
+#: filter_pmail.cxx:31
 #, fuzzy
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Uvoz mbox datotekaova (Unix, Evolution)"
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Uvoz mapi iz Pegasus-Mail-a"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
 #, fuzzy
-msgid "mbox Files (*)"
-msgstr "mbox datoteke (*)"
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Uvozim nove poštanske datotekaove („.cnm“)..."
+
+#: filter_pmail.cxx:74
+#, fuzzy
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Uvozim poštanske mape („.pmm“)..."
+
+#: filter_pmail.cxx:76
+#, fuzzy
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Uvozim „UNIX“ poštanske mape („.mbx“)..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, fuzzy, c-format
+msgid "Importing %1"
+msgstr "Uvozim %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr ""
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -587,13 +463,105 @@ msgstr ""
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#, fuzzy
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b>Fatalna greška:</b> Ne mogu pokrenuti KMail za DCOP komunikaciju. "
+"Uvjerite se da je <i>kmail</i> instaliran."
+
+#: filters.cxx:153 filters.cxx:188
+#, fuzzy
+msgid "Cannot make folder %1 in KMail"
+msgstr "Ne mogu napraviti mapu %1 u KMail-u"
+
+#: filters.cxx:156 filters.cxx:191
+#, fuzzy
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "Ne mogu dodati poruku u mapu %1 u KMail-u"
+
+#: filters.cxx:162 filters.cxx:194
+#, fuzzy
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Greška prilikom dodavanja poruke u mapu %1 u KMail-u"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "od:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "do:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Trenutno:"
+
+#: kimportpagedlg.ui:115
+#, fuzzy, no-c-format
+msgid "Importing in progress..."
+msgstr "Uvoz je u toku"
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Ukupno:"
+
+#: kimportpagedlg.ui:199
+#, fuzzy, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Kliknite na „Nazad“ da biste uvezli još poruka ili kontakata"
+
+#: kselfilterpagedlg.ui:91
+#, fuzzy, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Dobrodošli u KMailCVT — KMail-ov alat za uvoz</b>\n"
+"<br><br>\n"
+"Ovaj program će vam pomoći da uvezete poruke iz vašeg prethodnog programa za "
+"e-poštu u KMail.<br><br><br><br>\n"
+"Odaberite program iz koga želite da uvozite, pa onda kliknite na „Sljedeći“."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
 
 #, fuzzy
diff --git a/tde-i18n-hu/messages/tdepim/kmailcvt.po b/tde-i18n-hu/messages/tdepim/kmailcvt.po
index a68b8bcb01e..55e7051cf52 100644
--- a/tde-i18n-hu/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-hu/messages/tdepim/kmailcvt.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TDE 3.5\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2008-01-02 11:11+0100\n"
 "Last-Translator: Tamas Szanto <tszanto@interware.hu>\n"
 "Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
@@ -12,25 +12,80 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Importálás az Outlookból"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Szántó Tamás"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "tszanto@mol.hu"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT importáló eszköz"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "1. lépés: a szűrő kiválasztása"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "2. lépés: az importálás elvégzése..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importálás van folyamatban"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Az importálás befejeződött"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Készítette: %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail importszűrők"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) A KMailCVT fejlesztői, 2000-2005."
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Az eredeti szerző"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Karbantartó, új szűrők készítése"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Átdolgozott grafikus felület, egyéb egyszerűsítések"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Üzenetek és mappastruktúra importálása az Evolution 1.x-ből"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook importszűrő</b></p>"
-"<p>Ez a szűrő egy Outlook PST-fájlból tud üzeneteket importálni. A művelet "
-"előtt meg kell határozni, hogy melyik könyvtárban található a kívánt PST-fájl. "
-"Windows 2000 és újabb esetén ez általában: <i>C:\\Documents and Settings</i></p>"
-"<p><b>Megjegyzés:</b> a létrehozott könyvtárak neve meg fog egyezni az eredeti "
-"azonosító nevével, kiegészítve az OUTLOOK- előtaggal.</p>"
+"<p><b>Evolution 1.x importszűrő</b></p><p>Válassza ki az Evolution-üzenetek "
+"könyvtárát (általában ~/.evolution/local).</p><p>Az importáló le tudja "
+"kérdezni a mappastruktúrát, a mappák ide kerülnek: \"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -40,27 +95,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Nincs kijelölve egy könyvtár sem."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "A fájlok számolása folyik..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Az üzenetek számolása folyik..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "A könyvtárak számolása folyik..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "A mappák számolása folyik..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Új üzenetfájlok importálása..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -68,6 +102,22 @@ msgstr "Új üzenetfájlok importálása..."
 msgid "No files found for import."
 msgstr "Nem található importálandó fájl."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Befejeződött az üzenetek importálása innen: %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "%1 megnyitása nem sikerült, ki lesz hagyva"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -83,39 +133,37 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "%n duplikált üzenet importálása nem történt meg"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "%1 megnyitása nem sikerült, ki lesz hagyva"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Üzenetek és mappastruktúra importálása az Evolution 1.x-ből"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Helyi levelek és a mappastruktúra importálása az Evolution 2.x-ből"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x importszűrő</b></p>"
-"<p>Válassza ki az Evolution-üzenetek könyvtárát (általában "
-"~/.evolution/local).</p>"
-"<p>Az importáló le tudja kérdezni a mappastruktúrát, a mappák ide kerülnek: "
-"\"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x importszűrő</b></p><p>Válassza ki az Evolution helyi "
+"üzenetkönyvtárát (általában ~/.evolution/mail/local/).</p><p><b>Megjegyzés:</"
+"b> ne válasszon ki olyan könyvtárat, amely <u>nem tartalmaz</u> mbox-"
+"fájlokat (például egy maildir könyvtárat). Ebben az esetben sok új mappa "
+"jöhet létre.</p><p>Az importáló le tudja kérdezni a mappastruktúrát, a "
+"mappák ide kerülnek: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Befejeződött az üzenetek importálása innen: %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Az importálás befejeződött, a felhasználó megszakította a műveletet."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "A(z) %1 fájl importálásának megkezdése..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -123,99 +171,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Pegasus Mail mappák importálása"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Válassza ki a Pegasus Mail alapkönyvtárat (ahol a *.CNM, *.PMM és *.MBX "
-"fájlok találhatók). Általában az alapértelmezés C:\\pmail\\mail vagy "
-"C:\\pmail\\mail\\admin szokott lenni</p>"
-"<p><b>Megjegyzés:</b> a szűrő a mappastruktúrát is átemeli, a mappák ide "
-"kerülnek: \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Nem sikerült feldolgozni a mappastruktúrát. Folytatódik az importálás az "
-"almappák feldolgozása nélkül."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Az új üzenetek fájljainak ('.cnm') importálása..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Üzenetmappák ('.pmm') importálása..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "'UNIX' üzenetmappák ('.mbx') importálása..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "%1 importálása"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "%1. üzenet"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "A mappastruktúra feldolgozása..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Készítette: %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Üzenetek importálása Lotus Notesból"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Lotus Notes importáló szöveges üzenetekhez</b></p>"
-"<p>Ez a szűrő struktúrált szövegfájlokat tud átvenni KMailbe exportált Lotus "
-"Notes kliensből. Ezt a szűrőt használja, ha Lotus Notes kliensből vagy más "
-"olyan programból szeretne importálni, amely ismeri a  Lotus Notes Structured "
-"Text formátumot.</p>"
-"<p><b>Megjegyzés:</b> a program a mappastruktúrát is át tudja venni, az "
-"importált mappák ez alá kerülnek: \"LNotes-Import\" (a helyi mappában). A "
-"mappanév az eredeti mappa fájlnevével fog megegyezni.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Minden fájl (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Üzenetek importálása innen: %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -223,30 +182,21 @@ msgstr "KMailes üzenetek és mappastruktúra importálása"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>KMail importszűrő</b></p>"
-"<p>Válassza ki az importálandó KMail-alapkönyvtárt.</p>"
-"<p><b>Megjegyzés:</b> soha ne válassza ki az aktuális KMail-alapkönyvtárat "
-"(általában: ~/Mail vagy ~/.trinity/share/apps/kmail/mail)! Ha ezt teszi, a "
-"KMailCVT végtelen ciklusba eshet. </p>"
-"<p>Ez a szűrő nem tud mbox-fájlokat tartalmazó postafiókot importálni.</p>"
-"<p>A program a mappastruktúrát is át tudja venni, a mappák ide kerülnek: "
-"\"KMail-Import\" (a helyi mappában).</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Az importálás befejeződött, a felhasználó megszakította a műveletet."
+"<p><b>KMail importszűrő</b></p><p>Válassza ki az importálandó KMail-"
+"alapkönyvtárt.</p><p><b>Megjegyzés:</b> soha ne válassza ki az aktuális "
+"KMail-alapkönyvtárat (általában: ~/Mail vagy ~/.trinity/share/apps/kmail/"
+"mail)! Ha ezt teszi, a KMailCVT végtelen ciklusba eshet. </p><p>Ez a szűrő "
+"nem tud mbox-fájlokat tartalmazó postafiókot importálni.</p><p>A program a "
+"mappastruktúrát is át tudja venni, a mappák ide kerülnek: \"KMail-Import"
+"\" (a helyi mappában).</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -259,192 +209,41 @@ msgstr "Mappa importálása: %1..."
 msgid "Could not import %1"
 msgstr "Nem sikerült importálni: %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Thunderbird/Mozilla-adatok (üzenetek és mappastruktúra) importálása"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird/Mozilla importszűrő</b></p>"
-"<p>Válassza ki a Thunderbird/Mozilla alap üzenetkönyvtárát (általában "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Megjegyzés:</b> ne válasszon ki olyan könyvtárat, amely <u>"
-"nem tartalmaz</u> mbox-fájlokat (például egy maildir könyvtárat). Ebben az "
-"esetben sok új mappa jöhet létre.</p>"
-"<p>A mappastruktúrát is le tudja kérdezni az importáló, a mappák ide kerülnek: "
-"\"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "A(z) %1 fájl importálásának megkezdése..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Importálás Operából"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera importszűrő</b></p>"
-"<p>Ezzel a szűrővel az Opera levelezőprogramjának üzeneteit lehet a KMailbe "
-"beolvasni. Akkor kell használni, ha egy azonosítóhoz tartozó minden üzenetet át "
-"szeretne venni egy Opera maildirből.</p>"
-"<p>Válassza ki az azonosítóhoz tartozó könyvtárat (általában "
-"~/.opera/mail/store/azonosító*).</p>"
-"<p><b>Megjegyzés:</b> az üzenetek az azonosítóval megegyező nevű mappába "
-"kerülnek, kiegészítve az OPERA- előtaggal.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Helyi levelek és a mappastruktúra importálása az Evolution 2.x-ből"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x importszűrő</b></p>"
-"<p>Válassza ki az Evolution helyi üzenetkönyvtárát (általában "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Megjegyzés:</b> ne válasszon ki olyan könyvtárat, amely <u>"
-"nem tartalmaz</u> mbox-fájlokat (például egy maildir könyvtárat). Ebben az "
-"esetben sok új mappa jöhet létre.</p>"
-"<p>Az importáló le tudja kérdezni a mappastruktúrát, a mappák ide kerülnek: "
-"\"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Ettől:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Eddig:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Aktuális:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Importálás folyik..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Összesen:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Kattintson a 'Vissza' gombra további e-mailek és névjegyek importálásához"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Üzenetek importálása Lotus Notesból"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Üdvözöljük a KMailCVT-ben, a KMail üzenetimportálójában!</b>\n"
-"<br>"
-"<br>\n"
-"E program segítségével be lehet tölteni a KMailbe más levelezőprogramok "
-"üzeneteit."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Válassza ki az importálás forrását, majd kattintson a 'Következő' gombra."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "A &duplikált üzenetek eltávolítása az importálás során"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail importszűrők"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) A KMailCVT fejlesztői, 2000-2005."
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Az eredeti szerző"
+"<p><b>Lotus Notes importáló szöveges üzenetekhez</b></p><p>Ez a szűrő "
+"struktúrált szövegfájlokat tud átvenni KMailbe exportált Lotus Notes "
+"kliensből. Ezt a szűrőt használja, ha Lotus Notes kliensből vagy más olyan "
+"programból szeretne importálni, amely ismeri a  Lotus Notes Structured Text "
+"formátumot.</p><p><b>Megjegyzés:</b> a program a mappastruktúrát is át tudja "
+"venni, az importált mappák ez alá kerülnek: \"LNotes-Import\" (a helyi "
+"mappában). A mappanév az eredeti mappa fájlnevével fog megegyezni.</p>"
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Karbantartó, új szűrők készítése"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Átdolgozott grafikus felület, egyéb egyszerűsítések"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Minden fájl (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Szántó Tamás"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Üzenetek importálása innen: %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "tszanto@mol.hu"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "%1. üzenet"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -452,12 +251,11 @@ msgstr "Importálás az OS X Mail programból"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Importszűrő az OS X Mailhez</b></p>"
-"<p>Ez az importszűrő az Apple Mac OS X-ben található Mail programból tud "
-"üzeneteket importálni.</p>"
+"<p><b>Importszűrő az OS X Mailhez</b></p><p>Ez az importszűrő az Apple Mac "
+"OS X-ben található Mail programból tud üzeneteket importálni.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -465,25 +263,27 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n duplikált üzenet importálása nem történt meg a KMail %1 mappájába"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT importáló eszköz"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "1. lépés: a szűrő kiválasztása"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "2. lépés: az importálás elvégzése..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Mbox fájlok importálása (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importálás van folyamatban"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Mbox importszűrő</b></p><p>Ezzel a szűrővel Mbox fájlokat lehet a "
+"KMailbe beolvasni. Akkor kell használni, ha a korábbi levelezőprogram ezt a "
+"hagyományos UNIX-os formátumot használta (pl. Ximian Evolution).</"
+"p><p><b>Megjegyzés:</b> az üzenetek a fájllal megegyező nevű mappába "
+"kerülnek, kiegészítve az MBOX előtaggal.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Az importálás befejeződött"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Mbox-fájlok (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -491,24 +291,21 @@ msgstr "Importálás Outlook Expressből"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 importszűrő</b></p>"
-"<p>Először meg kell keresni a postafiók fájljainak pontos helyét. .dbx és .mbx "
-"kiterjesztésű fájlokat kell keresni itt:"
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> (Windows 9x esetén)"
-"<li><i>Documents and Settings</i> (Windows 2000 és újabb esetén)</ul></p>"
-"<p><b>Megjegyzés:</b> a program a mappastruktúrát is át tudja venni, az Outlook "
-"Express 5 és 6 mappái ide kerülnek: \"OE-Import\" (a helyi mappán belül).</p>"
+"<p><b>Outlook Express 4/5/6 importszűrő</b></p><p>Először meg kell keresni a "
+"postafiók fájljainak pontos helyét. .dbx és .mbx kiterjesztésű fájlokat kell "
+"keresni itt:<ul><li><i>C:\\Windows\\Application Data</i> (Windows 9x "
+"esetén)<li><i>Documents and Settings</i> (Windows 2000 és újabb esetén)</"
+"ul></p><p><b>Megjegyzés:</b> a program a mappastruktúrát is át tudja venni, "
+"az Outlook Express 5 és 6 mappái ide kerülnek: \"OE-Import\" (a helyi mappán "
+"belül).</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -543,33 +340,196 @@ msgstr "OE5+ postafiók importálása: %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ mappafájl importálása: %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Importálás Operából"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Opera importszűrő</b></p><p>Ezzel a szűrővel az Opera "
+"levelezőprogramjának üzeneteit lehet a KMailbe beolvasni. Akkor kell "
+"használni, ha egy azonosítóhoz tartozó minden üzenetet át szeretne venni egy "
+"Opera maildirből.</p><p>Válassza ki az azonosítóhoz tartozó könyvtárat "
+"(általában ~/.opera/mail/store/azonosító*).</p><p><b>Megjegyzés:</b> az "
+"üzenetek az azonosítóval megegyező nevű mappába kerülnek, kiegészítve az "
+"OPERA- előtaggal.</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "A fájlok számolása folyik..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Új üzenetfájlok importálása..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Importálás az Outlookból"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Outlook importszűrő</b></p><p>Ez a szűrő egy Outlook PST-fájlból tud "
+"üzeneteket importálni. A művelet előtt meg kell határozni, hogy melyik "
+"könyvtárban található a kívánt PST-fájl. Windows 2000 és újabb esetén ez "
+"általában: <i>C:\\Documents and Settings</i></p><p><b>Megjegyzés:</b> a "
+"létrehozott könyvtárak neve meg fog egyezni az eredeti azonosító nevével, "
+"kiegészítve az OUTLOOK- előtaggal.</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Az üzenetek számolása folyik..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "A könyvtárak számolása folyik..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "A mappák számolása folyik..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Egyszerű szöveges üzenetek importálása"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Válassza ki az üzeneteket tartalmazó könyvtárat. Az üzenetek ugyanolyan "
+"nevű könyvtárba kerülnek, mint ahonnan származnak, ellátva a PLAIN- "
+"előtaggal</p><p>A szűrő alkalmas .msg, .eml és .txt üzenetek beolvasására.</"
+"p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Pegasus Mail mappák importálása"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Válassza ki a Pegasus Mail alapkönyvtárat (ahol a *.CNM, *.PMM és *.MBX "
+"fájlok találhatók). Általában az alapértelmezés C:\\pmail\\mail vagy C:"
+"\\pmail\\mail\\admin szokott lenni</p><p><b>Megjegyzés:</b> a szűrő a "
+"mappastruktúrát is átemeli, a mappák ide kerülnek: \"PegasusMail-Import\".</"
+"p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Nem sikerült feldolgozni a mappastruktúrát. Folytatódik az importálás az "
+"almappák feldolgozása nélkül."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Az új üzenetek fájljainak ('.cnm') importálása..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Üzenetmappák ('.pmm') importálása..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "'UNIX' üzenetmappák ('.mbx') importálása..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "%1 importálása"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "A mappastruktúra feldolgozása..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Sylpheed-adatok (üzenetek és mappastruktúra) importálása"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Sylpheed importszűrő</b></p><p>Válassza ki az importálandó Sylpheed "
+"üzenetkönyvtárat (általában: ~/Mail ).</p><p>A program a mappastruktúrát is "
+"át tudja venni, a mappák ide kerülnek: \"Sylpheed-Import\" (a helyi "
+"mappában).</p><p>A szűrő az üzenetállapotokat is újragenerálja (pl. új, "
+"továbbított)."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Üzenetek és mappastruktúra importálása a Bat! levelezőprogramból"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Importáló a Bat! levelezőprogramhoz</b></p><p>Válassza ki a 'The Bat!' "
+"helyi üzenetmappáját (amelyet importálni szeretne).</p><p><b>Megjegyzés:</b> "
+"a szűrő a 'The Bat!' helyi mappájából tölti át a *.tbb-fájlokat, tehát pl. a "
+"POP-postafiókot igen, az IMAP/DIMAP-postafiókokat nem.</p><p>A program a "
+"mappastruktúrát is át tudja venni, a mappák ide kerülnek: \"TheBat-Import"
+"\" (a helyi mappába).</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Thunderbird/Mozilla-adatok (üzenetek és mappastruktúra) importálása"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Sylpheed importszűrő</b></p>"
-"<p>Válassza ki az importálandó Sylpheed üzenetkönyvtárat (általában: ~/Mail "
-").</p>"
-"<p>A program a mappastruktúrát is át tudja venni, a mappák ide kerülnek: "
-"\"Sylpheed-Import\" (a helyi mappában).</p>"
-"<p>A szűrő az üzenetállapotokat is újragenerálja (pl. új, továbbított)."
+"<p><b>Thunderbird/Mozilla importszűrő</b></p><p>Válassza ki a Thunderbird/"
+"Mozilla alap üzenetkönyvtárát (általában ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Megjegyzés:</b> ne válasszon ki olyan könyvtárat, amely "
+"<u>nem tartalmaz</u> mbox-fájlokat (például egy maildir könyvtárat). Ebben "
+"az esetben sok új mappa jöhet létre.</p><p>A mappastruktúrát is le tudja "
+"kérdezni az importáló, a mappák ide kerülnek: \"Thunderbird-Import\".</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<b>Végzetes hiba:</b> nem sikerült elindítani a KMailt a DCOP kommunikációhoz. "
-"Ellenőrizze, hogy a <i>kmail</i> program telepítve van-e."
+"<b>Végzetes hiba:</b> nem sikerült elindítani a KMailt a DCOP "
+"kommunikációhoz. Ellenőrizze, hogy a <i>kmail</i> program telepítve van-e."
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -583,64 +543,58 @@ msgstr "Nem sikerült hozzáadni egy üzenetet a KMail %1 nevű mappájához"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Nem sikerült hozzáadni egy üzenetet a KMail %1 mappájához."
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Egyszerű szöveges üzenetek importálása"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Ettől:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Válassza ki az üzeneteket tartalmazó könyvtárat. Az üzenetek ugyanolyan nevű "
-"könyvtárba kerülnek, mint ahonnan származnak, ellátva a PLAIN- előtaggal</p>"
-"<p>A szűrő alkalmas .msg, .eml és .txt üzenetek beolvasására.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Eddig:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Mbox fájlok importálása (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Aktuális:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Mbox importszűrő</b></p>"
-"<p>Ezzel a szűrővel Mbox fájlokat lehet a KMailbe beolvasni. Akkor kell "
-"használni, ha a korábbi levelezőprogram ezt a hagyományos UNIX-os formátumot "
-"használta (pl. Ximian Evolution).</p>"
-"<p><b>Megjegyzés:</b> az üzenetek a fájllal megegyező nevű mappába kerülnek, "
-"kiegészítve az MBOX előtaggal.</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Importálás folyik..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Mbox-fájlok (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Üzenetek és mappastruktúra importálása a Bat! levelezőprogramból"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Összesen:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Kattintson a 'Vissza' gombra további e-mailek és névjegyek importálásához"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Importáló a Bat! levelezőprogramhoz</b></p>"
-"<p>Válassza ki a 'The Bat!' helyi üzenetmappáját (amelyet importálni "
-"szeretne).</p>"
-"<p><b>Megjegyzés:</b> a szűrő a 'The Bat!' helyi mappájából tölti át a "
-"*.tbb-fájlokat, tehát pl. a POP-postafiókot igen, az IMAP/DIMAP-postafiókokat "
-"nem.</p>"
-"<p>A program a mappastruktúrát is át tudja venni, a mappák ide kerülnek: "
-"\"TheBat-Import\" (a helyi mappába).</p>"
+"<b>Üdvözöljük a KMailCVT-ben, a KMail üzenetimportálójában!</b>\n"
+"<br><br>\n"
+"E program segítségével be lehet tölteni a KMailbe más levelezőprogramok "
+"üzeneteit.<br><br><br><br>\n"
+" Válassza ki az importálás forrását, majd kattintson a 'Következő' gombra."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "A &duplikált üzenetek eltávolítása az importálás során"
diff --git a/tde-i18n-is/messages/tdepim/kmailcvt.po b/tde-i18n-is/messages/tdepim/kmailcvt.po
index 007ee81a7da..c908b0c64bb 100644
--- a/tde-i18n-is/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-is/messages/tdepim/kmailcvt.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-03-04 12:25+0100\n"
 "Last-Translator: Arnar Leósson <leosson@frisurf.no>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -20,25 +20,83 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Flytja inn Outlook póst"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+"Þórarinn R. Einarsson, Pjetur G. Hjaltason, Svanur Pálsson, Arnar Leósson"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
 msgstr ""
-"<p><b>Outlook innflutningssía</b></p>"
-"<p>Þessi sía flytur inn póst frá Outlook pst-skrám. Þú þarft að finna möppuna "
-"þar sem pst-skrárnar eru geymdar með því að leita að .pst skrám undir: <i>"
-"Documents and Settings</i> í Windows 2000 eða nýrra</ul></p>"
-"<p><b>Athugið:</b> Póstur verður fluttur inn í möppur nefndar eftir auðkenninu "
-"sem þær komu frá, með forskeytinu OUTLOOK-</p>"
+"thori@mindspring.com, pjetur@pjetur.net, svanurpalsson@hotmail.com, "
+"leosson@frisurf.no"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT innflutningstól"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Skref 1: Veldu síu"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Skref 2: Flyt inn..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Framkvæmi innflutning"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Innflutningi lokið"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Skrifað af %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail Innflutningssíur"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, höfundar KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Upprunalegur höfundur"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Umsjónarmaður og nýjar síður"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nýtt grafískt viðmót og tiltekt"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Flytja inn Evolution 1.x bréf og möppuskipulag"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
+msgstr ""
+"<p><b>Evolution 1.x innflutningssía</b></p><p>Veldu grunnmöppu Evolution "
+"póstsins þín (vanalega ~/evolution/local).</p> <p>Þar sem það er mögulegt að "
+"halda möppuskipulaginu, verður það sett undir: \"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -48,27 +106,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Engin mappa valin."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Tel skrár ..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Tel bréf..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Tel möppur..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Tel möppur..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Flyt inn nýjar póstskrár..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -76,6 +113,22 @@ msgstr "Flyt inn nýjar póstskrár..."
 msgid "No files found for import."
 msgstr "Engar skrár fundust til innflutnings."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Innflutningi pósts frá %1 lokið"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Get ekki opnað %1, sleppi"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -93,38 +146,37 @@ msgstr ""
 "Eitt endurtekið bréf ekki flutt inn\n"
 "%n endurtekin bréf ekki flutt inn"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Get ekki opnað %1, sleppi"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Flytja inn Evolution 1.x bréf og möppuskipulag"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Flytja inn Evolution 2.x bréf og möppuskipulag"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x innflutningssía</b></p>"
-"<p>Veldu grunnmöppu Evolution póstsins þín (vanalega ~/evolution/local).</p> "
-"<p>Þar sem það er mögulegt að halda möppuskipulaginu, verður það sett undir: "
-"\"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x innflutningssía</b></p><p>Veldu grunnmöppu Evolution "
+"póstsins þín (vanalega ~/.evolution/mail/local/).</p><p><b>Athugaðu:</b> "
+"Aldrei velja möppu sem <u>inniheldur ekki</u> mbox skrár (t.d. maildir). Ef "
+"þú gerir það mun haug af nýjum möppum verða bætt við.</p><p>Þar sem það er "
+"mögulegt að halda möppuskipulaginu, verður það sett undir: \"Evolution-Import"
+"\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Innflutningi pósts frá %1 lokið"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Innflutningi lokið, notandi hætti við."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Hef innflutning á %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -132,97 +184,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Flytja inn möppur úr Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p> Veldu Pegasus-Mail möppuna á tölvunni þinni (sem inniheldur *.CNM, *.PMM og "
-"*.MBX skrár). Á mörgum kerfum er þetta í C:\\PMail\\mail eða "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Athugaðu:</b> Þar sem það er mögulegt að halda möppuskipulaginu, verður "
-"það sett undir: \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Get ekki þáttað möppuskipulagið; held áfram án stuðnings við undirmöppur."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Flyt inn nýjar póstskrár ('.cnm') ..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Flyt inn póstmöppur ('.pmm') ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Flyt inn 'UNIX' póstmöppur ('.mbx') ..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Flyt inn %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Bréf %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Þátta möppuskipulagið..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Skrifað af %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Flytja inn Lotus Notes póst"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Lotus Notes innflutningssía</b></p>"
-"<p>Þessi sía flytur inn textaskrár frá útfluttum Lotus Notes pósti inn í KMail. "
-"Notaðu þessa síu ef þú vilt flytja inn póst frá Lotus Notes eða öðrum "
-"póstforritum sem nota Lotus Notes sniðið.</p>"
-"<p><b>Athugaðu:</b> Þar sem það er mögulegt að halda möppuskipulaginu, verður "
-"innflutti pósturinn settur í undirmöppur undir: \"LNotes-Import\", nefndar "
-"eftir heiti á skránum þær koma úr.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Allar skrár (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Flyt inn póst frá %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -230,30 +195,20 @@ msgstr "Flytja inn KMail bréf og möppuskipulag"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>KMail innflutningssía</b></p>"
-"<p>Veldu grunnmöppu KMail póstsins sem þú vilt flytja inn.</p> "
-"<p><b>Athugaðu:</b> Aldrei velja núverandi möppu KMail (vanalega ~/Mail eða "
-"~/.trinity/share/apps/kmail/mail ): gerir þú það mun KMailCVT festast í "
-"stöðugri endurtekningu. </p> "
-"<p>Sían flytur ekki inn KMail póstmöppur sem innihalda mbox skrár.</p>"
-"<p>Þar sem það er mögulegt að halda möppuskipulaginu, verður það sett undir: "
-"\"KMail-Import\".</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Innflutningi lokið, notandi hætti við."
+"<p><b>KMail innflutningssía</b></p><p>Veldu grunnmöppu KMail póstsins sem þú "
+"vilt flytja inn.</p> <p><b>Athugaðu:</b> Aldrei velja núverandi möppu KMail "
+"(vanalega ~/Mail eða ~/.trinity/share/apps/kmail/mail ): gerir þú það mun "
+"KMailCVT festast í stöðugri endurtekningu. </p> <p>Sían flytur ekki inn "
+"KMail póstmöppur sem innihalda mbox skrár.</p><p>Þar sem það er mögulegt að "
+"halda möppuskipulaginu, verður það sett undir: \"KMail-Import\".</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -266,193 +221,40 @@ msgstr "Flytja inn möppu %1..."
 msgid "Could not import %1"
 msgstr "Gat ekki flutt inn %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Flytja inn Thunderbird/Mozilla póst og möppuskipulag"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird/Mozilla innflutningssía</b></p>"
-"<p>Veldu grunnmöppu Thunderbird/Mozilla póstsins þín (vanalega "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Athugaðu:</b> Aldrei velja möppu sem <u>inniheldur ekki</u> "
-"mbox skrár (t.d. maildir). Ef þú gerir það mun haug af nýjum möppum verða bætt "
-"við.</p>"
-"<p>Þar sem það er mögulegt að halda möppuskipulaginu, verður það sett undir: "
-"\"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Hef innflutning á %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Flytja inn Opera póst"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera póst innflutningssía</b></p>"
-"<p>Þessi sía flytur inn póst frá Opera. Notaðu þessa síu ef þú vilt flytja inn "
-"póst frá Opera póstmöppu.</p> "
-"<p>Veldu möppuna þar sem pósturinn er geymdur (vanalega "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Athugaðu:</b> Pósturinn verðu fluttur inn í möppur sem heita eftir "
-"auðkenninu sem þær koma frá, með forskeytinu OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Flytja inn Evolution 2.x bréf og möppuskipulag"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x innflutningssía</b></p>"
-"<p>Veldu grunnmöppu Evolution póstsins þín (vanalega "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Athugaðu:</b> Aldrei velja möppu sem <u>inniheldur ekki</u> "
-"mbox skrár (t.d. maildir). Ef þú gerir það mun haug af nýjum möppum verða bætt "
-"við.</p>"
-"<p>Þar sem það er mögulegt að halda möppuskipulaginu, verður það sett undir: "
-"\"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Frá:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Til:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Núverandi:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Innflutningur í gangi..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Samtals:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Ýttu á 'Til baka' til að flytja inn fleiri bréf eða tengiliði"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Flytja inn Lotus Notes póst"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Velkomin(n) í KMailCVT - KMail innflutningstólið</b>\n"
-"<br>"
-"<br>\n"
-"Þetta forrit hjálpar þér að flytja póst inn í KMail úr þínu síðasta "
-"póstforriti."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Vinsamlegast veldu það forrit sem þú vilt flytja inn úr og ýttu svo á 'Áfram'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Fjarlægja en&durtekin bréf í innflutningi"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail Innflutningssíur"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, höfundar KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Upprunalegur höfundur"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Umsjónarmaður og nýjar síður"
+"<p><b>Lotus Notes innflutningssía</b></p><p>Þessi sía flytur inn textaskrár "
+"frá útfluttum Lotus Notes pósti inn í KMail. Notaðu þessa síu ef þú vilt "
+"flytja inn póst frá Lotus Notes eða öðrum póstforritum sem nota Lotus Notes "
+"sniðið.</p><p><b>Athugaðu:</b> Þar sem það er mögulegt að halda "
+"möppuskipulaginu, verður innflutti pósturinn settur í undirmöppur undir: "
+"\"LNotes-Import\", nefndar eftir heiti á skránum þær koma úr.</p>"
 
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nýtt grafískt viðmót og tiltekt"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Allar skrár (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-"Þórarinn R. Einarsson, Pjetur G. Hjaltason, Svanur Pálsson, Arnar Leósson"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Flyt inn póst frá %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"thori@mindspring.com, pjetur@pjetur.net, svanurpalsson@hotmail.com, "
-"leosson@frisurf.no"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Bréf %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -460,11 +262,11 @@ msgstr "Flytja inn OS X póst"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X póst innflutningssía</b></p>"
-"<p>Þessi sía flytur inn póst frá Apple Mac OS X póstforritinu.</p>"
+"<p><b>OS X póst innflutningssía</b></p><p>Þessi sía flytur inn póst frá "
+"Apple Mac OS X póstforritinu.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -474,25 +276,27 @@ msgstr ""
 "Eitt endurtekið bréf ekki flutt inn í möppuna %1 í KMail\n"
 "%n endurtekin bréf ekki flutt inn í möppuna %1 í KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT innflutningstól"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Skref 1: Veldu síu"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Skref 2: Flyt inn..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Flytja inn mbox skrár (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Framkvæmi innflutning"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox innflutningssía</b></p><p>Þessi sía flytur inn mbox skrár í "
+"KMail.  Notaðu þessa síu ef þú vilt flytja inn póst frá Ximian Evolution eða "
+"öðrum póstforritum sem nota þetta hefðbundna UNIX snið.</p><p><b>Athugið:</"
+"b> Pósturinn verðu fluttur inn í möppur sem heita eftir skránum sem þær komu "
+"úr, með forskeytinu MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Innflutningi lokið"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox skrár (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -500,24 +304,20 @@ msgstr "Flytja inn Outlook Express póst"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 innflutningssía</b></p>"
-"<p>Þú þarft að finna möppuna þar sem pósthólfið hefur verið geymt með því að "
-"leita að .dbx eða .mbx skrám undir "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> í Windows 9x "
-"<li><i>Documents and Settings</i> í Windows 2000 eða nýrra</ul></p>"
-"<p><b>Athugaðu:</b> Þar sem það er mögulegt að halda möppuskipulaginu, verður "
-"það sett undir: \"OE-Import\".</p>"
+"<p><b>Outlook Express 4/5/6 innflutningssía</b></p><p>Þú þarft að finna "
+"möppuna þar sem pósthólfið hefur verið geymt með því að leita að .dbx eða ."
+"mbx skrám undir <ul><li><i>C:\\Windows\\Application Data</i> í Windows 9x "
+"<li><i>Documents and Settings</i> í Windows 2000 eða nýrra</ul></"
+"p><p><b>Athugaðu:</b> Þar sem það er mögulegt að halda möppuskipulaginu, "
+"verður það sett undir: \"OE-Import\".</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -552,29 +352,187 @@ msgstr "Flyt inn OE5+ pósthólf %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Flyt inn OE5+ möppuskrá %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Flytja inn Opera póst"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Opera póst innflutningssía</b></p><p>Þessi sía flytur inn póst frá "
+"Opera. Notaðu þessa síu ef þú vilt flytja inn póst frá Opera póstmöppu.</p> "
+"<p>Veldu möppuna þar sem pósturinn er geymdur (vanalega ~/.opera/mail/store/"
+"account*).</p><p><b>Athugaðu:</b> Pósturinn verðu fluttur inn í möppur sem "
+"heita eftir auðkenninu sem þær koma frá, með forskeytinu OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Tel skrár ..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Flyt inn nýjar póstskrár..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Flytja inn Outlook póst"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Outlook innflutningssía</b></p><p>Þessi sía flytur inn póst frá "
+"Outlook pst-skrám. Þú þarft að finna möppuna þar sem pst-skrárnar eru "
+"geymdar með því að leita að .pst skrám undir: <i>Documents and Settings</i> "
+"í Windows 2000 eða nýrra</ul></p><p><b>Athugið:</b> Póstur verður fluttur "
+"inn í möppur nefndar eftir auðkenninu sem þær komu frá, með forskeytinu "
+"OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Tel bréf..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Tel möppur..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Tel möppur..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Flytja inn einfaldan textapóst"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Veldu möppuna sem geymir póst á þínu kerfi.  Pósturinn verður geymdur í "
+"möppu með sama nafni og mappan sem hann var í, með forskeytinu PLAIN-</"
+"p><p>Þessi sía flytur inn allan .msg, .eml og .txt póst.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Flytja inn möppur úr Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p> Veldu Pegasus-Mail möppuna á tölvunni þinni (sem inniheldur *.CNM, *.PMM "
+"og *.MBX skrár). Á mörgum kerfum er þetta í C:\\PMail\\mail eða C:\\pmail"
+"\\mail\\admin</p><p><b>Athugaðu:</b> Þar sem það er mögulegt að halda "
+"möppuskipulaginu, verður það sett undir: \"PegasusMail-Import\".</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Get ekki þáttað möppuskipulagið; held áfram án stuðnings við undirmöppur."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Flyt inn nýjar póstskrár ('.cnm') ..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Flyt inn póstmöppur ('.pmm') ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Flyt inn 'UNIX' póstmöppur ('.mbx') ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Flyt inn %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Þátta möppuskipulagið..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Flytja inn Sylpheed bréf og möppuskipulag"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Sylpheed innflutningssía</b></p><p>Veldu grunnmöppu Sylpheed póstsins "
+"þín (vanalega ~/Mail ).</p><p>Þar sem það er mögulegt að halda "
+"möppuskipulaginu, verður það sett undir: \"Sylpheed-Import\".</p> <p>Sían "
+"mun einnig endurskapa stöðu bréfana, þ.e. ný eða áframsend."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Flytja inn Bat! bréf og möppuskipulag"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Bat! innflutningssía</b></p><p>Veldu grunnmöppu 'The Bat!' "
+"póstmöppunar sem þú vilt flytja inn.</p><p><b>Athugaðu:</b> Sían flytur inn "
+"*.tbb skrárnar frá staðbundnu möppu 'The Bat!', þ.e. frá POP tengingu, en "
+"ekki frá IMAP/DIMAP tengingu.</p><p>Þar sem það er mögulegt að halda "
+"möppuskipulaginu, verður innflutti pósturinn settur í undirmöppur undir: "
+"\"TheBat-Import\".</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Flytja inn Thunderbird/Mozilla póst og möppuskipulag"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Sylpheed innflutningssía</b></p>"
-"<p>Veldu grunnmöppu Sylpheed póstsins þín (vanalega ~/Mail ).</p>"
-"<p>Þar sem það er mögulegt að halda möppuskipulaginu, verður það sett undir: "
-"\"Sylpheed-Import\".</p> "
-"<p>Sían mun einnig endurskapa stöðu bréfana, þ.e. ný eða áframsend."
+"<p><b>Thunderbird/Mozilla innflutningssía</b></p><p>Veldu grunnmöppu "
+"Thunderbird/Mozilla póstsins þín (vanalega ~/.thunderbird/*.default/Mail/"
+"Local Folders/).</p><p><b>Athugaðu:</b> Aldrei velja möppu sem <u>inniheldur "
+"ekki</u> mbox skrár (t.d. maildir). Ef þú gerir það mun haug af nýjum möppum "
+"verða bætt við.</p><p>Þar sem það er mögulegt að halda möppuskipulaginu, "
+"verður það sett undir: \"Thunderbird-Import\".</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Alvarlegt:</b> Gat ekki ræst KMail til að hefja DCOP samskipti. Gangtu úr "
 "skugga um að <i>kmail</i> sé uppsett."
@@ -591,68 +549,75 @@ msgstr "Get ekki sett bréf í möppuna %1 í KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Villa við að bæta bréfi í möppuna %1 í KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Flytja inn einfaldan textapóst"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Frá:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Veldu möppuna sem geymir póst á þínu kerfi.  Pósturinn verður geymdur í "
-"möppu með sama nafni og mappan sem hann var í, með forskeytinu PLAIN-</p>"
-"<p>Þessi sía flytur inn allan .msg, .eml og .txt póst.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Til:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Flytja inn mbox skrár (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Núverandi:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>mbox innflutningssía</b></p>"
-"<p>Þessi sía flytur inn mbox skrár í KMail.  Notaðu þessa síu ef þú vilt flytja "
-"inn póst frá Ximian Evolution eða öðrum póstforritum sem nota þetta hefðbundna "
-"UNIX snið.</p>"
-"<p><b>Athugið:</b> Pósturinn verðu fluttur inn í möppur sem heita eftir skránum "
-"sem þær komu úr, með forskeytinu MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Innflutningur í gangi..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox skrár (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Flytja inn Bat! bréf og möppuskipulag"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Samtals:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Ýttu á 'Til baka' til að flytja inn fleiri bréf eða tengiliði"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Bat! innflutningssía</b></p>"
-"<p>Veldu grunnmöppu 'The Bat!' póstmöppunar sem þú vilt flytja inn.</p>"
-"<p><b>Athugaðu:</b> Sían flytur inn *.tbb skrárnar frá staðbundnu möppu 'The "
-"Bat!', þ.e. frá POP tengingu, en ekki frá IMAP/DIMAP tengingu.</p>"
-"<p>Þar sem það er mögulegt að halda möppuskipulaginu, verður innflutti "
-"pósturinn settur í undirmöppur undir: \"TheBat-Import\".</p>"
-
-#~ msgid "<p>Select the base directory of Evolution's mails (usually ~/evolution/local).</p><p>As it is currently impossible to recreate the folder structure, it will be \"contained\" in the generated folder's names.</p><p>For instance, if you have a \"foo\" folder in Evolution, with a \"bar\" subfolder, two folders will be created in KMail : \"foo\" and \"foo-bar\"</p>"
-#~ msgstr "<p>Veldu grunnmöppu Evolution bréfa (oftast ~/evolution/local).</p> <p>Þar sem það er ómögulegt í augnablikinu að halda möppuskipulaginu mun það verða \"innifalið\" í nöfnum mappanna sem búnar verða til.</p> <p>Til dæmis, ef þú ert með \"foo\" möppu í Evolution, með \"bar\" undirmöppu, verða tvær möppur búnar til í KMail: \"foo\" og \"foo-bar\"</p>"
+"<b>Velkomin(n) í KMailCVT - KMail innflutningstólið</b>\n"
+"<br><br>\n"
+"Þetta forrit hjálpar þér að flytja póst inn í KMail úr þínu síðasta "
+"póstforriti.<br><br><br><br>\n"
+"Vinsamlegast veldu það forrit sem þú vilt flytja inn úr og ýttu svo á "
+"'Áfram'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Fjarlægja en&durtekin bréf í innflutningi"
+
+#~ msgid ""
+#~ "<p>Select the base directory of Evolution's mails (usually ~/evolution/"
+#~ "local).</p><p>As it is currently impossible to recreate the folder "
+#~ "structure, it will be \"contained\" in the generated folder's names.</"
+#~ "p><p>For instance, if you have a \"foo\" folder in Evolution, with a \"bar"
+#~ "\" subfolder, two folders will be created in KMail : \"foo\" and \"foo-bar"
+#~ "\"</p>"
+#~ msgstr ""
+#~ "<p>Veldu grunnmöppu Evolution bréfa (oftast ~/evolution/local).</p> "
+#~ "<p>Þar sem það er ómögulegt í augnablikinu að halda möppuskipulaginu mun "
+#~ "það verða \"innifalið\" í nöfnum mappanna sem búnar verða til.</p> <p>Til "
+#~ "dæmis, ef þú ert með \"foo\" möppu í Evolution, með \"bar\" undirmöppu, "
+#~ "verða tvær möppur búnar til í KMail: \"foo\" og \"foo-bar\"</p>"
 
 #~ msgid "File %1 does not seem to be an Outlook Express mailbox"
 #~ msgstr "Skráin %1 virðist ekki vera Outlook Express pósthólf"
diff --git a/tde-i18n-it/messages/tdepim/kmailcvt.po b/tde-i18n-it/messages/tdepim/kmailcvt.po
index b838fba0e25..7ed142c9820 100644
--- a/tde-i18n-it/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-it/messages/tdepim/kmailcvt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-01-08 01:10+0100\n"
 "Last-Translator: Alessandro Astarita <aleast@capri.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -17,25 +17,82 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Importa i messaggi di Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Alessandro Astarita"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "aleast@capri.it"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Strumento di importazione KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Passo 1: seleziona filtro"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Passo 2: importazione..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importazione in corso"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Importazione conclusa"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Scritto da %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Filtri di importazione di KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, gli sviluppatori di KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Autore originario"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Responsabile & nuovi filtri"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nuova interfaccia utente & miglioramenti vari"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+"Importa i messaggi locali di Evolution 1.x e la struttura delle cartelle"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Filtro di importazione Outlook</b></p> "
-"<p>Questo filtro importerà i messaggi da file pst di Outlook. Devi localizzare "
-"le cartelle dove sono conservati file con estensione .pst, in genere si trovano "
-"in <i>C:\\Documents and Settings</i> in Windows 2000 o successivo</p>"
-"<p><b>Nota:</b> i messaggi di posta elettronica saranno importati in cartelle "
-"col nome della cartella originaria preceduta dal prefisso 'OUTLOOK-'</p>"
+"<p><b>Filtro di importazione Evolution 1.x</b></p> <p>Seleziona la cartella "
+"di partenza della posta di Evolution (generalmente ~/.evolution/local/).</p> "
+"<p>Dato che è possibile ricreare la struttura delle cartelle, esse saranno "
+"conservate come: \"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -45,27 +102,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Nessuna directory selezionata."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Conteggio file..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Conteggio messaggi..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Conteggio cartelle..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Conteggio caselle..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Importazione nuovi file di messaggi di posta..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -73,6 +109,22 @@ msgstr "Importazione nuovi file di messaggi di posta..."
 msgid "No files found for import."
 msgstr "Nessun file trovato da importare."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Importazione messaggi di posta da %1 conclusa"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Impossibile aprire %1, saltato"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -90,40 +142,38 @@ msgstr ""
 "1 messaggio duplicato non importato\n"
 "%n messaggi duplicati non importati"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Impossibile aprire %1, saltato"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
-"Importa i messaggi locali di Evolution 1.x e la struttura delle cartelle"
+"Importa i messaggi locali di Evolution 2.x e la struttura delle cartelle"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Filtro di importazione Evolution 1.x</b></p> "
-"<p>Seleziona la cartella di partenza della posta di Evolution (generalmente "
-"~/.evolution/local/).</p> "
-"<p>Dato che è possibile ricreare la struttura delle cartelle, esse saranno "
-"conservate come: \"Evolution-Import\".</p>"
+"<p><b>Filtro di importazione Evolution 2.x</b></p> <p>Seleziona la cartella "
+"di partenza della posta di Evolution (generalmente ~/.evolution/mail/local/)."
+"</p> <p><b>Nota:</b> non scegliere una cartella che <u>non contiene</u> dei "
+"file mbox (maildir, per esempio) perché verrebbero create tante nuove "
+"cartelle.</p> <p>Dato che è possibile ricreare la struttura delle cartelle, "
+"esse saranno conservate come: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Importazione messaggi di posta da %1 conclusa"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Importazione conclusa, annullata dall'utente."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Avvio importazione file %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -131,99 +181,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importa cartelle da Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p> Seleziona la directory di Pegasus-Mail sul tuo sistema (contenente file "
-"CNM, PMM e MBX). In molti casi è conservata in C:\\pmail\\mailo "
-"C:\\pmail\\mail\\admin</p> "
-"<p><b>Nota:</b> Dato che è possibile ricreare la struttura delle cartelle, esse "
-"saranno conservate come: \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Impossibile analizzare la struttura delle cartelle; importazione senza supporto "
-"per le sotto-cartelle."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importazione nuovo file di messaggi (\".cnm\")..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importazione cartelle di messaggi (\".pmm\")..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importazione cartelle di messaggi \"UNIX\" (\".mbx\")..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importazione %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Messaggio %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Analisi della struttura delle cartelle..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Scritto da %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Importa i messaggi di Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Filtro di importazione Testo strutturato Lotus Notes</b></p> "
-"<p>Questo filtro importerà i file di testo strutturato da Lotus Notes a KMail. "
-"Utilizza questo filtro se vuoi importare i messaggi di posta da Lotus Notes o "
-"altri programmi di posta che utilizzano il formato Testo strutturato Lotus "
-"Notes.</p> "
-"<p><b>Nota:</b> Dato che è possibile ricreare la struttura delle cartelle, esse "
-"saranno conservate in sotto-cartelle col nome dei file di origine in: "
-"\"LNotes-Import\" della tua cartella locale.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Tutti i file (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Importazione messaggi di posta da %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -231,33 +192,23 @@ msgstr "Importa i messaggi di KMail e la struttura delle cartelle"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Filtro d'importazione KMail</b></p>"
-"<p>Seleziona la cartella di partenza della cartella di posta locale di KMail "
-"che vuoi importare.</p> "
+"<p><b>Filtro d'importazione KMail</b></p><p>Seleziona la cartella di "
+"partenza della cartella di posta locale di KMail che vuoi importare.</p> "
 "<p><b>Nota:</b> Non selezionare la tua casella di posta locale di KMail "
-"(generalmente ~/Mail oppure ~/.trinity/share/apps/kmail/mail): in questo caso, "
-"KMailCVT potrebbe entrare in un ciclo infinito.</p> "
-"<p>Questo filtro non importa le cartelle di posta locale di KMail con file "
-"mbox.</p>"
-"<p>Dato che è possibile ricreare la struttura delle cartelle, esse saranno "
+"(generalmente ~/Mail oppure ~/.trinity/share/apps/kmail/mail): in questo "
+"caso, KMailCVT potrebbe entrare in un ciclo infinito.</p> <p>Questo filtro "
+"non importa le cartelle di posta locale di KMail con file mbox.</p><p>Dato "
+"che è possibile ricreare la struttura delle cartelle, esse saranno "
 "conservate come: \"KMail-Import\" nella tua cartella locale.</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Importazione conclusa, annullata dall'utente."
-
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
 msgstr "Importa cartella %1..."
@@ -269,193 +220,41 @@ msgstr "Importa cartella %1..."
 msgid "Could not import %1"
 msgstr "Impossibile importare %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-"Importa i messaggi locali di Thunderbird/Mozilla e la struttura delle cartelle"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Filtro d'importazione Thunderbird/Mozilla</b></p>"
-"<p>Seleziona la cartella di partenza della posta di Thunderbird (generalmente "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p> "
-"<p><b>Nota:</b> non scegliere una cartella che <u>non contiene</u> "
-"dei file mbox (maildir, per esempio) perché verrebbero create tante nuove "
-"cartelle.</p> "
-"<p>Dato che è possibile ricreare la struttura delle cartelle, esse saranno "
-"conservate come: \"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Avvio importazione file %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Importa messaggi di posta da Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Filtro di importazione da Opera</b></p> "
-"<p>Questo filtro importerà la posta dalla cartella dei messaggi di Opera.</p> "
-"<p>Seleziona la cartella dell'account (generalmente "
-"~/.opera/mail/store/account*).</p> <b>Nota:</b> I messaggi di posta elettronica "
-"saranno importati in cartelle col nome della cartella originaria preceduta dal "
-"prefisso 'OPERA-'</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
-"Importa i messaggi locali di Evolution 2.x e la struttura delle cartelle"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Filtro di importazione Evolution 2.x</b></p> "
-"<p>Seleziona la cartella di partenza della posta di Evolution (generalmente "
-"~/.evolution/mail/local/).</p> "
-"<p><b>Nota:</b> non scegliere una cartella che <u>non contiene</u> "
-"dei file mbox (maildir, per esempio) perché verrebbero create tante nuove "
-"cartelle.</p> "
-"<p>Dato che è possibile ricreare la struttura delle cartelle, esse saranno "
-"conservate come: \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Da:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "A:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Corrente:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Importazione in corso..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Totale:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Fai clic su 'Indietro' per importare più messaggi di posta elettronica o "
-"contatti"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Importa i messaggi di Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Benvenuto in KMailCVT - lo strumento di importazione di KMail</b>\n"
-"<br>"
-"<br>\n"
-"Questo programma ti aiuterà nell'importazione dei tuoi messaggi di posta "
-"elettronica dal tuo vecchio programma di posta in KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Scegli il programma da cui vuoi importare e poi fai clic su 'Successivo'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Rimuovi i messaggi &duplicati durante l'importazione"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Filtri di importazione di KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, gli sviluppatori di KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Autore originario"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Responsabile & nuovi filtri"
+"<p><b>Filtro di importazione Testo strutturato Lotus Notes</b></p> <p>Questo "
+"filtro importerà i file di testo strutturato da Lotus Notes a KMail. "
+"Utilizza questo filtro se vuoi importare i messaggi di posta da Lotus Notes "
+"o altri programmi di posta che utilizzano il formato Testo strutturato Lotus "
+"Notes.</p> <p><b>Nota:</b> Dato che è possibile ricreare la struttura delle "
+"cartelle, esse saranno conservate in sotto-cartelle col nome dei file di "
+"origine in: \"LNotes-Import\" della tua cartella locale.</p>"
 
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nuova interfaccia utente & miglioramenti vari"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Tutti i file (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Alessandro Astarita"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Importazione messaggi di posta da %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "aleast@capri.it"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Messaggio %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -463,12 +262,12 @@ msgstr "Importa da OS X Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Filtro di importazione OS X Mail</b></p>"
-"<p>Questo filtro importa i messaggi di posta elettronica dal programma di posta "
-"presente nel Mac OS X di Apple.</p>"
+"<p><b>Filtro di importazione OS X Mail</b></p><p>Questo filtro importa i "
+"messaggi di posta elettronica dal programma di posta presente nel Mac OS X "
+"di Apple.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -478,25 +277,28 @@ msgstr ""
 "1 messaggio duplicato non importato nella cartella %1 di KMail\n"
 "%n messaggi duplicati non importati nella cartella %1 di KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Strumento di importazione KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Passo 1: seleziona filtro"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Passo 2: importazione..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importa file mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importazione in corso"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Filtro di importazione mbox</b></p> <p>Questo filtro importerà i file "
+"mbox in KMail. Utilizza questo filtro se vuoi importare i messaggi di posta "
+"da Ximian Evolution o altri programmi di posta che utilizzano questo formato "
+"tradizionale UNIX.</p> <p><b>Nota:</b> I messaggi di posta elettronica "
+"saranno importati in cartelle col nome della cartella originaria preceduta "
+"dal prefisso 'MBOX-'</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Importazione conclusa"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "file mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -504,25 +306,21 @@ msgstr "Importa messaggi di posta da Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Filtro di importazione Outlook Express 4/5/6</b></p> "
-"<p>Devi localizzare le cartelle dove sono conservate le caselle di posta con "
-"estensione .dbx o .mbx in "
-"<ul> "
-"<li><i>C:\\Windows\\Application Data</i> sotto Windows 9x"
-"<li><i>Documents and Settings</i> sotto Windows 2000 o successivi</ul></p>"
-"<p><b>Nota:</b> Dato che è possibile ricreare la struttura delle cartelle, "
-"quelle importate da Outlook Express 5 e 6 saranno conservate come: "
-"\"OE-Import\".</p>"
+"<p><b>Filtro di importazione Outlook Express 4/5/6</b></p> <p>Devi "
+"localizzare le cartelle dove sono conservate le caselle di posta con "
+"estensione .dbx o .mbx in <ul> <li><i>C:\\Windows\\Application Data</i> "
+"sotto Windows 9x<li><i>Documents and Settings</i> sotto Windows 2000 o "
+"successivi</ul></p><p><b>Nota:</b> Dato che è possibile ricreare la "
+"struttura delle cartelle, quelle importate da Outlook Express 5 e 6 saranno "
+"conservate come: \"OE-Import\".</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -558,30 +356,194 @@ msgstr "Importazione casella di posta OE5+ %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importazione file cartella OE5+ %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Importa messaggi di posta da Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Filtro di importazione da Opera</b></p> <p>Questo filtro importerà la "
+"posta dalla cartella dei messaggi di Opera.</p> <p>Seleziona la cartella "
+"dell'account (generalmente ~/.opera/mail/store/account*).</p> <b>Nota:</b> I "
+"messaggi di posta elettronica saranno importati in cartelle col nome della "
+"cartella originaria preceduta dal prefisso 'OPERA-'</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Conteggio file..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Importazione nuovi file di messaggi di posta..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Importa i messaggi di Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Filtro di importazione Outlook</b></p> <p>Questo filtro importerà i "
+"messaggi da file pst di Outlook. Devi localizzare le cartelle dove sono "
+"conservati file con estensione .pst, in genere si trovano in <i>C:"
+"\\Documents and Settings</i> in Windows 2000 o successivo</p><p><b>Nota:</b> "
+"i messaggi di posta elettronica saranno importati in cartelle col nome della "
+"cartella originaria preceduta dal prefisso 'OUTLOOK-'</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Conteggio messaggi..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Conteggio cartelle..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Conteggio caselle..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Importa messaggi di posta in testo semplice"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p> Seleziona la directory contenente i messaggi di posta sul tuo sistema. I "
+"messaggi di posta elettronica saranno conservati in cartelle con lo stesso "
+"nome della directory da cui provengono preceduta dal prefisso 'PLAIN-'</p> "
+"<p>Questo filtro importerà tutti i messaggi con estensione .msg, .eml, e ."
+"txt</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importa cartelle da Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p> Seleziona la directory di Pegasus-Mail sul tuo sistema (contenente file "
+"CNM, PMM e MBX). In molti casi è conservata in C:\\pmail\\mailo C:\\pmail"
+"\\mail\\admin</p> <p><b>Nota:</b> Dato che è possibile ricreare la struttura "
+"delle cartelle, esse saranno conservate come: \"PegasusMail-Import\".</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Impossibile analizzare la struttura delle cartelle; importazione senza "
+"supporto per le sotto-cartelle."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importazione nuovo file di messaggi (\".cnm\")..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importazione cartelle di messaggi (\".pmm\")..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importazione cartelle di messaggi \"UNIX\" (\".mbx\")..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importazione %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Analisi della struttura delle cartelle..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importa i messaggi di Sylpheed e la struttura delle cartelle"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 msgstr ""
-"<p><b>Filtro d'importazione Sylpheed</b></p>"
-"<p>Seleziona la cartella di partenza della cartella di posta che vuoi importare "
-"(generalmente ~/Mail).</p> "
-"<p>Dato che è possibile ricreare la struttura delle cartelle, esse saranno "
-"conservate come: \"Sylpheed-Import\" nella tua cartella locale.</p> "
+"<p><b>Filtro d'importazione Sylpheed</b></p><p>Seleziona la cartella di "
+"partenza della cartella di posta che vuoi importare (generalmente ~/Mail).</"
+"p> <p>Dato che è possibile ricreare la struttura delle cartelle, esse "
+"saranno conservate come: \"Sylpheed-Import\" nella tua cartella locale.</p> "
 "<p>Questo filtro ricrea anche lo stato dei messaggi, es.: nuovo o inoltrato."
 
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Importa i messaggi locali di The Bat! e la struttura delle cartelle"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Filtro d'importazione The Bat!</b></p><p>Seleziona la cartella di "
+"partenza della cartella di posta locale di 'The Bat!' che vuoi importare.</"
+"p> <p><b>Nota:</b> Questo filtro importa i file *.tbb dalla cartella locale "
+"di The Bat!, es.: dagli account POP e non da quelli IMAP/DIMAP.</p><p>Dato "
+"che è possibile ricreare la struttura delle cartelle, esse saranno "
+"conservate come: \"TheBat-Import\" nel tuo account locale.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+"Importa i messaggi locali di Thunderbird/Mozilla e la struttura delle "
+"cartelle"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Filtro d'importazione Thunderbird/Mozilla</b></p><p>Seleziona la "
+"cartella di partenza della posta di Thunderbird (generalmente ~/.thunderbird/"
+"*.default/Mail/Local Folders/).</p> <p><b>Nota:</b> non scegliere una "
+"cartella che <u>non contiene</u> dei file mbox (maildir, per esempio) perché "
+"verrebbero create tante nuove cartelle.</p> <p>Dato che è possibile ricreare "
+"la struttura delle cartelle, esse saranno conservate come: \"Thunderbird-"
+"Import\".</p>"
+
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Errore fatale:</b> Impossibile avviare KMail per la comunicazione DCOP. "
 "Assicurarsi che <b>KMail</b> sia installato correttamente."
@@ -598,65 +560,59 @@ msgstr "Impossibile aggiungere il messaggio alla cartella %1 in KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Errore durante l'inserimento del messaggio nella cartella %1 in KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Importa messaggi di posta in testo semplice"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Da:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p> Seleziona la directory contenente i messaggi di posta sul tuo sistema. I "
-"messaggi di posta elettronica saranno conservati in cartelle con lo stesso nome "
-"della directory da cui provengono preceduta dal prefisso 'PLAIN-'</p> "
-"<p>Questo filtro importerà tutti i messaggi con estensione .msg, .eml, e "
-".txt</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "A:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importa file mbox (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Corrente:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Filtro di importazione mbox</b></p> "
-"<p>Questo filtro importerà i file mbox in KMail. Utilizza questo filtro se vuoi "
-"importare i messaggi di posta da Ximian Evolution o altri programmi di posta "
-"che utilizzano questo formato tradizionale UNIX.</p> "
-"<p><b>Nota:</b> I messaggi di posta elettronica saranno importati in cartelle "
-"col nome della cartella originaria preceduta dal prefisso 'MBOX-'</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Importazione in corso..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "file mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Importa i messaggi locali di The Bat! e la struttura delle cartelle"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Totale:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Fai clic su 'Indietro' per importare più messaggi di posta elettronica o "
+"contatti"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Filtro d'importazione The Bat!</b></p>"
-"<p>Seleziona la cartella di partenza della cartella di posta locale di 'The "
-"Bat!' che vuoi importare.</p> "
-"<p><b>Nota:</b> Questo filtro importa i file *.tbb dalla cartella locale di The "
-"Bat!, es.: dagli account POP e non da quelli IMAP/DIMAP.</p>"
-"<p>Dato che è possibile ricreare la struttura delle cartelle, esse saranno "
-"conservate come: \"TheBat-Import\" nel tuo account locale.</p>"
+"<b>Benvenuto in KMailCVT - lo strumento di importazione di KMail</b>\n"
+"<br><br>\n"
+"Questo programma ti aiuterà nell'importazione dei tuoi messaggi di posta "
+"elettronica dal tuo vecchio programma di posta in KMail.<br><br><br><br>\n"
+"Scegli il programma da cui vuoi importare e poi fai clic su 'Successivo'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Rimuovi i messaggi &duplicati durante l'importazione"
diff --git a/tde-i18n-ja/messages/tdepim/kmailcvt.po b/tde-i18n-ja/messages/tdepim/kmailcvt.po
index b0fea2ca1b3..828d9da9691 100644
--- a/tde-i18n-ja/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ja/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-02-21 23:00+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <Kdeveloper@kde.gr.jp>\n"
@@ -18,24 +18,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Outlook メールをインポート"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Shinichi Tsunoda"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "tsuno@ngy.1st.ne.jp"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT インポートツール"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "ステップ 1: フィルタを選択"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "ステップ 2: インポート..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "インポート進行中"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "インポート完了"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p>作者: %1</p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail インポートフィルタ"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, The KMailCVT developers"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "オリジナルの作者"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "メンテナ、新しいフィルタ"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "新しい GUI、コードの整理"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Evolution 1.x のローカルメールとフォルダ構造をインポート"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p>Outlook メールインポートフィルタ</p>"
-"<p>このフィルタは Outlook pst ファイルからメールをインポートします。.pst を検索して pst "
-"ファイルが保存されているフォルダを見つけてください。Windows 2000 以降では <i>C:\\Documents and Settings</i> "
-"です。</p>"
-"<p>注意: メールは元のアカウント名に OUTLOOK- というプレフィックスが付いたフォルダにインポートされます。</p>"
+"<p>Evolution 1.x インポートフィルタ</p><p>Evolution メールのベースディレクト"
+"リを選択してください (通常 ~/evolution/local)。</p><p>フォルダ構造の再現が可"
+"能なので、フォルダは \"Evolution-Import\" 以下に保存します。</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -45,27 +101,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "ディレクトリが選択されていません。"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "ファイルを数えています..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "メールを数えています..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "ディレクトリを数えています..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "フォルダを数えています..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "新しいメールファイルをインポート中..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -73,6 +108,22 @@ msgstr "新しいメールファイルをインポート中..."
 msgid "No files found for import."
 msgstr "インポートするファイルが見つかりません。"
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "%1 からのメールのインポートが完了しました"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "%1 を開けません。スキップします。"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -88,37 +139,36 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "%n 個の重複メッセージはインポートしていません"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "%1 を開けません。スキップします。"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Evolution 1.x のローカルメールとフォルダ構造をインポート"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Evolution 2.x のローカルメールとフォルダ構造をインポート"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p>Evolution 1.x インポートフィルタ</p>"
-"<p>Evolution メールのベースディレクトリを選択してください (通常 ~/evolution/local)。</p>"
-"<p>フォルダ構造の再現が可能なので、フォルダは \"Evolution-Import\" 以下に保存します。</p>"
+"<p>Evolution 2.x インポートフィルタ</p><p>ローカル Evolution メールフォルダの"
+"ベースディレクトリを選択してください (通常 ~/.evolution/mail/local/)。</p><p>"
+"注意: mbox ファイルを含まないフォルダ (例えば maildir) を選択しないでくださ"
+"い。選択すると、多数の新しいフォルダが作成されます。</p><p>フォルダ構造の再現"
+"が可能なので、フォルダは \"Evolution-Import\" 以下に保存します。</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "%1 からのメールのインポートが完了しました"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "ユーザによってキャンセルされたため、インポートを終了しました。"
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "ファイル %1 のインポート開始..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -126,121 +176,32 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Pegasus-Mail からフォルダをインポート"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>システムの Pegasus-Mail ディレクトリ (*.CNM, *.PMM, *.MBX ファイルを含む) "
-"を選択してください。多くのシステムではこれは C:\\PMail\\mail または C:\\pmail\\mail\\admin にあります。</p> "
-"<p>注意: フォルダ構造の再現が可能なので、フォルダは \"PegasusMail-Import\" 以下に保存します。</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr "フォルダ構造を解析できません。サブフォルダのサポートなしでインポートを続けます。"
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "新規メールファイル (.cnm) をインポート中 ..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "メールフォルダ (.pmm) をインポート中 ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "UNIX メールフォルダ (.mbx) をインポート中..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "%1 をインポート"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "メッセージ %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "フォルダ構造を解析中..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p>作者: %1</p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Lotus Notes メールをインポート"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p>Lotus Notes 構造化テキストメールインポートフィルタ</p>"
-"<p>このフィルタはエクスポートされた Lotus Notes メールクライアントの構造化テキストファイルを KMail にインポートします。Lotus "
-"または Lotus Notes 構造化テキストフォーマットを使用する他のメールプログラムからメールをインポートする場合は、このフィルタを使ってください。</p>"
-"<p>注意: フォルダ構造の再現が可能なので、インポートしたメッセージはローカルフォルダの \"LNotes-Import\" "
-"以下のサブフォルダに保存します。サブフォルダにはメッセージの元のファイル名を使用します。</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "すべてのファイル (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "%1 からメールをインポート"
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "KMail Maildir とフォルダ構造をインポート"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p>KMail インポートフィルタ</p>"
-"<p>インポートする KMail メールフォルダのベースディレクトリを選択してください。</p>"
-"<p>注意: 現在のローカル KMail maildir (通常 ~/Mail または ~/.trinity/share/apps/kmail/mail) "
-"は選択しないでください。選択すると、KMailCVT が無限ループに陥る可能性があります。</p>"
-"<p>このフィルタは mbox ファイルの KMail メールフォルダはインポートしません。</p>"
-"<p>フォルダ構造の再現が可能なので、フォルダはローカルフォルダの \"KMail-Import\" 以下に保存します。</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "ユーザによってキャンセルされたため、インポートを終了しました。"
+"<p>KMail インポートフィルタ</p><p>インポートする KMail メールフォルダのベース"
+"ディレクトリを選択してください。</p><p>注意: 現在のローカル KMail maildir (通"
+"常 ~/Mail または ~/.trinity/share/apps/kmail/mail) は選択しないでください。選"
+"択すると、KMailCVT が無限ループに陥る可能性があります。</p><p>このフィルタは "
+"mbox ファイルの KMail メールフォルダはインポートしません。</p><p>フォルダ構造"
+"の再現が可能なので、フォルダはローカルフォルダの \"KMail-Import\" 以下に保存"
+"します。</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -253,179 +214,41 @@ msgstr "フォルダ %1 をインポート..."
 msgid "Could not import %1"
 msgstr "%1 をインポートできませんでした"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Thunderbird/Mozilla のローカルメールとフォルダ構造をインポート"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p>Thunderbird/Mozilla インポートフィルタ</p>"
-"<p>Thinderbird/Mozilla のベースメールフォルダを選択してください (通常 "
-"~/.thunderbird/*.default/Mail/Local Folders/)。</p>"
-"<p>注意: mbox ファイルを含まないフォルダ (例えば maildir) を選択しないでください。選択すると、多数の新規フォルダが作成されます。</p>"
-"<p>フォルダ構造の再現が可能なので、フォルダは  \"Thunderbird-Import\" 以下に保存します。</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "ファイル %1 のインポート開始..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Opera メールをインポート"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p>Opera メールインポートフィルタ</p>\n"
-"<p>このフィルタは Opera メールフォルダからメールをインポートします。Opera maidlir "
-"のひとつのアカウントのすべてのメールをインポートする場合は、これを使ってください。</p>"
-"<p>アカウントのディレクトリを選択してください (通常 ~/.opera/mail/store/account*)。</p>"
-"<p>注意: メールは元のアカウント名に OPERA- というプレフィックスが付いたフォルダにインポートされます。</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Evolution 2.x のローカルメールとフォルダ構造をインポート"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p>Evolution 2.x インポートフィルタ</p>"
-"<p>ローカル Evolution メールフォルダのベースディレクトリを選択してください (通常 ~/.evolution/mail/local/)。</p>"
-"<p>注意: mbox ファイルを含まないフォルダ (例えば maildir) を選択しないでください。選択すると、多数の新しいフォルダが作成されます。</p>"
-"<p>フォルダ構造の再現が可能なので、フォルダは \"Evolution-Import\" 以下に保存します。</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "From:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "To:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "現在:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "インポート進行中..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "合計:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "他のメールや連絡先をインポートするには「前」をクリックしてください。"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Lotus Notes メールをインポート"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<qt>KMailCVT - KMail インポートツール へようこそ"
-"<br>"
-"<br>このプログラムは以前に使用していたメールプログラムから KMail にメールをインポートするお手伝いをします。"
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"移行するメールプログラムを選択し「次」をクリックしてください。"
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "インポート中に重複メッセージを削除する(&D)"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
+"<p>Lotus Notes 構造化テキストメールインポートフィルタ</p><p>このフィルタはエ"
+"クスポートされた Lotus Notes メールクライアントの構造化テキストファイルを "
+"KMail にインポートします。Lotus または Lotus Notes 構造化テキストフォーマット"
+"を使用する他のメールプログラムからメールをインポートする場合は、このフィルタ"
+"を使ってください。</p><p>注意: フォルダ構造の再現が可能なので、インポートした"
+"メッセージはローカルフォルダの \"LNotes-Import\" 以下のサブフォルダに保存しま"
+"す。サブフォルダにはメッセージの元のファイル名を使用します。</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail インポートフィルタ"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, The KMailCVT developers"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "オリジナルの作者"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "メンテナ、新しいフィルタ"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "新しい GUI、コードの整理"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "すべてのファイル (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Shinichi Tsunoda"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "%1 からメールをインポート"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "tsuno@ngy.1st.ne.jp"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "メッセージ %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -433,11 +256,11 @@ msgstr "OS X Mail からインポート"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p>OS X Mail インポートフィルタ</p>"
-"<p>このフィルタは Apple Mac OS X メールクライアントからメールをインポートします。</p>"
+"<p>OS X Mail インポートフィルタ</p><p>このフィルタは Apple Mac OS X メールク"
+"ライアントからメールをインポートします。</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -445,25 +268,27 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n 個の重複メッセージは KMail のフォルダ %1 にインポートしていません"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT インポートツール"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "ステップ 1: フィルタを選択"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "ステップ 2: インポート..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "mbox ファイルをインポート (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "インポート進行中"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p>mbox インポートフィルタ</p><p>このフィルタは mbox ファイルを KMail にイン"
+"ポートします。Ximian Evolution あるいはこの伝統的な UNIX フォーマットを使用す"
+"る他のメールプログラムからメールをインポートする場合は、これを使ってくださ"
+"い。</p><p>注意: メールは元のファイル名に MBOX- というプレフィックスが付いた"
+"フォルダにインポートされます。</p> "
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "インポート完了"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox ファイル (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -471,28 +296,26 @@ msgstr "Outlook Express メールをインポート"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p>Outlook Express 4/5/6 インポートフィルタ</p>"
-"<p>.dbx または .mbx ファイルを検索して、メールボックスが保存されているフォルダの場所を見つけてください。</p>"
-"<ul>"
-"<li>Windows 9x では <i>C:\\Windows\\Application Data</i>"
-"<li>Windows 2000 以降では <i>Documents and Settings</i></ul></p>"
-"<p>注意: フォルダ構造の再現が可能なので、Outlook Express 5 と 6 からのフォルダはローカルフォルダの \"OE-Import\" "
-"以下に保存します。</p>"
+"<p>Outlook Express 4/5/6 インポートフィルタ</p><p>.dbx または .mbx ファイルを"
+"検索して、メールボックスが保存されているフォルダの場所を見つけてください。</"
+"p><ul><li>Windows 9x では <i>C:\\Windows\\Application Data</i><li>Windows "
+"2000 以降では <i>Documents and Settings</i></ul></p><p>注意: フォルダ構造の再"
+"現が可能なので、Outlook Express 5 と 6 からのフォルダはローカルフォルダの "
+"\"OE-Import\" 以下に保存します。</p>"
 
 #: filter_oe.cxx:67
 #, c-format
 msgid "No Outlook Express mailboxes found in directory %1."
-msgstr "ディレクトリ %1 に Outlook Express メールボックスが見つかりませんでした。"
+msgstr ""
+"ディレクトリ %1 に Outlook Express メールボックスが見つかりませんでした。"
 
 #: filter_oe.cxx:82
 msgid "Import folder structure..."
@@ -522,30 +345,193 @@ msgstr "OE5+ メールボックス %1 をインポート"
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ フォルダファイル %1 をインポート"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Opera メールをインポート"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p>Opera メールインポートフィルタ</p>\n"
+"<p>このフィルタは Opera メールフォルダからメールをインポートします。Opera "
+"maidlir のひとつのアカウントのすべてのメールをインポートする場合は、これを"
+"使ってください。</p><p>アカウントのディレクトリを選択してください (通常 ~/."
+"opera/mail/store/account*)。</p><p>注意: メールは元のアカウント名に OPERA- と"
+"いうプレフィックスが付いたフォルダにインポートされます。</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "ファイルを数えています..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "新しいメールファイルをインポート中..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Outlook メールをインポート"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p>Outlook メールインポートフィルタ</p><p>このフィルタは Outlook pst ファイル"
+"からメールをインポートします。.pst を検索して pst ファイルが保存されている"
+"フォルダを見つけてください。Windows 2000 以降では <i>C:\\Documents and "
+"Settings</i> です。</p><p>注意: メールは元のアカウント名に OUTLOOK- というプ"
+"レフィックスが付いたフォルダにインポートされます。</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "メールを数えています..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "ディレクトリを数えています..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "フォルダを数えています..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "プレーンテキストのEメールをインポート"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>システム上のメールが含まれるディレクトリを選択してください。メールは元の"
+"ディレクトリ名に PLAIN- というプレフィックスがいたディレクトリに置かれます。"
+"</p> <p>このフィルタはすべての .msg, .eml および .txt メールをインポートしま"
+"す。</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Pegasus-Mail からフォルダをインポート"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>システムの Pegasus-Mail ディレクトリ (*.CNM, *.PMM, *.MBX ファイルを含む) "
+"を選択してください。多くのシステムではこれは C:\\PMail\\mail または C:\\pmail"
+"\\mail\\admin にあります。</p> <p>注意: フォルダ構造の再現が可能なので、フォ"
+"ルダは \"PegasusMail-Import\" 以下に保存します。</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"フォルダ構造を解析できません。サブフォルダのサポートなしでインポートを続けま"
+"す。"
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "新規メールファイル (.cnm) をインポート中 ..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "メールフォルダ (.pmm) をインポート中 ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "UNIX メールフォルダ (.mbx) をインポート中..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "%1 をインポート"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "フォルダ構造を解析中..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Sylpheed メールディレクトリとフォルダ構造をインポート"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 msgstr ""
-"<p>Sylpheed インポートフィルタ</p>"
-"<p>インポートする Sylpheed メールフォルダのベースディレクトリを選択してください (通常 ~/Mail)。</p>"
-"<p>フォルダ構造の再現が可能なので、フォルダはローカルフォルダの \"Sylpheed-Import\" 以下に保存します。</p>"
-"<p>このフィルタはメッセージのステータス (新規、転送済みなど) も再現します。"
+"<p>Sylpheed インポートフィルタ</p><p>インポートする Sylpheed メールフォルダの"
+"ベースディレクトリを選択してください (通常 ~/Mail)。</p><p>フォルダ構造の再現"
+"が可能なので、フォルダはローカルフォルダの \"Sylpheed-Import\" 以下に保存しま"
+"す。</p><p>このフィルタはメッセージのステータス (新規、転送済みなど) も再現し"
+"ます。"
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Bat! のメールとフォルダ構造をインポート"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p>Bat! インポートフィルタ</p><p>インポートする 'The Bat!' ローカルメールフォ"
+"ルダのベースディレクトリを選択してください。</p><p>注意: このフィルタは 'The "
+"Bat!' ローカルフォルダ から *.tbb ファイルをインポートします。つまり、IMAP/"
+"DIMAP アカウントからではなく POP アカウントからインポートします。</p><p>フォ"
+"ルダ構造の再現が可能なので、フォルダはローカルアカウントの \"TheBat-Import\" "
+"以下に保存します。</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Thunderbird/Mozilla のローカルメールとフォルダ構造をインポート"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p>Thunderbird/Mozilla インポートフィルタ</p><p>Thinderbird/Mozilla のベース"
+"メールフォルダを選択してください (通常 ~/.thunderbird/*.default/Mail/Local "
+"Folders/)。</p><p>注意: mbox ファイルを含まないフォルダ (例えば maildir) を選"
+"択しないでください。選択すると、多数の新規フォルダが作成されます。</p><p>フォ"
+"ルダ構造の再現が可能なので、フォルダは  \"Thunderbird-Import\" 以下に保存しま"
+"す。</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<b>致命的:</b> DCOP 通信用に KMail を開始できませんでした。<i>kmail</i> がインストールされているか確認してください。"
+"<b>致命的:</b> DCOP 通信用に KMail を開始できませんでした。<i>kmail</i> がイ"
+"ンストールされているか確認してください。"
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -559,59 +545,56 @@ msgstr "KMail のフォルダ %1 にメッセージを追加できません"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "KMail のフォルダ %1 へのメッセージの追加中にエラー発生"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "プレーンテキストのEメールをインポート"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "From:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>システム上のメールが含まれるディレクトリを選択してください。メールは元のディレクトリ名に PLAIN- "
-"というプレフィックスがいたディレクトリに置かれます。</p> "
-"<p>このフィルタはすべての .msg, .eml および .txt メールをインポートします。</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "To:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "mbox ファイルをインポート (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "現在:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p>mbox インポートフィルタ</p>"
-"<p>このフィルタは mbox ファイルを KMail にインポートします。Ximian Evolution あるいはこの伝統的な UNIX "
-"フォーマットを使用する他のメールプログラムからメールをインポートする場合は、これを使ってください。</p>"
-"<p>注意: メールは元のファイル名に MBOX- というプレフィックスが付いたフォルダにインポートされます。</p> "
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "インポート進行中..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox ファイル (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Bat! のメールとフォルダ構造をインポート"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "合計:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "他のメールや連絡先をインポートするには「前」をクリックしてください。"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p>Bat! インポートフィルタ</p>"
-"<p>インポートする 'The Bat!' ローカルメールフォルダのベースディレクトリを選択してください。</p>"
-"<p>注意: このフィルタは 'The Bat!' ローカルフォルダ から *.tbb ファイルをインポートします。つまり、IMAP/DIMAP "
-"アカウントからではなく POP アカウントからインポートします。</p>"
-"<p>フォルダ構造の再現が可能なので、フォルダはローカルアカウントの \"TheBat-Import\" 以下に保存します。</p>"
+"<qt>KMailCVT - KMail インポートツール へようこそ<br><br>このプログラムは以前"
+"に使用していたメールプログラムから KMail にメールをインポートするお手伝いをし"
+"ます。<br><br><br><br>\n"
+"移行するメールプログラムを選択し「次」をクリックしてください。"
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "インポート中に重複メッセージを削除する(&D)"
diff --git a/tde-i18n-kk/messages/tdepim/kmailcvt.po b/tde-i18n-kk/messages/tdepim/kmailcvt.po
index 274f2b583aa..978e698cefa 100644
--- a/tde-i18n-kk/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-kk/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-04-15 16:53+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh\n"
@@ -15,26 +15,81 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Outlook эл.поштасын импорттау"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Сайран Киккарин"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "sairan@computer.org"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT импорт құралы"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "1-қадам: Сүзгіні таңдау"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "2-қадам: Импорттау..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Импорт ету"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Импорт аяқталды"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Авторы: %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail импорт сүзгілері"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, KMailCVT жасаушылары"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Бастапқы авторы"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Жетілдірушісі және жаңа сүзгілері"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Жаңа интерфейсі мен кодын тазалау"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Import Evolution 1.x поштасы мен қапшықтарын импорттау"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook эл.поштасын импорттау сүзгісі</b></p>"
-"<p>Бұл сүзгі Outlook-тың pst-файлынан эл.поштасын импорттап береді. Бұл "
-"pst-файл қай қапшықта қайда жатқанын іздеп табасыз. Іздеуді Windows 2000 және "
-"кейінгі жүйелерінде <i>C:\\Documents and Settings</i> "
-"деген қапшығынан бастап істеу керек</p>"
-"<p><b>Ескерту:</b> Хаттар \"OUTLOOK-\" деген префикстен кейін алынған "
-"тіркелгінің атын жалғап аталған қапшыққа импортталды.</p>"
+"<p><b>Evolution 1.x поштасын импорттау сүзгісі</b></p><p>Импорттауға "
+"Evolution-ның негізгі пошта каталогын таңдаңыз (әдетте, ол ~/evolution/"
+"local).</p><p>Қапшықтар құрылымы қайталауға келсе, ол \"Evolution-Import\" "
+"деген қапшықта өрбіп құрылады.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -44,27 +99,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Каталогы таңдалмаған."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Файдарды санау..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Хаттарды санау..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Каталогтарды санау..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Қапшықтарды санау..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Жаңа пошта файлдарын импорттау..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -72,6 +106,22 @@ msgstr "Жаңа пошта файлдарын импорттау..."
 msgid "No files found for import."
 msgstr "Импорттайтын файлдар табылмады."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "%1 эл.поштасын импорттау аяқталды"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "%1 ашылмай өткізіп жіберілді"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -87,39 +137,37 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "%n қайталанатын хат импортталған жоқ"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "%1 ашылмай өткізіп жіберілді"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Import Evolution 1.x поштасы мен қапшықтарын импорттау"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Import Evolution 2.x поштасы мен қапшықтарын импорттау"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x поштасын импорттау сүзгісі</b></p>"
-"<p>Импорттауға Evolution-ның негізгі пошта каталогын таңдаңыз (әдетте, ол "
-"~/evolution/local).</p>"
-"<p>Қапшықтар құрылымы қайталауға келсе, ол \"Evolution-Import\" деген қапшықта "
-"өрбіп құрылады.</p>"
+"<p><b>Evolution 2.x поштасын импорттау сүзгісі</b></p><p>Импорттауға "
+"Evolution-ның негізгі пошта каталогын таңдаңыз (әдетте, ол ~/.evolution/mail/"
+"local/).</p><p> Ешқашанда мазмұны mbox-файлдардан <u>емес</u>  (мысалы "
+"maildir пішімдегі) қапшықты таңдамаңыз: өйтсеңіз, нәтижесінде тым көп жаңа "
+"қапшық құрылады.</p><p>Сонымен қапшықтар жүйесі қайталауға келсе, ол "
+"\"Evolution-Import\" деген қапшықта өрбіп құрылады.</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "%1 эл.поштасын импорттау аяқталды"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Пайдаланушысы айнып, импорт тоқталды."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "%1 файлын импорттауы басталды..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -127,66 +175,43 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Pegasus-Mail қапшықтарын импорттау"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Жүйеңіздегі Pegasus-Mail каталогын таңдаңыз (ішінде *.CNM, *.PMM және *.MBX "
-"файлдары жатқан). Жүйелердің көбінде ол C:\\pmail\\mail немесе "
-"C:\\pmail\\mail\\admin деген қапшық</p>"
-"<p><b>Ескерту:</b> Қапшықтар құрылымы қайталауға келсе, ол "
-"\"PegasusMail-Import\" деген қапшықта өрбіп құрылады.</p>"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
+msgstr "KMai поштасы мен қапшықтарын импорттау"
 
-#: filter_pmail.cxx:69
+#: filter_kmail_maildir.cxx:28
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"Қапшықтар құрылымы талдауға келмеді; импортта ішкі қапшықтар құрылымы "
-"қайталанбайды."
+"<p><b>KMail поштасын импорттау сүзгісі</b></p><p>Импорттауға KMail-дің "
+"негізгі пошта каталогын таңдаңыз.</p><p><b>Ескерту:</b> Ешқашанда Сіздің "
+"қолданыстағы жергілікті KMail пошта қапшығыңызды таңдамаңыз (әдетте ол ~/"
+"Mail немесе ~/.trinity/share/apps/kmail/mail ): өйтсеңіз, KMailCVT бітпейтін "
+"тұйықтыққа түседі. </p><p>Бұл сүзгі mbox файлдар жатқан KMail пошта "
+"қапшықтарды импорттай алмайды.</p><p>Сонымен, қапшықтар құрылымы қайталауға "
+"келсе, ол \"KMail-Import\" деген қапшықта өрбіп құрылады.</p>"
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Жаңа пошта файлдарын ('.cnm') импорттау..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Пошта қапшықтарын ('.pmm') импорттау..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "'UNIX' пошта қапшықтарын ('.mbx') импорттау..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "%1 импорт ету"
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+msgid "Import folder %1..."
+msgstr "%1 қапшығын импорттау..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
 #, c-format
-msgid "Message %1"
-msgstr "%1 хаты"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Қапшық құрылымын талдау..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Авторы: %1.</i></p>"
+msgid "Could not import %1"
+msgstr "%1 деген импортталмады"
 
 #: filter_lnotes.cxx:30
 msgid "Import Lotus Notes Emails"
@@ -194,22 +219,21 @@ msgstr "Lotus Notes эл.поштасын импорттау"
 
 #: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 "<p><b>Lotus Notes-тың Structured Text пішімдегі эл.поштасын импорттау "
-"сүзгісі</b></p>"
-"<p>Бұл сүзгі Lotus Notes эл.пошта клиентінен немесе басқа да бағдарламадан "
-"экспортталған Structured Text пішімдегі файлдарды KMail-ге импорттап береді.</p>"
-"<p><b>Ескерту:</b> қапшықтар құрылымы қайталауға келсе, импортталған хаттар "
-"\"LNotes-Import\" деген қапшықтың ішкі қапшытарында сақталады. Әрбір ішкі "
-"қапшықтың атауы хаттар алынған файлдың атауын қайталайды.</p>"
+"сүзгісі</b></p><p>Бұл сүзгі Lotus Notes эл.пошта клиентінен немесе басқа да "
+"бағдарламадан экспортталған Structured Text пішімдегі файлдарды KMail-ге "
+"импорттап береді.</p><p><b>Ескерту:</b> қапшықтар құрылымы қайталауға келсе, "
+"импортталған хаттар \"LNotes-Import\" деген қапшықтың ішкі қапшытарында "
+"сақталады. Әрбір ішкі қапшықтың атауы хаттар алынған файлдың атауын "
+"қайталайды.</p>"
 
 #: filter_lnotes.cxx:55
 msgid "All Files (*)"
@@ -220,232 +244,10 @@ msgstr "Бүкіл файлдар (*)"
 msgid "Importing emails from %1"
 msgstr "%1 дегеннен эл.поштаны импорттау"
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr "KMai поштасы мен қапшықтарын импорттау"
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-"<p><b>KMail поштасын импорттау сүзгісі</b></p>"
-"<p>Импорттауға KMail-дің негізгі пошта каталогын таңдаңыз.</p>"
-"<p><b>Ескерту:</b> Ешқашанда Сіздің қолданыстағы жергілікті KMail пошта "
-"қапшығыңызды таңдамаңыз (әдетте ол ~/Mail немесе "
-"~/.trinity/share/apps/kmail/mail ): өйтсеңіз, KMailCVT бітпейтін тұйықтыққа "
-"түседі. </p>"
-"<p>Бұл сүзгі mbox файлдар жатқан KMail пошта қапшықтарды импорттай алмайды.</p>"
-"<p>Сонымен, қапшықтар құрылымы қайталауға келсе, ол \"KMail-Import\" деген "
-"қапшықта өрбіп құрылады.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Пайдаланушысы айнып, импорт тоқталды."
-
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-msgid "Import folder %1..."
-msgstr "%1 қапшығын импорттау..."
-
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
-msgid "Could not import %1"
-msgstr "%1 деген импортталмады"
-
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Thunderbird/Mozilla поштасы мен қапшықтарын импорттау"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird/Mozilla клиентінен импорттау сүзгісі</b></p>"
-"<p>Импорттауға Thunderbird/Mozilla-ның негізгі пошта қапшығын таңдаңыз (әдетте, "
-"ол  ~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Ескерту:</b> Ешқашанда мазмұны mbox-файлдардан <u>емес</u>  "
-"(мысалы maildir пішімдегі) қапшықты таңдамаңыз: өйтсеңіз, нәтижесінде тым көп "
-"жаңа қапшық құрылады.</p>"
-"<p>Сонымен, қапшықтар құрылымы қайталауға келсе, ол \"Thunderbird-Import\" "
-"деген қапшықта өрбіп құрылады.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "%1 файлын импорттауы басталды..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Opera эл.поштасын импорттау"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera эл.поштасын импорттау сүзгісі</b></p>"
-"<p>Сүзгі Opera пошта қапшығынан импорт етеді. Бір тіркелгінің барлық Opera "
-"поштасын импорттауға қолданыңыз.</p>"
-"<p>Тіркелгінің каталогын таңдаңыз(әдетте, ол ~/.opera/mail/store/account*).</p>"
-"<p><b>Ескерту:</b> Хаттар \"OPERA-\" деген префикстен кейін алынған тіркелгінің "
-"атын жалғап аталған қапшыққа импортталды.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Import Evolution 2.x поштасы мен қапшықтарын импорттау"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x поштасын импорттау сүзгісі</b></p>"
-"<p>Импорттауға Evolution-ның негізгі пошта каталогын таңдаңыз (әдетте, ол "
-"~/.evolution/mail/local/).</p>"
-"<p> Ешқашанда мазмұны mbox-файлдардан <u>емес</u>  (мысалы maildir пішімдегі) "
-"қапшықты таңдамаңыз: өйтсеңіз, нәтижесінде тым көп жаңа қапшық құрылады.</p>"
-"<p>Сонымен қапшықтар жүйесі қайталауға келсе, ол \"Evolution-Import\" деген "
-"қапшықта өрбіп құрылады.</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Басы:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Аяғы:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Назардағысы:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Импорт ету..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Жалпы:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Басқа эл.пошта не контакттарды импорттау үшін 'Шегіну' дегенді басыңыз "
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>KMailCVT - KMail импорт құралы: қош келдіңіз</b>\n"
-"<br>"
-"<br>\n"
-"Бұл бағдарлама Сіз бұрын қолданған эл.пошта бағдарламадан эл.поштаңызды "
-"KMail-ге импорттап береді."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Қай бағдарламадан импорттауын қалайтыныңызды таңдап, 'Келесі' дегенді басыңыз."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Қай&таланатын хаттар импортталмасын"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail импорт сүзгілері"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, KMailCVT жасаушылары"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Бастапқы авторы"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Жетілдірушісі және жаңа сүзгілері"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Жаңа интерфейсі мен кодын тазалау"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Сайран Киккарин"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "sairan@computer.org"
+msgid "Message %1"
+msgstr "%1 хаты"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -453,11 +255,11 @@ msgstr "OS X Mail пошта клиентінен импорттау"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X Mail клиентінен импорттау сүзгісі</b></p>"
-"<p>Бұл Apple Mac OS X Mail клиентінен импорттау сүзгісі.</p>"
+"<p><b>OS X Mail клиентінен импорттау сүзгісі</b></p><p>Бұл Apple Mac OS X "
+"Mail клиентінен импорттау сүзгісі.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -465,25 +267,27 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n қайталанатын хат KMail-дің %1 қапшығына импортталған жоқ"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT импорт құралы"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "1-қадам: Сүзгіні таңдау"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "2-қадам: Импорттау..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Mbox файлдарын (UNIX, Evolution) импорттау"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Импорт ету"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox-ты импорттау сүзгісі</b></p><p>Бұл mbox файлдарды KMail-ге импорт "
+"ететін сүзгі. Бұны Ximian Evolution немесе басқа да UNIX-тің дәстүрлі "
+"пішімін пайдаланатын пошта бағдарламасының импорт етуге қолданыңыз.</"
+"p><p><b>Ескерту:</b></b> Хаттар \"MBOX-\" деген префикстен кейін алынған "
+"файлдың атын жалғап аталған қапшыққа импортталды.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Импорт аяқталды"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox файлдары (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -491,25 +295,21 @@ msgstr "Outlook Express эл.поштасын импорттау"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 импорттау сүзгісі</b></p>"
-"<p>Пошта жәшігі қай қапшықта орналасқанын .dbx не .mbx файлдары қайда жатқанын "
-"іздеп табасыз. Іздеуді"
-"<ul>"
-"<li>Windows 9x жүйесінде <i>C:\\Windows\\Application Data</i> "
-"<li>Windows 2000 және кейінгі жүйесінде <i>Documents and Settings</i></ul></p>"
-"қапшығынан істеу керек."
-"<p><b>Ескерту:</b> Сонымен, қапшықтар құрылымы қайталауға келсе, Outlook "
-"Express 5 пен 6-ның қапшықтары \"OE-Import\" деген қапшықта сақталады.</p>"
+"<p><b>Outlook Express 4/5/6 импорттау сүзгісі</b></p><p>Пошта жәшігі қай "
+"қапшықта орналасқанын .dbx не .mbx файлдары қайда жатқанын іздеп табасыз. "
+"Іздеуді<ul><li>Windows 9x жүйесінде <i>C:\\Windows\\Application Data</i> "
+"<li>Windows 2000 және кейінгі жүйесінде <i>Documents and Settings</i></ul></"
+"p>қапшығынан істеу керек.<p><b>Ескерту:</b> Сонымен, қапшықтар құрылымы "
+"қайталауға келсе, Outlook Express 5 пен 6-ның қапшықтары \"OE-Import\" деген "
+"қапшықта сақталады.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -544,46 +344,65 @@ msgstr "OE5+ %1 пошта жәшігін импорттау"
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ %1 қапшық файлын импорттау"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "Sylpheed поштасы мен қапшықтарын импорттау"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Opera эл.поштасын импорттау"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
-"<p><b>Sylpheed поштасын импорттау сүзгісі</b></p>"
-"<p>Импорттауға Sylpheed-тің негізгі пошта каталогын таңдаңыз (әдетте, ол ~/Mail "
-").</p>"
-"<p>Қапшықтар құрылымы қайталауға келсе, ол \"Sylpheed-Import\" деген қапшықта "
-"өрбіп құрылады.</p>"
-"<p>Сонымен қатар бұл сүзгі хаттың күй-жайын да қайталап береді, мысалы, жаңа не "
-"басқаға жіберілген деп."
+"<p><b>Opera эл.поштасын импорттау сүзгісі</b></p><p>Сүзгі Opera пошта "
+"қапшығынан импорт етеді. Бір тіркелгінің барлық Opera поштасын импорттауға "
+"қолданыңыз.</p><p>Тіркелгінің каталогын таңдаңыз(әдетте, ол ~/.opera/mail/"
+"store/account*).</p><p><b>Ескерту:</b> Хаттар \"OPERA-\" деген префикстен "
+"кейін алынған тіркелгінің атын жалғап аталған қапшыққа импортталды.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Файдарды санау..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Жаңа пошта файлдарын импорттау..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Outlook эл.поштасын импорттау"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>Түзелмейтін қате:</b> KMail клиенті DCOP арқылы байланыс құруға жегілмеді. "
-"<i>Kmail</i> орнатылғанын тексеріңіз."
+"<p><b>Outlook эл.поштасын импорттау сүзгісі</b></p><p>Бұл сүзгі Outlook-тың "
+"pst-файлынан эл.поштасын импорттап береді. Бұл pst-файл қай қапшықта қайда "
+"жатқанын іздеп табасыз. Іздеуді Windows 2000 және кейінгі жүйелерінде <i>C:"
+"\\Documents and Settings</i> деген қапшығынан бастап істеу керек</"
+"p><p><b>Ескерту:</b> Хаттар \"OUTLOOK-\" деген префикстен кейін алынған "
+"тіркелгінің атын жалғап аталған қапшыққа импортталды.</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "KMail-де %1 қапшығы құрылмады"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Хаттарды санау..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "KMail-дің %1 қапшығына хат қосылмады"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Каталогтарды санау..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "KMail-дің %1 қапшығына хатты қосқанда қате орын алды"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Қапшықтарды санау..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -592,38 +411,79 @@ msgstr "Жай мәтінді эл.поштасын импорттау"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 "<p>Эл.пошта файлдары жатқан каталогты таңдаңыз. Хаттар \"PLAIN-\" деген "
 "префикстен кейін алынған каталогының атын жалғап аталған қапшықтарға "
-"орналастырылады.</p>"
-"<p>Бұл сүзгі барлық .msg, .eml және .txt файлдардағы эл.поштаны импорттайды.</p>"
+"орналастырылады.</p><p>Бұл сүзгі барлық .msg, .eml және .txt файлдардағы эл."
+"поштаны импорттайды.</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Mbox файлдарын (UNIX, Evolution) импорттау"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Pegasus-Mail қапшықтарын импорттау"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>mbox-ты импорттау сүзгісі</b></p>"
-"<p>Бұл mbox файлдарды KMail-ге импорт ететін сүзгі. Бұны Ximian Evolution "
-"немесе басқа да UNIX-тің дәстүрлі пішімін пайдаланатын пошта бағдарламасының "
-"импорт етуге қолданыңыз.</p>"
-"<p><b>Ескерту:</b></b> Хаттар \"MBOX-\" деген префикстен кейін алынған файлдың "
-"атын жалғап аталған қапшыққа импортталды.</p>"
+"<p>Жүйеңіздегі Pegasus-Mail каталогын таңдаңыз (ішінде *.CNM, *.PMM және *."
+"MBX файлдары жатқан). Жүйелердің көбінде ол C:\\pmail\\mail немесе C:\\pmail"
+"\\mail\\admin деген қапшық</p><p><b>Ескерту:</b> Қапшықтар құрылымы "
+"қайталауға келсе, ол \"PegasusMail-Import\" деген қапшықта өрбіп құрылады.</"
+"p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox файлдары (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Қапшықтар құрылымы талдауға келмеді; импортта ішкі қапшықтар құрылымы "
+"қайталанбайды."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Жаңа пошта файлдарын ('.cnm') импорттау..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Пошта қапшықтарын ('.pmm') импорттау..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "'UNIX' пошта қапшықтарын ('.mbx') импорттау..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "%1 импорт ету"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Қапшық құрылымын талдау..."
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "Sylpheed поштасы мен қапшықтарын импорттау"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Sylpheed поштасын импорттау сүзгісі</b></p><p>Импорттауға Sylpheed-тің "
+"негізгі пошта каталогын таңдаңыз (әдетте, ол ~/Mail ).</p><p>Қапшықтар "
+"құрылымы қайталауға келсе, ол \"Sylpheed-Import\" деген қапшықта өрбіп "
+"құрылады.</p><p>Сонымен қатар бұл сүзгі хаттың күй-жайын да қайталап береді, "
+"мысалы, жаңа не басқаға жіберілген деп."
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -631,17 +491,113 @@ msgstr "Bat! поштасы мен қапшықтарын импорттау"
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Bat! эл.поштасын импорттау сүзгісі</b></p><p>Импорттауға 'The Bat!'-"
+"тың негізгі пошта каталогын таңдаңыз.</p><p><b>Ескерту:</b> Бұл сүзгі 'The "
+"Bat!'-тың жергілікті қапшығындағы *.tbb-файлдарынан (POP поштасын, IMAP/"
+"DIMAP поштасын тимей) импорттайды.</p><p>Қапшықтар құрылымы қайталауға "
+"келсе, ол \"TheBat-Import\" деген қапшықта өрбіп құрылады.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Thunderbird/Mozilla поштасы мен қапшықтарын импорттау"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Thunderbird/Mozilla клиентінен импорттау сүзгісі</b></p><p>Импорттауға "
+"Thunderbird/Mozilla-ның негізгі пошта қапшығын таңдаңыз (әдетте, ол  ~/."
+"thunderbird/*.default/Mail/Local Folders/).</p><p><b>Ескерту:</b> Ешқашанда "
+"мазмұны mbox-файлдардан <u>емес</u>  (мысалы maildir пішімдегі) қапшықты "
+"таңдамаңыз: өйтсеңіз, нәтижесінде тым көп жаңа қапшық құрылады.</"
+"p><p>Сонымен, қапшықтар құрылымы қайталауға келсе, ол \"Thunderbird-Import\" "
+"деген қапшықта өрбіп құрылады.</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b>Түзелмейтін қате:</b> KMail клиенті DCOP арқылы байланыс құруға "
+"жегілмеді. <i>Kmail</i> орнатылғанын тексеріңіз."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "KMail-де %1 қапшығы құрылмады"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "KMail-дің %1 қапшығына хат қосылмады"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "KMail-дің %1 қапшығына хатты қосқанда қате орын алды"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Басы:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Аяғы:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Назардағысы:"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Импорт ету..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Жалпы:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Басқа эл.пошта не контакттарды импорттау үшін 'Шегіну' дегенді басыңыз "
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Bat! эл.поштасын импорттау сүзгісі</b></p>"
-"<p>Импорттауға 'The Bat!'-тың негізгі пошта каталогын таңдаңыз.</p>"
-"<p><b>Ескерту:</b> Бұл сүзгі 'The Bat!'-тың жергілікті қапшығындағы "
-"*.tbb-файлдарынан (POP поштасын, IMAP/DIMAP поштасын тимей) импорттайды.</p>"
-"<p>Қапшықтар құрылымы қайталауға келсе, ол \"TheBat-Import\" деген қапшықта "
-"өрбіп құрылады.</p>"
+"<b>KMailCVT - KMail импорт құралы: қош келдіңіз</b>\n"
+"<br><br>\n"
+"Бұл бағдарлама Сіз бұрын қолданған эл.пошта бағдарламадан эл.поштаңызды "
+"KMail-ге импорттап береді.<br><br><br><br>\n"
+" Қай бағдарламадан импорттауын қалайтыныңызды таңдап, 'Келесі' дегенді "
+"басыңыз."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Қай&таланатын хаттар импортталмасын"
diff --git a/tde-i18n-km/messages/tdepim/kmailcvt.po b/tde-i18n-km/messages/tdepim/kmailcvt.po
index f218503a68c..c5d7a5981f1 100644
--- a/tde-i18n-km/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-km/messages/tdepim/kmailcvt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2008-07-14 16:41+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <en@li.org>\n"
@@ -16,26 +16,82 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "នាំចូល​អ៊ីមែល​​របស់ Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "ខឹម សុខែម, លី សួស្ដី, អេង វណ្ណៈ, អោក ពិសិដ្ឋ"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+"khoemsokhem@khmeros.info,soursdey@khmeros.info, evannak@khmeros.info,"
+"piseth_dv@khmeros.info"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "ឧបករណ៍​នាំចូល KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "ជំហាន​ទី​ ១​ ៖ ជ្រើស​តម្រង​"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "ជំហាន​ទី ២ ៖ កំពុង​នាំចូល​..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "នាំចូល​ក្នុង​ដំណើរការ"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "ការ​នាំចូល​បាន​បញ្ចប់​"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>បាន​សរសេរ​ដោយ​ %1 ។</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "តម្រង​នាំចូល​របស់ KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "រក្សា​សិទ្ធិ​ឆ្នាំ ២000-២00៥ ដោយ​​អ្នក​អភិវឌ្ឍន៍ KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "អ្នក​និពន្ធ​ដើម​"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "អ្នក​ថែទាំ​ និង​តម្រង​ថ្មី​"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "GUI ថ្មី​ និង​ការ​បោស​សំអាត"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "នាំចូល​សំបុត្រ​មូលដ្ឋាន​របស់ Evolution 1.x ​និង​រចនាសម្ព័ន្ធ​ថត"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>តម្រង​នាំចូល​អ៊ីមែល​របស់ Outlook</b></p>"
-"<p>តម្រង​នេះ​នឹង​នាំចូល​សំបុត្រ​ពី​ឯកសារ Outlook pst ។ "
-"អ្ន​នឹង​ត្រូវ​កំណត់​ទីតាំង​ថត​ដែល​ឯកសារpst ត្រូវ​បាន​ទុក​ ដោយ​ស្វែងរក​ឯកសារ "
-".pst ក្រោម ៖ <i>C:\\Documents and Settings</i> នៅ​ក្នុង​វ៉ីនដូ ២០០០ "
-"ឬ​ខ្ពស់​ជាង​នេះ</p>"
-"<p><b>ចំណាំ ៖</b> អ៊ីមែល​នឹងត្រូវ​បាន​នាំចូល​ទៅ​ក្នុង​ថត​មួយ​ដែល​មាន​ឈ្មោះ "
-"បន្ទាប់​ពី​គណនី​ដែល​ពួក​វា​បាន​មក ដោយ​បាន​ដាក់បុព្វបទ​ដោយ OUTLOOK-</p>"
+"<p><b>តម្រង​នាំចូល Evolution 1.x​</b></p><p>ជ្រើស​ថត​មូលដ្ឋាន​​នៃ​​សំបុត្រ​​របស់Evolution (តាម​"
+"ធម្មតា ~/evolution/local) ។</p><p>ព្រោះ​ថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត ថត​នឹង​ត្រូវ​"
+"បាន​ទុក​ក្រោម ៖\"Evolution-ការ​នាំចូល\" ។</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -45,27 +101,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "គ្មាន​ថត​បាន​ជ្រើស ។"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "កំពុង​រាប់​ឯកសារ..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "កំពុង​រាប់​សំបុត្រ..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "កំពុង​រាប់​ថត..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "កំពុង​រាប់​ថត..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "កំពុង​នាំចូល​​ឯកសារ​សំបុត្រ​ថ្មី​..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -73,6 +108,22 @@ msgstr "កំពុង​នាំចូល​​ឯកសារ​សំបុ
 msgid "No files found for import."
 msgstr "រក​មិន​ឃើញ​ឯកសារ​​ដើម្បី​នាំចូល ។"
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "​នាំចូល​អ៊ីមែល​ពី %1 បាន​បញ្ចប់"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "មិន​អាច​បើក %1 បាន​ទេ រំលង"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -88,39 +139,36 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "%n សារ​ស្ទួន​មិន​បាន​នាំចូល"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "មិន​អាច​បើក %1 បាន​ទេ រំលង"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "នាំចូល​សំបុត្រ​មូលដ្ឋាន​របស់ Evolution 1.x ​និង​រចនាសម្ព័ន្ធ​ថត"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "នាំចូល​សំបុត្រ​មូលដ្ឋាន​របស់ Evolution 2.x និង​រចនាសម្ព័ន្ធ​ថត"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>តម្រង​នាំចូល Evolution 1.x​</b></p>"
-"<p>ជ្រើស​ថត​មូលដ្ឋាន​​នៃ​​សំបុត្រ​​របស់Evolution (តាម​ធម្មតា "
-"~/evolution/local) ។</p>"
-"<p>ព្រោះ​ថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត "
-"ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖\"Evolution-ការ​នាំចូល\" ។</p>"
+"<p><b>តម្រង​នាំចូល​របស់ Evolution 2.x​</b></p><p>ជ្រើស​ថត​មូលដ្ឋាន​របស់​ថត​សំបុត្រ​ Evolution "
+"មូលដ្ឋាន​របស់​អ្នក (តាម​ធម្មតា ~/.evolution/mail/local/) ។</p><p><b>ចំណាំ ៖</b> កុំ​ជ្រើស​ថត​"
+"ដែល​ <u>មិន</u> មាន​ឯកសារ mbox (ឧទាហរណ៍ maildir) ៖ ប្រសិន​បើ​អ្នក​ធ្វើ​ដូច្នេះ អ្នក​នឹង​ទទួល​បាន​"
+"ថត​ថ្មី​ជា​ច្រើន ។</p><p>ព្រោះថា វា​អាច​បង្កើត​​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត​ ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖ "
+"\"Evolution-កា​រ​នាំចូល\" ។</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "​នាំចូល​អ៊ីមែល​ពី %1 បាន​បញ្ចប់"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "​ការ​នាំចូល​បាន​បញ្ចប់ ដោយ​បាន​បោះបង់​ដោយ​អ្នក​ប្រើ ។"
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "ចាប់​ផ្ដើម​នាំចូល​ឯកសារ %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -128,129 +176,31 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "ថត​នាំចូល​ពី​សំបុត្រ Pegasus"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>ជ្រើស​ថត​សំបុត្រ​របស់ Pegasus នៅ​លើ​ប្រព័ន្ធ​របស់​អ្នក (មាន​ឯកសារ*.CNM, "
-"*.PMM និង *.MBX) ។ នៅ​លើ​ប្រព័ន្ធ​ជា​ច្រើន វា​ត្រូវ​បាន​ទុក​ក្នុង "
-"C:\\pmail\\mail ឬC:\\pmail\\mail\\admin</p>"
-"<p><b>ចំណាំ ៖</b> ព្រោះ​ថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត "
-"ថត​នឹង​ត្រូវ​បានទុក​ក្រោម ៖\"PegasusMail-ការ​នាំចូល\" ។</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr "មិន​អាច​ញែក​រចនាសម្ព័ន្ធ​ថត បន្ត​នាំចូល​ដោយ​គ្មាន​ការ​គាំទ្រ​ថត​រង ។"
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "កំពុង​នាំចូល​ឯកសារ​សំបុត្រ​ថ្មី ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "កំពុង​នាំចូល​ថត​សំបុត្រ​ ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "កំពុង​នាំចូល​​ថត​សំបុត្រ​របស់ 'យូនីក' ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "កំពុង​នាំចូល​ %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "សារ %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "កំពុង​ញែក​រចនាសម្ព័ន្ធ​ថត​..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>បាន​សរសេរ​ដោយ​ %1 ។</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "នាំចូល​អ៊ីមែល​របស់ Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>តម្រង​នាំចូល​សំបុត្រ​អត្ថបទ​ដែល​មាន​រចនាសម្ព័ន្ធ​របស់ Lotus Notes</b></p>"
-"<p>តម្រង​នេះ​នឹង​នាំចូល​ឯកសារ​អត្ថបទ​ដែល​មាន​រចនាសម្ព័ន្ធ​ពី​កម្មវិធី​អ៊ីមែល​របស"
-"់ Lotus Notes ទៅ​ក្នុង​ KMail ។ ប្រើ​តម្រង​នេះ "
-"ប្រសិន​បើ​អ្នក​ចង់​នាំចូល​សំបុត្រ​ពី Lotus ឬ កម្មវិធី​អ៊ីមែល​ផ្សេង​ទៀត "
-"ដែល​ប្រើ​ទ្រង់ទ្រាយ​អត្ថបទ​ដែល​មាន​រចនាសម្ព័ន្ធរបស់​ Lotus Notes ។</p>"
-"<p><b>ចំណាំ ៖</b> ព្រោះថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត "
-"សារ​ដែល​បាន​នាំចូល​​នឹង​ត្រូវ​បាន​ទុក​ក្នុង​ថត​រង​​ក្រោម ៖ "
-"\"LNotes-ការ​នាំចូល\" "
-"នៅ​ក្នុង​ថត​មូលដ្ឋាន​របស់​ដែល​មាន​ឈ្មោះ​របស់​ឯកសារ​ដែល​សារ​បាន​មក ។</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "ឯកសារ​ទាំង​អស់ (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "កំពុង​នាំចូល​អ៊ីមែល​ពី %1"
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "នាំចូល KMail Maildirs និង​រចនាម្ព័ន្ធ​ថត"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>តម្រង​នាំចូល KMail​</b></p>"
-"<p>ជ្រើស​ថត​មូលដ្ឋាន​នៃ​ថត​សំបុត្រ​របស់ KMail ដែល​អ្នក​ចង់​នាំចូល ។</p>"
-"<p><b>ចំណាំ ៖</b> កុំ​ជ្រើស​ KMail maildir មូលដ្ឋាន​បច្ចុប្បន្ន​របស់​អ្នក "
-"(តាម​ធម្មតា ~/Mail ឬ ~/.trinity/share/apps/kmail/mail ) ៖ ក្នុង​ករណីនេះ "
-"KMailCVT អាច​​គាំង​​នៅ​ក្នុង​រង្វិល​ជុំ​បន្ត ។ </p>"
-"<p>តម្រង​នេះ​មិន​នាំចូល​ថត​សំបុត្រ​រប​ស់ KMail ​ជា​មួយ​ឯកសារ mbox ។</p>"
-"<p>ព្រោះ​ថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ម្ដង​ទៀត ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖ "
-"\"KMail-Import\" នៅ​ក្នុង​ថត​មូលដ្ឋាន​របស់​អ្នក ។</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "​ការ​នាំចូល​បាន​បញ្ចប់ ដោយ​បាន​បោះបង់​ដោយ​អ្នក​ប្រើ ។"
+"<p><b>តម្រង​នាំចូល KMail​</b></p><p>ជ្រើស​ថត​មូលដ្ឋាន​នៃ​ថត​សំបុត្រ​របស់ KMail ដែល​អ្នក​ចង់​នាំចូល ។</"
+"p><p><b>ចំណាំ ៖</b> កុំ​ជ្រើស​ KMail maildir មូលដ្ឋាន​បច្ចុប្បន្ន​របស់​អ្នក (តាម​ធម្មតា ~/Mail ឬ "
+"~/.trinity/share/apps/kmail/mail ) ៖ ក្នុង​ករណីនេះ KMailCVT អាច​​គាំង​​នៅ​ក្នុង​រង្វិល​ជុំ​"
+"បន្ត ។ </p><p>តម្រង​នេះ​មិន​នាំចូល​ថត​សំបុត្រ​រប​ស់ KMail ​ជា​មួយ​ឯកសារ mbox ។</p><p>ព្រោះ​ថា វា​អាច​"
+"បង្កើត​រចនាសម្ព័ន្ធ​ម្ដង​ទៀត ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖ \"KMail-Import\" នៅ​ក្នុង​ថត​មូលដ្ឋាន​របស់​"
+"អ្នក ។</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -263,192 +213,40 @@ msgstr "នាំចូល​ថត %1..."
 msgid "Could not import %1"
 msgstr "មិន​អាច​នាំចូល %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-"នាំចូល​សំបុត្រ​មូលដ្ឋាន និង​រចនាសម្ព័ន្ធ​ថត​​របស់​​​ Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>តម្រង​នាំចូល Thunderbird/Mozilla</b></p>"
-"<p>ជ្រើស​ថត​សំបុត្រ​មូលដ្ឋាន​របស់ Thunderbird/Mozilla "
-"(តាម​ធម្មតា~/.thunderbird/*.default/Mail/Local Folders/) ។</p>"
-"<p><b>ចំណាំ ៖</b> កុំ​ជ្រើស​ថត​ដែល​ <u>មិន​</u> មាន​ឯកសារ mbox (ឧទាហរណ៍ "
-"maildir) ៖ ប្រសិន​បើ​អ្នក​ធ្វើ​ដូច្នេះ អ្នក​នឹង​ទទួល​បាន​ថត​ថ្មី​ជា​ច្រើន ។</p>"
-"<p>ព្រោះថា​ វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដ​ង​ទៀត "
-"ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖ \"Thunderbird-ការ​នាំចូល\" ។</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "ចាប់​ផ្ដើម​នាំចូល​ឯកសារ %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "នាំចូល​អ៊ីមែល​របស់​ Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>តម្រង​នាំចូល​អ៊ីមែល​របស់ Opera</b></p>"
-"<p>តម្រង​នេះ​នឹង​នាំចូល​សំបុត្រ​ពី​ថត​សំបុត្រ​របស់ Opera ។ ប្រើ​តម្រង​នេះ "
-"ប្រសិន​បើ​អ្ន​ក​ចង់​នាំចូល​សំបុត្រ​ទាំង​អស់​ក្នុង​គណនី​នៅ​ក្នុង Opera "
-"maildir ។</p>"
-"<p>ជ្រើស​ថត​នៃ​គណនី (តាម​ធម្មតា ~/.opera/mail/store/account*) ។</p>"
-"<p><b>ចំណាំ ៖</b> "
-"អ៊ីមែល​នឹង​ត្រូវ​បាន​នាំចូល​ទៅ​ក្នុង​ថត​ដែល​មាន​ឈ្មោះ​បន្ទាប់​ពី​គណនី​ដែល​ពួក​វា"
-"​មាន ដោយ​បាន​ដាក់បុព្វ​បទ​ដោយ OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "នាំចូល​សំបុត្រ​មូលដ្ឋាន​របស់ Evolution 2.x និង​រចនាសម្ព័ន្ធ​ថត"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>តម្រង​នាំចូល​របស់ Evolution 2.x​</b></p>"
-"<p>ជ្រើស​ថត​មូលដ្ឋាន​របស់​ថត​សំបុត្រ​ Evolution មូលដ្ឋាន​របស់​អ្នក (តាម​ធម្មតា "
-"~/.evolution/mail/local/) ។</p>"
-"<p><b>ចំណាំ ៖</b> កុំ​ជ្រើស​ថត​ដែល​ <u>មិន</u> មាន​ឯកសារ mbox (ឧទាហរណ៍ "
-"maildir) ៖ ប្រសិន​បើ​អ្នក​ធ្វើ​ដូច្នេះ អ្នក​នឹង​ទទួល​បាន​ថត​ថ្មី​ជា​ច្រើន ។</p>"
-"<p>ព្រោះថា វា​អាច​បង្កើត​​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត​ "
-"ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖ \"Evolution-កា​រ​នាំចូល\" ។</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "ពី ៖"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "ទៅ ៖​"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "បច្ចុប្បន្ន​ ៖"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "ការ​នាំចូល​កំពុង​ដំណើរការ..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "សរុប ៖"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "ចុច​ 'ថយ​ក្រោយ​' ដើម្បី​នាំចូល​អ៊ីមែល ឬ ទំនាក់ទំនង​​ផ្សេងៗ​ទៀត​"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "នាំចូល​អ៊ីមែល​របស់ Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>សូម​ស្វាគមន៍​មក​កាន់ KMailCVT - ឧបករណ៍​នាំចូល​របស់ KMail</b>\n"
-"<br>"
-"<br>\n"
-"កម្មវិធី​នេះ​នឹង​ជួយ​អ្នក​ឲ្យ​នាំចូល​អ៊ីមែល​របស់​អ្នក​ពី​កម្មវិធី​​អ៊ីមែល​មុន​រប"
-"ស់​អ្ន​កទៅ​ក្នុង​កម្មវិធី KMail ។"
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" សូម​ជ្រើស​កម្មវិធី​ដែល​អ្នក​ចង់​នាំចូល បន្ទាប់​មក​ចុច 'បន្ទាប់' ។"
+"<p><b>តម្រង​នាំចូល​សំបុត្រ​អត្ថបទ​ដែល​មាន​រចនាសម្ព័ន្ធ​របស់ Lotus Notes</b></p><p>តម្រង​នេះ​នឹង​នាំចូល​"
+"ឯកសារ​អត្ថបទ​ដែល​មាន​រចនាសម្ព័ន្ធ​ពី​កម្មវិធី​អ៊ីមែល​របស់ Lotus Notes ទៅ​ក្នុង​ KMail ។ ប្រើ​តម្រង​នេះ "
+"ប្រសិន​បើ​អ្នក​ចង់​នាំចូល​សំបុត្រ​ពី Lotus ឬ កម្មវិធី​អ៊ីមែល​ផ្សេង​ទៀត ដែល​ប្រើ​ទ្រង់ទ្រាយ​អត្ថបទ​ដែល​មាន​"
+"រចនាសម្ព័ន្ធរបស់​ Lotus Notes ។</p><p><b>ចំណាំ ៖</b> ព្រោះថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដង​"
+"ទៀត សារ​ដែល​បាន​នាំចូល​​នឹង​ត្រូវ​បាន​ទុក​ក្នុង​ថត​រង​​ក្រោម ៖ \"LNotes-ការ​នាំចូល\" នៅ​ក្នុង​ថត​មូលដ្ឋាន​របស់​"
+"ដែល​មាន​ឈ្មោះ​របស់​ឯកសារ​ដែល​សារ​បាន​មក ។</p>"
 
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "យក​សារ​ស្ទួន​ចេញ​​កំឡុង​ពេល​នាំចូល"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "តម្រង​នាំចូល​របស់ KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "រក្សា​សិទ្ធិ​ឆ្នាំ ២000-២00៥ ដោយ​​អ្នក​អភិវឌ្ឍន៍ KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "អ្នក​និពន្ធ​ដើម​"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "អ្នក​ថែទាំ​ និង​តម្រង​ថ្មី​"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "GUI ថ្មី​ និង​ការ​បោស​សំអាត"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "ឯកសារ​ទាំង​អស់ (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "ខឹម សុខែម, លី សួស្ដី, អេង វណ្ណៈ, អោក ពិសិដ្ឋ"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "កំពុង​នាំចូល​អ៊ីមែល​ពី %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"khoemsokhem@khmeros.info,soursdey@khmeros.info, "
-"evannak@khmeros.info,piseth_dv@khmeros.info"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "សារ %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -456,11 +254,11 @@ msgstr "នាំចូល​ពី​សំបុត្រ​របស់ OS X"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>តម្រង​នាំចូល​សំបុត្រ​របស់ OS​</b></p>"
-"<p>តម្រង​នេះ​នាំចូល​អ៊ីមែល​ពី​កម្មវិធី​អ៊ីមែល​ក្នុង Apple Mac OS X ។</p>"
+"<p><b>តម្រង​នាំចូល​សំបុត្រ​របស់ OS​</b></p><p>តម្រង​នេះ​នាំចូល​អ៊ីមែល​ពី​កម្មវិធី​អ៊ីមែល​ក្នុង Apple Mac OS "
+"X ។</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -468,25 +266,26 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n សារ​ស្ទួន​មិន​បាន​នាំចូល​ទៅ​ថត %1 នៅ​ក្នុង KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "ឧបករណ៍​នាំចូល KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "ជំហាន​ទី​ ១​ ៖ ជ្រើស​តម្រង​"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "ជំហាន​ទី ២ ៖ កំពុង​នាំចូល​..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "នាំចូល​ឯកសារ​ mbox (យូនីក, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "នាំចូល​ក្នុង​ដំណើរការ"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>តម្រង​នាចូល mbox</b></p><p>តម្រង​នេះ​នឹង​នាំចូល​ឯកសារ mbox ទៅ​ក្នុង​ KMail ។ ប្រើ​តម្រង​"
+"នេះ​ ប្រសិន​បើ​អ្នក​ចង់​នាំចូល​សំបុត្រ​ពី​ Ximian Evolution ឬ កម្មវិធី​អ៊ីមែល​​ផ្សេងៗ​ទៀត ដែល​ប្រើ​ទ្រង់ទ្រាយ​"
+"យូនីក​ដើម​នេះ ។</p><p><b>ចំណាំ ៖</b> អ៊ីមែល​នឹង​ត្រូវ​បាន​នាំចូល​ទៅ​ក្នុង​ថត​ដែល​មាន​ឈ្មោះ​បន្ទាប់​ពី​ឯកសារ​"
+"ដែល​ពួក​វា​មាន ដោយ​បាន​ដាក់​បុព្វបទ​ដោយ​ MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "ការ​នាំចូល​បាន​បញ្ចប់​"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "ឯកសារ​ mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -494,25 +293,20 @@ msgstr "នាំចូល​អ៊ីមែល​​របស់ Outlook Expres
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>តម្រង​នាំចូល​របស់ Outlook Express ៤/៥/៦</b></p>"
-"<p>អ្នក​នឹង​ត្រូវ​កំណត់​ទីតាំង​ថត​ដែល​ប្រអប់​សំបុត្រ​ត្រូវ​បាន​ទុក​ "
-"ដោយ​ស្វែងរក​ឯកសារ .dbx ឬ .mbx ក្រោម "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> នៅ​ក្នុង​វ៉ីនដូ9x"
-"<li><i>Documents and Settings</i> នៅ​ក្នុង​វ៉ីនដូ ២០០០ ឬ​ខ្ពស់​ជាង​នេះ</ul></p>"
-"<p><b>ចំណាំ ៖</b> ព្រោះ​ថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត "
-"ថត​ដែល​បាន​មក​ពី Outlook Express ៥ និង ៦ នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖\"OE-Import\" "
-"ក្នុង​ថត​មូលដ្ឋាន​របស់​អ្នក ។</p>"
+"<p><b>តម្រង​នាំចូល​របស់ Outlook Express ៤/៥/៦</b></p><p>អ្នក​នឹង​ត្រូវ​កំណត់​ទីតាំង​ថត​ដែល​ប្រអប់​"
+"សំបុត្រ​ត្រូវ​បាន​ទុក​ ដោយ​ស្វែងរក​ឯកសារ .dbx ឬ .mbx ក្រោម <ul><li><i>C:\\Windows"
+"\\Application Data</i> នៅ​ក្នុង​វ៉ីនដូ9x<li><i>Documents and Settings</i> នៅ​ក្នុង​វ៉ីនដូ "
+"២០០០ ឬ​ខ្ពស់​ជាង​នេះ</ul></p><p><b>ចំណាំ ៖</b> ព្រោះ​ថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត ថត​"
+"ដែល​បាន​មក​ពី Outlook Express ៥ និង ៦ នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖\"OE-Import\" ក្នុង​ថត​មូលដ្ឋាន​របស់​"
+"អ្នក ។</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -547,33 +341,184 @@ msgstr "កំពុង​នាំចូល​ប្រអប់​​សំប
 msgid "Importing OE5+ Folder file %1"
 msgstr "កំពុង​នាំចូល​ថត​​​ឯកសារ​ OE5+ %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "នាំចូល​អ៊ីមែល​របស់​ Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>តម្រង​នាំចូល​អ៊ីមែល​របស់ Opera</b></p><p>តម្រង​នេះ​នឹង​នាំចូល​សំបុត្រ​ពី​ថត​សំបុត្រ​របស់ Opera ។ ប្រើ​"
+"តម្រង​នេះ ប្រសិន​បើ​អ្ន​ក​ចង់​នាំចូល​សំបុត្រ​ទាំង​អស់​ក្នុង​គណនី​នៅ​ក្នុង Opera maildir ។</p><p>ជ្រើស​ថត​នៃ​"
+"គណនី (តាម​ធម្មតា ~/.opera/mail/store/account*) ។</p><p><b>ចំណាំ ៖</b> អ៊ីមែល​នឹង​ត្រូវ​បាន​"
+"នាំចូល​ទៅ​ក្នុង​ថត​ដែល​មាន​ឈ្មោះ​បន្ទាប់​ពី​គណនី​ដែល​ពួក​វា​មាន ដោយ​បាន​ដាក់បុព្វ​បទ​ដោយ OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "កំពុង​រាប់​ឯកសារ..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "កំពុង​នាំចូល​​ឯកសារ​សំបុត្រ​ថ្មី​..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "នាំចូល​អ៊ីមែល​​របស់ Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>តម្រង​នាំចូល​អ៊ីមែល​របស់ Outlook</b></p><p>តម្រង​នេះ​នឹង​នាំចូល​សំបុត្រ​ពី​ឯកសារ Outlook "
+"pst ។ អ្ន​នឹង​ត្រូវ​កំណត់​ទីតាំង​ថត​ដែល​ឯកសារpst ត្រូវ​បាន​ទុក​ ដោយ​ស្វែងរក​ឯកសារ .pst ក្រោម ៖ <i>C:"
+"\\Documents and Settings</i> នៅ​ក្នុង​វ៉ីនដូ ២០០០ ឬ​ខ្ពស់​ជាង​នេះ</p><p><b>ចំណាំ ៖</b> អ៊ីមែល​"
+"នឹងត្រូវ​បាន​នាំចូល​ទៅ​ក្នុង​ថត​មួយ​ដែល​មាន​ឈ្មោះ បន្ទាប់​ពី​គណនី​ដែល​ពួក​វា​បាន​មក ដោយ​បាន​ដាក់បុព្វបទ​ដោយ "
+"OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "កំពុង​រាប់​សំបុត្រ..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "កំពុង​រាប់​ថត..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "កំពុង​រាប់​ថត..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "នាំចូល​អ៊ីមែល​ជា​អត្ថបទ​ធម្មតា​"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>ជ្រើស​ថត​ដែល​មាន​អ៊ីមែល​នៅ​លើ​ប្រព័ន្ធ​របស់​អ្នក ។ អ៊ីមេល​ត្រូវ​បាន​ដាក់​ក្នុង​ថត​មួយ​ ដែល​មាន​ឈ្មោះ​ដូចគ្នា​នឹង​"
+"ឈ្មោះ​ថត​ដែល​ពួក​វា​នៅក្នុង​នោះ ដោយ​បាន​ដាក់​បុព្វបទ​ PLAIN-</p><p>​តម្រង​នេះ​នឹង​នាំចូល​អ៊ីមែល​ .msg, ."
+"eml និង .txt ទាំង​អស់ ។</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "ថត​នាំចូល​ពី​សំបុត្រ Pegasus"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>ជ្រើស​ថត​សំបុត្រ​របស់ Pegasus នៅ​លើ​ប្រព័ន្ធ​របស់​អ្នក (មាន​ឯកសារ*.CNM, *.PMM និង *.MBX) ។ នៅ​"
+"លើ​ប្រព័ន្ធ​ជា​ច្រើន វា​ត្រូវ​បាន​ទុក​ក្នុង C:\\pmail\\mail ឬC:\\pmail\\mail\\admin</"
+"p><p><b>ចំណាំ ៖</b> ព្រោះ​ថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត ថត​នឹង​ត្រូវ​បានទុក​ក្រោម ៖"
+"\"PegasusMail-ការ​នាំចូល\" ។</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr "មិន​អាច​ញែក​រចនាសម្ព័ន្ធ​ថត បន្ត​នាំចូល​ដោយ​គ្មាន​ការ​គាំទ្រ​ថត​រង ។"
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "កំពុង​នាំចូល​ឯកសារ​សំបុត្រ​ថ្មី ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "កំពុង​នាំចូល​ថត​សំបុត្រ​ ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "កំពុង​នាំចូល​​ថត​សំបុត្រ​របស់ 'យូនីក' ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "កំពុង​នាំចូល​ %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "កំពុង​ញែក​រចនាសម្ព័ន្ធ​ថត​..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "នាំចូល Sylpheed Maildirs និង​រចនាសម្ព័ន្ធ​ថត"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 msgstr ""
-"<p><b>តម្រង​នាំចូល Sylpheed​</b></p>"
-"<p>ជ្រើស​ថត​មូលដ្ឋាន​របស់​ថត​សំបុត្រ​របស់ Sylpheed ដែល​អ្នក​ចង់​នាំចូល "
-"(តាម​ធម្មតា ៖~/Mail ) ។</p>"
-"<p>ព្រោះ​ថា​ វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត "
-"ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖\"Sylpheed-ការ​នាំចូល\" នៅ​ក្នុង​ថត​មូលដ្ឋាន ។</p>"
-"<p>តម្រង​នេះ​ក៏​បង្កើត​ស្ថានភាព​របស់​សារ​ម្ដង​ទៀត​ផងដែរ ឧ. ថ្មី ឬ​បញ្ជូន​បន្ត ។"
+"<p><b>តម្រង​នាំចូល Sylpheed​</b></p><p>ជ្រើស​ថត​មូលដ្ឋាន​របស់​ថត​សំបុត្រ​របស់ Sylpheed ដែល​អ្នក​ចង់​"
+"នាំចូល (តាម​ធម្មតា ៖~/Mail ) ។</p><p>ព្រោះ​ថា​ វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត ថត​នឹង​ត្រូវ​"
+"បាន​ទុក​ក្រោម ៖\"Sylpheed-ការ​នាំចូល\" នៅ​ក្នុង​ថត​មូលដ្ឋាន ។</p><p>តម្រង​នេះ​ក៏​បង្កើត​ស្ថានភាព​របស់​"
+"សារ​ម្ដង​ទៀត​ផងដែរ ឧ. ថ្មី ឬ​បញ្ជូន​បន្ត ។"
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "នាំចូល​ Bat ! សំបុត្រ និង​រចនាសម្ព័ន្ធ​ថត"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>តម្រង​នាំចូល​របស់ The Bat!​</b></p><p>ជ្រើស​ថត​មូលដ្ឋាន​របស់ 'The Bat!' ថត​សំបុត្រ​មូលដ្ឋាន​"
+"ដែល​អ្នក​ចង់​នាំចូល ។</p><p><b>ចំណាំ ៖</b> តម្រង​នេះ​នាំចូល​ឯកសារ *.tbb ពី​ថត​មូលដ្ឋាន​របស់ 'The "
+"Bat!' ឧ.ពី​គណនី POP និង​មិន​បាន​មក​ពីគណនី IMAP/DIMAP ។</p><p>ព្រោះថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​"
+"ថត​ម្ដង​ទៀត ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖\"TheBat-ការ​នាំចូល\" នៅ​ក្នុង​គណនី​មូលដ្ឋាន​របស់​អ្នក ។</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "នាំចូល​សំបុត្រ​មូលដ្ឋាន និង​រចនាសម្ព័ន្ធ​ថត​​របស់​​​ Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>តម្រង​នាំចូល Thunderbird/Mozilla</b></p><p>ជ្រើស​ថត​សំបុត្រ​មូលដ្ឋាន​របស់ Thunderbird/"
+"Mozilla (តាម​ធម្មតា~/.thunderbird/*.default/Mail/Local Folders/) ។</"
+"p><p><b>ចំណាំ ៖</b> កុំ​ជ្រើស​ថត​ដែល​ <u>មិន​</u> មាន​ឯកសារ mbox (ឧទាហរណ៍ maildir) ៖ ប្រសិន​"
+"បើ​អ្នក​ធ្វើ​ដូច្នេះ អ្នក​នឹង​ទទួល​បាន​ថត​ថ្មី​ជា​ច្រើន ។</p><p>ព្រោះថា​ វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដ​ង​"
+"ទៀត ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖ \"Thunderbird-ការ​នាំចូល\" ។</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<b>កំហុស​ធ្ងន់ធ្ងរ ៖</b> មិន​អាចចាប់ផ្ដើម KMail សម្រាប់​ទំនាក់ទំនង DCOP ។ "
-"សូម​ប្រាកដ​ថា <i>kmail</i> ត្រូវ​បាន​ដំឡើង ។"
+"<b>កំហុស​ធ្ងន់ធ្ងរ ៖</b> មិន​អាចចាប់ផ្ដើម KMail សម្រាប់​ទំនាក់ទំនង DCOP ។ សូម​ប្រាកដ​ថា "
+"<i>kmail</i> ត្រូវ​បាន​ដំឡើង ។"
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -587,67 +532,57 @@ msgstr "មិន​អាច​បន្ថែម​សារ​ទៅ​ថត
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "កំហុស​ខណៈពេល​បន្ថែម​សារ​ទៅ​ថត %1 ក្នុង KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "នាំចូល​អ៊ីមែល​ជា​អត្ថបទ​ធម្មតា​"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "ពី ៖"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>ជ្រើស​ថត​ដែល​មាន​អ៊ីមែល​នៅ​លើ​ប្រព័ន្ធ​របស់​អ្នក ។ "
-"អ៊ីមេល​ត្រូវ​បាន​ដាក់​ក្នុង​ថត​មួយ​ "
-"ដែល​មាន​ឈ្មោះ​ដូចគ្នា​នឹង​ឈ្មោះ​ថត​ដែល​ពួក​វា​នៅក្នុង​នោះ ដោយ​បាន​ដាក់​បុព្វបទ​ "
-"PLAIN-</p>"
-"<p>​តម្រង​នេះ​នឹង​នាំចូល​អ៊ីមែល​ .msg, .eml និង .txt ទាំង​អស់ ។</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "ទៅ ៖​"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "នាំចូល​ឯកសារ​ mbox (យូនីក, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "បច្ចុប្បន្ន​ ៖"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>តម្រង​នាចូល mbox</b></p>"
-"<p>តម្រង​នេះ​នឹង​នាំចូល​ឯកសារ mbox ទៅ​ក្នុង​ KMail ។ ប្រើ​តម្រង​នេះ​ "
-"ប្រសិន​បើ​អ្នក​ចង់​នាំចូល​សំបុត្រ​ពី​ Ximian Evolution ឬ "
-"កម្មវិធី​អ៊ីមែល​​ផ្សេងៗ​ទៀត ដែល​ប្រើ​ទ្រង់ទ្រាយ​យូនីក​ដើម​នេះ ។</p>"
-"<p><b>ចំណាំ ៖</b> "
-"អ៊ីមែល​នឹង​ត្រូវ​បាន​នាំចូល​ទៅ​ក្នុង​ថត​ដែល​មាន​ឈ្មោះ​បន្ទាប់​ពី​ឯកសារ​ដែល​ពួក​វ"
-"ា​មាន ដោយ​បាន​ដាក់​បុព្វបទ​ដោយ​ MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "ការ​នាំចូល​កំពុង​ដំណើរការ..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "ឯកសារ​ mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "នាំចូល​ Bat ! សំបុត្រ និង​រចនាសម្ព័ន្ធ​ថត"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "សរុប ៖"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "ចុច​ 'ថយ​ក្រោយ​' ដើម្បី​នាំចូល​អ៊ីមែល ឬ ទំនាក់ទំនង​​ផ្សេងៗ​ទៀត​"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>តម្រង​នាំចូល​របស់ The Bat!​</b></p>"
-"<p>ជ្រើស​ថត​មូលដ្ឋាន​របស់ 'The Bat!' "
-"ថត​សំបុត្រ​មូលដ្ឋាន​ដែល​អ្នក​ចង់​នាំចូល ។</p>"
-"<p><b>ចំណាំ ៖</b> តម្រង​នេះ​នាំចូល​ឯកសារ *.tbb ពី​ថត​មូលដ្ឋាន​របស់ 'The Bat!' "
-"ឧ.ពី​គណនី POP និង​មិន​បាន​មក​ពីគណនី IMAP/DIMAP ។</p>"
-"<p>ព្រោះថា វា​អាច​បង្កើត​រចនាសម្ព័ន្ធ​ថត​ម្ដង​ទៀត "
-"ថត​នឹង​ត្រូវ​បាន​ទុក​ក្រោម ៖\"TheBat-ការ​នាំចូល\" "
-"នៅ​ក្នុង​គណនី​មូលដ្ឋាន​របស់​អ្នក ។</p>"
+"<b>សូម​ស្វាគមន៍​មក​កាន់ KMailCVT - ឧបករណ៍​នាំចូល​របស់ KMail</b>\n"
+"<br><br>\n"
+"កម្មវិធី​នេះ​នឹង​ជួយ​អ្នក​ឲ្យ​នាំចូល​អ៊ីមែល​របស់​អ្នក​ពី​កម្មវិធី​​អ៊ីមែល​មុន​របស់​អ្ន​កទៅ​ក្នុង​កម្មវិធី KMail ។"
+"<br><br><br><br>\n"
+" សូម​ជ្រើស​កម្មវិធី​ដែល​អ្នក​ចង់​នាំចូល បន្ទាប់​មក​ចុច 'បន្ទាប់' ។"
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "យក​សារ​ស្ទួន​ចេញ​​កំឡុង​ពេល​នាំចូល"
diff --git a/tde-i18n-ko/messages/tdepim/kmailcvt.po b/tde-i18n-ko/messages/tdepim/kmailcvt.po
index dcb240f5253..9a6ebc4d02e 100644
--- a/tde-i18n-ko/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ko/messages/tdepim/kmailcvt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
 "Report-Msgid-Bugs-To: http://bugs.trinitydesktop.org\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-12-04 19:39+0900\n"
 "Last-Translator: Park Shinjo <peremen@gmail.com>\n"
 "Language-Team: Korean <cho.sungjae@gmail.com>\n"
@@ -17,23 +17,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Outlook 전자우편 가져오기"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Park Shinjo"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "peremen@gmail.com"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT 가져오기 도구"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "단계 1: 필터 선택"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "단계 2: 가져오는 중..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "가져오는 중"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "가져오기 완료"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>%1이 작성함.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail 가져오기 필터"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, KMailCVT 개발자"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "원 저작자"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "관리자 및 새로운 필터"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "새로운 GUI와 청소"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Evolution 1.x 지역 편지함과 폴더 구조 가져오기"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook 가져오기 필터</b></p>"
-"<p>Outlook .pst 파일에서 메시지를 가져옵니다. pst 파일 저장된 폴더를 선택하십시오. 이 폴더는 윈도 2000 이상의 경우 <i>"
-"C:\\Documents and Settings</i> 폴더 아래에 생성됩니다.</p>"
-"<p><b>메모:</b>메시지들은 원본 계정의 이름 앞에 OUTLOOK-이 붙은 이름의 폴더 아래에 저장됩니다.</p>"
+"<p><b>Evolution 1.x 가져오기 필터</b></p><p>가져오고자 하는 기본 Evolution 메"
+"일 폴더를 선택하십시오. 대개 ~/evolution/local입니다.</p><p>폴더 구조를 다시 "
+"생성할 수 있기 때문에 \"Evolution 가져오기\" 폴더 아래에 저장됩니다.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -43,27 +100,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "디렉터리가 선택되지 않았습니다."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "파일 개수 세는 중..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "편지 개수 세는 중..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "디렉터리 세는 중..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "폴더 세는 중..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "새로운 메일 파일 가져오는 중..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -71,6 +107,22 @@ msgstr "새로운 메일 파일 가져오는 중..."
 msgid "No files found for import."
 msgstr "가져올 파일이 없습니다."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "%1에서 메일 가져오기 완료"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "%1을(를) 열 수 없음, 건너뜀"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -86,37 +138,36 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "%n개의 중복된 메시지는 가지고 오지 않았습니다"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "%1을(를) 열 수 없음, 건너뜀"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Evolution 1.x 지역 편지함과 폴더 구조 가져오기"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Evolution 2.x 지역 메일과 폴더 구조 가져오기"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x 가져오기 필터</b></p>"
-"<p>가져오고자 하는 기본 Evolution 메일 폴더를 선택하십시오. 대개 ~/evolution/local입니다.</p>"
-"<p>폴더 구조를 다시 생성할 수 있기 때문에 \"Evolution 가져오기\" 폴더 아래에 저장됩니다.</p>"
+"<p><b>Evolution 2.x 가져오기 필터</b></p><p>기본 Evloution 지역 메일 폴더를 "
+"선택하십시오. 대개 ~/.evolution/mail/local 입니다.</p><p><b>메모:</b> "
+"maildir 같은 .mbox 파일을 <u>포함하지 않는</u> 폴더를 선택하지 마십시오. 만"
+"약 선택했다면 매우 많은 새 폴더가 생성됩니다. </p><p>폴더 구조를 다시 생성할 "
+"수 있기 때문에 \"Evolution 가져오기\" 폴더 아래에 저장됩니다.</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "%1에서 메일 가져오기 완료"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "가져오기가 완료되었습니다. 사용자에 의해 취소되었습니다."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "파일 %1 가져오기 시작..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -124,91 +175,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Pegasus-Mail 폴더 가져오기"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>시스템에 있는 *.CNM, *.PNM 파일이 있는 Pegasus Mail 디렉터리를 선택하십시오. 대부분 시스템에서 이 경로는 "
-"C:\\pmail\\mail이거나 C:\\pmail\\mail\\admin입니다.</p>"
-"<p><b>메모:</b>폴더 구조를 다시 생성할 수 있기 때문에 \"PegasusMail 가져오기\" 폴더 아래에 저장됩니다.</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr "폴더 구조를 읽을 수 없어서 하위 폴더 지원 없이 가져옵니다."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "새로운 편지 파일('.cnm') 가져오는 중..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "편지 폴더('.pmm') 가져오는 중... "
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "유닉스 편지함('.mbx') 가져오는 중..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "%1 가져오는 중"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "메시지 %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "폴더 구조 처리 중..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>%1이 작성함.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Lotus Notes 메시지 가져오기"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Lotus Notes 구조화된 텍스트 메일 가져오기 필터</b></p>"
-"<p>이 필터는 Lotus Notes 메일 클라이언트의 텍스트 파일을 KMail로 가져옵니다. Lotus Notes나 이 형식의 파일을 "
-"사용하는 다른 클라이언트의 메시지를 가져오려면 선택하십시오.</p>"
-"<p><b>메모:</b> 폴더 구조를 다시 생성할 수 있기 때문에 \"LNotus-Import\" 폴더 아래에 저장됩니다.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "모든 파일 (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "%1에서 메시지 가져오는 중"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -216,29 +186,20 @@ msgstr "KMail 편지함과 폴더 구조 가져오기"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>KMail 가져오기 필터</b></p>"
-"<p>기본 KMail 메일 폴더를 선택하십시오.</p>"
-"<p><b>메모:</b> 현재 사용 중인 지역 KMail 메일 폴더를 선택하지 마십시오. 대개 ~/Mail이나 "
-"~/.trinity/share/apps/kmail/mail입니다. 만약 이 폴더를 선택했다면, KMailCVT는 무한 반복에 빠질 수 "
-"있습니다.</p>"
-"<p>이 필터는 mbox 파일을 포함하는 KMail 메일 폴더를 가져올 수 없습니다.</p>"
-"<p>폴더 구조를 다시 생성할 수 있기 때문에 \"KMail 가져오기\" 폴더 아래에 저장됩니다.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "가져오기가 완료되었습니다. 사용자에 의해 취소되었습니다."
+"<p><b>KMail 가져오기 필터</b></p><p>기본 KMail 메일 폴더를 선택하십시오.</"
+"p><p><b>메모:</b> 현재 사용 중인 지역 KMail 메일 폴더를 선택하지 마십시오. 대"
+"개 ~/Mail이나 ~/.trinity/share/apps/kmail/mail입니다. 만약 이 폴더를 선택했다"
+"면, KMailCVT는 무한 반복에 빠질 수 있습니다.</p><p>이 필터는 mbox 파일을 포함"
+"하는 KMail 메일 폴더를 가져올 수 없습니다.</p><p>폴더 구조를 다시 생성할 수 "
+"있기 때문에 \"KMail 가져오기\" 폴더 아래에 저장됩니다.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -251,176 +212,39 @@ msgstr "폴더 %1 가져오기... "
 msgid "Could not import %1"
 msgstr "%1을(를) 가져올 수 없음"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Thunderbird/Mozilla Mail 지역 메시지와 폴더 구조 가져오기"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird/Mozilla 가져오기 필터</b></p>"
-"<p>기본 Thunderbird/Mozilla 메일 폴더를 선택하십시오. 대개 ~/.thunderbird/*.default/Mail/Local "
-"Folders입니다.</p>"
-"<p><b>메모:</b> maildir 같은 .mbox 파일을 <u>포함하지 않는</u> 폴더를 선택하지 마십시오. 만약 선택했다면 매우 많은 "
-"새 폴더가 생성됩니다. </p>"
-"<p>폴더 구조를 다시 생성할 수 있기 때문에 \"Thunderbird 가져오기\" 폴더 아래에 저장됩니다.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "파일 %1 가져오기 시작..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Opera 메일 가져오기"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera 메일 가져오기 필터</b></p>"
-"<p>이 필터는 Opera 메일 폴더에서 메시지를 가져옵니다. Opera 메일 디렉터리의 모든 메시지를 가져오려면 사용하십시오.</p>"
-"<p>계정이 있는 곳의 디렉터리를 선택하십시오. 대개 ~/.opera/mail/store/account*입니다.</p>"
-"<p><b>메모:</b> 메시지들은 원본 계정의 이름에 OPERA-가 들어간 폴더로 모두 가져와집니다.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Evolution 2.x 지역 메일과 폴더 구조 가져오기"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x 가져오기 필터</b></p>"
-"<p>기본 Evloution 지역 메일 폴더를 선택하십시오. 대개 ~/.evolution/mail/local 입니다.</p>"
-"<p><b>메모:</b> maildir 같은 .mbox 파일을 <u>포함하지 않는</u> 폴더를 선택하지 마십시오. 만약 선택했다면 매우 많은 "
-"새 폴더가 생성됩니다. </p>"
-"<p>폴더 구조를 다시 생성할 수 있기 때문에 \"Evolution 가져오기\" 폴더 아래에 저장됩니다.</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "원본:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "대상:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "현재:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "가져오는 중..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "합계:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "'뒤로' 단추를 누르면 더 많은 메시지나 연락처를 가져올 수 있습니다"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Lotus Notes 메시지 가져오기"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>KMailCVT - KMail 가져오기 도구에 오신 것을 환영합니다</b>\n"
-"<br /><br />\n"
-"이 프로그램은 전에 사용했던 메일 프로그램에서 KMail로 메시지를 가져오도록 도와 줍니다.<br /><br /><br /><br />\n"
-" 가져올 프로그램을 선택한 다음 '다음' 단추를 누르십시오."
+"<p><b>Lotus Notes 구조화된 텍스트 메일 가져오기 필터</b></p><p>이 필터는 "
+"Lotus Notes 메일 클라이언트의 텍스트 파일을 KMail로 가져옵니다. Lotus Notes"
+"나 이 형식의 파일을 사용하는 다른 클라이언트의 메시지를 가져오려면 선택하십시"
+"오.</p><p><b>메모:</b> 폴더 구조를 다시 생성할 수 있기 때문에 \"LNotus-Import"
+"\" 폴더 아래에 저장됩니다.</p>"
 
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "가져오는 동안 중복된 메시지 삭제(&D)"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail 가져오기 필터"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, KMailCVT 개발자"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "원 저작자"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "관리자 및 새로운 필터"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "새로운 GUI와 청소"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "모든 파일 (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Park Shinjo"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "%1에서 메시지 가져오는 중"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "peremen@gmail.com"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "메시지 %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -428,11 +252,11 @@ msgstr "OS X 메일에서 가져오기"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X 메일 가져오기 필터</b></p>"
-"<p>이 필터는 애플 Mac OS X의 메일 클라이언트에서 전자 우편을 가져옵니다.</p>"
+"<p><b>OS X 메일 가져오기 필터</b></p><p>이 필터는 애플 Mac OS X의 메일 클라이"
+"언트에서 전자 우편을 가져옵니다.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -440,25 +264,26 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "KMail의 폴더 %1(으)로 중복된 메시지 %n개를 가져오지 않았습니다"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT 가져오기 도구"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "단계 1: 필터 선택"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "단계 2: 가져오는 중..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "mbox 파일 가져오기 (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "가져오는 중"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox 가져오기 필터</b></p><p>이 필터는 mbox 파일을 KMail으로 가져옵니"
+"다. Ximian Evolution이나 전통적인 UNIX 형식을 사용하는 다른 메일 클라인언트에"
+"서 메일을 가져올 경우 선택하십시오.</p><p><b>메모:</b>메시지는 원본 파일의 이"
+"름에 MBOX-가 앞에 붙은 폴더 안에 저장됩니다.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "가져오기 완료"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox 파일 (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -466,23 +291,19 @@ msgstr "Outlook Express 전자 우편 가져오기"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 가져오기 필터</b></p>"
-"<p>.dbx나 .mbx 파일이 있는 메일함이 저장된 폴더를 선택하십시오. 이 폴더는 "
-"<ul>"
-"<li>윈도 9x: <i>C:\\Windows\\Application Data</i></li>윈도 2000 이상: <i>"
-"Documents and Settings</i></li></ul></p>"
-"<p>폴더 구조를 다시 생성할 수 있기 때문에 Outlook Express 5나 6에서 가져온 폴더는 \"OE-Import\" 폴더 아래에 "
-"저장됩니다.</p>"
+"<p><b>Outlook Express 4/5/6 가져오기 필터</b></p><p>.dbx나 .mbx 파일이 있는 "
+"메일함이 저장된 폴더를 선택하십시오. 이 폴더는 <ul><li>윈도 9x: <i>C:"
+"\\Windows\\Application Data</i></li>윈도 2000 이상: <i>Documents and "
+"Settings</i></li></ul></p><p>폴더 구조를 다시 생성할 수 있기 때문에 Outlook "
+"Express 5나 6에서 가져온 폴더는 \"OE-Import\" 폴더 아래에 저장됩니다.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -517,30 +338,187 @@ msgstr "OE5+ 편지함 %1 가져오는 중"
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ 폴더 파일 %1 가져오는 중"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Opera 메일 가져오기"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Opera 메일 가져오기 필터</b></p><p>이 필터는 Opera 메일 폴더에서 메시지"
+"를 가져옵니다. Opera 메일 디렉터리의 모든 메시지를 가져오려면 사용하십시오.</"
+"p><p>계정이 있는 곳의 디렉터리를 선택하십시오. 대개 ~/.opera/mail/store/"
+"account*입니다.</p><p><b>메모:</b> 메시지들은 원본 계정의 이름에 OPERA-가 들"
+"어간 폴더로 모두 가져와집니다.</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "파일 개수 세는 중..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "새로운 메일 파일 가져오는 중..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Outlook 전자우편 가져오기"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Outlook 가져오기 필터</b></p><p>Outlook .pst 파일에서 메시지를 가져옵니"
+"다. pst 파일 저장된 폴더를 선택하십시오. 이 폴더는 윈도 2000 이상의 경우 "
+"<i>C:\\Documents and Settings</i> 폴더 아래에 생성됩니다.</p><p><b>메모:</b>"
+"메시지들은 원본 계정의 이름 앞에 OUTLOOK-이 붙은 이름의 폴더 아래에 저장됩니"
+"다.</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "편지 개수 세는 중..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "디렉터리 세는 중..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "폴더 세는 중..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "일반 텍스트 메일 가져오기"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>시스템의 전자 우편을 포함하는 디렉터리를 선택하십시오. 메시지들은 원본 디"
+"렉토리 이름 앞에 PLAIN-이 붙은 이름의 폴더 아래 저장됩니다.</p><p>이 필터는 ."
+"msg, .eml, .txt 파일을 가져옵니다.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Pegasus-Mail 폴더 가져오기"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>시스템에 있는 *.CNM, *.PNM 파일이 있는 Pegasus Mail 디렉터리를 선택하십시"
+"오. 대부분 시스템에서 이 경로는 C:\\pmail\\mail이거나 C:\\pmail\\mail\\admin"
+"입니다.</p><p><b>메모:</b>폴더 구조를 다시 생성할 수 있기 때문에 "
+"\"PegasusMail 가져오기\" 폴더 아래에 저장됩니다.</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr "폴더 구조를 읽을 수 없어서 하위 폴더 지원 없이 가져옵니다."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "새로운 편지 파일('.cnm') 가져오는 중..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "편지 폴더('.pmm') 가져오는 중... "
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "유닉스 편지함('.mbx') 가져오는 중..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "%1 가져오는 중"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "폴더 구조 처리 중..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Sylpheed 메일 디렉터리와 폴더 구조 가져오기"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Sylpheed 가져오기 필터</b></p><p>가져오고자 하는 기본 Sylpheed 메일 폴"
+"더를 선택하십시오. 대개 ~/.Mail입니다.</p><p>폴더 구조를 다시 생성할 수 있기 "
+"때문에 \"Sylpheed 가져오기\" 폴더 아래에 저장됩니다.</p><p>이 필터는 새로 도"
+"착했거나 전달되었음 같은 메시지 상태도 가져옵니다.</p>"
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "The Bat! 메시지와 폴더 구조 가져오기"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>The Bat! 가져오기 필터</b></p><p>기본 The Bat! 지역 메일 폴더를 선택하"
+"십시오.</p><p><b>메모:</b> 이 필터는 The Bat! 지역 폴더의 *.tbb 파일을 가져옵"
+"니다. POP 계정의 메시지는 가져오나, IMAP/DIMAP 계정의 메시지는 가져 오지 않습"
+"니다.</p><p>폴더 구조를 다시 생성할 수 있기 때문에 \"TheBat-Import\" 폴더 아"
+"래에 저장됩니다.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Thunderbird/Mozilla Mail 지역 메시지와 폴더 구조 가져오기"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Sylpheed 가져오기 필터</b></p>"
-"<p>가져오고자 하는 기본 Sylpheed 메일 폴더를 선택하십시오. 대개 ~/.Mail입니다.</p>"
-"<p>폴더 구조를 다시 생성할 수 있기 때문에 \"Sylpheed 가져오기\" 폴더 아래에 저장됩니다.</p>"
-"<p>이 필터는 새로 도착했거나 전달되었음 같은 메시지 상태도 가져옵니다.</p>"
+"<p><b>Thunderbird/Mozilla 가져오기 필터</b></p><p>기본 Thunderbird/Mozilla 메"
+"일 폴더를 선택하십시오. 대개 ~/.thunderbird/*.default/Mail/Local Folders입니"
+"다.</p><p><b>메모:</b> maildir 같은 .mbox 파일을 <u>포함하지 않는</u> 폴더를 "
+"선택하지 마십시오. 만약 선택했다면 매우 많은 새 폴더가 생성됩니다. </p><p>폴"
+"더 구조를 다시 생성할 수 있기 때문에 \"Thunderbird 가져오기\" 폴더 아래에 저"
+"장됩니다.</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<b>치명적 오류:</b> DCOP 통신을 위해서 KMail을 시작할 수 없습니다.<i>kmail</i>이 설치되어 있는지 확인하십시오."
+"<b>치명적 오류:</b> DCOP 통신을 위해서 KMail을 시작할 수 없습니다.<i>kmail</"
+"i>이 설치되어 있는지 확인하십시오."
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -554,59 +532,57 @@ msgstr "KMail에서 폴더 %1에 메시지를 추가할 수 없습니다"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "KMail에서 폴더 %1에 메시지를 추가하는 중 오류 발생"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "일반 텍스트 메일 가져오기"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "원본:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>시스템의 전자 우편을 포함하는 디렉터리를 선택하십시오. 메시지들은 원본 디렉토리 이름 앞에 PLAIN-이 붙은 이름의 폴더 아래 "
-"저장됩니다.</p>"
-"<p>이 필터는 .msg, .eml, .txt 파일을 가져옵니다.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "대상:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "mbox 파일 가져오기 (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "현재:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>mbox 가져오기 필터</b></p>"
-"<p>이 필터는 mbox 파일을 KMail으로 가져옵니다. Ximian Evolution이나 전통적인 UNIX 형식을 사용하는 다른 메일 "
-"클라인언트에서 메일을 가져올 경우 선택하십시오.</p>"
-"<p><b>메모:</b>메시지는 원본 파일의 이름에 MBOX-가 앞에 붙은 폴더 안에 저장됩니다.</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "가져오는 중..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox 파일 (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "The Bat! 메시지와 폴더 구조 가져오기"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "합계:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "'뒤로' 단추를 누르면 더 많은 메시지나 연락처를 가져올 수 있습니다"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>The Bat! 가져오기 필터</b></p>"
-"<p>기본 The Bat! 지역 메일 폴더를 선택하십시오.</p>"
-"<p><b>메모:</b> 이 필터는 The Bat! 지역 폴더의 *.tbb 파일을 가져옵니다. POP 계정의 메시지는 가져오나, "
-"IMAP/DIMAP 계정의 메시지는 가져 오지 않습니다.</p>"
-"<p>폴더 구조를 다시 생성할 수 있기 때문에 \"TheBat-Import\" 폴더 아래에 저장됩니다.</p>"
+"<b>KMailCVT - KMail 가져오기 도구에 오신 것을 환영합니다</b>\n"
+"<br /><br />\n"
+"이 프로그램은 전에 사용했던 메일 프로그램에서 KMail로 메시지를 가져오도록 도"
+"와 줍니다.<br /><br /><br /><br />\n"
+" 가져올 프로그램을 선택한 다음 '다음' 단추를 누르십시오."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "가져오는 동안 중복된 메시지 삭제(&D)"
diff --git a/tde-i18n-lt/messages/tdepim/kmailcvt.po b/tde-i18n-lt/messages/tdepim/kmailcvt.po
index aa06583c6e5..e5910c3f9e1 100644
--- a/tde-i18n-lt/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-lt/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-09-02 17:30+0300\n"
 "Last-Translator: Donatas Glodenis <dgvirtual@akl.lt>\n"
 "Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
@@ -14,30 +14,92 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 "(n%100<10 || n%100>=20) ? 1 : 2);\n"
 "(n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Importuoti Outlook paštą"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Eugenijus Paulauskas,Ričardas Čepas,Donatas Glodenis"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "eugenijus@agvila.lt,rch@richard.eu.org,dgvirtual@akl.lt"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT importo įrankis"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "1 žingsnis: pasirinkite filtrą"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "2 žingsnis: importuojama..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Vyksta importavimas"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Importavimas baigtas"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Parašė %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail importavimo filtrai"
+
+#: main.cpp:35
+#, fuzzy
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2003, KMailCVT programuotojai"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Originalo autorius"
+
+#: main.cpp:37
+#, fuzzy
+msgid "Maintainer & New filters"
+msgstr "Tvarkyti tinklo aplankus"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nauja GNS ir kodo valymas"
+
+#: filter_evolution.cxx:31
+#, fuzzy
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Importuoti Evolution 2.x vietinį paštą ir aplankų struktūrą"
+
+#: filter_evolution.cxx:33
+#, fuzzy
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook pašto importavimo filtras</b></p>"
-"<p>Šis filtras importuoja iš Outlook *.pst bylos. Visų pirma suraskite aplanką, "
-"kuriame saugoma *.pst byla, ieškodami bylų su tokia priesaga aplanke <i>"
-"C:\\Documents and Settings</i>, jei tai - Windows 2000 ar vėlesnė versija</p>"
-"<p><b>Pastaba:</b> Laiškai yra importuojami į aplanką, pavadintą pagal bylos, "
-"iš kurios jie imami, pavadinimą, pridedant priešdėlį OUTLOOK-</p>"
+"<p><b>Evolution 2.x importo filtras</b></p><p>Pasirinkite vietinio Evolution "
+"pašto katalogą (paprastai - ~/.evolution/mail/local/).</p><p><b>Pastaba:</b> "
+"nesirinkite aplanko, kuriame <u>nėra</u> mbox bylų (pvz., jei ten yra "
+"maildir). Jei visgi taip padarysite, gausite daug naujų aplankų.</"
+"p><p>Kadangi šiuo metu nėra įmanoma atkurti aplankų struktūros, ji "
+"bus„įtraukta“ sukurtų aplankų pavadinimuose.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -47,27 +109,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Nepasirinktas aplankas."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Skaičiuojamos bylos..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Skaičiuojami laiškai..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Skaičiuojamos direktorijos..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Skaičiuojami aplankai..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Importuojami naujos pašto bylos..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -75,6 +116,22 @@ msgstr "Importuojami naujos pašto bylos..."
 msgid "No files found for import."
 msgstr "Nerasta bylų importavimui."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Baigiamas laiškų importavimas iš %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Negalima atverti „%1“, ji praleidžiama"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -93,44 +150,39 @@ msgstr ""
 "Neimportuoti %n besidubliuojantys laiškai\n"
 "Neimportuota %n besidubliuojančių laiškų"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Negalima atverti „%1“, ji praleidžiama"
-
-#: filter_evolution.cxx:31
-#, fuzzy
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importuoti Evolution 2.x vietinį paštą ir aplankų struktūrą"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 #, fuzzy
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 2.x importo filtras</b></p>"
-"<p>Pasirinkite vietinio Evolution pašto katalogą (paprastai - "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Pastaba:</b> nesirinkite aplanko, kuriame <u>nėra</u> "
-"mbox bylų (pvz., jei ten yra maildir). Jei visgi taip padarysite, gausite daug "
-"naujų aplankų.</p>"
-"<p>Kadangi šiuo metu nėra įmanoma atkurti aplankų struktūros, ji bus„įtraukta“ "
-"sukurtų aplankų pavadinimuose.</p>"
+"<p><b>Evolution 2.x importo filtras</b></p><p>Pasirinkite vietinio Evolution "
+"pašto katalogą (paprastai - ~/.evolution/mail/local/).</p><p><b>Pastaba:</b> "
+"nesirinkite aplanko, kuriame <u>nėra</u> mbox bylų (pvz., jei ten yra "
+"maildir). Jei visgi taip padarysite, gausite daug naujų aplankų.</"
+"p><p>Kadangi šiuo metu nėra įmanoma atkurti aplankų struktūros, ji "
+"bus„įtraukta“ sukurtų aplankų pavadinimuose.</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Baigiamas laiškų importavimas iš %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+#, fuzzy
+msgid "Finished import, canceled by user."
+msgstr "Užduoties atsisakė naudotojas."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Pradėti importuoti bylą %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -138,101 +190,11 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importuoti Pegasus-Mail aplankus"
-
-#: filter_pmail.cxx:33
-#, fuzzy
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Pažymėkite savo sistemos Pegasus-Mail aplanką (turintį CNM, PMM ir MBX "
-"bylas). Daugelyje sistemų jos saugomos C:\\PMail\\mail</p>"
-"<p><b>Pastaba:</b> Šis importo filtras importuos Jūsų aplankus, bet ne jų "
-"struktūrą. Tačiau greičiausiai toks importavimas bus vienetinis atvejis.</p>"
-"<p><b>Pastaba:</b> Laiškai bus importuoti į aplanką su priešdėliu pmail-</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importuoju naujas laiškų bylas („.cnm“) ..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importuojami laiškų aplankai ('.pmm') ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importuojami 'unix' pašto aplankai ('.mbx') ..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importuojama %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Laiškas %1"
-
-#: filter_pmail.cxx:290
-#, fuzzy
-msgid "Parsing the folder structure..."
-msgstr "Panašių į šlamštą laiškų aplankas:"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Parašė %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "Importuoti Outlook paštą"
-
-#: filter_lnotes.cxx:32
-#, fuzzy
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>mbox importo filtras</b></p>"
-"<p>Šis filtras importuoja mbox bylas į KMail. Naudokite šį filtrą jei norite "
-"importuoti bylas iš Ximian Evolution ar kitos programos, naudojančios "
-"tradicinius UNIX formatus.</p>"
-"<p><b>Pastaba:</b> laiškai bus importuoti į aplanką, pavadintą pagal bylą, iš "
-"kurios jie įkeliami, su priešdėliu MBOX-</p>"
-
-#: filter_lnotes.cxx:55
-#, fuzzy
-msgid "All Files (*)"
-msgstr "Visi Bylos"
-
-#: filter_lnotes.cxx:64
-#, fuzzy, c-format
-msgid "Importing emails from %1"
-msgstr "Importuojami laiškai iš %1..."
-
 #: filter_kmail_maildir.cxx:26
 #, fuzzy
 msgid "Import KMail Maildirs and Folder Structure"
@@ -240,24 +202,15 @@ msgstr "Importuoti Evolution paštą ir aplankų struktūrą"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-#, fuzzy
-msgid "Finished import, canceled by user."
-msgstr "Užduoties atsisakė naudotojas."
-
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 #, fuzzy
 msgid "Import folder %1..."
@@ -270,198 +223,42 @@ msgstr "&Importuoti MBox aplanką..."
 msgid "Could not import %1"
 msgstr "Nepavyko importuoti %1"
 
-#: filter_thunderbird.cxx:28
-#, fuzzy
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Importuoti Thunderbird vietinį paštą ir aplankų struktūrą"
-
-#: filter_thunderbird.cxx:30
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird importo filtras</b></p>"
-"<p>Pažymėkite šakninį Thunderbird pašto aplanką (paprastai tai yra "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Pastaba:</b> Niekuomet nežymėkite aplanko, kuriame <u>nėra</u> "
-"mbox bylų (pvz., yra maildir). Jei visgi taip padarysite, bus sukurta daug "
-"naujų aplankų.</p>"
-"<p>Kadangi šiuo metu nėra įmanoma atkurti aplankų struktūros, ji bus„įtraukta“ "
-"sukurtų aplankų pavadinimuose.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Pradėti importuoti bylą %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Importuoti Opera paštą"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera importo filtras</b></p>"
-"<p>Šis filtras importuos paštą iš Opera pašto aplanko. Naudokite šį filtrą "
-"norėdami importuoti visus maildir aplankus iš Opera.</p>"
-"<p>Pasirinkite paskyros aplanką (greičiausiai: "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Pastaba:</b> Laiškai bus importuoti į aplanką pavadintą pagal paskyrą, su "
-"priešdėliu OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Importuoti Evolution 2.x vietinį paštą ir aplankų struktūrą"
+msgid "Import Lotus Notes Emails"
+msgstr "Importuoti Outlook paštą"
 
-#: filter_evolution_v2.cxx:31
+#: filter_lnotes.cxx:32
 #, fuzzy
 msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<p><b>Evolution 2.x importo filtras</b></p>"
-"<p>Pasirinkite vietinio Evolution pašto katalogą (paprastai - "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Pastaba:</b> nesirinkite aplanko, kuriame <u>nėra</u> "
-"mbox bylų (pvz., jei ten yra maildir). Jei visgi taip padarysite, gausite daug "
-"naujų aplankų.</p>"
-"<p>Kadangi šiuo metu nėra įmanoma atkurti aplankų struktūros, ji bus„įtraukta“ "
-"sukurtų aplankų pavadinimuose.</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Nuo:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Kam:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Dabartinis:"
+"<p><b>mbox importo filtras</b></p><p>Šis filtras importuoja mbox bylas į "
+"KMail. Naudokite šį filtrą jei norite importuoti bylas iš Ximian Evolution "
+"ar kitos programos, naudojančios tradicinius UNIX formatus.</p><p><b>Pastaba:"
+"</b> laiškai bus importuoti į aplanką, pavadintą pagal bylą, iš kurios jie "
+"įkeliami, su priešdėliu MBOX-</p>"
 
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "Importing in progress..."
-msgstr "Vyksta importavimas"
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Viso:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Prašome spausti mygtuką „Atgal“ jei norite importuoti daugiau laiškų ar "
-"kontaktų"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>Jus sveikina KMailCVT - KMail pašto importavimo įrankis</b>\n"
-"<br>"
-"<br>\n"
-"Ši programa padės importuoti Jūsų e. paštą iš anksčiau naudotos pašto programos "
-"į KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Prašome pasirinkti programą, iš kurios norėtumėte importuoti laiškus ir "
-"spauskite „Toliau“."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, fuzzy, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Importavimo metu panaikinti dubliuojančias laiškų kopijas"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail importavimo filtrai"
-
-#: main.cpp:35
-#, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2003, KMailCVT programuotojai"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Originalo autorius"
-
-#: main.cpp:37
+#: filter_lnotes.cxx:55
 #, fuzzy
-msgid "Maintainer & New filters"
-msgstr "Tvarkyti tinklo aplankus"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nauja GNS ir kodo valymas"
+msgid "All Files (*)"
+msgstr "Visi Bylos"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Eugenijus Paulauskas,Ričardas Čepas,Donatas Glodenis"
+#: filter_lnotes.cxx:64
+#, fuzzy, c-format
+msgid "Importing emails from %1"
+msgstr "Importuojami laiškai iš %1..."
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "eugenijus@agvila.lt,rch@richard.eu.org,dgvirtual@akl.lt"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Laiškas %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -469,11 +266,11 @@ msgstr "Importuoti iš OS X pašto"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X pašto importo filtras</b></p>"
-"<p>Šis filtras importuoja laiškus iš Apple Mac OS X.</p>"
+"<p><b>OS X pašto importo filtras</b></p><p>Šis filtras importuoja laiškus iš "
+"Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -484,25 +281,27 @@ msgstr ""
 "%n besidubliuojantys laiškai nebuvo importuoti į KMail aplanką %1\n"
 "%n besidubliuojančių laiškų nebuvo importuota į KMail aplanką %1"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT importo įrankis"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "1 žingsnis: pasirinkite filtrą"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "2 žingsnis: importuojama..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importuoti mbox bylas (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Vyksta importavimas"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox importo filtras</b></p><p>Šis filtras importuoja mbox bylas į "
+"KMail. Naudokite šį filtrą jei norite importuoti bylas iš Ximian Evolution "
+"ar kitos programos, naudojančios tradicinius UNIX formatus.</p><p><b>Pastaba:"
+"</b> laiškai bus importuoti į aplanką, pavadintą pagal bylą, iš kurios jie "
+"įkeliami, su priešdėliu MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Importavimas baigtas"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox bylos (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -511,25 +310,21 @@ msgstr "Importuoti Outlook Express paštą"
 #: filter_oe.cxx:42
 #, fuzzy
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 importo filtras</b></p>"
-"<p>Raskite aplanką, kuriame buvo saugomas paštas, ieškodami .dbx or .mbx bylų "
-"aplanke "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> Windows 9x atveju arba"
-"<li><i>Documents and Settings</i> in Windows 2000 ar vėlesnės versijos "
-"atveju.</ul></p>"
-"<p><b>Pastaba:</b> Laiškai yra importuojami į aplanką, pavadintą pagal bylos, "
-"iš kurios jie imami, pavadinimą, pridedant priešdėlį OE-</p>"
+"<p><b>Outlook Express 4/5/6 importo filtras</b></p><p>Raskite aplanką, "
+"kuriame buvo saugomas paštas, ieškodami .dbx or .mbx bylų aplanke "
+"<ul><li><i>C:\\Windows\\Application Data</i> Windows 9x atveju "
+"arba<li><i>Documents and Settings</i> in Windows 2000 ar vėlesnės versijos "
+"atveju.</ul></p><p><b>Pastaba:</b> Laiškai yra importuojami į aplanką, "
+"pavadintą pagal bylos, iš kurios jie imami, pavadinimą, pridedant priešdėlį "
+"OE-</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -565,40 +360,65 @@ msgstr "Importuojama OE5+ pašto dėžutė %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importuojama OE5+ pašto dėžutė %1"
 
-#: filter_sylpheed.cxx:27
-#, fuzzy
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "Importuoti Evolution paštą ir aplankų struktūrą"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Importuoti Opera paštą"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
+"<p><b>Opera importo filtras</b></p><p>Šis filtras importuos paštą iš Opera "
+"pašto aplanko. Naudokite šį filtrą norėdami importuoti visus maildir "
+"aplankus iš Opera.</p><p>Pasirinkite paskyros aplanką (greičiausiai: ~/."
+"opera/mail/store/account*).</p><p><b>Pastaba:</b> Laiškai bus importuoti į "
+"aplanką pavadintą pagal paskyrą, su priešdėliu OPERA-</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Skaičiuojamos bylos..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Importuojami naujos pašto bylos..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Importuoti Outlook paštą"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>Lemtinga:</b> nepavyksta startuoti KMail DCOP ryšiui užmegsti. Įsitikinkite "
-"kad <i>kmail</i> yra įdiegtas."
+"<p><b>Outlook pašto importavimo filtras</b></p><p>Šis filtras importuoja iš "
+"Outlook *.pst bylos. Visų pirma suraskite aplanką, kuriame saugoma *.pst "
+"byla, ieškodami bylų su tokia priesaga aplanke <i>C:\\Documents and "
+"Settings</i>, jei tai - Windows 2000 ar vėlesnė versija</p><p><b>Pastaba:</"
+"b> Laiškai yra importuojami į aplanką, pavadintą pagal bylos, iš kurios jie "
+"imami, pavadinimą, pridedant priešdėlį OUTLOOK-</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "Negalima sukurti aplanko %1 KMail'e"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Skaičiuojami laiškai..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "Negalima įdėti laiško į aplanką %1 KMail'e"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Skaičiuojamos direktorijos..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Klaida įdedant laišką į aplanką %1 KMail'e"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Skaičiuojami aplankai..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -607,39 +427,75 @@ msgstr "Importuoti paprasto teksto e. pašto laiškus"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 "<p>Pažymėkite aplanką, kuriame, Jūsų sistemos atveju, laikomi pašto laiškai. "
-"Laiškai bus įdėti į pašto aplanką, pavadintą pagal aplanką, kuriame jie buvi, "
-"su priešdėliu PLAIN-</p>"
-"<p>Šis filtras importuos visus .msg, .eml and .txt bylose esančius e. pašto "
-"laiškus.</p>"
+"Laiškai bus įdėti į pašto aplanką, pavadintą pagal aplanką, kuriame jie "
+"buvi, su priešdėliu PLAIN-</p><p>Šis filtras importuos visus .msg, .eml and ."
+"txt bylose esančius e. pašto laiškus.</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importuoti mbox bylas (UNIX, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importuoti Pegasus-Mail aplankus"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
+#, fuzzy
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>mbox importo filtras</b></p>"
-"<p>Šis filtras importuoja mbox bylas į KMail. Naudokite šį filtrą jei norite "
-"importuoti bylas iš Ximian Evolution ar kitos programos, naudojančios "
-"tradicinius UNIX formatus.</p>"
-"<p><b>Pastaba:</b> laiškai bus importuoti į aplanką, pavadintą pagal bylą, iš "
-"kurios jie įkeliami, su priešdėliu MBOX-</p>"
+"<p>Pažymėkite savo sistemos Pegasus-Mail aplanką (turintį CNM, PMM ir MBX "
+"bylas). Daugelyje sistemų jos saugomos C:\\PMail\\mail</p><p><b>Pastaba:</b> "
+"Šis importo filtras importuos Jūsų aplankus, bet ne jų struktūrą. Tačiau "
+"greičiausiai toks importavimas bus vienetinis atvejis.</p><p><b>Pastaba:</b> "
+"Laiškai bus importuoti į aplanką su priešdėliu pmail-</p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox bylos (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importuoju naujas laiškų bylas („.cnm“) ..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importuojami laiškų aplankai ('.pmm') ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importuojami 'unix' pašto aplankai ('.mbx') ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importuojama %1"
+
+#: filter_pmail.cxx:290
+#, fuzzy
+msgid "Parsing the folder structure..."
+msgstr "Panašių į šlamštą laiškų aplankas:"
+
+#: filter_sylpheed.cxx:27
+#, fuzzy
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "Importuoti Evolution paštą ir aplankų struktūrą"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
 
 #: filter_thebat.cxx:33
 #, fuzzy
@@ -648,29 +504,180 @@ msgstr "Importuoti Thunderbird vietinį paštą ir aplankų struktūrą"
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
 msgstr ""
 
-#~ msgid "<p><b>Thunderbird import filter</b></p><p>Select your base Thunderbird mailfolder (usually ~/.thunderbird/*.default/Mail/Local Folders/).</p><p><b>Note:</b> Never choose a Folder, which <u>does not</u> contain mbox-files (for example a maildir). If you do it anyway, you will get many new folders.</p><p>As it is currently impossible to recreate the folder structure, it will be \"contained\" in the generated folder's names.</p>"
-#~ msgstr "<p><b>Thunderbird importo filtras</b></p><p>Pažymėkite šakninį Thunderbird pašto aplanką (paprastai tai yra ~/.thunderbird/*.default/Mail/Local Folders/).</p><p><b>Pastaba:</b> Niekuomet nežymėkite aplanko, kuriame <u>nėra</u> mbox bylų (pvz., yra maildir). Jei visgi taip padarysite, bus sukurta daug naujų aplankų.</p><p>Kadangi šiuo metu nėra įmanoma atkurti aplankų struktūros, ji bus„įtraukta“ sukurtų aplankų pavadinimuose.</p>"
+#: filter_thunderbird.cxx:28
+#, fuzzy
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Importuoti Thunderbird vietinį paštą ir aplankų struktūrą"
+
+#: filter_thunderbird.cxx:30
+#, fuzzy
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Thunderbird importo filtras</b></p><p>Pažymėkite šakninį Thunderbird "
+"pašto aplanką (paprastai tai yra ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Pastaba:</b> Niekuomet nežymėkite aplanko, kuriame "
+"<u>nėra</u> mbox bylų (pvz., yra maildir). Jei visgi taip padarysite, bus "
+"sukurta daug naujų aplankų.</p><p>Kadangi šiuo metu nėra įmanoma atkurti "
+"aplankų struktūros, ji bus„įtraukta“ sukurtų aplankų pavadinimuose.</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b>Lemtinga:</b> nepavyksta startuoti KMail DCOP ryšiui užmegsti. "
+"Įsitikinkite kad <i>kmail</i> yra įdiegtas."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "Negalima sukurti aplanko %1 KMail'e"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "Negalima įdėti laiško į aplanką %1 KMail'e"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Klaida įdedant laišką į aplanką %1 KMail'e"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Nuo:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Kam:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Dabartinis:"
+
+#: kimportpagedlg.ui:115
+#, fuzzy, no-c-format
+msgid "Importing in progress..."
+msgstr "Vyksta importavimas"
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Viso:"
+
+#: kimportpagedlg.ui:199
+#, fuzzy, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Prašome spausti mygtuką „Atgal“ jei norite importuoti daugiau laiškų ar "
+"kontaktų"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Jus sveikina KMailCVT - KMail pašto importavimo įrankis</b>\n"
+"<br><br>\n"
+"Ši programa padės importuoti Jūsų e. paštą iš anksčiau naudotos pašto "
+"programos į KMail.<br><br><br><br>\n"
+" Prašome pasirinkti programą, iš kurios norėtumėte importuoti laiškus ir "
+"spauskite „Toliau“."
+
+#: kselfilterpagedlg.ui:133
+#, fuzzy, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Importavimo metu panaikinti dubliuojančias laiškų kopijas"
+
+#~ msgid ""
+#~ "<p><b>Thunderbird import filter</b></p><p>Select your base Thunderbird "
+#~ "mailfolder (usually ~/.thunderbird/*.default/Mail/Local Folders/).</"
+#~ "p><p><b>Note:</b> Never choose a Folder, which <u>does not</u> contain "
+#~ "mbox-files (for example a maildir). If you do it anyway, you will get "
+#~ "many new folders.</p><p>As it is currently impossible to recreate the "
+#~ "folder structure, it will be \"contained\" in the generated folder's "
+#~ "names.</p>"
+#~ msgstr ""
+#~ "<p><b>Thunderbird importo filtras</b></p><p>Pažymėkite šakninį "
+#~ "Thunderbird pašto aplanką (paprastai tai yra ~/.thunderbird/*.default/"
+#~ "Mail/Local Folders/).</p><p><b>Pastaba:</b> Niekuomet nežymėkite aplanko, "
+#~ "kuriame <u>nėra</u> mbox bylų (pvz., yra maildir). Jei visgi taip "
+#~ "padarysite, bus sukurta daug naujų aplankų.</p><p>Kadangi šiuo metu nėra "
+#~ "įmanoma atkurti aplankų struktūros, ji bus„įtraukta“ sukurtų aplankų "
+#~ "pavadinimuose.</p>"
 
 #~ msgid "Import Evolution Mails and Folder Structure"
 #~ msgstr "Importuoti Evolution paštą ir aplankų struktūrą"
 
-#~ msgid "<p>Select the base directory of Evolution's mails (usually ~/evolution/local).</p><p>As it is currently impossible to recreate the folder structure, it will be \"contained\" in the generated folder's names.</p><p>For instance, if you have a \"foo\" folder in Evolution, with a \"bar\" subfolder, two folders will be created in KMail : \"foo\" and \"foo-bar\"</p>"
-#~ msgstr "<p>Pažymėkite šakninį Evolution pašto aplanką (paprastai tai yra ~/evolution/local).</p><p>Kadangi šiuo metu nėra įmanoma atkurti aplankų struktūros, ji bus„įtraukta“ sukurtų aplankų pavadinimuose.</p><p>Pvz., jei turite aplanką „foo“ su „bar“ paaplankiui Evolution kliente, KMail bus sukurti du aplankai : „foo“ and „foo-bar“</p>"
-
-#~ msgid "<p>Select the Pegasus-Mail directory on your system (containing CNM, PMM and MBX files). On many systems this is stored in C:\\PMail\\mail</p><p><b>Note:</b> This import filter will import your folders, but not the folder structure. But you will probably only do this one time.</p><p><b>Note:</b> Emails will be imported into folder with the prefix pmail-</p>"
-#~ msgstr "<p>Pažymėkite savo sistemos Pegasus-Mail aplanką (turintį CNM, PMM ir MBX bylas). Daugelyje sistemų jos saugomos C:\\PMail\\mail</p><p><b>Pastaba:</b> Šis importo filtras importuos Jūsų aplankus, bet ne jų struktūrą. Tačiau greičiausiai toks importavimas bus vienetinis atvejis.</p><p><b>Pastaba:</b> Laiškai bus importuoti į aplanką su priešdėliu pmail-</p>"
+#~ msgid ""
+#~ "<p>Select the base directory of Evolution's mails (usually ~/evolution/"
+#~ "local).</p><p>As it is currently impossible to recreate the folder "
+#~ "structure, it will be \"contained\" in the generated folder's names.</"
+#~ "p><p>For instance, if you have a \"foo\" folder in Evolution, with a \"bar"
+#~ "\" subfolder, two folders will be created in KMail : \"foo\" and \"foo-bar"
+#~ "\"</p>"
+#~ msgstr ""
+#~ "<p>Pažymėkite šakninį Evolution pašto aplanką (paprastai tai yra ~/"
+#~ "evolution/local).</p><p>Kadangi šiuo metu nėra įmanoma atkurti aplankų "
+#~ "struktūros, ji bus„įtraukta“ sukurtų aplankų pavadinimuose.</p><p>Pvz., "
+#~ "jei turite aplanką „foo“ su „bar“ paaplankiui Evolution kliente, KMail "
+#~ "bus sukurti du aplankai : „foo“ and „foo-bar“</p>"
+
+#~ msgid ""
+#~ "<p>Select the Pegasus-Mail directory on your system (containing CNM, PMM "
+#~ "and MBX files). On many systems this is stored in C:\\PMail\\mail</"
+#~ "p><p><b>Note:</b> This import filter will import your folders, but not "
+#~ "the folder structure. But you will probably only do this one time.</"
+#~ "p><p><b>Note:</b> Emails will be imported into folder with the prefix "
+#~ "pmail-</p>"
+#~ msgstr ""
+#~ "<p>Pažymėkite savo sistemos Pegasus-Mail aplanką (turintį CNM, PMM ir MBX "
+#~ "bylas). Daugelyje sistemų jos saugomos C:\\PMail\\mail</p><p><b>Pastaba:</"
+#~ "b> Šis importo filtras importuos Jūsų aplankus, bet ne jų struktūrą. "
+#~ "Tačiau greičiausiai toks importavimas bus vienetinis atvejis.</"
+#~ "p><p><b>Pastaba:</b> Laiškai bus importuoti į aplanką su priešdėliu pmail-"
+#~ "</p>"
 
 #~ msgid "Please click 'Back' to import more emails or contacts"
-#~ msgstr "Prašome spausti mygtuką „Atgal“ jei norite importuoti daugiau laiškų ar kontaktų"
-
-#~ msgid "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of your local Evolution mailfolder (usually ~/.evolution/mail/local/).</p><p><b>Note:</b> Never choose a Folder, which <u>does not</u> contain mbox-files (for example a maildir). If you do it anyway, you will get many new folders.</p><p>As it is currently impossible to recreate the folder structure, it will be \"contained\" in the generated folder's names.</p>"
-#~ msgstr "<p><b>Evolution 2.x importo filtras</b></p><p>Pasirinkite vietinio Evolution pašto katalogą (paprastai - ~/.evolution/mail/local/).</p><p><b>Pastaba:</b> nesirinkite aplanko, kuriame <u>nėra</u> mbox bylų (pvz., jei ten yra maildir). Jei visgi taip padarysite, gausite daug naujų aplankų.</p><p>Kadangi šiuo metu nėra įmanoma atkurti aplankų struktūros, ji bus„įtraukta“ sukurtų aplankų pavadinimuose.</p>"
+#~ msgstr ""
+#~ "Prašome spausti mygtuką „Atgal“ jei norite importuoti daugiau laiškų ar "
+#~ "kontaktų"
+
+#~ msgid ""
+#~ "<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+#~ "your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+#~ "p><p><b>Note:</b> Never choose a Folder, which <u>does not</u> contain "
+#~ "mbox-files (for example a maildir). If you do it anyway, you will get "
+#~ "many new folders.</p><p>As it is currently impossible to recreate the "
+#~ "folder structure, it will be \"contained\" in the generated folder's "
+#~ "names.</p>"
+#~ msgstr ""
+#~ "<p><b>Evolution 2.x importo filtras</b></p><p>Pasirinkite vietinio "
+#~ "Evolution pašto katalogą (paprastai - ~/.evolution/mail/local/).</"
+#~ "p><p><b>Pastaba:</b> nesirinkite aplanko, kuriame <u>nėra</u> mbox bylų "
+#~ "(pvz., jei ten yra maildir). Jei visgi taip padarysite, gausite daug "
+#~ "naujų aplankų.</p><p>Kadangi šiuo metu nėra įmanoma atkurti aplankų "
+#~ "struktūros, ji bus„įtraukta“ sukurtų aplankų pavadinimuose.</p>"
diff --git a/tde-i18n-lv/messages/tdepim/kmailcvt.po b/tde-i18n-lv/messages/tdepim/kmailcvt.po
index 89aed746850..d705be42313 100644
--- a/tde-i18n-lv/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-lv/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2001-12-09 15:15EEST\n"
 "Last-Translator: Andris Maziks <andzha@latnet.lv>\n"
 "Language-Team: Latvian\n"
@@ -15,19 +15,78 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.5\n"
 
-#: filter_outlook.cxx:28
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Andris Maziks"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "andris.m@delfi.lv"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr ""
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: kmailcvt.cpp:34
 #, fuzzy
-msgid "Import Outlook Emails"
+msgid "Step 2: Importing..."
+msgstr "&Importēt"
+
+#: kmailcvt.cpp:76
+#, fuzzy
+msgid "Import in progress"
 msgstr "Importēt Outlook Express 4"
 
-#: filter_outlook.cxx:30
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr ""
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr ""
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr ""
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr ""
+
+#: main.cpp:36
+msgid "Original author"
+msgstr ""
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr ""
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
@@ -38,32 +97,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-#, fuzzy
-msgid "Counting files..."
-msgstr "Skaitu failus ..."
-
-#: filter_outlook.cxx:46
-#, fuzzy
-msgid "Counting mail..."
-msgstr "Skaitu failus ..."
-
-#: filter_outlook.cxx:47
-#, fuzzy
-msgid "Counting directories..."
-msgstr "Skaitu failus ..."
-
-#: filter_outlook.cxx:48
-#, fuzzy
-msgid "Counting folders..."
-msgstr "Skaitu failus ..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-#, fuzzy
-msgid "Importing new mail files..."
-msgstr "Importēju jaunos pasta failus ('.cnm') ..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -71,6 +104,23 @@ msgstr "Importēju jaunos pasta failus ('.cnm') ..."
 msgid "No files found for import."
 msgstr ""
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr ""
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#, fuzzy
+msgid "Unable to open %1, skipping"
+msgstr "Nevar atvērt failu '%1'"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 #, fuzzy
@@ -87,34 +137,30 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "Nevar pievienot ziņojumu mapei %1 kpastā"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-#, fuzzy
-msgid "Unable to open %1, skipping"
-msgstr "Nevar atvērt failu '%1'"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr ""
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
 #: filter_kmail_archive.cxx:24
@@ -123,62 +169,36 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-#, fuzzy
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importēt Pegusus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_kmail_maildir.cxx:28
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:72
-#, fuzzy
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importēju jaunos pasta failus ('.cnm') ..."
-
-#: filter_pmail.cxx:74
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 #, fuzzy
-msgid "Importing mail folders ('.pmm')..."
+msgid "Import folder %1..."
 msgstr "Importēju pasta mapes ('.pmm') ..."
 
-#: filter_pmail.cxx:76
-#, fuzzy
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importēju 'unix' pasta mapes ('.mbx') ..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr ""
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
 #, c-format
-msgid "Message %1"
-msgstr ""
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr ""
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
+msgid "Could not import %1"
 msgstr ""
 
 #: filter_lnotes.cxx:30
@@ -188,14 +208,13 @@ msgstr "Importēt Outlook Express 4"
 
 #: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 
 #: filter_lnotes.cxx:55
@@ -207,202 +226,19 @@ msgstr ""
 msgid "Importing emails from %1"
 msgstr "Importēju pasta mapes ('.pmm') ..."
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr ""
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr ""
-
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-#, fuzzy
-msgid "Import folder %1..."
-msgstr "Importēju pasta mapes ('.pmm') ..."
-
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
-msgid "Could not import %1"
-msgstr ""
-
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr ""
-
-#: filter_opera.cxx:28
-#, fuzzy
-msgid "Import Opera Emails"
-msgstr "Importēt Outlook Express 4"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, fuzzy, no-c-format
-msgid "From:"
-msgstr "No: %1"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "Uz"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, fuzzy, no-c-format
-msgid "Current:"
-msgstr "tekošais:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "Importing in progress..."
-msgstr "Importēt Outlook Express 4"
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr ""
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr ""
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr ""
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr ""
-
-#: main.cpp:36
-msgid "Original author"
-msgstr ""
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
+msgid "Message %1"
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Andris Maziks"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "andris.m@delfi.lv"
-
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
 msgstr ""
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
@@ -412,26 +248,21 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "Nevar pievienot ziņojumu mapei %1 kpastā"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
 msgstr ""
 
-#: kmailcvt.cpp:34
-#, fuzzy
-msgid "Step 2: Importing..."
-msgstr "&Importēt"
-
-#: kmailcvt.cpp:76
-#, fuzzy
-msgid "Import in progress"
-msgstr "Importēt Outlook Express 4"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
 msgstr ""
 
 #: filter_oe.cxx:40
@@ -441,13 +272,11 @@ msgstr "Importēt Outlook Express 4"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
@@ -487,25 +316,164 @@ msgstr ""
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importēju pasta mapes ('.pmm') ..."
 
+#: filter_opera.cxx:28
+#, fuzzy
+msgid "Import Opera Emails"
+msgstr "Importēt Outlook Express 4"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+#, fuzzy
+msgid "Counting files..."
+msgstr "Skaitu failus ..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#, fuzzy
+msgid "Importing new mail files..."
+msgstr "Importēju jaunos pasta failus ('.cnm') ..."
+
+#: filter_outlook.cxx:28
+#, fuzzy
+msgid "Import Outlook Emails"
+msgstr "Importēt Outlook Express 4"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+
+#: filter_outlook.cxx:46
+#, fuzzy
+msgid "Counting mail..."
+msgstr "Skaitu failus ..."
+
+#: filter_outlook.cxx:47
+#, fuzzy
+msgid "Counting directories..."
+msgstr "Skaitu failus ..."
+
+#: filter_outlook.cxx:48
+#, fuzzy
+msgid "Counting folders..."
+msgstr "Skaitu failus ..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr ""
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+
+#: filter_pmail.cxx:31
+#, fuzzy
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importēt Pegusus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+#, fuzzy
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importēju jaunos pasta failus ('.cnm') ..."
+
+#: filter_pmail.cxx:74
+#, fuzzy
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importēju pasta mapes ('.pmm') ..."
+
+#: filter_pmail.cxx:76
+#, fuzzy
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importēju 'unix' pasta mapes ('.mbx') ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr ""
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 #, fuzzy
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "FATĀLI: Nevar startēt kpastu priekš dcop sakariem\n"
 "       pārliecinieties, ka 'kpasts' ir jūsu ceļā."
@@ -525,49 +493,54 @@ msgstr "Nevar pievienot ziņojumu mapei %1 kpastā"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Kļūda pievienojot ziņojumu mapei %1 kpastā"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr ""
+#: kimportpagedlg.ui:91
+#, fuzzy, no-c-format
+msgid "From:"
+msgstr "No: %1"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
+#: kimportpagedlg.ui:99
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "Uz"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr ""
+#: kimportpagedlg.ui:107
+#, fuzzy, no-c-format
+msgid "Current:"
+msgstr "tekošais:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, fuzzy, no-c-format
+msgid "Importing in progress..."
+msgstr "Importēt Outlook Express 4"
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
 msgstr ""
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
 msgstr ""
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
 
 #, fuzzy
@@ -666,8 +639,10 @@ msgstr ""
 #~ msgstr "Nevar atvērt K Adresugrāmatu"
 
 #, fuzzy
-#~ msgid "A little tool to convert mail boxes and address books to KMail format"
-#~ msgstr "Sīks rīks pastkastīšu un adresu grāmatu konvertēšanai uz kpasta formātu"
+#~ msgid ""
+#~ "A little tool to convert mail boxes and address books to KMail format"
+#~ msgstr ""
+#~ "Sīks rīks pastkastīšu un adresu grāmatu konvertēšanai uz kpasta formātu"
 
 #~ msgid "Kmailcvt2"
 #~ msgstr "Kmailcvt2"
diff --git a/tde-i18n-mk/messages/tdepim/kmailcvt.po b/tde-i18n-mk/messages/tdepim/kmailcvt.po
index d593e87f208..fb672e80765 100644
--- a/tde-i18n-mk/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-mk/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-02-28 14:27+0100\n"
 "Last-Translator: Bozidar Proevski <bobibobi@freemail.com.mk>\n"
 "Language-Team: Macedonian <mkde-l10n@lists.sourceforge.net>\n"
@@ -15,26 +15,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Внесување на пораки од Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Божидар Проевски"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "bobibobi@freemail.com.mk"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Алатката за внесување KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Чекор 1: Изберете филтер"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Чекор 2: Внесување..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Внесувањето е во тек"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Внесувањето заврши"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Напишано од %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Филтри за внесување во КПошта"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, развивачите на KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Оригинален автор"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Одржувач и нови филтри"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Ново ГУИ и расчистувања"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Внесување на локални пораки и структури на папки од Evolution 1.x"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Филтер за внесување пошта од Outlook</b></p>"
-"<p>Овој филтер внесува пораки од pst-датотека од Outlook. Ќе треба да ја "
-"лоцирате папката каде што се наоѓа pst-датотеката така што ќе побарате за "
-".pst-датотеки под: <i>C:\\Documents and Settings</i> "
-"во Windows 2000 или понов</p>"
-"<p><b>Забелешка:</b> Пораките ќе бидат внесени во папка именувана според "
-"сметката од која што дошле, со префикс OUTLOOK-</p>"
+"<p><b>Филтер за внесување од Evolution 1.x</b></p><p>Изберете ја основната "
+"папка за пораки на Evolution (обично ~/evolution/local).</p><p>Бидејќи е "
+"можно да се обнови структурата на папките, тие ќе бидат внесени под "
+"„Evolution-Import“.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -44,27 +99,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Нема избрана папка."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Пребројувам датотеки..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Пребројувам пораки..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Пребројувам именици..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Пребројувам папки..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Внесувам нови датотеки со пошта..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -72,6 +106,22 @@ msgstr "Внесувам нови датотеки со пошта..."
 msgid "No files found for import."
 msgstr "Нема пронајдени папки за внесување."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Завршив со внесување е-пораки од %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Не можам да го отворам %1, прескокам"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -90,39 +140,37 @@ msgstr ""
 "Не се внесени %n пораки-дупликати\n"
 "Не се внесени %n пораки-дупликати"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Не можам да го отворам %1, прескокам"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Внесување на локални пораки и структури на папки од Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Внесување на локални пораки и структури на пораки од Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Филтер за внесување од Evolution 1.x</b></p>"
-"<p>Изберете ја основната папка за пораки на Evolution (обично "
-"~/evolution/local).</p>"
-"<p>Бидејќи е можно да се обнови структурата на папките, тие ќе бидат внесени "
-"под „Evolution-Import“.</p>"
+"<p><b>Филтер за внесување од Evolution 2.x</b></p><p>Изберете ја основната "
+"папка на вашата локална mailfolder-папка од Evolution (обично ~/.evolution/"
+"mail/local/).</p><p><b>Забелешка:</b> Никогаш не избирајте папка што <u>не "
+"содржи</u> mbox-датотеки (на пример maildir-папка). Ако изберете ќе добиете "
+"многу нови папки.</p><p>Бидејќи е можно да се обнови структурата на папки, "
+"тие ќе бидат внесени под „Evolution-Import“.</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Завршив со внесување е-пораки од %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Внесувањето е завршено, прекинато од корисникот."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Почеток на внесување на датотеката %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -130,99 +178,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Внесување на папки од Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Изберете ја папката од Pegasus-Mail на вашиот систем (што ги содржи "
-"датотеките од тип *.CNM, *.PMM and *.MBX). На многу системи тие се наоѓаат во "
-"C:\\pmail\\mail или C:\\pmail\\mail\\admin</p>"
-"<p><b>Забелешка:</b> Бидејќи е можно да се обнови структурата на папките, тие "
-"ќе бидат зачувани под „PegasusMail-Import“.</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"Не можам да ја анализирам структурата на папките, продолжувам со внесување без "
-"поддржка за потпапки."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Внесувам нови пораки („.cnm“)..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Внесувам папки со пораки („.pmm“)..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Внесувам „UNIX“ mail-папки („.mbx“)..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Внесувам %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Порака %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Ја анализирам структурата на папките..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Напишано од %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Внесување на пораки од Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Филтер за внесување пошта од „Lotus Notes Structured Text“</b></p>"
-"<p>Овој филтер внесува датотеки во формат „Structured Text“од експортиран "
-"„Lotus Notes“-клиент во КПошта. Користете го овој филтер ако сакате да внесете "
-"пораки од Lotus или други клиенти што го користат форматот „Lotus Notes "
-"Structured Text“.</p>"
-"<p><b>Забелешка:</b>Бидејќи е можно да се обнови структурата на папки, пораките "
-"ќе бидат внесени во потпапки под „LNotes-Import“ во вашата локална папка, "
-"именувани според датотеките од каде што дошле.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Сите датотеки (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Внесувам пораки од %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -230,30 +189,22 @@ msgstr "Внесување на Maildir-папки и структури на п
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Филтер за внесување од КПошта</b></p>"
-"<p>Изберете ја основната папка на KMail што сакате да ја внесете.</p>"
-"<p><b>Забелешка:</b> Никогаш не ја избирајте вашата активна локална "
-"maildir-папка од КПошта (обично ~/Mail or ~/.trinity/share/apps/kmail/mail ). "
-"Во тој случај, KMailCVT може да се заглави во бесконечна јамка. </p>"
-"<p>Овој филтер не внесува папки од КПошта со mbox-датотеки.</p>"
-"<p>Бидејќи е можно да се обнови структурата на датотеките, тие ќе бидат внесени "
-"под „KMail-Import“ во вашата локална папка.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Внесувањето е завршено, прекинато од корисникот."
+"<p><b>Филтер за внесување од КПошта</b></p><p>Изберете ја основната папка на "
+"KMail што сакате да ја внесете.</p><p><b>Забелешка:</b> Никогаш не ја "
+"избирајте вашата активна локална maildir-папка од КПошта (обично ~/Mail or "
+"~/.trinity/share/apps/kmail/mail ). Во тој случај, KMailCVT може да се "
+"заглави во бесконечна јамка. </p><p>Овој филтер не внесува папки од КПошта "
+"со mbox-датотеки.</p><p>Бидејќи е можно да се обнови структурата на "
+"датотеките, тие ќе бидат внесени под „KMail-Import“ во вашата локална папка."
+"</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -266,192 +217,42 @@ msgstr "Внесување на папката %1..."
 msgid "Could not import %1"
 msgstr "Не можев да ја внесам %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-"Внесување од локалните папки и структури на папки на Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Филтер за внесување од Thunderbird/Mozilla</b></p>"
-"<p>Изберете ја вашата основна папка од Thunderbird/Mozilla за пошта (обично е "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Забелешка:</b> Никогаш не избирајте папка што <u>не содржи</u> "
-"mbox-датотеки (на пример maildir-папка). Ако изберете, ќе добиете многу нови "
-"папки.</p>"
-"<p>Бидејќи е возможно да се обнови структурата на папките, тие ќе бидат внесени "
-"во „Thunderbird-Import“.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Почеток на внесување на датотеката %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Внесување на пораки од Опера"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Филтер за внесување на пораки од Опера</b></p>"
-"<p>Овој филтер ќе ги внесе пораките од папката за пошта на Опера. Користете го "
-"овој филтер ако сакате да ги внесете сите пораки од некоја сметка од "
-"maildir-папката на Опера.</p>"
-"<p>Изберете ја папката на сметката (обично ~/.opera/mail/store/account*).</p>"
-"<p><b>Забелешка:</b> Пораките ќе бидат внесени во папка со име како сметката од "
-"која што дошле, со префикс OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Внесување на локални пораки и структури на пораки од Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Филтер за внесување од Evolution 2.x</b></p>"
-"<p>Изберете ја основната папка на вашата локална mailfolder-папка од Evolution "
-"(обично ~/.evolution/mail/local/).</p>"
-"<p><b>Забелешка:</b> Никогаш не избирајте папка што <u>не содржи</u> "
-"mbox-датотеки (на пример maildir-папка). Ако изберете ќе добиете многу нови "
-"папки.</p>"
-"<p>Бидејќи е можно да се обнови структурата на папки, тие ќе бидат внесени под "
-"„Evolution-Import“.</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Од:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "До:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Тековна:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Внесувањето е во тек..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Вкупно:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Кликнете „Назад“ за да внесете други пошти или контакти"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Внесување на пораки од Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Добредојдовте во KMailCVT - алатката за внесување на КПошта</b>\n"
-"<br>"
-"<br>\n"
-"Оваа програма ќа ви помогне да ги внесете во КПошта вашите пораки од вашата "
-"претходна програма за пошта."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Изберете ја програмата од која што сакате да ја внесете поштата и потоа "
-"кликнете „Следно“."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Отстрани пораки-&дупликати при внесување"
+"<p><b>Филтер за внесување пошта од „Lotus Notes Structured Text“</b></"
+"p><p>Овој филтер внесува датотеки во формат „Structured Text“од експортиран "
+"„Lotus Notes“-клиент во КПошта. Користете го овој филтер ако сакате да "
+"внесете пораки од Lotus или други клиенти што го користат форматот „Lotus "
+"Notes Structured Text“.</p><p><b>Забелешка:</b>Бидејќи е можно да се обнови "
+"структурата на папки, пораките ќе бидат внесени во потпапки под „LNotes-"
+"Import“ во вашата локална папка, именувани според датотеките од каде што "
+"дошле.</p>"
 
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Филтри за внесување во КПошта"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, развивачите на KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Оригинален автор"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Одржувач и нови филтри"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Ново ГУИ и расчистувања"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Сите датотеки (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Божидар Проевски"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Внесувам пораки од %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "bobibobi@freemail.com.mk"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Порака %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -459,11 +260,11 @@ msgstr "Внесување од е-поштата на OS X"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Филтер за внес на е-пошта од OS X</b></p>"
-"<p>Овој филтер внесува е-пошта од клиентот за е-пошта во Apple Mac OS X.</p>"
+"<p><b>Филтер за внес на е-пошта од OS X</b></p><p>Овој филтер внесува е-"
+"пошта од клиентот за е-пошта во Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -474,25 +275,27 @@ msgstr ""
 "Не се внесени %n пораки-дупликати во папката %1 во КПошта\n"
 "Не се внесени %n пораки-дупликати во папката %1 во КПошта"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Алатката за внесување KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Чекор 1: Изберете филтер"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Чекор 2: Внесување..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Внесување на mbox-датотеки (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Внесувањето е во тек"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Филтер за внесување на mbox-датотеки</b></p><p>Овој филтер ќе ги внесе "
+"mbox-датотеките во KMail. Користете го овој филтер ако сакате да внесете "
+"пораки од Ximian Evolution или други програми што го користат овој "
+"традиционален UNIX-формат.</p><p><b>Забелешка:</b> Пораките ќе бидат внесени "
+"во папки именувани според датотеката од која што дошле, со префикс MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Внесувањето заврши"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox-датотеки (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -500,25 +303,21 @@ msgstr "Внесување на пораки од Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Филтер за внесување од Outlook Express 4/5/6</b></p>"
-"<p>Ќе треба да ја лоцирате папката каде што се наоѓаат пораките така што ќе "
-"побарате за .dbx или .mbx-датотеки под "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> во Windows 9x"
-"<li><i>Documents and Settings</i> во Windows 2000 или понов</ul></p>"
-"<p><b>Забелешка:</b> Бидејќи е можно да се обнови структурата на папки, истите "
-"од Outlook Express 5 и 6 ќе бидат внесени под „OE-Import“ во вашата локална "
-"папка.</p>"
+"<p><b>Филтер за внесување од Outlook Express 4/5/6</b></p><p>Ќе треба да ја "
+"лоцирате папката каде што се наоѓаат пораките така што ќе побарате за .dbx "
+"или .mbx-датотеки под <ul><li><i>C:\\Windows\\Application Data</i> во "
+"Windows 9x<li><i>Documents and Settings</i> во Windows 2000 или понов</ul></"
+"p><p><b>Забелешка:</b> Бидејќи е можно да се обнови структурата на папки, "
+"истите од Outlook Express 5 и 6 ќе бидат внесени под „OE-Import“ во вашата "
+"локална папка.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -553,31 +352,193 @@ msgstr "Го внесувам пошт. сандаче %1 од OE5+ "
 msgid "Importing OE5+ Folder file %1"
 msgstr "Ја внесувам датотеката %1 од папката на OE5+"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Внесување на пораки од Опера"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Филтер за внесување на пораки од Опера</b></p><p>Овој филтер ќе ги "
+"внесе пораките од папката за пошта на Опера. Користете го овој филтер ако "
+"сакате да ги внесете сите пораки од некоја сметка од maildir-папката на "
+"Опера.</p><p>Изберете ја папката на сметката (обично ~/.opera/mail/store/"
+"account*).</p><p><b>Забелешка:</b> Пораките ќе бидат внесени во папка со име "
+"како сметката од која што дошле, со префикс OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Пребројувам датотеки..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Внесувам нови датотеки со пошта..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Внесување на пораки од Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Филтер за внесување пошта од Outlook</b></p><p>Овој филтер внесува "
+"пораки од pst-датотека од Outlook. Ќе треба да ја лоцирате папката каде што "
+"се наоѓа pst-датотеката така што ќе побарате за .pst-датотеки под: <i>C:"
+"\\Documents and Settings</i> во Windows 2000 или понов</p><p><b>Забелешка:</"
+"b> Пораките ќе бидат внесени во папка именувана според сметката од која што "
+"дошле, со префикс OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Пребројувам пораки..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Пребројувам именици..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Пребројувам папки..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Внесување на пораки како обичен текст"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Изберете ја папката на вашиот систем што ги содржи пораките. Тие ќе бидат "
+"внесени во папка со исто име како папката каде што биле, со префикс PLAIN-</"
+"p><p>Овој филтер ќе ги внесе сите датотеки со наставки .msg, .eml и .txt.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Внесување на папки од Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Изберете ја папката од Pegasus-Mail на вашиот систем (што ги содржи "
+"датотеките од тип *.CNM, *.PMM and *.MBX). На многу системи тие се наоѓаат "
+"во C:\\pmail\\mail или C:\\pmail\\mail\\admin</p><p><b>Забелешка:</b> "
+"Бидејќи е можно да се обнови структурата на папките, тие ќе бидат зачувани "
+"под „PegasusMail-Import“.</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Не можам да ја анализирам структурата на папките, продолжувам со внесување "
+"без поддржка за потпапки."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Внесувам нови пораки („.cnm“)..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Внесувам папки со пораки („.pmm“)..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Внесувам „UNIX“ mail-папки („.mbx“)..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Внесувам %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Ја анализирам структурата на папките..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Внесување на Maildir-папките и структурите на папки од Sylpheed"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 msgstr ""
-"<p><b>Филтер за внесување од Sylpheed</b></p>"
-"<p>Изберете ја основната папка за пошта на Sylpheed што сакате да ја внесете "
-"(обично: ~/Mail ).</p>"
-"<p>Бидејќи е можно да се обнови структурата на папките, тие ќе бидат внесени "
-"под : „Sylpheed-Import“ во вашата локална папка.</p>"
-"<p>Филтерот исто така го обновува и статусот на пораката како на пример нова "
-"или препратена."
+"<p><b>Филтер за внесување од Sylpheed</b></p><p>Изберете ја основната папка "
+"за пошта на Sylpheed што сакате да ја внесете (обично: ~/Mail ).</"
+"p><p>Бидејќи е можно да се обнови структурата на папките, тие ќе бидат "
+"внесени под : „Sylpheed-Import“ во вашата локална папка.</p><p>Филтерот исто "
+"така го обновува и статусот на пораката како на пример нова или препратена."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Внесување на пораки и структура на папки од The Bat!"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Филтер за внесување од „The Bat!“</b></p><p>Изберете ја основната "
+"папка од локалната папка за пошта на „The Bat!“ од каде што сакате да ги "
+"внесете пораките.</p><p><b>Забелешка:</b> Овој филтер ги внесува *.tbb-"
+"датотеките од локалната папка на „The Bat!“, на пример од POP-сметки, а не "
+"од IMAP/DIMAP-сметки.</p><p>Бидејќи е можно да се обнови структурата на "
+"папки, тие ќе бидат внесени под „TheBat-Import“ во вашата локална сметка.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+"Внесување од локалните папки и структури на папки на Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Филтер за внесување од Thunderbird/Mozilla</b></p><p>Изберете ја "
+"вашата основна папка од Thunderbird/Mozilla за пошта (обично е ~/."
+"thunderbird/*.default/Mail/Local Folders/).</p><p><b>Забелешка:</b> Никогаш "
+"не избирајте папка што <u>не содржи</u> mbox-датотеки (на пример maildir-"
+"папка). Ако изберете, ќе добиете многу нови папки.</p><p>Бидејќи е возможно "
+"да се обнови структурата на папките, тие ќе бидат внесени во „Thunderbird-"
+"Import“.</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Фатално:</b> Не можам да ја стартувам КПошта за комуникација преку DCOP. "
 "Осигурете се дека е <i>КПошта</i> инсталирана."
@@ -594,63 +555,58 @@ msgstr "Не можам да ја додадам пораката во папк�
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Грешка при додавање на пораката во папката %1 во КПошта"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Внесување на пораки како обичен текст"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Од:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Изберете ја папката на вашиот систем што ги содржи пораките. Тие ќе бидат "
-"внесени во папка со исто име како папката каде што биле, со префикс PLAIN-</p>"
-"<p>Овој филтер ќе ги внесе сите датотеки со наставки .msg, .eml и .txt.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "До:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Внесување на mbox-датотеки (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Тековна:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Филтер за внесување на mbox-датотеки</b></p>"
-"<p>Овој филтер ќе ги внесе mbox-датотеките во KMail. Користете го овој филтер "
-"ако сакате да внесете пораки од Ximian Evolution или други програми што го "
-"користат овој традиционален UNIX-формат.</p>"
-"<p><b>Забелешка:</b> Пораките ќе бидат внесени во папки именувани според "
-"датотеката од која што дошле, со префикс MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Внесувањето е во тек..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox-датотеки (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Внесување на пораки и структура на папки од The Bat!"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Вкупно:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Кликнете „Назад“ за да внесете други пошти или контакти"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Филтер за внесување од „The Bat!“</b></p>"
-"<p>Изберете ја основната папка од локалната папка за пошта на „The Bat!“ од "
-"каде што сакате да ги внесете пораките.</p>"
-"<p><b>Забелешка:</b> Овој филтер ги внесува *.tbb-датотеките од локалната папка "
-"на „The Bat!“, на пример од POP-сметки, а не од IMAP/DIMAP-сметки.</p>"
-"<p>Бидејќи е можно да се обнови структурата на папки, тие ќе бидат внесени под "
-"„TheBat-Import“ во вашата локална сметка.</p>"
+"<b>Добредојдовте во KMailCVT - алатката за внесување на КПошта</b>\n"
+"<br><br>\n"
+"Оваа програма ќа ви помогне да ги внесете во КПошта вашите пораки од вашата "
+"претходна програма за пошта.<br><br><br><br>\n"
+" Изберете ја програмата од која што сакате да ја внесете поштата и потоа "
+"кликнете „Следно“."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Отстрани пораки-&дупликати при внесување"
diff --git a/tde-i18n-ms/messages/tdepim/kmailcvt.po b/tde-i18n-ms/messages/tdepim/kmailcvt.po
index 2fbf2754382..e95a1256438 100644
--- a/tde-i18n-ms/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ms/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mimos\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-10-10 08:43+0800\n"
 "Last-Translator: MIMOS <opensource@mimos.my>\n"
 "Language-Team: Malay <kedidiemas@yahoogroups.com>\n"
@@ -13,25 +13,82 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Import e-mel Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "MIMOS"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "opensource@mimos.my"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Alat pengimport KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Langkah 1: Pilih Penapis"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Langkah 2: Mengimport..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Import sedang berjalan"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import tamat"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Ditulis oleh %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Penapis import KMail "
+
+#: main.cpp:35
+#, fuzzy
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2003, Pembangun KMailCVT "
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Pengarang asal"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "GUI baru & pembersihan"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Impot Mel Setempat Evolution 1.x dan Struktur Folder"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Penapis import e-mel Outlook</b></p>"
-"<p>Penapis ini akan mengimport mel dari fail-pst Outlook. Anda perlu mencari "
-"folder tempat fail-pst disimpan dengan mencari fail .pst di bawah: <i>"
-"C:\\Dokumen dan Seting</i> dalam Windows 2000 atau versi yang lebih baru</p>"
-"<p><b>Perhatian:</b> E-mel akan diimport ke dalam folder yang dinamakan "
-"berdasarkan akaun asal, dengan awalan  OUTLOOK-</p>"
+"<p><b>Penapis import Evolution 1.x </b></p><p>Pilih direktori dasar mel "
+"Evolution (biasanya ~/evolution/local).</p><p>Oleh sebab struktur folder "
+"boleh dicipta semula, folder akan distorkan di bawah: \"Evolution-Import\".</"
+"p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -41,27 +98,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Tiada direktori dipilih"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Menghitung fail..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Menghitung mel..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Menghitung direktori..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Menghitung folder..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Mengimport fail mel baru..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -69,6 +105,22 @@ msgstr "Mengimport fail mel baru..."
 msgid "No files found for import."
 msgstr "Tiada fail ditemui untuk import."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Selesai mengimpot e-mel dari %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Tidak dapat membuka %1, melangkau"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -86,38 +138,37 @@ msgstr ""
 "_n: 1 mesej duplikat tak diimport\n"
 "%n mesej duplikat tak diimport"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Tidak dapat membuka %1, melangkau"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Impot Mel Setempat Evolution 1.x dan Struktur Folder"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Import Mel Setempat  Evolution 2.x dan Struktur Folder"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Penapis import Evolution 1.x </b></p>"
-"<p>Pilih direktori dasar mel Evolution (biasanya ~/evolution/local).</p>"
-"<p>Oleh sebab struktur folder boleh dicipta semula, folder akan distorkan di "
-"bawah: \"Evolution-Import\".</p>"
+"<p><b>Penapis import Evolution 2.x</b></p><p>Pilih direktori dasar folder "
+"mel Evolution setempat anda (biasanya ~/.evolution/mail/local/). </"
+"p><p><b>Perhatian:</b> Jangan sekali-kali pilih Folder yang <u>tidak</u> "
+"mengandungi fail mbox (contohnya meldir): jika anda melakukannya, anda akan "
+"menerima banyak folder.</p><p>Oleh sebab struktur folder boleh dicipta "
+"semula, folder akan disimpan di bawah: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Selesai mengimpot e-mel dari %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Import ditamatkan, dibatalkan oleh pengguna."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Mulakan import fail %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -125,66 +176,43 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Import folder dari Mel Pegasus"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Pilih direktori  Pegasus-Mail dalam sistem anda (mengandungi fail*.CNM, "
-"*.PMM dan *.MBX). Dalam kebanyakan sistem, ia disimpan dalam C:\\pmail\\mail "
-"atau C:\\pmail\\mel\\admin</p>"
-"<p><b>Perhatian:</b> Oleh sebab struktur folder boleh dicipta, folder akan "
-"disimpan di bawah: \"PegasusMail-Import\".</p>"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
+msgstr "Import Meldir KMail dan Struktur Folder"
 
-#: filter_pmail.cxx:69
+#: filter_kmail_maildir.cxx:28
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"Tidak dapat mengkaji hurai struktur folder; import diteruskan tanpa sokongan "
-"subfolder."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Mengimport fail mel baru ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Mengimport folder mel ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Mengimport folder mel  'UNIX'  ('.mbx')..."
+"<p><b>Penapis import KMail</b></p><p>Pilih direktori dasar folder mel  KMail "
+"yang anda ingin import.</p><p><b>Perhatian:</b> Jangan sekali-kali pilih "
+"meldir semasa KMail anda (biasanya ~/Mel atau  ~/.trinity/share/apps/kmail/"
+"mel ): dalam kes ini, KMailCVT mungkin terperangkap dalam gelung berterusan. "
+"</p><p>Penapis ini tidak mengimport folder mel KMail yang ada fail mbox.</"
+"p><p>Oleh sebab struktur folder boleh dicipta semula, folder akan disimpan "
+"di bawah: \"KMail-Import\" dalam folder setempat anda.</p>"
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Mengimport %1"
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+msgid "Import folder %1..."
+msgstr "Import folder %1..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
 #, c-format
-msgid "Message %1"
-msgstr "Mesej %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Mengkaji hurai struktur folder..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Ditulis oleh %1.</i></p>"
+msgid "Could not import %1"
+msgstr "Tidak dapat mengimport %1"
 
 #: filter_lnotes.cxx:30
 #, fuzzy
@@ -194,21 +222,19 @@ msgstr "Import e-mel Outlook"
 #: filter_lnotes.cxx:32
 #, fuzzy
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<p><b>Penapis import mbox</b></p>"
-"<p>Penapis ini akan mengimport fail mbox ke dalam  KMail. Gunakan penapis ini "
-"jika anda ingin mengimport mel dari Ximian Evolution atau penghantar mel lain "
-"yang menggunakan format tradisional UNIX ini.</p>"
-"<p><b>Perhatian:</b> E-mel akan diimport ke dalam folder yang dinamakan "
-"berdasarkan folder asal, dengan awalan MBOX-</p>"
+"<p><b>Penapis import mbox</b></p><p>Penapis ini akan mengimport fail mbox ke "
+"dalam  KMail. Gunakan penapis ini jika anda ingin mengimport mel dari Ximian "
+"Evolution atau penghantar mel lain yang menggunakan format tradisional UNIX "
+"ini.</p><p><b>Perhatian:</b> E-mel akan diimport ke dalam folder yang "
+"dinamakan berdasarkan folder asal, dengan awalan MBOX-</p>"
 
 #: filter_lnotes.cxx:55
 #, fuzzy
@@ -220,232 +246,10 @@ msgstr "Fail mbox (*)"
 msgid "Importing emails from %1"
 msgstr "Mengimport e-mel dari %1..."
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr "Import Meldir KMail dan Struktur Folder"
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-"<p><b>Penapis import KMail</b></p>"
-"<p>Pilih direktori dasar folder mel  KMail yang anda ingin import.</p>"
-"<p><b>Perhatian:</b> Jangan sekali-kali pilih meldir semasa KMail anda "
-"(biasanya ~/Mel atau  ~/.trinity/share/apps/kmail/mel ): dalam kes ini, "
-"KMailCVT mungkin terperangkap dalam gelung berterusan. </p>"
-"<p>Penapis ini tidak mengimport folder mel KMail yang ada fail mbox.</p>"
-"<p>Oleh sebab struktur folder boleh dicipta semula, folder akan disimpan di "
-"bawah: \"KMail-Import\" dalam folder setempat anda.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Import ditamatkan, dibatalkan oleh pengguna."
-
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-msgid "Import folder %1..."
-msgstr "Import folder %1..."
-
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
-msgid "Could not import %1"
-msgstr "Tidak dapat mengimport %1"
-
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Import Mel Setempat dan Struktur FolderThunderbird/Mozilla "
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Penapis import Thunderbird/Mozilla</b></p>"
-"<p>Memilih folder mel dasar Thunderbird/Mozilla anda (biasanya "
-"~/.thunderbird/*.default/Mel/Local Folder/).</p>"
-"<p><b>Perhatian:</b> Jangan sekali-kali memilih Folder yang  <u>tidak </u> "
-"mengandungi fail mbox (contohnya, meldir): jika anda lakukan, anda akan "
-"menerima banyak folder baru.</p>"
-"<p>Oleh kerana struktur folder boleh dicipta semula, folder akan distorkan di "
-"bawah: \"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Mulakan import fail %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Import e-mel Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Penapis import e-mel Opera</b></p>"
-"<p>Penapis ini akan mengimport mel dari folder mel Opera. Gunakan penapis ini "
-"jika anda ingin mengimport semua e-mel dalam satu akaun dalam meldir Opera.</p>"
-"<p>Pilih direktori akaun (biasanya ~/.opera/mel/stor/akaun*).</p>"
-"<p><b>Perhatian:</b> E-mel akan diimport ke satu folder yang dinamakan "
-"berdasarkan akaun asal mereka, dengan awalan  OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Import Mel Setempat  Evolution 2.x dan Struktur Folder"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Penapis import Evolution 2.x</b></p>"
-"<p>Pilih direktori dasar folder mel Evolution setempat anda (biasanya "
-"~/.evolution/mail/local/). </p>"
-"<p><b>Perhatian:</b> Jangan sekali-kali pilih Folder yang <u>tidak</u> "
-"mengandungi fail mbox (contohnya meldir): jika anda melakukannya, anda akan "
-"menerima banyak folder.</p>"
-"<p>Oleh sebab struktur folder boleh dicipta semula, folder akan disimpan di "
-"bawah: \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Daripada:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Kepada:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Semasa:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Import sedang berjalan..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Jumlah:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Klik 'Undur' untuk mengimport lebih banyak e-mel atau orang hubungan"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>Selamat Datang ke KMailCVT - Alat KMail Import</b>\n"
-"<br>"
-"<br>\n"
-"Program ini akan membantu anda mengimpot e-mel dari program e-mel terdahulu ke "
-"dalam KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Pilih program yang darinya anda ingin import, kemudian klik 'Seterusnya'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Buang mesej &duplikat semasa import"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Penapis import KMail "
-
-#: main.cpp:35
-#, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2003, Pembangun KMailCVT "
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Pengarang asal"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "GUI baru & pembersihan"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "MIMOS"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "opensource@mimos.my"
+msgid "Message %1"
+msgstr "Mesej %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -453,11 +257,11 @@ msgstr "Import dari Mel OS X"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Penapis Import Mel OS X </b></p>"
-"<p>Penapis ini mengimport e-mel dari pelanggan Apple Mac OS X.</p>"
+"<p><b>Penapis Import Mel OS X </b></p><p>Penapis ini mengimport e-mel dari "
+"pelanggan Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 #, fuzzy
@@ -468,25 +272,27 @@ msgstr ""
 "_n: 1 mesej duplikat yang tak diimport ke folder %1 dalam KMail\n"
 "%n mesej duplikat yang tak diimport ke folder  %1 dalam KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Alat pengimport KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Langkah 1: Pilih Penapis"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Langkah 2: Mengimport..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Import Fail mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Import sedang berjalan"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Penapis import mbox</b></p><p>Penapis ini akan mengimport fail mbox ke "
+"dalam  KMail. Gunakan penapis ini jika anda ingin mengimport mel dari Ximian "
+"Evolution atau penghantar mel lain yang menggunakan format tradisional UNIX "
+"ini.</p><p><b>Perhatian:</b> E-mel akan diimport ke dalam folder yang "
+"dinamakan berdasarkan folder asal, dengan awalan MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import tamat"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Fail mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -494,25 +300,21 @@ msgstr "Import Emel Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Penapis import Outlook Express 4/5/6 </b></p>"
-"<p>Anda perlu mencari folder di mana kotak mel disimpan dengan mencari  fail "
-".dbx atau .mbx "
-"<ul>"
-"<li><i>di bawah C:\\Windows\\Application Data</i> dalam Windows 9x"
-"<li><i>Dokumen dan Seting</i> dalam Windows 2000 atau versi lebih baru</ul></p>"
-"<p><b>Perhatian:</b> Oleh sebab struktur folder boleh dicipta semula, folder "
-"dari Outlook Express 5 and 6 akan disimpan di bawah: \"OE-Import\" di dalam "
-"folder setempat anda.</p>"
+"<p><b>Penapis import Outlook Express 4/5/6 </b></p><p>Anda perlu mencari "
+"folder di mana kotak mel disimpan dengan mencari  fail .dbx atau .mbx "
+"<ul><li><i>di bawah C:\\Windows\\Application Data</i> dalam Windows "
+"9x<li><i>Dokumen dan Seting</i> dalam Windows 2000 atau versi lebih baru</"
+"ul></p><p><b>Perhatian:</b> Oleh sebab struktur folder boleh dicipta semula, "
+"folder dari Outlook Express 5 and 6 akan disimpan di bawah: \"OE-Import\" di "
+"dalam folder setempat anda.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -547,34 +349,196 @@ msgstr "Mengimport Kotak Mel  OE5+ %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Mengimport Fail Folder  OE5+ %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Import e-mel Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Penapis import e-mel Opera</b></p><p>Penapis ini akan mengimport mel "
+"dari folder mel Opera. Gunakan penapis ini jika anda ingin mengimport semua "
+"e-mel dalam satu akaun dalam meldir Opera.</p><p>Pilih direktori akaun "
+"(biasanya ~/.opera/mel/stor/akaun*).</p><p><b>Perhatian:</b> E-mel akan "
+"diimport ke satu folder yang dinamakan berdasarkan akaun asal mereka, dengan "
+"awalan  OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Menghitung fail..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Mengimport fail mel baru..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Import e-mel Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Penapis import e-mel Outlook</b></p><p>Penapis ini akan mengimport mel "
+"dari fail-pst Outlook. Anda perlu mencari folder tempat fail-pst disimpan "
+"dengan mencari fail .pst di bawah: <i>C:\\Dokumen dan Seting</i> dalam "
+"Windows 2000 atau versi yang lebih baru</p><p><b>Perhatian:</b> E-mel akan "
+"diimport ke dalam folder yang dinamakan berdasarkan akaun asal, dengan "
+"awalan  OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Menghitung mel..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Menghitung direktori..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Menghitung folder..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Import e-mel teks biasa"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Pilih direktori yang mengandungi e-mel pada sistem anda. E-mel "
+"ditempatkan dalam folder yang namanya sama dengan direktori asal, dengan "
+"awalan PLAIN-</p><p>Penapis ini akan mengimport semua e-mel  .msg, .eml dan ."
+"txt.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Import folder dari Mel Pegasus"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Pilih direktori  Pegasus-Mail dalam sistem anda (mengandungi fail*.CNM, *."
+"PMM dan *.MBX). Dalam kebanyakan sistem, ia disimpan dalam C:\\pmail\\mail "
+"atau C:\\pmail\\mel\\admin</p><p><b>Perhatian:</b> Oleh sebab struktur "
+"folder boleh dicipta, folder akan disimpan di bawah: \"PegasusMail-Import\"."
+"</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Tidak dapat mengkaji hurai struktur folder; import diteruskan tanpa sokongan "
+"subfolder."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Mengimport fail mel baru ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Mengimport folder mel ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Mengimport folder mel  'UNIX'  ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Mengimport %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Mengkaji hurai struktur folder..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Import Meldir Sylpheed dan Struktur Folder"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Penapis import Sylpheed</b></p><p>Pilih direktori dasar folder mel "
+"Sylpheed yang anda ingin import (biasanya: ~/Mel ).</p><p>Oleh sebab "
+"struktur folder boleh dicipta semula, folder akan distorkan di bawah: "
+"\"Sylpheed-Import\" dalam folder setempat anda.</p><p>Penapis ini juga "
+"mencipta semula status mesej, misalnya baru atau diperpanjang."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Import Mel Bat! dan Struktur Folder "
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Penapis import The Bat!</b></p><p>Pilih direktori dasar folder mel "
+"setempat 'The Bat!' yang anda ingin import.</p><p><b>Perhatian:</b> Penapis "
+"ini mengimport fail *.tbb dari folder setempat 'The Bat!', cth: dari akaun "
+"POP , dan bukan dari akaun  IMAP/DIMAP.</p><p>Oleh sebab struktur folder "
+"boleh dicipta semula, folder akan disimpan di bawah: \"TheBat-Import\" dalam "
+"akaun setempat anda.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Import Mel Setempat dan Struktur FolderThunderbird/Mozilla "
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Penapis import Sylpheed</b></p>"
-"<p>Pilih direktori dasar folder mel Sylpheed yang anda ingin import (biasanya: "
-"~/Mel ).</p>"
-"<p>Oleh sebab struktur folder boleh dicipta semula, folder akan distorkan di "
-"bawah: \"Sylpheed-Import\" dalam folder setempat anda.</p>"
-"<p>Penapis ini juga mencipta semula status mesej, misalnya baru atau "
-"diperpanjang."
+"<p><b>Penapis import Thunderbird/Mozilla</b></p><p>Memilih folder mel dasar "
+"Thunderbird/Mozilla anda (biasanya ~/.thunderbird/*.default/Mel/Local "
+"Folder/).</p><p><b>Perhatian:</b> Jangan sekali-kali memilih Folder yang  "
+"<u>tidak </u> mengandungi fail mbox (contohnya, meldir): jika anda lakukan, "
+"anda akan menerima banyak folder baru.</p><p>Oleh kerana struktur folder "
+"boleh dicipta semula, folder akan distorkan di bawah: \"Thunderbird-Import\"."
+"</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<b>Fatal:</b> Tidak dapat memulakan KMail untuk komunikasi  DCOP. Pastikan <i>"
-"kmail</i> telah dipasang."
+"<b>Fatal:</b> Tidak dapat memulakan KMail untuk komunikasi  DCOP. Pastikan "
+"<i>kmail</i> telah dipasang."
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -588,66 +552,60 @@ msgstr "Tidak dapat menambah mesej ke folder %1 dalam KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Ralat semasa menambah mesej ke folder %1 dalam KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Import e-mel teks biasa"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Daripada:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Pilih direktori yang mengandungi e-mel pada sistem anda. E-mel ditempatkan "
-"dalam folder yang namanya sama dengan direktori asal, dengan awalan PLAIN-</p>"
-"<p>Penapis ini akan mengimport semua e-mel  .msg, .eml dan .txt.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Kepada:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Import Fail mbox (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Semasa:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Penapis import mbox</b></p>"
-"<p>Penapis ini akan mengimport fail mbox ke dalam  KMail. Gunakan penapis ini "
-"jika anda ingin mengimport mel dari Ximian Evolution atau penghantar mel lain "
-"yang menggunakan format tradisional UNIX ini.</p>"
-"<p><b>Perhatian:</b> E-mel akan diimport ke dalam folder yang dinamakan "
-"berdasarkan folder asal, dengan awalan MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Import sedang berjalan..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Fail mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Import Mel Bat! dan Struktur Folder "
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Jumlah:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Klik 'Undur' untuk mengimport lebih banyak e-mel atau orang hubungan"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Penapis import The Bat!</b></p>"
-"<p>Pilih direktori dasar folder mel setempat 'The Bat!' yang anda ingin "
-"import.</p>"
-"<p><b>Perhatian:</b> Penapis ini mengimport fail *.tbb dari folder setempat "
-"'The Bat!', cth: dari akaun POP , dan bukan dari akaun  IMAP/DIMAP.</p>"
-"<p>Oleh sebab struktur folder boleh dicipta semula, folder akan disimpan di "
-"bawah: \"TheBat-Import\" dalam akaun setempat anda.</p>"
+"<b>Selamat Datang ke KMailCVT - Alat KMail Import</b>\n"
+"<br><br>\n"
+"Program ini akan membantu anda mengimpot e-mel dari program e-mel terdahulu "
+"ke dalam KMail.<br><br><br><br>\n"
+"Pilih program yang darinya anda ingin import, kemudian klik 'Seterusnya'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Buang mesej &duplikat semasa import"
 
 #~ msgid "KImportPageDlg"
 #~ msgstr "KImportPageDlg"
diff --git a/tde-i18n-nb/messages/tdepim/kmailcvt.po b/tde-i18n-nb/messages/tdepim/kmailcvt.po
index c9da74c268a..7a8637872d4 100644
--- a/tde-i18n-nb/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-nb/messages/tdepim/kmailcvt.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-01-28 15:44+0100\n"
 "Last-Translator: Lars Risan <lrisan@tik.uio.no>\n"
 "Language-Team: Norsk bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -25,25 +25,85 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Importer e-post fra Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Knut Yrvin,Bjørn Steensrud,Nils Kristian Tomren, Axel Bojer"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+"knuty@skolelinux.no,bjornst@powertech.no,project@nilsk.net, axelb@skolelinux."
+"no"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Importverktøy for KMail"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Trinn 1: Velg filter "
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Trinn 2: Importerer …"
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Holder på å importere"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Ferdig med å importere"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Skrevet av %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Importfiltre for KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "© 2000–2003 KMailCVT-utviklerne"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Opprinnelig forfatter"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Vedlikeholder og nye filtre"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nytt grensesnitt og opprydding"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Importer lokale e-poster og mappestrukturen fra Evolution 1.x"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Importfilter for Outlook</b></p>"
-"<p>Dette filteret vil importere e-poster fra en Outlook pst-fil. Du må finne "
-"mappa hvor dine lokale pst-filer er lagret ved å søke etter .pst filer under: "
-"<i>C:\\Documents and Settings</i> i Windows 2000 eller senere</p>"
-"<p><b>Merk:</b>E-post vil importeres til mapper som får navn fra filene de kom "
-"fra, med forstavelsen «OUTLOOK-».</p>"
+"<p><b>Importfilter for Evolution 1.x</b></p><p>Velg din lokale Evolution-"
+"postmappe (vanligvis ~/.evolution/mail/local/).</p><p><b>Merk:</b> Aldri "
+"velg en mappe som <u>ikke</u> inneholder mbox-filer (for eksempel en "
+"maildir). Om du likevel gjør det vil du få mange nye mapper.</p><p>Siden det "
+"er mulig å gjenopprette mappestrukturen, vil mappene bli lagret under "
+"«Evolution-Import».</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -53,27 +113,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Ingen mappe valgt"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Teller filer …"
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Teller e-poster …"
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Teller kataloger …"
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Teller mapper …"
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Importerer nye e-postfiler …"
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -81,6 +120,22 @@ msgstr "Importerer nye e-postfiler …"
 msgid "No files found for import."
 msgstr "Ingen filer funnet for import"
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Ferdig med å importere e-poster fra %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Klarte ikke åpne %1, hopper over"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -98,40 +153,37 @@ msgstr ""
 "1 duplikatmelding ble ikke importert\n"
 "%n duplikatmeldinger ble ikke importert"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Klarte ikke åpne %1, hopper over"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Importer lokale e-poster og mappestrukturen fra Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Importer lokale e-poster og mappestruktur fra Evolution 2.x "
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Importfilter for Evolution 1.x</b></p>"
-"<p>Velg din lokale Evolution-postmappe (vanligvis ~/.evolution/mail/local/).</p>"
-"<p><b>Merk:</b> Aldri velg en mappe som <u>ikke</u> inneholder mbox-filer (for "
-"eksempel en maildir). Om du likevel gjør det vil du få mange nye mapper.</p>"
-"<p>Siden det er mulig å gjenopprette mappestrukturen, vil mappene bli lagret "
-"under «Evolution-Import».</p>"
+"<p><b>Importfilter for Evolution 2.x</b></p><p>Velg din lokale Evolution-e-"
+"postmappe (vanligvis ~/.evolution/mail/local/).</p><p><b>Merk:</b> Aldri "
+"velg en mappe som <u>ikke</u> inneholder mbox-filer (for eksempel en "
+"maildir). Hvis du gjør det vil du få mange nye mapper.</p><p>Siden det er "
+"mulig å gjenopprette mappestrukturen, vil mappene bli lagret under "
+"«Evolution-Import».</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Ferdig med å importere e-poster fra %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Ferdig å importere, avbrutt av brukeren."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Start import av fila %1 …"
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -139,130 +191,32 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importer mapper fra Pegasus-e-post"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Velg mappa for Pegasus-e-post på systemet (som inneholder *.CNM, *.PMM og "
-"*.MBX-filer). På mange systemer er disse lagret i C:\\Pmail\\mail eller "
-"C:\\pmail\\mail\\admin </p>"
-"<p><b>Merk:</b> Siden det er mulig å importere mappestrukturen vil mappene bli "
-"lagret under «PegasusMail-Import».</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Klarte ikke å tolke mappestrukturen; fortsetter importeringa uten støtte for "
-"undermapper."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importerer filer med ny e-post («.cnm») …"
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importerer postmapper («.pmm») …"
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importerer «UNIX» e-postmapper («.mbx») …"
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importerer %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Melding %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Tolker mappestrukturen …"
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Skrevet av %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Importer e-post fra «Lotus Notes»"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Importfilter for e-post i strukturert tekst fra Lotus Notes</b></p>"
-"<p>Dette filteret vil importere strukturerte tekstfiler fra en eksportert Lotus "
-"Notes e-postklient til KMail. Bruk dette filteret hvis du vil importere "
-"e-poster fra Lotus Notes eller andre e-postprogrammer som bruker Lotusformatet "
-"«Strukturert tektformat» (Structured Text format).</p>"
-"<p><b>Merk:</b> Siden det er mulig å gjenopprette mappestrukturen vil "
-"importerte meldinger havne i mapper under «LNotes-Import» i din lokale "
-"e-postmappe. Disse mappene vil få navn etter filene som e-postene kom fra</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Alle filer (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Importerer e-post fra %1"
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "Importer e-post og mappestruktur fra Kmails «Maildir»"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Importfilter for Kmail</b></p>"
-"<p>Velg bunnmappa til den Kmail-mappa du vil importere.</p> "
-"<p><b>Merk:</b> Aldri velg den lokale maildir-mappa du bruker nå (vanligvis "
-"~/Mail eller ~/.trinity/share/apps/kmail/mail): KmailCVT kan da låse seg i en "
-"evig løkke</p> "
-"<p>Dette filteret importerer ikke Kmail-e-postmapper i formatet «mbox».</p> "
-"<p>Siden det er mulig p gjenopprette mappestrukturen vil mappene bli lagret "
-"under «KMail-Import» i din lokale e-postmappe.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Ferdig å importere, avbrutt av brukeren."
+"<p><b>Importfilter for Kmail</b></p><p>Velg bunnmappa til den Kmail-mappa du "
+"vil importere.</p> <p><b>Merk:</b> Aldri velg den lokale maildir-mappa du "
+"bruker nå (vanligvis ~/Mail eller ~/.trinity/share/apps/kmail/mail): "
+"KmailCVT kan da låse seg i en evig løkke</p> <p>Dette filteret importerer "
+"ikke Kmail-e-postmapper i formatet «mbox».</p> <p>Siden det er mulig p "
+"gjenopprette mappestrukturen vil mappene bli lagret under «KMail-Import» i "
+"din lokale e-postmappe.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -275,188 +229,42 @@ msgstr "Importer mappa %1 …"
 msgid "Could not import %1"
 msgstr "Kunne ikke importere %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Importer lokale meldinger og mappestruktur fra Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Importfilter for Thunderbird/Mozilla</b></p>"
-"<p>Velg din Thunderbird/MOzilla postmappe (vanligvis "
-"~/thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Merk:</b> Aldri velg en mappe som <u>ikke</u> inneholder mbox-filer (for "
-"eksempel «maildir»). Hvis du likevel gjør det vil du få mange nye mapper.</p>"
-"<p>Siden det er mulig å gjenopprette mappestrukturen, vil mappa bli lagret "
-"under «Thunderbird-Import»</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Start import av fila %1 …"
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Importer e-post fra Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Importfilter for Opera</b></p>"
-"<p>Dette filteret vil importere e-poster fra Opera. Bruk dette filteret hvis du "
-"vil importere alle e-postene fra en konto i Operas «maildir»-mappe.</p>"
-"<p>Velg konto-mappa (vanligvis ~/.opera/mail/store/account*).</p>"
-"<p><b>Merk:</b> E-poster vil bli importert til en mappe som får navn etter "
-"kontoen de kom fra og med forstaveøsen «OPERA-»</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Importer lokale e-poster og mappestruktur fra Evolution 2.x "
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Importfilter for Evolution 2.x</b></p>"
-"<p>Velg din lokale Evolution-e-postmappe (vanligvis "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Merk:</b> Aldri velg en mappe som <u>ikke</u> inneholder mbox-filer (for "
-"eksempel en maildir). Hvis du gjør det vil du få mange nye mapper.</p>"
-"<p>Siden det er mulig å gjenopprette mappestrukturen, vil mappene bli lagret "
-"under «Evolution-Import».</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Fra:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Til:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Denne:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Importerer …"
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr " …"
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Totalt:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Trykk «Tilbake» for å importere flere e-poster eller kontakter"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Importer e-post fra «Lotus Notes»"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Dette er KMailCVT – Importverktøyet til KMail</b>\n"
-"<br>"
-"<br>\n"
-"Dette programmet hjelper deg å importere e-postmeldinger fra andre "
-"e-postprogrammer og til KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Velg det programmet du vil importere fra og trykk «Neste»."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Fjern &duplikatmeldinger under import"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Importfiltre for KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "© 2000–2003 KMailCVT-utviklerne"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Opprinnelig forfatter"
+"<p><b>Importfilter for e-post i strukturert tekst fra Lotus Notes</b></"
+"p><p>Dette filteret vil importere strukturerte tekstfiler fra en eksportert "
+"Lotus Notes e-postklient til KMail. Bruk dette filteret hvis du vil "
+"importere e-poster fra Lotus Notes eller andre e-postprogrammer som bruker "
+"Lotusformatet «Strukturert tektformat» (Structured Text format).</"
+"p><p><b>Merk:</b> Siden det er mulig å gjenopprette mappestrukturen vil "
+"importerte meldinger havne i mapper under «LNotes-Import» i din lokale e-"
+"postmappe. Disse mappene vil få navn etter filene som e-postene kom fra</p>"
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Vedlikeholder og nye filtre"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nytt grensesnitt og opprydding"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Alle filer (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Knut Yrvin,Bjørn Steensrud,Nils Kristian Tomren, Axel Bojer"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Importerer e-post fra %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"knuty@skolelinux.no,bjornst@powertech.no,project@nilsk.net, axelb@skolelinux.no"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Melding %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -464,11 +272,11 @@ msgstr "Importer mapper fra «OS X Mail»"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Filter for import av meldinger fra OS X Mail</b></p> "
-"<p>Dette filteret importerer meldinger fra e-postklienten i Apple Max OS X.</p>"
+"<p><b>Filter for import av meldinger fra OS X Mail</b></p> <p>Dette filteret "
+"importerer meldinger fra e-postklienten i Apple Max OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -478,25 +286,27 @@ msgstr ""
 "1 duplikat melding ikke importert til mappa %1 i KMail\n"
 "%n duplikatmeldinger ble ikke importert til mappa %1 i KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Importverktøy for KMail"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Trinn 1: Velg filter "
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Trinn 2: Importerer …"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importer mbox-filer (Unix, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Holder på å importere"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Importfilter for mbox</b></p><p>Dette filteret vil importere mbox-"
+"filer til KMail. Bruk dette filteret hvis du vil importere e-poster fra "
+"Ximian Evolution eller andre e-postprogrammer som bruker dette tradisjonelle "
+"UNIX-formatet.</p><p><b>Merk:</b> E-poster blir importert til mapper som får "
+"navn etter den fila de kom fra og med forstavelsen «MBOX-»</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Ferdig med å importere"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox-filer (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -504,25 +314,20 @@ msgstr "Importer Outlook Express e-poster"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Importfilter for Outlook Express 4/5/6</b></p>"
-"<p>Finn mappa der e-posten er lagret ved å søke etter: .dbx- eller .mbx-filer "
-"under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> i Windows 9x"
-"<li><i>Documents and Settings</i> i Windows 2000 eller senere</ul></p></p> "
-"<p><b>Merk:</b>Siden det er mulig å gjenopprette mappestrukturen vil mapper fra "
-"Outlook Express 5 og 6 bli lagret under «OE-Import» i din lokale "
-"e-postmappe.</p> "
+"<p><b>Importfilter for Outlook Express 4/5/6</b></p><p>Finn mappa der e-"
+"posten er lagret ved å søke etter: .dbx- eller .mbx-filer under <ul><li><i>C:"
+"\\Windows\\Application Data</i> i Windows 9x<li><i>Documents and Settings</"
+"i> i Windows 2000 eller senere</ul></p></p> <p><b>Merk:</b>Siden det er "
+"mulig å gjenopprette mappestrukturen vil mapper fra Outlook Express 5 og 6 "
+"bli lagret under «OE-Import» i din lokale e-postmappe.</p> "
 
 #: filter_oe.cxx:67
 #, c-format
@@ -557,33 +362,191 @@ msgstr "Importerer OE5+-postboksen %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importerer mappefila %1 fra OE5+"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Importer e-post fra Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Importfilter for Opera</b></p><p>Dette filteret vil importere e-poster "
+"fra Opera. Bruk dette filteret hvis du vil importere alle e-postene fra en "
+"konto i Operas «maildir»-mappe.</p><p>Velg konto-mappa (vanligvis ~/.opera/"
+"mail/store/account*).</p><p><b>Merk:</b> E-poster vil bli importert til en "
+"mappe som får navn etter kontoen de kom fra og med forstaveøsen «OPERA-»</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Teller filer …"
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Importerer nye e-postfiler …"
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Importer e-post fra Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Importfilter for Outlook</b></p><p>Dette filteret vil importere e-"
+"poster fra en Outlook pst-fil. Du må finne mappa hvor dine lokale pst-filer "
+"er lagret ved å søke etter .pst filer under: <i>C:\\Documents and Settings</"
+"i> i Windows 2000 eller senere</p><p><b>Merk:</b>E-post vil importeres til "
+"mapper som får navn fra filene de kom fra, med forstavelsen «OUTLOOK-».</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Teller e-poster …"
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Teller kataloger …"
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Teller mapper …"
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Importer e-post i ren tekst"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Velg mappa som inneholder e-posten din på systemet. E-postene er plassert "
+"i en mappe med samme navnet som mappa de var i med forstavelsen «PLAIN-»</"
+"p><p>Dette filteret importerer alle .msg, .eml og .txt e-poster.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importer mapper fra Pegasus-e-post"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Velg mappa for Pegasus-e-post på systemet (som inneholder *.CNM, *.PMM og "
+"*.MBX-filer). På mange systemer er disse lagret i C:\\Pmail\\mail eller C:"
+"\\pmail\\mail\\admin </p><p><b>Merk:</b> Siden det er mulig å importere "
+"mappestrukturen vil mappene bli lagret under «PegasusMail-Import».</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Klarte ikke å tolke mappestrukturen; fortsetter importeringa uten støtte for "
+"undermapper."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importerer filer med ny e-post («.cnm») …"
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importerer postmapper («.pmm») …"
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importerer «UNIX» e-postmapper («.mbx») …"
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importerer %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Tolker mappestrukturen …"
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importer e-post og mappestruktur fra Sylpheeds «Maildir»"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 msgstr ""
-"<p><b>Importfilter for Sylpheed</b></p> "
-"<p>Velg hvilken mappe du vil legge Sylpheeds «maildir» i (vanligvis ~/Mail).</p> "
-"<p>Siden det er mulig å gjenopprette mappestrukturen så vil mappene bli lagret "
-"under «Sylpheed-Import» i din lokale e-postmappe.</p> "
-"<p>Dette filteret opprettholder også statusen på meldingene, f.eks. «Ny» eller "
-"«Videresendt»."
+"<p><b>Importfilter for Sylpheed</b></p> <p>Velg hvilken mappe du vil legge "
+"Sylpheeds «maildir» i (vanligvis ~/Mail).</p> <p>Siden det er mulig å "
+"gjenopprette mappestrukturen så vil mappene bli lagret under «Sylpheed-"
+"Import» i din lokale e-postmappe.</p> <p>Dette filteret opprettholder også "
+"statusen på meldingene, f.eks. «Ny» eller «Videresendt»."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Importer e-post-meldinger og mappestruktur fra «The Bat!»"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Importfilter for The Bat!</b></p> <p>Velg bunnmappa til de e-"
+"postmeldingene i «The Bat!» du vil importere.</p> <p><b>Merk.</b>  Dette "
+"filteret importerer *.tbb-filer fra e-postmappene i «The Bat!», det vil si "
+"fra POP-kontoen og ikke fra IMAP/DIMAP-kontoen.</p><p>Siden det er mulig å "
+"gjenopprette mappestrukturen så vil mappene bli lagret under «The Bat."
+"import» i din lokale e-postmappe.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Importer lokale meldinger og mappestruktur fra Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Importfilter for Thunderbird/Mozilla</b></p><p>Velg din Thunderbird/"
+"MOzilla postmappe (vanligvis ~/thunderbird/*.default/Mail/Local Folders/).</"
+"p><p><b>Merk:</b> Aldri velg en mappe som <u>ikke</u> inneholder mbox-filer "
+"(for eksempel «maildir»). Hvis du likevel gjør det vil du få mange nye "
+"mapper.</p><p>Siden det er mulig å gjenopprette mappestrukturen, vil mappa "
+"bli lagret under «Thunderbird-Import»</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<b>Fatalt:</b> Klarte ikke starte KMail for DCOP-kommunikasjon. Sjekk at <i>"
-"kmail</i> er installert."
+"<b>Fatalt:</b> Klarte ikke starte KMail for DCOP-kommunikasjon. Sjekk at "
+"<i>kmail</i> er installert."
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -597,62 +560,57 @@ msgstr "Klarte ikke legge til melding i mappa %1 i KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Det oppsto en feil når meldinga ble lagt til mappa %1 i KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Importer e-post i ren tekst"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Fra:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Velg mappa som inneholder e-posten din på systemet. E-postene er plassert i "
-"en mappe med samme navnet som mappa de var i med forstavelsen «PLAIN-»</p>"
-"<p>Dette filteret importerer alle .msg, .eml og .txt e-poster.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Til:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importer mbox-filer (Unix, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Denne:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Importfilter for mbox</b></p>"
-"<p>Dette filteret vil importere mbox-filer til KMail. Bruk dette filteret hvis "
-"du vil importere e-poster fra Ximian Evolution eller andre e-postprogrammer som "
-"bruker dette tradisjonelle UNIX-formatet.</p>"
-"<p><b>Merk:</b> E-poster blir importert til mapper som får navn etter den fila "
-"de kom fra og med forstavelsen «MBOX-»</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Importerer …"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox-filer (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr " …"
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Importer e-post-meldinger og mappestruktur fra «The Bat!»"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Totalt:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Trykk «Tilbake» for å importere flere e-poster eller kontakter"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Importfilter for The Bat!</b></p> "
-"<p>Velg bunnmappa til de e-postmeldingene i «The Bat!» du vil importere.</p> "
-"<p><b>Merk.</b>  Dette filteret importerer *.tbb-filer fra e-postmappene i «The "
-"Bat!», det vil si fra POP-kontoen og ikke fra IMAP/DIMAP-kontoen.</p>"
-"<p>Siden det er mulig å gjenopprette mappestrukturen så vil mappene bli lagret "
-"under «The Bat.import» i din lokale e-postmappe.</p>"
+"<b>Dette er KMailCVT – Importverktøyet til KMail</b>\n"
+"<br><br>\n"
+"Dette programmet hjelper deg å importere e-postmeldinger fra andre e-"
+"postprogrammer og til KMail.<br><br><br><br>\n"
+"Velg det programmet du vil importere fra og trykk «Neste»."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Fjern &duplikatmeldinger under import"
diff --git a/tde-i18n-nds/messages/tdepim/kmailcvt.po b/tde-i18n-nds/messages/tdepim/kmailcvt.po
index bf501f094f6..158d6fd1e65 100644
--- a/tde-i18n-nds/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-nds/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-12-23 23:12+0100\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -14,28 +14,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Nettbreven ut Outlook importeren"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Sönke Dibbern"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "s_dibbern@web.de"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT-Importwarktüüch"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Schritt 1: Filter utsöken"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Schritt 2: Importeren..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Import löppt"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import afslaten"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Schreven vun %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Importfiltern för KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, De KMailCVT-Schrievers"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Orginaalautor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Pleger & Niege Filtern"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nieg Böversiet & Oprümen"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Lokaal Nettbreven un Ornerstruktuur ut Evolution 1.x importeren"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Importfilter för Outlook-Nettbreven</b></p>"
-"<p>Disse Filter importeert Nettbreven ut en pst-Datei vun Outlook. Du muttst "
-"den Oort vun den Orner mit de pst-Datei angeven. Wenn Du em nich kennst, söök "
-"na *.pst-Dateien binnen"
-"<ul>"
-"<li><i>C:\\Windows\\Anwennendaten</i> ünner Windows 98"
-"<li><i>C:\\Dokmenten un Instellen</i> ünner Windows 2000 oder nieger</ul></p>"
-"<p><b>Beacht bitte</b>: De Nettbreven warrt na en Orner importeert, de "
-"\"OUTLOOK-<i>Kontonaam</i>\" nöömt warrt.</p>"
+"<p><b>Importfilter för Evolution 1.x</b></p><p>Söök den Wörtelorner vun de "
+"Evolution-Nettpost ut (normalerwies is dat ~/evolution/local).</p><p>Ok de "
+"Struktuur vun de Ornern warrt övernahmen, se dukt ünner \"Evolution-Import\" "
+"op.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -45,27 +98,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Keen Orner utsöcht."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Dateien warrt tellt..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Nettbreven warrt tellt..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Verteken warrt tellt..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Ornern warrt tellt..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Nieg Nettpostdateien warrt importeert..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -73,6 +105,22 @@ msgstr "Nieg Nettpostdateien warrt importeert..."
 msgid "No files found for import."
 msgstr "Keen Dateien för't Importeren funnen."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Import vun Nettbreven vun %1 is afslaten"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "%1 lett sik nich opmaken, warrt övergahn"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -90,39 +138,37 @@ msgstr ""
 "1 dubbelt Naricht nich importeert\n"
 "%n dubbelte Narichten nich importeert"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "%1 lett sik nich opmaken, warrt övergahn"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Lokaal Nettbreven un Ornerstruktuur ut Evolution 1.x importeren"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Lokaal Nettbreven un Ornerstruktuur ut Evolution 2.x importeren"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Importfilter för Evolution 1.x</b></p>"
-"<p>Söök den Wörtelorner vun de Evolution-Nettpost ut (normalerwies is dat "
-"~/evolution/local).</p>"
-"<p>Ok de Struktuur vun de Ornern warrt övernahmen, se dukt ünner "
-"\"Evolution-Import\" op.</p>"
+"<p><b>Importfilter för Evolution 2.x</b></p><p>Söök den Wörtelorner för Dien "
+"lokaal Evolution-Nettpost ut (normalerwies is dat ~/.evolution/mail/local/)."
+"</p><p><b>Beacht bitte</b>: Söök bitte nienich Ornern ut, de <u>keen</u> "
+"mbox-Dateien bargt (t.B. KMail-Nettpostornern): Wenn Du dat liekers deist, "
+"kriggst Du en Barg niege Ornern.</p><p>Ok de Struktuur vun de Ornern warrt "
+"övernahmen, se dukt ünner \"Evolution-Import\" op.</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Import vun Nettbreven vun %1 is afslaten"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Importeren beendt, Bruker hett afbraken"
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Import vun Datei \"%1\" start..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -130,66 +176,42 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Nettpostornern ut Pegasus-Mail importeren"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Söök den Nettpostorner vun Pegasus-Mail op Dien Systeem ut (he bargt *.cnm-, "
-"*.pmm- un *.mbx-Dateien). Op vele Systemen liggt he ünner C:\\pmail\\mail oder "
-"C:\\pmail\\mail\\admin.</p>"
-"<p><b>Beacht bitte</b>: Ok de Struktuur vun de Ornern warrt övernahmen, se dukt "
-"ünner \"PegasusMail-Import\" op.</p>"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
+msgstr "Nettpostornern un Ornerstruktuur ut KMail importeren"
 
-#: filter_pmail.cxx:69
+#: filter_kmail_maildir.cxx:28
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"Ornerstruktuur lett sik nich inlesen, Import warrt ahn Ünnerstütten för "
-"Ünnerornern wiedermaakt"
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Nieg Nettpostdateien (\"*.cnm\") warrt importeert..."
+"<p><b>Importfilter för KMail</b></p><p>Söök den Wörtelorner vun de KMail-"
+"Nettpost ut.</p><p><b>Beacht bitte</b>: Söök nienich Dien aktuell lokaal "
+"KMail-Nettpostorner ut (normalerwies is dat ~/Mail oder ~/.trinity/share/"
+"apps/kmail/mail ): KMailCVT kunn denn in en Rundloop fastsitten.</p><p>Disse "
+"Filter importeert keen KMail-Ornern mit mbox-Dateien.</p><p>Ok de Struktuur "
+"vun de Ornern warrt övernahmen, se dukt ünner \"KMail-Import\" op.</p>"
 
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Nettpostornern (\"*.pmm\") warrt importeert..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "\"UNIX\"-Nettpostornern (\"*.mbx\") warrt importeert..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "%1 warrt importeert"
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+msgid "Import folder %1..."
+msgstr "Orner \"%1\" importeren..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
 #, c-format
-msgid "Message %1"
-msgstr "Naricht %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Ornerstruktuur warrt inleest..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Schreven vun %1.</i></p>"
+msgid "Could not import %1"
+msgstr "\"%1\" lett sik nich importeren"
 
 #: filter_lnotes.cxx:30
 msgid "Import Lotus Notes Emails"
@@ -197,23 +219,21 @@ msgstr "Nettbreven ut Lotus Notes importeren"
 
 #: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<p><b>Importfilter för Struktuurtext-Nettbreven vun Lotus Notes</b></p>"
-"<p>Disse Filter importeert Struktuurtext-Dateien vun en exporteert "
+"<p><b>Importfilter för Struktuurtext-Nettbreven vun Lotus Notes</b></"
+"p><p>Disse Filter importeert Struktuurtext-Dateien vun en exporteert "
 "Nettpost-Client vun Lotus Notes na KMail. Bruuk dissen Filter, wenn Du "
 "Nettbreven ut Lotus Notes oder anner Programmen importeren wullt, de dat "
-"Struktuurtext-Formaat vun Lotus Notes bruukt.</p>"
-"<p><b>Beacht bitte</b>: Ok de Struktuur vun de Ornern warrt övernahmen, se dukt "
-"ünner \"LNotes-Import\" op un warrt na de Dateien nöömt, ut de de Narichten dor "
-"binnen kemen.</p>"
+"Struktuurtext-Formaat vun Lotus Notes bruukt.</p><p><b>Beacht bitte</b>: Ok "
+"de Struktuur vun de Ornern warrt övernahmen, se dukt ünner \"LNotes-Import\" "
+"op un warrt na de Dateien nöömt, ut de de Narichten dor binnen kemen.</p>"
 
 #: filter_lnotes.cxx:55
 msgid "All Files (*)"
@@ -224,234 +244,10 @@ msgstr "All Dateien (*)"
 msgid "Importing emails from %1"
 msgstr "Nettbreven vun \"%1\" warrt importeert"
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr "Nettpostornern un Ornerstruktuur ut KMail importeren"
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-"<p><b>Importfilter för KMail</b></p>"
-"<p>Söök den Wörtelorner vun de KMail-Nettpost ut.</p>"
-"<p><b>Beacht bitte</b>: Söök nienich Dien aktuell lokaal KMail-Nettpostorner ut "
-"(normalerwies is dat ~/Mail oder ~/.trinity/share/apps/kmail/mail ): KMailCVT "
-"kunn denn in en Rundloop fastsitten.</p>"
-"<p>Disse Filter importeert keen KMail-Ornern mit mbox-Dateien.</p>"
-"<p>Ok de Struktuur vun de Ornern warrt övernahmen, se dukt ünner "
-"\"KMail-Import\" op.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Importeren beendt, Bruker hett afbraken"
-
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-msgid "Import folder %1..."
-msgstr "Orner \"%1\" importeren..."
-
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
-msgid "Could not import %1"
-msgstr "\"%1\" lett sik nich importeren"
-
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Lokaal Nettbreven un Ornerstruktuur ut Thunderbird/Mozilla importeren"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Importfilter för Thunderbird un Mozilla</b></p>"
-"<p>Söök den Wörtelorner vun de Thunderbird/Mozilla-Nettpost ut (normalerwies is "
-"dat~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Beacht bitte</b>: Söök bitte nienich Ornern ut, de <u>keen</u> "
-"mbox-Dateien bargt (t.B. en \"KMail\"-Nettpostorner). Wenn Du dat liekers "
-"deist, kriggst Du en Barg niege Ornern.</p>"
-"<p>Ok de Struktuur vun de Ornern warrt övernahmen, se dukt ünner "
-"\"Thunderbird-Import\" op.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Import vun Datei \"%1\" start..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Nettbreven ut Opera importeren"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Importfilter för Opera</b></p>"
-"<p>Disse Filter importeert de Nettpost ut den Opera-Nettpostorner. Bruuk dissen "
-"Filter, wenn Du all Nettbreven vun en Konto binnen Opera sien Postorner "
-"importeren wullt.</p>"
-"<p>Söök den Konto-Orner ut (normalerwies ~/.opera/mail/store/account*).</p>"
-"<p><b>Beacht bitte</b>: De Nettbreven warrt na en Orner importeert, de "
-"\"OPERA-<i>Kontonaam</i>\" nöömt warrt.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Lokaal Nettbreven un Ornerstruktuur ut Evolution 2.x importeren"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Importfilter för Evolution 2.x</b></p>"
-"<p>Söök den Wörtelorner för Dien lokaal Evolution-Nettpost ut (normalerwies is "
-"dat ~/.evolution/mail/local/).</p>"
-"<p><b>Beacht bitte</b>: Söök bitte nienich Ornern ut, de <u>keen</u> "
-"mbox-Dateien bargt (t.B. KMail-Nettpostornern): Wenn Du dat liekers deist, "
-"kriggst Du en Barg niege Ornern.</p>"
-"<p>Ok de Struktuur vun de Ornern warrt övernahmen, se dukt ünner "
-"\"Evolution-Import\" op.</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Vun:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Na:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Aktuell:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Import löppt..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Tosamen:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Klick op \"Torüch\", wenn Du mehr Nettbreven oder Kontakten importeren wullt"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b> Willkamen bi KMailCVT - dat KMail-Importwarktüüch</b>\n"
-"<br>"
-"<br>\n"
-"Dit Programm hölpt Di bi't Importeren vun Nettpost ut Dien verleden "
-"Nettpostprogramm na KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Söök dat Programm ut, ut dat Du Nettpost importeren wullt, un klick op "
-"\"Nakamen\"."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Bi't Importeren &dubbelt Narichten wegdoon"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Importfiltern för KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, De KMailCVT-Schrievers"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Orginaalautor"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Pleger & Niege Filtern"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nieg Böversiet & Oprümen"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Sönke Dibbern"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "s_dibbern@web.de"
+msgid "Message %1"
+msgstr "Naricht %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -459,12 +255,11 @@ msgstr "Nettbreven ut OS X-Mail importeren"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Importfilter för OS X-Mail </b></p>"
-"<p>Disse Filter importeert Nettbreven ut dat Nettpostprogramm vun Apple MacOS "
-"X</p>"
+"<p><b>Importfilter för OS X-Mail </b></p><p>Disse Filter importeert "
+"Nettbreven ut dat Nettpostprogramm vun Apple MacOS X</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -474,25 +269,27 @@ msgstr ""
 "1 dubbelt Naricht nich na Orner %1 vun KMail importeert\n"
 "%n dubbelt Narichten nich na Orner %1 vun KMail importeert"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT-Importwarktüüch"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Schritt 1: Filter utsöken"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Schritt 2: Importeren..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Mbox-Dateien importeren (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Import löppt"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Importfilter för mbox-Dateien</b></p><p>Disse Filter importeert mbox-"
+"Dateien na KMail. Bruuk em, wenn Du Nettbreven ut Ximian Evolution oder "
+"anner Programmen importeren wullt, de dat klass'sche UNIX-Formaat bruukt.</"
+"p><p><b>Beacht bitte</b>: De Nettbreven warrt na Ornern importeert, de "
+"\"MBOX-<i>Borndateinaam</i>\" nöömt warrt.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import afslaten"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Mbox-Dateien (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -500,24 +297,21 @@ msgstr "Nettbreven vun Outlook-Express importeren"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Importfilter för Outlook Express 4/5/6</b></p>"
-"<p>Du muttst den Oort vun den Nettpostorner vun Outlook Express angeven. Wenn "
-"Du em nich kennst, söök na *.dbx- oder *.mbx-Dateien binnen"
-"<ul>"
-"<li><i>C:\\Windows\\Anwennendaten</i> ünner Windows 98"
-"<li><i>C:\\Dokmenten un Instellen</i> ünner Windows 2000 oder nieger</ul></p>"
-"<p><b>Beacht bitte</b>: Ok de Struktuur vun de Ornern warrt vun Outlook Express "
-"5 un 6 övernahmen, se dukt ünner \"OE-Import\" op.</p>"
+"<p><b>Importfilter för Outlook Express 4/5/6</b></p><p>Du muttst den Oort "
+"vun den Nettpostorner vun Outlook Express angeven. Wenn Du em nich kennst, "
+"söök na *.dbx- oder *.mbx-Dateien binnen<ul><li><i>C:\\Windows"
+"\\Anwennendaten</i> ünner Windows 98<li><i>C:\\Dokmenten un Instellen</i> "
+"ünner Windows 2000 oder nieger</ul></p><p><b>Beacht bitte</b>: Ok de "
+"Struktuur vun de Ornern warrt vun Outlook Express 5 un 6 övernahmen, se dukt "
+"ünner \"OE-Import\" op.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -552,45 +346,67 @@ msgstr "OE5/6-Postfach \"%1\" warrt importeert"
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5/6-Ornerdatei \"%1\" warrt importeert"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "Nettpostornern un Ornerstruktuur ut Sylpheed importeren"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Nettbreven ut Opera importeren"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
-"<p><b>Importfilter för Sylpheed</b></p>"
-"<p>Söök den Wörtelorner vun de Sylpheed-Nettpost ut (normalerwies is dat "
-"~/Mail).</p>"
-"<p>Ok de Struktuur vun de Ornern warrt övernahmen, se dukt ünner "
-"\"Sylpheed-Import\" op.</p>"
-"<p>Disse Filter wohrt den Narichtentostand, t.B. Nieg oder Wiederleddt."
+"<p><b>Importfilter för Opera</b></p><p>Disse Filter importeert de Nettpost "
+"ut den Opera-Nettpostorner. Bruuk dissen Filter, wenn Du all Nettbreven vun "
+"en Konto binnen Opera sien Postorner importeren wullt.</p><p>Söök den Konto-"
+"Orner ut (normalerwies ~/.opera/mail/store/account*).</p><p><b>Beacht bitte</"
+"b>: De Nettbreven warrt na en Orner importeert, de \"OPERA-<i>Kontonaam</i>"
+"\" nöömt warrt.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Dateien warrt tellt..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Nieg Nettpostdateien warrt importeert..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Nettbreven ut Outlook importeren"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>Swoor Fehler</b>: KMail lett sik nich för de DCOP-Kommunikatschoon starten. "
-"Prööv bitte, wat <i>kmail</i> installeert is."
+"<p><b>Importfilter för Outlook-Nettbreven</b></p><p>Disse Filter importeert "
+"Nettbreven ut en pst-Datei vun Outlook. Du muttst den Oort vun den Orner mit "
+"de pst-Datei angeven. Wenn Du em nich kennst, söök na *.pst-Dateien "
+"binnen<ul><li><i>C:\\Windows\\Anwennendaten</i> ünner Windows 98<li><i>C:"
+"\\Dokmenten un Instellen</i> ünner Windows 2000 oder nieger</ul></"
+"p><p><b>Beacht bitte</b>: De Nettbreven warrt na en Orner importeert, de "
+"\"OUTLOOK-<i>Kontonaam</i>\" nöömt warrt.</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "Orner \"%1\" lett sik in KMail nich opstellen"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Nettbreven warrt tellt..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "Naricht lett sik nich den KMail-Orner \"%1\" tofögen"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Verteken warrt tellt..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Fehler bi't Tofögen vun en Naricht na den KMail-Orner \"%1\""
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Ornern warrt tellt..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -599,37 +415,77 @@ msgstr "Eenfachtext-Nettbreven importeren"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 "<p>Söök den Orner op Dien Systeem ut, de de Nettbreven bargt. Se warrt na en "
-"Orner importeert, de \"PLAIN-<i>Bornorner</i>\" heet.</p>"
-"<p>Disse Filter warrt all *.msg-, *.eml- un *.txt-Nettbreven importeren.</p>"
+"Orner importeert, de \"PLAIN-<i>Bornorner</i>\" heet.</p><p>Disse Filter "
+"warrt all *.msg-, *.eml- un *.txt-Nettbreven importeren.</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Mbox-Dateien importeren (UNIX, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Nettpostornern ut Pegasus-Mail importeren"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>Importfilter för mbox-Dateien</b></p>"
-"<p>Disse Filter importeert mbox-Dateien na KMail. Bruuk em, wenn Du Nettbreven "
-"ut Ximian Evolution oder anner Programmen importeren wullt, de dat klass'sche "
-"UNIX-Formaat bruukt.</p>"
-"<p><b>Beacht bitte</b>: De Nettbreven warrt na Ornern importeert, de \"MBOX-<i>"
-"Borndateinaam</i>\" nöömt warrt.</p>"
+"<p>Söök den Nettpostorner vun Pegasus-Mail op Dien Systeem ut (he bargt *."
+"cnm-, *.pmm- un *.mbx-Dateien). Op vele Systemen liggt he ünner C:\\pmail"
+"\\mail oder C:\\pmail\\mail\\admin.</p><p><b>Beacht bitte</b>: Ok de "
+"Struktuur vun de Ornern warrt övernahmen, se dukt ünner \"PegasusMail-Import"
+"\" op.</p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Mbox-Dateien (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Ornerstruktuur lett sik nich inlesen, Import warrt ahn Ünnerstütten för "
+"Ünnerornern wiedermaakt"
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Nieg Nettpostdateien (\"*.cnm\") warrt importeert..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Nettpostornern (\"*.pmm\") warrt importeert..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "\"UNIX\"-Nettpostornern (\"*.mbx\") warrt importeert..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "%1 warrt importeert"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Ornerstruktuur warrt inleest..."
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "Nettpostornern un Ornerstruktuur ut Sylpheed importeren"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Importfilter för Sylpheed</b></p><p>Söök den Wörtelorner vun de "
+"Sylpheed-Nettpost ut (normalerwies is dat ~/Mail).</p><p>Ok de Struktuur vun "
+"de Ornern warrt övernahmen, se dukt ünner \"Sylpheed-Import\" op.</"
+"p><p>Disse Filter wohrt den Narichtentostand, t.B. Nieg oder Wiederleddt."
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -637,17 +493,113 @@ msgstr "Nettbreven un Ornerstruktuur ut The Bat! importeren"
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Importfilter för The Bat!</b></p><p>Söök den Wörtelorner för Dien "
+"lokaal Nettpostorner vun \"The Bat!\" ut.</p><p><b>Beacht bitte</b>: Disse "
+"Filter importeert de *.tbb-Dateien vun den lokaal \"The Bat!\"-Orner, t.B. "
+"vun POP-Kontos, man nich vun IMAP/DIMAP-Kontos.</p><p>Ok de Struktuur vun de "
+"Ornern warrt övernahmen, se dukt ünner \"TheBat-Import\" op.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Lokaal Nettbreven un Ornerstruktuur ut Thunderbird/Mozilla importeren"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Importfilter för Thunderbird un Mozilla</b></p><p>Söök den Wörtelorner "
+"vun de Thunderbird/Mozilla-Nettpost ut (normalerwies is dat~/.thunderbird/*."
+"default/Mail/Local Folders/).</p><p><b>Beacht bitte</b>: Söök bitte nienich "
+"Ornern ut, de <u>keen</u> mbox-Dateien bargt (t.B. en \"KMail\"-"
+"Nettpostorner). Wenn Du dat liekers deist, kriggst Du en Barg niege Ornern.</"
+"p><p>Ok de Struktuur vun de Ornern warrt övernahmen, se dukt ünner "
+"\"Thunderbird-Import\" op.</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<p><b>Importfilter för The Bat!</b></p>"
-"<p>Söök den Wörtelorner för Dien lokaal Nettpostorner vun \"The Bat!\" ut.</p>"
-"<p><b>Beacht bitte</b>: Disse Filter importeert de *.tbb-Dateien vun den lokaal "
-"\"The Bat!\"-Orner, t.B. vun POP-Kontos, man nich vun IMAP/DIMAP-Kontos.</p>"
-"<p>Ok de Struktuur vun de Ornern warrt övernahmen, se dukt ünner "
-"\"TheBat-Import\" op.</p>"
+"<b>Swoor Fehler</b>: KMail lett sik nich för de DCOP-Kommunikatschoon "
+"starten. Prööv bitte, wat <i>kmail</i> installeert is."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "Orner \"%1\" lett sik in KMail nich opstellen"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "Naricht lett sik nich den KMail-Orner \"%1\" tofögen"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Fehler bi't Tofögen vun en Naricht na den KMail-Orner \"%1\""
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Vun:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Na:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Aktuell:"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Import löppt..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Tosamen:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Klick op \"Torüch\", wenn Du mehr Nettbreven oder Kontakten importeren wullt"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b> Willkamen bi KMailCVT - dat KMail-Importwarktüüch</b>\n"
+"<br><br>\n"
+"Dit Programm hölpt Di bi't Importeren vun Nettpost ut Dien verleden "
+"Nettpostprogramm na KMail.<br><br><br><br>\n"
+"Söök dat Programm ut, ut dat Du Nettpost importeren wullt, un klick op "
+"\"Nakamen\"."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Bi't Importeren &dubbelt Narichten wegdoon"
diff --git a/tde-i18n-nl/messages/tdepim/kmailcvt.po b/tde-i18n-nl/messages/tdepim/kmailcvt.po
index f254ac9f9ba..a2d903e7f3e 100644
--- a/tde-i18n-nl/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-nl/messages/tdepim/kmailcvt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-12-31 00:45+0100\n"
 "Last-Translator: Bram Schoenmakers <bramschoenmakers@kde.nl>\n"
 "Language-Team: Nederlands <kde-i18n-nl@kde.org>\n"
@@ -22,25 +22,81 @@ msgstr ""
 "X-Generator: KBabel 1.10.2\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Berichten van Outlook importeren"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Hans Dijkema,Rinse de Vries,Bram Schoenmakers"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "h.dijkema@hum.org,rinse@kde.nl,bramschoenmakers@kde.nl"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT Importhulpprogramma"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Stap 1: selecteer het filter"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Stap 2: importeren..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importeren wordt uitgevoerd"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import is voltooid"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Geschreven door %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail Importfilters"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, de ontwikkelaars van KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Oorspronkelijke auteur"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Onderhouder & nieuwe filters"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nieuwe GUI en verbeteringen"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Berichten en mappenstructuur van Evolution 1.x importeren"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook importfilter</b></p> "
-"<p>Dit filter importeert berichten uit een pst-bestand van Outlook. U dient de "
-"map op te zoeken die het pst-bestand bevat onder: <i>"
-"C:\\Documents and Settings</i> in Windows 2000 of later.</p> "
-"<p><b>Opmerking:</b> E-mailberichten worden in een map geplaatst dat naar het "
-"account vernoemd wordt, voorafgegaan aan OUTLOOK-.</p>"
+"<p><b>Evolution 1.x importfilter</b></p> <p>Selecteer de hoofdmap met "
+"berichten van Thunderbird (normaal gesproken is dat ~/.evolution/local).</p> "
+"<p>Omdat het mogelijk is om een nieuwe mappenstructuur aan te maken worden "
+"alle mappen onder \"Evolution-Import\" geplaatst.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -50,27 +106,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Geen map geselecteerd."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Bestanden worden geteld..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Berichten worden geteld..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Mappen worden geteld..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Mappen worden geteld..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Nieuwe e-mailbestanden worden geïmporteerd..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -78,6 +113,22 @@ msgstr "Nieuwe e-mailbestanden worden geïmporteerd..."
 msgid "No files found for import."
 msgstr "Geen bestanden gevonden om te importeren."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Import van e-mailberichten uit %1 is voltooid"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "%1 kan niet worden geopend en wordt daarom overgeslagen"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -95,39 +146,37 @@ msgstr ""
 "1 dubbel bericht niet geïmporteerd\n"
 "%n dubbele berichten niet geïmporteerd"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "%1 kan niet worden geopend en wordt daarom overgeslagen"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Berichten en mappenstructuur van Evolution 1.x importeren"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Berichten en mappenstructuur van Evolution 2.x importeren"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x importfilter</b></p> "
-"<p>Selecteer de hoofdmap met berichten van Thunderbird (normaal gesproken is "
-"dat ~/.evolution/local).</p> "
-"<p>Omdat het mogelijk is om een nieuwe mappenstructuur aan te maken worden alle "
-"mappen onder \"Evolution-Import\" geplaatst.</p>"
+"<p><b>Evolution 2.x importfilter</b></p> <p>Selecteer de hoofdmap met "
+"berichten van Thunderbird (normaal gesproken is dat ~/.evolution/mail/local)."
+"</p> <p><b>Opmerking:</b> Kies nooit een map waarin <u>geen</u> mbox-"
+"bestanden zitten (bijvoorbeeld maildir). Wanneer u dit toch doet krijgt u "
+"veel nieuwe mappen.</p> <p>Omdat de mappenstructuur opnieuw aangemaakt kan "
+"worden, zullen de mappen opgeslagen worden onder: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Import van e-mailberichten uit %1 is voltooid"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Importeren voltooid, geannuleerd door gebruiker."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Begonnen met bestand %1 te importeren..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -135,99 +184,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Mappen van Pegasus Mail importeren"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Selecteer de map met Pegasus Mail op uw systeem. Deze map bevat de CNM-, "
-"PMM- en MBX-bestanden. Op veel computers bevinden deze bestanden zich in "
-"C:\\PMail\\mail\\admin</p> "
-"<p><b>Opmerking:</b> Omdat de mappenstructuur opnieuw aangemaakt kan worden, "
-"zullen de mappen geplaatst worden onder: \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Kon de mappenstructuur niet ontleden, de import wordt voortgezet zonder "
-"ondersteuning voor submappen."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Nieuwe e-mailbestanden worden geïmporteerd ('.cnm') ..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "E-mailmappen worden geïmporteerd ( '.pmm') ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "UNIX e-mailmappen worden geïmporteerd ('.mbx') ..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Bezig met importeren van %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Bericht %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "De mappenstructuur wordt ontleed..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Geschreven door %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "E-mailberichten van Lotus Notes importeren"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Importfilter voor Lotus Notes Structured Text</b></p> "
-"<p>Dit filter zal Structured Text-bestanden van Lotus Notes naar KMail "
-"importeren. Gebruik dit filter als u e-mailberichten van Lotus Notes, of andere "
-"programma's die dit bestandsformaat ondersteunen, wilt importeren en voor "
-"andere e-mailprogramma's die gebruik maken van dit standaard UNIX-formaat.</p> "
-"<p><b>Opmerking:</b> Omdat het mogelijk is om de mappenstructuur opnieuw aan te "
-"maken zullen de geïmporteerde berichten in submappen geplaatst worden onder: "
-"\"LNotes-Import\".</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Alle bestanden (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "E-mailberichten van %1 worden geïmporteerd"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -235,31 +195,22 @@ msgstr "Maildirs en mappenstructuur van KMail importeren"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Importfilter voor KMail</b></p> "
-"<p>Selecteer de hoofdmap van de berichtmappen van KMail dat u wilt "
-"importeren.</p> "
-"<p><b>Opmerking:</b> U mag nooit de huidige maildir van KMail gebruiken "
-"(normaal gesproken is dat ~/Mail of ~/.trinity/share/apps/kmail/mail), omdat "
-"KMailCVT anders kan vastlopen.</p> "
-"<p>Dit filter ondersteunt geen berichtmappen van KMail in het mbox-formaat.</p> "
-"<p>Omdat de mappenstructuur opnieuw aangemaakt kan worden, zullen de mappen "
-"opgeslagen worden in uw lokale map onder: \"KMail-Import\".</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Importeren voltooid, geannuleerd door gebruiker."
+"<p><b>Importfilter voor KMail</b></p> <p>Selecteer de hoofdmap van de "
+"berichtmappen van KMail dat u wilt importeren.</p> <p><b>Opmerking:</b> U "
+"mag nooit de huidige maildir van KMail gebruiken (normaal gesproken is dat ~/"
+"Mail of ~/.trinity/share/apps/kmail/mail), omdat KMailCVT anders kan "
+"vastlopen.</p> <p>Dit filter ondersteunt geen berichtmappen van KMail in het "
+"mbox-formaat.</p> <p>Omdat de mappenstructuur opnieuw aangemaakt kan worden, "
+"zullen de mappen opgeslagen worden in uw lokale map onder: \"KMail-Import\"."
+"</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -272,193 +223,42 @@ msgstr "Map %1 importeren..."
 msgid "Could not import %1"
 msgstr "Kon %1 niet importeren"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Berichten en mappenstructuur van Thunderbird/Mozilla importeren"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird/Mozilla importfilter</b></p> "
-"<p>Selecteer de hoofdmap met berichten van Thunderbird/Mozilla (normaal "
-"gesproken is dat ~/.thunderbird/*.default/Mail/Local Folders/).</p> "
-"<p><b>Opmerking:</b> Kies nooit een map waarin <u>geen</u> "
-"mbox-bestanden zitten (bijvoorbeeld maildir). Wanneer u dit toch doet krijgt u "
-"veel nieuwe mappen.</p> "
-"<p>Het is mogelijk om een nieuwe mappenstructuur aan te maken, de mappen zullen "
-"in \"Thunderbird-Import\" geplaatst worden.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Begonnen met bestand %1 te importeren..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Berichten van Opera importeren"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera importfilter</b></p> "
-"<p>Dit filter importeert e-mailberichten van een berichtenmap van Opera. "
-"Gebruik dit filter om alle berichten te importeren van een bepaald account in "
-"de maildir van Opera.</p> "
-"<p>Selecteer de map van het account (normaal gesproken onder "
-"~/.opera/mail/store/account*).</p> "
-"<p><b>Opmerking:</b> De e-mailberichten worden in een map geplaatst met een "
-"naam aan de hand van het account waar ze toe behoren, voorafgegaan aan "
-"OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Berichten en mappenstructuur van Evolution 2.x importeren"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x importfilter</b></p> "
-"<p>Selecteer de hoofdmap met berichten van Thunderbird (normaal gesproken is "
-"dat ~/.evolution/mail/local).</p> "
-"<p><b>Opmerking:</b> Kies nooit een map waarin <u>geen</u> "
-"mbox-bestanden zitten (bijvoorbeeld maildir). Wanneer u dit toch doet krijgt u "
-"veel nieuwe mappen.</p> "
-"<p>Omdat de mappenstructuur opnieuw aangemaakt kan worden, zullen de mappen "
-"opgeslagen worden onder: \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Van:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Naar:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Huidig:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Import wordt uitgevoerd..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Totaal:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Klik op de knop'Terug' om meer e-mailberichten of contactpersonen te importeren"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "E-mailberichten van Lotus Notes importeren"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Welkom bij KMailCVT, een importprogramma voor KMail.</b>\n"
-"<br>"
-"<br> Dit programma zal u helpen bij het importeren van e-mailberichten uit uw "
-"vorige e-mailprogramma naar KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Selecteer het programma waar u de berichten uit wilt importeren, en klik op "
-"\"Volgende\"."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "&Dubbele berichten verwijderen tijdens importeren"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail Importfilters"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, de ontwikkelaars van KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Oorspronkelijke auteur"
+"<p><b>Importfilter voor Lotus Notes Structured Text</b></p> <p>Dit filter "
+"zal Structured Text-bestanden van Lotus Notes naar KMail importeren. Gebruik "
+"dit filter als u e-mailberichten van Lotus Notes, of andere programma's die "
+"dit bestandsformaat ondersteunen, wilt importeren en voor andere e-"
+"mailprogramma's die gebruik maken van dit standaard UNIX-formaat.</p> "
+"<p><b>Opmerking:</b> Omdat het mogelijk is om de mappenstructuur opnieuw aan "
+"te maken zullen de geïmporteerde berichten in submappen geplaatst worden "
+"onder: \"LNotes-Import\".</p>"
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Onderhouder & nieuwe filters"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nieuwe GUI en verbeteringen"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Alle bestanden (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Hans Dijkema,Rinse de Vries,Bram Schoenmakers"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "E-mailberichten van %1 worden geïmporteerd"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "h.dijkema@hum.org,rinse@kde.nl,bramschoenmakers@kde.nl"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Bericht %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -466,12 +266,11 @@ msgstr "Van OS X Mail importeren"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Importfilter voor OS X Mail</b></p>"
-"<p> Dit filter importeert e-mailberichten van het e-mailprogramma van Apple Mac "
-"OS X.</p>"
+"<p><b>Importfilter voor OS X Mail</b></p><p> Dit filter importeert e-"
+"mailberichten van het e-mailprogramma van Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -481,25 +280,28 @@ msgstr ""
 "1 dubbel bericht werd niet geïmporteerd in de map %1 van KMail.\n"
 "%n dubbele berichten werden niet geïmporteerd in de map %1 van KMail."
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT Importhulpprogramma"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Stap 1: selecteer het filter"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Stap 2: importeren..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "mbox-bestanden importeren (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importeren wordt uitgevoerd"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox-importfilter</b></p> <p>Dit filter zal mbox-bestanden naar KMail "
+"importeren. Gebruik dit filter als u e-mailberichten van Ximian Evolution "
+"wilt importeren en voor andere e-mailprogramma's die gebruik maken van dit "
+"standaard UNIX-formaat.</p> <p><b>Opmerking:</b> de berichten zullen worden "
+"geïmporteerd naar mappen die vernoemd worden naar het bestand waar de "
+"berichten uit gehaald worden, met als voorvoegsel MBOX-.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import is voltooid"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox-bestanden (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -507,25 +309,21 @@ msgstr "Berichten van Outlook Express importeren"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 importfilter</b></p> "
-"<p>U dient de map op te vragen waar uw postvak iks opgeslagen door naar .dbx- "
-"of .mbx-bestanden te zoeken onder "
-"<ul> "
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x "
-"<li><i>Documents and Settings</i> in Windows 2000 of nieuwer</ul></p>"
-"<p><b>Opmerking:</b> Omdat het mogelijk is om de mappenstructuur opnieuw aan te "
-"maken, zullen de mappen van Outlook Express 5 en 6 geplaatst worden onder "
-"\"OE-Import\" in uw lokale map.</p>"
+"<p><b>Outlook Express 4/5/6 importfilter</b></p> <p>U dient de map op te "
+"vragen waar uw postvak iks opgeslagen door naar .dbx- of .mbx-bestanden te "
+"zoeken onder <ul> <li><i>C:\\Windows\\Application Data</i> in Windows 9x "
+"<li><i>Documents and Settings</i> in Windows 2000 of nieuwer</ul></"
+"p><p><b>Opmerking:</b> Omdat het mogelijk is om de mappenstructuur opnieuw "
+"aan te maken, zullen de mappen van Outlook Express 5 en 6 geplaatst worden "
+"onder \"OE-Import\" in uw lokale map.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -561,34 +359,197 @@ msgstr "OE5-postvak %1 wordt geïmporteerd"
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5 wordt geïmporteerd met het mapbestand %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Berichten van Opera importeren"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Opera importfilter</b></p> <p>Dit filter importeert e-mailberichten "
+"van een berichtenmap van Opera. Gebruik dit filter om alle berichten te "
+"importeren van een bepaald account in de maildir van Opera.</p> <p>Selecteer "
+"de map van het account (normaal gesproken onder ~/.opera/mail/store/"
+"account*).</p> <p><b>Opmerking:</b> De e-mailberichten worden in een map "
+"geplaatst met een naam aan de hand van het account waar ze toe behoren, "
+"voorafgegaan aan OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Bestanden worden geteld..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Nieuwe e-mailbestanden worden geïmporteerd..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Berichten van Outlook importeren"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Outlook importfilter</b></p> <p>Dit filter importeert berichten uit "
+"een pst-bestand van Outlook. U dient de map op te zoeken die het pst-bestand "
+"bevat onder: <i>C:\\Documents and Settings</i> in Windows 2000 of later.</p> "
+"<p><b>Opmerking:</b> E-mailberichten worden in een map geplaatst dat naar "
+"het account vernoemd wordt, voorafgegaan aan OUTLOOK-.</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Berichten worden geteld..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Mappen worden geteld..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Mappen worden geteld..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "E-mailberichten in platte-tekst importeren"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p> Selecteer de map op uw computer die de e-mailberichten bevat. De e-"
+"mailberichten worden opgeslagen in een bestand dat de zelfde naam draagt als "
+"de map waar ze uitkomen, met als voorvoegsel PLAIN-</p> <p>Dit filter "
+"importeert alle .msg .eml en .txt-e-mailberichten.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Mappen van Pegasus Mail importeren"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Selecteer de map met Pegasus Mail op uw systeem. Deze map bevat de CNM-, "
+"PMM- en MBX-bestanden. Op veel computers bevinden deze bestanden zich in C:"
+"\\PMail\\mail\\admin</p> <p><b>Opmerking:</b> Omdat de mappenstructuur "
+"opnieuw aangemaakt kan worden, zullen de mappen geplaatst worden onder: "
+"\"PegasusMail-Import\".</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Kon de mappenstructuur niet ontleden, de import wordt voortgezet zonder "
+"ondersteuning voor submappen."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Nieuwe e-mailbestanden worden geïmporteerd ('.cnm') ..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "E-mailmappen worden geïmporteerd ( '.pmm') ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "UNIX e-mailmappen worden geïmporteerd ('.mbx') ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Bezig met importeren van %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "De mappenstructuur wordt ontleed..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Berichten en mappenstructuur van Sylpheed importeren"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Sylpheed importfilter</b></p> <p>Selecteer de map met berichten die u "
+"wilt importeren (normaal gesproken: ~/Mail ).</p> <p>Omdat het mogelijk is "
+"om een nieuwe mappenstructuur te maken zullen de mappen geplaatst worden "
+"onder \"Sylpheed-Import\" in uw lokale map.</p> <p>Deze map maakt ook een "
+"nieuwe status aan voor berichten, bijvoorbeeld 'nieuw' of 'doorgestuurd'."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Berichten en mappenstructuur van The Bat! importeren"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Importfilter voor The Bat!</b></p> <p>Selecteer de hoofdmap van de "
+"berichtenmappen van The Bat! die u wilt importeren.</p> <p><b>Opmerkingen:</"
+"b> Dit filter importeert de *.tbb-bestanden uit de lokale mappen van The "
+"Bat! zoals die van POP-accounts. Deze worden niet geïmporteerd voor IMAP/"
+"DIMAP-accounts.</p> <p>Omdat het mogelijk is om een nieuwe mappenstructuur "
+"aan te maken worden de mappen geplaatst in de map \"TheBat-Import\" in uw "
+"lokale account.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Berichten en mappenstructuur van Thunderbird/Mozilla importeren"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Sylpheed importfilter</b></p> "
-"<p>Selecteer de map met berichten die u wilt importeren (normaal gesproken: "
-"~/Mail ).</p> "
-"<p>Omdat het mogelijk is om een nieuwe mappenstructuur te maken zullen de "
-"mappen geplaatst worden onder \"Sylpheed-Import\" in uw lokale map.</p> "
-"<p>Deze map maakt ook een nieuwe status aan voor berichten, bijvoorbeeld "
-"'nieuw' of 'doorgestuurd'."
+"<p><b>Thunderbird/Mozilla importfilter</b></p> <p>Selecteer de hoofdmap met "
+"berichten van Thunderbird/Mozilla (normaal gesproken is dat ~/.thunderbird/*."
+"default/Mail/Local Folders/).</p> <p><b>Opmerking:</b> Kies nooit een map "
+"waarin <u>geen</u> mbox-bestanden zitten (bijvoorbeeld maildir). Wanneer u "
+"dit toch doet krijgt u veel nieuwe mappen.</p> <p>Het is mogelijk om een "
+"nieuwe mappenstructuur aan te maken, de mappen zullen in \"Thunderbird-Import"
+"\" geplaatst worden.</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<b>Fataal:</b> Kmail kan niet worden gestart voor DCOP-communicatie. Controleer "
-"of <i>kmail</i> is geïnstalleerd."
+"<b>Fataal:</b> Kmail kan niet worden gestart voor DCOP-communicatie. "
+"Controleer of <i>kmail</i> is geïnstalleerd."
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -602,66 +563,59 @@ msgstr "Het bericht kan niet aan de map %1 in kmail worden toegevoegd"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Fout bij het toevoegen van bericht aan de map %1 in kmail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "E-mailberichten in platte-tekst importeren"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Van:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p> Selecteer de map op uw computer die de e-mailberichten bevat. De "
-"e-mailberichten worden opgeslagen in een bestand dat de zelfde naam draagt als "
-"de map waar ze uitkomen, met als voorvoegsel PLAIN-</p> "
-"<p>Dit filter importeert alle .msg .eml en .txt-e-mailberichten.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Naar:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "mbox-bestanden importeren (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Huidig:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>mbox-importfilter</b></p> "
-"<p>Dit filter zal mbox-bestanden naar KMail importeren. Gebruik dit filter als "
-"u e-mailberichten van Ximian Evolution wilt importeren en voor andere "
-"e-mailprogramma's die gebruik maken van dit standaard UNIX-formaat.</p> "
-"<p><b>Opmerking:</b> de berichten zullen worden geïmporteerd naar mappen die "
-"vernoemd worden naar het bestand waar de berichten uit gehaald worden, met als "
-"voorvoegsel MBOX-.</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Import wordt uitgevoerd..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox-bestanden (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Berichten en mappenstructuur van The Bat! importeren"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Totaal:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Klik op de knop'Terug' om meer e-mailberichten of contactpersonen te "
+"importeren"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Importfilter voor The Bat!</b></p> "
-"<p>Selecteer de hoofdmap van de berichtenmappen van The Bat! die u wilt "
-"importeren.</p> "
-"<p><b>Opmerkingen:</b> Dit filter importeert de *.tbb-bestanden uit de lokale "
-"mappen van The Bat! zoals die van POP-accounts. Deze worden niet geïmporteerd "
-"voor IMAP/DIMAP-accounts.</p> "
-"<p>Omdat het mogelijk is om een nieuwe mappenstructuur aan te maken worden de "
-"mappen geplaatst in de map \"TheBat-Import\" in uw lokale account.</p>"
+"<b>Welkom bij KMailCVT, een importprogramma voor KMail.</b>\n"
+"<br><br> Dit programma zal u helpen bij het importeren van e-mailberichten "
+"uit uw vorige e-mailprogramma naar KMail.<br><br><br><br>\n"
+" Selecteer het programma waar u de berichten uit wilt importeren, en klik op "
+"\"Volgende\"."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "&Dubbele berichten verwijderen tijdens importeren"
diff --git a/tde-i18n-nn/messages/tdepim/kmailcvt.po b/tde-i18n-nn/messages/tdepim/kmailcvt.po
index 6273761ed7f..0c226804d70 100644
--- a/tde-i18n-nn/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-nn/messages/tdepim/kmailcvt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-05-12 17:57+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-no@lister.ping.uio.no>\n"
@@ -22,26 +22,86 @@ msgstr ""
 "X-Generator: KBabel 1.10\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Importer e-post frå Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Gaute Hvoslef Kvalnes, Håvard Korsvoll"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "gaute@verdsveven.com, korsvoll@skolelinux.no"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Importverktøy for KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Steg 1: Vel filter"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Steg 2: Importering …"
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Igang med å importera"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Ferdig med å importera"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Skrive av %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Importfilter for KMail"
+
+#: main.cpp:35
+#, fuzzy
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "© 2000–2003 KMailCVT-utviklarane"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Opphavleg forfattar"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
 msgstr ""
-"<p><b>Filter for import frå Outlook</b></p> "
-"<p>Dette filteret importerer e-post frå ei Outlook-pst-fil. Du må finna mappa "
-"der pst-fila er lagra ved å søkja etter .pst-filer under:"
-"<ul> "
-"<li><i>Documents and Settings</i> i Windows 2000 eller seinare.</ul></p>"
-"<p><b>Merk:</b> E-postar vil bli importerte til mapper med namn etter den fila "
-"dei kom frå, med førestavinga OUTLOOK-</p>"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Ny GUI og oppreinsking"
+
+#: filter_evolution.cxx:31
+#, fuzzy
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Importer lokal e-post og mappestruktur frå Evolution 2.x"
+
+#: filter_evolution.cxx:33
+#, fuzzy
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
+msgstr ""
+"<p><b>Filter for import frå Evolution 2.x</b></p> <p>Vel e-postkatalogen til "
+"Evolution (vanlegvis ~/.evolution/mail/local/).</p> <p><b>Merk:</b> Vel "
+"ikkje ei mappe som inneheld <u>noko anna</u> enn mbox-filer (t.d. ei maildir-"
+"mappe). Dersom du likevel gjer det, kjem du til å få massevis av nye mapper."
+"</p> <p>Det er ikkje mogleg å gjenoppretta mappestrukturen, så mappenamna "
+"vil i staden visa strukturen.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -51,27 +111,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Inga mappe er vald"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Tel filer …"
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Tel e-post …"
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Tel katalogar …"
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Tel mapper …"
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Importerer nye e-postfiler …"
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -79,6 +118,22 @@ msgstr "Importerer nye e-postfiler …"
 msgid "No files found for import."
 msgstr "Fann ingen filer som kunne importerast."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Ferdig med å importera e-postar frå %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Klarte ikkje opna %1, hoppar over"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -96,43 +151,38 @@ msgstr ""
 "Éi lik melding ikkje importert\n"
 "%n like meldingar ikkje importerte"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Klarte ikkje opna %1, hoppar over"
-
-#: filter_evolution.cxx:31
-#, fuzzy
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Importer lokal e-post og mappestruktur frå Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 #, fuzzy
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Filter for import frå Evolution 2.x</b></p> "
-"<p>Vel e-postkatalogen til Evolution (vanlegvis ~/.evolution/mail/local/).</p> "
-"<p><b>Merk:</b> Vel ikkje ei mappe som inneheld <u>noko anna</u> "
-"enn mbox-filer (t.d. ei maildir-mappe). Dersom du likevel gjer det, kjem du til "
-"å få massevis av nye mapper.</p> "
-"<p>Det er ikkje mogleg å gjenoppretta mappestrukturen, så mappenamna vil i "
-"staden visa strukturen.</p>"
+"<p><b>Filter for import frå Evolution 2.x</b></p> <p>Vel e-postkatalogen til "
+"Evolution (vanlegvis ~/.evolution/mail/local/).</p> <p><b>Merk:</b> Vel "
+"ikkje ei mappe som inneheld <u>noko anna</u> enn mbox-filer (t.d. ei maildir-"
+"mappe). Dersom du likevel gjer det, kjem du til å få massevis av nye mapper."
+"</p> <p>Det er ikkje mogleg å gjenoppretta mappestrukturen, så mappenamna "
+"vil i staden visa strukturen.</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Ferdig med å importera e-postar frå %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr ""
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Start import av fila %1 …"
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -140,100 +190,11 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importer mapper frå Pegasus-epost"
-
-#: filter_pmail.cxx:33
-#, fuzzy
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Vel mappa for Pegasus-epost på systemet (som inneheld CNM, PMM og "
-"MBX-filer). På mange system er desse lagra i C:\\Pmail\\mail</p>"
-"<p><b>Merk:</b> Dette importfilteret vil importera mappene dine, men ikkje "
-"mappestrukturen. Du vil derimot truleg berre gjera dette ein gong.</p>"
-"<p><b>Merk:</b> E-postar vil bli importert i mapper med førestavinga pmail-</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importerer nye e-postfiler («.cnm») …"
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importerer e-postmapper («.pmm») …"
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importerer «UNIX»-e-postmapper («.mbx») …"
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importerer %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Melding %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr ""
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Skrive av %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "Importer e-post frå Outlook"
-
-#: filter_lnotes.cxx:32
-#, fuzzy
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Filter for import frå mbox</b></p>"
-"<p>Dette filteret vil importera mbox-filer til KMail. Bruk dette filteret viss "
-"du vil importera e-postar frå Ximian Evolution eller andre e-postprogram som "
-"brukar dette tradisjonelle UNIX-formatet.</p>"
-"<p><b>Merk:</b> E-postar vil verta importerte til mapper med namn etter den "
-"fila dei kom frå og med førestavinga MBOX-</p>"
-
-#: filter_lnotes.cxx:55
-#, fuzzy
-msgid "All Files (*)"
-msgstr "mbox-filer (*)"
-
-#: filter_lnotes.cxx:64
-#, fuzzy, c-format
-msgid "Importing emails from %1"
-msgstr "Importerer e-post frå %1 …"
-
 #: filter_kmail_maildir.cxx:26
 #, fuzzy
 msgid "Import KMail Maildirs and Folder Structure"
@@ -241,21 +202,13 @@ msgstr "Importer e-post og mappestruktur frå Evolution"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
@@ -270,192 +223,42 @@ msgstr "Start import av fila %1 …"
 msgid "Could not import %1"
 msgstr "Klarte ikkje importera %1"
 
-#: filter_thunderbird.cxx:28
-#, fuzzy
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Importer lokal e-post og mappestruktur frå Thunderbird"
-
-#: filter_thunderbird.cxx:30
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Filter for import frå Thunderbird</b></p> "
-"<p>Vel e-postkatalogen til Thunderbird (vanlegvis "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p> "
-"<p><b>Merk:</b> Vel ikkje ei mappe som inneheld <u>noko anna</u> "
-"enn mbox-filer (t.d. ei maildir-mappe). Dersom du likevel gjer det, kjem du til "
-"å få massevis av nye mapper.</p> "
-"<p>Det er ikkje mogleg å gjenoppretta mappestrukturen, så mappenamna vil i "
-"staden visa strukturen.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Start import av fila %1 …"
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Importer e-post frå Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Filter for import frå Opera</b></p>"
-"<p>Dette filteret vil importera e-post frå Opera. Bruk dette filteret viss du "
-"vil importera e-postar frå ein konto i Opera-mappa.</p> "
-"<p>Vel mappa som inneheld kontoen (vanlegvis ~/.opera/mail/store/account*).</p>"
-"<p><b>Merk:</b> E-postar blir importert til mapper som er namngjevne etter den "
-"fila dei kom frå og med førestavinga OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Importer lokal e-post og mappestruktur frå Evolution 2.x"
+msgid "Import Lotus Notes Emails"
+msgstr "Importer e-post frå Outlook"
 
-#: filter_evolution_v2.cxx:31
+#: filter_lnotes.cxx:32
 #, fuzzy
 msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<p><b>Filter for import frå Evolution 2.x</b></p> "
-"<p>Vel e-postkatalogen til Evolution (vanlegvis ~/.evolution/mail/local/).</p> "
-"<p><b>Merk:</b> Vel ikkje ei mappe som inneheld <u>noko anna</u> "
-"enn mbox-filer (t.d. ei maildir-mappe). Dersom du likevel gjer det, kjem du til "
-"å få massevis av nye mapper.</p> "
-"<p>Det er ikkje mogleg å gjenoppretta mappestrukturen, så mappenamna vil i "
-"staden visa strukturen.</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Frå:"
+"<p><b>Filter for import frå mbox</b></p><p>Dette filteret vil importera mbox-"
+"filer til KMail. Bruk dette filteret viss du vil importera e-postar frå "
+"Ximian Evolution eller andre e-postprogram som brukar dette tradisjonelle "
+"UNIX-formatet.</p><p><b>Merk:</b> E-postar vil verta importerte til mapper "
+"med namn etter den fila dei kom frå og med førestavinga MBOX-</p>"
 
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Til:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Denne:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "Importing in progress..."
-msgstr "Igang med å importera"
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr " …"
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Totalt:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Trykk «Tilbake» for å importera fleire e-postar og kontaktar"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>Velkommen til KMailCVT – Importverktøyet til KMail</b>\n"
-"<br>"
-"<br>\n"
-"Dette programmet vil hjelpa deg å importera e-postmeldingar frå andre "
-"e-postklientar til KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Vel det programmet du vil importera frå og trykk «Neste»."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, fuzzy, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Fjern like meldingar ved import"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Importfilter for KMail"
-
-#: main.cpp:35
+#: filter_lnotes.cxx:55
 #, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "© 2000–2003 KMailCVT-utviklarane"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Opphavleg forfattar"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Ny GUI og oppreinsking"
+msgid "All Files (*)"
+msgstr "mbox-filer (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Gaute Hvoslef Kvalnes, Håvard Korsvoll"
+#: filter_lnotes.cxx:64
+#, fuzzy, c-format
+msgid "Importing emails from %1"
+msgstr "Importerer e-post frå %1 …"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "gaute@verdsveven.com, korsvoll@skolelinux.no"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Melding %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -463,11 +266,11 @@ msgstr "Importer mapper frå OS X Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Filter for import frå OS X Mail</b></p> "
-"<p>Dette filteret importerer meldingar frå e-postklienten i Apple Mac OS X.</p>"
+"<p><b>Filter for import frå OS X Mail</b></p> <p>Dette filteret importerer "
+"meldingar frå e-postklienten i Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -477,25 +280,27 @@ msgstr ""
 "Éi lik melding ikkje importert til mappa %1 i KMail\n"
 "%n like meldingar ikkje importerte til mappa %1 i KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Importverktøy for KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Steg 1: Vel filter"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Steg 2: Importering …"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importer mbox-filer (Unix, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Igang med å importera"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Filter for import frå mbox</b></p><p>Dette filteret vil importera mbox-"
+"filer til KMail. Bruk dette filteret viss du vil importera e-postar frå "
+"Ximian Evolution eller andre e-postprogram som brukar dette tradisjonelle "
+"UNIX-formatet.</p><p><b>Merk:</b> E-postar vil verta importerte til mapper "
+"med namn etter den fila dei kom frå og med førestavinga MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Ferdig med å importera"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox-filer (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -504,24 +309,20 @@ msgstr "Importer e-post frå Outlook Express"
 #: filter_oe.cxx:42
 #, fuzzy
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Importfilter for Outlook Express 4/5/6</b></p>"
-"<p>Du må finna mappa der e-postboksen er lagra ved å søkja etter .dbx eller "
-".mbx-filer under "
-"<ul> "
-"<li><i>C:\\Windows\\Application Data</i> i Windows 9x"
-"<li><i>Documents and Settings</i> i Windows 2000 eller seinare</ul></p>"
-"<p><b>Merk:</b> E-postar vil verta importerte til mapper med namn etter den "
-"fila dei kom frå, med førestavinga OE-</p>"
+"<p><b>Importfilter for Outlook Express 4/5/6</b></p><p>Du må finna mappa der "
+"e-postboksen er lagra ved å søkja etter .dbx eller .mbx-filer under <ul> "
+"<li><i>C:\\Windows\\Application Data</i> i Windows 9x<li><i>Documents and "
+"Settings</i> i Windows 2000 eller seinare</ul></p><p><b>Merk:</b> E-postar "
+"vil verta importerte til mapper med namn etter den fila dei kom frå, med "
+"førestavinga OE-</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -557,6 +358,128 @@ msgstr "Importerer OE5+-postboksen %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Ignorerer OE5+-mappefila %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Importer e-post frå Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Filter for import frå Opera</b></p><p>Dette filteret vil importera e-"
+"post frå Opera. Bruk dette filteret viss du vil importera e-postar frå ein "
+"konto i Opera-mappa.</p> <p>Vel mappa som inneheld kontoen (vanlegvis ~/."
+"opera/mail/store/account*).</p><p><b>Merk:</b> E-postar blir importert til "
+"mapper som er namngjevne etter den fila dei kom frå og med førestavinga "
+"OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Tel filer …"
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Importerer nye e-postfiler …"
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Importer e-post frå Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Filter for import frå Outlook</b></p> <p>Dette filteret importerer e-"
+"post frå ei Outlook-pst-fil. Du må finna mappa der pst-fila er lagra ved å "
+"søkja etter .pst-filer under:<ul> <li><i>Documents and Settings</i> i "
+"Windows 2000 eller seinare.</ul></p><p><b>Merk:</b> E-postar vil bli "
+"importerte til mapper med namn etter den fila dei kom frå, med førestavinga "
+"OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Tel e-post …"
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Tel katalogar …"
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Tel mapper …"
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Importer e-post i rein tekst"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Vel mappa som inneheld e-posten din på systemet. E-postane er plassert i "
+"ei mappe med same namnet som katalogen dei var i med førestavinga PLAIN-</"
+"p><p>Dette filteret vil importera alle .msg, .eml og .txt e-postar.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importer mapper frå Pegasus-epost"
+
+#: filter_pmail.cxx:33
+#, fuzzy
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Vel mappa for Pegasus-epost på systemet (som inneheld CNM, PMM og MBX-"
+"filer). På mange system er desse lagra i C:\\Pmail\\mail</p><p><b>Merk:</b> "
+"Dette importfilteret vil importera mappene dine, men ikkje mappestrukturen. "
+"Du vil derimot truleg berre gjera dette ein gong.</p><p><b>Merk:</b> E-"
+"postar vil bli importert i mapper med førestavinga pmail-</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importerer nye e-postfiler («.cnm») …"
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importerer e-postmapper («.pmm») …"
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importerer «UNIX»-e-postmapper («.mbx») …"
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importerer %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
 #: filter_sylpheed.cxx:27
 #, fuzzy
 msgid "Import Sylpheed Maildirs and Folder Structure"
@@ -564,21 +487,57 @@ msgstr "Importer e-post og mappestruktur frå Evolution"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+#, fuzzy
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Importer lokal e-post og mappestruktur frå Thunderbird"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
 msgstr ""
 
+#: filter_thunderbird.cxx:28
+#, fuzzy
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Importer lokal e-post og mappestruktur frå Thunderbird"
+
+#: filter_thunderbird.cxx:30
+#, fuzzy
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Filter for import frå Thunderbird</b></p> <p>Vel e-postkatalogen til "
+"Thunderbird (vanlegvis ~/.thunderbird/*.default/Mail/Local Folders/).</p> "
+"<p><b>Merk:</b> Vel ikkje ei mappe som inneheld <u>noko anna</u> enn mbox-"
+"filer (t.d. ei maildir-mappe). Dersom du likevel gjer det, kjem du til å få "
+"massevis av nye mapper.</p> <p>Det er ikkje mogleg å gjenoppretta "
+"mappestrukturen, så mappenamna vil i staden visa strukturen.</p>"
+
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<b>Fatalt:</b> Klarte ikkje starta KMail for DCOP-kommunikasjon. Sjå til at <i>"
-"kmail</i> er installert."
+"<b>Fatalt:</b> Klarte ikkje starta KMail for DCOP-kommunikasjon. Sjå til at "
+"<i>kmail</i> er installert."
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -592,63 +551,74 @@ msgstr "Klarte ikkje leggja melding til i mappa %1 i KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Feil oppsto når meldinga blei lagt til mappa %1 i KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Importer e-post i rein tekst"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Frå:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Vel mappa som inneheld e-posten din på systemet. E-postane er plassert i ei "
-"mappe med same namnet som katalogen dei var i med førestavinga PLAIN-</p>"
-"<p>Dette filteret vil importera alle .msg, .eml og .txt e-postar.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Til:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importer mbox-filer (Unix, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Denne:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Filter for import frå mbox</b></p>"
-"<p>Dette filteret vil importera mbox-filer til KMail. Bruk dette filteret viss "
-"du vil importera e-postar frå Ximian Evolution eller andre e-postprogram som "
-"brukar dette tradisjonelle UNIX-formatet.</p>"
-"<p><b>Merk:</b> E-postar vil verta importerte til mapper med namn etter den "
-"fila dei kom frå og med førestavinga MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, fuzzy, no-c-format
+msgid "Importing in progress..."
+msgstr "Igang med å importera"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox-filer (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr " …"
 
-#: filter_thebat.cxx:33
-#, fuzzy
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Importer lokal e-post og mappestruktur frå Thunderbird"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Totalt:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, fuzzy, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Trykk «Tilbake» for å importera fleire e-postar og kontaktar"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
+"<b>Velkommen til KMailCVT – Importverktøyet til KMail</b>\n"
+"<br><br>\n"
+"Dette programmet vil hjelpa deg å importera e-postmeldingar frå andre e-"
+"postklientar til KMail.<br><br><br><br>\n"
+"Vel det programmet du vil importera frå og trykk «Neste»."
+
+#: kselfilterpagedlg.ui:133
+#, fuzzy, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Fjern like meldingar ved import"
 
-#~ msgid "<p>Select the base directory of Evolution's mails (usually ~/evolution/local).</p><p>As it is currently impossible to recreate the folder structure, it will be \"contained\" in the generated folder's names.</p><p>For instance, if you have a \"foo\" folder in Evolution, with a \"bar\" subfolder, two folders will be created in KMail : \"foo\" and \"foo-bar\"</p>"
-#~ msgstr "<p>Vel e-postmappa frå Evolution (vanlegvis ~/evolution/local).</p><p>På grunn av at det er umogeleg å gjenskape mappestrukturen, vil dei «oppbevarast» i dei oppretta mappenamna. </p> <p>Til dømes om du har ei «personleg»-mappe i Evolution, med ei «hemmeleg»-undermappe, vert to mapper laga i Kmail : «personleg» og «personleg-hemmeleg»</p>"
+#~ msgid ""
+#~ "<p>Select the base directory of Evolution's mails (usually ~/evolution/"
+#~ "local).</p><p>As it is currently impossible to recreate the folder "
+#~ "structure, it will be \"contained\" in the generated folder's names.</"
+#~ "p><p>For instance, if you have a \"foo\" folder in Evolution, with a \"bar"
+#~ "\" subfolder, two folders will be created in KMail : \"foo\" and \"foo-bar"
+#~ "\"</p>"
+#~ msgstr ""
+#~ "<p>Vel e-postmappa frå Evolution (vanlegvis ~/evolution/local).</p><p>På "
+#~ "grunn av at det er umogeleg å gjenskape mappestrukturen, vil dei "
+#~ "«oppbevarast» i dei oppretta mappenamna. </p> <p>Til dømes om du har ei "
+#~ "«personleg»-mappe i Evolution, med ei «hemmeleg»-undermappe, vert to "
+#~ "mapper laga i Kmail : «personleg» og «personleg-hemmeleg»</p>"
 
 #~ msgid "File %1 does not seem to be an Outlook Express mailbox"
 #~ msgstr "Fila %1 ser ikkje ut til å vera ein postboks for Outlook Express"
diff --git a/tde-i18n-pa/messages/tdepim/kmailcvt.po b/tde-i18n-pa/messages/tdepim/kmailcvt.po
index 68762271766..3dbf33e6aa5 100644
--- a/tde-i18n-pa/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-pa/messages/tdepim/kmailcvt.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-01-17 10:47+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi <punjabi-l10n@lists.sf.net>\n"
@@ -15,18 +15,76 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Outlook ਈ-ਮੇਲਾਂ ਆਯਾਤ"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "ਅਮਨਪ੍ਰੀਤ ਸਿੰਘ ਆਲਮ,ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "aalam@redhat.com,aalam@users.sf.net"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT ਅਯਾਤ ਸੰਦ"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "ਪਗ਼ 1: ਫੋਲਡਰ ਚੁਣੋ"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "ਪਗ਼ 2: ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "ਆਯਾਤ ਜਾਰੀ ਹੈ"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "ਆਯਾਤ ਮੁਕੰਮਲ"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>%1 ਵਲੋਂ ਲਿਖਿਆ ਗਿਆ।</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail ਆਯਾਤ ਫਿਲਟਰ"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) ੨੦੦੦-੨੦੦੫, KMailCVT ਖੋਜੀ"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "ਅਸਲੀ ਲੇਖਕ"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "ਪਰਬੰਧਕ ਅਤੇ ਨਵੇਂ ਫਿਲਟਰ"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "ਨਵਾਂ GUI & ਸਫ਼ਾਈ"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
@@ -37,27 +95,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "ਕੋਈ ਡਾਇਰੈਕਟਰੀ ਚੁਣੀ ਨਹੀਂ ਹੈ।"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "ਫਾਇਲਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "ਮੇਲਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "ਡਾਇਰੈਕਟਰੀਆਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "ਫੋਲਡਰਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "ਨਵੀਆਂ ਪੱਤਰ ਫਾਇਲਾਂ ਅਯਾਤ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -65,6 +102,22 @@ msgstr "ਨਵੀਆਂ ਪੱਤਰ ਫਾਇਲਾਂ ਅਯਾਤ ਕੀਤ�
 msgid "No files found for import."
 msgstr "ਆਯਾਤ ਕਰਨ ਲਈ ਕੋਈ ਫਾਇਲ ਨਹੀਂ ਹੈ।"
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "%1 ਤੋਂ ਈਮੇਲ ਆਯਾਤ ਕਰਨਾ ਮੁਕੰਮਲ ਹੋਇਆ"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "%1 ਨੂੰ ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ, ਅਧੂਰਾ ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -80,34 +133,31 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "%1 ਨੂੰ ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ, ਅਧੂਰਾ ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "%1 ਤੋਂ ਈਮੇਲ ਆਯਾਤ ਕਰਨਾ ਮੁਕੰਮਲ ਹੋਇਆ"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "ਆਯਾਤ ਕਰਨ ਖਤਮ, ਉਪਭੋਗੀ ਨੇ ਖਤਮ ਕੀਤਾ ਹੈ।"
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "ਫਾਇਲ %1 ਆਯਾਤ ਕਰਨੀ ਸ਼ੁਰੂ..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -115,59 +165,36 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr ""
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_pmail.cxx:69
+#: filter_kmail_maildir.cxx:28
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr ""
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr ""
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "%1 ਨੂੰ ਆਯਾਤ ਕੀਤੀ ਜਾ ਰਿਹਾ ਹੈ"
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+msgid "Import folder %1..."
+msgstr "ਫੋਲਡਰ %1 ਆਯਾਤ..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
 #, c-format
-msgid "Message %1"
-msgstr "%1 ਸੁਨੇਹਾ"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "ਫੋਲਡਰ ਢਾਂਚੇ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>%1 ਵਲੋਂ ਲਿਖਿਆ ਗਿਆ।</i></p>"
+msgid "Could not import %1"
+msgstr "%1 ਨੂੰ ਆਯਾਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
 
 #: filter_lnotes.cxx:30
 msgid "Import Lotus Notes Emails"
@@ -175,14 +202,13 @@ msgstr "ਲੋਟਸ ਸੂਚਨਾ ਈ-ਮੇਲ ਅਯਾਤ"
 
 #: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 
 #: filter_lnotes.cxx:55
@@ -194,201 +220,10 @@ msgstr "ਸਭ ਫਾਇਲਾਂ (*)"
 msgid "Importing emails from %1"
 msgstr "%1 ਤੋਂ ਈ-ਮੇਲ ਆਯਾਤ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr ""
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "ਆਯਾਤ ਕਰਨ ਖਤਮ, ਉਪਭੋਗੀ ਨੇ ਖਤਮ ਕੀਤਾ ਹੈ।"
-
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-msgid "Import folder %1..."
-msgstr "ਫੋਲਡਰ %1 ਆਯਾਤ..."
-
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
-msgid "Could not import %1"
-msgstr "%1 ਨੂੰ ਆਯਾਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
-
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "ਥੰਡਰਬਰਡ/ਮੌਜੀਲਾ ਲੋਕਲ ਪੱਤਰ ਅਤੇ ਫੋਲਡਰ ਢਾਂਚਾ ਆਯਾਤ"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "ਫਾਇਲ %1 ਆਯਾਤ ਕਰਨੀ ਸ਼ੁਰੂ..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr ""
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "ਵੱਲੋ:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "ਵੱਲ:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "ਮੌਜੂਦਾ:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "ਆਯਾਤ ਜਾਰੀ ਹੈ..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "ਕੁੱਲ:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "ਹੋਰ ਈ-ਮੇਲ ਜਾਂ ਸੰਪਰਕ ਅਯਾਤ ਕਰਨ ਲਈ 'ਪਿੱਛੇ' ਨੂੰ ਦਬਾਓ"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>KMailCVT ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ - ਕੇ-ਮੇਲ ਅਯਾਤ ਸੰਦ</b>\n"
-"<br>"
-"<br>\n"
-"ਇਹ ਸੰਦ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਪੁਰਾਣੇ ਈ-ਮੇਲ ਪਰੋਗਰਾਮ ਤੋਂ ਤੁਹਾਡੀਆਂ ਈ-ਮੇਲਾਂ ਅਯਾਤ ਕਰਨ ਲਈ "
-"ਸਹਾਇਤਾ ਕਰੇਗਾ।"
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" ਕਿਰਪਾ ਕਰਕੇ ਪਰੋਗਰਾਮ ਦੀ ਚੋਣ ਕਰੋ, ਜਿਸ ਤੋਂ ਆਯਾਤ ਕਰਨੀਆਂ ਹਨ, ਅਤੇ 'ਅੱਗੇ' ਦਬਾਓ।"
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr ""
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail ਆਯਾਤ ਫਿਲਟਰ"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) ੨੦੦੦-੨੦੦੫, KMailCVT ਖੋਜੀ"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "ਅਸਲੀ ਲੇਖਕ"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "ਪਰਬੰਧਕ ਅਤੇ ਨਵੇਂ ਫਿਲਟਰ"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "ਨਵਾਂ GUI & ਸਫ਼ਾਈ"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "ਅਮਨਪ੍ਰੀਤ ਸਿੰਘ ਆਲਮ,ਅਮਨਪਰੀਤ ਸਿੰਘ ਆਲਮ"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "aalam@redhat.com,aalam@users.sf.net"
+msgid "Message %1"
+msgstr "%1 ਸੁਨੇਹਾ"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -396,8 +231,8 @@ msgstr "OS X ਪੱਤਰ ਤੋਂ ਆਯਾਤ"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
@@ -406,25 +241,22 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT ਅਯਾਤ ਸੰਦ"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "ਪਗ਼ 1: ਫੋਲਡਰ ਚੁਣੋ"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "ਪਗ਼ 2: ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr ""
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "ਆਯਾਤ ਜਾਰੀ ਹੈ"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "ਆਯਾਤ ਮੁਕੰਮਲ"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox ਫਾਇਲਾਂ (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -432,13 +264,11 @@ msgstr ""
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
@@ -476,37 +306,54 @@ msgstr ""
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ ਫੋਲਡਰ ਫਾਇਲ %1 ਆਯਾਤ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
 msgstr ""
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "ਫਾਇਲਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "ਨਵੀਆਂ ਪੱਤਰ ਫਾਇਲਾਂ ਅਯਾਤ ਕੀਤੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Outlook ਈ-ਮੇਲਾਂ ਆਯਾਤ"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "ਕੇਮੇਲ ਵਿੱਚ ਫੋਲਡਰ %1 ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "ਮੇਲਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "ਕੇਮੇਲ ਵਿੱਚ %1 ਫੋਲਡਰ ਲਈ ਸੁਨੇਹੇ ਜੋੜੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "ਡਾਇਰੈਕਟਰੀਆਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "ਕੇਮੇਲ ਵਿੱਚ %1 ਫੋਲਡਰ ਤੋਂ ਸੁਨੇਹੇ ਜੋੜਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "ਫੋਲਡਰਾਂ ਦੀ ਗਿਣਤੀ ਜਾਰੀ ਹੈ..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -515,28 +362,63 @@ msgstr "ਸਮਤਲ ਪਾਠ ਈ-ਮੇਲਾਂ ਆਯਾਤ"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox ਫਾਇਲਾਂ (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr ""
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr ""
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr ""
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "%1 ਨੂੰ ਆਯਾਤ ਕੀਤੀ ਜਾ ਰਿਹਾ ਹੈ"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "ਫੋਲਡਰ ਢਾਂਚੇ ਦੀ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr ""
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -544,11 +426,97 @@ msgstr ""
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "ਥੰਡਰਬਰਡ/ਮੌਜੀਲਾ ਲੋਕਲ ਪੱਤਰ ਅਤੇ ਫੋਲਡਰ ਢਾਂਚਾ ਆਯਾਤ"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "ਕੇਮੇਲ ਵਿੱਚ ਫੋਲਡਰ %1 ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਦਾ ਹੈ"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "ਕੇਮੇਲ ਵਿੱਚ %1 ਫੋਲਡਰ ਲਈ ਸੁਨੇਹੇ ਜੋੜੇ ਨਹੀਂ ਜਾ ਸਕਦੇ ਹਨ"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "ਕੇਮੇਲ ਵਿੱਚ %1 ਫੋਲਡਰ ਤੋਂ ਸੁਨੇਹੇ ਜੋੜਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "ਵੱਲੋ:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "ਵੱਲ:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "ਮੌਜੂਦਾ:"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "ਆਯਾਤ ਜਾਰੀ ਹੈ..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "ਕੁੱਲ:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "ਹੋਰ ਈ-ਮੇਲ ਜਾਂ ਸੰਪਰਕ ਅਯਾਤ ਕਰਨ ਲਈ 'ਪਿੱਛੇ' ਨੂੰ ਦਬਾਓ"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>KMailCVT ਵਲੋਂ ਜੀ ਆਇਆਂ ਨੂੰ - ਕੇ-ਮੇਲ ਅਯਾਤ ਸੰਦ</b>\n"
+"<br><br>\n"
+"ਇਹ ਸੰਦ ਤੁਹਾਨੂੰ ਤੁਹਾਡੇ ਪੁਰਾਣੇ ਈ-ਮੇਲ ਪਰੋਗਰਾਮ ਤੋਂ ਤੁਹਾਡੀਆਂ ਈ-ਮੇਲਾਂ ਅਯਾਤ ਕਰਨ ਲਈ ਸਹਾਇਤਾ ਕਰੇਗਾ।"
+"<br><br><br><br>\n"
+" ਕਿਰਪਾ ਕਰਕੇ ਪਰੋਗਰਾਮ ਦੀ ਚੋਣ ਕਰੋ, ਜਿਸ ਤੋਂ ਆਯਾਤ ਕਰਨੀਆਂ ਹਨ, ਅਤੇ 'ਅੱਗੇ' ਦਬਾਓ।"
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
diff --git a/tde-i18n-pl/messages/tdepim/kmailcvt.po b/tde-i18n-pl/messages/tdepim/kmailcvt.po
index a72e9b93556..5d657c4fada 100644
--- a/tde-i18n-pl/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-pl/messages/tdepim/kmailcvt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2015-01-18 13:48+0100\n"
 "Last-Translator: mcbx\n"
 "Language-Team:  <pl@li.org>\n"
@@ -19,25 +19,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Import wiadomości Outlooka"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Marcin Giedz, Mikołaj Machowski"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "mgiedz@elka.pw.edu.pl, mikmach@wp.pl"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Narzędzie importu KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Krok 1: Wybierz filtr"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Krok 2: Importuj..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Import trwa"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import zakończony"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Autorem jest %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Filtry importu KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, programiści KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Oryginalny autor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Opiekun i nowe filtry"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nowe GUI i porządki"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Importuj wiadomości i strukturę folderów Evolution 1.x"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Filtr importu wiadomości z Outlooka</b></p>"
-"<p>Ten filtr importuje wiadomości z plików pst Outlooka. Będzie konieczne "
-"znalezienie katalogu zawierającego pliki pst w podkatalogach katalogu: <i>"
-"C:\\Documents and Settings</i> w Windows 2000 lub późniejszych</p>"
-"<p><b>Uwaga:</b> Wiadomości będą zaimportowane do folderu nazwanego tak samo "
-"jak konto, z którego pochodzą, z prefiksem OUTLOOK-</p>"
+"<p><b>Filtr importu z Evolution 1.x</b></p><p>Wybierz katalog bazowy foldera "
+"pocztowego Evolution (zwykle ~/evolution/local/).</p><p>Ponieważ możliwe "
+"jest odtworzenie struktury folderów, zostaną one umieszczone w folderze: "
+"\"Evolution-Import\"</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -47,27 +103,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Nie wybrano katalogu."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Zliczanie plików...."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Zliczanie wiadomości..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Zliczanie katalogów..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Zliczanie folderów..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Importowanie nowych plików wiadomości..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -75,6 +110,22 @@ msgstr "Importowanie nowych plików wiadomości..."
 msgid "No files found for import."
 msgstr "Nie znaleziono żadnych plików do zaimportowania."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Zakończono import wiadomości z %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Nie można otworzyć %1, pomijam"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -93,39 +144,37 @@ msgstr ""
 "Nie zaimportowano %n zduplikowanych wiadomości\n"
 "Nie zaimportowano %n zduplikowanych wiadomości"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Nie można otworzyć %1, pomijam"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Importuj wiadomości i strukturę folderów Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Importuj wiadomości i strukturę folderów Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Filtr importu z Evolution 1.x</b></p>"
-"<p>Wybierz katalog bazowy foldera pocztowego Evolution (zwykle "
-"~/evolution/local/).</p>"
-"<p>Ponieważ możliwe jest odtworzenie struktury folderów, zostaną one "
-"umieszczone w folderze: \"Evolution-Import\"</p>"
+"<p><b>Filtr importu z Evolution 2.x</b></p><p>Wybierz katalog bazowy foldera "
+"pocztowego Evolution (zwykle ~/.evolution/mail/local/).</p><p><b>Uwaga:</b>  "
+"Nigdy nie wybieraj foldera, który <u>nie zawiera</u> plików mbox (na "
+"przykład katalogu maildir). Jeśli to zrobisz, otrzymasz wiele nowych "
+"folderów.</p><p>Ponieważ możliwe jest odtworzenie struktury folderów, "
+"zostaną one umieszczone w folderze: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Zakończono import wiadomości z %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Import zakończony z powodu anulowania przez użytkownika."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Rozpocznij import pliku %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -133,99 +182,13 @@ msgstr "Importuj archiwum KMail"
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Filtr importu archiwum KMail</b></p>"
-"<p>ten filtr importuje pliki archiwum zapisywane przez KMail.</p>"
-"<p>Te pliki zawierają pełne drzewo katalogów spakowane w jeden plik.</p>"
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Import folderów Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p> Wybierz katalog Pegasus-Mail (zawierający pliki *.CNM, *.PMM, *.MBX). W "
-"większości systemów jest to C:\\PMail\\mail lub C:\\pmail\\mail\\admin</p> "
-"<p><b>Uwaga:</b>Ponieważ możliwe jest odtworzenie struktury folderów, zostaną "
-"one umieszczone w folderze: \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid "Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Nie udało się zanalizować struktury folderów, importowanie będzie kontynuowane "
-"bez obsługi podfolderów."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importowanie nowych plików wiadomości ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importowanie folderów wiadomości ('.pnm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importowanie 'uniksowych' folderów wiadomości ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importowanie %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Wiadomość %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Analizowanie struktury folderów..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Autorem jest %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Importowanie wiadomości Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Filtr importu wiadomości Structured Text z Lotus Notes</b></p>"
-"<p>Ten filtr importuje pliki Structured Text z programu pocztowego Lotus Notes "
-"do KMaila. Tego filtra można użyć do zaimportowania wiadomości z Lotusa lub "
-"innych programów pocztowych używających formatu Structured Text.</p>"
-"<p><b>Uwaga:</b> Ponieważ możliwe jest odtworzenie struktury folderów, zostaną "
-"one umieszczone w folderze \"LNotes-Import\", w podfolderach nazwanych "
-"stosowanie do plików z których powstały.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Wszystkie pliki (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Importowanie wiadomości z %1"
+"<p><b>Filtr importu archiwum KMail</b></p><p>ten filtr importuje pliki "
+"archiwum zapisywane przez KMail.</p><p>Te pliki zawierają pełne drzewo "
+"katalogów spakowane w jeden plik.</p>"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -233,32 +196,22 @@ msgstr "Importuj wiadomości i strukturę folderów KMail"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Filtr importu KMail</b></p>"
-"<p>Proszę wybrać katalog bazowy folderu pocztowego KMail, który chcesz "
-"zaimportować.</p>"
-"<p><b>Uwaga:</b> Nigdy nie wolno wybrać katalogu aktualnie używanego KMaila "
-"(zwykle ~/Mail lub ~/.trinity/share/apps/kmail/mail ): jeśli to zrobisz, "
-"KMailCVT może się zapętlić. </p>"
-"<p>Ten filtr nie importuje folderów KMail z plikami mbox.</p>"
-"<p>Ponieważ możliwe jest odtworzenie struktury folderów, zostaną one "
+"<p><b>Filtr importu KMail</b></p><p>Proszę wybrać katalog bazowy folderu "
+"pocztowego KMail, który chcesz zaimportować.</p><p><b>Uwaga:</b> Nigdy nie "
+"wolno wybrać katalogu aktualnie używanego KMaila (zwykle ~/Mail lub ~/."
+"trinity/share/apps/kmail/mail ): jeśli to zrobisz, KMailCVT może się "
+"zapętlić. </p><p>Ten filtr nie importuje folderów KMail z plikami mbox.</"
+"p><p>Ponieważ możliwe jest odtworzenie struktury folderów, zostaną one "
 "umieszczone w folderze: \"KMail-Import\".</p>"
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Import zakończony z powodu anulowania przez użytkownika."
-
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
 msgstr "Importuj folder %1..."
@@ -270,191 +223,41 @@ msgstr "Importuj folder %1..."
 msgid "Could not import %1"
 msgstr "Nie można zaimportować %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Importuj lokalne wiadomości i strukturę folderów Thunderbirda/Mozilli"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Filtr importu z Thunderbirda/Mozilli</b></p>"
-"<p>Wybierz główny folder poczty Thunderbirda/Mozilli (zwykle "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Uwaga:</b> Nigdy nie wybieraj foldera, który <u>nie zawiera</u> "
-"plików mbox (na przykład katalogu maildir). Jeśli to zrobisz, otrzymasz wiele "
-"nowych folderów.</p>"
-"<p>Ponieważ możliwe jest odtworzenie struktury folderów, zostaną one "
-"umieszczone w folderze: \"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Rozpocznij import pliku %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Import wiadomości Opery"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Filtr importu wiadomości z Opery</b></p>"
-"<p>Ten filtr importuje wiadomości z foldera pocztowego Opery. Użyj tego filtra, "
-"jeśli chcesz zaimportować wszystkie wiadomości znajdujące się na koncie w "
-"katalogu pocztowym Opery.</p>"
-"<p>Wybierz katalog zawierający konto (zwykle ~/.opera/mail/store/account*).</p>"
-"<p><b>Uwaga:</b>Wiadomości zostaną zaimportowane do folderów nazwanych tak jak "
-"konto, z którego pochodzą, z przedrostkiem OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Importuj wiadomości i strukturę folderów Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Filtr importu z Evolution 2.x</b></p>"
-"<p>Wybierz katalog bazowy foldera pocztowego Evolution (zwykle "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Uwaga:</b>  Nigdy nie wybieraj foldera, który <u>nie zawiera</u> "
-"plików mbox (na przykład katalogu maildir). Jeśli to zrobisz, otrzymasz wiele "
-"nowych folderów.</p>"
-"<p>Ponieważ możliwe jest odtworzenie struktury folderów, zostaną one "
-"umieszczone w folderze: \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Od:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Do:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Bieżący:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Importowanie trwa..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Wszystkich:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Proszę wcisnąć 'Wstecz', żeby zaimportować więcej wiadomości lub wizytówek"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Importowanie wiadomości Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Witaj w KMailCVT - Narzędziu importu KMaila</b>\n"
-"<br>"
-"<br>\n"
-"Ten program pomoże ci zaimportować wiadomości z twojego poprzedniego programu "
-"pocztowego do KMaila."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Proszę wybrać program z jakiego chcesz dokonać importu, a potem kliknij "
-"\"Następny\"."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Usuń z&duplikowane wiadomości podczas importu"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Filtry importu KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, programiści KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Oryginalny autor"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Opiekun i nowe filtry"
+"<p><b>Filtr importu wiadomości Structured Text z Lotus Notes</b></p><p>Ten "
+"filtr importuje pliki Structured Text z programu pocztowego Lotus Notes do "
+"KMaila. Tego filtra można użyć do zaimportowania wiadomości z Lotusa lub "
+"innych programów pocztowych używających formatu Structured Text.</"
+"p><p><b>Uwaga:</b> Ponieważ możliwe jest odtworzenie struktury folderów, "
+"zostaną one umieszczone w folderze \"LNotes-Import\", w podfolderach "
+"nazwanych stosowanie do plików z których powstały.</p>"
 
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nowe GUI i porządki"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Wszystkie pliki (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Marcin Giedz, Mikołaj Machowski"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Importowanie wiadomości z %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "mgiedz@elka.pw.edu.pl, mikmach@wp.pl"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Wiadomość %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -462,11 +265,11 @@ msgstr "Import z programu pocztowego OS X"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Filtr importu poczty z OS X</b></p>"
-"<p>Ten filtr importuje e-maile z klienta poczty z systemu Apple Mac OS X.</p>"
+"<p><b>Filtr importu poczty z OS X</b></p><p>Ten filtr importuje e-maile z "
+"klienta poczty z systemu Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -475,27 +278,30 @@ msgid ""
 msgstr ""
 "%n zduplikowana wiadomość nie została zaimportowana do foldera %1 w KMail\n"
 "%n zduplikowane wiadomości nie zostały zaimportowane do foldera %1 w KMail\n"
-"%n zduplikowanych wiadomości nie zostało zaimportowanych do foldera %1 w KMail"
-
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Narzędzie importu KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Krok 1: Wybierz filtr"
+"%n zduplikowanych wiadomości nie zostało zaimportowanych do foldera %1 w "
+"KMail"
 
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Krok 2: Importuj..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importuj pliki mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Import trwa"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Filtr importu mbox</b></p> <p>Ten filtr zaimportuje pliki mbox do "
+"KMaila. Użyj go jeśli chcesz dokonać importu wiadomości z Ximian Evolution "
+"lub innych programów pocztowych używających tego tradycyjnego uniksowego "
+"formatu.</p> <p><b>Uwaga:</b> Wiadomości zostaną zaimportowane do folderów "
+"nazwanych tak jak plik z którego pochodzą, z przedrostkiem MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import zakończony"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "pliki mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -503,24 +309,21 @@ msgstr "Import wiadomości Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Filtr importu z Outlook Express 4/5/6</b></p> "
-"<p>Musisz znaleźć katalog gdzie są przechowywane skrzynki pocztowe. Szukaj "
-"plików .dbx lub .mbx w: "
-"<ul> "
-"<li><i>C:\\Windows\\Application Data</i> w Windows 9x "
-"<li><i>Documents and Settings</i> w Windows 2000 lub nowszych </ul></p>"
-"<p><b>Uwaga:</b>Ponieważ możliwe jest odtworzenie struktury folderów, foldery z "
-"Outlook Express 5 i 6 zostaną umieszczone w folderze: \"OE-Import\".</p>"
+"<p><b>Filtr importu z Outlook Express 4/5/6</b></p> <p>Musisz znaleźć "
+"katalog gdzie są przechowywane skrzynki pocztowe. Szukaj plików .dbx lub ."
+"mbx w: <ul> <li><i>C:\\Windows\\Application Data</i> w Windows 9x "
+"<li><i>Documents and Settings</i> w Windows 2000 lub nowszych </ul></"
+"p><p><b>Uwaga:</b>Ponieważ możliwe jest odtworzenie struktury folderów, "
+"foldery z Outlook Express 5 i 6 zostaną umieszczone w folderze: \"OE-Import"
+"\".</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -555,30 +358,192 @@ msgstr "Importowanie skrzynki pocztowej OE5+ %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importowanie pliku folderu OE5+ %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Import wiadomości Opery"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Filtr importu wiadomości z Opery</b></p><p>Ten filtr importuje "
+"wiadomości z foldera pocztowego Opery. Użyj tego filtra, jeśli chcesz "
+"zaimportować wszystkie wiadomości znajdujące się na koncie w katalogu "
+"pocztowym Opery.</p><p>Wybierz katalog zawierający konto (zwykle ~/.opera/"
+"mail/store/account*).</p><p><b>Uwaga:</b>Wiadomości zostaną zaimportowane do "
+"folderów nazwanych tak jak konto, z którego pochodzą, z przedrostkiem OPERA-"
+"</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Zliczanie plików...."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Importowanie nowych plików wiadomości..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Import wiadomości Outlooka"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Filtr importu wiadomości z Outlooka</b></p><p>Ten filtr importuje "
+"wiadomości z plików pst Outlooka. Będzie konieczne znalezienie katalogu "
+"zawierającego pliki pst w podkatalogach katalogu: <i>C:\\Documents and "
+"Settings</i> w Windows 2000 lub późniejszych</p><p><b>Uwaga:</b> Wiadomości "
+"będą zaimportowane do folderu nazwanego tak samo jak konto, z którego "
+"pochodzą, z prefiksem OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Zliczanie wiadomości..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Zliczanie katalogów..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Zliczanie folderów..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Importuj zwykłe wiadomości tekstowe"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p> Wybierz katalog zawierający wiadomości w twoim systemie. Wiadomości będą "
+"umieszczone w folderze o takiej samej nazwie co katalog gdzie były z "
+"przedrostkiem PLAIN-</p> <p>Ten filtr zaimportuje wszystkie wiadomości ."
+"msg, .eml i .txt</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Import folderów Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p> Wybierz katalog Pegasus-Mail (zawierający pliki *.CNM, *.PMM, *.MBX). W "
+"większości systemów jest to C:\\PMail\\mail lub C:\\pmail\\mail\\admin</p> "
+"<p><b>Uwaga:</b>Ponieważ możliwe jest odtworzenie struktury folderów, "
+"zostaną one umieszczone w folderze: \"PegasusMail-Import\".</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Nie udało się zanalizować struktury folderów, importowanie będzie "
+"kontynuowane bez obsługi podfolderów."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importowanie nowych plików wiadomości ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importowanie folderów wiadomości ('.pnm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importowanie 'uniksowych' folderów wiadomości ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importowanie %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Analizowanie struktury folderów..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importuj wiadomości i strukturę folderów Sylpheed"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Filtr importu z Sylpheed</b></p><p>Wybierz katalog główny poczty "
+"Sylpheed, z którego chcesz importować (zwykle: ~/Mail ).</p><p>Ponieważ "
+"możliwe jest odtworzenie struktury folderów, zostaną one umieszczone w "
+"folderze: \"Sylpheed-Import\".</p><p>Ten filtr odtwarza również stan "
+"wiadomości, np. Nowa lub Przekazana."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Importuj wiadomości i strukturę folderów The Bat!"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
 msgstr ""
-"<p><b>Filtr importu z Sylpheed</b></p>"
-"<p>Wybierz katalog główny poczty Sylpheed, z którego chcesz importować (zwykle: "
-"~/Mail ).</p>"
-"<p>Ponieważ możliwe jest odtworzenie struktury folderów, zostaną one "
-"umieszczone w folderze: \"Sylpheed-Import\".</p>"
-"<p>Ten filtr odtwarza również stan wiadomości, np. Nowa lub Przekazana."
+"<p><b>Filtr importu z The Bat!</b></p><p>Wybierz katalog bazowy folderu "
+"pocztowego The Bat!, który chcesz zaimportować.</p><p><b>Uwaga:</b> Ten "
+"filtr importuje pliki *.tbb z lokalnych folderów The Bat!, np. z kont POP, a "
+"nie z kont IMAP/DIMAP.</p><p>Ponieważ możliwe jest odtworzenie struktury "
+"folderów, zostaną one umieszczone w folderze: \"TheBat-Import\".</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Importuj lokalne wiadomości i strukturę folderów Thunderbirda/Mozilli"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Filtr importu z Thunderbirda/Mozilli</b></p><p>Wybierz główny folder "
+"poczty Thunderbirda/Mozilli (zwykle ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Uwaga:</b> Nigdy nie wybieraj foldera, który <u>nie "
+"zawiera</u> plików mbox (na przykład katalogu maildir). Jeśli to zrobisz, "
+"otrzymasz wiele nowych folderów.</p><p>Ponieważ możliwe jest odtworzenie "
+"struktury folderów, zostaną one umieszczone w folderze: \"Thunderbird-Import"
+"\".</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>KRYTYCZNY:</b> Nie można uruchomić KMail dla komunikacji z DCOP. Upewnij "
 "się, że <i>kmail</i> jest zainstalowany."
@@ -595,65 +560,59 @@ msgstr "Nie można dodać wiadomości do folderu %1 w KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Błąd podczas dodawania wiadomości do folderu %1 w KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Importuj zwykłe wiadomości tekstowe"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Od:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p> Wybierz katalog zawierający wiadomości w twoim systemie. Wiadomości będą "
-"umieszczone w folderze o takiej samej nazwie co katalog gdzie były z "
-"przedrostkiem PLAIN-</p> "
-"<p>Ten filtr zaimportuje wszystkie wiadomości .msg, .eml i .txt</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Do:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importuj pliki mbox (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Bieżący:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Filtr importu mbox</b></p> "
-"<p>Ten filtr zaimportuje pliki mbox do KMaila. Użyj go jeśli chcesz dokonać "
-"importu wiadomości z Ximian Evolution lub innych programów pocztowych "
-"używających tego tradycyjnego uniksowego formatu.</p> "
-"<p><b>Uwaga:</b> Wiadomości zostaną zaimportowane do folderów nazwanych tak jak "
-"plik z którego pochodzą, z przedrostkiem MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Importowanie trwa..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "pliki mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Importuj wiadomości i strukturę folderów The Bat!"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Wszystkich:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Proszę wcisnąć 'Wstecz', żeby zaimportować więcej wiadomości lub wizytówek"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Filtr importu z The Bat!</b></p>"
-"<p>Wybierz katalog bazowy folderu pocztowego The Bat!, który chcesz "
-"zaimportować.</p>"
-"<p><b>Uwaga:</b> Ten filtr importuje pliki *.tbb z lokalnych folderów The Bat!, "
-"np. z kont POP, a nie z kont IMAP/DIMAP.</p>"
-"<p>Ponieważ możliwe jest odtworzenie struktury folderów, zostaną one "
-"umieszczone w folderze: \"TheBat-Import\".</p>"
+"<b>Witaj w KMailCVT - Narzędziu importu KMaila</b>\n"
+"<br><br>\n"
+"Ten program pomoże ci zaimportować wiadomości z twojego poprzedniego "
+"programu pocztowego do KMaila.<br><br><br><br>\n"
+"Proszę wybrać program z jakiego chcesz dokonać importu, a potem kliknij "
+"\"Następny\"."
 
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Usuń z&duplikowane wiadomości podczas importu"
diff --git a/tde-i18n-pt/messages/tdepim/kmailcvt.po b/tde-i18n-pt/messages/tdepim/kmailcvt.po
index d60fd7cffd1..6dabd877ed5 100644
--- a/tde-i18n-pt/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-pt/messages/tdepim/kmailcvt.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-12-31 21:37+0000\n"
 "Last-Translator: José Nuno Pires <jncp@netcabo.pt>\n"
 "Language-Team: pt <kde-i18n-pt@kde.org>\n"
@@ -16,25 +16,81 @@ msgstr ""
 "X-POFile-SpellExtra: Documents pst DIMAP Bat LNotes Sylpheed admin Lotus\n"
 "X-POFile-SpellExtra: Import PegasusMail tbb TheBat The\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Importar os E-mails do Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "José Nuno Pires,Pedro Morais"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "jncp@netcabo.pt,morais@kde.org"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Ferramenta de Importação KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "1º Passo: Seleccionar o Filtro"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "2º Passo: A importar..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importação a decorrer"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Importação terminou"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Criado por %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Filtros de Importação do KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, A equipa de desenvolvimento do KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Autor original"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Manutenção e Filtros Novos"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nova interface e limpezas"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Importar E-mails Locais e Estrutura de Pastas Locais do Evolution 1.x"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Filtro de importação de e-mail do Outlook</b></p>"
-"<p>Este filtro importa e-mail de um ficheiro pst do Outlook. Tem que localizar "
-"a pasta onde o ficheiro pst for guardado procurando por ficheiros .pst em: <i>"
-"C:\\Documents and Settings</i> no Windows 2000 ou superior</p>"
-"<p><b>Nota:</b> Os e-mails serão importados para uma pasta com o nome da conta "
-"de onde vieram, com o prefixo OUTLOOK-</p>"
+"<p><b>Filtro de importação Evolution 1.x</b></p><p>Escolha a pasta base de e-"
+"mail do Evolution (normalmente ~/.evolution/local/).</p><p><p>Dado que é "
+"possível voltar a criar a estrutura de pastas, estas ficarão guardadas sob: "
+"\"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -44,27 +100,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Nenhuma directoria seleccionada."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "A contar os ficheiros..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "A contar os e-mails..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "A contar as directorias..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "A contar as pastas..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "A importar os novos ficheiros de e-mail..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -72,6 +107,22 @@ msgstr "A importar os novos ficheiros de e-mail..."
 msgid "No files found for import."
 msgstr "Nenhum ficheiro encontrado para importar."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Terminou a importação do correio do %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Não é possível aceder ao %1, a ignorar"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -89,40 +140,37 @@ msgstr ""
 "1 mensagem duplicada não importada\n"
 "%n mensagens duplicadas não importadas"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Não é possível aceder ao %1, a ignorar"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Importar E-mails Locais e Estrutura de Pastas Locais do Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Importar E-mails e Estrutura de Pastas Locais do Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Filtro de importação Evolution 1.x</b></p>"
-"<p>Escolha a pasta base de e-mail do Evolution (normalmente "
-"~/.evolution/local/).</p>"
-"<p>"
-"<p>Dado que é possível voltar a criar a estrutura de pastas, estas ficarão "
+"<p><b>Filtro de importação Evolution 2.x</b></p><p>Escolha a pasta base de e-"
+"mail Evolution (normalmente ~/.evolution/mail/local/).</p><p><b>Nota:</b> "
+"Nunca escolha uma pasta que <u>não</u> contenha ficheiros mbox (por exemplo "
+"uma 'maildir'). Se o fizer de qualquer modo fica com muitas novas pastas.</"
+"p><p>Como é possível voltar a criar a estrutura de pastas, estas ficarão "
 "guardadas sob: \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Terminou a importação do correio do %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Terminou a importação; foi cancelada pelo utilizador."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Iniciar a importação do ficheiro %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -130,66 +178,43 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importar Pastas do Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Seleccione a pasta do Pegasus-Mail no seu sistema (a qual contém os "
-"ficheiros CNM, PMM e MBX). Em muitos sistemas esta é guardada no "
-"C:\\pmail\\mail ou em C:\\pmail\\mail\\admin/p>"
-"<p><b>Nota:</b> Dado que é possível criar de novo a estrutura de pastas, estas "
-"ficarão guardadas sob: \"PegasusMail-Import\".</p>"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
+msgstr "Importar E-mails e Estrutura de Pastas do KMail"
 
-#: filter_pmail.cxx:69
+#: filter_kmail_maildir.cxx:28
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"Não é possível processar a estrutura de pastas; a continuar a importação sem o "
-"suporte para sub-pastas."
+"<p><b>Filtro de importação do KMail</b></p><p>Seleccione a pasta de base da "
+"pasta de correio do KMail que deseja importar.</p><p><b>Nota:</b> Nunca "
+"seleccione a sua pasta local do KMail (normalmente a ~/Mail ou a ~/.trinity/"
+"share/apps/kmail/mail ): nesse caso, o KMailCVT poderá ficar preso num ciclo "
+"infinito.</p><p>Este filtro não importa as pastas de correio do KMail com "
+"ficheiros 'mbox'.</p><p>Dado que é possível criar de novo a estrutura de "
+"pastas, estas ficarão guardadas sob:\"KMail-Import\" na sua pasta local.</p>"
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "A importar os novos ficheiros de correio ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "A importar as pastas de correio ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "A importar as pastas do correio do UNIX ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "A importar %1"
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+msgid "Import folder %1..."
+msgstr "Importar a pasta %1..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
 #, c-format
-msgid "Message %1"
-msgstr "Mensagem %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "A processar a estrutura de pastas..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Criado por %1.</i></p>"
+msgid "Could not import %1"
+msgstr "Não foi possível importar %1"
 
 #: filter_lnotes.cxx:30
 msgid "Import Lotus Notes Emails"
@@ -197,22 +222,21 @@ msgstr "Importar os E-mails do Lotus Notes"
 
 #: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<p><b>Filtro de importação de texto estruturado do Lotus Notes</b></p>"
-"<p>Este filtro irá importar os ficheiros de texto estruturado que um cliente de "
-"e-mail do Lotus Notes tenha exportado para o KMail. Utilize este filtro se "
-"quiser importar as mensagens do Lotus Notes ou de outros programas que usem o "
-"formato de texto estruturado do Lotus Notes.</p>"
-"<p><b>Nota:</b> Dado que é possível voltar a criar a estrutura de pastas, estas "
-"serão guardadas em sub-pastas com os nomes dos ficheiros de onde são oriundas, "
+"<p><b>Filtro de importação de texto estruturado do Lotus Notes</b></"
+"p><p>Este filtro irá importar os ficheiros de texto estruturado que um "
+"cliente de e-mail do Lotus Notes tenha exportado para o KMail. Utilize este "
+"filtro se quiser importar as mensagens do Lotus Notes ou de outros programas "
+"que usem o formato de texto estruturado do Lotus Notes.</p><p><b>Nota:</b> "
+"Dado que é possível voltar a criar a estrutura de pastas, estas serão "
+"guardadas em sub-pastas com os nomes dos ficheiros de onde são oriundas, "
 "sob: \"LNotes-Import\" na sua pasta local.</p>"
 
 #: filter_lnotes.cxx:55
@@ -224,237 +248,10 @@ msgstr "Todos os Ficheiros (*)"
 msgid "Importing emails from %1"
 msgstr "A importar os e-mails de %1"
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr "Importar E-mails e Estrutura de Pastas do KMail"
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-"<p><b>Filtro de importação do KMail</b></p>"
-"<p>Seleccione a pasta de base da pasta de correio do KMail que deseja "
-"importar.</p>"
-"<p><b>Nota:</b> Nunca seleccione a sua pasta local do KMail (normalmente a "
-"~/Mail ou a ~/.trinity/share/apps/kmail/mail ): nesse caso, o KMailCVT poderá "
-"ficar preso num ciclo infinito.</p>"
-"<p>Este filtro não importa as pastas de correio do KMail com ficheiros "
-"'mbox'.</p>"
-"<p>Dado que é possível criar de novo a estrutura de pastas, estas ficarão "
-"guardadas sob:\"KMail-Import\" na sua pasta local.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Terminou a importação; foi cancelada pelo utilizador."
-
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-msgid "Import folder %1..."
-msgstr "Importar a pasta %1..."
-
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
-msgid "Could not import %1"
-msgstr "Não foi possível importar %1"
-
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Importar E-mails e Estrutura de Pastas do Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Filtro de importação Thunderbird/Mozilla</b></p>"
-"<p>Escolha a pasta base de e-mail Thunderbird/Mozilla (normalmente "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Nota:</b> Nunca escolha uma pasta que <u>não</u> "
-"contenha ficheiros mbox (por exemplo uma 'maildir'). Se o fizer de qualquer "
-"modo fica com muitas novas pastas.</p>"
-"<p>Como é actualmente impossível voltar a criar a estrutura de pastas, esta "
-"fica \"contida\" no nome das pastas geradas.</p>"
-"<p>Dado que é possível criar de novo a estrutura de pastas, estas ficarão sob: "
-"\"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Iniciar a importação do ficheiro %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Importar os E-mails do Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Filtro de importação de e-mail Opera</b></p>"
-"<p>Este filtro importa e-mail de uma pasta de e-mail Opera. Utilize este filtro "
-"se deseja importar todos os e-mails de uma conta na pasta de e-mail do "
-"Opera.</p>"
-"<p>Escolha a pasta da conta (normalmente ~/.opera/mail/store/account*).</p>"
-"<p><b>Nota:</b> Os e-mails serão importados para uma pasta com o nome da conta "
-"de onde vieram, com o prefixo OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Importar E-mails e Estrutura de Pastas Locais do Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Filtro de importação Evolution 2.x</b></p>"
-"<p>Escolha a pasta base de e-mail Evolution (normalmente "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Nota:</b> Nunca escolha uma pasta que <u>não</u> "
-"contenha ficheiros mbox (por exemplo uma 'maildir'). Se o fizer de qualquer "
-"modo fica com muitas novas pastas.</p>"
-"<p>Como é possível voltar a criar a estrutura de pastas, estas ficarão "
-"guardadas sob: \"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "De:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Para:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Actual:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Importação a decorrer..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Total:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Carregue em 'Anterior' para importar mais e-mails ou contactos"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>Bem-vindo ao KMailCVT - A Ferramenta de Importação do KMail</b>\n"
-"<br>"
-"<br>\n"
-"Este programa ajudá-lo-á a importar o seu correio dos seus programas de correio "
-"electrónico anteriores para o KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Seleccione por favor o programa do qual deseja importar os dados e carregue em "
-"'Próximo'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Remover as mensagens &duplicadas durante a importação"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Filtros de Importação do KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, A equipa de desenvolvimento do KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Autor original"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Manutenção e Filtros Novos"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nova interface e limpezas"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "José Nuno Pires,Pedro Morais"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "jncp@netcabo.pt,morais@kde.org"
+msgid "Message %1"
+msgstr "Mensagem %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -462,11 +259,11 @@ msgstr "Importar do OS X Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Filtro de Importação OS X Mail</b></p>"
-"<p>Este filtro importa e-mails do cliente Mail do Mac OS X da Apple.</p>"
+"<p><b>Filtro de Importação OS X Mail</b></p><p>Este filtro importa e-mails "
+"do cliente Mail do Mac OS X da Apple.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -476,25 +273,28 @@ msgstr ""
 "1 mensagem duplicada não importada para a pasta %1 do KMail<\n"
 "%n mensagem duplicadas não importadas para a pasta %1 do KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Ferramenta de Importação KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "1º Passo: Seleccionar o Filtro"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "2º Passo: A importar..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importar os ficheiros MBOX (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importação a decorrer"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Filtro de importação de 'mbox'</b></p><p>Este filtro irá importar os "
+"ficheiros MBOX para o KMail. Utilize este filtro se quiser importar as "
+"mensagens do Ximian Evolution ou de outros clientes que usam este formato "
+"tradicional do UNIX.</p><p><b>Nota:</b> As mensagens serão importadas para "
+"as pastas com o nome do ficheiro de onde vieram, acompanhadas do prefixo "
+"MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Importação terminou"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Ficheiros mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -502,25 +302,21 @@ msgstr "Importar os E-mails do Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Filtro de Importação do Outlook Express 4/5/6</b></p>"
-"<p>Você irá necessitar de localizar a pasta onde a caixa de correio foi "
-"gravada, para procurar pelos ficheiros .dbx ou .mbx em "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> no Windows 9x"
-"<li><i>Documents and Settings</i> no Windows 2000 ou posterior</ul></p>"
-"<p><b>Nota:</b> Dado que é possível criar de novo a estrutura de pastas, as "
-"pastas do Outlook Express 5 e 6 serão gravadas sob: \"OE-Import\" na sua pasta "
-"local.</p>"
+"<p><b>Filtro de Importação do Outlook Express 4/5/6</b></p><p>Você irá "
+"necessitar de localizar a pasta onde a caixa de correio foi gravada, para "
+"procurar pelos ficheiros .dbx ou .mbx em <ul><li><i>C:\\Windows\\Application "
+"Data</i> no Windows 9x<li><i>Documents and Settings</i> no Windows 2000 ou "
+"posterior</ul></p><p><b>Nota:</b> Dado que é possível criar de novo a "
+"estrutura de pastas, as pastas do Outlook Express 5 e 6 serão gravadas sob: "
+"\"OE-Import\" na sua pasta local.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -556,31 +352,194 @@ msgstr "A importar a Caixa do Correio do OE5+ %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "A importar o ficheiro da pasta do OE5+ %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Importar os E-mails do Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Filtro de importação de e-mail Opera</b></p><p>Este filtro importa e-"
+"mail de uma pasta de e-mail Opera. Utilize este filtro se deseja importar "
+"todos os e-mails de uma conta na pasta de e-mail do Opera.</p><p>Escolha a "
+"pasta da conta (normalmente ~/.opera/mail/store/account*).</p><p><b>Nota:</"
+"b> Os e-mails serão importados para uma pasta com o nome da conta de onde "
+"vieram, com o prefixo OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "A contar os ficheiros..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "A importar os novos ficheiros de e-mail..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Importar os E-mails do Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Filtro de importação de e-mail do Outlook</b></p><p>Este filtro "
+"importa e-mail de um ficheiro pst do Outlook. Tem que localizar a pasta onde "
+"o ficheiro pst for guardado procurando por ficheiros .pst em: <i>C:"
+"\\Documents and Settings</i> no Windows 2000 ou superior</p><p><b>Nota:</b> "
+"Os e-mails serão importados para uma pasta com o nome da conta de onde "
+"vieram, com o prefixo OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "A contar os e-mails..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "A contar as directorias..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "A contar as pastas..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Importar as Mensagens em Texto Simples"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Seleccione a pasta que contém as mensagens no seu sistema. Estas são "
+"armazenadas numa pasta com o mesmo nome da directoria onde eles se "
+"encontravam, antecedida de um PLAIN-</p><p>Este filtro irá importar todos os "
+"e-mails em .msg, .eml e .txt.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importar Pastas do Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Seleccione a pasta do Pegasus-Mail no seu sistema (a qual contém os "
+"ficheiros CNM, PMM e MBX). Em muitos sistemas esta é guardada no C:\\pmail"
+"\\mail ou em C:\\pmail\\mail\\admin/p><p><b>Nota:</b> Dado que é possível "
+"criar de novo a estrutura de pastas, estas ficarão guardadas sob: "
+"\"PegasusMail-Import\".</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Não é possível processar a estrutura de pastas; a continuar a importação sem "
+"o suporte para sub-pastas."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "A importar os novos ficheiros de correio ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "A importar as pastas de correio ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "A importar as pastas do correio do UNIX ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "A importar %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "A processar a estrutura de pastas..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importar E-mails e Estrutura de Pastas do Sylpheed"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Filtro de importação do Sylpheed</b></p><p>Seleccione a pasta de base "
+"da pasta de correio do Sylpheed que deseja importar (normalmente: ~/Mail ).</"
+"p><p>Dado que é possível criar de novo a estrutura, as pastas serão gravadas "
+"sob: \"Sylpheed-Import\" na sua pasta local.</p><p>Este filtro também cria "
+"de novo o estado da mensagem, p.ex. nova ou reencaminhada."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Importar E-mails e Estrutura de Pastas do The Bat!"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Filtro de importação do The Bat!</b></p><p>Seleccione a pasta de base "
+"da pasta de correio do 'The Bat!' que deseja importar.</p><p><b>Nota:</b> "
+"Este filtro importa os ficheiros '*.tbb' da pasta local do 'The Bat!', p."
+"ex., das contas de POP e não das contas de IMAP/DIMAP.</p><p>Dado que é "
+"possível criar de novo a estrutura de pastas, estas ficarão guardadas sob: "
+"\"TheBat-Import\" na sua pasta local.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Importar E-mails e Estrutura de Pastas do Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Filtro de importação do Sylpheed</b></p>"
-"<p>Seleccione a pasta de base da pasta de correio do Sylpheed que deseja "
-"importar (normalmente: ~/Mail ).</p>"
-"<p>Dado que é possível criar de novo a estrutura, as pastas serão gravadas sob: "
-"\"Sylpheed-Import\" na sua pasta local.</p>"
-"<p>Este filtro também cria de novo o estado da mensagem, p.ex. nova ou "
-"reencaminhada."
+"<p><b>Filtro de importação Thunderbird/Mozilla</b></p><p>Escolha a pasta "
+"base de e-mail Thunderbird/Mozilla (normalmente ~/.thunderbird/*.default/"
+"Mail/Local Folders/).</p><p><b>Nota:</b> Nunca escolha uma pasta que <u>não</"
+"u> contenha ficheiros mbox (por exemplo uma 'maildir'). Se o fizer de "
+"qualquer modo fica com muitas novas pastas.</p><p>Como é actualmente "
+"impossível voltar a criar a estrutura de pastas, esta fica \"contida\" no "
+"nome das pastas geradas.</p><p>Dado que é possível criar de novo a estrutura "
+"de pastas, estas ficarão sob: \"Thunderbird-Import\".</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Fatal</b>: Não foi possível iniciar o KMail para a comunicação por DCOP. "
 "Verifique se o <i>kmail</i> está instalado."
@@ -597,64 +556,58 @@ msgstr "Não foi possível adicionar a mensagem à pasta %1 no KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Erro ao adicionar a mensagem à pasta %1 no KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Importar as Mensagens em Texto Simples"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "De:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Seleccione a pasta que contém as mensagens no seu sistema. Estas são "
-"armazenadas numa pasta com o mesmo nome da directoria onde eles se encontravam, "
-"antecedida de um PLAIN-</p>"
-"<p>Este filtro irá importar todos os e-mails em .msg, .eml e .txt.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Para:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importar os ficheiros MBOX (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Actual:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Filtro de importação de 'mbox'</b></p>"
-"<p>Este filtro irá importar os ficheiros MBOX para o KMail. Utilize este filtro "
-"se quiser importar as mensagens do Ximian Evolution ou de outros clientes que "
-"usam este formato tradicional do UNIX.</p>"
-"<p><b>Nota:</b> As mensagens serão importadas para as pastas com o nome do "
-"ficheiro de onde vieram, acompanhadas do prefixo MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Importação a decorrer..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Ficheiros mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Importar E-mails e Estrutura de Pastas do The Bat!"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Total:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Carregue em 'Anterior' para importar mais e-mails ou contactos"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Filtro de importação do The Bat!</b></p>"
-"<p>Seleccione a pasta de base da pasta de correio do 'The Bat!' que deseja "
-"importar.</p>"
-"<p><b>Nota:</b> Este filtro importa os ficheiros '*.tbb' da pasta local do 'The "
-"Bat!', p.ex., das contas de POP e não das contas de IMAP/DIMAP.</p>"
-"<p>Dado que é possível criar de novo a estrutura de pastas, estas ficarão "
-"guardadas sob: \"TheBat-Import\" na sua pasta local.</p>"
+"<b>Bem-vindo ao KMailCVT - A Ferramenta de Importação do KMail</b>\n"
+"<br><br>\n"
+"Este programa ajudá-lo-á a importar o seu correio dos seus programas de "
+"correio electrónico anteriores para o KMail.<br><br><br><br>\n"
+" Seleccione por favor o programa do qual deseja importar os dados e carregue "
+"em 'Próximo'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Remover as mensagens &duplicadas durante a importação"
diff --git a/tde-i18n-pt_BR/messages/tdepim/kmailcvt.po b/tde-i18n-pt_BR/messages/tdepim/kmailcvt.po
index b798217ef98..65651b39466 100644
--- a/tde-i18n-pt_BR/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-pt_BR/messages/tdepim/kmailcvt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-08-28 15:15-0300\n"
 "Last-Translator: Felipe Arruda <felipemiguel@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@mail.kde.org>\n"
@@ -20,26 +20,81 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Importar Emails do Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Elvis Pfützenreuter, Rodrigo Stulzer"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "epx@conectiva.com.br, rodrigo@conectiva.com.br"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Ferramenta de Importação KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Passo 1: Selecionar filtro"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Passo 2: Importar..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Importação em progresso"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Importação finalizada"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Escrito por %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Filtros de Importação do KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, Os desenvolvedores do KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Autor original"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Mantenedor e Novos Filtros"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nova GUI & limpezas"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Importar Mensagens e Estrutura de Pastas do Evolution 1.x"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Filtro de importação de mensagens do Outlook</b></p>"
-"<p>Este filtro importará mensagens de um arquivo PST do Outlook. Você "
-"precisarálocalizar a pasta onde o arquivo PST é armazenado procurando por "
-"arquivos.pst em: <i>C:\\Documents and Settings</i> no Windows 2000 ou "
-"superior</p>"
-"<p><b>Nota:</b> As mensagens serão importadas para uma pasta com o nome da "
-"conta de onde vieram, com o prefixo OUTLOOK-</p>"
+"<p><b>Filtro de importação do Evolution 1.x</b></p><p>Selecione a pasta base "
+"de e-mails do Evolution (geralmente ~/evolution/local).</p><p>Já que é "
+"possível recriar a estrutura de pastas, as pastas serão armazenadas em : "
+"\"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -49,27 +104,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Nenhum diretório selecionado."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Contando arquivos ..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Contando mensagens..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Contando diretórios..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Contando pastas..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Importando novos arquivos de correio ..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -77,6 +111,22 @@ msgstr "Importando novos arquivos de correio ..."
 msgid "No files found for import."
 msgstr "Nenhum arquivo encontrado para importar."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Importação de e-mails finalizada de %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Impossível abrir %1, ignorando"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -94,39 +144,37 @@ msgstr ""
 "Uma mensagem duplicada não foi importada\n"
 "%n mensagens duplicadas não foram importadas"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Impossível abrir %1, ignorando"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Importar Mensagens e Estrutura de Pastas do Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Importar Mensagens e Estrutura de Pastas do Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Filtro de importação do Evolution 1.x</b></p>"
-"<p>Selecione a pasta base de e-mails do Evolution (geralmente "
-"~/evolution/local).</p>"
-"<p>Já que é possível recriar a estrutura de pastas, as pastas serão armazenadas "
+"<p><b>Filtro de importação do Evolution 2.x</b></p><p>Escolha a pasta base "
+"de mensagens Evolution (normalmente ~/.evolution/mail/local/).</p><p><b>Nota:"
+"</b> Nunca escolha uma pasta que <u>não</u> contenha arquivos mbox (por "
+"exemplo, um maildir). Se você fizer isso, ficará com muitas novas pastas.</"
+"p><p>Já que é possível recriar a estrutura de pasta, as pastas serão criadas "
 "em : \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Importação de e-mails finalizada de %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Importação finalizada, cancelada pelo usuário."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Iniciando a importação do arquivo %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -134,100 +182,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importar Diretórios do Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p> Selecione o diretório do Pegasus Mail em seu sistema (contendo arquivos "
-"*.CNM, *.PMM e *.MBX). Em muitos sistemas, ele está armazenado em "
-"C:\\pmail\\mail ou C:\\pmail\\mail\\admin</p>"
-"<p><b>Nota:</b> Já que é possível recriar a estrutura de pasta, as pastas serão "
-"armazenadas em: \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Não foi possível obter a estrutura de pastas, a importação continuará sem "
-"suporte à subpastas."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importando novos arquivos de correio ('.cnm') ..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importando pastas de correio ('.pmm') ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importando pastas de correio 'UNIX' ('.mbx') ..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importando %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Mensagem %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Decodificando estrutura de pastas..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Escrito por %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Importar Mensagens do Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Filtro de importação de Texto Estruturado do Lotus Notes</b></p>"
-"<p>Este filtro importará arquivos de Texto Estruturado exportados por um "
-"cliente de e-mail Lotus Notes para o KMail. Utilize este filtro se você deseja "
-"importar mensagens do Lotus ou outros clientes que utilizam formato de Texto "
-"Estruturado do Lotus Notes.</p>"
-"<p><b>Nota:</b> Já que é possível recriar a estrutura de pasta, as mensagens "
-"importadas serão armazenadas em subpastas dentro de: \"LNotes-Import\", na sua "
-"pasta local, nomeadas de acordo com o nome dos arquivos dos quais as mensagens "
-"vieram.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Todos os Arquivos (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Importando e-mails de %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -235,30 +193,21 @@ msgstr "Importar Mensagens e Estrutura de Pastas do KMail"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Filtro de importação do KMail</b></p>"
-"<p>Escolha a pasta base de mensagens do KMail que você deseja importar</p>"
-"<p><b>Nota:</b> Nunca selecione diretório de mensagens atual (normalmente "
-"~/Mail ou ~/.trinity/share/apps/kmail/mail ): neste caso, o KMailCVT pode "
-"acabar em um loop infinito. </p>"
-"<p>Este filtro não importa pasta de mensagens do KMail com arquivos mbox.</p>"
-"<p>Já que é possível recriar a estrutura de pasta, as pastas serão armazenadas "
-"em: \"KMail-Import\" na sua pasta local.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Importação finalizada, cancelada pelo usuário."
+"<p><b>Filtro de importação do KMail</b></p><p>Escolha a pasta base de "
+"mensagens do KMail que você deseja importar</p><p><b>Nota:</b> Nunca "
+"selecione diretório de mensagens atual (normalmente ~/Mail ou ~/.trinity/"
+"share/apps/kmail/mail ): neste caso, o KMailCVT pode acabar em um loop "
+"infinito. </p><p>Este filtro não importa pasta de mensagens do KMail com "
+"arquivos mbox.</p><p>Já que é possível recriar a estrutura de pasta, as "
+"pastas serão armazenadas em: \"KMail-Import\" na sua pasta local.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -271,191 +220,42 @@ msgstr "Importando pasta %1..."
 msgid "Could not import %1"
 msgstr "Não foi possível importar %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Importar Mensagens e Estrutura de Pastas do Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Filtro de importação do Thunderbird/Mozilla</b></p>"
-"<p>Escolha a pasta base de emails do Thunderbird/Mozilla (normalmente "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Nota:</b> Nunca escolha uma pasta que <u>não</u> "
-"contenha arquivos mbox (por exemplo, um maildir). Se você fizer isso, ficará "
-"com muitas novas pastas.</p>"
-"<p>Como é possível recriar a estrutura de pasta, as pastas serão armazenadas "
-"como: \"Thnderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Iniciando a importação do arquivo %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Importar Emails do Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Filtro de importação de mensagens do Opera</b></p>"
-"<p>Este filtro importa mensagens de uma pasta de correio do Opera. Use este "
-"filtro se você desejar importar todas as mensagens de uma conta na pasta de "
-"email do Opera.</p>"
-"<p>Escolha a pasta da conta (normalmente ~/.opera/mail/store/account*).</p>"
-"<p><b>Nota:</b> As mensagens serão importadas para uma pasta com o nome da "
-"conta de onde vieram, com o prefixo OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Importar Mensagens e Estrutura de Pastas do Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Filtro de importação do Evolution 2.x</b></p>"
-"<p>Escolha a pasta base de mensagens Evolution (normalmente "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Nota:</b> Nunca escolha uma pasta que <u>não</u> "
-"contenha arquivos mbox (por exemplo, um maildir). Se você fizer isso, ficará "
-"com muitas novas pastas.</p>"
-"<p>Já que é possível recriar a estrutura de pasta, as pastas serão criadas em : "
-"\"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "De:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Para:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Atual:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Importação em progresso..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Total:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Clique em 'Voltar' para importar mais mensagens ou contatos"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Importar Mensagens do Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Bem-vindo ao KMailCVT - A Ferramenta de Importação do KMail</b>\n"
-"<br>"
-"<br>\n"
-"Este programa lhe ajudará a importar seu e-mail do programa de e-mail anterior "
-"para dentro do KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Por favor, selecione o programa de onde gostaria de importar e então clique em "
-"'Próximo'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Remover mensagens &duplicadas durante a importação"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Filtros de Importação do KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, Os desenvolvedores do KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Autor original"
+"<p><b>Filtro de importação de Texto Estruturado do Lotus Notes</b></"
+"p><p>Este filtro importará arquivos de Texto Estruturado exportados por um "
+"cliente de e-mail Lotus Notes para o KMail. Utilize este filtro se você "
+"deseja importar mensagens do Lotus ou outros clientes que utilizam formato "
+"de Texto Estruturado do Lotus Notes.</p><p><b>Nota:</b> Já que é possível "
+"recriar a estrutura de pasta, as mensagens importadas serão armazenadas em "
+"subpastas dentro de: \"LNotes-Import\", na sua pasta local, nomeadas de "
+"acordo com o nome dos arquivos dos quais as mensagens vieram.</p>"
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Mantenedor e Novos Filtros"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nova GUI & limpezas"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Todos os Arquivos (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Elvis Pfützenreuter, Rodrigo Stulzer"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Importando e-mails de %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "epx@conectiva.com.br, rodrigo@conectiva.com.br"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Mensagem %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -463,11 +263,11 @@ msgstr "Importar do Mail.app do OS X"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Filtro de Importação do Mail.app do OS X</b></p> "
-"<p>Esse filtro importa mensagens do cliente de email do Mac OS X da Apple.</p>"
+"<p><b>Filtro de Importação do Mail.app do OS X</b></p> <p>Esse filtro "
+"importa mensagens do cliente de email do Mac OS X da Apple.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -477,25 +277,27 @@ msgstr ""
 "Uma mensagem duplicada não foi importada para a pasta %1 do KMail\n"
 "%n mensagens duplicadas não foram importadas para a pasta %1 do KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Ferramenta de Importação KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Passo 1: Selecionar filtro"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Passo 2: Importar..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importar arquivos mbox (Unix, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Importação em progresso"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>filtro de importação mbox</b></p><p>Este filtro importará arquivos "
+"mbox para o KMail. Use este filtro se você quer importar e-mails do Ximian "
+"Evolution ou outros programas de e-mail que usam este formato tradicional do "
+"Unix.</p><p><b>Nota:</b> Os e-mails serão importados para pastas com nomes "
+"iguais aos nomes dos arquivos de onde eles vieram, prefixados com MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Importação finalizada"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "arquivos mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -503,24 +305,21 @@ msgstr "Importar E-mails do Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Filtro de Importação do Outlook Express 4/5/6</b></p>"
-"<p>Você precisará localizar a pasta onde a caixa de correio foi armazenada, "
-"buscando arquivos do tipo .dbx ou .mbx em "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> no Windows 9x"
-"<li><i>Documentos e Preferências</i> no Windows 2000 ou posterior</ul></p>"
-"<p><b>Nota:</b> Já que é possível recriar a estrutura de pasta, as pastas do "
-"Outlook Express 5 e 6 serão armazenadas em: \"OE-Import\" na pasta local.</p>"
+"<p><b>Filtro de Importação do Outlook Express 4/5/6</b></p><p>Você precisará "
+"localizar a pasta onde a caixa de correio foi armazenada, buscando arquivos "
+"do tipo .dbx ou .mbx em <ul><li><i>C:\\Windows\\Application Data</i> no "
+"Windows 9x<li><i>Documentos e Preferências</i> no Windows 2000 ou posterior</"
+"ul></p><p><b>Nota:</b> Já que é possível recriar a estrutura de pasta, as "
+"pastas do Outlook Express 5 e 6 serão armazenadas em: \"OE-Import\" na pasta "
+"local.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -556,30 +355,192 @@ msgstr "Importando Caixa de Correio %1 do OE5+"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importando o arquivo de diretório %1 do OE5+"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Importar Emails do Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Filtro de importação de mensagens do Opera</b></p><p>Este filtro "
+"importa mensagens de uma pasta de correio do Opera. Use este filtro se você "
+"desejar importar todas as mensagens de uma conta na pasta de email do Opera."
+"</p><p>Escolha a pasta da conta (normalmente ~/.opera/mail/store/account*).</"
+"p><p><b>Nota:</b> As mensagens serão importadas para uma pasta com o nome da "
+"conta de onde vieram, com o prefixo OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Contando arquivos ..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Importando novos arquivos de correio ..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Importar Emails do Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Filtro de importação de mensagens do Outlook</b></p><p>Este filtro "
+"importará mensagens de um arquivo PST do Outlook. Você precisarálocalizar a "
+"pasta onde o arquivo PST é armazenado procurando por arquivos.pst em: <i>C:"
+"\\Documents and Settings</i> no Windows 2000 ou superior</p><p><b>Nota:</b> "
+"As mensagens serão importadas para uma pasta com o nome da conta de onde "
+"vieram, com o prefixo OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Contando mensagens..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Contando diretórios..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Contando pastas..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Importar Mensagens de Texto Puro"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Selecione o diretório contendo os e-mails em seu sistema. Os e-mails são "
+"colocados em um diretório com o mesmo nome do diretório de onde vieram, com "
+"o prefixo de PLAIN-</p><p>Este filtro importará todos os e-mails .msg, .eml "
+"e .txt.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importar Diretórios do Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p> Selecione o diretório do Pegasus Mail em seu sistema (contendo arquivos "
+"*.CNM, *.PMM e *.MBX). Em muitos sistemas, ele está armazenado em C:\\pmail"
+"\\mail ou C:\\pmail\\mail\\admin</p><p><b>Nota:</b> Já que é possível "
+"recriar a estrutura de pasta, as pastas serão armazenadas em: \"PegasusMail-"
+"Import\".</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Não foi possível obter a estrutura de pastas, a importação continuará sem "
+"suporte à subpastas."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importando novos arquivos de correio ('.cnm') ..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importando pastas de correio ('.pmm') ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importando pastas de correio 'UNIX' ('.mbx') ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importando %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Decodificando estrutura de pastas..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Importar Mensagens e Estrutura de Pastas do Slypheed"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Filtro de Importação Sylpheed</b></p><p>Selecione o diretório base da "
+"pasta de mensagens do Sylpheed que você quer importar (normalmente: ~/Mail )."
+"</p><p>Já que é possível recriar a estrutura de pasta, as pastas serão "
+"armazenadas em : \"Sylpheed-Import\" na sua pasta local.</p><p>Este filtro "
+"também recria o status da mensagem, ex: nova ou encaminhada."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Importar Mensagens e Estrutura de Pastas do \"The Bat!\""
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Filtro de importação The Bat!</b></p><p>Selecione o diretório base da "
+"pasta de mensagens do 'The Bat!' que você gostaria de importar.</"
+"p><p><b>Nota:</b> Este filtro importa os arquivos *.tbb da pasta local do "
+"'The Bat!', ex: de contas POP, e não de contas IMAP/DIMAP.</p><p>Já que é "
+"possível recriar a estrutura de pasta, as pastas serão armazenadas em : "
+"\"TheBat-Import\" na sua conta local.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Importar Mensagens e Estrutura de Pastas do Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Filtro de Importação Sylpheed</b></p>"
-"<p>Selecione o diretório base da pasta de mensagens do Sylpheed que você quer "
-"importar (normalmente: ~/Mail ).</p>"
-"<p>Já que é possível recriar a estrutura de pasta, as pastas serão armazenadas "
-"em : \"Sylpheed-Import\" na sua pasta local.</p>"
-"<p>Este filtro também recria o status da mensagem, ex: nova ou encaminhada."
+"<p><b>Filtro de importação do Thunderbird/Mozilla</b></p><p>Escolha a pasta "
+"base de emails do Thunderbird/Mozilla (normalmente ~/.thunderbird/*.default/"
+"Mail/Local Folders/).</p><p><b>Nota:</b> Nunca escolha uma pasta que <u>não</"
+"u> contenha arquivos mbox (por exemplo, um maildir). Se você fizer isso, "
+"ficará com muitas novas pastas.</p><p>Como é possível recriar a estrutura de "
+"pasta, as pastas serão armazenadas como: \"Thnderbird-Import\".</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Fatal:</b> não foi possível iniciar o KMail para comunicação DCOP. "
 "Certifique-se de que o <i>kmail</i> está instalado."
@@ -596,67 +557,61 @@ msgstr "Impossível adicionar mensagem à pasta %1 do KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Erro ao adicionar mensagem à pasta %1 no KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Importar Mensagens de Texto Puro"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "De:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Selecione o diretório contendo os e-mails em seu sistema. Os e-mails são "
-"colocados em um diretório com o mesmo nome do diretório de onde vieram, com o "
-"prefixo de PLAIN-</p>"
-"<p>Este filtro importará todos os e-mails .msg, .eml e .txt.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Para:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importar arquivos mbox (Unix, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Atual:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>filtro de importação mbox</b></p>"
-"<p>Este filtro importará arquivos mbox para o KMail. Use este filtro se você "
-"quer importar e-mails do Ximian Evolution ou outros programas de e-mail que "
-"usam este formato tradicional do Unix.</p>"
-"<p><b>Nota:</b> Os e-mails serão importados para pastas com nomes iguais aos "
-"nomes dos arquivos de onde eles vieram, prefixados com MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Importação em progresso..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "arquivos mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Importar Mensagens e Estrutura de Pastas do \"The Bat!\""
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Total:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Clique em 'Voltar' para importar mais mensagens ou contatos"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Filtro de importação The Bat!</b></p>"
-"<p>Selecione o diretório base da pasta de mensagens do 'The Bat!' que você "
-"gostaria de importar.</p>"
-"<p><b>Nota:</b> Este filtro importa os arquivos *.tbb da pasta local do 'The "
-"Bat!', ex: de contas POP, e não de contas IMAP/DIMAP.</p>"
-"<p>Já que é possível recriar a estrutura de pasta, as pastas serão armazenadas "
-"em : \"TheBat-Import\" na sua conta local.</p>"
+"<b>Bem-vindo ao KMailCVT - A Ferramenta de Importação do KMail</b>\n"
+"<br><br>\n"
+"Este programa lhe ajudará a importar seu e-mail do programa de e-mail "
+"anterior para dentro do KMail.<br><br><br><br>\n"
+" Por favor, selecione o programa de onde gostaria de importar e então clique "
+"em 'Próximo'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Remover mensagens &duplicadas durante a importação"
 
 #~ msgid "File %1 does not seem to be an Outlook Express mailbox"
 #~ msgstr "O arquivo %1 não parece ser uma caixa de correio do Outlook Express"
diff --git a/tde-i18n-ro/messages/tdepim/kmailcvt.po b/tde-i18n-ro/messages/tdepim/kmailcvt.po
index 9c75ece53c1..0955ad003e1 100644
--- a/tde-i18n-ro/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ro/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 27 04 2002 19:22\n"
 "Last-Translator: Claudiu Costin <claudiuc@geocities.com>\n"
 "Language-Team: Romanian <ro-kde@egroups.com>\n"
@@ -15,19 +15,78 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0beta1\n"
 
-#: filter_outlook.cxx:28
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Claudiu Costin"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "claudiuc@kde.org"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr ""
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: kmailcvt.cpp:34
 #, fuzzy
-msgid "Import Outlook Emails"
+msgid "Step 2: Importing..."
+msgstr "&Importă"
+
+#: kmailcvt.cpp:76
+#, fuzzy
+msgid "Import in progress"
 msgstr "Importare Outlook Express 4"
 
-#: filter_outlook.cxx:30
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr ""
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr ""
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr ""
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr ""
+
+#: main.cpp:36
+msgid "Original author"
+msgstr ""
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr ""
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
@@ -38,31 +97,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Înnumăr fişierele..."
-
-#: filter_outlook.cxx:46
-#, fuzzy
-msgid "Counting mail..."
-msgstr "Înnumăr fişierele..."
-
-#: filter_outlook.cxx:47
-#, fuzzy
-msgid "Counting directories..."
-msgstr "Înnumăr fişierele..."
-
-#: filter_outlook.cxx:48
-#, fuzzy
-msgid "Counting folders..."
-msgstr "Înnumăr fişierele..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-#, fuzzy
-msgid "Importing new mail files..."
-msgstr "Import fişiere cu mail-uri noi ('.cnm') ..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -70,6 +104,23 @@ msgstr "Import fişiere cu mail-uri noi ('.cnm') ..."
 msgid "No files found for import."
 msgstr ""
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr ""
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#, fuzzy
+msgid "Unable to open %1, skipping"
+msgstr "Nu pot deschide fişierul \"%1\""
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 #, fuzzy
@@ -86,34 +137,30 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "Eroare la adăugarea mesajului în directorui %1 al KMail"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-#, fuzzy
-msgid "Unable to open %1, skipping"
-msgstr "Nu pot deschide fişierul \"%1\""
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr ""
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
 #: filter_kmail_archive.cxx:24
@@ -122,108 +169,24 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-#, fuzzy
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importare Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Import fişiere cu mail-uri noi ('.cnm') ..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Import folderele de mail ('.pmm') ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Import fişiere de mail \"unix\" ('.mbx') ..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr ""
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr ""
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr ""
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
-
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "Importare Outlook Express 4"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:64
-#, fuzzy, c-format
-msgid "Importing emails from %1"
-msgstr "Import folderele de mail ('.pmm') ..."
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
@@ -238,159 +201,36 @@ msgstr "Import folderele de mail ('.pmm') ..."
 msgid "Could not import %1"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr ""
-
-#: filter_opera.cxx:28
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid "Import Opera Emails"
-msgstr "Importare Outlook Express 4"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr ""
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, fuzzy, no-c-format
-msgid "From:"
-msgstr "De la: %1"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, fuzzy, no-c-format
-msgid "To:"
-msgstr "La: %1"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, fuzzy, no-c-format
-msgid "Current:"
-msgstr "curent:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "Importing in progress..."
+msgid "Import Lotus Notes Emails"
 msgstr "Importare Outlook Express 4"
 
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr ""
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr ""
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr ""
-
-#: main.cpp:36
-msgid "Original author"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
 msgstr ""
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
+#: filter_lnotes.cxx:64
+#, fuzzy, c-format
+msgid "Importing emails from %1"
+msgstr "Import folderele de mail ('.pmm') ..."
 
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Claudiu Costin"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "claudiuc@kde.org"
-
 #: filter_mailapp.cxx:32
 #, fuzzy
 msgid "Import From OS X Mail"
@@ -398,8 +238,8 @@ msgstr "Importare Pegasus-Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
@@ -409,26 +249,21 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "Eroare la adăugarea mesajului în directorui %1 al KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
 msgstr ""
 
-#: kmailcvt.cpp:34
-#, fuzzy
-msgid "Step 2: Importing..."
-msgstr "&Importă"
-
-#: kmailcvt.cpp:76
-#, fuzzy
-msgid "Import in progress"
-msgstr "Importare Outlook Express 4"
-
-#: kmailcvt.cpp:79
-msgid "Import finished"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
 msgstr ""
 
 #: filter_oe.cxx:40
@@ -438,13 +273,11 @@ msgstr "Importare Outlook Express 4"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
@@ -483,25 +316,160 @@ msgstr ""
 msgid "Importing OE5+ Folder file %1"
 msgstr "   import directorul %1 în kmail %2"
 
+#: filter_opera.cxx:28
+#, fuzzy
+msgid "Import Opera Emails"
+msgstr "Importare Outlook Express 4"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Înnumăr fişierele..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#, fuzzy
+msgid "Importing new mail files..."
+msgstr "Import fişiere cu mail-uri noi ('.cnm') ..."
+
+#: filter_outlook.cxx:28
+#, fuzzy
+msgid "Import Outlook Emails"
+msgstr "Importare Outlook Express 4"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+
+#: filter_outlook.cxx:46
+#, fuzzy
+msgid "Counting mail..."
+msgstr "Înnumăr fişierele..."
+
+#: filter_outlook.cxx:47
+#, fuzzy
+msgid "Counting directories..."
+msgstr "Înnumăr fişierele..."
+
+#: filter_outlook.cxx:48
+#, fuzzy
+msgid "Counting folders..."
+msgstr "Înnumăr fişierele..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr ""
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+
+#: filter_pmail.cxx:31
+#, fuzzy
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importare Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Import fişiere cu mail-uri noi ('.cnm') ..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Import folderele de mail ('.pmm') ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Import fişiere de mail \"unix\" ('.mbx') ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr ""
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr ""
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 #, fuzzy
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "Eroare fatală: Nu am putut porni KMail\n"
 "pentru comunicaţie DCOP. Asiguraţi-vă că\n"
@@ -523,49 +491,54 @@ msgstr "Nu pot adăuga mesajul în directorul %1 din KMail"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Eroare la adăugarea mesajului în directorui %1 al KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr ""
+#: kimportpagedlg.ui:91
+#, fuzzy, no-c-format
+msgid "From:"
+msgstr "De la: %1"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
+#: kimportpagedlg.ui:99
+#, fuzzy, no-c-format
+msgid "To:"
+msgstr "La: %1"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr ""
+#: kimportpagedlg.ui:107
+#, fuzzy, no-c-format
+msgid "Current:"
+msgstr "curent:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, fuzzy, no-c-format
+msgid "Importing in progress..."
+msgstr "Importare Outlook Express 4"
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
 msgstr ""
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
 msgstr ""
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
 
 #, fuzzy
@@ -760,8 +733,11 @@ msgstr ""
 #~ "contactaţi autorul programului."
 
 #, fuzzy
-#~ msgid "A little tool to convert mail boxes and address books to KMail format"
-#~ msgstr "Un mic utilitar pentru conversia căsuţelor de mail şi a cărţilor de adrese la formatul KMail"
+#~ msgid ""
+#~ "A little tool to convert mail boxes and address books to KMail format"
+#~ msgstr ""
+#~ "Un mic utilitar pentru conversia căsuţelor de mail şi a cărţilor de "
+#~ "adrese la formatul KMail"
 
 #~ msgid "Kmailcvt2"
 #~ msgstr "Convertor KMail 2"
@@ -819,7 +795,8 @@ msgstr ""
 #~ msgstr "Nu pot deschide %1 pentru citire"
 
 #~ msgid "%1 has no PAB id that I know of, can't convert this"
-#~ msgstr "%1 nu are un identificator PAB cunoscut şi deci nu poate fi convertit"
+#~ msgstr ""
+#~ "%1 nu are un identificator PAB cunoscut şi deci nu poate fi convertit"
 
 #, fuzzy
 #~ msgid "Import Filter for Eudora Light Addressbook"
@@ -890,7 +867,8 @@ msgstr ""
 #~ "\n"
 #~ "OBSERVAŢIE: Kmailcvt preia aceleaşi nume de foldere,\n"
 #~ "dar le precede cu 'pmail-'. \n"
-#~ "Dacă acest lucru vă cauzează probleme (aveţi folderen în KMail care încep cu 'pmail-'), anulaţi procedura\n"
+#~ "Dacă acest lucru vă cauzează probleme (aveţi folderen în KMail care încep "
+#~ "cu 'pmail-'), anulaţi procedura\n"
 #~ "de importare (următorul dialog vă va spune ce să\n"
 #~ "faceţi) şi redenumiţi folderele KMail existente."
 
@@ -914,7 +892,8 @@ msgstr ""
 #~ "\n"
 #~ "OBSERVAŢIE: Kmailcvt preia aceleaşi nume de foldere,\n"
 #~ "dar le precede cu 'pmail-'. \n"
-#~ "Dacă acest lucru vă cauzează probleme (aveţi folderen în KMail care încep cu 'pmail-'), anulaţi procedura\n"
+#~ "Dacă acest lucru vă cauzează probleme (aveţi folderen în KMail care încep "
+#~ "cu 'pmail-'), anulaţi procedura\n"
 #~ "de importare (următorul dialog vă va spune ce să\n"
 #~ "faceţi) şi redenumiţi folderele KMail existente."
 
diff --git a/tde-i18n-ru/messages/tdepim/kmailcvt.po b/tde-i18n-ru/messages/tdepim/kmailcvt.po
index 42f1fc1a686..a7c76277275 100644
--- a/tde-i18n-ru/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ru/messages/tdepim/kmailcvt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-01-16 13:21+0300\n"
 "Last-Translator: Andrey Cherepanov <sibskull@mail.ru>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -16,28 +16,83 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Импорт писем Outlook Express 5"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Андрей Черепанов"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "sibskull@mail.ru"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Импорт KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Шаг 1: Выбор фильтра"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Шаг 2: Импорт..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Идёт импорт"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Импорт закончен"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Написан %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Фильтры импорта KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, Разработчики KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Автор идеи"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Сопровождение и новые фильтры"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Новый интерфейс и подчистка кода"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Импорт локальных папок и писем Evolution 1.х"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Фильтр импорта из Outlook</b></p>"
-"<p>Этот фильтр позволяет импортировать письма из почтового файла Outlook. "
-"Укажите папку, содержащую файл почты Outlook с расширением .pst. Эта папка "
-"располагается в <i>C:\\Documents and Settings</i> на Windows 2000 или более "
-"поздних версиях.</p>"
-"<p><b>Примечание:</b> Импортированные папки будут иметь префикс OUTLOOK-</p>"
+"<p><b>Импорт почты Evolution 1.х</b></p><p>Выберите каталог почты Evolution "
+"(обычно ~/evolution/local).</p><p>Если возможно воссоздать структуру папок, "
+"папки будут сохранены в папке \"Evolution-Import\".</p> "
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -47,27 +102,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Каталог не выбран."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Подсчёт файлов ..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Подсчёт писем..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Подсчёт каталогов..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Подсчёт папок..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Импорт новых почтовых файлов..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -75,6 +109,22 @@ msgstr "Импорт новых почтовых файлов..."
 msgid "No files found for import."
 msgstr "не найдено файлов для импорта."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Импорт электронных писем из %1 закончен"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Не удаётся открыть %1, будет пропущен"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -93,38 +143,37 @@ msgstr ""
 "%n повторяющихся письма не были импортированы\n"
 "%n повторяющихся писем не были импортированы"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Не удаётся открыть %1, будет пропущен"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Импорт локальных папок и писем Evolution 1.х"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Импорт локальных папок и писем Evolution 2.х"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Импорт почты Evolution 1.х</b></p>"
-"<p>Выберите каталог почты Evolution (обычно ~/evolution/local).</p>"
-"<p>Если возможно воссоздать структуру папок, папки будут сохранены в папке "
-"\"Evolution-Import\".</p> "
+"<p><b>Фильтр импорта из Evolution 2.x</b></p><p>Вам необходимо указать "
+"папку, в которой храниться почта Evolution (обычно это ~/.evolution/mail/"
+"local/).</p><p><b>Примечание:</b> <u>не пытайтесь</u> импортировать почту в "
+"формате, отличном от mbox (например почту в формате maildir). В этом случае "
+"вы получите огромное количество новых папок.</p><p>Если возможно воссоздать "
+"структуру папок, папки будут сохранены в \"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Импорт электронных писем из %1 закончен"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Прервано пользователем."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Импорт файла %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -132,98 +181,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Импорт папок из Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Выберите каталог Pegasus-Mail (содержащий файлы CNM, PMM и MBX). На "
-"большинстве систем они хранятся в каталоге C:\\PMail\\mail или "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Примечание:</b> Если возможно воссоздать структуру папок, папки будут "
-"сохранены в папке \"PegasusMail-Import\".</p> "
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Невозможно обработать структуру папок. Все сообщения будут импортированы в одну "
-"папку."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Импортировать новые почтовые файлы ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Импортировать почтовые папки ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Импортировать почтовые папки Unix ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Импорт %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Письмо %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Обработка структуры папок..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Написан %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Импорт писем Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Импорт из файлов с сохранёнными письмами Lotus Notes</b></p>"
-"<p>Этот фильтр импортирует письма из файлов с сохранёнными письмами Lotus "
-"Notes. Используйте этот фильтр, если хотите импортировать письма из файлов "
-"формата Structured Text, в которые Lotus Notes или другой почтовый клиент могут "
-"сохранить письма.</p> "
-"<p><b>Примечание:</b>Если возможно воссоздать структуру папок, письма будут "
-"сохранены в подпапках с именами файлов папки \"LNotes-Import\".</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Все файлы (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Импорт писем из %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -231,30 +192,20 @@ msgstr "Импорт папок KMail в формате maildir"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Фильтр импорта из KMail</b></p>"
-"<p>Вам необходимо указать папку, в которой храниться почта KMail.</p>"
-"<p><b>Примечание:</b> Никогда не выбирайте папку с вашей локальной почтой "
-"(~/Mail или ~/.trinity/share/apps/kmail/mail), так как в этом случае программа "
-"повиснет.</p> "
-"<p>Этот фильтр не импортирует папки в виде файлов mbox.</p> "
-"<p>Если возможно воссоздать структуру папок, папки будут сохранены в папке "
-"\"KMail-Import\".</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Прервано пользователем."
+"<p><b>Фильтр импорта из KMail</b></p><p>Вам необходимо указать папку, в "
+"которой храниться почта KMail.</p><p><b>Примечание:</b> Никогда не выбирайте "
+"папку с вашей локальной почтой (~/Mail или ~/.trinity/share/apps/kmail/"
+"mail), так как в этом случае программа повиснет.</p> <p>Этот фильтр не "
+"импортирует папки в виде файлов mbox.</p> <p>Если возможно воссоздать "
+"структуру папок, папки будут сохранены в папке \"KMail-Import\".</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -267,190 +218,41 @@ msgstr "Импорт папки %1..."
 msgid "Could not import %1"
 msgstr "Не удаётся импортировать %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Импорт локальных папок и писем Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Фильтр импорта из Thunderbird/Mozilla</b></p>"
-"<p>Вам необходимо указать папку, в которой храниться почта Thunderbird/Mozilla "
-"(обычно это ~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Примечание:</b> <u>не пытайтесь</u> импортировать почту в формате, "
-"отличном от mbox (например почту в формате maildir). В этом случае вы получите "
-"огромное количество новых папок.</p>"
-"<p>Если возможно воссоздать структуру папок, папки будут сохранены в папке "
-"\"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Импорт файла %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Импорт писем Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Импорт писем из Opera</b></p>"
-"<p>Этот фильтр импортирует письма из Opera в KMail. Используйте его, если вы "
-"хотите импортировать все письма из папки почты Opera.</p>"
-"<p>Укажите папку вашей учётной записи Opera (обычно это "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Примечание:</b> импортированные папки будут иметь префикс OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Импорт локальных папок и писем Evolution 2.х"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Фильтр импорта из Evolution 2.x</b></p>"
-"<p>Вам необходимо указать папку, в которой храниться почта Evolution (обычно "
-"это ~/.evolution/mail/local/).</p>"
-"<p><b>Примечание:</b> <u>не пытайтесь</u> импортировать почту в формате, "
-"отличном от mbox (например почту в формате maildir). В этом случае вы получите "
-"огромное количество новых папок.</p>"
-"<p>Если возможно воссоздать структуру папок, папки будут сохранены в "
-"\"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "С"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "по"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Текущий:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Идёт импорт..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Всего:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Нажмите на кнопку 'Назад' для импорта писем и контактов из других программ"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Импорт писем Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Добро пожаловать в KMailCVT - утилиту импорта данных в KMail</b>\n"
-"<br>"
-"<br>\n"
-"Эта программа поможет вам импортировать электронные письма из вашей прежней "
-"программы электронной почты в KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Выберите программу, данные которой вы хотите импортировать и нажмите 'Далее'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Удаление &повторяющихся писем при импорте"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
+"<p><b>Импорт из файлов с сохранёнными письмами Lotus Notes</b></p><p>Этот "
+"фильтр импортирует письма из файлов с сохранёнными письмами Lotus Notes. "
+"Используйте этот фильтр, если хотите импортировать письма из файлов формата "
+"Structured Text, в которые Lotus Notes или другой почтовый клиент могут "
+"сохранить письма.</p> <p><b>Примечание:</b>Если возможно воссоздать "
+"структуру папок, письма будут сохранены в подпапках с именами файлов папки "
+"\"LNotes-Import\".</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Фильтры импорта KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, Разработчики KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Автор идеи"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Сопровождение и новые фильтры"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Новый интерфейс и подчистка кода"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Все файлы (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Андрей Черепанов"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Импорт писем из %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "sibskull@mail.ru"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Письмо %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -458,12 +260,11 @@ msgstr "Импорт почты из почтового клиента OS X"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Импорт почты OS X</b></p>"
-"<p>Этот фильтр позволяет импортировать почту из почтового клиента Apple Mac OS "
-"X.</p>"
+"<p><b>Импорт почты OS X</b></p><p>Этот фильтр позволяет импортировать почту "
+"из почтового клиента Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -474,25 +275,27 @@ msgstr ""
 "%n повторяющихся письма не были добавлены в папку KMail %1\n"
 "%n повторяющихся писем не были добавлены в папку KMail %1"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Импорт KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Шаг 1: Выбор фильтра"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Шаг 2: Импорт..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Импорт файлов mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Идёт импорт"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Импорт из mbox</b></p><p>Этот фильтр импортирует письма из файлов mbox "
+"в KMail. Используйте его, если вы хотите импортировать письма из Ximian "
+"Evolution или других почтовых клиентов, которые хранят письма в традиционном "
+"формате почты UNIX.</p><p><b>Примечание:</b> импортированные папки будут "
+"иметь префикс MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Импорт закончен"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Файлы mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -500,25 +303,20 @@ msgstr "Импорт писем Outlook Express 5"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Фильтр импорта из Outlook Express 4/5/6</b></p>"
-"<p>Вам необходимо указать папку, в которой хранятся почтовые ящики Outlook  "
-"Express в файлах .dbx или .mbx:"
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> в Windows 9x"
-"<li><i>Documents and Settings</i> в Windows 2000 или более поздних версиях</ul>"
-"</p>"
-"<p><b>Примечание:</b>Если возможно воссоздать структуру папок, папки будут "
-"сохранены в \"OE-Import\".</p>"
+"<p><b>Фильтр импорта из Outlook Express 4/5/6</b></p><p>Вам необходимо "
+"указать папку, в которой хранятся почтовые ящики Outlook  Express в файлах ."
+"dbx или .mbx:<ul><li><i>C:\\Windows\\Application Data</i> в Windows "
+"9x<li><i>Documents and Settings</i> в Windows 2000 или более поздних "
+"версиях</ul></p><p><b>Примечание:</b>Если возможно воссоздать структуру "
+"папок, папки будут сохранены в \"OE-Import\".</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -553,29 +351,190 @@ msgstr "Импорт из почтового файла OE5+ %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Импорт файла папки OE5+ %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Импорт писем Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Импорт писем из Opera</b></p><p>Этот фильтр импортирует письма из "
+"Opera в KMail. Используйте его, если вы хотите импортировать все письма из "
+"папки почты Opera.</p><p>Укажите папку вашей учётной записи Opera (обычно "
+"это ~/.opera/mail/store/account*).</p><p><b>Примечание:</b> импортированные "
+"папки будут иметь префикс OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Подсчёт файлов ..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Импорт новых почтовых файлов..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Импорт писем Outlook Express 5"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Фильтр импорта из Outlook</b></p><p>Этот фильтр позволяет "
+"импортировать письма из почтового файла Outlook. Укажите папку, содержащую "
+"файл почты Outlook с расширением .pst. Эта папка располагается в <i>C:"
+"\\Documents and Settings</i> на Windows 2000 или более поздних версиях.</"
+"p><p><b>Примечание:</b> Импортированные папки будут иметь префикс OUTLOOK-</"
+"p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Подсчёт писем..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Подсчёт каталогов..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Подсчёт папок..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Импорт файлов сообщений электронной почты"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Выберите каталог, содержащий электронные письма. Письма будут "
+"импортированы в папку с тем же названием, что и имя каталога и префиксом "
+"PLAIN-</p><p>Этот фильтр импортирует электронные письма из файлов .msg, .eml "
+"и .txt.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Импорт папок из Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Выберите каталог Pegasus-Mail (содержащий файлы CNM, PMM и MBX). На "
+"большинстве систем они хранятся в каталоге C:\\PMail\\mail или C:\\pmail"
+"\\mail\\admin</p><p><b>Примечание:</b> Если возможно воссоздать структуру "
+"папок, папки будут сохранены в папке \"PegasusMail-Import\".</p> "
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Невозможно обработать структуру папок. Все сообщения будут импортированы в "
+"одну папку."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Импортировать новые почтовые файлы ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Импортировать почтовые папки ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Импортировать почтовые папки Unix ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Импорт %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Обработка структуры папок..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Импорт папок и писем Sylpheed"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 msgstr ""
-"<p><b>Импорт почты Sylpheed</b></p>"
-"<p>Выберите каталог почты Sylpheed (обычно ~/Mail).</p>"
-"<p>Если возможно воссоздать структуру папок, папки будут сохранены в папке "
-"\"Sylpheed-Import\".</p> "
-"<p>Также будут импортирован статус сообщений (новые, пересланные и т.п.)."
+"<p><b>Импорт почты Sylpheed</b></p><p>Выберите каталог почты Sylpheed "
+"(обычно ~/Mail).</p><p>Если возможно воссоздать структуру папок, папки будут "
+"сохранены в папке \"Sylpheed-Import\".</p> <p>Также будут импортирован "
+"статус сообщений (новые, пересланные и т.п.)."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Импорт папок и писем The Bat!"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Фильтр импорта из The Bat!</b></p><p>Вам необходимо указать папку, в "
+"которой храниться почта 'The Bat!'.</p><p><b>Примечание:</b> Этот фильтр "
+"импортирует импортирует локальные почтовые папки из файлов *.tbb (почта с "
+"серверов POP), но не почту с серверов IMAP/DIMAP.</p><p>Если возможно "
+"воссоздать структуру папок, папки будут сохранены в папке \"TheBat-Import\"."
+"</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Импорт локальных папок и писем Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Фильтр импорта из Thunderbird/Mozilla</b></p><p>Вам необходимо указать "
+"папку, в которой храниться почта Thunderbird/Mozilla (обычно это ~/."
+"thunderbird/*.default/Mail/Local Folders/).</p><p><b>Примечание:</b> <u>не "
+"пытайтесь</u> импортировать почту в формате, отличном от mbox (например "
+"почту в формате maildir). В этом случае вы получите огромное количество "
+"новых папок.</p><p>Если возможно воссоздать структуру папок, папки будут "
+"сохранены в папке \"Thunderbird-Import\".</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Критическая ошибка:</b> Не удаётся запустить KMail для связи через DCOP. "
 "Убедитесь, что программа <i>kmail</i> установлена."
@@ -592,62 +551,58 @@ msgstr "Не удаётся добавить письмо в папку KMail %1
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Ошибка добавления письма в папку KMail %1"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Импорт файлов сообщений электронной почты"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "С"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Выберите каталог, содержащий электронные письма. Письма будут импортированы "
-"в папку с тем же названием, что и имя каталога и префиксом PLAIN-</p>"
-"<p>Этот фильтр импортирует электронные письма из файлов .msg, .eml и .txt.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "по"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Импорт файлов mbox (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Текущий:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Импорт из mbox</b></p>"
-"<p>Этот фильтр импортирует письма из файлов mbox в KMail. Используйте его, если "
-"вы хотите импортировать письма из Ximian Evolution или других почтовых "
-"клиентов, которые хранят письма в традиционном формате почты UNIX.</p>"
-"<p><b>Примечание:</b> импортированные папки будут иметь префикс MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Идёт импорт..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Файлы mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Импорт папок и писем The Bat!"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Всего:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Нажмите на кнопку 'Назад' для импорта писем и контактов из других программ"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Фильтр импорта из The Bat!</b></p>"
-"<p>Вам необходимо указать папку, в которой храниться почта 'The Bat!'.</p>"
-"<p><b>Примечание:</b> Этот фильтр импортирует импортирует локальные почтовые "
-"папки из файлов *.tbb (почта с серверов POP), но не почту с серверов "
-"IMAP/DIMAP.</p>"
-"<p>Если возможно воссоздать структуру папок, папки будут сохранены в папке "
-"\"TheBat-Import\".</p>"
+"<b>Добро пожаловать в KMailCVT - утилиту импорта данных в KMail</b>\n"
+"<br><br>\n"
+"Эта программа поможет вам импортировать электронные письма из вашей прежней "
+"программы электронной почты в KMail.<br><br><br><br>\n"
+"Выберите программу, данные которой вы хотите импортировать и нажмите 'Далее'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Удаление &повторяющихся писем при импорте"
diff --git a/tde-i18n-rw/messages/tdepim/kmailcvt.po b/tde-i18n-rw/messages/tdepim/kmailcvt.po
index 39171a11418..63de4d183f2 100644
--- a/tde-i18n-rw/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-rw/messages/tdepim/kmailcvt.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt 3.4\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-05-25 18:52-0600\n"
 "Last-Translator: Steve Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -24,95 +24,78 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: filter_outlook.cxx:28
-#, fuzzy
-msgid "Import Outlook Emails"
-msgstr "utumenyetso tw'igitabo cy'itumiza"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+"Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien "
+"NSENGIYUMVA"
 
-#: filter_outlook.cxx:30
-#, fuzzy
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
 msgstr ""
-"<p> <b> Imeli Kuzana Akayunguruzo: </b> </p> "
-"<p> Akayunguruzo: Kuzana Kuva: A - Idosiye . Kuri i Ububiko... i - Idosiye ku "
-"Gushakisha... ya:  . Idosiye : <i> : \\D na </i> in Cyangwa Nyuma </p> "
-"<p> <b> icyitonderwa : </b> cyavuye ahandi/cyatumijwe A Ububiko... &Cyitwa: "
-"Nyuma i Konti: Kuva: , Na: - </p> "
+"muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, "
+"ndonatienuk@yahoo.co.uk"
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr ""
+
+#: kmailcvt.cpp:31
 #, fuzzy
-msgid "No directory selected."
-msgstr "Ububiko Byahiswemo . "
+msgid "Step 1: Select Filter"
+msgstr "1 : "
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
+#: kmailcvt.cpp:34
 #, fuzzy
-msgid "Counting files..."
-msgstr "Idosiye ... "
+msgid "Step 2: Importing..."
+msgstr "2 : ... "
 
-#: filter_outlook.cxx:46
+#: kmailcvt.cpp:76
 #, fuzzy
-msgid "Counting mail..."
-msgstr "Ibaruwa ... "
+msgid "Import in progress"
+msgstr "in Aho bigeze: "
 
-#: filter_outlook.cxx:47
+#: kmailcvt.cpp:79
 #, fuzzy
-msgid "Counting directories..."
-msgstr "ububiko bw'amaderese ... "
+msgid "Import finished"
+msgstr "Byarangiye "
 
-#: filter_outlook.cxx:48
+#: kselfilterpage.cpp:78
 #, fuzzy
-msgid "Counting folders..."
-msgstr "Ububiko ... "
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p> <i> ku %1 . </i> </p> "
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#: main.cpp:33
 #, fuzzy
-msgid "Importing new mail files..."
-msgstr "Gishya Ibaruwa Idosiye ... "
+msgid "KMailCVT"
+msgstr "Ibaruwa"
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#: main.cpp:34
 #, fuzzy
-msgid "No files found for import."
-msgstr "Idosiye Byabonetse ya:  Kuzana . "
+msgid "KMail Import Filters"
+msgstr "Muyunguruzi izana"
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
+#: main.cpp:35
 #, fuzzy
-msgid "Importing emails from %1..."
-msgstr "Kuva: %1 ... "
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "( C ) - , "
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
-#, fuzzy, c-format
-msgid ""
-"_n: 1 duplicate message not imported\n"
-"%n duplicate messages not imported"
-msgstr ""
-"1 Gusubiramo &Ubutumwa OYA %n Gusubiramo Ubutumwa OYA cyavuye ahandi/cyatumijwe "
+#: main.cpp:36
+msgid "Original author"
+msgstr "Umwanditsi wa mbere "
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+#: main.cpp:37
 #, fuzzy
-msgid "Unable to open %1, skipping"
-msgstr "Kuri Gufungura %1 , Gusimbuka: %s "
+msgid "Maintainer & New filters"
+msgstr "& Muyunguruzi "
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr ""
 
 #: filter_evolution.cxx:31
 #, fuzzy
@@ -122,15 +105,31 @@ msgstr "1 . x na "
 #: filter_evolution.cxx:33
 #, fuzzy
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p> <b> 1 . x Kuzana Akayunguruzo: </b> </p> "
-"<p> i SHINGIRO Ububiko Bya ( ~ /Impinduka /Bya hafi ) . </p> "
-"<p> ni Kuri i Ububiko... Imiterere , i Ububiko : \" - \" . </p> "
+"<p> <b> 1 . x Kuzana Akayunguruzo: </b> </p> <p> i SHINGIRO Ububiko Bya ( ~ /"
+"Impinduka /Bya hafi ) . </p> <p> ni Kuri i Ububiko... Imiterere , i "
+"Ububiko : \" - \" . </p> "
+
+#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
+#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
+#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
+#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
+#: filter_thunderbird.cxx:65
+#, fuzzy
+msgid "No directory selected."
+msgstr "Ububiko Byahiswemo . "
+
+#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
+#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
+#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
+#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+#, fuzzy
+msgid "No files found for import."
+msgstr "Idosiye Byabonetse ya:  Kuzana . "
 
 #: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
 #: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
@@ -140,110 +139,78 @@ msgstr ""
 msgid "Finished importing emails from %1"
 msgstr "Kuvana hanze... Kuva: %1 "
 
-#: filter_kmail_archive.cxx:24
-msgid "Import KMail Archive File"
-msgstr ""
-
-#: filter_kmail_archive.cxx:26
-msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr ""
-
-#: filter_pmail.cxx:33
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
 #, fuzzy
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p> i - Ububiko ku Sisitemu ( * . , * . na * . Idosiye ) . iyi ni in : \\p "
-"Ibaruwa \\m Cyangwa : \\p Ibaruwa \\m \\a DGITO </p> "
-"<p> <b> icyitonderwa : </b> ni Kuri i Ububiko... Imiterere , i Ububiko : \" - "
-"\" . </p> "
+msgid "Unable to open %1, skipping"
+msgstr "Kuri Gufungura %1 , Gusimbuka: %s "
 
-#: filter_pmail.cxx:69
+#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
+#: filter_opera.cxx:89 filter_outlook.cxx:57
 #, fuzzy
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr "i Ububiko... Imiterere ; Kuzana Gushigikira . "
+msgid "Importing emails from %1..."
+msgstr "Kuva: %1 ... "
 
-#: filter_pmail.cxx:72
-#, fuzzy
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Gishya Ibaruwa Idosiye ( ' . ) ... "
+#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
+#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
+#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
+#: filter_thunderbird.cxx:101
+#, fuzzy, c-format
+msgid ""
+"_n: 1 duplicate message not imported\n"
+"%n duplicate messages not imported"
+msgstr ""
+"1 Gusubiramo &Ubutumwa OYA %n Gusubiramo Ubutumwa OYA cyavuye ahandi/"
+"cyatumijwe "
 
-#: filter_pmail.cxx:74
+#: filter_evolution_v2.cxx:29
 #, fuzzy
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Ibaruwa Ububiko ( ' . ) ... "
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "2 . x na "
 
-#: filter_pmail.cxx:76
+#: filter_evolution_v2.cxx:31
 #, fuzzy
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "' Ibaruwa Ububiko ( ' . ) ... "
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, fuzzy, c-format
-msgid "Importing %1"
-msgstr "Kuvana hanze..."
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, fuzzy, c-format
-msgid "Message %1"
-msgstr "Ubutumwa:"
+msgid ""
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
+msgstr ""
+"<p> <b> 2 . x Kuzana Akayunguruzo: </b> </p> <p> i SHINGIRO Ububiko Bya Bya "
+"hafi ( ~ /. Impinduka /Ibaruwa /Bya hafi /) . </p> <p> <b> icyitonderwa : </"
+"b> Hitamo... A < u > OYA < /u > - Idosiye ( ya:  Urugero: A ) : NIBA , "
+"Kubona Gishya Ububiko . </p> <p> ni Kuri i Ububiko... Imiterere , i "
+"Ububiko : \" - \" . </p> "
 
-#: filter_pmail.cxx:290
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
 #, fuzzy
-msgid "Parsing the folder structure..."
-msgstr "i Ububiko... Imiterere ... "
+msgid "Finished import, canceled by user."
+msgstr "Kuzana , Kureka ku Umukoresha . "
 
-#: kselfilterpage.cpp:78
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
 #, fuzzy
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p> <i> ku %1 . </i> </p> "
+msgid "Start import file %1..."
+msgstr "Gutangira Kuzana Idosiye %1 ... "
 
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "Kuzana amadosiye ya Lotus"
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
+msgstr ""
 
-#: filter_lnotes.cxx:32
-#, fuzzy
+#: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p> <b> Ibaruwa Kuzana Akayunguruzo: </b> </p> "
-"<p> Akayunguruzo: Kuzana Idosiye Kuva: Imeli Umukiriya . iyi Akayunguruzo: NIBA "
-"Kuri Kuzana Kuva: Cyangwa Ikindi Koresha Imiterere . </p> "
-"<p> <b> icyitonderwa : </b> ni Kuri i Ububiko... Imiterere , i cyavuye "
-"ahandi/cyatumijwe Ubutumwa in &Cyitwa: ku i Idosiye Kuva: : \" - \" in Bya hafi "
-"Ububiko... . </p> "
-
-#: filter_lnotes.cxx:55
-#, fuzzy
-msgid "All Files (*)"
-msgstr "Amadosiye yose"
-
-#: filter_lnotes.cxx:64
-#, fuzzy, c-format
-msgid "Importing emails from %1"
-msgstr "Kuva: %1 "
 
 #: filter_kmail_maildir.cxx:26
 #, fuzzy
@@ -253,30 +220,19 @@ msgstr "na "
 #: filter_kmail_maildir.cxx:28
 #, fuzzy
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p> <b> Kuzana Akayunguruzo: </b> </p> "
-"<p> i SHINGIRO Ububiko Bya i Kuri Kuzana . </p> "
-"<p> <b> icyitonderwa : </b> Guhitamo KIGEZWEHO Bya hafi ( ~ /Cyangwa ~ /. kde "
-"/Gusangiza ///Ibaruwa ) : in iyi , Gicurasi in A Gikomeza . </p> "
-"<p> Akayunguruzo: OYA Kuzana Na: Idosiye . </p> "
-"<p> ni Kuri i Ububiko... Imiterere , i Ububiko : \" - \" in Bya hafi Ububiko... "
-". </p> "
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-#, fuzzy
-msgid "Finished import, canceled by user."
-msgstr "Kuzana , Kureka ku Umukoresha . "
+"<p> <b> Kuzana Akayunguruzo: </b> </p> <p> i SHINGIRO Ububiko Bya i Kuri "
+"Kuzana . </p> <p> <b> icyitonderwa : </b> Guhitamo KIGEZWEHO Bya hafi ( ~ /"
+"Cyangwa ~ /. kde /Gusangiza ///Ibaruwa ) : in iyi , Gicurasi in A Gikomeza . "
+"</p> <p> Akayunguruzo: OYA Kuzana Na: Idosiye . </p> <p> ni Kuri i "
+"Ububiko... Imiterere , i Ububiko : \" - \" in Bya hafi Ububiko... . </p> "
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 #, fuzzy
@@ -290,198 +246,42 @@ msgstr "Ububiko... %1 ... "
 msgid "Could not import %1"
 msgstr "OYA Kuzana %1 "
 
-#: filter_thunderbird.cxx:28
-#, fuzzy
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "/Mozilla na "
-
-#: filter_thunderbird.cxx:30
-#, fuzzy
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p> <b> /Mozilla Kuzana Akayunguruzo: </b> </p> "
-"<p> SHINGIRO /Mozilla ( ~ /. /* . Mburabuzi ///) . </p> "
-"<p> <b> icyitonderwa : </b> Hitamo... A < u > OYA < /u > "
-"- Idosiye ( ya:  Urugero: , A ) : NIBA , Kubona Gishya Ububiko . </p> "
-"<p> ni Kuri i Ububiko... Imiterere , i Ububiko : \" - \" . </p> "
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-#, fuzzy
-msgid "Start import file %1..."
-msgstr "Gutangira Kuzana Idosiye %1 ... "
-
-#: filter_opera.cxx:28
-#, fuzzy
-msgid "Import Opera Emails"
-msgstr "Kwimura &Ibiranga Opera"
-
-#: filter_opera.cxx:30
-#, fuzzy
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p> <b> Imeli Kuzana Akayunguruzo: </b> </p> "
-"<p> Akayunguruzo: Kuzana Kuva: Ibaruwa Ububiko... . iyi Akayunguruzo: NIBA Kuri "
-"Kuzana Byose muri A Konti: in i . </p> "
-"<p> i Ububiko Bya i Konti: ( ~ /. Opera /Ibaruwa //Konti: * ) . </p> "
-"<p> <b> icyitonderwa : </b> cyavuye ahandi/cyatumijwe A Ububiko... &Cyitwa: "
-"Nyuma i Konti: Kuva: , Na: - </p> "
-
-#: filter_evolution_v2.cxx:29
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "2 . x na "
+msgid "Import Lotus Notes Emails"
+msgstr "Kuzana amadosiye ya Lotus"
 
-#: filter_evolution_v2.cxx:31
+#: filter_lnotes.cxx:32
 #, fuzzy
 msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<p> <b> 2 . x Kuzana Akayunguruzo: </b> </p> "
-"<p> i SHINGIRO Ububiko Bya Bya hafi ( ~ /. Impinduka /Ibaruwa /Bya hafi /) . "
-"</p> "
-"<p> <b> icyitonderwa : </b> Hitamo... A < u > OYA < /u > "
-"- Idosiye ( ya:  Urugero: A ) : NIBA , Kubona Gishya Ububiko . </p> "
-"<p> ni Kuri i Ububiko... Imiterere , i Ububiko : \" - \" . </p> "
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Birava"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Kuri:"
+"<p> <b> Ibaruwa Kuzana Akayunguruzo: </b> </p> <p> Akayunguruzo: Kuzana "
+"Idosiye Kuva: Imeli Umukiriya . iyi Akayunguruzo: NIBA Kuri Kuzana Kuva: "
+"Cyangwa Ikindi Koresha Imiterere . </p> <p> <b> icyitonderwa : </b> ni Kuri "
+"i Ububiko... Imiterere , i cyavuye ahandi/cyatumijwe Ubutumwa in &Cyitwa: ku "
+"i Idosiye Kuva: : \" - \" in Bya hafi Ububiko... . </p> "
 
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, fuzzy, no-c-format
-msgid "Current:"
-msgstr "KIGEZWEHO"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "Importing in progress..."
-msgstr "in Aho bigeze: ... "
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, fuzzy, no-c-format
-msgid "Total:"
-msgstr "Igiteranyo:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "' Kuri Kuzana Birenzeho Cyangwa Aho kubariza "
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, fuzzy, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b> Kuri - </b> \n"
-"<br> "
-"<br> \n"
-"Porogaramu Ifashayobora Kuzana Imeli Kuva: Ibanjirije Imeli Porogaramu . "
-"<br> "
-"<br> "
-"<br> "
-"<br> \n"
-"Guhitamo i Porogaramu nka Kuri Kuzana Kuva: , Hanyuma Kanda ' . "
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, fuzzy, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Gusubiramo Ubutumwa Kuzana "
-
-#: main.cpp:33
-#, fuzzy
-msgid "KMailCVT"
-msgstr "Ibaruwa"
-
-#: main.cpp:34
-#, fuzzy
-msgid "KMail Import Filters"
-msgstr "Muyunguruzi izana"
-
-#: main.cpp:35
-#, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "( C ) - , "
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Umwanditsi wa mbere "
-
-#: main.cpp:37
+#: filter_lnotes.cxx:55
 #, fuzzy
-msgid "Maintainer & New filters"
-msgstr "& Muyunguruzi "
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr ""
+msgid "All Files (*)"
+msgstr "Amadosiye yose"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-"Viateur MUGENZI, JEAN BAPTISTE NGENDAHAYO, Augustin KIBERWA, Donatien "
-"NSENGIYUMVA"
+#: filter_lnotes.cxx:64
+#, fuzzy, c-format
+msgid "Importing emails from %1"
+msgstr "Kuva: %1 "
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"muvia1@yahoo.fr, ngenda_denis@yahoo.co.uk, akiberwa@yahoo.co.uk, "
-"ndonatienuk@yahoo.co.uk"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, fuzzy, c-format
+msgid "Message %1"
+msgstr "Ubutumwa:"
 
 #: filter_mailapp.cxx:32
 #, fuzzy
@@ -491,8 +291,8 @@ msgstr "Ibaruwa yavanywe hanze"
 #: filter_mailapp.cxx:34
 #, fuzzy
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr "<p> <b> </b> </p> <p> Akayunguruzo: e - Kuva: i Umukiriya in . </p> "
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
@@ -501,32 +301,31 @@ msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
-"1 Gusubiramo &Ubutumwa OYA cyavuye ahandi/cyatumijwe Kuri Ububiko... %1 in %n "
-"Gusubiramo Ubutumwa OYA cyavuye ahandi/cyatumijwe Kuri Ububiko... %1 in "
+"1 Gusubiramo &Ubutumwa OYA cyavuye ahandi/cyatumijwe Kuri Ububiko... %1 in "
+"%n Gusubiramo Ubutumwa OYA cyavuye ahandi/cyatumijwe Kuri Ububiko... %1 in "
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: kmailcvt.cpp:31
-#, fuzzy
-msgid "Step 1: Select Filter"
-msgstr "1 : "
-
-#: kmailcvt.cpp:34
-#, fuzzy
-msgid "Step 2: Importing..."
-msgstr "2 : ... "
-
-#: kmailcvt.cpp:76
+#: filter_mbox.cxx:30
 #, fuzzy
-msgid "Import in progress"
-msgstr "in Aho bigeze: "
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p> <b> Kuzana Akayunguruzo: </b> </p> <p> Akayunguruzo: Kuzana Idosiye . "
+"iyi Akayunguruzo: NIBA Kuri Kuzana Kuva: Cyangwa Ikindi Koresha iyi "
+"Imiterere . </p> <p> <b> icyitonderwa : </b> cyavuye ahandi/cyatumijwe "
+"Ububiko &Cyitwa: Nyuma i Idosiye Kuva: , Na: - </p> "
 
-#: kmailcvt.cpp:79
+#: filter_mbox.cxx:48
 #, fuzzy
-msgid "Import finished"
-msgstr "Byarangiye "
+msgid "mbox Files (*)"
+msgstr "Amadosiye y'ibimenyetso (*.sms)"
 
 #: filter_oe.cxx:40
 #, fuzzy
@@ -536,24 +335,19 @@ msgstr "Outlook Express"
 #: filter_oe.cxx:42
 #, fuzzy
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p> <b> 4 /5 /6 Kuzana Akayunguruzo: </b> </p> "
-"<p> Kuri i Ububiko... i Agasanduku k'ubutumwa ku Gushakisha... ya:  . Cyangwa . "
-"Idosiye "
-"<ul> "
-"<li> <i> : \\W \\A </i> in "
-"<li> <i> na </i> in Cyangwa Nyuma </ul> </p> "
-"<p> <b> icyitonderwa : </b> ni Kuri i Ububiko... Imiterere , i Ububiko Kuva: 5 "
-"na 6 : \" - \" in Bya hafi Ububiko... . </p> "
+"<p> <b> 4 /5 /6 Kuzana Akayunguruzo: </b> </p> <p> Kuri i Ububiko... i "
+"Agasanduku k'ubutumwa ku Gushakisha... ya:  . Cyangwa . Idosiye <ul> <li> "
+"<i> : \\W \\A </i> in <li> <i> na </i> in Cyangwa Nyuma </ul> </p> <p> <b> "
+"icyitonderwa : </b> ni Kuri i Ububiko... Imiterere , i Ububiko Kuva: 5 na "
+"6 : \" - \" in Bya hafi Ububiko... . </p> "
 
 #: filter_oe.cxx:67
 #, fuzzy, c-format
@@ -590,45 +384,73 @@ msgstr ""
 msgid "Importing OE5+ Folder file %1"
 msgstr "+ Idosiye %1 "
 
-#: filter_sylpheed.cxx:27
+#: filter_opera.cxx:28
 #, fuzzy
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "na "
+msgid "Import Opera Emails"
+msgstr "Kwimura &Ibiranga Opera"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 #, fuzzy
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
-msgstr "<p><b>G."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p> <b> Imeli Kuzana Akayunguruzo: </b> </p> <p> Akayunguruzo: Kuzana Kuva: "
+"Ibaruwa Ububiko... . iyi Akayunguruzo: NIBA Kuri Kuzana Byose muri A Konti: "
+"in i . </p> <p> i Ububiko Bya i Konti: ( ~ /. Opera /Ibaruwa //Konti: * ) . "
+"</p> <p> <b> icyitonderwa : </b> cyavuye ahandi/cyatumijwe A Ububiko... "
+"&Cyitwa: Nyuma i Konti: Kuva: , Na: - </p> "
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+#, fuzzy
+msgid "Counting files..."
+msgstr "Idosiye ... "
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+#, fuzzy
+msgid "Importing new mail files..."
+msgstr "Gishya Ibaruwa Idosiye ... "
+
+#: filter_outlook.cxx:28
+#, fuzzy
+msgid "Import Outlook Emails"
+msgstr "utumenyetso tw'igitabo cy'itumiza"
+
+#: filter_outlook.cxx:30
 #, fuzzy
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b> : </b> Kuri Tangira &vendorShortName; ya:  Itumanaho . <i> </i> "
-"ni yakorewe iyinjizaporogaramu . "
+"<p> <b> Imeli Kuzana Akayunguruzo: </b> </p> <p> Akayunguruzo: Kuzana Kuva: "
+"A - Idosiye . Kuri i Ububiko... i - Idosiye ku Gushakisha... ya:  . "
+"Idosiye : <i> : \\D na </i> in Cyangwa Nyuma </p> <p> <b> icyitonderwa : </"
+"b> cyavuye ahandi/cyatumijwe A Ububiko... &Cyitwa: Nyuma i Konti: Kuva: , "
+"Na: - </p> "
 
-#: filters.cxx:153 filters.cxx:188
+#: filter_outlook.cxx:46
 #, fuzzy
-msgid "Cannot make folder %1 in KMail"
-msgstr "Ubwoko Ububiko... %1 in "
+msgid "Counting mail..."
+msgstr "Ibaruwa ... "
 
-#: filters.cxx:156 filters.cxx:191
+#: filter_outlook.cxx:47
 #, fuzzy
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "&Ongera &Ubutumwa Kuri Ububiko... %1 in "
+msgid "Counting directories..."
+msgstr "ububiko bw'amaderese ... "
 
-#: filters.cxx:162 filters.cxx:194
+#: filter_outlook.cxx:48
 #, fuzzy
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Ikosa Wongera &Ubutumwa Kuri Ububiko... %1 in "
+msgid "Counting folders..."
+msgstr "Ububiko ... "
 
 #: filter_plain.cxx:27
 #, fuzzy
@@ -639,38 +461,76 @@ msgstr "Imbuga z'inyandiko nyazo"
 #, fuzzy
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
-"<p> i Ububiko i ku Sisitemu . in A Ububiko... Na: i Izina: Nka i Ububiko in , "
-"ku - </p> "
-"<p> Akayunguruzo: Kuzana Byose . , . na . txt . </p> "
+"<p> i Ububiko i ku Sisitemu . in A Ububiko... Na: i Izina: Nka i Ububiko "
+"in , ku - </p> <p> Akayunguruzo: Kuzana Byose . , . na . txt . </p> "
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
 msgstr ""
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 #, fuzzy
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p> <b> Kuzana Akayunguruzo: </b> </p> "
-"<p> Akayunguruzo: Kuzana Idosiye . iyi Akayunguruzo: NIBA Kuri Kuzana Kuva: "
-"Cyangwa Ikindi Koresha iyi Imiterere . </p> "
-"<p> <b> icyitonderwa : </b> cyavuye ahandi/cyatumijwe Ububiko &Cyitwa: Nyuma i "
-"Idosiye Kuva: , Na: - </p> "
+"<p> i - Ububiko ku Sisitemu ( * . , * . na * . Idosiye ) . iyi ni in : \\p "
+"Ibaruwa \\m Cyangwa : \\p Ibaruwa \\m \\a DGITO </p> <p> <b> icyitonderwa : "
+"</b> ni Kuri i Ububiko... Imiterere , i Ububiko : \" - \" . </p> "
 
-#: filter_mbox.cxx:48
+#: filter_pmail.cxx:69
 #, fuzzy
-msgid "mbox Files (*)"
-msgstr "Amadosiye y'ibimenyetso (*.sms)"
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr "i Ububiko... Imiterere ; Kuzana Gushigikira . "
+
+#: filter_pmail.cxx:72
+#, fuzzy
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Gishya Ibaruwa Idosiye ( ' . ) ... "
+
+#: filter_pmail.cxx:74
+#, fuzzy
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Ibaruwa Ububiko ( ' . ) ... "
+
+#: filter_pmail.cxx:76
+#, fuzzy
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "' Ibaruwa Ububiko ( ' . ) ... "
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, fuzzy, c-format
+msgid "Importing %1"
+msgstr "Kuvana hanze..."
+
+#: filter_pmail.cxx:290
+#, fuzzy
+msgid "Parsing the folder structure..."
+msgstr "i Ububiko... Imiterere ... "
+
+#: filter_sylpheed.cxx:27
+#, fuzzy
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "na "
+
+#: filter_sylpheed.cxx:29
+#, fuzzy
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr "<p><b>G."
 
 #: filter_thebat.cxx:33
 #, fuzzy
@@ -680,11 +540,110 @@ msgstr "! na "
 #: filter_thebat.cxx:35
 #, fuzzy
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
 msgstr "<p><b>G."
+
+#: filter_thunderbird.cxx:28
+#, fuzzy
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "/Mozilla na "
+
+#: filter_thunderbird.cxx:30
+#, fuzzy
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p> <b> /Mozilla Kuzana Akayunguruzo: </b> </p> <p> SHINGIRO /Mozilla "
+"( ~ /. /* . Mburabuzi ///) . </p> <p> <b> icyitonderwa : </b> Hitamo... A < "
+"u > OYA < /u > - Idosiye ( ya:  Urugero: , A ) : NIBA , Kubona Gishya "
+"Ububiko . </p> <p> ni Kuri i Ububiko... Imiterere , i Ububiko : \" - \" . </"
+"p> "
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#, fuzzy
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b> : </b> Kuri Tangira &vendorShortName; ya:  Itumanaho . <i> </i> ni "
+"yakorewe iyinjizaporogaramu . "
+
+#: filters.cxx:153 filters.cxx:188
+#, fuzzy
+msgid "Cannot make folder %1 in KMail"
+msgstr "Ubwoko Ububiko... %1 in "
+
+#: filters.cxx:156 filters.cxx:191
+#, fuzzy
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "&Ongera &Ubutumwa Kuri Ububiko... %1 in "
+
+#: filters.cxx:162 filters.cxx:194
+#, fuzzy
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Ikosa Wongera &Ubutumwa Kuri Ububiko... %1 in "
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Birava"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Kuri:"
+
+#: kimportpagedlg.ui:107
+#, fuzzy, no-c-format
+msgid "Current:"
+msgstr "KIGEZWEHO"
+
+#: kimportpagedlg.ui:115
+#, fuzzy, no-c-format
+msgid "Importing in progress..."
+msgstr "in Aho bigeze: ... "
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, fuzzy, no-c-format
+msgid "Total:"
+msgstr "Igiteranyo:"
+
+#: kimportpagedlg.ui:199
+#, fuzzy, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "' Kuri Kuzana Birenzeho Cyangwa Aho kubariza "
+
+#: kselfilterpagedlg.ui:91
+#, fuzzy, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b> Kuri - </b> \n"
+"<br> <br> \n"
+"Porogaramu Ifashayobora Kuzana Imeli Kuva: Ibanjirije Imeli Porogaramu . "
+"<br> <br> <br> <br> \n"
+"Guhitamo i Porogaramu nka Kuri Kuzana Kuva: , Hanyuma Kanda ' . "
+
+#: kselfilterpagedlg.ui:133
+#, fuzzy, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Gusubiramo Ubutumwa Kuzana "
diff --git a/tde-i18n-se/messages/tdepim/kmailcvt.po b/tde-i18n-se/messages/tdepim/kmailcvt.po
index b25fa5bf296..e7eacdbe269 100644
--- a/tde-i18n-se/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-se/messages/tdepim/kmailcvt.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-01-10 20:33+0100\n"
 "Last-Translator: Børre Gaup <boerre@skolelinux.no>\n"
 "Language-Team: Northern Sami <i18n-sme@lister.ping.uio.no>\n"
@@ -13,77 +13,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr ""
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Børre Gaup"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "boerre@skolelinux.no"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
 msgstr ""
 
-#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
-#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
-#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
-#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
-#: filter_thunderbird.cxx:65
-msgid "No directory selected."
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
 msgstr ""
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
 msgstr ""
 
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
+#: kmailcvt.cpp:76
+msgid "Import in progress"
 msgstr ""
 
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
+#: kmailcvt.cpp:79
+msgid "Import finished"
 msgstr ""
 
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
 msgstr ""
 
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
+#: main.cpp:33
+msgid "KMailCVT"
 msgstr ""
 
-#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
-#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
-#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
-#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
-msgid "No files found for import."
+#: main.cpp:34
+msgid "KMail Import Filters"
 msgstr ""
 
-#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
-#: filter_opera.cxx:89 filter_outlook.cxx:57
-msgid "Importing emails from %1..."
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
 msgstr ""
 
-#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
-#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
-#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
-#: filter_thunderbird.cxx:101
-#, c-format
-msgid ""
-"_n: 1 duplicate message not imported\n"
-"%n duplicate messages not imported"
+#: main.cpp:36
+msgid "Original author"
+msgstr "Álgovuolggalaš čálli"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
 msgstr ""
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
 msgstr ""
 
 #: filter_evolution.cxx:31
@@ -92,11 +79,25 @@ msgstr ""
 
 #: filter_evolution.cxx:33
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
+msgstr ""
+
+#: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
+#: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
+#: filter_opera.cxx:60 filter_outlook.cxx:44 filter_plain.cxx:44
+#: filter_pmail.cxx:56 filter_sylpheed.cxx:56 filter_thebat.cxx:62
+#: filter_thunderbird.cxx:65
+msgid "No directory selected."
+msgstr ""
+
+#: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
+#: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
+#: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
+#: filter_thebat.cxx:69 filter_thunderbird.cxx:72
+msgid "No files found for import."
 msgstr ""
 
 #: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
@@ -107,64 +108,90 @@ msgstr ""
 msgid "Finished importing emails from %1"
 msgstr ""
 
-#: filter_kmail_archive.cxx:24
-msgid "Import KMail Archive File"
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
 msgstr ""
 
-#: filter_kmail_archive.cxx:26
+#: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
+#: filter_opera.cxx:89 filter_outlook.cxx:57
+msgid "Importing emails from %1..."
+msgstr ""
+
+#: filter_evolution.cxx:195 filter_evolution_v2.cxx:92
+#: filter_kmail_maildir.cxx:85 filter_opera.cxx:143 filter_outlook.cxx:58
+#: filter_plain.cxx:82 filter_sylpheed.cxx:80 filter_thebat.cxx:86
+#: filter_thunderbird.cxx:101
+#, c-format
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"_n: 1 duplicate message not imported\n"
+"%n duplicate messages not imported"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr ""
 
-#: filter_pmail.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
 msgstr ""
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
 msgstr ""
 
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
+#: filter_kmail_archive.cxx:26
+msgid ""
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
 msgstr ""
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
+#: filter_kmail_maildir.cxx:28
+msgid ""
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+msgid "Import folder %1..."
 msgstr ""
 
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
+#, c-format
+msgid "Could not import %1"
 msgstr ""
 
 #: filter_lnotes.cxx:30
@@ -173,14 +200,13 @@ msgstr ""
 
 #: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 
 #: filter_lnotes.cxx:55
@@ -192,276 +218,191 @@ msgstr ""
 msgid "Importing emails from %1"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr ""
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+#: filter_mailapp.cxx:32
+msgid "Import From OS X Mail"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-msgid "Import folder %1..."
+#: filter_mailapp.cxx:34
+msgid ""
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
-#, c-format
-msgid "Could not import %1"
+#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+msgid ""
+"_n: 1 duplicate message not imported to folder %1 in KMail\n"
+"%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
 msgstr ""
 
-#: filter_thunderbird.cxx:30
+#: filter_mbox.cxx:30
 msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
 msgstr ""
 
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
+#: filter_oe.cxx:40
+msgid "Import Outlook Express Emails"
 msgstr ""
 
-#: filter_opera.cxx:30
+#: filter_oe.cxx:42
 msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
+"your local folder.</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
+#: filter_oe.cxx:67
+#, c-format
+msgid "No Outlook Express mailboxes found in directory %1."
 msgstr ""
 
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Sáddejeaddji:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Vuostáiváldi:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Dán:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
+#: filter_oe.cxx:82
+msgid "Import folder structure..."
 msgstr ""
 
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr " …"
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Oktiibuot:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
+#: filter_oe.cxx:101
+msgid "Finished importing Outlook Express emails"
 msgstr ""
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+#: filter_oe.cxx:119
+#, c-format
+msgid "Unable to open mailbox %1"
 msgstr ""
 
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
+#: filter_oe.cxx:130
+#, c-format
+msgid "Importing OE4 Mailbox %1"
 msgstr ""
 
-#: main.cpp:33
-msgid "KMailCVT"
+#: filter_oe.cxx:144
+#, c-format
+msgid "Importing OE5+ Mailbox %1"
 msgstr ""
 
-#: main.cpp:34
-msgid "KMail Import Filters"
+#: filter_oe.cxx:150
+#, c-format
+msgid "Importing OE5+ Folder file %1"
 msgstr ""
 
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
 msgstr ""
 
-#: main.cpp:36
-msgid "Original author"
-msgstr "Álgovuolggalaš čálli"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
 
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
 msgstr ""
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Børre Gaup"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "boerre@skolelinux.no"
-
-#: filter_mailapp.cxx:32
-msgid "Import From OS X Mail"
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
 msgstr ""
 
-#: filter_mailapp.cxx:34
-msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
 msgstr ""
 
-#: filter_mailapp.cxx:129 filter_mbox.cxx:135
+#: filter_outlook.cxx:30
 msgid ""
-"_n: 1 duplicate message not imported to folder %1 in KMail\n"
-"%n duplicate messages not imported to folder %1 in KMail"
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
 msgstr ""
 
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
 msgstr ""
 
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
 msgstr ""
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
 msgstr ""
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 
-#: filter_oe.cxx:40
-msgid "Import Outlook Express Emails"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
 msgstr ""
 
-#: filter_oe.cxx:42
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
-"your local folder.</p>"
-msgstr ""
-
-#: filter_oe.cxx:67
-#, c-format
-msgid "No Outlook Express mailboxes found in directory %1."
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
 
-#: filter_oe.cxx:82
-msgid "Import folder structure..."
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
 msgstr ""
 
-#: filter_oe.cxx:101
-msgid "Finished importing Outlook Express emails"
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
 msgstr ""
 
-#: filter_oe.cxx:119
-#, c-format
-msgid "Unable to open mailbox %1"
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
 msgstr ""
 
-#: filter_oe.cxx:130
-#, c-format
-msgid "Importing OE4 Mailbox %1"
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
 msgstr ""
 
-#: filter_oe.cxx:144
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
 #, c-format
-msgid "Importing OE5+ Mailbox %1"
+msgid "Importing %1"
 msgstr ""
 
-#: filter_oe.cxx:150
-#, c-format
-msgid "Importing OE5+ Folder file %1"
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
 msgstr ""
 
 #: filter_sylpheed.cxx:27
@@ -470,18 +411,45 @@ msgstr ""
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr ""
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr ""
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 
 #: filters.cxx:153 filters.cxx:188
@@ -496,47 +464,52 @@ msgstr ""
 msgid "Error while adding message to folder %1 in KMail"
 msgstr ""
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr ""
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Sáddejeaddji:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Vuostáiváldi:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr ""
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Dán:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
 msgstr ""
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr ""
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr " …"
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Oktiibuot:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
 msgstr ""
 
-#: filter_thebat.cxx:35
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
diff --git a/tde-i18n-sk/messages/tdepim/kmailcvt.po b/tde-i18n-sk/messages/tdepim/kmailcvt.po
index 83a0ab20407..7f393029099 100644
--- a/tde-i18n-sk/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-sk/messages/tdepim/kmailcvt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-07-05 12:53+0200\n"
 "Last-Translator: Richard Fric <Richard.Fric@kdemail.net>\n"
 "Language-Team: Slovak <kde-i18n-doc@kde.org>\n"
@@ -18,25 +18,81 @@ msgstr ""
 "X-Generator: KBabel 1.11.2\n"
 "Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Import Outlook Emails"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Stanislav Višňovský"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "visnovsky@kde.org"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Importovací nástroj KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Krok 1: Výber filtra"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Krok 2: Importovanie..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Prebieha import"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import bol ukončený"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Napísal %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Importovacie filtre KMailu"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, Vývojári KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Pôvodný autor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Údržbár a nové filtre"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nové rozhranie a vyčistenie"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Import lokálnych správ Evolution a štruktúry priečinkov"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook email importovací filter</b></p>"
-"<p>Tento filter importuje emaily z Outlook pst súborov. Musíte zadať priečinok, "
-"obsahujúci pst súbor, v:<i>C:\\Dokumenty a nastavenia</i> "
-"vo Windows 2000 a novších</p>"
-"<p><b>Poznámka:</b> Správy budú importované do priečinkov pomenovaných podľa "
-"účtu, z ktorého pochádzajú s predponou OUTLOOK</p>"
+"<p><b>Evolution 1.x importovací filter</b></p><p>Vyberte základný priečinok "
+"pre správy Evolution (zvyčajne ~/evolution/local).</p> <p>Vzhľadom na to, že "
+"štruktúra priečinkov sa dá znova vytvoriť, priečinky budú uložené pod: "
+"\"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -46,27 +102,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Nebol vybraný žiaden priečinok."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Počítam súbory..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Počítajú sa správy..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Počítajú sa priečinky..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Počítajú sa priečinky..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Import súborov s novými správami..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -74,6 +109,22 @@ msgstr "Import súborov s novými správami..."
 msgid "No files found for import."
 msgstr "Nenájdené žiadne súbory na import."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Dokončený prevod pošty z %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Nie je možné otvoriť %1, preskakujem"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -92,39 +143,37 @@ msgstr ""
 "%n duplikované správy neboli importované\n"
 "%n duplikovaných správ nebolo importovaných"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Nie je možné otvoriť %1, preskakujem"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Import lokálnych správ Evolution a štruktúry priečinkov"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Import lokálnych správ Evolution 2.x a štruktúry priečinkov"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x importovací filter</b></p>"
-"<p>Vyberte základný priečinok pre správy Evolution (zvyčajne "
-"~/evolution/local).</p> "
-"<p>Vzhľadom na to, že štruktúra priečinkov sa dá znova vytvoriť, priečinky budú "
-"uložené pod: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x importovací filter</b></p><p>Vyberte základný priečinok "
+"pre správy Evolution (zvyčajne ~/evolution/mail/local/).</p> <p><b>Poznámka:"
+"</b> Nikdy nevyberte priečinok, ktorý <u>neobsahuje</u> mbox-súbory "
+"(napríklad maildir): ak to spravíte, dostanete veľa nových priečinkov.</"
+"p><p>Vzhľadom na to, že štruktúra priečinkov sa dá znova vytvoriť, priečinky "
+"budú uložené pod: \"Evolution-Import\".</p> "
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Dokončený prevod pošty z %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Import ukončený, zrušený užívateľom."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Začiatok importu zo súboru %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -132,66 +181,43 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Import priečinkov z Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Vyberte priečinok programu Pegasus-Mail na vašom systéme (obsahuje súbory "
-"*.CNM, *.PMM a *.MBX). Často je to C:\\pmail\\mail alebo "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Poznámka:</b>Vzhľadom na to, že štruktúra priečinkov sa dá znova "
-"vytvoriť, priečinky budú uložené pod: \"PegasusMail-Import\".</p>"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
+msgstr "Import KMail Maildirs a štruktúry priečinkov"
 
-#: filter_pmail.cxx:69
+#: filter_kmail_maildir.cxx:28
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"Nedá sa analyzovať štruktúra priečinkov, import bude pokračovať bez podpory "
-"podpriečinkov."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importujem súbory s novými správami ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importujem priečinky s poštou ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importujem unixové priečinky s poštou ('.mbx')..."
+"<p><b>KMail importovací filter</b></p><p>Vyberte základný priečinok pre "
+"správy KMail, ktoré chcete importovať.</p><p><b>Poznámka:</b> Nikdy "
+"nevyberajte aktuálny poštový priečinok KMail (zvyčajne ~/Mail alebo ~/."
+"trinity/share/apps/kmail/mail): v tomto prípade sa KMailCVT zasekne v "
+"nekonečnej slučke.</p> <p>Tento filter importuje poštové priečinky KMail s "
+"mbox súbormi.</p><p>Vzhľadom na to, že štruktúra priečinkov sa dá znova "
+"vytvoriť, priečinky budú uložené pod: \"KMail-Import\".</p> "
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importovanie %1"
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+msgid "Import folder %1..."
+msgstr "Importovať priečinok %1..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
 #, c-format
-msgid "Message %1"
-msgstr "Správa %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Analyzuje sa štruktúra priečinkov..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Napísal %1.</i></p>"
+msgid "Could not import %1"
+msgstr "Nie je možné importovať %1"
 
 #: filter_lnotes.cxx:30
 msgid "Import Lotus Notes Emails"
@@ -199,22 +225,21 @@ msgstr "Import Lotus Notes Emails"
 
 #: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<p><b>Lotus Notes importovací filter pre štruktúrovaný text</b></p>"
-"<p>Tento filter importuje súbory štruktúrovaného textu z Lotus Notes poštového "
+"<p><b>Lotus Notes importovací filter pre štruktúrovaný text</b></p><p>Tento "
+"filter importuje súbory štruktúrovaného textu z Lotus Notes poštového "
 "klienta do KMail. Použite tento filter, ak chcete importovať z Lotus alebo "
-"iných klientov, ktorí používajú Lotus Notes štruktúrovaný textový formát.</p>"
-"<p><b>Poznámka:</b> Vzhľadom na to, že štruktúra priečinkov sa dá znova "
-"vytvoriť, importované správy sa vytvoria v podpriečinkoch pod: "
-"\"LNotes-Import\", pomenované podľa mien súborov, z ktorých pochádzajú.</p>"
+"iných klientov, ktorí používajú Lotus Notes štruktúrovaný textový formát.</"
+"p><p><b>Poznámka:</b> Vzhľadom na to, že štruktúra priečinkov sa dá znova "
+"vytvoriť, importované správy sa vytvoria v podpriečinkoch pod: \"LNotes-"
+"Import\", pomenované podľa mien súborov, z ktorých pochádzajú.</p>"
 
 #: filter_lnotes.cxx:55
 msgid "All Files (*)"
@@ -225,231 +250,10 @@ msgstr "Všetky súbory (*)"
 msgid "Importing emails from %1"
 msgstr "Importujú sa správy z %1"
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr "Import KMail Maildirs a štruktúry priečinkov"
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-"<p><b>KMail importovací filter</b></p>"
-"<p>Vyberte základný priečinok pre správy KMail, ktoré chcete importovať.</p>"
-"<p><b>Poznámka:</b> Nikdy nevyberajte aktuálny poštový priečinok KMail "
-"(zvyčajne ~/Mail alebo ~/.trinity/share/apps/kmail/mail): v tomto prípade sa "
-"KMailCVT zasekne v nekonečnej slučke.</p> "
-"<p>Tento filter importuje poštové priečinky KMail s mbox súbormi.</p>"
-"<p>Vzhľadom na to, že štruktúra priečinkov sa dá znova vytvoriť, priečinky budú "
-"uložené pod: \"KMail-Import\".</p> "
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Import ukončený, zrušený užívateľom."
-
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-msgid "Import folder %1..."
-msgstr "Importovať priečinok %1..."
-
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
-msgid "Could not import %1"
-msgstr "Nie je možné importovať %1"
-
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Import lokálnej pošty z Thunderbird/Mozilla a štruktúry pričinkov"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird/Mozilla importovací filter</b></p>"
-"<p>Vyberte základný priečinok pošty Thunderbird/Mozilla (zvyčajne "
-"~/.thunderbird/*.default/Mail/LocalFolders/).</p>"
-"<p><b>Poznámka:</b> Nikdy nezolte priečinok, ktorý <u>neobsahuje</u> "
-"mbox súbory (napríklad maildir): ak to spravíte, dostanete veľa nových "
-"priečinkov.</p>"
-"<p>Vzhľadom na to, že štruktúra priečinkov sa dá znova vytvoriť, priečinky budú "
-"uložené pod: \"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Začiatok importu zo súboru %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Import Opera Emails"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera email importovací filter</b></p>"
-"<p>Tento filter importuje správy z poštových priečinkov Opera. Použite tento "
-"filter, ak chcete importovať všetky správyz účtu v Opera.</p> "
-"<p>Vyberte priečinok účtu (zvyčajne ~/.opera/mail/store/account*).</p>"
-"<p><b>Poznámka:</b> Správy budú importované do priečinkov pomenovaných podľa "
-"účtu s predponou OPERA</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Import lokálnych správ Evolution 2.x a štruktúry priečinkov"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x importovací filter</b></p>"
-"<p>Vyberte základný priečinok pre správy Evolution (zvyčajne "
-"~/evolution/mail/local/).</p> "
-"<p><b>Poznámka:</b> Nikdy nevyberte priečinok, ktorý <u>neobsahuje</u> "
-"mbox-súbory (napríklad maildir): ak to spravíte, dostanete veľa nových "
-"priečinkov.</p>"
-"<p>Vzhľadom na to, že štruktúra priečinkov sa dá znova vytvoriť, priečinky budú "
-"uložené pod: \"Evolution-Import\".</p> "
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Od:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Pre:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Aktuálne:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Prebieha import..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Celkovo:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Stlačte 'Dozadu', ak chcete importovať viac správ alebo kontaktov"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>Víta vás KMailCVT - Nástroj pre import do KMail</b>\n"
-"<br>"
-"<br>\n"
-"Tento program vám pomôže importovať vašu poštu z iných poštových klientov do "
-"KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Prosím, vyberte program, z ktorého chcete importovať a potom stlačte 'Dopredu'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Odstrániť &duplicitné správy počas importu"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Importovacie filtre KMailu"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, Vývojári KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Pôvodný autor"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Údržbár a nové filtre"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nové rozhranie a vyčistenie"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Stanislav Višňovský"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "visnovsky@kde.org"
+msgid "Message %1"
+msgstr "Správa %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -457,11 +261,11 @@ msgstr "Import z OS X-Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Filter importu z OS X Mail</b></p>"
-"<p>Tento filter importuje emaily z poštového klienta na Apple Mac OS X.</p>"
+"<p><b>Filter importu z OS X Mail</b></p><p>Tento filter importuje emaily z "
+"poštového klienta na Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -472,25 +276,27 @@ msgstr ""
 "%n duplikované správy neboli importované do KMail priečinku %1\n"
 "%n duplikovaných správ nebolo importovaných do KMail priečinku %1"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Importovací nástroj KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Krok 1: Výber filtra"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Krok 2: Importovanie..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Import mbox súborov (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Prebieha import"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>filter pre import mbox</b></p><p>Tento filter importuje súbory typu "
+"mbox do KMail. Použite tento filter, ak chcete importovať z Ximian Evolution "
+"alebo iných klientov, ktorí používajú tento tradičný UNIX formát.</"
+"p><p><b>Poznámka:</b> Správy budú importované do priečinkov, ktorých mená "
+"budú podľa súborov, z ktorých sa importovalo a predponou MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import bol ukončený"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox súbory (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -498,24 +304,20 @@ msgstr "Import pošty z Outlook Expressu"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 importovací filter</b></p>"
-"<p>Musíte zadať priečinok, v ktorom je schránka. Obsahuje súbory .dbx alebo "
-".mbx v "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> vo Windows 9x"
-"<li><i>Dokumenty a nastavenia</i> vo Windows 2000 a novších</ul></p>"
-"<p><b>Poznámka:</b> Vzhľadom na to, že štruktúra priečinkov sa dá znova "
-"vytvoriť, priečinky z Outlook Express 5 a 6 sa vytvoria pod: \"OE-Import\".</p>"
+"<p><b>Outlook Express 4/5/6 importovací filter</b></p><p>Musíte zadať "
+"priečinok, v ktorom je schránka. Obsahuje súbory .dbx alebo .mbx v "
+"<ul><li><i>C:\\Windows\\Application Data</i> vo Windows 9x<li><i>Dokumenty a "
+"nastavenia</i> vo Windows 2000 a novších</ul></p><p><b>Poznámka:</b> "
+"Vzhľadom na to, že štruktúra priečinkov sa dá znova vytvoriť, priečinky z "
+"Outlook Express 5 a 6 sa vytvoria pod: \"OE-Import\".</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -550,44 +352,64 @@ msgstr "Importovanie OE5+ mailboxu %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Import OE5+ súboru priečinku %1"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "Import Sylpheed Maildirs a štruktúry priečinkov"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Import Opera Emails"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
-"<p><b>Sylpheed importovací filter</b></p>"
-"<p>Vyberte základný priečinok pošty Sylpheed (zvyčajne ~/Mail).</p>"
-"<p>Vzhľadom na to, že štruktúra priečinkov sa dá znova vytvoriť, priečinky budú "
-"uložené pod: \"Sylpheed-Import\".</p>"
-"<p>Tento filter tiež vytvorí stav správ, napr. nová alebo preposlaná."
+"<p><b>Opera email importovací filter</b></p><p>Tento filter importuje správy "
+"z poštových priečinkov Opera. Použite tento filter, ak chcete importovať "
+"všetky správyz účtu v Opera.</p> <p>Vyberte priečinok účtu (zvyčajne ~/."
+"opera/mail/store/account*).</p><p><b>Poznámka:</b> Správy budú importované "
+"do priečinkov pomenovaných podľa účtu s predponou OPERA</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Počítam súbory..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Import súborov s novými správami..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Import Outlook Emails"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>Kritická:</b> Nie je možné spustiť KMail pre DCOP komunikáciu. Overte, či je "
-"<i>kmail</i> nainštalovaný."
+"<p><b>Outlook email importovací filter</b></p><p>Tento filter importuje "
+"emaily z Outlook pst súborov. Musíte zadať priečinok, obsahujúci pst súbor, "
+"v:<i>C:\\Dokumenty a nastavenia</i> vo Windows 2000 a novších</"
+"p><p><b>Poznámka:</b> Správy budú importované do priečinkov pomenovaných "
+"podľa účtu, z ktorého pochádzajú s predponou OUTLOOK</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "Nie je možné vytvoriť priečinok %1 v KMaile"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Počítajú sa správy..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "Nie je možné pridať správu do priečinku %1 v KMaile"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Počítajú sa priečinky..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Chyba pri pridávaní správy do priečinku %1 v KMaile"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Počítajú sa priečinky..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -596,38 +418,77 @@ msgstr "Import emailov z čistého textu"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 "<p>Vyberte priečinok, ktorý obsahuje na vašom systéme emailové správy. Sú "
-"umiestnené v priečinku, ktorý má rovnaké meno ako pôvodný priečinok s predponou "
-"PLAIN-</p>"
-"<p>Tento filter importuje všetky správy .msg, .eml a .txt.</p>"
+"umiestnené v priečinku, ktorý má rovnaké meno ako pôvodný priečinok s "
+"predponou PLAIN-</p><p>Tento filter importuje všetky správy .msg, .eml a ."
+"txt.</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Import mbox súborov (UNIX, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Import priečinkov z Pegasus-Mail"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>filter pre import mbox</b></p>"
-"<p>Tento filter importuje súbory typu mbox do KMail. Použite tento filter, ak "
-"chcete importovať z Ximian Evolution alebo iných klientov, ktorí používajú "
-"tento tradičný UNIX formát.</p>"
-"<p><b>Poznámka:</b> Správy budú importované do priečinkov, ktorých mená budú "
-"podľa súborov, z ktorých sa importovalo a predponou MBOX-</p>"
+"<p>Vyberte priečinok programu Pegasus-Mail na vašom systéme (obsahuje súbory "
+"*.CNM, *.PMM a *.MBX). Často je to C:\\pmail\\mail alebo C:\\pmail\\mail"
+"\\admin</p><p><b>Poznámka:</b>Vzhľadom na to, že štruktúra priečinkov sa dá "
+"znova vytvoriť, priečinky budú uložené pod: \"PegasusMail-Import\".</p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox súbory (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Nedá sa analyzovať štruktúra priečinkov, import bude pokračovať bez podpory "
+"podpriečinkov."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importujem súbory s novými správami ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importujem priečinky s poštou ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importujem unixové priečinky s poštou ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importovanie %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Analyzuje sa štruktúra priečinkov..."
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "Import Sylpheed Maildirs a štruktúry priečinkov"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Sylpheed importovací filter</b></p><p>Vyberte základný priečinok pošty "
+"Sylpheed (zvyčajne ~/Mail).</p><p>Vzhľadom na to, že štruktúra priečinkov sa "
+"dá znova vytvoriť, priečinky budú uložené pod: \"Sylpheed-Import\".</"
+"p><p>Tento filter tiež vytvorí stav správ, napr. nová alebo preposlaná."
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -635,17 +496,112 @@ msgstr "Import The Bail Mails a štruktúry priečinkov"
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
 msgstr ""
-"<p><b>The Bat! importovací filter</b></p>"
-"<p>Vyberte základný poštový priečinok 'The Bat!', ktorý chcete importovať.</p>"
-"<p><b>Poznámka:</b> Tento filter importuje *.tbb súbory z 'The Bat!' lokálnych "
-"priečinkov, napr. z POP účtov a nie z IMAP/DIMAP účtov.</p>"
-"<p>Vzhľadom na to, že štruktúra priečinkov sa dá znova vytvoriť, priečinky sa "
-"vytvoria pod: \"TheBat-Import\".</p>"
+"<p><b>The Bat! importovací filter</b></p><p>Vyberte základný poštový "
+"priečinok 'The Bat!', ktorý chcete importovať.</p><p><b>Poznámka:</b> Tento "
+"filter importuje *.tbb súbory z 'The Bat!' lokálnych priečinkov, napr. z POP "
+"účtov a nie z IMAP/DIMAP účtov.</p><p>Vzhľadom na to, že štruktúra "
+"priečinkov sa dá znova vytvoriť, priečinky sa vytvoria pod: \"TheBat-Import"
+"\".</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Import lokálnej pošty z Thunderbird/Mozilla a štruktúry pričinkov"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Thunderbird/Mozilla importovací filter</b></p><p>Vyberte základný "
+"priečinok pošty Thunderbird/Mozilla (zvyčajne ~/.thunderbird/*.default/Mail/"
+"LocalFolders/).</p><p><b>Poznámka:</b> Nikdy nezolte priečinok, ktorý "
+"<u>neobsahuje</u> mbox súbory (napríklad maildir): ak to spravíte, dostanete "
+"veľa nových priečinkov.</p><p>Vzhľadom na to, že štruktúra priečinkov sa dá "
+"znova vytvoriť, priečinky budú uložené pod: \"Thunderbird-Import\".</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b>Kritická:</b> Nie je možné spustiť KMail pre DCOP komunikáciu. Overte, či "
+"je <i>kmail</i> nainštalovaný."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "Nie je možné vytvoriť priečinok %1 v KMaile"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "Nie je možné pridať správu do priečinku %1 v KMaile"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Chyba pri pridávaní správy do priečinku %1 v KMaile"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Od:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Pre:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Aktuálne:"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Prebieha import..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Celkovo:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Stlačte 'Dozadu', ak chcete importovať viac správ alebo kontaktov"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Víta vás KMailCVT - Nástroj pre import do KMail</b>\n"
+"<br><br>\n"
+"Tento program vám pomôže importovať vašu poštu z iných poštových klientov do "
+"KMail.<br><br><br><br>\n"
+"Prosím, vyberte program, z ktorého chcete importovať a potom stlačte "
+"'Dopredu'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Odstrániť &duplicitné správy počas importu"
diff --git a/tde-i18n-sl/messages/tdepim/kmailcvt.po b/tde-i18n-sl/messages/tdepim/kmailcvt.po
index 8c5d3ce75ea..aca49dec164 100644
--- a/tde-i18n-sl/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-sl/messages/tdepim/kmailcvt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-06-27 03:38+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -21,25 +21,80 @@ msgstr ""
 "Plural-Forms:  nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
 "n%100==4 ? 2 : 3);\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Uvozi e-pošto iz Outlooka"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Gregor Rakar,Andrej Vernekar,Jure Repinc"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "gregor.rakar@kiss.si,andrej.vernekar@moj.net,jlp@holodeck1.com"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Uvozno orodje KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Korak 1: Izbira filtra"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Korak 2: Uvažanje ..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Uvažanje poteka"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Uvažanje končano"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Napisal(a) %1</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Uvozni filtri za KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "© 2000-2005, razvijalci KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Prvotni avtor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Vzdrževalec in novi filtri"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nov grafičen vmesnik in čiščenje"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Uvozi krajevno pošto in zgradbo map iz Evolution 1.x"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Filter za uvažanje iz Outlooka</b></p>"
-"<p>Ta filter bo uvozil e-sporočila iz Outlookove datoteke pst. Najti boste "
-"morali mapo, v kateri je shanjena datoteka pst. Iščite v<i>"
-"C:\\Documents and Settings</i> v Windows 2000 ali novejših</ul></p>"
-"<p><b>Opomba:</b> E-sporočila bodo uvožena v mapo poimenovano po računu, iz "
-"katerega izvirajo, s predpono OUTLOOK-</p>"
+"<p><b>Filter za uvoz iz Evolution 1.x</b></p><p>Izberite svoj osnovni poštni "
+"imenik v Evolution (običajno ~/evolution/local/).</p><p>Ker je možno "
+"poustvariti zgradbo map, bodo le te shranjene pod: »Evolution-Import«.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -49,27 +104,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Ni izbranega imenika."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Štetje datotek ..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Štetje e-pošte ..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Štetje imenikov ..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Štetje map ..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Uvažanje novih poštnih datotek ..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -77,6 +111,22 @@ msgstr "Uvažanje novih poštnih datotek ..."
 msgid "No files found for import."
 msgstr "Ni najdenih datotek za uvoz."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Uvoz e-pošte iz %1 je končan"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Ni moč odpreti %1, preskakovanje"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -96,39 +146,37 @@ msgstr ""
 "%n podvojeni sporočili nista uvoženi\n"
 "%n podvojena sporočila niso uvožena"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Ni moč odpreti %1, preskakovanje"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Uvozi krajevno pošto in zgradbo map iz Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Uvoz pošte in strukture map iz Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Filter za uvoz iz Evolution 1.x</b></p>"
-"<p>Izberite svoj osnovni poštni imenik v Evolution (običajno "
-"~/evolution/local/).</p>"
-"<p>Ker je možno poustvariti zgradbo map, bodo le te shranjene pod: "
+"<p><b>Filter za uvoz iz Evolution 2.x</b></p><p>Izberite svoj osnovni poštni "
+"imenik v Evolution (običajno ~/.evolution/mail/local/).</p><p><b>Upoštevajte:"
+"</b> Nikoli ne izberite mape, ki <u>ne</u> vsebuje datotek mbox (na primer "
+"mape vrste maildir). Če to vseeno naredite, boste imeli veliko novih map.</"
+"p><p>Ker je možno poustvariti zgradbo map, bodo le te shranjene pod: "
 "»Evolution-Import«.</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Uvoz e-pošte iz %1 je končan"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Uvoz je končan, prekinjen s strani uporabnika."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Začni uvažati datoteko %1 ..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -136,64 +184,42 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Uvozi mape iz Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Izberite imenik Pegasus-Mail (vsebuje datoteke CNM, PMM in MBX). V mnogih "
-"sistemih se ta nahaja v mapi C:\\pmail\\mail ali C:\\pmail\\mail\\admin</p>"
-"<p>Ker je možno poustvariti zgradbo map, bodo le te shranjene pod: "
-"»PegasusMail-Import«.</p>"
+#: filter_kmail_maildir.cxx:26
+msgid "Import KMail Maildirs and Folder Structure"
+msgstr "Uvoz pošte in strukture map iz KMaila"
 
-#: filter_pmail.cxx:69
+#: filter_kmail_maildir.cxx:28
 msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"Ni moč razčleniti zgradbe map. Uvoz se bo nadaljeval brez podpore podmapam."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Uvažanje novih poštnih datotek (».cnm«) ..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Uvažanje poštnih map (».pmm«) ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Uvažanje poštnih map »UNIX« (».mbx«) ..."
+"<p><b>Filter za uvoz iz KMaila</b></p><p>Izberite svoj osnovni poštni imenik "
+"v Kmailu, ki ga želite uvoziti.</p><p><b>Upoštevajte:</b> Nikoli ne izberite "
+"trenutne lokalne poštne mape (običajno ~/Mail ali ~/.trinity/share/apps/"
+"kmail/mail). Če to storite, se lahko KMailCVT ujame v neskončno zanko.</p> "
+"<p>Ta filter ne uvozi poštnih map, ki vsebujejo datoteke mbox.</p><p>Ker je "
+"možno poustvariti zgradbo map, bodo le te shranjene pod: »Kmail-Import«.</p>"
 
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Uvažanje %1"
+#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
+msgid "Import folder %1..."
+msgstr "Uvozi mapo %1 ..."
 
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
+#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
+#: filter_sylpheed.cxx:158
 #, c-format
-msgid "Message %1"
-msgstr "Sporočilo %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Razčlenjevanje zgradbe map ..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Napisal(a) %1</i></p>"
+msgid "Could not import %1"
+msgstr "Ni moč uvoziti %1"
 
 #: filter_lnotes.cxx:30
 msgid "Import Lotus Notes Emails"
@@ -201,24 +227,22 @@ msgstr "Uvozi e-pošto iz Lotus Notes"
 
 #: filter_lnotes.cxx:32
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
 "<p><b>Filter za uvažanje pošte v obliki strukturiranega besedila iz Lotus "
-"Notes</b></p>"
-"<p>Ta filter bo uvozil strukturirane besedilne datoteke, ki so bile izvožene iz "
-"odjemalca za e-pošto Lotus Notes. Uporabite ta filter, če želite uvoziti pošto "
-"iz Lotus Notes ali iz drugih odjemalcev, ki uporabljajo obliko strukturiranega "
-"besedila Lotus Notes.</p>"
-"<p><b>Opomba:</b> Ker je možno poustvariti zgradbo map, bodo sporočila "
-"shranjena v mape pod: »LNotes-Import« v krajevni mapi. Podmape bodo imele enako "
-"ime kot izvorne datoteke s sporočili.</p>"
+"Notes</b></p><p>Ta filter bo uvozil strukturirane besedilne datoteke, ki so "
+"bile izvožene iz odjemalca za e-pošto Lotus Notes. Uporabite ta filter, če "
+"želite uvoziti pošto iz Lotus Notes ali iz drugih odjemalcev, ki uporabljajo "
+"obliko strukturiranega besedila Lotus Notes.</p><p><b>Opomba:</b> Ker je "
+"možno poustvariti zgradbo map, bodo sporočila shranjena v mape pod: »LNotes-"
+"Import« v krajevni mapi. Podmape bodo imele enako ime kot izvorne datoteke s "
+"sporočili.</p>"
 
 #: filter_lnotes.cxx:55
 msgid "All Files (*)"
@@ -229,230 +253,10 @@ msgstr "Vse datoteke (*)"
 msgid "Importing emails from %1"
 msgstr "Uvažanje e-pošte iz %1"
 
-#: filter_kmail_maildir.cxx:26
-msgid "Import KMail Maildirs and Folder Structure"
-msgstr "Uvoz pošte in strukture map iz KMaila"
-
-#: filter_kmail_maildir.cxx:28
-msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-"<p><b>Filter za uvoz iz KMaila</b></p>"
-"<p>Izberite svoj osnovni poštni imenik v Kmailu, ki ga želite uvoziti.</p>"
-"<p><b>Upoštevajte:</b> Nikoli ne izberite trenutne lokalne poštne mape "
-"(običajno ~/Mail ali ~/.trinity/share/apps/kmail/mail). Če to storite, se lahko "
-"KMailCVT ujame v neskončno zanko.</p> "
-"<p>Ta filter ne uvozi poštnih map, ki vsebujejo datoteke mbox.</p>"
-"<p>Ker je možno poustvariti zgradbo map, bodo le te shranjene pod: "
-"»Kmail-Import«.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Uvoz je končan, prekinjen s strani uporabnika."
-
-#: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
-msgid "Import folder %1..."
-msgstr "Uvozi mapo %1 ..."
-
-#: filter_kmail_maildir.cxx:206 filter_kmail_maildir.cxx:211
-#: filter_plain.cxx:67 filter_plain.cxx:71 filter_sylpheed.cxx:153
-#: filter_sylpheed.cxx:158
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
 #, c-format
-msgid "Could not import %1"
-msgstr "Ni moč uvoziti %1"
-
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Uvozi krajevno pošto Thunderbirda/Mozille in strukturo map"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Filter za uvoz iz Thunderbirda</b></p>"
-"<p>Izberite svoj osnovni poštni imenik v Thunderbirdu (običajno "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Upoštevajte:</b> Nikoli ne izberite mape, ki <u>ne</u> "
-"vsebuje datotek mbox (na primer mape vrste maildir). Če to vseeno naredite, "
-"boste imeli veliko novih map.</p>"
-"<p>Ker je možno poustvariti zgradbo map, bodo le te shranjene pod: "
-"»Thunderbird-Import«.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Začni uvažati datoteko %1 ..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Uvozi e-pošto iz Opere"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Filter za pošte iz Opere</b></p>"
-"<p>Ta filter bo uvozil e-sporočila iz Operinega poštnega imenika. Uporabite ta "
-"filter če želite uvoziti vsa sporočila znotraj računa v Operinem poštnem "
-"imeniku.</p> "
-"<p>Izberite imenik za račun (običajno ~/.opera/mail/store/account*).</p>"
-"<p><b>Opomba:</b> E-sporočila bodo uvožena v mapo poimenovano po računu iz "
-"katerega izvirajo, s predpono OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Uvoz pošte in strukture map iz Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Filter za uvoz iz Evolution 2.x</b></p>"
-"<p>Izberite svoj osnovni poštni imenik v Evolution (običajno "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Upoštevajte:</b> Nikoli ne izberite mape, ki <u>ne</u> "
-"vsebuje datotek mbox (na primer mape vrste maildir). Če to vseeno naredite, "
-"boste imeli veliko novih map.</p>"
-"<p>Ker je možno poustvariti zgradbo map, bodo le te shranjene pod: "
-"»Evolution-Import«.</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Od:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Za:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Trenutno:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Uvažanje poteka ..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Skupaj:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Kliknite »Nazaj« za uvažanje dodatnih sporočil ali stikov"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>Dobrodošli v KMailCVT - orodju za uvažanje v KMail</b> "
-"<br>"
-"<br> Ta program vam bo pomagal pri uvažanju vaših e-sporočil iz vašega "
-"prejšnjega e-poštnega programa v KMail."
-"<br>"
-"<br>"
-"<br> Prosim, izberite program iz katerega želite uvažati in nato kliknite "
-"»Naprej«."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Odstrani po&dvojena sporočila med uvažanjem"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Uvozni filtri za KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "© 2000-2005, razvijalci KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Prvotni avtor"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Vzdrževalec in novi filtri"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nov grafičen vmesnik in čiščenje"
-
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Gregor Rakar,Andrej Vernekar,Jure Repinc"
-
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "gregor.rakar@kiss.si,andrej.vernekar@moj.net,jlp@holodeck1.com"
+msgid "Message %1"
+msgstr "Sporočilo %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -460,11 +264,11 @@ msgstr "Uvozi mape iz OS X Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Uvozni filter OS X</b></p>"
-"<p>Ta filter uvaža e-pošto s poštnega odjemalca za Apple Mac OS X.</p>"
+"<p><b>Uvozni filter OS X</b></p><p>Ta filter uvaža e-pošto s poštnega "
+"odjemalca za Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -476,25 +280,27 @@ msgstr ""
 "%n podvojeni sporočili nista uvoženi v mapo %1 v KMailu\n"
 "%n podvojena sporočila niso uvožena v mapo %1 v KMailu"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Uvozno orodje KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Korak 1: Izbira filtra"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Korak 2: Uvažanje ..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Uvozi datoteke mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Uvažanje poteka"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Filter za uvoz mbox</b></p><p>Ta filter bo uvozil datoteke mbox v "
+"KMail. Uporabite ta filter če želite uvoziti sporočila iz Ximian Evolution "
+"in drugih poštnih programov, ki uporabljajo ta tradicionalno UNIX obliko.</"
+"p> <p><b>Opomba:</b> E-sporočila bodo uvožena v mape poimenovane po izvoru s "
+"predpono MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Uvažanje končano"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Datoteke mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -502,24 +308,20 @@ msgstr "Uvozi e-sporočila iz Outlook Expressa"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Filter za uvažanje iz Outlook Expressa 4/5/6</b></p>"
-"<p>Najti boste morali mapo v kateri je shranjen poštni predal. Iščite datoteke "
-".dbx ali .mbx v"
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> v Windows 9x "
-"<li><i>Documents and Settings</i> v Windows 2000 ali novejših</ul></p>"
-"<p>Ker je možno poustvariti zgradbo map, bodo le te shranjene pod: »OE-Import« "
-"v krajevni mapi.</p>"
+"<p><b>Filter za uvažanje iz Outlook Expressa 4/5/6</b></p><p>Najti boste "
+"morali mapo v kateri je shranjen poštni predal. Iščite datoteke .dbx ali ."
+"mbx v<ul><li><i>C:\\Windows\\Application Data</i> v Windows 9x "
+"<li><i>Documents and Settings</i> v Windows 2000 ali novejših</ul></p><p>Ker "
+"je možno poustvariti zgradbo map, bodo le te shranjene pod: »OE-Import« v "
+"krajevni mapi.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -554,30 +356,188 @@ msgstr "Uvažanje poštnega predala %1 za OE5+"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Uvažanje datoteke OE5+ z mapo %1 "
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Uvozi e-pošto iz Opere"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Filter za pošte iz Opere</b></p><p>Ta filter bo uvozil e-sporočila iz "
+"Operinega poštnega imenika. Uporabite ta filter če želite uvoziti vsa "
+"sporočila znotraj računa v Operinem poštnem imeniku.</p> <p>Izberite imenik "
+"za račun (običajno ~/.opera/mail/store/account*).</p><p><b>Opomba:</b> E-"
+"sporočila bodo uvožena v mapo poimenovano po računu iz katerega izvirajo, s "
+"predpono OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Štetje datotek ..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Uvažanje novih poštnih datotek ..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Uvozi e-pošto iz Outlooka"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Filter za uvažanje iz Outlooka</b></p><p>Ta filter bo uvozil e-"
+"sporočila iz Outlookove datoteke pst. Najti boste morali mapo, v kateri je "
+"shanjena datoteka pst. Iščite v<i>C:\\Documents and Settings</i> v Windows "
+"2000 ali novejših</ul></p><p><b>Opomba:</b> E-sporočila bodo uvožena v mapo "
+"poimenovano po računu, iz katerega izvirajo, s predpono OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Štetje e-pošte ..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Štetje imenikov ..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Štetje map ..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Uvoz navadnih besedilnih sporočil"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Izberite imenik, ki vsebuje e-pošto. E-pošta se nahaja v mapi z enakim "
+"imenom, kot ga je imel imenik, v katerem se je nahajala, s predpono PLAIN-</"
+"p> <p>Ta filter bo uvozil vsa e-sporočila oblike .msg, .eml in .txt.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Uvozi mape iz Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Izberite imenik Pegasus-Mail (vsebuje datoteke CNM, PMM in MBX). V mnogih "
+"sistemih se ta nahaja v mapi C:\\pmail\\mail ali C:\\pmail\\mail\\admin</"
+"p><p>Ker je možno poustvariti zgradbo map, bodo le te shranjene pod: "
+"»PegasusMail-Import«.</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Ni moč razčleniti zgradbe map. Uvoz se bo nadaljeval brez podpore podmapam."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Uvažanje novih poštnih datotek (».cnm«) ..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Uvažanje poštnih map (».pmm«) ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Uvažanje poštnih map »UNIX« (».mbx«) ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Uvažanje %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Razčlenjevanje zgradbe map ..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Uvoz pošte in strukture map iz Sylpheeda"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Filter za uvoz iz Sylpheeda</b></p> <p>Izberite svoj osnovni poštni "
+"imenik v Sylpheedu (običajno ~/Mail ).</p> <p>Ker je možno poustvariti "
+"zgradbo map, bodo le te shranjene pod: »Sylpheed-Import« v vaši krajevni "
+"mapi.</p> <p>Ta filter prav tako poustvari stanje sporočil, na primer novo "
+"ali posredovano.</p>"
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Uvozi pošto in zgradbo map iz Bat!"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Filter za uvoz iz The Bat!</b></p> <p>Izberite osnovno mapo z e-pošto "
+"za The Bat!, ki jo želite uvoziti.</p> <p><b>Opomba:</b> Ta filter uvozi "
+"datoteke *.tbb iz krajevne mape za The Bat!. To pomeni, da uvozi le račune "
+"POP in ne računov IMAP ali DIMAP.</p><p>Ker je možno poustvariti zgradbo "
+"map, bodo sporočila shranjena v mape pod: »TheBat-Import« v krajevni mapi.</"
+"p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Uvozi krajevno pošto Thunderbirda/Mozille in strukturo map"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Filter za uvoz iz Sylpheeda</b></p> "
-"<p>Izberite svoj osnovni poštni imenik v Sylpheedu (običajno ~/Mail ).</p> "
-"<p>Ker je možno poustvariti zgradbo map, bodo le te shranjene pod: "
-"»Sylpheed-Import« v vaši krajevni mapi.</p> "
-"<p>Ta filter prav tako poustvari stanje sporočil, na primer novo ali "
-"posredovano.</p>"
+"<p><b>Filter za uvoz iz Thunderbirda</b></p><p>Izberite svoj osnovni poštni "
+"imenik v Thunderbirdu (običajno ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Upoštevajte:</b> Nikoli ne izberite mape, ki <u>ne</u> "
+"vsebuje datotek mbox (na primer mape vrste maildir). Če to vseeno naredite, "
+"boste imeli veliko novih map.</p><p>Ker je možno poustvariti zgradbo map, "
+"bodo le te shranjene pod: »Thunderbird-Import«.</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Pogubna napaka:</b> Ni moč pognati KMail za komunikacijo preko DCOP. "
 "Preverite, če je <i>KMail</i> nameščen."
@@ -594,62 +554,56 @@ msgstr "V KMail ni moč dodati sporočila v mapo %1."
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Napaka pri dodajanju sporočila v mapo %1 v KMailu."
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Uvoz navadnih besedilnih sporočil"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Od:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Izberite imenik, ki vsebuje e-pošto. E-pošta se nahaja v mapi z enakim "
-"imenom, kot ga je imel imenik, v katerem se je nahajala, s predpono PLAIN-</p> "
-"<p>Ta filter bo uvozil vsa e-sporočila oblike .msg, .eml in .txt.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Za:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Uvozi datoteke mbox (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Trenutno:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Filter za uvoz mbox</b></p>"
-"<p>Ta filter bo uvozil datoteke mbox v KMail. Uporabite ta filter če želite "
-"uvoziti sporočila iz Ximian Evolution in drugih poštnih programov, ki "
-"uporabljajo ta tradicionalno UNIX obliko.</p> "
-"<p><b>Opomba:</b> E-sporočila bodo uvožena v mape poimenovane po izvoru s "
-"predpono MBOX-</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Uvažanje poteka ..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Datoteke mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Uvozi pošto in zgradbo map iz Bat!"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Skupaj:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Kliknite »Nazaj« za uvažanje dodatnih sporočil ali stikov"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Filter za uvoz iz The Bat!</b></p> "
-"<p>Izberite osnovno mapo z e-pošto za The Bat!, ki jo želite uvoziti.</p> "
-"<p><b>Opomba:</b> Ta filter uvozi datoteke *.tbb iz krajevne mape za The Bat!. "
-"To pomeni, da uvozi le račune POP in ne računov IMAP ali DIMAP.</p>"
-"<p>Ker je možno poustvariti zgradbo map, bodo sporočila shranjena v mape pod: "
-"»TheBat-Import« v krajevni mapi.</p>"
+"<b>Dobrodošli v KMailCVT - orodju za uvažanje v KMail</b> <br><br> Ta "
+"program vam bo pomagal pri uvažanju vaših e-sporočil iz vašega prejšnjega e-"
+"poštnega programa v KMail.<br><br><br> Prosim, izberite program iz katerega "
+"želite uvažati in nato kliknite »Naprej«."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Odstrani po&dvojena sporočila med uvažanjem"
diff --git a/tde-i18n-sr/messages/tdepim/kmailcvt.po b/tde-i18n-sr/messages/tdepim/kmailcvt.po
index c6b9f294d60..33c0a53b313 100644
--- a/tde-i18n-sr/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-sr/messages/tdepim/kmailcvt.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-01-08 15:56+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -20,25 +20,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Увоз порука из Outlook-а"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Топлица Танасковић,Слободан Симић"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "toptan@kde.org.yu,simicsl@verat.net"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT алат за увоз"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Корак 1: Одаберите филтер"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Корак 2: Увожење..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Увоз је у току"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Увоз је завршен"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Написао %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail-ови филтери за увоз"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "© 2000-2005, развојни тим KMailCVT-а"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Првобитни аутор"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Одржавалац и нови филтери"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Нов GUI и чистке"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Увези пошту и структуру фасцикли Evolution-а 1.x"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Филтер за увоз из Outlook-а</b></p>"
-"<p>Овај филтер ће увести пошту из Outlook-овог pst-фајла. Потребно је да "
-"пронађете фасциклу где се pst-фајл налази, тако што ћете потражити .pst фајлове "
-"под: <i>C:\\Documents and Settings</i> у Windows-у 2000 или новијем.</p>"
-"<p><b>Напомена:</b> Поруке ће бити увезене у фасциклу именовану по налогу из "
-"кога су дошле, уз префикс OUTLOOK-</p>"
+"<p><b>Филтер увоза Evolution-а 1.x</b></p><p>Изаберите основни директоријум "
+"за Evolution-ову пошту (начешће ~/evolution/local).</p><p>Пошто је могуће "
+"поново направити структуру фасцикли, она ће бити смештена под: „Evolution-"
+"увоз“.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -48,27 +104,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Није одабран ниједан директоријум."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Бројим фајлове..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Бројим пошту..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Бројим директоријуме..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Бројим фасцикле..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Увозим нове поштанске фајлове..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -76,6 +111,22 @@ msgstr "Увозим нове поштанске фајлове..."
 msgid "No files found for import."
 msgstr "Није нађен ниједан фајл за увоз."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Увоз порука из %1 је завршен"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Не могу да отворим %1, прескачем"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -94,39 +145,37 @@ msgstr ""
 "%n дуплиране поруке нису увезене\n"
 "%n дуплираних порука није увезено"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Не могу да отворим %1, прескачем"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Увези пошту и структуру фасцикли Evolution-а 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Увези пошту и структуру фасцикли Evolution-а 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Филтер увоза Evolution-а 1.x</b></p>"
-"<p>Изаберите основни директоријум за Evolution-ову пошту (начешће "
-"~/evolution/local).</p>"
-"<p>Пошто је могуће поново направити структуру фасцикли, она ће бити смештена "
-"под: „Evolution-увоз“.</p>"
+"<p><b>Филтер за увоз из Evolution-а 2.x</b></p><p>Изаберите основни "
+"директоријум вашег локалне поштанске фасцикле у Evolution-у (обично ~/."
+"evolution/mail/local/).</p><p><b>Напомена:</b> Никада не бирајте фасциклу "
+"која <u>не садржи</u> mbox фајлове (на пример maildir). Ако то ипак учините, "
+"добићете много нових фасцикли.</p><p>Пошто је могуће регенерисати структуру "
+"фасцикли, она ће бити смештене под „Evolution-увоз“.</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Увоз порука из %1 је завршен"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Завршен увоз, отказан од стране корисника."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Почни увоз фајла %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -134,99 +183,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Увоз фасцикли из Pegasus-Mail-а"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Одаберите директоријум Pegasus-Mail-а на вашем систему (садржи CNM, PMM и "
-"MBX фајлове). На многим системима је смештен у C:\\PMail\\mail или "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Напомена:</b> Пошто је могуће поново направити структуру фасцикли, она ће "
-"бити смештена под: „PegasusMail-увоз“.</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Не могу да расчланим структуру фасцикле; настављам увоз без подршке за "
-"подфасцикле."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Увозим нове поштанске фајлове („.cnm“)..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Увозим поштанске фасцикле („.pmm“)..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Увозим „UNIX“ поштанске фасцикле („.mbx“)..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Увозим %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Порука %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Расчлањујем структуру фасцикле..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Написао %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Увоз порука из Lotus Notes-а"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Филтер за увоз структурног текста из Lotus Notes-а</b></p>"
-"<p>Овај филтер ће увести фајлове структурног текста из извоза поштанског "
-"клијента Lotus Notes-а у KMail. Користите овај филтер ако желите да увезете "
-"пошту из Lotus-а или других програма који користе формат структурног текста "
-"Lotus Notes-а.</p>"
-"<p><b>Напомена:</b> Пошто је могуће регенерисати структуру фасцикли, увезене "
-"поруке ће бити смештене у подфасцикле именоване по фајловима од којих су "
-"настале у локалној фасцикли „LNotes-увоз“.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Сви фајлови (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Увозим е-поруке из %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -234,28 +194,19 @@ msgstr "Увези пошту и структуру фасцикли KMail-а"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Филтер за увоз из KMail-а</b></p>"
-"<p>Изаберите основни директоријум KMail-ове фасцикле поште коју желите да "
-"увезете.</p>"
-"<p><b>Напомена:</b> Никада не бирајте текућу фасциклу поште KMail-а (обично "
-"~/Mail или ~/.trinity/share/apps/kmail/mail ): у том случају KMailCVT би могао "
-"да заглави у сталној петљи.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Завршен увоз, отказан од стране корисника."
+"<p><b>Филтер за увоз из KMail-а</b></p><p>Изаберите основни директоријум "
+"KMail-ове фасцикле поште коју желите да увезете.</p><p><b>Напомена:</b> "
+"Никада не бирајте текућу фасциклу поште KMail-а (обично ~/Mail или ~/."
+"trinity/share/apps/kmail/mail ): у том случају KMailCVT би могао да заглави "
+"у сталној петљи.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -268,189 +219,41 @@ msgstr "Фасцикла увоза %1..."
 msgid "Could not import %1"
 msgstr "Нисам могао увести %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Увези пошту и структуру фасцикли Thunderbird-а/Mozilla-е"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Филтер за увоз из Thunderbird-а/Mozilla-е</b></p>"
-"<p>Изаберите базну поштанску фасциклу Thunderbird-а/Mozilla-е (обично "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Напомена:</b> Никада не бирајте фасциклу која <u>не садржи</u> "
-"mbox фајлове (на пример maildir). Ако то ипак учините, добићете много нових "
-"фасцикли.</p>"
-"<p>Пошто је могуће регенерисати структуру фасцикли, фасцикле ће бити садржане "
-"под „Увоз Thunderbird-а“.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Почни увоз фајла %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Увези пошту из Opera-е"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Филтер за увоз из Opera-е</b></p>"
-"<p>Овај филтер ће увести пошту из Opera-ине поштанске фасцикле. Употребите овај "
-"филтер ако желите да увезете сву пошту у оквиру налога у Opera-и.</p>"
-"<p>Изаберите директоријум налога (обично ~/.opera/mail/store/account*).</p>"
-"<p><b>Напомена:</b> Поруке ће бити увезене у фасциклу именовану по налогу из "
-"кога су дошле, уз префикс OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Увези пошту и структуру фасцикли Evolution-а 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Филтер за увоз из Evolution-а 2.x</b></p>"
-"<p>Изаберите основни директоријум вашег локалне поштанске фасцикле у "
-"Evolution-у (обично ~/.evolution/mail/local/).</p>"
-"<p><b>Напомена:</b> Никада не бирајте фасциклу која <u>не садржи</u> "
-"mbox фајлове (на пример maildir). Ако то ипак учините, добићете много нових "
-"фасцикли.</p>"
-"<p>Пошто је могуће регенерисати структуру фасцикли, она ће бити смештене под "
-"„Evolution-увоз“.</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Од:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "За:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Текући:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Увоз је у току..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Укупно:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Кликните на „Назад“ да бисте увезли још порука или контаката"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Увоз порука из Lotus Notes-а"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Добродошли у KMailCVT — KMail-ов алат за увоз</b>\n"
-"<br>"
-"<br>\n"
-"Овај програм ће вам помоћи да увезете поруке из вашег претходног програма за "
-"е-пошту у KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Изаберите програм из кога желите да увозите, па онда кликните на „Следећи“."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Уклони &дупликате порука током увоза"
+"<p><b>Филтер за увоз структурног текста из Lotus Notes-а</b></p><p>Овај "
+"филтер ће увести фајлове структурног текста из извоза поштанског клијента "
+"Lotus Notes-а у KMail. Користите овај филтер ако желите да увезете пошту из "
+"Lotus-а или других програма који користе формат структурног текста Lotus "
+"Notes-а.</p><p><b>Напомена:</b> Пошто је могуће регенерисати структуру "
+"фасцикли, увезене поруке ће бити смештене у подфасцикле именоване по "
+"фајловима од којих су настале у локалној фасцикли „LNotes-увоз“.</p>"
 
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail-ови филтери за увоз"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "© 2000-2005, развојни тим KMailCVT-а"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Првобитни аутор"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Одржавалац и нови филтери"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Нов GUI и чистке"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Сви фајлови (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Топлица Танасковић,Слободан Симић"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Увозим е-поруке из %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "toptan@kde.org.yu,simicsl@verat.net"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Порука %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -458,12 +261,11 @@ msgstr "Увоз из OS X Mail-а"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Филтер за увоз из OS X Mail-а</b></p>"
-"<p>Овај филтер увози е-поруке из поштанског клијента у Apple-овим Mac OS-у "
-"X.</p>"
+"<p><b>Филтер за увоз из OS X Mail-а</b></p><p>Овај филтер увози е-поруке из "
+"поштанског клијента у Apple-овим Mac OS-у X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -474,25 +276,27 @@ msgstr ""
 "%n дупликатске поруке нису увезене у фасциклу %1 у KMail-у\n"
 "%n дупликатских порука није увезено у фасциклу %1 у KMail-у"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT алат за увоз"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Корак 1: Одаберите филтер"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Корак 2: Увожење..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Увоз mbox фајловa (Unix, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Увоз је у току"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox филтер за увоз</b></p><p>Овај филтер ће увести mbox фајлове у "
+"KMail. Користите овај филтер ако желите да увезете пошту из Ximian-овог "
+"Evolution-а или других програма који користе традиционални Unix-ов формат.</"
+"p><p><b>Напомена:</b> Поруке ће бити увезене у фасцикле са именом истим као "
+"што се зове фајл из кога су увезене са префиксом „MBOX-“</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Увоз је завршен"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox фајлови (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -500,24 +304,20 @@ msgstr "Увоз порука из Outlook Express-а"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 филтер за увоз</b></p>"
-"<p>Мораћете лоцирати директоријум у коме се чува поштанско сандуче тако што "
-"ћете тражити .dbx или .mbx фајлове у"
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> у Windows 9x"
-"<li><i>Documents and Settings</i> у Windows 2000 или новијем</ul></p>"
-"<p><b>Напомена:</b> Пошто је могуће регенерисати структуру фасцикли из Outlook "
-"Express-а 5 и 6, она ће бити смештена под „ОЕ-увоз“ у вашој локалној "
+"<p><b>Outlook Express 4/5/6 филтер за увоз</b></p><p>Мораћете лоцирати "
+"директоријум у коме се чува поштанско сандуче тако што ћете тражити .dbx "
+"или .mbx фајлове у<ul><li><i>C:\\Windows\\Application Data</i> у Windows "
+"9x<li><i>Documents and Settings</i> у Windows 2000 или новијем</ul></"
+"p><p><b>Напомена:</b> Пошто је могуће регенерисати структуру фасцикли из "
+"Outlook Express-а 5 и 6, она ће бити смештена под „ОЕ-увоз“ у вашој локалној "
 "фасцикли.</p>"
 
 #: filter_oe.cxx:67
@@ -554,32 +354,193 @@ msgstr "Увозим OE5+ поштанско сандуче %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Увозим OE5+ фајл са фасциклама %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Увези пошту из Opera-е"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Филтер за увоз из Opera-е</b></p><p>Овај филтер ће увести пошту из "
+"Opera-ине поштанске фасцикле. Употребите овај филтер ако желите да увезете "
+"сву пошту у оквиру налога у Opera-и.</p><p>Изаберите директоријум налога "
+"(обично ~/.opera/mail/store/account*).</p><p><b>Напомена:</b> Поруке ће бити "
+"увезене у фасциклу именовану по налогу из кога су дошле, уз префикс OPERA-</"
+"p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Бројим фајлове..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Увозим нове поштанске фајлове..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Увоз порука из Outlook-а"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Филтер за увоз из Outlook-а</b></p><p>Овај филтер ће увести пошту из "
+"Outlook-овог pst-фајла. Потребно је да пронађете фасциклу где се pst-фајл "
+"налази, тако што ћете потражити .pst фајлове под: <i>C:\\Documents and "
+"Settings</i> у Windows-у 2000 или новијем.</p><p><b>Напомена:</b> Поруке ће "
+"бити увезене у фасциклу именовану по налогу из кога су дошле, уз префикс "
+"OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Бројим пошту..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Бројим директоријуме..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Бројим фасцикле..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Увоз обичних текстуалних е-порука"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Одаберите директоријум који садржи поруке на вашем систему. Поруке ће "
+"бити смештене у фасциклу са истим именом као што је и директоријум у коме су "
+"са префиксом „PLAIN-“</p><p>Овај филтер ће увести све .msg, .eml и .txt "
+"поруке.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Увоз фасцикли из Pegasus-Mail-а"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Одаберите директоријум Pegasus-Mail-а на вашем систему (садржи CNM, PMM и "
+"MBX фајлове). На многим системима је смештен у C:\\PMail\\mail или C:\\pmail"
+"\\mail\\admin</p><p><b>Напомена:</b> Пошто је могуће поново направити "
+"структуру фасцикли, она ће бити смештена под: „PegasusMail-увоз“.</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Не могу да расчланим структуру фасцикле; настављам увоз без подршке за "
+"подфасцикле."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Увозим нове поштанске фајлове („.cnm“)..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Увозим поштанске фасцикле („.pmm“)..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Увозим „UNIX“ поштанске фасцикле („.mbx“)..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Увозим %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Расчлањујем структуру фасцикле..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Увези пошту и структуру фасцикли Sylpheed-а"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Филтер увоза из Sylpheed-а</b></p><p>Изаберите основни директоријум за "
+"Sylpheed-ову пошту (начешће ~/Mail).</p><p>Пошто је могуће поново направити "
+"структуру фасцикли, она ће бити садржана под „Sylpheed-увоз“.</p><p>Овај "
+"филтер такође поново прави статус поруке, нпр. нова или прослеђена."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Увези пошту и структуру фасцикли The Bat-а!"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Филтер увоза из The Bat-а!</b></p><p>Изаберите основну локалну "
+"фасциклу поште где желите да сместите увоз из „The Bat-а“.</p><p><b>Напомена:"
+"</b> Овај филтер увози *.tbb фајлове из локалне фасциле „The Bat-а!“, нпр. "
+"из POP налога, а не из IMAP/DIMAP налога.</p><p>Пошто је могуће регенерисати "
+"структуру фасцикли, оне ће бити смештене под „The Bat!-увоз“ у вашем "
+"локалном налогу.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Увези пошту и структуру фасцикли Thunderbird-а/Mozilla-е"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Филтер увоза из Sylpheed-а</b></p>"
-"<p>Изаберите основни директоријум за Sylpheed-ову пошту (начешће ~/Mail).</p>"
-"<p>Пошто је могуће поново направити структуру фасцикли, она ће бити садржана "
-"под „Sylpheed-увоз“.</p>"
-"<p>Овај филтер такође поново прави статус поруке, нпр. нова или прослеђена."
+"<p><b>Филтер за увоз из Thunderbird-а/Mozilla-е</b></p><p>Изаберите базну "
+"поштанску фасциклу Thunderbird-а/Mozilla-е (обично ~/.thunderbird/*.default/"
+"Mail/Local Folders/).</p><p><b>Напомена:</b> Никада не бирајте фасциклу која "
+"<u>не садржи</u> mbox фајлове (на пример maildir). Ако то ипак учините, "
+"добићете много нових фасцикли.</p><p>Пошто је могуће регенерисати структуру "
+"фасцикли, фасцикле ће бити садржане под „Увоз Thunderbird-а“.</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<b>Кобно:</b> Не могу да покренем KMail за DCOP комуникацију. Уверите се да је "
-"<i>kmail</i> инсталиран."
+"<b>Кобно:</b> Не могу да покренем KMail за DCOP комуникацију. Уверите се да "
+"је <i>kmail</i> инсталиран."
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -593,64 +554,57 @@ msgstr "Не могу да додам поруку у фасциклу %1 у KMa
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Грешка приликом додавања поруке у фасциклу %1 у KMail-у"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Увоз обичних текстуалних е-порука"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Од:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Одаберите директоријум који садржи поруке на вашем систему. Поруке ће бити "
-"смештене у фасциклу са истим именом као што је и директоријум у коме су са "
-"префиксом „PLAIN-“</p>"
-"<p>Овај филтер ће увести све .msg, .eml и .txt поруке.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "За:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Увоз mbox фајловa (Unix, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Текући:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>mbox филтер за увоз</b></p>"
-"<p>Овај филтер ће увести mbox фајлове у KMail. Користите овај филтер ако желите "
-"да увезете пошту из Ximian-овог Evolution-а или других програма који користе "
-"традиционални Unix-ов формат.</p>"
-"<p><b>Напомена:</b> Поруке ће бити увезене у фасцикле са именом истим као што "
-"се зове фајл из кога су увезене са префиксом „MBOX-“</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Увоз је у току..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox фајлови (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Увези пошту и структуру фасцикли The Bat-а!"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Укупно:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Кликните на „Назад“ да бисте увезли још порука или контаката"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Филтер увоза из The Bat-а!</b></p>"
-"<p>Изаберите основну локалну фасциклу поште где желите да сместите увоз из „The "
-"Bat-а“.</p>"
-"<p><b>Напомена:</b> Овај филтер увози *.tbb фајлове из локалне фасциле „The "
-"Bat-а!“, нпр. из POP налога, а не из IMAP/DIMAP налога.</p>"
-"<p>Пошто је могуће регенерисати структуру фасцикли, оне ће бити смештене под "
-"„The Bat!-увоз“ у вашем локалном налогу.</p>"
+"<b>Добродошли у KMailCVT — KMail-ов алат за увоз</b>\n"
+"<br><br>\n"
+"Овај програм ће вам помоћи да увезете поруке из вашег претходног програма за "
+"е-пошту у KMail.<br><br><br><br>\n"
+"Изаберите програм из кога желите да увозите, па онда кликните на „Следећи“."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Уклони &дупликате порука током увоза"
diff --git a/tde-i18n-sr@Latn/messages/tdepim/kmailcvt.po b/tde-i18n-sr@Latn/messages/tdepim/kmailcvt.po
index fd8ebe6a447..9fb05e7ed78 100644
--- a/tde-i18n-sr@Latn/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-sr@Latn/messages/tdepim/kmailcvt.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-01-08 15:56+0100\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -20,25 +20,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Uvoz poruka iz Outlook-a"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Toplica Tanasković,Slobodan Simić"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "toptan@kde.org.yu,simicsl@verat.net"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT alat za uvoz"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Korak 1: Odaberite filter"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Korak 2: Uvoženje..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Uvoz je u toku"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Uvoz je završen"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Napisao %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail-ovi filteri za uvoz"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "© 2000-2005, razvojni tim KMailCVT-a"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Prvobitni autor"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Održavalac i novi filteri"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nov GUI i čistke"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Uvezi poštu i strukturu fascikli Evolution-a 1.x"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Filter za uvoz iz Outlook-a</b></p>"
-"<p>Ovaj filter će uvesti poštu iz Outlook-ovog pst-fajla. Potrebno je da "
-"pronađete fasciklu gde se pst-fajl nalazi, tako što ćete potražiti .pst fajlove "
-"pod: <i>C:\\Documents and Settings</i> u Windows-u 2000 ili novijem.</p>"
-"<p><b>Napomena:</b> Poruke će biti uvezene u fasciklu imenovanu po nalogu iz "
-"koga su došle, uz prefiks OUTLOOK-</p>"
+"<p><b>Filter uvoza Evolution-a 1.x</b></p><p>Izaberite osnovni direktorijum "
+"za Evolution-ovu poštu (načešće ~/evolution/local).</p><p>Pošto je moguće "
+"ponovo napraviti strukturu fascikli, ona će biti smeštena pod: „Evolution-"
+"uvoz“.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -48,27 +104,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Nije odabran nijedan direktorijum."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Brojim fajlove..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Brojim poštu..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Brojim direktorijume..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Brojim fascikle..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Uvozim nove poštanske fajlove..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -76,6 +111,22 @@ msgstr "Uvozim nove poštanske fajlove..."
 msgid "No files found for import."
 msgstr "Nije nađen nijedan fajl za uvoz."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Uvoz poruka iz %1 je završen"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Ne mogu da otvorim %1, preskačem"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -94,39 +145,37 @@ msgstr ""
 "%n duplirane poruke nisu uvezene\n"
 "%n dupliranih poruka nije uvezeno"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Ne mogu da otvorim %1, preskačem"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Uvezi poštu i strukturu fascikli Evolution-a 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Uvezi poštu i strukturu fascikli Evolution-a 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Filter uvoza Evolution-a 1.x</b></p>"
-"<p>Izaberite osnovni direktorijum za Evolution-ovu poštu (načešće "
-"~/evolution/local).</p>"
-"<p>Pošto je moguće ponovo napraviti strukturu fascikli, ona će biti smeštena "
-"pod: „Evolution-uvoz“.</p>"
+"<p><b>Filter za uvoz iz Evolution-a 2.x</b></p><p>Izaberite osnovni "
+"direktorijum vašeg lokalne poštanske fascikle u Evolution-u (obično ~/."
+"evolution/mail/local/).</p><p><b>Napomena:</b> Nikada ne birajte fasciklu "
+"koja <u>ne sadrži</u> mbox fajlove (na primer maildir). Ako to ipak učinite, "
+"dobićete mnogo novih fascikli.</p><p>Pošto je moguće regenerisati strukturu "
+"fascikli, ona će biti smeštene pod „Evolution-uvoz“.</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Uvoz poruka iz %1 je završen"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Završen uvoz, otkazan od strane korisnika."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Počni uvoz fajla %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -134,99 +183,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Uvoz fascikli iz Pegasus-Mail-a"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Odaberite direktorijum Pegasus-Mail-a na vašem sistemu (sadrži CNM, PMM i "
-"MBX fajlove). Na mnogim sistemima je smešten u C:\\PMail\\mail ili "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Napomena:</b> Pošto je moguće ponovo napraviti strukturu fascikli, ona će "
-"biti smeštena pod: „PegasusMail-uvoz“.</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Ne mogu da rasčlanim strukturu fascikle; nastavljam uvoz bez podrške za "
-"podfascikle."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Uvozim nove poštanske fajlove („.cnm“)..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Uvozim poštanske fascikle („.pmm“)..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Uvozim „UNIX“ poštanske fascikle („.mbx“)..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Uvozim %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Poruka %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Rasčlanjujem strukturu fascikle..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Napisao %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Uvoz poruka iz Lotus Notes-a"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Filter za uvoz strukturnog teksta iz Lotus Notes-a</b></p>"
-"<p>Ovaj filter će uvesti fajlove strukturnog teksta iz izvoza poštanskog "
-"klijenta Lotus Notes-a u KMail. Koristite ovaj filter ako želite da uvezete "
-"poštu iz Lotus-a ili drugih programa koji koriste format strukturnog teksta "
-"Lotus Notes-a.</p>"
-"<p><b>Napomena:</b> Pošto je moguće regenerisati strukturu fascikli, uvezene "
-"poruke će biti smeštene u podfascikle imenovane po fajlovima od kojih su "
-"nastale u lokalnoj fascikli „LNotes-uvoz“.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Svi fajlovi (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Uvozim e-poruke iz %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -234,28 +194,19 @@ msgstr "Uvezi poštu i strukturu fascikli KMail-a"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Filter za uvoz iz KMail-a</b></p>"
-"<p>Izaberite osnovni direktorijum KMail-ove fascikle pošte koju želite da "
-"uvezete.</p>"
-"<p><b>Napomena:</b> Nikada ne birajte tekuću fasciklu pošte KMail-a (obično "
-"~/Mail ili ~/.trinity/share/apps/kmail/mail ): u tom slučaju KMailCVT bi mogao "
-"da zaglavi u stalnoj petlji.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Završen uvoz, otkazan od strane korisnika."
+"<p><b>Filter za uvoz iz KMail-a</b></p><p>Izaberite osnovni direktorijum "
+"KMail-ove fascikle pošte koju želite da uvezete.</p><p><b>Napomena:</b> "
+"Nikada ne birajte tekuću fasciklu pošte KMail-a (obično ~/Mail ili ~/."
+"trinity/share/apps/kmail/mail ): u tom slučaju KMailCVT bi mogao da zaglavi "
+"u stalnoj petlji.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -268,189 +219,41 @@ msgstr "Fascikla uvoza %1..."
 msgid "Could not import %1"
 msgstr "Nisam mogao uvesti %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Uvezi poštu i strukturu fascikli Thunderbird-a/Mozilla-e"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Filter za uvoz iz Thunderbird-a/Mozilla-e</b></p>"
-"<p>Izaberite baznu poštansku fasciklu Thunderbird-a/Mozilla-e (obično "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Napomena:</b> Nikada ne birajte fasciklu koja <u>ne sadrži</u> "
-"mbox fajlove (na primer maildir). Ako to ipak učinite, dobićete mnogo novih "
-"fascikli.</p>"
-"<p>Pošto je moguće regenerisati strukturu fascikli, fascikle će biti sadržane "
-"pod „Uvoz Thunderbird-a“.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Počni uvoz fajla %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Uvezi poštu iz Opera-e"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Filter za uvoz iz Opera-e</b></p>"
-"<p>Ovaj filter će uvesti poštu iz Opera-ine poštanske fascikle. Upotrebite ovaj "
-"filter ako želite da uvezete svu poštu u okviru naloga u Opera-i.</p>"
-"<p>Izaberite direktorijum naloga (obično ~/.opera/mail/store/account*).</p>"
-"<p><b>Napomena:</b> Poruke će biti uvezene u fasciklu imenovanu po nalogu iz "
-"koga su došle, uz prefiks OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Uvezi poštu i strukturu fascikli Evolution-a 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Filter za uvoz iz Evolution-a 2.x</b></p>"
-"<p>Izaberite osnovni direktorijum vašeg lokalne poštanske fascikle u "
-"Evolution-u (obično ~/.evolution/mail/local/).</p>"
-"<p><b>Napomena:</b> Nikada ne birajte fasciklu koja <u>ne sadrži</u> "
-"mbox fajlove (na primer maildir). Ako to ipak učinite, dobićete mnogo novih "
-"fascikli.</p>"
-"<p>Pošto je moguće regenerisati strukturu fascikli, ona će biti smeštene pod "
-"„Evolution-uvoz“.</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Od:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Za:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Tekući:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Uvoz je u toku..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Ukupno:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Kliknite na „Nazad“ da biste uvezli još poruka ili kontakata"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Uvoz poruka iz Lotus Notes-a"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Dobrodošli u KMailCVT — KMail-ov alat za uvoz</b>\n"
-"<br>"
-"<br>\n"
-"Ovaj program će vam pomoći da uvezete poruke iz vašeg prethodnog programa za "
-"e-poštu u KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Izaberite program iz koga želite da uvozite, pa onda kliknite na „Sledeći“."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Ukloni &duplikate poruka tokom uvoza"
+"<p><b>Filter za uvoz strukturnog teksta iz Lotus Notes-a</b></p><p>Ovaj "
+"filter će uvesti fajlove strukturnog teksta iz izvoza poštanskog klijenta "
+"Lotus Notes-a u KMail. Koristite ovaj filter ako želite da uvezete poštu iz "
+"Lotus-a ili drugih programa koji koriste format strukturnog teksta Lotus "
+"Notes-a.</p><p><b>Napomena:</b> Pošto je moguće regenerisati strukturu "
+"fascikli, uvezene poruke će biti smeštene u podfascikle imenovane po "
+"fajlovima od kojih su nastale u lokalnoj fascikli „LNotes-uvoz“.</p>"
 
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail-ovi filteri za uvoz"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "© 2000-2005, razvojni tim KMailCVT-a"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Prvobitni autor"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Održavalac i novi filteri"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nov GUI i čistke"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Svi fajlovi (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Toplica Tanasković,Slobodan Simić"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Uvozim e-poruke iz %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "toptan@kde.org.yu,simicsl@verat.net"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Poruka %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -458,12 +261,11 @@ msgstr "Uvoz iz OS X Mail-a"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Filter za uvoz iz OS X Mail-a</b></p>"
-"<p>Ovaj filter uvozi e-poruke iz poštanskog klijenta u Apple-ovim Mac OS-u "
-"X.</p>"
+"<p><b>Filter za uvoz iz OS X Mail-a</b></p><p>Ovaj filter uvozi e-poruke iz "
+"poštanskog klijenta u Apple-ovim Mac OS-u X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -474,25 +276,27 @@ msgstr ""
 "%n duplikatske poruke nisu uvezene u fasciklu %1 u KMail-u\n"
 "%n duplikatskih poruka nije uvezeno u fasciklu %1 u KMail-u"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT alat za uvoz"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Korak 1: Odaberite filter"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Korak 2: Uvoženje..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Uvoz mbox fajlova (Unix, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Uvoz je u toku"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox filter za uvoz</b></p><p>Ovaj filter će uvesti mbox fajlove u "
+"KMail. Koristite ovaj filter ako želite da uvezete poštu iz Ximian-ovog "
+"Evolution-a ili drugih programa koji koriste tradicionalni Unix-ov format.</"
+"p><p><b>Napomena:</b> Poruke će biti uvezene u fascikle sa imenom istim kao "
+"što se zove fajl iz koga su uvezene sa prefiksom „MBOX-“</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Uvoz je završen"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox fajlovi (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -500,24 +304,20 @@ msgstr "Uvoz poruka iz Outlook Express-a"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 filter za uvoz</b></p>"
-"<p>Moraćete locirati direktorijum u kome se čuva poštansko sanduče tako što "
-"ćete tražiti .dbx ili .mbx fajlove u"
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> u Windows 9x"
-"<li><i>Documents and Settings</i> u Windows 2000 ili novijem</ul></p>"
-"<p><b>Napomena:</b> Pošto je moguće regenerisati strukturu fascikli iz Outlook "
-"Express-a 5 i 6, ona će biti smeštena pod „OE-uvoz“ u vašoj lokalnoj "
+"<p><b>Outlook Express 4/5/6 filter za uvoz</b></p><p>Moraćete locirati "
+"direktorijum u kome se čuva poštansko sanduče tako što ćete tražiti .dbx "
+"ili .mbx fajlove u<ul><li><i>C:\\Windows\\Application Data</i> u Windows "
+"9x<li><i>Documents and Settings</i> u Windows 2000 ili novijem</ul></"
+"p><p><b>Napomena:</b> Pošto je moguće regenerisati strukturu fascikli iz "
+"Outlook Express-a 5 i 6, ona će biti smeštena pod „OE-uvoz“ u vašoj lokalnoj "
 "fascikli.</p>"
 
 #: filter_oe.cxx:67
@@ -554,32 +354,193 @@ msgstr "Uvozim OE5+ poštansko sanduče %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Uvozim OE5+ fajl sa fasciklama %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Uvezi poštu iz Opera-e"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Filter za uvoz iz Opera-e</b></p><p>Ovaj filter će uvesti poštu iz "
+"Opera-ine poštanske fascikle. Upotrebite ovaj filter ako želite da uvezete "
+"svu poštu u okviru naloga u Opera-i.</p><p>Izaberite direktorijum naloga "
+"(obično ~/.opera/mail/store/account*).</p><p><b>Napomena:</b> Poruke će biti "
+"uvezene u fasciklu imenovanu po nalogu iz koga su došle, uz prefiks OPERA-</"
+"p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Brojim fajlove..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Uvozim nove poštanske fajlove..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Uvoz poruka iz Outlook-a"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Filter za uvoz iz Outlook-a</b></p><p>Ovaj filter će uvesti poštu iz "
+"Outlook-ovog pst-fajla. Potrebno je da pronađete fasciklu gde se pst-fajl "
+"nalazi, tako što ćete potražiti .pst fajlove pod: <i>C:\\Documents and "
+"Settings</i> u Windows-u 2000 ili novijem.</p><p><b>Napomena:</b> Poruke će "
+"biti uvezene u fasciklu imenovanu po nalogu iz koga su došle, uz prefiks "
+"OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Brojim poštu..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Brojim direktorijume..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Brojim fascikle..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Uvoz običnih tekstualnih e-poruka"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Odaberite direktorijum koji sadrži poruke na vašem sistemu. Poruke će "
+"biti smeštene u fasciklu sa istim imenom kao što je i direktorijum u kome su "
+"sa prefiksom „PLAIN-“</p><p>Ovaj filter će uvesti sve .msg, .eml i .txt "
+"poruke.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Uvoz fascikli iz Pegasus-Mail-a"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Odaberite direktorijum Pegasus-Mail-a na vašem sistemu (sadrži CNM, PMM i "
+"MBX fajlove). Na mnogim sistemima je smešten u C:\\PMail\\mail ili C:\\pmail"
+"\\mail\\admin</p><p><b>Napomena:</b> Pošto je moguće ponovo napraviti "
+"strukturu fascikli, ona će biti smeštena pod: „PegasusMail-uvoz“.</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Ne mogu da rasčlanim strukturu fascikle; nastavljam uvoz bez podrške za "
+"podfascikle."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Uvozim nove poštanske fajlove („.cnm“)..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Uvozim poštanske fascikle („.pmm“)..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Uvozim „UNIX“ poštanske fascikle („.mbx“)..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Uvozim %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Rasčlanjujem strukturu fascikle..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Uvezi poštu i strukturu fascikli Sylpheed-a"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Filter uvoza iz Sylpheed-a</b></p><p>Izaberite osnovni direktorijum za "
+"Sylpheed-ovu poštu (načešće ~/Mail).</p><p>Pošto je moguće ponovo napraviti "
+"strukturu fascikli, ona će biti sadržana pod „Sylpheed-uvoz“.</p><p>Ovaj "
+"filter takođe ponovo pravi status poruke, npr. nova ili prosleđena."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Uvezi poštu i strukturu fascikli The Bat-a!"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Filter uvoza iz The Bat-a!</b></p><p>Izaberite osnovnu lokalnu "
+"fasciklu pošte gde želite da smestite uvoz iz „The Bat-a“.</p><p><b>Napomena:"
+"</b> Ovaj filter uvozi *.tbb fajlove iz lokalne fascile „The Bat-a!“, npr. "
+"iz POP naloga, a ne iz IMAP/DIMAP naloga.</p><p>Pošto je moguće regenerisati "
+"strukturu fascikli, one će biti smeštene pod „The Bat!-uvoz“ u vašem "
+"lokalnom nalogu.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Uvezi poštu i strukturu fascikli Thunderbird-a/Mozilla-e"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Filter uvoza iz Sylpheed-a</b></p>"
-"<p>Izaberite osnovni direktorijum za Sylpheed-ovu poštu (načešće ~/Mail).</p>"
-"<p>Pošto je moguće ponovo napraviti strukturu fascikli, ona će biti sadržana "
-"pod „Sylpheed-uvoz“.</p>"
-"<p>Ovaj filter takođe ponovo pravi status poruke, npr. nova ili prosleđena."
+"<p><b>Filter za uvoz iz Thunderbird-a/Mozilla-e</b></p><p>Izaberite baznu "
+"poštansku fasciklu Thunderbird-a/Mozilla-e (obično ~/.thunderbird/*.default/"
+"Mail/Local Folders/).</p><p><b>Napomena:</b> Nikada ne birajte fasciklu koja "
+"<u>ne sadrži</u> mbox fajlove (na primer maildir). Ako to ipak učinite, "
+"dobićete mnogo novih fascikli.</p><p>Pošto je moguće regenerisati strukturu "
+"fascikli, fascikle će biti sadržane pod „Uvoz Thunderbird-a“.</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<b>Kobno:</b> Ne mogu da pokrenem KMail za DCOP komunikaciju. Uverite se da je "
-"<i>kmail</i> instaliran."
+"<b>Kobno:</b> Ne mogu da pokrenem KMail za DCOP komunikaciju. Uverite se da "
+"je <i>kmail</i> instaliran."
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -593,64 +554,57 @@ msgstr "Ne mogu da dodam poruku u fasciklu %1 u KMail-u"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Greška prilikom dodavanja poruke u fasciklu %1 u KMail-u"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Uvoz običnih tekstualnih e-poruka"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Od:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Odaberite direktorijum koji sadrži poruke na vašem sistemu. Poruke će biti "
-"smeštene u fasciklu sa istim imenom kao što je i direktorijum u kome su sa "
-"prefiksom „PLAIN-“</p>"
-"<p>Ovaj filter će uvesti sve .msg, .eml i .txt poruke.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Za:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Uvoz mbox fajlova (Unix, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Tekući:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>mbox filter za uvoz</b></p>"
-"<p>Ovaj filter će uvesti mbox fajlove u KMail. Koristite ovaj filter ako želite "
-"da uvezete poštu iz Ximian-ovog Evolution-a ili drugih programa koji koriste "
-"tradicionalni Unix-ov format.</p>"
-"<p><b>Napomena:</b> Poruke će biti uvezene u fascikle sa imenom istim kao što "
-"se zove fajl iz koga su uvezene sa prefiksom „MBOX-“</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Uvoz je u toku..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox fajlovi (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Uvezi poštu i strukturu fascikli The Bat-a!"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Ukupno:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Kliknite na „Nazad“ da biste uvezli još poruka ili kontakata"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Filter uvoza iz The Bat-a!</b></p>"
-"<p>Izaberite osnovnu lokalnu fasciklu pošte gde želite da smestite uvoz iz „The "
-"Bat-a“.</p>"
-"<p><b>Napomena:</b> Ovaj filter uvozi *.tbb fajlove iz lokalne fascile „The "
-"Bat-a!“, npr. iz POP naloga, a ne iz IMAP/DIMAP naloga.</p>"
-"<p>Pošto je moguće regenerisati strukturu fascikli, one će biti smeštene pod "
-"„The Bat!-uvoz“ u vašem lokalnom nalogu.</p>"
+"<b>Dobrodošli u KMailCVT — KMail-ov alat za uvoz</b>\n"
+"<br><br>\n"
+"Ovaj program će vam pomoći da uvezete poruke iz vašeg prethodnog programa za "
+"e-poštu u KMail.<br><br><br><br>\n"
+"Izaberite program iz koga želite da uvozite, pa onda kliknite na „Sledeći“."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Ukloni &duplikate poruka tokom uvoza"
diff --git a/tde-i18n-sv/messages/tdepim/kmailcvt.po b/tde-i18n-sv/messages/tdepim/kmailcvt.po
index b869b248d37..d280858dde2 100644
--- a/tde-i18n-sv/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-sv/messages/tdepim/kmailcvt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-01-05 19:25+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@comhem.se>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -19,25 +19,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Importera e-post från Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Daniel Karlsson,Mattias Newzella"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "chaotica@home.se,newzella@linux.nu"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Kmailcvt-importverktyg"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Steg 1: Välj filter"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Steg 2: Importera..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Import pågår"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Import klar"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Skriven av %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "Kmailcvt"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Kmail-importfilter"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "© 2000-2005, KMailCVT-utvecklarna"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Ursprunglig upphovsman"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Underhåll och nya filter"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Nytt gränssnitt och upprensningar"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Importera lokala brev och katalogstruktur från Evolution 1.x"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Importfilter för Outlook e-post</b></p>"
-"<p>Det här filtret importerar brev från en Outlook pst-fil. Du måste hitta "
-"katalogen där pst-filen har lagrats genom att söka efter .pst-filer under <i>"
-"C:\\Documents and Settings</i> i Windows 2000 eller senare</p>"
-"<p><b>Observera:</b> E-post importeras till en katalog som får namn efter "
-"kontot de kom från, med prefixet OUTLOOK-.</p>"
+"<p><b>Importfilter för Evolution 1.x</b></p><p>Välj baskatalog för "
+"Evolutions e-post (oftast ~/evolution/local).</p><p>Eftersom det är möjligt "
+"att återskapa korgstrukturen, lagras alla korgar under: \"Evolution import\"."
+"</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -47,27 +103,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Ingen katalog vald."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Räknar filer..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Räknar brev..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Räknar kataloger..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Räknar korgar..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Importerar nya brevfiler..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -75,6 +110,22 @@ msgstr "Importerar nya brevfiler..."
 msgid "No files found for import."
 msgstr "Inga filer hittades att importera."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Avslutade import av e-post från %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Kunde inte öppna %1. Hoppar över."
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -92,38 +143,37 @@ msgstr ""
 "1 duplicerat brev importerades inte\n"
 "%n duplicerade brev importerades inte"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Kunde inte öppna %1. Hoppar över."
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Importera lokala brev och katalogstruktur från Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Importera lokala brev och katalogstruktur från Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Importfilter för Evolution 1.x</b></p>"
-"<p>Välj baskatalog för Evolutions e-post (oftast ~/evolution/local).</p>"
-"<p>Eftersom det är möjligt att återskapa korgstrukturen, lagras alla korgar "
-"under: \"Evolution import\".</p>"
+"<p><b>Importfilter för Evolution 2.x</b></p><p>Välj baskatalogen för den "
+"lokala brevkatalogen i Evolution (oftast ~/.evolution/mail/local/).</"
+"p><p><b>Observera:</b> Välj aldrig en katalog som <u>inte</u> innehåller "
+"mbox-filer (till exempel en brevkatalog). Om du gör det ändå, får du många "
+"nya korgar.</p> <p>Eftersom det är möjligt att återskapa korgstrukturen, "
+"lagras alla korgar under: \"Evolution-import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Avslutade import av e-post från %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Avslutade import, avbruten av användaren."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Starta import av filen %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -131,99 +181,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Importera korgar från Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Välj Pegasus-Mail-katalogen på systemet (som innehåller CNM-, PMM- och "
-"MBX-filer). I många system lagras den här filen på C:\\pmail\\mail eller "
-"C:\\pmail\\mail\\admin.</p>"
-"<p><b>Observera:</b> Eftersom det är möjligt att återskapa katalogstrukturen, "
-"lagras alla kataloger under \"PegasusMail-Import\".</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Kan inte tolka katalogstrukturen. Fortsätter import utan stöd för "
-"underkataloger."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Importerar nya brevfiler (\".cnm\")..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Importerar brevmappar (\".pmm\")..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Importerar Unix-brevmappar (\".mbx\")..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Importerar %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Brev %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Tolkar katalogstrukturen..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Skriven av %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Importera e-post från Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Importfilter för Lotus Notes strukturerad text e-post</b></p>"
-"<p>Det här filtret importerar strukturerade textfiler från export av en Lotus "
-"Notes e-postklient till Kmail. Använd filtret om du vill importera post från "
-"Lotus eller andra e-postprogram som använder Lotus Notes strukturerade "
-"textformat.</p> "
-"<p><b>Observera:</b> Eftersom det är möjligt att återskapa korgstrukturen, "
-"lagras importerade brev i underkorgar som namnges av filerna de kom ifrån under "
-"\"LNotes-Import\" i din lokala korg.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Alla filer (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Importerar brev från %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -231,30 +192,21 @@ msgstr "Importera Kmails brevkataloger och katalogstruktur"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Importfilter för Kmail</b></p>"
-"<p>Välj baskatalogen för den Kmail brevkorg som du vill importera.</p>"
-"<p><b>Observera:</b> Välj aldrig ditt nuvarande lokala brevkatalog för Kmail "
-"(oftast ~/Mail eller ~/.trinity/share/apps/kmail/mail). I detta fall kan "
-"Kmailcvt hamna i en kontinuerlig snurra.</p>"
-"<p>Det här filtret importerar inte Kmail brevkataloger med mbox-filer.</p>"
-"<p>Eftersom det är möjligt att återskapa korgstrukturen, lagras alla korgar "
-"under: \"KMail-Import\" i din lokala korg.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Avslutade import, avbruten av användaren."
+"<p><b>Importfilter för Kmail</b></p><p>Välj baskatalogen för den Kmail "
+"brevkorg som du vill importera.</p><p><b>Observera:</b> Välj aldrig ditt "
+"nuvarande lokala brevkatalog för Kmail (oftast ~/Mail eller ~/.trinity/share/"
+"apps/kmail/mail). I detta fall kan Kmailcvt hamna i en kontinuerlig snurra.</"
+"p><p>Det här filtret importerar inte Kmail brevkataloger med mbox-filer.</"
+"p><p>Eftersom det är möjligt att återskapa korgstrukturen, lagras alla "
+"korgar under: \"KMail-Import\" i din lokala korg.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -267,190 +219,41 @@ msgstr "Importera katalog %1..."
 msgid "Could not import %1"
 msgstr "Kunde inte importera %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Importera lokala brev och katalogstruktur från Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Importfilter för Thunderbird/Mozilla</b></p>"
-"<p>Välj baskatalogen för e-post i Thunderbird/Mozilla (oftast "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Observera:</b> Välj aldrig en katalog som <u>inte</u> "
-"innehåller mbox-filer (till exempel en brevkatalog). Om du gör det ändå, får du "
-"många nya korgar.</p> "
-"<p>Eftersom det är möjligt att återskapa korgstrukturen, lagras alla korgar "
-"under: \"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Starta import av filen %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Importera e-post från Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Importfilter för e-post från Opera</b></p>"
-"<p>Det här filtret importerar brev från Operas brevkorgar. Använd filtret om du "
-"vill importera alla brev från ett konto i Operas brevkatalog.</p>"
-"<p>Välj kontots katalog (oftast ~/.opera/mail/store/account*).</p>"
-"<p><b>Observera:</b> E-post importeras till en katalog som får namn efter "
-"kontot de kom från, med prefixet OPERA-.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Importera lokala brev och katalogstruktur från Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Importfilter för Evolution 2.x</b></p>"
-"<p>Välj baskatalogen för den lokala brevkatalogen i Evolution (oftast "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Observera:</b> Välj aldrig en katalog som <u>inte</u> "
-"innehåller mbox-filer (till exempel en brevkatalog). Om du gör det ändå, får du "
-"många nya korgar.</p> "
-"<p>Eftersom det är möjligt att återskapa korgstrukturen, lagras alla korgar "
-"under: \"Evolution-import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Från:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Till:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Nuvarande:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Import pågår..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Totalt:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Klicka på 'Tillbaka' för att importera mer e-post eller flera kontakter"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Importera e-post från Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Välkommen till Kmailcvt - Kmails importverktyg</b>\n"
-"<br>"
-"<br>\n"
-"Det här programmet hjälper dig importera e-post från ditt tidigare "
-"e-postprogram till Kmail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Välj program som du vill importera från, och klicka därefter på \"Nästa\"."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Ta bort &duplicerade brev under import"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "Kmailcvt"
+"<p><b>Importfilter för Lotus Notes strukturerad text e-post</b></p><p>Det "
+"här filtret importerar strukturerade textfiler från export av en Lotus Notes "
+"e-postklient till Kmail. Använd filtret om du vill importera post från Lotus "
+"eller andra e-postprogram som använder Lotus Notes strukturerade textformat."
+"</p> <p><b>Observera:</b> Eftersom det är möjligt att återskapa "
+"korgstrukturen, lagras importerade brev i underkorgar som namnges av filerna "
+"de kom ifrån under \"LNotes-Import\" i din lokala korg.</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Kmail-importfilter"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "© 2000-2005, KMailCVT-utvecklarna"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Ursprunglig upphovsman"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Underhåll och nya filter"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Nytt gränssnitt och upprensningar"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Alla filer (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Daniel Karlsson,Mattias Newzella"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Importerar brev från %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "chaotica@home.se,newzella@linux.nu"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Brev %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -458,11 +261,11 @@ msgstr "Importera korgar från OS X-Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X-importfilter för e-post</b></p>"
-"<p>Det här filtret importerar e-post från e-postprogrammet i Apple Mac OS X.</p>"
+"<p><b>OS X-importfilter för e-post</b></p><p>Det här filtret importerar e-"
+"post från e-postprogrammet i Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -472,25 +275,27 @@ msgstr ""
 "1 duplicerat brev importerades inte till korgen %1 i Kmail\n"
 "%n duplicerade brev importerades inte till korgen %1 i Kmail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Kmailcvt-importverktyg"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Steg 1: Välj filter"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Steg 2: Importera..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Importera mbox-filer (Unix, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Import pågår"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Importfilter för mbox</b></p><p>Det här filtret importerar mbox-filer "
+"till Kmail. Använd filtret om du vill importera post från Ximian Evolution "
+"eller andra e-postprogram som använder det här traditionella Unix-formatet.</"
+"p> <p><b>Observera:</b> E-post importeras till kataloger som får namn efter "
+"filen de kom från, med prefixet MBOX-.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Import klar"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox-filer (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -498,25 +303,20 @@ msgstr "Importera e-post från Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6-importfilter</b></p>"
-"<p>Du måste hitta katalogen där brevlådan har lagrats genom att söka efter "
-".dbx- eller .mbx-filer under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> i Windows 9x "
-"<li><i>Documents and Settings</i> i Windows 2000 eller senare</ul></p>"
-"<p><b>Observera:</b> Eftersom det är möjligt att skapa om katalog-strukturen, "
-"lagras alla korgar från Outlook 5 och 6 under: \"OE-import\" i din lokala "
-"katalog.</p>"
+"<p><b>Outlook Express 4/5/6-importfilter</b></p><p>Du måste hitta katalogen "
+"där brevlådan har lagrats genom att söka efter .dbx- eller .mbx-filer under "
+"<ul><li><i>C:\\Windows\\Application Data</i> i Windows 9x <li><i>Documents "
+"and Settings</i> i Windows 2000 eller senare</ul></p><p><b>Observera:</b> "
+"Eftersom det är möjligt att skapa om katalog-strukturen, lagras alla korgar "
+"från Outlook 5 och 6 under: \"OE-import\" i din lokala katalog.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -551,46 +351,66 @@ msgstr "Importerar OE5+-brevlåda %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Importerar OE5+-katalogfil %1"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "Importera brevkataloger och katalogstruktur från Sylpheed"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Importera e-post från Opera"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
-"<p><b>Importerfilter för Sylpheed</b></p>"
-"<p>Välj baskatalog för Sylphed brevkorg som du vill importera (oftast "
-"~/Mail).</p>"
-"<p>Eftersom det är möjligt att återskapa korgstrukturen, lagras alla korgar "
-"under: \"Sylpheed-Import\" i din lokala korg.</p> "
-"<p>Det här filtret återskapar också status på ett brev, t.ex. nytt eller "
-"vidarebefordrat."
+"<p><b>Importfilter för e-post från Opera</b></p><p>Det här filtret "
+"importerar brev från Operas brevkorgar. Använd filtret om du vill importera "
+"alla brev från ett konto i Operas brevkatalog.</p><p>Välj kontots katalog "
+"(oftast ~/.opera/mail/store/account*).</p><p><b>Observera:</b> E-post "
+"importeras till en katalog som får namn efter kontot de kom från, med "
+"prefixet OPERA-.</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Räknar filer..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Importerar nya brevfiler..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Importera e-post från Outlook"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>Allvarligt fel:</b> Kunde inte starta Kmail för DCOP-kommunikation. Försäkra "
-"dig om att <i>kmail</i> är installerat."
+"<p><b>Importfilter för Outlook e-post</b></p><p>Det här filtret importerar "
+"brev från en Outlook pst-fil. Du måste hitta katalogen där pst-filen har "
+"lagrats genom att söka efter .pst-filer under <i>C:\\Documents and Settings</"
+"i> i Windows 2000 eller senare</p><p><b>Observera:</b> E-post importeras "
+"till en katalog som får namn efter kontot de kom från, med prefixet OUTLOOK-."
+"</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "Kan inte skapa korg %1 i Kmail"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Räknar brev..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "Kan inte lägga till brev i korg %1 i Kmail"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Räknar kataloger..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "Fel uppstod när brevet skulle läggas till i korg %1 i Kmail"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Räknar korgar..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -599,37 +419,78 @@ msgstr "Importera enkla textbrev"
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 "<p>Välj katalogen som innehåller e-post i ditt system. E-post läggs i en "
-"katalog med samma namn som de fanns i, med prefixet PLAIN-</p>"
-"<p>Det här filtret importerar all .msg-, .eml- och .txt-e-post.</p>"
+"katalog med samma namn som de fanns i, med prefixet PLAIN-</p><p>Det här "
+"filtret importerar all .msg-, .eml- och .txt-e-post.</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Importera mbox-filer (Unix, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Importera korgar från Pegasus-Mail"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>Importfilter för mbox</b></p>"
-"<p>Det här filtret importerar mbox-filer till Kmail. Använd filtret om du vill "
-"importera post från Ximian Evolution eller andra e-postprogram som använder det "
-"här traditionella Unix-formatet.</p> "
-"<p><b>Observera:</b> E-post importeras till kataloger som får namn efter filen "
-"de kom från, med prefixet MBOX-.</p>"
+"<p>Välj Pegasus-Mail-katalogen på systemet (som innehåller CNM-, PMM- och "
+"MBX-filer). I många system lagras den här filen på C:\\pmail\\mail eller C:"
+"\\pmail\\mail\\admin.</p><p><b>Observera:</b> Eftersom det är möjligt att "
+"återskapa katalogstrukturen, lagras alla kataloger under \"PegasusMail-Import"
+"\".</p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox-filer (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Kan inte tolka katalogstrukturen. Fortsätter import utan stöd för "
+"underkataloger."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Importerar nya brevfiler (\".cnm\")..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Importerar brevmappar (\".pmm\")..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Importerar Unix-brevmappar (\".mbx\")..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Importerar %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Tolkar katalogstrukturen..."
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "Importera brevkataloger och katalogstruktur från Sylpheed"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Importerfilter för Sylpheed</b></p><p>Välj baskatalog för Sylphed "
+"brevkorg som du vill importera (oftast ~/Mail).</p><p>Eftersom det är "
+"möjligt att återskapa korgstrukturen, lagras alla korgar under: \"Sylpheed-"
+"Import\" i din lokala korg.</p> <p>Det här filtret återskapar också status "
+"på ett brev, t.ex. nytt eller vidarebefordrat."
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -637,17 +498,112 @@ msgstr "Importera lokala brev och katalogstruktur från Bat!"
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Importfilter för Bat!</b></p><p>Välj baskatalogen för den lokala Bat! "
+"brevkorg som du vill importera.</p><p><b>Observera:</b> Filtret importerar i "
+"synnerhet *.tbb-filer från lokala korgar i Bat!, t.ex. från POP-konton och "
+"inte från IMAP/DIMAP-konton.</p><p>Eftersom det är möjligt att återskapa "
+"korgstrukturen, lagras alla korgar under: \"TheBat-Import\" i din lokala "
+"korg.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Importera lokala brev och katalogstruktur från Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Importfilter för Thunderbird/Mozilla</b></p><p>Välj baskatalogen för e-"
+"post i Thunderbird/Mozilla (oftast ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Observera:</b> Välj aldrig en katalog som <u>inte</u> "
+"innehåller mbox-filer (till exempel en brevkatalog). Om du gör det ändå, får "
+"du många nya korgar.</p> <p>Eftersom det är möjligt att återskapa "
+"korgstrukturen, lagras alla korgar under: \"Thunderbird-Import\".</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b>Allvarligt fel:</b> Kunde inte starta Kmail för DCOP-kommunikation. "
+"Försäkra dig om att <i>kmail</i> är installerat."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "Kan inte skapa korg %1 i Kmail"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "Kan inte lägga till brev i korg %1 i Kmail"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "Fel uppstod när brevet skulle läggas till i korg %1 i Kmail"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Från:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Till:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Nuvarande:"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Import pågår..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Totalt:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Klicka på 'Tillbaka' för att importera mer e-post eller flera kontakter"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Importfilter för Bat!</b></p>"
-"<p>Välj baskatalogen för den lokala Bat! brevkorg som du vill importera.</p>"
-"<p><b>Observera:</b> Filtret importerar i synnerhet *.tbb-filer från lokala "
-"korgar i Bat!, t.ex. från POP-konton och inte från IMAP/DIMAP-konton.</p>"
-"<p>Eftersom det är möjligt att återskapa korgstrukturen, lagras alla korgar "
-"under: \"TheBat-Import\" i din lokala korg.</p>"
+"<b>Välkommen till Kmailcvt - Kmails importverktyg</b>\n"
+"<br><br>\n"
+"Det här programmet hjälper dig importera e-post från ditt tidigare e-"
+"postprogram till Kmail.<br><br><br><br>\n"
+" Välj program som du vill importera från, och klicka därefter på \"Nästa\"."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Ta bort &duplicerade brev under import"
diff --git a/tde-i18n-ta/messages/tdepim/kmailcvt.po b/tde-i18n-ta/messages/tdepim/kmailcvt.po
index 19b40822d5a..443a55e798d 100644
--- a/tde-i18n-ta/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-ta/messages/tdepim/kmailcvt.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-03-23 23:29-0800\n"
 "Last-Translator: Tamil PC <tamilpc@ambalam.com>\n"
 "Language-Team:  <ta@li.org>\n"
@@ -14,26 +14,84 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Outlook மின்னஞ்சல்களை இறக்கு"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "தமிழ்PC"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "tamilpc@ambalam.com"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Kஅஞ்சல்CVT இறக்குமதி கருவி"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Step 1:வடிகட்டியை தேர்ந்தெடு"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Step 2:இறக்குமதியாகிறது..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "இறக்குமதி நடந்து கொண்டிருக்கிறது"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "இறக்குமதி நடந்து முடிந்தது"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>எழுதியவரால் %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "Kஅஞசல்CVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Kஅஞ்சல் இறக்குமதி வடிகட்டிகள்."
+
+#: main.cpp:35
+#, fuzzy
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2003, Kஅஞ்சல்CVT உருவாக்கிகள்"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "மூல ஆசிரியர்"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "புதிய GUI & துடைத்தெடு"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "பரிணாம அஞ்சல்கள் மற்றும் அடைவு உருவத்தை இறக்கு"
+
+#: filter_evolution.cxx:33
+#, fuzzy
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p> "
-"<p>This is an Outlook Express import filter which fully supports versions 4 to "
-"6.</p>"
-"<p>Outlook Express generally stores its mailboxes in C:\\Windows\\Application "
-"Data\\Identities\\\\Microsoft\\Outlook Express</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with OE-</p>"
+"<p>பரிணாம அஞ்சல்களுடைய மூல அடைவை தேர்ந்தெடு (வழக்கமாக ~/evolution/local).</"
+"p><p>இது தற்போது அடைவு உருவத்தை மறு உருவாக்க முடியவில்லை, இது கண்டிப்பாக "
+"உருவாக்கப்பட்ட அடைவுகளின் பெயர்களில் \"உள்ளடக்கியுள்ளது\".</p><p>ஒரு வேளை, நீங்கள் \"foo"
+"\" பரிமாணத்தின் அடைவை வைத்திருந்தால், அதனுடன் \"bar\" உள்ளடைவும், கேமெயிலில் இரண்டு "
+"அடைவுகள் உருவாக்கியது : \"foo\" மற்றும் \"foo-bar\"</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -43,27 +101,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "தடம் தேர்வு செய்யப்படவில்லை"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "கணக்கிடுகின்ற கோப்புகள்..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "அஞ்சல்களை கணக்கிடுகிறது..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "கணக்கிடுகின்ற கோப்புகள்..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "அடைவுகளை கணக்கிடுகிறது..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "புதிய அஞ்சல் கோப்புகளை இறக்குமதி செய்கிறது...."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -71,6 +108,22 @@ msgstr "புதிய அஞ்சல் கோப்புகளை இறக
 msgid "No files found for import."
 msgstr "இறக்குவதற்கு எந்த கோப்புகளும் இல்லை."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "மின்னஞ்சல்களை %1...இல் இருந்து இறக்குமதி செய்யப்பட்டது."
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "%1 எனும் கோப்பினைத் திறக்க முடியவில்லை,  தாவுகிறது."
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -86,41 +139,38 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "kஅஞ்சலுக்கு %1 கோப்புறையில் செய்திகளை சேர்க்க இயலாது"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "%1 எனும் கோப்பினைத் திறக்க முடியவில்லை,  தாவுகிறது."
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "பரிணாம அஞ்சல்கள் மற்றும் அடைவு உருவத்தை இறக்கு"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 #, fuzzy
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p>பரிணாம அஞ்சல்களுடைய மூல அடைவை தேர்ந்தெடு (வழக்கமாக ~/evolution/local).</p>"
-"<p>இது தற்போது அடைவு உருவத்தை மறு உருவாக்க முடியவில்லை, இது கண்டிப்பாக "
-"உருவாக்கப்பட்ட அடைவுகளின் பெயர்களில் \"உள்ளடக்கியுள்ளது\".</p>"
-"<p>ஒரு வேளை, நீங்கள் \"foo\" பரிமாணத்தின் அடைவை வைத்திருந்தால், அதனுடன் \"bar\" "
-"உள்ளடைவும், கேமெயிலில் இரண்டு அடைவுகள் உருவாக்கியது : \"foo\" மற்றும் "
-"\"foo-bar\"</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder, which <u>does not</u> contain mbox-"
+"files (for example a maildir). If you do it anyway, you will get many new "
+"folders.</p><p>As it is currently impossible to recreate the folder "
+"structure, it will be \"contained\" in the generated folder's names.</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "மின்னஞ்சல்களை %1...இல் இருந்து இறக்குமதி செய்யப்பட்டது."
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr ""
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "கோப்பு %1ஐ இறக்க துவக்கவும்..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -128,100 +178,11 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr " Pegasus-அஞ்சலில் இருந்து கோப்புறைகளை இறக்குமதி செய்"
-
-#: filter_pmail.cxx:33
-#, fuzzy
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Select the Pegasus-Mail directory on your system (containing CNM, PMM and "
-"MBX files). On many systems this is stored in C:\\PMail\\mail</p>"
-"<p><b>Note:</b> This import filter will import your folders, but not the folder "
-"structure. But you will probably only do this one time.</p>"
-"<p><b>Note:</b> Emails will be imported into folder with the prefix pmail-</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "புதிய அஞ்சல் கோப்புகளை இறக்குமதி செய்கிறது.'.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "புதிய அஞ்சல் கோப்புகளை இறக்குமதி செய்கிறது...."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "'UNIX'  அஞசல் ('.mbx')... கோப்புறையை இறக்குமதி செய்கிறது"
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "இறக்குமதியாகிறது %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "செய்தி%1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr ""
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>எழுதியவரால் %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "Outlook மின்னஞ்சல்களை இறக்கு"
-
-#: filter_lnotes.cxx:32
-#, fuzzy
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-
-#: filter_lnotes.cxx:55
-#, fuzzy
-msgid "All Files (*)"
-msgstr "mபெட்டி கோப்புகள் (*)"
-
-#: filter_lnotes.cxx:64
-#, fuzzy, c-format
-msgid "Importing emails from %1"
-msgstr "மின்னஞ்சல்களை %1...இல் இருந்து இறக்குமதி செய்கிறது"
-
 #: filter_kmail_maildir.cxx:26
 #, fuzzy
 msgid "Import KMail Maildirs and Folder Structure"
@@ -230,30 +191,20 @@ msgstr "பரிணாம அஞ்சல்கள் மற்றும் அ
 #: filter_kmail_maildir.cxx:28
 #, fuzzy
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder, which <u>does not</u> "
-"contain mbox-files (for example a maildir). If you do it anyway, you will get "
-"many new folders.</p>"
-"<p>As it is currently impossible to recreate the folder structure, it will be "
-"\"contained\" in the generated folder's names.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder, which <u>does not</u> contain mbox-"
+"files (for example a maildir). If you do it anyway, you will get many new "
+"folders.</p><p>As it is currently impossible to recreate the folder "
+"structure, it will be \"contained\" in the generated folder's names.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 #, fuzzy
@@ -267,195 +218,42 @@ msgstr "கோப்பு %1ஐ இறக்க துவக்கவும்.
 msgid "Could not import %1"
 msgstr "%1 இறக்குமதி செய்ய இயலவில்லை"
 
-#: filter_thunderbird.cxx:28
-#, fuzzy
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "பரிணாம அஞ்சல்கள் மற்றும் அடைவு உருவத்தை இறக்கு"
-
-#: filter_thunderbird.cxx:30
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird import filter</b></p>"
-"<p>Select your base Thunderbird mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder, which <u>does not</u> "
-"contain mbox-files (for example a maildir). If you do it anyway, you will get "
-"many new folders.</p>"
-"<p>As it is currently impossible to recreate the folder structure, it will be "
-"\"contained\" in the generated folder's names.</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "கோப்பு %1ஐ இறக்க துவக்கவும்..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "அவுட்லுக் எக்ஸ்பிரஸ் மின்னஞ்சல்களை இறக்குமதி செய்"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "பரிணாம அஞ்சல்கள் மற்றும் அடைவு உருவத்தை இறக்கு"
+msgid "Import Lotus Notes Emails"
+msgstr "Outlook மின்னஞ்சல்களை இறக்கு"
 
-#: filter_evolution_v2.cxx:31
+#: filter_lnotes.cxx:32
 #, fuzzy
 msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder, which <u>does not</u> "
-"contain mbox-files (for example a maildir). If you do it anyway, you will get "
-"many new folders.</p>"
-"<p>As it is currently impossible to recreate the folder structure, it will be "
-"\"contained\" in the generated folder's names.</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "அனுப்புநர்:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "பெறுநர்:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "தற்போதைய"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Importing in progress..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "மொத்தம்:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"அதிக மின்னஞ்சல்களை அல்லது தொடர்புகளை இறக்குமதி செய்ய 'பின்' என்பதை க்ளிக் "
-"செய்யவும்"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "கீழிறக்கும்போது வந்த போலி செய்திகளை நீக்கு"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "Kஅஞசல்CVT"
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Kஅஞ்சல் இறக்குமதி வடிகட்டிகள்."
-
-#: main.cpp:35
+#: filter_lnotes.cxx:55
 #, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2003, Kஅஞ்சல்CVT உருவாக்கிகள்"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "மூல ஆசிரியர்"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "புதிய GUI & துடைத்தெடு"
+msgid "All Files (*)"
+msgstr "mபெட்டி கோப்புகள் (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "தமிழ்PC"
+#: filter_lnotes.cxx:64
+#, fuzzy, c-format
+msgid "Importing emails from %1"
+msgstr "மின்னஞ்சல்களை %1...இல் இருந்து இறக்குமதி செய்கிறது"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "tamilpc@ambalam.com"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "செய்தி%1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -463,12 +261,11 @@ msgstr "OS X அஞ்சலில் இருந்து கீழிறக�
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X அஞ்சல் இறக்கு அலங்காரம்</b></p>"
-"<p>இந்த அலங்காரம் ஆப்பிள் மாக் OS Xல் அஞ்சல் உறுப்பினரில் இருந்து மின்னஞ்சல்களை "
-"இறக்குகிறது.</p>"
+"<p><b>OS X அஞ்சல் இறக்கு அலங்காரம்</b></p><p>இந்த அலங்காரம் ஆப்பிள் மாக் OS Xல் அஞ்சல் "
+"உறுப்பினரில் இருந்து மின்னஞ்சல்களை இறக்குகிறது.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 #, fuzzy
@@ -477,25 +274,27 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "kஅஞ்சலுக்கு %1 கோப்புறையில் செய்திகளை சேர்க்க இயலாது"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Kஅஞ்சல்CVT இறக்குமதி கருவி"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Step 1:வடிகட்டியை தேர்ந்தெடு"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Step 2:இறக்குமதியாகிறது..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "mபெட்டிக் கோப்புகளை (UNIX, Evolution) இறக்குமதி செய்"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "இறக்குமதி நடந்து கொண்டிருக்கிறது"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "இறக்குமதி நடந்து முடிந்தது"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mபெட்டி கோப்புகள் (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -504,23 +303,20 @@ msgstr "அவுட்லுக் எக்ஸ்பிரஸ் மின்�
 #: filter_oe.cxx:42
 #, fuzzy
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p> "
-"<p>This is an Outlook Express import filter which fully supports versions 4 to "
-"6.</p>"
-"<p>Outlook Express generally stores its mailboxes in C:\\Windows\\Application "
-"Data\\Identities\\\\Microsoft\\Outlook Express</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with OE-</p>"
+"<p><b>Outlook Express 4/5/6 import filter</b></p> <p>This is an Outlook "
+"Express import filter which fully supports versions 4 to 6.</p><p>Outlook "
+"Express generally stores its mailboxes in C:\\Windows\\Application Data"
+"\\Identities\\\\Microsoft\\Outlook Express</p><p><b>Note:</b> Emails will be "
+"imported into folders named after the file they came from, prefixed with OE-"
+"</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -556,47 +352,65 @@ msgstr "OE5+ அஞ்சல் பெட்டியை%1 இறக்கும
 msgid "Importing OE5+ Folder file %1"
 msgstr "புறக்கணிக்கப்படுகிறது OE5+  கோப்புறை கோப்பு %1"
 
-#: filter_sylpheed.cxx:27
-#, fuzzy
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "பரிணாம அஞ்சல்கள் மற்றும் அடைவு உருவத்தை இறக்கு"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "அவுட்லுக் எக்ஸ்பிரஸ் மின்னஞ்சல்களை இறக்குமதி செய்"
 
-#: filter_sylpheed.cxx:29
-#, fuzzy
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
-"<p>பரிணாம அஞ்சல்களுடைய மூல அடைவை தேர்ந்தெடு (வழக்கமாக ~/evolution/local).</p>"
-"<p>இது தற்போது அடைவு உருவத்தை மறு உருவாக்க முடியவில்லை, இது கண்டிப்பாக "
-"உருவாக்கப்பட்ட அடைவுகளின் பெயர்களில் \"உள்ளடக்கியுள்ளது\".</p>"
-"<p>ஒரு வேளை, நீங்கள் \"foo\" பரிமாணத்தின் அடைவை வைத்திருந்தால், அதனுடன் \"bar\" "
-"உள்ளடைவும், கேமெயிலில் இரண்டு அடைவுகள் உருவாக்கியது : \"foo\" மற்றும் "
-"\"foo-bar\"</p>"
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "கணக்கிடுகின்ற கோப்புகள்..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "புதிய அஞ்சல் கோப்புகளை இறக்குமதி செய்கிறது...."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Outlook மின்னஞ்சல்களை இறக்கு"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>உயிர்நாடி:</b> DCOP தகவல் தொடர்புக்கு Kஅஞ்சலை ஆரம்பிக்க இயலவில்லை. <i>"
-"kmail</i> நிறுவப்பட்டது என்பதை உறுதிபடுத்து."
+"<p><b>Outlook Express 4/5/6 import filter</b></p> <p>This is an Outlook "
+"Express import filter which fully supports versions 4 to 6.</p><p>Outlook "
+"Express generally stores its mailboxes in C:\\Windows\\Application Data"
+"\\Identities\\\\Microsoft\\Outlook Express</p><p><b>Note:</b> Emails will be "
+"imported into folders named after the file they came from, prefixed with OE-"
+"</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "kஅஞ்சலுக்கு %1 கோப்புறையில் இறக்குமதி செய்ய இயலாது"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "அஞ்சல்களை கணக்கிடுகிறது..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "kஅஞ்சலுக்கு %1 கோப்புறையில் செய்திகளை சேர்க்க இயலாது"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "கணக்கிடுகின்ற கோப்புகள்..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "kஅஞ்சலுக்கு %1 கோப்புறையில் செய்திகளை சேர்க்கும் போது பிழை"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "அடைவுகளை கணக்கிடுகிறது..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -605,38 +419,80 @@ msgstr "வெற்று உரை மின்னஞ்சலை இறக்
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "mபெட்டிக் கோப்புகளை (UNIX, Evolution) இறக்குமதி செய்"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr " Pegasus-அஞ்சலில் இருந்து கோப்புறைகளை இறக்குமதி செய்"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
+#, fuzzy
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
 msgstr ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"<p>Select the Pegasus-Mail directory on your system (containing CNM, PMM and "
+"MBX files). On many systems this is stored in C:\\PMail\\mail</p><p><b>Note:"
+"</b> This import filter will import your folders, but not the folder "
+"structure. But you will probably only do this one time.</p><p><b>Note:</b> "
+"Emails will be imported into folder with the prefix pmail-</p>"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mபெட்டி கோப்புகள் (*)"
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "புதிய அஞ்சல் கோப்புகளை இறக்குமதி செய்கிறது.'.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "புதிய அஞ்சல் கோப்புகளை இறக்குமதி செய்கிறது...."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "'UNIX'  அஞசல் ('.mbx')... கோப்புறையை இறக்குமதி செய்கிறது"
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "இறக்குமதியாகிறது %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
+#: filter_sylpheed.cxx:27
+#, fuzzy
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "பரிணாம அஞ்சல்கள் மற்றும் அடைவு உருவத்தை இறக்கு"
+
+#: filter_sylpheed.cxx:29
+#, fuzzy
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p>பரிணாம அஞ்சல்களுடைய மூல அடைவை தேர்ந்தெடு (வழக்கமாக ~/evolution/local).</"
+"p><p>இது தற்போது அடைவு உருவத்தை மறு உருவாக்க முடியவில்லை, இது கண்டிப்பாக "
+"உருவாக்கப்பட்ட அடைவுகளின் பெயர்களில் \"உள்ளடக்கியுள்ளது\".</p><p>ஒரு வேளை, நீங்கள் \"foo"
+"\" பரிமாணத்தின் அடைவை வைத்திருந்தால், அதனுடன் \"bar\" உள்ளடைவும், கேமெயிலில் இரண்டு "
+"அடைவுகள் உருவாக்கியது : \"foo\" மற்றும் \"foo-bar\"</p>"
 
 #: filter_thebat.cxx:33
 #, fuzzy
@@ -646,22 +502,116 @@ msgstr "பரிணாம அஞ்சல்கள் மற்றும் அ
 #: filter_thebat.cxx:35
 #, fuzzy
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
 msgstr ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder, which <u>does not</u> "
-"contain mbox-files (for example a maildir). If you do it anyway, you will get "
-"many new folders.</p>"
-"<p>As it is currently impossible to recreate the folder structure, it will be "
-"\"contained\" in the generated folder's names.</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder, which <u>does not</u> contain mbox-"
+"files (for example a maildir). If you do it anyway, you will get many new "
+"folders.</p><p>As it is currently impossible to recreate the folder "
+"structure, it will be \"contained\" in the generated folder's names.</p>"
+
+#: filter_thunderbird.cxx:28
+#, fuzzy
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "பரிணாம அஞ்சல்கள் மற்றும் அடைவு உருவத்தை இறக்கு"
+
+#: filter_thunderbird.cxx:30
+#, fuzzy
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Thunderbird import filter</b></p><p>Select your base Thunderbird "
+"mailfolder (usually ~/.thunderbird/*.default/Mail/Local Folders/).</"
+"p><p><b>Note:</b> Never choose a Folder, which <u>does not</u> contain mbox-"
+"files (for example a maildir). If you do it anyway, you will get many new "
+"folders.</p><p>As it is currently impossible to recreate the folder "
+"structure, it will be \"contained\" in the generated folder's names.</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b>உயிர்நாடி:</b> DCOP தகவல் தொடர்புக்கு Kஅஞ்சலை ஆரம்பிக்க இயலவில்லை. <i>kmail</i> "
+"நிறுவப்பட்டது என்பதை உறுதிபடுத்து."
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "kஅஞ்சலுக்கு %1 கோப்புறையில் இறக்குமதி செய்ய இயலாது"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "kஅஞ்சலுக்கு %1 கோப்புறையில் செய்திகளை சேர்க்க இயலாது"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "kஅஞ்சலுக்கு %1 கோப்புறையில் செய்திகளை சேர்க்கும் போது பிழை"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "அனுப்புநர்:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "பெறுநர்:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "தற்போதைய"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Importing in progress..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "மொத்தம்:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "அதிக மின்னஞ்சல்களை அல்லது தொடர்புகளை இறக்குமதி செய்ய 'பின்' என்பதை க்ளிக் செய்யவும்"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "கீழிறக்கும்போது வந்த போலி செய்திகளை நீக்கு"
 
 #~ msgid "KImportPageDlg"
 #~ msgstr "KImportPageDlg"
diff --git a/tde-i18n-tg/messages/tdepim/kmailcvt.po b/tde-i18n-tg/messages/tdepim/kmailcvt.po
index 512f91af963..4099a060a03 100644
--- a/tde-i18n-tg/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-tg/messages/tdepim/kmailcvt.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-09-16 16:50+0500\n"
 "Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
 "Language-Team: Tajik\n"
@@ -22,29 +22,92 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10\n"
 
-#: filter_outlook.cxx:28
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr ""
+"* НПО \"Имкониятҳои ҷавонон\" * Tajik Linux Users Group * Young Ladies Tajik "
+"Linux Users Group * http://www.khujand.org * http://www.tajikngo.org * "
+"http://www.yo-tj.org * Роҷер Ковакс, Виктор Ибрагимов, Марина Колючева, "
+"Евгения Фатхеева, Акмал Ватаншоев, Абророва Хиромон, Акмал Саломов, Акбар "
+"Ватаншоев, Фарход Ахмедов, Эркин Пулатов, Гулшод Довуди, Гулноз Курбанова, "
+"Зарина Косымова, Шухрат Лоиқов, Сурайё Ҷурахонова *"
+
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr ""
+"rkovacs@khujand.org, youth_opportunities@tajikngo.org, MarinaKL@tajikngo.org"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Импорти KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Қадами 1: интихоби Филтер"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Қадами 2 : Импорт кардан"
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Импорт рафта истодааст"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Импорт тамом шуд"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Навистаги %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Филтерҳои импорти KMail"
+
+#: main.cpp:35
 #, fuzzy
-msgid "Import Outlook Emails"
-msgstr "Импорт кардани хатҳои Outlook Express "
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2003, The KMailCVT developers"
 
-#: filter_outlook.cxx:30
+#: main.cpp:36
+msgid "Original author"
+msgstr "Муаллифи ибтидоӣ"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr ""
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Нави GUT & тозаги"
+
+#: filter_evolution.cxx:31
+#, fuzzy
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Импорт Evolution почтаҳо ва Структураи Папка"
+
+#: filter_evolution.cxx:33
 #, fuzzy
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 филтери </b></p>ворид карда шуда "
-"<p>Ба шумо лозим аст,ки ҷойгир намудани папкаи ,ки дар қуттии почтавии,ки  "
-"барои  кофтуковии.dbx ё mbx дар таги файл "
-"<ul> "
-"<li> <i>C:\\Windows\\Aplication Data</i> дар Windows 9x Документҳо вa           "
-"дар Windows 2000 ё баъдтар </ul></p>"
-"<p><b>Кайд кунед:</b>E-mail-ҳоро дар папкаҳои ,ки номгузори карда шуданд,ки аз "
-"ОЕ-</p> префикс мебошанд,ворид мекунем."
+"<p>Базаи директорияи почтаҳои Evolution-ро интихоб кунед (Одатан /evolution/ "
+"таҳҷои ).</p> <p> Мисли пештара номумкин аз сари нав сохтани структураи "
+"папкаро,ин мешавад \"таркиб ёфтааст\"дар номи папка тавлид ёфтан.<p> "
+"<p>Масалан ,агар шумо дар папкаи\"foo\"дар Еvolution доред,бо \"bar\" папкаи "
+"дар таг буда ,ду папка дар KMail сохта мешаванд :\"foo\"ва\"foo-bar\"<p> "
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -54,30 +117,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Каталог интихоб нашудааст"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Ҳисоб кардани файлҳо..."
-
-#: filter_outlook.cxx:46
-#, fuzzy
-msgid "Counting mail..."
-msgstr "Ҳисоб кардани файлҳо..."
-
-#: filter_outlook.cxx:47
-#, fuzzy
-msgid "Counting directories..."
-msgstr "Ҳисоб кардани файлҳо..."
-
-#: filter_outlook.cxx:48
-#, fuzzy
-msgid "Counting folders..."
-msgstr "Ҳисоб кардани файлҳо..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Импорти файлҳои нави хати элетрони..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -85,6 +124,22 @@ msgstr "Импорти файлҳои нави хати элетрони..."
 msgid "No files found for import."
 msgstr ""
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Импорт кардани хатҳои электрони аз %1 тамом шуд"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Бе қобилияти дар кушодан %1,партофтан"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -99,147 +154,52 @@ msgid ""
 "_n: 1 duplicate message not imported\n"
 "%n duplicate messages not imported"
 msgstr ""
-"Дар вақте,ки илова кардани хабар ба папкаи %1дар KMail бударо, нусха намудани "
-"хабари хатто"
-
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Бе қобилияти дар кушодан %1,партофтан"
+"Дар вақте,ки илова кардани хабар ба папкаи %1дар KMail бударо, нусха "
+"намудани хабари хатто"
 
-#: filter_evolution.cxx:31
+#: filter_evolution_v2.cxx:29
 #, fuzzy
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
 msgstr "Импорт Evolution почтаҳо ва Структураи Папка"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 #, fuzzy
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
 "<p>Базаи директорияи почтаҳои Evolution-ро интихоб кунед (Одатан /evolution/ "
-"таҳҷои ).</p> "
-"<p> Мисли пештара номумкин аз сари нав сохтани структураи папкаро,ин мешавад "
-"\"таркиб ёфтааст\"дар номи папка тавлид ёфтан."
-"<p> "
+"таҳҷои ).</p> <p> Мисли пештара номумкин аз сари нав сохтани структураи "
+"папкаро,ин мешавад \"таркиб ёфтааст\"дар номи папка тавлид ёфтан.<p> "
 "<p>Масалан ,агар шумо дар папкаи\"foo\"дар Еvolution доред,бо \"bar\" папкаи "
-"дар таг буда ,ду папка дар KMail сохта мешаванд :\"foo\"ва\"foo-bar\""
-"<p> "
+"дар таг буда ,ду папка дар KMail сохта мешаванд :\"foo\"ва\"foo-bar\"<p> "
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Импорт кардани хатҳои электрони аз %1 тамом шуд"
-
-#: filter_kmail_archive.cxx:24
-msgid "Import KMail Archive File"
-msgstr ""
-
-#: filter_kmail_archive.cxx:26
-msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Импорти Феҳристҳо аз Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-#, fuzzy
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
 msgstr ""
-"<p> Pegasus-Mail директорияро дар систематон истифода баред(аз файлҳои CNM, PMM "
-"ва MBX иборат аст).Дар бисёри системаҳо ин дар C:\\PMail\\почта</p> "
-"<p><b>Қайд кунед:Ин импорт филтер  папкаи шуморо ворид мекунад аммо структураи "
-"папкаро не.Аммо шумо мумкин ,ки инро як бор мекунед. "
-"<p> "
-"<p><b>Қайд : Email-ҳо дар папкаи бо префикс pmail ворид мешавад-</p>"
 
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
 msgstr ""
 
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Импорти файлҳои навъи хатҳои электрони ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Импорти феҳриҳои почта ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Импорти феҳриҳои почтаи UNIX ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Импорти %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Хабар %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
+#: filter_kmail_archive.cxx:24
+msgid "Import KMail Archive File"
 msgstr ""
 
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Навистаги %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-#, fuzzy
-msgid "Import Lotus Notes Emails"
-msgstr "Импорт кардани хатҳои Outlook Express "
-
-#: filter_lnotes.cxx:32
-#, fuzzy
+#: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>mbox филтери ворид карда шуда</b></p> "
-"<p>Ин филтер  файлҳои mbox-ро ба KMail ворид мекунад.Ин филтерро истифода баред "
-",агар ба шумо маъқул шавад почтаҳои аз Ximian Evolution ворид кунед ё дигар "
-"почтаҳои,ки анъанави UNIX форматро истифода мебаранд онҳо аз MBOX-и префикс "
-"карда шуда омаданд"
-
-#: filter_lnotes.cxx:55
-#, fuzzy
-msgid "All Files (*)"
-msgstr "Файлҳои mbox (*)"
-
-#: filter_lnotes.cxx:64
-#, fuzzy, c-format
-msgid "Importing emails from %1"
-msgstr "Импорт кардани хатҳои электрони аз %1..."
 
 #: filter_kmail_maildir.cxx:26
 #, fuzzy
@@ -248,21 +208,13 @@ msgstr "Импорт Evolution почтаҳо ва Структураи Папк
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
@@ -277,193 +229,41 @@ msgstr "Импорт кардани хатҳои электрони аз %1..."
 msgid "Could not import %1"
 msgstr "Импорт карда нашуд %1"
 
-#: filter_thunderbird.cxx:28
-#, fuzzy
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Импорт Evolution почтаҳо ва Структураи Папка"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr ""
-
-#: filter_opera.cxx:28
+#: filter_lnotes.cxx:30
 #, fuzzy
-msgid "Import Opera Emails"
+msgid "Import Lotus Notes Emails"
 msgstr "Импорт кардани хатҳои Outlook Express "
 
-#: filter_opera.cxx:30
-#, fuzzy
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>mbox филтери ворид карда шуда</b></p> "
-"<p>Ин филтер  файлҳои mbox-ро ба KMail ворид мекунад.Ин филтерро истифода баред "
-",агар ба шумо маъқул шавад почтаҳои аз Ximian Evolution ворид кунед ё дигар "
-"почтаҳои,ки анъанави UNIX форматро истифода мебаранд онҳо аз MBOX-и префикс "
-"карда шуда омаданд"
-
-#: filter_evolution_v2.cxx:29
-#, fuzzy
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Импорт Evolution почтаҳо ва Структураи Папка"
-
-#: filter_evolution_v2.cxx:31
+#: filter_lnotes.cxx:32
 #, fuzzy
 msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p>Базаи директорияи почтаҳои Evolution-ро интихоб кунед (Одатан /evolution/ "
-"таҳҷои ).</p> "
-"<p> Мисли пештара номумкин аз сари нав сохтани структураи папкаро,ин мешавад "
-"\"таркиб ёфтааст\"дар номи папка тавлид ёфтан."
-"<p> "
-"<p>Масалан ,агар шумо дар папкаи\"foo\"дар Еvolution доред,бо \"bar\" папкаи "
-"дар таг буда ,ду папка дар KMail сохта мешаванд :\"foo\"ва\"foo-bar\""
-"<p> "
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Аз:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Ба:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Давомӣ:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, fuzzy, no-c-format
-msgid "Importing in progress..."
-msgstr "Импорт рафта истодааст"
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Ҳамагӣ:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, fuzzy, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Барои боз импорти номаҳо ё контактҳо тугмаи қафоро паҳш кунед"
-
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
-msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
-msgstr ""
-"<b>Марҳамат ба KMailCVT - KMail импорти хабарҳо</b>\n"
-"<br>"
-"<br>\n"
-"Ин программа барои фиристонидани хатҳои шумо аз программаи пештара ба KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" ёри мерасонад  Прграммаеро ки шумо фиристонидан мехоҳед интихоб кунед ва "
-"тугмаи 'пешро' пахш кунед"
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
+"<p><b>mbox филтери ворид карда шуда</b></p> <p>Ин филтер  файлҳои mbox-ро ба "
+"KMail ворид мекунад.Ин филтерро истифода баред ,агар ба шумо маъқул шавад "
+"почтаҳои аз Ximian Evolution ворид кунед ё дигар почтаҳои,ки анъанави UNIX "
+"форматро истифода мебаранд онҳо аз MBOX-и префикс карда шуда омаданд"
 
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Филтерҳои импорти KMail"
-
-#: main.cpp:35
+#: filter_lnotes.cxx:55
 #, fuzzy
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2003, The KMailCVT developers"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Муаллифи ибтидоӣ"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr ""
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Нави GUT & тозаги"
+msgid "All Files (*)"
+msgstr "Файлҳои mbox (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr ""
-"* НПО \"Имкониятҳои ҷавонон\" * Tajik Linux Users Group * Young Ladies Tajik "
-"Linux Users Group * http://www.khujand.org * http://www.tajikngo.org * "
-"http://www.yo-tj.org * Роҷер Ковакс, Виктор Ибрагимов, Марина Колючева, Евгения "
-"Фатхеева, Акмал Ватаншоев, Абророва Хиромон, Акмал Саломов, Акбар Ватаншоев, "
-"Фарход Ахмедов, Эркин Пулатов, Гулшод Довуди, Гулноз Курбанова, Зарина "
-"Косымова, Шухрат Лоиқов, Сурайё Ҷурахонова *"
+#: filter_lnotes.cxx:64
+#, fuzzy, c-format
+msgid "Importing emails from %1"
+msgstr "Импорт кардани хатҳои электрони аз %1..."
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr ""
-"rkovacs@khujand.org, youth_opportunities@tajikngo.org, MarinaKL@tajikngo.org"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Хабар %1"
 
 #: filter_mailapp.cxx:32
 #, fuzzy
@@ -472,8 +272,8 @@ msgstr "Импорти Феҳристҳо аз Pegasus-Mail"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
@@ -482,28 +282,29 @@ msgid ""
 "_n: 1 duplicate message not imported to folder %1 in KMail\n"
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr ""
-"Дар вақте,ки илова кардани хабар ба папкаи %1дар KMail бударо, нусха намудани "
-"хабари хатто"
+"Дар вақте,ки илова кардани хабар ба папкаи %1дар KMail бударо, нусха "
+"намудани хабари хатто"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Импорти KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Қадами 1: интихоби Филтер"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Қадами 2 : Импорт кардан"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Импорти файлҳои mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Импорт рафта истодааст"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox филтери ворид карда шуда</b></p> <p>Ин филтер  файлҳои mbox-ро ба "
+"KMail ворид мекунад.Ин филтерро истифода баред ,агар ба шумо маъқул шавад "
+"почтаҳои аз Ximian Evolution ворид кунед ё дигар почтаҳои,ки анъанави UNIX "
+"форматро истифода мебаранд онҳо аз MBOX-и префикс карда шуда омаданд"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Импорт тамом шуд"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "Файлҳои mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -512,24 +313,20 @@ msgstr "Импорт кардани хатҳои Outlook Express "
 #: filter_oe.cxx:42
 #, fuzzy
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 филтери </b></p>ворид карда шуда "
-"<p>Ба шумо лозим аст,ки ҷойгир намудани папкаи ,ки дар қуттии почтавии,ки  "
-"барои  кофтуковии.dbx ё mbx дар таги файл "
-"<ul> "
-"<li> <i>C:\\Windows\\Aplication Data</i> дар Windows 9x Документҳо вa           "
-"дар Windows 2000 ё баъдтар </ul></p>"
-"<p><b>Кайд кунед:</b>E-mail-ҳоро дар папкаҳои ,ки номгузори карда шуданд,ки аз "
-"ОЕ-</p> префикс мебошанд,ворид мекунем."
+"<p><b>Outlook Express 4/5/6 филтери </b></p>ворид карда шуда <p>Ба шумо "
+"лозим аст,ки ҷойгир намудани папкаи ,ки дар қуттии почтавии,ки  барои  "
+"кофтуковии.dbx ё mbx дар таги файл <ul> <li> <i>C:\\Windows\\Aplication "
+"Data</i> дар Windows 9x Документҳо вa           дар Windows 2000 ё баъдтар </"
+"ul></p><p><b>Кайд кунед:</b>E-mail-ҳоро дар папкаҳои ,ки номгузори карда "
+"шуданд,ки аз ОЕ-</p> префикс мебошанд,ворид мекунем."
 
 #: filter_oe.cxx:67
 #, c-format
@@ -565,6 +362,134 @@ msgstr "Импорти OE5+ қуттии почта %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ПАПКА файл %1-ро аҳмият надиҳед"
 
+#: filter_opera.cxx:28
+#, fuzzy
+msgid "Import Opera Emails"
+msgstr "Импорт кардани хатҳои Outlook Express "
+
+#: filter_opera.cxx:30
+#, fuzzy
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>mbox филтери ворид карда шуда</b></p> <p>Ин филтер  файлҳои mbox-ро ба "
+"KMail ворид мекунад.Ин филтерро истифода баред ,агар ба шумо маъқул шавад "
+"почтаҳои аз Ximian Evolution ворид кунед ё дигар почтаҳои,ки анъанави UNIX "
+"форматро истифода мебаранд онҳо аз MBOX-и префикс карда шуда омаданд"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Ҳисоб кардани файлҳо..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Импорти файлҳои нави хати элетрони..."
+
+#: filter_outlook.cxx:28
+#, fuzzy
+msgid "Import Outlook Emails"
+msgstr "Импорт кардани хатҳои Outlook Express "
+
+#: filter_outlook.cxx:30
+#, fuzzy
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Outlook Express 4/5/6 филтери </b></p>ворид карда шуда <p>Ба шумо "
+"лозим аст,ки ҷойгир намудани папкаи ,ки дар қуттии почтавии,ки  барои  "
+"кофтуковии.dbx ё mbx дар таги файл <ul> <li> <i>C:\\Windows\\Aplication "
+"Data</i> дар Windows 9x Документҳо вa           дар Windows 2000 ё баъдтар </"
+"ul></p><p><b>Кайд кунед:</b>E-mail-ҳоро дар папкаҳои ,ки номгузори карда "
+"шуданд,ки аз ОЕ-</p> префикс мебошанд,ворид мекунем."
+
+#: filter_outlook.cxx:46
+#, fuzzy
+msgid "Counting mail..."
+msgstr "Ҳисоб кардани файлҳо..."
+
+#: filter_outlook.cxx:47
+#, fuzzy
+msgid "Counting directories..."
+msgstr "Ҳисоб кардани файлҳо..."
+
+#: filter_outlook.cxx:48
+#, fuzzy
+msgid "Counting folders..."
+msgstr "Ҳисоб кардани файлҳо..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "E-mail-ҳои аз PLAIN TEXT ворид карда шуда"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>  Директорияи ки аз e- mail-ҳо иборат аст дар систематон интихоб кунед.Е-"
+"mail-ҳо дар папкаи ,бо ҳамон номе ,ки дар директория буд ҷойгиранд, аз "
+"тарафи PLAIN  префикс шудааст.<p> Ин филтр e-mail-ҳои ки аз папкаҳои ,msg,"
+"eml,ва txt ворид мекунад .<p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Импорти Феҳристҳо аз Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+#, fuzzy
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p> Pegasus-Mail директорияро дар систематон истифода баред(аз файлҳои CNM, "
+"PMM ва MBX иборат аст).Дар бисёри системаҳо ин дар C:\\PMail\\почта</p> "
+"<p><b>Қайд кунед:Ин импорт филтер  папкаи шуморо ворид мекунад аммо "
+"структураи папкаро не.Аммо шумо мумкин ,ки инро як бор мекунед. <p> "
+"<p><b>Қайд : Email-ҳо дар папкаи бо префикс pmail ворид мешавад-</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Импорти файлҳои навъи хатҳои электрони ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Импорти феҳриҳои почта ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Импорти феҳриҳои почтаи UNIX ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Импорти %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr ""
+
 #: filter_sylpheed.cxx:27
 #, fuzzy
 msgid "Import Sylpheed Maildirs and Folder Structure"
@@ -573,29 +498,55 @@ msgstr "Импорт Evolution почтаҳо ва Структураи Папк
 #: filter_sylpheed.cxx:29
 #, fuzzy
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 msgstr ""
 "<p>Базаи директорияи почтаҳои Evolution-ро интихоб кунед (Одатан /evolution/ "
-"таҳҷои ).</p> "
-"<p> Мисли пештара номумкин аз сари нав сохтани структураи папкаро,ин мешавад "
-"\"таркиб ёфтааст\"дар номи папка тавлид ёфтан."
-"<p> "
+"таҳҷои ).</p> <p> Мисли пештара номумкин аз сари нав сохтани структураи "
+"папкаро,ин мешавад \"таркиб ёфтааст\"дар номи папка тавлид ёфтан.<p> "
 "<p>Масалан ,агар шумо дар папкаи\"foo\"дар Еvolution доред,бо \"bar\" папкаи "
-"дар таг буда ,ду папка дар KMail сохта мешаванд :\"foo\"ва\"foo-bar\""
-"<p> "
+"дар таг буда ,ду папка дар KMail сохта мешаванд :\"foo\"ва\"foo-bar\"<p> "
+
+#: filter_thebat.cxx:33
+#, fuzzy
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Импорт Evolution почтаҳо ва Структураи Папка"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+
+#: filter_thunderbird.cxx:28
+#, fuzzy
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Импорт Evolution почтаҳо ва Структураи Папка"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
-"<b>Хатогии дағал:</b> кушодани KMail барои алоқа бо DCOP. Бинед ки программаи "
-"<i>kmail</i> доред."
+"<b>Хатогии дағал:</b> кушодани KMail барои алоқа бо DCOP. Бинед ки "
+"программаи <i>kmail</i> доред."
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -609,58 +560,58 @@ msgstr "Хабар ба феҳристи %1 гузошта намешавад д
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Хатоги дар вақти гузоштани хабар ба феҳристи %1 дар KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "E-mail-ҳои аз PLAIN TEXT ворид карда шуда"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Аз:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>  Директорияи ки аз e- mail-ҳо иборат аст дар систематон интихоб "
-"кунед.Е-mail-ҳо дар папкаи ,бо ҳамон номе ,ки дар директория буд ҷойгиранд, аз "
-"тарафи PLAIN  префикс шудааст."
-"<p> Ин филтр e-mail-ҳои ки аз папкаҳои ,msg,eml,ва txt ворид мекунад ."
-"<p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Ба:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Импорти файлҳои mbox (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Давомӣ:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>mbox филтери ворид карда шуда</b></p> "
-"<p>Ин филтер  файлҳои mbox-ро ба KMail ворид мекунад.Ин филтерро истифода баред "
-",агар ба шумо маъқул шавад почтаҳои аз Ximian Evolution ворид кунед ё дигар "
-"почтаҳои,ки анъанави UNIX форматро истифода мебаранд онҳо аз MBOX-и префикс "
-"карда шуда омаданд"
+#: kimportpagedlg.ui:115
+#, fuzzy, no-c-format
+msgid "Importing in progress..."
+msgstr "Импорт рафта истодааст"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "Файлҳои mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-#, fuzzy
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Импорт Evolution почтаҳо ва Структураи Папка"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Ҳамагӣ:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, fuzzy, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Барои боз импорти номаҳо ё контактҳо тугмаи қафоро паҳш кунед"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>Марҳамат ба KMailCVT - KMail импорти хабарҳо</b>\n"
+"<br><br>\n"
+"Ин программа барои фиристонидани хатҳои шумо аз программаи пештара ба KMail."
+"<br><br><br><br>\n"
+" ёри мерасонад  Прграммаеро ки шумо фиристонидан мехоҳед интихоб кунед ва "
+"тугмаи 'пешро' пахш кунед"
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
 msgstr ""
diff --git a/tde-i18n-th/messages/tdepim/kmailcvt.po b/tde-i18n-th/messages/tdepim/kmailcvt.po
index aa1e3736e30..432cdba173b 100644
--- a/tde-i18n-th/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-th/messages/tdepim/kmailcvt.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-11-10 19:45+1100\n"
 "Last-Translator: Sahachart Anukulkitch <drrider@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
@@ -16,26 +16,81 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "นำเข้าอีเมลของ Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "ถนอมทรัพย์ นพบูรณ์,สหชาติ อนุกูลกิจ"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "donga_n@yahoo.com,drrider@gmail.com"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "เครื่องมือสำหรับนำเข้า KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "ขั้นที่ 1: เลือกตัวกรอง"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "ขั้นที่ 2: กำลังนำเข้า..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "การนำเข้ากำลังดำเนินการอยู่"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "การนำเข้าเสร็จสิ้น"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>ถูกเขียนโดย %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "ตัวกรองสำหรับนำเข้าอีเมลของโปรแกรม KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "สงวนลิขสิทธิ์ (c) 2000-2005, ผู้พัฒนา The KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "ผู้เขียนดั้งเดิม"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "ผู้ดูแล & ตัวกรองใหม่ๆ"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "ส่วนติดต่อผู้ใช้แบบกราฟิกส์แบบใหม่ & ทำความสะอาด"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "นำเข้าจดหมายในเครื่องและโครงสร้างโฟลเดอร์ของ Evolution 1.x"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>ตัวกรองการนำเข้าอีเมลจาก Outlook</b></p>"
-"<p>ตัวกรองนี้จะทำการนำเข้าอีเมลจากแฟ้ม pst ของโปรแกรม Outlook "
-"คุณจำเป็นต้องระบุที่ตั้งของโฟลเดอร์ที่เก็บแฟ้ม pst อยู่ โดยการหาแฟ้ม .pst ที่: "
-"<i>C:\\Documents and Settings</i> ใน Windows 2000 หรือรุ่นหลังจากนี้</p>"
-"<p><b>ข้อสังเกต:</b> "
-"อีเมลจะถูกนำเข้าไปยังโฟลเดอร์ที่มีชื่อเดียวกันกับบัญชีที่มา แล้วนำหน้าด้วย "
-"OUTLOOK-</p>"
+"<p><b>ตัวกรองการนำเข้าจาก Evolution 1.x</b></p> <p>เลือกไดเร็คทอรีหลักของจดหมายของ "
+"Evolution (ตามปกติจะอยู่ที่ ~/evolution/local)</p> "
+"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ขึ้นมาใหม่ ดังนั้นโฟลเดอร์ต่างๆ "
+"จะถูกเก็บไว้ที่: \"Evolution-Import\"</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -45,27 +100,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "ยังไม่ได้เลือกไดเร็กทอรี"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "กำลังนับแฟ้ม..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "กำลังนับอีเมล..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "กำลังนับไดเร็คทอรี..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "กำลังนับโฟลเดอร์..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "กำลังนำเข้าแฟ้มจดหมายใหม่..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -73,6 +107,22 @@ msgstr "กำลังนำเข้าแฟ้มจดหมายใหม
 msgid "No files found for import."
 msgstr "ไม่พบแฟ้มสำหรับจะทำการนำเข้า"
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "การนำเข้าอีเมลจาก %1 เสร็จสิ้น"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "ไม่สามารถเปิด %1 ได้, กำลังข้ามไป"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -88,39 +138,37 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "ข้อความซ้ำ %n ข้อความ ไม่ได้ถูกนำเข้า"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "ไม่สามารถเปิด %1 ได้, กำลังข้ามไป"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "นำเข้าจดหมายในเครื่องและโครงสร้างโฟลเดอร์ของ Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "นำเข้าเมลบนเครื่องและโครงสร้างโฟลเดอร์ของ Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>ตัวกรองการนำเข้าจาก Evolution 1.x</b></p> "
-"<p>เลือกไดเร็คทอรีหลักของจดหมายของ Evolution (ตามปกติจะอยู่ที่ "
-"~/evolution/local)</p> "
-"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ขึ้นมาใหม่ "
-"ดังนั้นโฟลเดอร์ต่างๆ จะถูกเก็บไว้ที่: \"Evolution-Import\"</p>"
+"<p><b>ตัวกรองการนำเข้า Evolution 2.x</b></p> "
+"<p>เลือกไดเร็คทอรีหลักของโฟลเดอร์เก็บอีเมลในโปรแกรม Evolution ของคุณ (ตามปกติคือ ~/."
+"evolution/mail/local)</p> <p><b>ข้อสังเกต:</b> อย่าเลือกโฟบเดอร์ืั้ <u>ไม่มี</u> แฟ้ม "
+"mbox อยู่ (ตัวอย่างเช่น maildir) หากคุณทำแบบนั้น คุณจะมีโฟลเดอร์ใหม่มากมาย</p> "
+"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่ ดังนั้นโฟลเดอร์ต่างๆ "
+"จะจะถูกเก็บไว้ที่ \"Evolution-Import\"</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "การนำเข้าอีเมลจาก %1 เสร็จสิ้น"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "การนำเข้าเสร็จสิ้น, ถูกยกเลิกโดยผู้ใช้"
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "เริ่มนำเข้าแฟ้ม %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -128,100 +176,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "นำเข้าโฟลเดอร์จาก Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>เลือกไดเร็คทอรีของ Pegasus-Mail บนระบบของคุณ (ต้องมีแฟ้ม *.CNM, *.PMM และ "
-"*.MBX อยู่) บนระบบส่วนมาก จะเก็บเอาไว้ที่ C:\\pmail\\mail หรือ "
-"C:\\pmail\\mail\\admin</p> "
-"<p><b>ข้อสังเกต:</b> "
-"เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างของโฟลเดอร์ใหม่ "
-"ดังนั้นโฟลเดอร์ต่างๆ จะถูกเก็บไว้ที่: \"PegasusMail-Import\"</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"ไม่สามารถวิเคราะห์โครงสร้างของโฟลเดอร์ได้; "
-"ทำการนำเข้าต่อไปโดยไม่มีการรองรับโฟลเดอร์ย่อย"
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "กำลังนำเข้าแฟ้มจดหมายใหม่ ('.cnm') ..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "กำลังนำเข้าโฟลเดอร์จดหมาย ('.pmm') ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "กำลังนำเข้าโฟลเดอร์จดหมายของ 'UNIX' ('.mbx') ..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "กำลังนำเข้า %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "ข้อความ %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "กำลังวิเคราะห์โครงสร้างโฟลเดอร์..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>ถูกเขียนโดย %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "นำเข้าอีเมลของ Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>ตัวกรองการนำเข้าอีเมลข้อความในโครงสร้างของ Lotus Notes</b></p>"
-"<p>ตัวกรองนี้จะทำการนำเข้าแฟ้มข้อความที่มีโครงสร้างแบบที่ถูกส่งออกมาจาก Lotus "
-"Notes เข้ามาใน KMail. ใช้ตัวกรองนี้หากว่าคุณต้องการที่จะนำเข้าอีเมลจาก Lotus "
-"หรือโปรแกรมอีเมลอื่นที่ใช้รูปแบบข้อความโครงสร้างแบบ Lotus Notes</p>"
-"<p><b>ข้อสังเกต:</b> "
-"เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ขึ้นมาใหม่ "
-"ข้อความที่ถูกนำเข้ามาจะถูกเก็บเอาไว้ที่โฟลเดอร์ย่อยr: \"LNotes-Import\", "
-"ในโฟลเดอร์ ในเครื่องของคุณโดยใช้ชื่อของแฟ้มที่ข้อความนั้นมาจาก</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "แฟ้มทั้งหมด(*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "กำลังนำเข้าอีเมลจาก %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -229,31 +187,21 @@ msgstr "นำเข้าไดเร็คทอรีเก็บอีเม
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>ตัวกรองการนำเข้า KMail</b></p> "
-"<p>เลือกไดเร็คทอรีหลักของโฟลเดอร์เก็บอีเมลของ KMail ที่คุณต้องการจะนำเข้า</p> "
-"<p><b>ข้อสังเกต:</b></p> อย่าเลือกไดเร็คทอรีเก็บอีเมลที่กำลังใช้อยู่ในปัจจุบัน "
-"(ตามปกติคือ ~/Mail หรือ ~/.trinity/share/apps/kmail/mail): ในกรณีนี้ KMailCVT "
-"จะติดอยู่ใน ลูปไม่รู้จบ</p> "
+"<p><b>ตัวกรองการนำเข้า KMail</b></p> <p>เลือกไดเร็คทอรีหลักของโฟลเดอร์เก็บอีเมลของ "
+"KMail ที่คุณต้องการจะนำเข้า</p> <p><b>ข้อสังเกต:</b></p> "
+"อย่าเลือกไดเร็คทอรีเก็บอีเมลที่กำลังใช้อยู่ในปัจจุบัน (ตามปกติคือ ~/Mail หรือ ~/.trinity/share/"
+"apps/kmail/mail): ในกรณีนี้ KMailCVT จะติดอยู่ใน ลูปไม่รู้จบ</p> "
 "<p>ตัวกรองนี้จะไม่ทำการนำเข้าโฟลเดอร์เก็บอีเมลของ KMail ที่มีแฟ้ม mbox</p> "
-"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ขึ้นมาใหม่ "
-"ดังนั้นโฟลเดอร์ต่างๆ จะถูกเก็บไว้ที่: \"KMail-Import\" "
-"ในโฟลเดอร์บนเครื่องของคุณ"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "การนำเข้าเสร็จสิ้น, ถูกยกเลิกโดยผู้ใช้"
+"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ขึ้นมาใหม่ ดังนั้นโฟลเดอร์ต่างๆ "
+"จะถูกเก็บไว้ที่: \"KMail-Import\" ในโฟลเดอร์บนเครื่องของคุณ"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -266,191 +214,41 @@ msgstr "กำลังนำเข้าโฟลเดอร์ %1..."
 msgid "Could not import %1"
 msgstr "ไม่สามารถนำเข้า %1 ได้"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "นำเข้าจดหมายบนเครื่องและโครงสร้างโฟลเดอร์ของ Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>ตัวกรองการนำเข้า Thunderbird/Mozilla</b></p> "
-"<p>เลือกโฟลเดอร์เก็บจดหมายหลักในโปรแกรม Thunderbird/Mozilla ของคุณ (ตามปกติคือ "
-"~/.thunderbird/*.default/Mail/Local Folders/)</p> "
-"<p><b>ข้อสังเกต:</b> อย่าเลือกโฟลเดอร์ที่ <u>ไม่ได้</u> "
-"มีแฟ้ม mbox-file (ตัวอย่างเช่น maildir): หากคุณทำแบบนั้น "
-"คุณจะได้โฟลเดอร์ใหม่มามากมาย</p> "
-"<p>เพราะว่ามีความเป็นไปได้ในการสาร้างโครงสร้างโฟลเดอร์ใหม่ ดังนั้นโฟลเดอร์ต่างๆ "
-"จะถูกเก็บไว้ที่: \"Thunderbird-Import\"</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "เริ่มนำเข้าแฟ้ม %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "นำเข้าอีเมลจากโอเปร่า"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>ตัวกรองการนำเข้าอีเมลจากโอเปร่า</b></p> "
-"<p>ตัวกรองนี้จะทำการนำเข้าอีเมลจากโฟลเดอร์เก็บอีเมลของโอเปร่า ให้ใช้ตัวกรองนี้ "
-"หากคุณต้องการที่จะนำเข้าอีเมลทั้งหมดภายในบัญชีผู้ใช้ "
-"ในไดเร็คทอรีเก็บอีเมลของโอเปร่า</p> "
-"<p>เลือกไดเร็คทอรีของบัญชีผู้ใช้ (ตามปกติคือ ~/.opera/mail/store/account*)</p> "
-"<p><b>ข้อสังเกต:</b> "
-"อีเมลจะถูกนำเข้าสูโฟลเดอร์ที่ชื่อเหมือนกับบัญชีผู้ใช้ที่นำเข้ามา โดยจะมี OPERA- "
-"นำหน้าอยู่</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "นำเข้าเมลบนเครื่องและโครงสร้างโฟลเดอร์ของ Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>ตัวกรองการนำเข้า Evolution 2.x</b></p> "
-"<p>เลือกไดเร็คทอรีหลักของโฟลเดอร์เก็บอีเมลในโปรแกรม Evolution ของคุณ "
-"(ตามปกติคือ ~/.evolution/mail/local)</p> "
-"<p><b>ข้อสังเกต:</b> อย่าเลือกโฟบเดอร์ืั้ <u>ไม่มี</u> "
-"แฟ้ม mbox อยู่ (ตัวอย่างเช่น maildir) หากคุณทำแบบนั้น "
-"คุณจะมีโฟลเดอร์ใหม่มากมาย</p> "
-"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่ "
-"ดังนั้นโฟลเดอร์ต่างๆ จะจะถูกเก็บไว้ที่ \"Evolution-Import\"</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "จาก:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "ถึง:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "ปัจจุบัน:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "การนำเข้ากำลังดำเนินการอยู่..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "ทั้งหมด:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "คลิกที่ 'กลับไป' เพื่อทำการนำเข้าอีเมลหรือรายชื่อติดต่ออื่นๆ"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "นำเข้าอีเมลของ Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>ยินดีต้อนรับสู่ KMailCVT - เครื่องมือนำเข้าอีเมลของ KMail</b>\n"
-"<br>"
-"<br>\n"
-"โปรแกรมนี้จะช่วยให้คุณนำเข้าอีเมลของคุณจากโปรแกรมรับ-ส่งอีเมลที่คุณใช้มาก่อน "
-"เข้ามาใน KMail"
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" โปรดเลือกโปรแกรมที่คุณต้องการจะทำการนำเข้า หลังจากนั้นให้คลิกที่ 'ถัดไป'"
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "&ลบข้อความที่ซ้ำกันออกไประหว่างการนำเข้า"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "ตัวกรองสำหรับนำเข้าอีเมลของโปรแกรม KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "สงวนลิขสิทธิ์ (c) 2000-2005, ผู้พัฒนา The KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "ผู้เขียนดั้งเดิม"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "ผู้ดูแล & ตัวกรองใหม่ๆ"
+"<p><b>ตัวกรองการนำเข้าอีเมลข้อความในโครงสร้างของ Lotus Notes</b></"
+"p><p>ตัวกรองนี้จะทำการนำเข้าแฟ้มข้อความที่มีโครงสร้างแบบที่ถูกส่งออกมาจาก Lotus Notes "
+"เข้ามาใน KMail. ใช้ตัวกรองนี้หากว่าคุณต้องการที่จะนำเข้าอีเมลจาก Lotus "
+"หรือโปรแกรมอีเมลอื่นที่ใช้รูปแบบข้อความโครงสร้างแบบ Lotus Notes</p><p><b>ข้อสังเกต:</b> "
+"เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ขึ้นมาใหม่ "
+"ข้อความที่ถูกนำเข้ามาจะถูกเก็บเอาไว้ที่โฟลเดอร์ย่อยr: \"LNotes-Import\", ในโฟลเดอร์ "
+"ในเครื่องของคุณโดยใช้ชื่อของแฟ้มที่ข้อความนั้นมาจาก</p>"
 
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "ส่วนติดต่อผู้ใช้แบบกราฟิกส์แบบใหม่ & ทำความสะอาด"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "แฟ้มทั้งหมด(*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "ถนอมทรัพย์ นพบูรณ์,สหชาติ อนุกูลกิจ"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "กำลังนำเข้าอีเมลจาก %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "donga_n@yahoo.com,drrider@gmail.com"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "ข้อความ %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -458,8 +256,8 @@ msgstr "นำเข้าจากโปรแกรม Mail ใน OS X"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
 "<p><b>ตัวกรองการนำเข้าจากโปรแกรม Mail ใน OS X</b></p> "
 "<p>ตัวกรองนี้จะทำการนำเข้าอีเมลจากโปรแกรม Mail ใน Mac OS X ของแอปเปิล</p>"
@@ -471,25 +269,26 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "ข้อความที่ซ้ำ %n ข้อความ จะไม่ถูกนำเข้าไปยังโฟลเดอร์ใน KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "เครื่องมือสำหรับนำเข้า KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "ขั้นที่ 1: เลือกตัวกรอง"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "ขั้นที่ 2: กำลังนำเข้า..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "นำเข้าแฟ้ม mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "การนำเข้ากำลังดำเนินการอยู่"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>ตัวกรองการนำเข้า mbox</b></p> <p>ตัวกรองนี้จะทำการนำเข้าแฟ้ม mbox เข้ามาใน "
+"KMail ใช้ตัวกรองนี้หากคุณต้องการ ที่จะนำเข้าอีเมลจาก Ximian Evolution หรือโปรแกรมรับ-"
+"ส่งเมลอื่นๆ ที่ใช้รูปแบบ ดั้งเดิมของ UNIX </p> <p><b>ข้อสังเกต</"
+"b>อีเมลจะถูกนำเข้าสู่โฟลเดอร์ที่มีชื่อตามแฟ้มที่มา แล้วนำหน้าด้วย MBOX- </p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "การนำเข้าเสร็จสิ้น"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "แฟ้ม mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -497,25 +296,20 @@ msgstr "นำเข้าอีเมล Outlook Express "
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>ตัวกรองการนำเข้า Outlook Express 4/5/6</b></p>"
-"<p>คุณจำเป็นต้องทำการระบุโฟลเดอร์ที่เก็บกล่องจดหมายอยู่ โดยการค้นหาแฟ้มประเภท "
-".dbx หรือ .mbx จากใน"
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> ใน Windows 9x"
-"<li><i>Documents and Settings</i> ใน Windows 2000 หรือรุ่นหลังจากนี้</ul></p>"
-"<p><b>ข้อสังเกต:</b> "
-"เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่, โฟลเดอร์ต่างๆ จาก "
-"Outlook Express 5 และ 6 จะถูกเก็บเอาไว้ที่: \"OE-Import\" ใน "
+"<p><b>ตัวกรองการนำเข้า Outlook Express 4/5/6</b></"
+"p><p>คุณจำเป็นต้องทำการระบุโฟลเดอร์ที่เก็บกล่องจดหมายอยู่ โดยการค้นหาแฟ้มประเภท .dbx หรือ ."
+"mbx จากใน<ul><li><i>C:\\Windows\\Application Data</i> ใน Windows "
+"9x<li><i>Documents and Settings</i> ใน Windows 2000 หรือรุ่นหลังจากนี้</ul></"
+"p><p><b>ข้อสังเกต:</b> เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่, "
+"โฟลเดอร์ต่างๆ จาก Outlook Express 5 และ 6 จะถูกเก็บเอาไว้ที่: \"OE-Import\" ใน "
 "โฟลเดอร์ในเครื่องของคุณ</p>"
 
 #: filter_oe.cxx:67
@@ -551,47 +345,65 @@ msgstr "กำลังนำเข้ากล่องจดหมาย %1 �
 msgid "Importing OE5+ Folder file %1"
 msgstr "กำลังนำเข้าแฟ้มโฟลเดอร์ %1 ของ OE5+"
 
-#: filter_sylpheed.cxx:27
-msgid "Import Sylpheed Maildirs and Folder Structure"
-msgstr "นำเข้าไดเร็คทอรีจดหมาย และโครงสร้างโฟลเดอร์จาก Sylpheed"
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "นำเข้าอีเมลจากโอเปร่า"
 
-#: filter_sylpheed.cxx:29
+#: filter_opera.cxx:30
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
 msgstr ""
-"<p><b>ตัวกรองการนำเข้าจาก Sylpheed</b></p> "
-"<p>เลือกไดเร็คทอรีเก็บจดหมายหลักของ Sylpheed ที่คุณต้องการจะนำเข้า (ตามปกติคือ "
-"~/Mail )</p> "
-"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างของโฟลเดอร์ขึ้นมาใหม่ "
-"ดังนั้น โฟลเดอร์ต่างๆ จะถูกเก็บเอาไว้ที่: \"Sylpheed-Import\" "
-"ในโฟลเดอร์บนเครื่องของคุณ</p> "
-"<p>ตัวกรองนี้จะยังทำการสร้างสถานะข้อความให้ใหม่ด้วย ต.ย. ข้อความใหม่ หรือ "
-"ถูกส่งต่อ"
+"<p><b>ตัวกรองการนำเข้าอีเมลจากโอเปร่า</b></p> "
+"<p>ตัวกรองนี้จะทำการนำเข้าอีเมลจากโฟลเดอร์เก็บอีเมลของโอเปร่า ให้ใช้ตัวกรองนี้ "
+"หากคุณต้องการที่จะนำเข้าอีเมลทั้งหมดภายในบัญชีผู้ใช้ ในไดเร็คทอรีเก็บอีเมลของโอเปร่า</p> "
+"<p>เลือกไดเร็คทอรีของบัญชีผู้ใช้ (ตามปกติคือ ~/.opera/mail/store/account*)</p> "
+"<p><b>ข้อสังเกต:</b> อีเมลจะถูกนำเข้าสูโฟลเดอร์ที่ชื่อเหมือนกับบัญชีผู้ใช้ที่นำเข้ามา โดยจะมี "
+"OPERA- นำหน้าอยู่</p>"
 
-#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "กำลังนับแฟ้ม..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "กำลังนำเข้าแฟ้มจดหมายใหม่..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "นำเข้าอีเมลของ Outlook"
+
+#: filter_outlook.cxx:30
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
 msgstr ""
-"<b>ผิดพลาดรุนแรง</b>: ไม่สามารถเริ่มโปรแกรม KMail สำหรับติดต่อกับ DCOP ได้ "
-"โปรดตรวจดูว่า ได้ติดตั้ง <i>kmail</i> ไว้แล้ว"
+"<p><b>ตัวกรองการนำเข้าอีเมลจาก Outlook</b></p><p>ตัวกรองนี้จะทำการนำเข้าอีเมลจากแฟ้ม "
+"pst ของโปรแกรม Outlook คุณจำเป็นต้องระบุที่ตั้งของโฟลเดอร์ที่เก็บแฟ้ม pst อยู่ โดยการหาแฟ้ม ."
+"pst ที่: <i>C:\\Documents and Settings</i> ใน Windows 2000 หรือรุ่นหลังจากนี้</"
+"p><p><b>ข้อสังเกต:</b> อีเมลจะถูกนำเข้าไปยังโฟลเดอร์ที่มีชื่อเดียวกันกับบัญชีที่มา แล้วนำหน้าด้วย "
+"OUTLOOK-</p>"
 
-#: filters.cxx:153 filters.cxx:188
-msgid "Cannot make folder %1 in KMail"
-msgstr "ไม่สามารถสร้างโฟลเดอร์ %1 ในโปรแกรม KMail ได้"
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "กำลังนับอีเมล..."
 
-#: filters.cxx:156 filters.cxx:191
-msgid "Cannot add message to folder %1 in KMail"
-msgstr "ไม่สามารถเพิ่มข้อความเข้าไปในโฟลเดอร์ %1 ในโปรแกรม KMail ได้"
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "กำลังนับไดเร็คทอรี..."
 
-#: filters.cxx:162 filters.cxx:194
-msgid "Error while adding message to folder %1 in KMail"
-msgstr "เกิดข้อผิดพลาดขณะเพิ่มข้อความเข้าไปในโฟลเดอร์ %1 ในโปรแกรม KMail"
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "กำลังนับโฟลเดอร์..."
 
 #: filter_plain.cxx:27
 msgid "Import Plain Text Emails"
@@ -600,38 +412,76 @@ msgstr "นำเข้าจดหมายข้อความธรรมด
 #: filter_plain.cxx:29
 msgid ""
 "<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
 msgstr ""
-"<p>เลือกไดเร็คทอรีที่มีอีเมลบนระบบของคุณ "
-"แล้วอีเมลจะถูกใส่ไว้ในโฟลเดอร์ที่มีชื่อเดียวกับ ไดเร็คทอรีที่เก็บอีเมลไว้ "
-"โดยจะนำหนัาด้วย PLAIN-ฒฝยฬ "
+"<p>เลือกไดเร็คทอรีที่มีอีเมลบนระบบของคุณ แล้วอีเมลจะถูกใส่ไว้ในโฟลเดอร์ที่มีชื่อเดียวกับ "
+"ไดเร็คทอรีที่เก็บอีเมลไว้ โดยจะนำหนัาด้วย PLAIN-ฒฝยฬ "
 "<p>ตัวกรองนี้จะทำการนำเข้าอีเมลที่มีนามสกุล .msg, .eml และ .txt ทั้งหมด</p>"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "นำเข้าแฟ้ม mbox (UNIX, Evolution)"
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "นำเข้าโฟลเดอร์จาก Pegasus-Mail"
 
-#: filter_mbox.cxx:30
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>เลือกไดเร็คทอรีของ Pegasus-Mail บนระบบของคุณ (ต้องมีแฟ้ม *.CNM, *.PMM และ *.MBX "
+"อยู่) บนระบบส่วนมาก จะเก็บเอาไว้ที่ C:\\pmail\\mail หรือ C:\\pmail\\mail\\admin</p> "
+"<p><b>ข้อสังเกต:</b> เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างของโฟลเดอร์ใหม่ "
+"ดังนั้นโฟลเดอร์ต่างๆ จะถูกเก็บไว้ที่: \"PegasusMail-Import\"</p>"
+
+#: filter_pmail.cxx:69
 msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
 msgstr ""
-"<p><b>ตัวกรองการนำเข้า mbox</b></p> "
-"<p>ตัวกรองนี้จะทำการนำเข้าแฟ้ม mbox เข้ามาใน KMail ใช้ตัวกรองนี้หากคุณต้องการ "
-"ที่จะนำเข้าอีเมลจาก Ximian Evolution หรือโปรแกรมรับ-ส่งเมลอื่นๆ ที่ใช้รูปแบบ "
-"ดั้งเดิมของ UNIX </p> "
-"<p><b>ข้อสังเกต</b>อีเมลจะถูกนำเข้าสู่โฟลเดอร์ที่มีชื่อตามแฟ้มที่มา "
-"แล้วนำหน้าด้วย MBOX- </p>"
+"ไม่สามารถวิเคราะห์โครงสร้างของโฟลเดอร์ได้; ทำการนำเข้าต่อไปโดยไม่มีการรองรับโฟลเดอร์ย่อย"
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "แฟ้ม mbox (*)"
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "กำลังนำเข้าแฟ้มจดหมายใหม่ ('.cnm') ..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "กำลังนำเข้าโฟลเดอร์จดหมาย ('.pmm') ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "กำลังนำเข้าโฟลเดอร์จดหมายของ 'UNIX' ('.mbx') ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "กำลังนำเข้า %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "กำลังวิเคราะห์โครงสร้างโฟลเดอร์..."
+
+#: filter_sylpheed.cxx:27
+msgid "Import Sylpheed Maildirs and Folder Structure"
+msgstr "นำเข้าไดเร็คทอรีจดหมาย และโครงสร้างโฟลเดอร์จาก Sylpheed"
+
+#: filter_sylpheed.cxx:29
+msgid ""
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>ตัวกรองการนำเข้าจาก Sylpheed</b></p> <p>เลือกไดเร็คทอรีเก็บจดหมายหลักของ "
+"Sylpheed ที่คุณต้องการจะนำเข้า (ตามปกติคือ ~/Mail )</p> "
+"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างของโฟลเดอร์ขึ้นมาใหม่ ดังนั้น โฟลเดอร์ต่างๆ "
+"จะถูกเก็บเอาไว้ที่: \"Sylpheed-Import\" ในโฟลเดอร์บนเครื่องของคุณ</p> "
+"<p>ตัวกรองนี้จะยังทำการสร้างสถานะข้อความให้ใหม่ด้วย ต.ย. ข้อความใหม่ หรือ ถูกส่งต่อ"
 
 #: filter_thebat.cxx:33
 msgid "Import The Bat! Mails and Folder Structure"
@@ -639,18 +489,111 @@ msgstr "นำเข้าอีเมลและดครงสร้างโ
 
 #: filter_thebat.cxx:35
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
 msgstr ""
-"<p><b>ตัวกรองการนำเข้า The Bat!</b></p>"
-"<p>เลือกไดเร็คทอรีหลักของโฟลเดอร์เก็บอีเมลของ 'The Bat!'ที่คุณต้องการจะนำเข้า "
-"</p>"
-"<p><b>ข้อสังเกต:</b> ตัวกรองนี้จะทำการนำเข้าแฟ้ม *.tbb-files จากโฟลเดอร์ 'The "
-"Bat!' ต.ย.เช่น จากบัญชี POP, และไม่ใช่จากบัญชี IMAP/DIMAP</p>"
-"<p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่ โฟลเดอร์ต่างๆ "
+"<p><b>ตัวกรองการนำเข้า The Bat!</b></p><p>เลือกไดเร็คทอรีหลักของโฟลเดอร์เก็บอีเมลของ "
+"'The Bat!'ที่คุณต้องการจะนำเข้า </p><p><b>ข้อสังเกต:</b> ตัวกรองนี้จะทำการนำเข้าแฟ้ม *."
+"tbb-files จากโฟลเดอร์ 'The Bat!' ต.ย.เช่น จากบัญชี POP, และไม่ใช่จากบัญชี IMAP/"
+"DIMAP</p><p>เนื่องจากมีความเป็นไปได้ที่จะมีการสร้างโครงสร้างโฟลเดอร์ใหม่ โฟลเดอร์ต่างๆ "
 "จะถูกเก็บเอาไว้ที่: \"TheBat-Import\" ในบัญชีบนเครื่องของคุณ.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "นำเข้าจดหมายบนเครื่องและโครงสร้างโฟลเดอร์ของ Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>ตัวกรองการนำเข้า Thunderbird/Mozilla</b></p> "
+"<p>เลือกโฟลเดอร์เก็บจดหมายหลักในโปรแกรม Thunderbird/Mozilla ของคุณ (ตามปกติคือ ~/."
+"thunderbird/*.default/Mail/Local Folders/)</p> <p><b>ข้อสังเกต:</b> "
+"อย่าเลือกโฟลเดอร์ที่ <u>ไม่ได้</u> มีแฟ้ม mbox-file (ตัวอย่างเช่น maildir): หากคุณทำแบบนั้น "
+"คุณจะได้โฟลเดอร์ใหม่มามากมาย</p> "
+"<p>เพราะว่ามีความเป็นไปได้ในการสาร้างโครงสร้างโฟลเดอร์ใหม่ ดังนั้นโฟลเดอร์ต่างๆ "
+"จะถูกเก็บไว้ที่: \"Thunderbird-Import\"</p>"
+
+#: filters.cxx:145 filters.cxx:180 filters.cxx:208
+msgid ""
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b>ผิดพลาดรุนแรง</b>: ไม่สามารถเริ่มโปรแกรม KMail สำหรับติดต่อกับ DCOP ได้ โปรดตรวจดูว่า "
+"ได้ติดตั้ง <i>kmail</i> ไว้แล้ว"
+
+#: filters.cxx:153 filters.cxx:188
+msgid "Cannot make folder %1 in KMail"
+msgstr "ไม่สามารถสร้างโฟลเดอร์ %1 ในโปรแกรม KMail ได้"
+
+#: filters.cxx:156 filters.cxx:191
+msgid "Cannot add message to folder %1 in KMail"
+msgstr "ไม่สามารถเพิ่มข้อความเข้าไปในโฟลเดอร์ %1 ในโปรแกรม KMail ได้"
+
+#: filters.cxx:162 filters.cxx:194
+msgid "Error while adding message to folder %1 in KMail"
+msgstr "เกิดข้อผิดพลาดขณะเพิ่มข้อความเข้าไปในโฟลเดอร์ %1 ในโปรแกรม KMail"
+
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "จาก:"
+
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "ถึง:"
+
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "ปัจจุบัน:"
+
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "การนำเข้ากำลังดำเนินการอยู่..."
+
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
+
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "ทั้งหมด:"
+
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "คลิกที่ 'กลับไป' เพื่อทำการนำเข้าอีเมลหรือรายชื่อติดต่ออื่นๆ"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
+msgid ""
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
+msgstr ""
+"<b>ยินดีต้อนรับสู่ KMailCVT - เครื่องมือนำเข้าอีเมลของ KMail</b>\n"
+"<br><br>\n"
+"โปรแกรมนี้จะช่วยให้คุณนำเข้าอีเมลของคุณจากโปรแกรมรับ-ส่งอีเมลที่คุณใช้มาก่อน เข้ามาใน "
+"KMail<br><br><br><br>\n"
+" โปรดเลือกโปรแกรมที่คุณต้องการจะทำการนำเข้า หลังจากนั้นให้คลิกที่ 'ถัดไป'"
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "&ลบข้อความที่ซ้ำกันออกไประหว่างการนำเข้า"
diff --git a/tde-i18n-tr/messages/tdepim/kmailcvt.po b/tde-i18n-tr/messages/tdepim/kmailcvt.po
index b40eef8e987..81f9d297e71 100644
--- a/tde-i18n-tr/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-tr/messages/tdepim/kmailcvt.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2008-02-28 20:27+0200\n"
 "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
 "Language-Team: Turkish <kde-i18n-doc@lists.kde.org>\n"
@@ -22,25 +22,77 @@ msgstr ""
 "X-Generator: LoKalize 0.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Outlook E-postalarını Al"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Tolga YAMAN"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "tolgayaman@isnet.net.tr"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT Alma Aracı"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "1. Adım: Filtreyi seçin"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "2. Adım: Dosya Alınıyor..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Dosya alımı devam ediyor"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Dosya alımı tamamlandı"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>%1 tarafından yazılmıştır.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail Alma Filtreleri"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, KMailCVT geliştiricileri"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Asıl yazar"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Projeyi Yürüten & Yeni Filtreler"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Yeni Arayüz & temizlemeler"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Evolution 1.x Yerel E-postalarını ve Dizin Yapısını Al"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook e-posta alma filtresi</b></p> "
-"<p>Bu filtre iletileri bir Outlook pst dosyasından alır. Windows 2000 veya "
-"sonrasında <i>C:\\Documents and Settings</i> altında .pst uzantısını aratarak "
-"pst-dosyasının bulundugu dizinin yerini belirtmeniz gerekiyor. </p>"
-"<p><b>Not:</b>E-postalar, OUTLOOK- önekinden sonra gelen hesap isimleriyle "
-"adlandırılan dizinlere alınacaktır.</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -50,27 +102,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Hiçbir dizin seçilmedi."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Dosyalar sayılıyor..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Posta sayılıyor..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Dizinler sayılıyor..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Klasörler sayılıyor..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Yeni e-posta dosyaları alınıyor..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -78,6 +109,22 @@ msgstr "Yeni e-posta dosyaları alınıyor..."
 msgid "No files found for import."
 msgstr "Alma işlemi için dosya bulunamadı."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "%1 konumundan e-postaların alınması tamamlandı"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "%1 açılamadı, atlanıyor"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -93,34 +140,38 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "%n tekrarlanan mesaj alınmadı"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "%1 açılamadı, atlanıyor"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Evolution 1.x Yerel E-postalarını ve Dizin Yapısını Al"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Evolution 2.x Yerel E-postalarını ve Dizin Yapısını Al"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
+"<p><b>Evolution 2.x ileti alma filtresi</b></p><p>Evolution ana posta "
+"dizininizi seçin (genellikle ~/.evolution/mail/local/) dizinidir.</"
+"p><p><b>Not:</b> Mmbox-dosyalarını <u>içermeyen</u> bir dizini asla seçmeyin "
+"(örneğin bir maildir): Eğer yine de bunu yaparsanız, birçok yeni dizin "
+"oluşacaktır.</p><p> Ancak dizin yapısını yeniden oluşturmanız mümkündür. "
+"Eğer bunu yaparsanız dizinler \"Evolution-Import\" dizini altında "
+"saklanacaktır.</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "%1 konumundan e-postaların alınması tamamlandı"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "İçeriye aktarma işlemi bitti, kullanıcı tarafından iptal edildi."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "%1 dosyasını almayı başlat..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -128,115 +179,26 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Dizinleri Pegasus Mail Uygulamasından Al"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p> Sisteminizdeki Pegasus-Posta dizinini seçin (CNM, PMM ve MBX dosyalarını "
-"barındıran). Birçok sistemde bu C:\\PMail\\mail ya da  C:\\pmail\\mail\\admin "
-"dizininde saklanır.</p>"
-"<p><b>Not:</b> Ancak dizin yapısını yeniden oluşturmanız mümkündür. Eğer bunu "
-"yaparsanız dizinler \"PegasusMail-Import\" dizini altında saklanacaktır.</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Dizin yapısı ayrıştırılamadı; alt dizin desteği olmadan içeriye aktarma "
-"işleminde devam ediliyor."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Yeni e-posta dosyaları alınıyor ('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "E-posta klasörleri alınıyor ('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "'UNIX' e-posta klasörleri alınıyor ('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "%1 Alınıyor"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Mesaj %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Dizin yapısı ayrıştırılıyor..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>%1 tarafından yazılmıştır.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Lotus Notları E-postalarını Al"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Tüm Dosyalar (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "%1 konumundan e-postalar alınıyor..."
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "KMail E-Posta Dizinlerini ve Dizin Yapısını Al"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
 
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "İçeriye aktarma işlemi bitti, kullanıcı tarafından iptal edildi."
-
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
 msgstr "%1 dizinini içeriye aktar..."
@@ -248,183 +210,34 @@ msgstr "%1 dizinini içeriye aktar..."
 msgid "Could not import %1"
 msgstr "%1 alınamadı"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Thunderbird/Mozilla Yerel Postalarını ve Dizin Yapısını Al"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "%1 dosyasını almayı başlat..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Opera E-postalarını Al"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera e-posta alma filtresi</b></p> "
-"<p>Bu filtre iletileri Opera posta dizininden alacak. Opera posta dizinindeki "
-"bir hesabınızdan bütün iletileri almak istiyorsanız bu filtreyi kullanın</p> "
-"<p>Hesap dizinini seçiniz (genellikle ~/.opera/mail/store/account*).</p>"
-"<p><b>Not:</b>E-postalar, OPERA- önekinden sonra gelen hesap isimleriyle "
-"adlandırılan dizinlere alınacaktır.</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Evolution 2.x Yerel E-postalarını ve Dizin Yapısını Al"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x ileti alma filtresi</b></p>"
-"<p>Evolution ana posta dizininizi seçin (genellikle ~/.evolution/mail/local/) "
-"dizinidir.</p>"
-"<p><b>Not:</b> Mmbox-dosyalarını <u>içermeyen</u> bir dizini asla seçmeyin "
-"(örneğin bir maildir): Eğer yine de bunu yaparsanız, birçok yeni dizin "
-"oluşacaktır.</p>"
-"<p> Ancak dizin yapısını yeniden oluşturmanız mümkündür. Eğer bunu yaparsanız "
-"dizinler \"Evolution-Import\" dizini altında saklanacaktır.</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "Kimden:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "Kime:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Güncel:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "İçeriye aktarma işlemi devam ediyor..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Toplam:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr ""
-"Lütfen daha çok e-posta ya da bağlantı almak için 'Geri' düğmesine tıklayın"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Lotus Notları E-postalarını Al"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>KMailCVT - KMail Alma Aracı'na hoşgeldiniz</b>\n"
-" "
-"<br>"
-"<br>\n"
-"Bu uygulama, e-postalarınızı daha önce kullandığınız e-posta uygulamsından "
-"KMail'e almanıza yardımcı olacak."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"Lütfen dosyaları almak istediğiniz uygulamayı seçin ve 'İleri'ye tıklayın."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Alma esnasında tekrarlanan iletileri &sil"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
 
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail Alma Filtreleri"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, KMailCVT geliştiricileri"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Asıl yazar"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Projeyi Yürüten & Yeni Filtreler"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Yeni Arayüz & temizlemeler"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Tüm Dosyalar (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Tolga YAMAN"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "%1 konumundan e-postalar alınıyor..."
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "tolgayaman@isnet.net.tr"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Mesaj %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -432,11 +245,11 @@ msgstr "OS X Mail'dan Al"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X Mail Alım Filtresi</b></p>"
-"<p>Bu filtre Apple Mac OS X e-posta istemcisinden e-postaları alır.</p>"
+"<p><b>OS X Mail Alım Filtresi</b></p><p>Bu filtre Apple Mac OS X e-posta "
+"istemcisinden e-postaları alır.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -444,25 +257,27 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "%n tekrar eden mesaj KMail' deki %1 klasörüne alınamadı"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT Alma Aracı"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "1. Adım: Filtreyi seçin"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "2. Adım: Dosya Alınıyor..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "mbox Dosyalarını Al (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Dosya alımı devam ediyor"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox alma filtresi</b></p> <p>Bu filtre mbox dosyalarınızı KMail'e "
+"alacak. E-postalarınızı, Ximian Evolution ya da geleneksel UNIX biçimini "
+"kullanan diğer uygulamalardan almak için bu filtreyi kullanın.</p> <p><b>Not:"
+"</b>E-postalar, MBOX- önekinden sonra gelen dosya isimleriyle adlandırılan "
+"dizinlere alınacaktır.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Dosya alımı tamamlandı"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox Dosyaları (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -470,26 +285,22 @@ msgstr "Outlook Express E-postalarını Al"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 alım filtresi</b></p> "
-"<p>E-posta dosyalarının saklandığı dizini belirtmelisiniz. E-postaların nerede "
-"saklandığını bulmak için .dbx ya da .mbx uzantılı dosyaları aşağıdaki "
-"dizinlerde arayabilirsiniz."
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> Windows 9x sürümünde"
-"<li><i>Documents and Settings</i> Windows 2000 veya daha yukarısında."
-"<ul></p>"
-"<p></b> Ancak dizin yapısını yeniden oluşturmanız mümkündür. Eğer bunu "
-"yaparsanız dizinler \"OE-Import\" dizini altında saklanacaktır.</p>"
+"<p><b>Outlook Express 4/5/6 alım filtresi</b></p> <p>E-posta dosyalarının "
+"saklandığı dizini belirtmelisiniz. E-postaların nerede saklandığını bulmak "
+"için .dbx ya da .mbx uzantılı dosyaları aşağıdaki dizinlerde arayabilirsiniz."
+"<ul><li><i>C:\\Windows\\Application Data</i> Windows 9x "
+"sürümünde<li><i>Documents and Settings</i> Windows 2000 veya daha "
+"yukarısında.<ul></p><p></b> Ancak dizin yapısını yeniden oluşturmanız "
+"mümkündür. Eğer bunu yaparsanız dizinler \"OE-Import\" dizini altında "
+"saklanacaktır.</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -524,24 +335,180 @@ msgstr "OE5+ Posta Kutusu %1 alınıyor"
 msgid "Importing OE5+ Folder file %1"
 msgstr "OE5+ Dizin dosyası %1 içeriye aktarılıyor"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Opera E-postalarını Al"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Opera e-posta alma filtresi</b></p> <p>Bu filtre iletileri Opera posta "
+"dizininden alacak. Opera posta dizinindeki bir hesabınızdan bütün iletileri "
+"almak istiyorsanız bu filtreyi kullanın</p> <p>Hesap dizinini seçiniz "
+"(genellikle ~/.opera/mail/store/account*).</p><p><b>Not:</b>E-postalar, "
+"OPERA- önekinden sonra gelen hesap isimleriyle adlandırılan dizinlere "
+"alınacaktır.</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Dosyalar sayılıyor..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Yeni e-posta dosyaları alınıyor..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Outlook E-postalarını Al"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Outlook e-posta alma filtresi</b></p> <p>Bu filtre iletileri bir "
+"Outlook pst dosyasından alır. Windows 2000 veya sonrasında <i>C:\\Documents "
+"and Settings</i> altında .pst uzantısını aratarak pst-dosyasının bulundugu "
+"dizinin yerini belirtmeniz gerekiyor. </p><p><b>Not:</b>E-postalar, OUTLOOK- "
+"önekinden sonra gelen hesap isimleriyle adlandırılan dizinlere alınacaktır.</"
+"p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Posta sayılıyor..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Dizinler sayılıyor..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Klasörler sayılıyor..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Düz Metin E-postalarını Al"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p> Sisteminizdeki e-postaları içeren klasörü seçin. E-postalar, daha önce "
+"oldukları klasör adının önüne PLAIN- öneki getirilerek oluşturulan dizinde "
+"saklanır. <p>Bu filtre tüm .msg, .eml, .txt e-postalarını alacak.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Dizinleri Pegasus Mail Uygulamasından Al"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p> Sisteminizdeki Pegasus-Posta dizinini seçin (CNM, PMM ve MBX dosyalarını "
+"barındıran). Birçok sistemde bu C:\\PMail\\mail ya da  C:\\pmail\\mail"
+"\\admin dizininde saklanır.</p><p><b>Not:</b> Ancak dizin yapısını yeniden "
+"oluşturmanız mümkündür. Eğer bunu yaparsanız dizinler \"PegasusMail-Import\" "
+"dizini altında saklanacaktır.</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Dizin yapısı ayrıştırılamadı; alt dizin desteği olmadan içeriye aktarma "
+"işleminde devam ediliyor."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Yeni e-posta dosyaları alınıyor ('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "E-posta klasörleri alınıyor ('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "'UNIX' e-posta klasörleri alınıyor ('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "%1 Alınıyor"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Dizin yapısı ayrıştırılıyor..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Sylpheed İleti Dizinlerini ve Dizin Yapısını İçeriye Aktar"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Tümünü içeri aktar! İletileri ve Dizin Yapısını Al"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Evolution 2.x alma filtresi</b></p> <p>Evolution ana posta dizininizi "
+"seçiniz (genellikle ~/.evolution/mail/local/).</p> <p><b>Not:</b>mbox-"
+"dosyalarını <u>içermeyen</u> bir dizini asla seçmeyin (örneğin bir maildir). "
+"Eğer yine de bunu yaparsanız, birçok yeni dizininiz oluşacaktır.</p><p>Ancak "
+"dizin yapısını yeniden oluşturmanız mümkündür. Eğer bunu yaparsanız dizinler "
+"\"TheBat-Import\" dizini altında saklanacaktır.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Thunderbird/Mozilla Yerel Postalarını ve Dizin Yapısını Al"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Ölümcül Hata</b>DROP iletişimi için KMail başlatılamadı.\n"
 "<i>kmail</i> uygulamasının sisteme kurulu olduğundan emin olun."
@@ -558,65 +525,58 @@ msgstr "KMail içinde %1 klasörüne mesaj eklenemedi"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "kMail'deki %1 klasörüne mesaj eklerken hata oluştu"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Düz Metin E-postalarını Al"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "Kimden:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p> Sisteminizdeki e-postaları içeren klasörü seçin. E-postalar, daha önce "
-"oldukları klasör adının önüne PLAIN- öneki getirilerek oluşturulan dizinde "
-"saklanır. "
-"<p>Bu filtre tüm .msg, .eml, .txt e-postalarını alacak.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "Kime:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "mbox Dosyalarını Al (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Güncel:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>mbox alma filtresi</b></p> "
-"<p>Bu filtre mbox dosyalarınızı KMail'e alacak. E-postalarınızı, Ximian "
-"Evolution ya da geleneksel UNIX biçimini kullanan diğer uygulamalardan almak "
-"için bu filtreyi kullanın.</p> "
-"<p><b>Not:</b>E-postalar, MBOX- önekinden sonra gelen dosya isimleriyle "
-"adlandırılan dizinlere alınacaktır.</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "İçeriye aktarma işlemi devam ediyor..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox Dosyaları (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Tümünü içeri aktar! İletileri ve Dizin Yapısını Al"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Toplam:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr ""
+"Lütfen daha çok e-posta ya da bağlantı almak için 'Geri' düğmesine tıklayın"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Evolution 2.x alma filtresi</b></p> "
-"<p>Evolution ana posta dizininizi seçiniz (genellikle "
-"~/.evolution/mail/local/).</p> "
-"<p><b>Not:</b>mbox-dosyalarını <u>içermeyen</u> bir dizini asla seçmeyin "
-"(örneğin bir maildir). Eğer yine de bunu yaparsanız, birçok yeni dizininiz "
-"oluşacaktır.</p>"
-"<p>Ancak dizin yapısını yeniden oluşturmanız mümkündür. Eğer bunu yaparsanız "
-"dizinler \"TheBat-Import\" dizini altında saklanacaktır.</p>"
+"<b>KMailCVT - KMail Alma Aracı'na hoşgeldiniz</b>\n"
+" <br><br>\n"
+"Bu uygulama, e-postalarınızı daha önce kullandığınız e-posta uygulamsından "
+"KMail'e almanıza yardımcı olacak.<br><br><br><br>\n"
+"Lütfen dosyaları almak istediğiniz uygulamayı seçin ve 'İleri'ye tıklayın."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Alma esnasında tekrarlanan iletileri &sil"
diff --git a/tde-i18n-uk/messages/tdepim/kmailcvt.po b/tde-i18n-uk/messages/tdepim/kmailcvt.po
index dc062eb7381..816a8aeca2c 100644
--- a/tde-i18n-uk/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-uk/messages/tdepim/kmailcvt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2007-01-30 13:28-0800\n"
 "Last-Translator: Ivan Petrouchtchak <ivanpetrouchtchak@yahoo.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -16,28 +16,83 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>"
-"=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "Імпорт пошти з Outlook"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "Andriy Rysin,Іван Петрущак"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
+msgid ""
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "rysin@kde.org,ivanpetrouchtchak@yahoo.com"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "Засіб імпорту KMailCVT"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "Крок 1: Вибір фільтру"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "Крок 2: Імпортування..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "Триває імпортування"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "Імпортування закінчилось"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Написаний %1.</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "Фільтри імпорту KMail"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, розробники KMailCVT"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "Початковий автор"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "Супровід і нові фільтри"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "Новий графічний інтерфейс та чистка коду"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "Імпортувати пошту і структуру тек Evolution 1.x"
+
+#: filter_evolution.cxx:33
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Фільтр імпорту з Outlook</b></p>"
-"<p>Цей фільтр імпортує пошту з Outlook pst-файла. вам необхідно знайти теку, в "
-"якій зберігається pst-файл. Шукайте за файлами .pst в: <i>"
-"C:\\Documents and Settings</i> - Windows 2000 або пізніших</p>"
-"<p><b>Примітка:</b> Листи будуть імпортовані у теки, назви яких беруться з назв "
-"рахунків, з яких вони походять, з долученим префіксом OUTLOOK-</p>"
+"<p><b>Фільтр імпорту з Evolution 1.x</b></p><p>Вкажіть базову теку локальної "
+"пошти Evolution (переважно це ~/evolution/local/).</p><p>Оскільки можливо "
+"відтворити структуру тек, вона буде міститись в \"Evolution-Import\".</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -47,27 +102,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "Каталог не вибрано."
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "Підрахування файлів..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "Підрахування листів..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "Підрахування каталогів..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "Підрахування тек..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "Імпортування нових файлів пошти..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -75,6 +109,22 @@ msgstr "Імпортування нових файлів пошти..."
 msgid "No files found for import."
 msgstr "Не знайдено файлів для імпортування."
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "Закінчено імпортування пошти з %1"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "Не вдається відкрити %1, пропускаємо його"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -93,39 +143,37 @@ msgstr ""
 "%n повідомлення-дублікати не було імпортовано\n"
 "%n повідомлень-дублікатів не було імпортовано"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "Не вдається відкрити %1, пропускаємо його"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "Імпортувати пошту і структуру тек Evolution 1.x"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "Імпортувати пошту і структуру тек Evolution 2.x"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Фільтр імпорту з Evolution 1.x</b></p>"
-"<p>Вкажіть базову теку локальної пошти Evolution (переважно це "
-"~/evolution/local/).</p>"
-"<p>Оскільки можливо відтворити структуру тек, вона буде міститись в "
+"<p><b>Фільтр імпорту з Evolution 2.x</b></p><p>Вкажіть базову теку локальної "
+"пошти Evolution (переважно це ~/.evolution/mail/local/).</p><p><b>Примітка:</"
+"b> Ніколи не вказуйте теку, яка <u>не</u> містить mbox-файлів (напр., "
+"maildir). Якщо ви це зробите, то в результаті буде створено багато нових тек."
+"</p><p>Оскільки можливо відтворити структуру тек, вона буде міститись в "
 "\"Evolution-Import\".</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "Закінчено імпортування пошти з %1"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "Імпортування закінчене, скасоване користувачем."
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "Почати імпортування файла %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -133,99 +181,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "Імпортувати теки з Pegasus-Mail"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>Виберіть каталог з файлами Pegasus-Mail (це той, що містить файли .CNM, .PMM "
-"і .MBX). На багатьох системах ці файли знаходяться у C:\\PMail\\mail або "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Примітка:</b> Оскільки, можливо відтворити структуру тек, вона буде "
-"міститись в \"PegasusMail-Import\"</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr ""
-"Не вдається зробити синтаксичний аналіз структури тек; продовжується "
-"імпортування без підтримки підтек."
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "Імпортування нових файлів пошти (\".cnm\") ..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "Імпортування тек з поштою (\".pmm\") ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "Імпортування тек з поштою у UNIX форматі (\".mbx\") ..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "Імпортування %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "Повідомлення %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "Аналіз структури тек..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Написаний %1.</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "Імпорт пошти з Lotus Notes"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Фільтр імпорту Lotus Notes Structured Text</b></p>"
-"<p>Цей фільтр імпортує в KMail пошту з файлів із структурованим текстом, "
-"експортованих з клієнта електронної пошти Lotus Notes. Вживайте цей фільтр, "
-"якщо ви хочете імпортувати пошту з Lotus або інших поштових програм, які "
-"використовують формат структурованого тексту Lotus Notes.</p>"
-"<p><b>Примітка:</b> Оскільки, можливо відтворити структуру тек, її буде "
-"розміщено в підтеках, названих за файлами, з яких вони походять, в "
-"\"LNotes-Import\" у вашій локальній теці.</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "Всі файли (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "Імпортування листів з %1"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -233,30 +192,21 @@ msgstr "Імпортувати пошту і структуру тек KMail"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>Фільтр імпортування KMail</b></p>"
-"<p>Виберіть базовий каталог поштової теки KMail, яку ви хочете імпортувати.</p>"
-"<p><b>Примітка:</b> Ніколи не вказуйте вашу поточну поштову теку KMail "
-"(зазвичай, ~/Mail або ~/.trinity/share/apps/kmail/mail ), бо у цьому випадку "
-"KMailCVT може застрягнути в безкінечному циклі. </p>"
-"<p>Цей фільтр не імпортує поштові теки KMail з файлами mbox.</p>"
-"<p>Оскільки, можливо відтворити структуру тек, вона буде міститись в "
-"\"KMail-Import\" у вашій локальній теці.</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "Імпортування закінчене, скасоване користувачем."
+"<p><b>Фільтр імпортування KMail</b></p><p>Виберіть базовий каталог поштової "
+"теки KMail, яку ви хочете імпортувати.</p><p><b>Примітка:</b> Ніколи не "
+"вказуйте вашу поточну поштову теку KMail (зазвичай, ~/Mail або ~/.trinity/"
+"share/apps/kmail/mail ), бо у цьому випадку KMailCVT може застрягнути в "
+"безкінечному циклі. </p><p>Цей фільтр не імпортує поштові теки KMail з "
+"файлами mbox.</p><p>Оскільки, можливо відтворити структуру тек, вона буде "
+"міститись в \"KMail-Import\" у вашій локальній теці.</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -269,190 +219,42 @@ msgstr "Імпортувати теку %1..."
 msgid "Could not import %1"
 msgstr "Не вдалося імпортувати %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "Імпортувати локальну пошту і структуру тек Thunderbird/Mozilla"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Фільтр імпорту з Thunderbird/Mozilla</b></p>"
-"<p>Вкажіть базову теку програми Thunderbird/Mozilla (переважно це "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Примітка:</b> Ніколи не вказуйте теку, яка <u>не</u> "
-"містить mbox-файлів (напр., maildir). Якщо ви це зробите, то в результаті буде "
-"створено багато нових тек.</p>"
-"<p>Оскільки можливо відтворити структуру тек, вона буде міститись в "
-"\"Thunderbird-Import\".</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "Почати імпортування файла %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "Імпорт пошти з Opera"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Фільтр імпорту пошти з Opera</b></p>"
-"<p>Цей фільтр імпортує листи з теки пошти Opera. Використовуйте цей фільтр для "
-"імпортування листів з певного рахунка в теці пошти Opera.</p>"
-"<p>Вкажіть каталог рахунка (переважно це ~/.opera/mail/store/account*).</p>"
-"<p><b>Примітка:</b> Листи будуть імпортовані у теки, назви яких беруться з назв "
-"рахунків, з яких вони походять, з долученим префіксом OPERA-</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "Імпортувати пошту і структуру тек Evolution 2.x"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Фільтр імпорту з Evolution 2.x</b></p>"
-"<p>Вкажіть базову теку локальної пошти Evolution (переважно це "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Примітка:</b> Ніколи не вказуйте теку, яка <u>не</u> "
-"містить mbox-файлів (напр., maildir). Якщо ви це зробите, то в результаті буде "
-"створено багато нових тек.</p>"
-"<p>Оскільки можливо відтворити структуру тек, вона буде міститись в "
-"\"Evolution-Import\".</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "З:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "До:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "Поточний:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "Триває імпортування..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "Всього:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "Натисніть \"Назад\" для імпорту інших листів та контактів"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "Імпорт пошти з Lotus Notes"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>Ласкаво просимо до KMailCVT - Засобу імпорту для KMail</b>\n"
-"<br>"
-"<br>\n"
-"Ця програма допоможе вам імпортувати ваші листи з попередньої поштової програми "
-"до KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Будь ласка виберіть програму теки якої ви бажаєте імпортувати, та натисніть "
-"\"Далі\"."
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "Видаляти повідомлення-&дублікати при імпортуванні"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "Фільтри імпорту KMail"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, розробники KMailCVT"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "Початковий автор"
+"<p><b>Фільтр імпорту Lotus Notes Structured Text</b></p><p>Цей фільтр "
+"імпортує в KMail пошту з файлів із структурованим текстом, експортованих з "
+"клієнта електронної пошти Lotus Notes. Вживайте цей фільтр, якщо ви хочете "
+"імпортувати пошту з Lotus або інших поштових програм, які використовують "
+"формат структурованого тексту Lotus Notes.</p><p><b>Примітка:</b> Оскільки, "
+"можливо відтворити структуру тек, її буде розміщено в підтеках, названих за "
+"файлами, з яких вони походять, в \"LNotes-Import\" у вашій локальній теці.</"
+"p>"
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "Супровід і нові фільтри"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "Новий графічний інтерфейс та чистка коду"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "Всі файли (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "Andriy Rysin,Іван Петрущак"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "Імпортування листів з %1"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "rysin@kde.org,ivanpetrouchtchak@yahoo.com"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "Повідомлення %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -460,11 +262,11 @@ msgstr "Імпорт пошти з OS X"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>Фільтр імпорту пошти з OS X</b></p>"
-"<p>Цей фільтр імпортує листи з клієнта ел. пошти Apple Mac OS X.</p>"
+"<p><b>Фільтр імпорту пошти з OS X</b></p><p>Цей фільтр імпортує листи з "
+"клієнта ел. пошти Apple Mac OS X.</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -475,25 +277,28 @@ msgstr ""
 "%n повідомлення-дублікати не було імпортовано у теку %1 в KMail\n"
 "%n повідомлень-дублікатів не було імпортовано у теку %1 в KMail"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "Засіб імпорту KMailCVT"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "Крок 1: Вибір фільтру"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "Крок 2: Імпортування..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "Імпорт файлів у форматі mbox (UNIX, Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "Триває імпортування"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>Фільтр імпортування файлів у форматі mbox</b></p><p>Цей фільтр "
+"імпортує файли у форматі mbox до KMail. Скористайтесь цим фільтром, якщо вам "
+"потрібно імпортувати листи з Ximian Evolution або інших поштових програм, "
+"які використовують цей традиційний для UNIX формат.</p><p><b>Примітка:</b> "
+"Листи буде імпортовано у теки, назва яких починається з рядка \"MBOX-\", за "
+"яким йде назва файла, з якого було імпортовано листи.</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "Імпортування закінчилось"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "файли mbox (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -501,24 +306,20 @@ msgstr "Імпорт пошти з Outlook Express"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Фільтр імпорту з Outlook Express 4/5/6</b></p>"
-"<p>Вам необхідно знайти теку, в якій зберігаються поштові скриньки. Шукайте за "
-"файлами .dbx або .mbx в "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> у Windows 9x"
-"<li><i>Documents and Settings</i> у Windows 2000 або пізніших</ul></p>"
-"<p><b>Примітка:</b>Оскільки можливо відтворити структуру тек, то теки з Outlook "
-"Express 5 і 6 будуть міститись в \"OE-Import\" у вашій локальній теці</p>"
+"<p><b>Фільтр імпорту з Outlook Express 4/5/6</b></p><p>Вам необхідно знайти "
+"теку, в якій зберігаються поштові скриньки. Шукайте за файлами .dbx або .mbx "
+"в <ul><li><i>C:\\Windows\\Application Data</i> у Windows 9x<li><i>Documents "
+"and Settings</i> у Windows 2000 або пізніших</ul></p><p><b>Примітка:</"
+"b>Оскільки можливо відтворити структуру тек, то теки з Outlook Express 5 і 6 "
+"будуть міститись в \"OE-Import\" у вашій локальній теці</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -553,30 +354,191 @@ msgstr "Імпортування скриньки OE5+ - %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "Імпортування OE5+ файла теки %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "Імпорт пошти з Opera"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Фільтр імпорту пошти з Opera</b></p><p>Цей фільтр імпортує листи з "
+"теки пошти Opera. Використовуйте цей фільтр для імпортування листів з "
+"певного рахунка в теці пошти Opera.</p><p>Вкажіть каталог рахунка (переважно "
+"це ~/.opera/mail/store/account*).</p><p><b>Примітка:</b> Листи будуть "
+"імпортовані у теки, назви яких беруться з назв рахунків, з яких вони "
+"походять, з долученим префіксом OPERA-</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "Підрахування файлів..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "Імпортування нових файлів пошти..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "Імпорт пошти з Outlook"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Фільтр імпорту з Outlook</b></p><p>Цей фільтр імпортує пошту з Outlook "
+"pst-файла. вам необхідно знайти теку, в якій зберігається pst-файл. Шукайте "
+"за файлами .pst в: <i>C:\\Documents and Settings</i> - Windows 2000 або "
+"пізніших</p><p><b>Примітка:</b> Листи будуть імпортовані у теки, назви яких "
+"беруться з назв рахунків, з яких вони походять, з долученим префіксом "
+"OUTLOOK-</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "Підрахування листів..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "Підрахування каталогів..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "Підрахування тек..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "Імпорт пошти з текстових файлів"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>Виберіть каталог, що містить листи електронної пошти. Листи буде "
+"збережено у теки, назва яких починається з рядка \"PLAIN-\", за яким йде "
+"назва каталогу з якого було імпортовано листи.</p><p>Цей фільтр імпортує всі "
+"файли, що закінчуються на .msg, .eml та .txt.</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "Імпортувати теки з Pegasus-Mail"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>Виберіть каталог з файлами Pegasus-Mail (це той, що містить файли .CNM, ."
+"PMM і .MBX). На багатьох системах ці файли знаходяться у C:\\PMail\\mail або "
+"C:\\pmail\\mail\\admin</p><p><b>Примітка:</b> Оскільки, можливо відтворити "
+"структуру тек, вона буде міститись в \"PegasusMail-Import\"</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr ""
+"Не вдається зробити синтаксичний аналіз структури тек; продовжується "
+"імпортування без підтримки підтек."
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "Імпортування нових файлів пошти (\".cnm\") ..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "Імпортування тек з поштою (\".pmm\") ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "Імпортування тек з поштою у UNIX форматі (\".mbx\") ..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "Імпортування %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "Аналіз структури тек..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "Імпортувати пошту і структуру тек Sylpheed"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
 msgstr ""
-"<p><b>Фільтр імпорту з Sylpheed</b></p>"
-"<p>Виберіть базовий каталог поштової теки Sylpheed, яку ви хочете імпортувати "
-"(зазвичай, ~/Mail ).</p>"
-"<p>Оскільки можливо відтворити структуру тек, вона буде міститись в "
-"\"Sylpheed-Import\" у вашій локальній теці.</p>"
-"<p>Цей фільтр також відтворює стан повідомлення, наприклад, нове або переслане."
+"<p><b>Фільтр імпорту з Sylpheed</b></p><p>Виберіть базовий каталог поштової "
+"теки Sylpheed, яку ви хочете імпортувати (зазвичай, ~/Mail ).</p><p>Оскільки "
+"можливо відтворити структуру тек, вона буде міститись в \"Sylpheed-Import\" "
+"у вашій локальній теці.</p><p>Цей фільтр також відтворює стан повідомлення, "
+"наприклад, нове або переслане."
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "Імпортувати пошту і структуру тек з The Bat!"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>Фільтр імпортування з The Bat!</b></p><p>Виберіть базовий каталог "
+"поштової теки \"The Bat!\", яку ви хочете імпортувати.</p><p><b>Примітка:</"
+"b> Цей фільтр імпортує *.tbb-файли з локальної теки \"The Bat!\", напр., з "
+"рахунків POP, а не з рахунків IMAP/DIMAP.</p><p>Оскільки, можливо відтворити "
+"структуру тек, теки буде розміщено в \"TheBat-Import\" у вашому локальному "
+"рахунку.</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "Імпортувати локальну пошту і структуру тек Thunderbird/Mozilla"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Фільтр імпорту з Thunderbird/Mozilla</b></p><p>Вкажіть базову теку "
+"програми Thunderbird/Mozilla (переважно це ~/.thunderbird/*.default/Mail/"
+"Local Folders/).</p><p><b>Примітка:</b> Ніколи не вказуйте теку, яка <u>не</"
+"u> містить mbox-файлів (напр., maildir). Якщо ви це зробите, то в результаті "
+"буде створено багато нових тек.</p><p>Оскільки можливо відтворити структуру "
+"тек, вона буде міститись в \"Thunderbird-Import\".</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
 msgstr ""
 "<b>Критична помилка:</b> Не вдається запустити KMail для зв'язку з DCOP. "
 "Переконайтеся, що програма <i>kmail</i> встановлена."
@@ -593,64 +555,58 @@ msgstr "Неможливо додати повідомлення в теку %1
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "Помилка додавання повідомлення до теки %1 в KMail"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "Імпорт пошти з текстових файлів"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "З:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>Виберіть каталог, що містить листи електронної пошти. Листи буде збережено у "
-"теки, назва яких починається з рядка \"PLAIN-\", за яким йде назва каталогу з "
-"якого було імпортовано листи.</p>"
-"<p>Цей фільтр імпортує всі файли, що закінчуються на .msg, .eml та .txt.</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "До:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "Імпорт файлів у форматі mbox (UNIX, Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "Поточний:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>Фільтр імпортування файлів у форматі mbox</b></p>"
-"<p>Цей фільтр імпортує файли у форматі mbox до KMail. Скористайтесь цим "
-"фільтром, якщо вам потрібно імпортувати листи з Ximian Evolution або інших "
-"поштових програм, які використовують цей традиційний для UNIX формат.</p>"
-"<p><b>Примітка:</b> Листи буде імпортовано у теки, назва яких починається з "
-"рядка \"MBOX-\", за яким йде назва файла, з якого було імпортовано листи.</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "Триває імпортування..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "файли mbox (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "Імпортувати пошту і структуру тек з The Bat!"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "Всього:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "Натисніть \"Назад\" для імпорту інших листів та контактів"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>Фільтр імпортування з The Bat!</b></p>"
-"<p>Виберіть базовий каталог поштової теки \"The Bat!\", яку ви хочете "
-"імпортувати.</p>"
-"<p><b>Примітка:</b> Цей фільтр імпортує *.tbb-файли з локальної теки \"The "
-"Bat!\", напр., з рахунків POP, а не з рахунків IMAP/DIMAP.</p>"
-"<p>Оскільки, можливо відтворити структуру тек, теки буде розміщено в "
-"\"TheBat-Import\" у вашому локальному рахунку.</p>"
+"<b>Ласкаво просимо до KMailCVT - Засобу імпорту для KMail</b>\n"
+"<br><br>\n"
+"Ця програма допоможе вам імпортувати ваші листи з попередньої поштової "
+"програми до KMail.<br><br><br><br>\n"
+" Будь ласка виберіть програму теки якої ви бажаєте імпортувати, та натисніть "
+"\"Далі\"."
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "Видаляти повідомлення-&дублікати при імпортуванні"
diff --git a/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po b/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po
index 39fd82e074f..f6b4b4d25de 100644
--- a/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-zh_CN/messages/tdepim/kmailcvt.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2005-08-03 22:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -18,24 +18,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "导入 Outlook 邮件"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "开源软件国际化之 TDE 简体中文翻译组"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "i18n-translation@lists.linux.net.cn"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT 导入工具"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "第一步：选择过滤器"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "第二步：导入..."
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "导入进行中"
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "导入已完成"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>由 %1 编写。</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail 导入过滤器"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005，KMailCVT 开发者"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "原始作者"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "维护者和新过滤器"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "新的界面和清理"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "导入 Evolution 1.x 本地邮件和文件夹结构"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook 电子邮件导入过滤器</b></p>"
-"<p>此过滤器将从 Outlook 的 PST 文件中导入邮件。您需要找到 PST 文件存储的文件夹。在 Windows 2000 及以后版本中，您可以在 "
-"<i>C:\\Documents and Settings</i> 下搜索 .pst 文件"
-"<p>"
-"<p><b>注意：</b>电子邮件将会导入到与账户同名的文件夹中，只是带有前缀“OUTLOOK-”</p>"
+"<p><b>Evolution 1.x 导入过滤器</b></p><p>选择您的 Evolution 本地邮件文件夹的"
+"基目录(通常为 ~/.evolution/local/)。</p><p>由于可以重新创建文件夹结构，文件夹"
+"将存储于“Evolution-Import”下。</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -45,27 +101,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "没有选中目录。"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "正在统计文件..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "正在统计邮件..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "正在统计目录..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "正在统计文件夹..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "正在导入新邮件文件..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -73,6 +108,22 @@ msgstr "正在导入新邮件文件..."
 msgid "No files found for import."
 msgstr "没有找到可导入的文件。"
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "从 %1 导入电子邮件完成"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "无法打开 %1，跳过"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -88,37 +139,36 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "未导入 %n 封重复的信件"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "无法打开 %1，跳过"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "导入 Evolution 1.x 本地邮件和文件夹结构"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "导入 Evolution 2.x 本地邮件和文件夹结构"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x 导入过滤器</b></p>"
-"<p>选择您的 Evolution 本地邮件文件夹的基目录(通常为 ~/.evolution/local/)。</p>"
-"<p>由于可以重新创建文件夹结构，文件夹将存储于“Evolution-Import”下。</p>"
+"<p><b>Evolution 2.x 导入过滤器</b></p><p>选择您的 Evolution 本地邮件文件夹的"
+"基目录(通常为 ~/.evolution/mail/local/)。</p><p><b>注意：</b>不要选择<u>不包"
+"含</u> mbox 文件的文件夹(比如 maildir)。如果您不小心选择了的话，您将会得到很"
+"多新文件夹。</p><p>由于可以创建文件夹结构，文件夹将存储于“Evolution-"
+"Import”下。</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "从 %1 导入电子邮件完成"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "完成了导入，被用户取消。"
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "开始导入文件 %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -126,92 +176,10 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
-msgstr ""
-
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "从 Pegasus-Mail 中导入文件夹"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>选择您系统上的 Pegasus-Mail 目录(其中包含 *.CNM，*.PMM 和 *.MBX 文件)。在许多系统中，此目录存储于 "
-"C:\\PMail\\mail 或 C:\\pmail\\mail\\admin</p>"
-"<p><b>注意：</b>由于可以重建文件夹结构，文件夹将存储于“PegasusMail-Import”下。</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr "无法分析文件夹结构；继续导入而不支持子文件夹。"
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "正在导入新邮件文件(“.cnm”)..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "正在导入邮件文件夹(“.pmm”) ..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "正在导入“UNIX”邮件文件夹(“.mbx”)..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "正在导入 %1"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "信件 %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "正在分析文件夹结构..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>由 %1 编写。</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "导入 Lotus Notes 邮件"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
-"<p><b>Lotus Notes 结构化文本邮件导入过滤器</b></p>"
-"<p>此过滤器将从 Lotus Notes 导出的结构化文本文件中把邮件文件导入至 KMail。如果您想要从 Lotus Notes 或使用 Lotus "
-"Notes 结构化文本格式的其它邮件程序中中导入邮件，请使用此过滤器。</p>"
-"<p><b>注意：</b>由于可以重现文件夹结构，导入的信件将会被存储于本地文件夹“LNotes-Import”的子文件夹中，而子文件夹的名称取决于导入时的文件"
-"名。</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "全部文件(*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "正在从 %1 导入邮件"
 
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
@@ -219,28 +187,19 @@ msgstr "导入 KMail 邮件和文件夹结构"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>KMail 导入过滤器</b></p>"
-"<p>选择您想要导入的 KMail 邮件文件夹的基础目录。</p>"
-"<p><b>注意：</b>绝对不要选择您目前的本地 KMail 邮件目录(通常是 ~/Mail 或 "
-"~/.trinity/share/apps/kmail/mail )。否则，KMailCVT 可能陷入死循环之中。</p>"
-"<p>此过滤器不会导入带 mbox 文件的 KMail 邮件文件夹。</p>"
-"<p>由于可以重建文件夹结构，文件夹将储于您本地文件夹的“KMail-Import”下。</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "完成了导入，被用户取消。"
+"<p><b>KMail 导入过滤器</b></p><p>选择您想要导入的 KMail 邮件文件夹的基础目"
+"录。</p><p><b>注意：</b>绝对不要选择您目前的本地 KMail 邮件目录(通常是 ~/"
+"Mail 或 ~/.trinity/share/apps/kmail/mail )。否则，KMailCVT 可能陷入死循环之"
+"中。</p><p>此过滤器不会导入带 mbox 文件的 KMail 邮件文件夹。</p><p>由于可以重"
+"建文件夹结构，文件夹将储于您本地文件夹的“KMail-Import”下。</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -253,179 +212,39 @@ msgstr "导入文件夹 %1..."
 msgid "Could not import %1"
 msgstr "无法导入 %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "导入 Thunderbird/Mozilla 本地邮件和文件夹结构"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird/Mozilla  导入过滤器</b></p>"
-"<p>选择您的基础 Thunderbird/Mozilla  邮件文件夹(通常是 ~/.thunderbird/*.default/Mail/Local "
-"Folders/)。</p>"
-"<p><b>注意：</b>绝对不要选择<u>不</u>包含 mbox 文件的文件夹(例如 maildir)。如果您那么做的话，将会得到很多新文件夹。</p>"
-"<p>由于可以重建文件夹结构，文件夹将存储于“Thunderbird-Import”下。</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "开始导入文件 %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "导入 Opera 邮件"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera 电子邮件导入过滤器</b></p>"
-"<p>此过滤器将导入 Opera 邮件文件夹中的邮件。如果您想要从 Opera 邮件目录中一个账户的全部邮件，请使用此过滤器。</p>"
-"<p>选择账户所在的目录(通常为 ~/.opera/mail/store/account*)。</p>"
-"<p><b>注意：</b>电子邮件将会导入到与账户同名的文件夹中，只是带有前缀“OPERA-”。</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "导入 Evolution 2.x 本地邮件和文件夹结构"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x 导入过滤器</b></p>"
-"<p>选择您的 Evolution 本地邮件文件夹的基目录(通常为 ~/.evolution/mail/local/)。</p>"
-"<p><b>注意：</b>不要选择<u>不包含</u> mbox 文件的文件夹(比如 maildir)。如果您不小心选择了的话，您将会得到很多新文件夹。</p>"
-"<p>由于可以创建文件夹结构，文件夹将存储于“Evolution-Import”下。</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "发件人："
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "收件人："
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "当前："
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "导入进行中..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "总计："
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "请点击“上一步”以导入更多的邮件或联系人"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "导入 Lotus Notes 邮件"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>欢迎使用 KMailCVT - KMail 导入工具</b>\n"
-"<br>"
-"<br>\n"
-"此程序能够帮助您从已有的程序中将邮件导入至 KMail。"
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"请选择您想要导入的程序，然后点击“下一步”。"
+"<p><b>Lotus Notes 结构化文本邮件导入过滤器</b></p><p>此过滤器将从 Lotus "
+"Notes 导出的结构化文本文件中把邮件文件导入至 KMail。如果您想要从 Lotus Notes "
+"或使用 Lotus Notes 结构化文本格式的其它邮件程序中中导入邮件，请使用此过滤器。"
+"</p><p><b>注意：</b>由于可以重现文件夹结构，导入的信件将会被存储于本地文件"
+"夹“LNotes-Import”的子文件夹中，而子文件夹的名称取决于导入时的文件名。</p>"
 
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "导入时删除重复邮件(&D)"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail 导入过滤器"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005，KMailCVT 开发者"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "原始作者"
-
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "维护者和新过滤器"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "新的界面和清理"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "全部文件(*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "开源软件国际化之 TDE 简体中文翻译组"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "正在从 %1 导入邮件"
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "i18n-translation@lists.linux.net.cn"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "信件 %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -433,11 +252,11 @@ msgstr "从 OS X 邮件中导入"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X 邮件导入过滤器</b></p>"
-"<p>此过滤器可从 Apple Mac OS X 的邮件客户端程序中导入电子邮件。</p>"
+"<p><b>OS X 邮件导入过滤器</b></p><p>此过滤器可从 Apple Mac OS X 的邮件客户端"
+"程序中导入电子邮件。</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -445,25 +264,26 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "未将 %n 封重复的信件导入到 KMail 的文件夹 %1 中"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT 导入工具"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "第一步：选择过滤器"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "第二步：导入..."
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "导入 mbox 文件(UNIX，Evolution)"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "导入进行中"
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox 导入过滤器</b></p><p>此过滤器将把 mbox 文件导入至 KMail。如果您想"
+"要从 Ximian Evolution 或其它使用此传统 UNIX 格式的邮件程序中导入邮件，请使用"
+"此过滤器。</p><p><b>注意：</b>电子邮件将会导入到与文件同名的文件夹中，只是带"
+"有前缀“MBOX-”。</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "导入已完成"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox 文件(*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -471,23 +291,19 @@ msgstr "导入 Outlook Express 邮件"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 导入过滤器</b></p>"
-"<p>您需要找到邮箱存储的文件夹，您可以在下列文件夹下搜索 .dbx 或 .mdx 文件"
-"<ul>"
-"<li>Windows 9x 下的 <i>C:\\Windows\\Application Data</i>"
-"<li>Windows 2000 或更高版本中的 <i>Documents and Settings</i></ul></p>"
-"<p><b>注意：</b>由于可以重建文件夹结构，Outlook Express 5 和 6 "
-"中的文件夹将被存储于您本地文件夹的“OE-Import”下。</p>"
+"<p><b>Outlook Express 4/5/6 导入过滤器</b></p><p>您需要找到邮箱存储的文件夹，"
+"您可以在下列文件夹下搜索 .dbx 或 .mdx 文件<ul><li>Windows 9x 下的 <i>C:"
+"\\Windows\\Application Data</i><li>Windows 2000 或更高版本中的 <i>Documents "
+"and Settings</i></ul></p><p><b>注意：</b>由于可以重建文件夹结构，Outlook "
+"Express 5 和 6 中的文件夹将被存储于您本地文件夹的“OE-Import”下。</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -522,29 +338,181 @@ msgstr "导入 OE5+ 邮箱 %1"
 msgid "Importing OE5+ Folder file %1"
 msgstr "导入 OE5+ 文件夹文件 %1"
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "导入 Opera 邮件"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Opera 电子邮件导入过滤器</b></p><p>此过滤器将导入 Opera 邮件文件夹中的"
+"邮件。如果您想要从 Opera 邮件目录中一个账户的全部邮件，请使用此过滤器。</"
+"p><p>选择账户所在的目录(通常为 ~/.opera/mail/store/account*)。</p><p><b>注"
+"意：</b>电子邮件将会导入到与账户同名的文件夹中，只是带有前缀“OPERA-”。</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "正在统计文件..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "正在导入新邮件文件..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "导入 Outlook 邮件"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Outlook 电子邮件导入过滤器</b></p><p>此过滤器将从 Outlook 的 PST 文件中"
+"导入邮件。您需要找到 PST 文件存储的文件夹。在 Windows 2000 及以后版本中，您可"
+"以在 <i>C:\\Documents and Settings</i> 下搜索 .pst 文件<p><p><b>注意：</b>电"
+"子邮件将会导入到与账户同名的文件夹中，只是带有前缀“OUTLOOK-”</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "正在统计邮件..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "正在统计目录..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "正在统计文件夹..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "导入纯文本电子邮件"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>选择您系统中包含电子邮件的目录。邮件会被放在与其所在目录同名的文件夹中，只"
+"是带有前缀“PLAIN-”。</p><p>此过滤器将会导入全部 .msg、.eml 和 .txt 邮件。</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "从 Pegasus-Mail 中导入文件夹"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>选择您系统上的 Pegasus-Mail 目录(其中包含 *.CNM，*.PMM 和 *.MBX 文件)。在"
+"许多系统中，此目录存储于 C:\\PMail\\mail 或 C:\\pmail\\mail\\admin</p><p><b>"
+"注意：</b>由于可以重建文件夹结构，文件夹将存储于“PegasusMail-Import”下。</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr "无法分析文件夹结构；继续导入而不支持子文件夹。"
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "正在导入新邮件文件(“.cnm”)..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "正在导入邮件文件夹(“.pmm”) ..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "正在导入“UNIX”邮件文件夹(“.mbx”)..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "正在导入 %1"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "正在分析文件夹结构..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "导入 Sylpheed 邮件和文件夹结构"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Sylpheed 导入过滤器</b></p><p>选择您想要导入的 Sylpheed 邮件文件夹的基"
+"础目录(通常是：~/Mail )。</p><p>由于可以重建文件夹结构，文件夹将储于您本地文"
+"件夹的“Sylpheed-Import”下。</p><p>此过滤器还将重建信件的状态，例如新邮件或已"
+"转发。"
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "导入 The Bat! 邮件和文件夹结构"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
+msgstr ""
+"<p><b>The Bat! 导入过滤器</b></p><p>选择您想要导入的 The Bat! 邮件文件夹的基"
+"础目录。</p><p><b>注意：</b>此过滤器将从 The Bat! 本地文件夹中导入 *.tbb 文"
+"件，这适用于 POP 账户，但不适用于 IMAP/DIMAP 账户。</p><p>由于可以重建文件夹"
+"结构，文件夹将储于您本地账户的“TheBat-Import”下。</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "导入 Thunderbird/Mozilla 本地邮件和文件夹结构"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
 msgstr ""
-"<p><b>Sylpheed 导入过滤器</b></p>"
-"<p>选择您想要导入的 Sylpheed 邮件文件夹的基础目录(通常是：~/Mail )。</p>"
-"<p>由于可以重建文件夹结构，文件夹将储于您本地文件夹的“Sylpheed-Import”下。</p>"
-"<p>此过滤器还将重建信件的状态，例如新邮件或已转发。"
+"<p><b>Thunderbird/Mozilla  导入过滤器</b></p><p>选择您的基础 Thunderbird/"
+"Mozilla  邮件文件夹(通常是 ~/.thunderbird/*.default/Mail/Local Folders/)。</"
+"p><p><b>注意：</b>绝对不要选择<u>不</u>包含 mbox 文件的文件夹(例如 maildir)。"
+"如果您那么做的话，将会得到很多新文件夹。</p><p>由于可以重建文件夹结构，文件夹"
+"将存储于“Thunderbird-Import”下。</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
-msgstr "<b>严重错误：</b>无法与 KMail 进行 DCOP 通讯。请确认<i>kmail</i>在您的路径中。"
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b>严重错误：</b>无法与 KMail 进行 DCOP 通讯。请确认<i>kmail</i>在您的路径"
+"中。"
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -558,58 +526,56 @@ msgstr "无法将信件添加到 KMail 的文件夹 %1 中"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "在将信件添加到 KMail 的文件夹 %1 时出错"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "导入纯文本电子邮件"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "发件人："
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>选择您系统中包含电子邮件的目录。邮件会被放在与其所在目录同名的文件夹中，只是带有前缀“PLAIN-”。</p>"
-"<p>此过滤器将会导入全部 .msg、.eml 和 .txt 邮件。</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "收件人："
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "导入 mbox 文件(UNIX，Evolution)"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "当前："
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>mbox 导入过滤器</b></p>"
-"<p>此过滤器将把 mbox 文件导入至 KMail。如果您想要从 Ximian Evolution 或其它使用此传统 UNIX "
-"格式的邮件程序中导入邮件，请使用此过滤器。</p>"
-"<p><b>注意：</b>电子邮件将会导入到与文件同名的文件夹中，只是带有前缀“MBOX-”。</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "导入进行中..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox 文件(*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "导入 The Bat! 邮件和文件夹结构"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "总计："
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "请点击“上一步”以导入更多的邮件或联系人"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>The Bat! 导入过滤器</b></p>"
-"<p>选择您想要导入的 The Bat! 邮件文件夹的基础目录。</p>"
-"<p><b>注意：</b>此过滤器将从 The Bat! 本地文件夹中导入 *.tbb 文件，这适用于 POP 账户，但不适用于 IMAP/DIMAP "
-"账户。</p>"
-"<p>由于可以重建文件夹结构，文件夹将储于您本地账户的“TheBat-Import”下。</p>"
+"<b>欢迎使用 KMailCVT - KMail 导入工具</b>\n"
+"<br><br>\n"
+"此程序能够帮助您从已有的程序中将邮件导入至 KMail。<br><br><br><br>\n"
+"请选择您想要导入的程序，然后点击“下一步”。"
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "导入时删除重复邮件(&D)"
diff --git a/tde-i18n-zh_TW/messages/tdepim/kmailcvt.po b/tde-i18n-zh_TW/messages/tdepim/kmailcvt.po
index 45de65445c2..17736f4a718 100644
--- a/tde-i18n-zh_TW/messages/tdepim/kmailcvt.po
+++ b/tde-i18n-zh_TW/messages/tdepim/kmailcvt.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kmailcvt1\n"
-"POT-Creation-Date: 2014-09-29 12:06-0500\n"
+"POT-Creation-Date: 2018-12-13 20:39+0100\n"
 "PO-Revision-Date: 2006-01-13 08:36+0800\n"
 "Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
 "dot tw>\n"
@@ -20,23 +20,80 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: filter_outlook.cxx:28
-msgid "Import Outlook Emails"
-msgstr "匯入 Outlook 的信件"
+#: _translatorinfo:1
+msgid ""
+"_: NAME OF TRANSLATORS\n"
+"Your names"
+msgstr "曾賢舜，高嘉璘"
 
-#: filter_outlook.cxx:30
+#: _translatorinfo:2
 msgid ""
-"<p><b>Outlook email import filter</b></p>"
-"<p>This filter will import mails from a Outlook pst-file. You will need to "
-"locate the folder where the pst-file has been stored by searching for .pst "
-"files under: <i>C:\\Documents and Settings</i> in Windows 2000 or later</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OUTLOOK-</p>"
+"_: EMAIL OF TRANSLATORS\n"
+"Your emails"
+msgstr "id5id5@tcts1.seed.net.tw, acelan@kde.linux.org.tw"
+
+#: kmailcvt.cpp:28
+msgid "KMailCVT Import Tool"
+msgstr "KMailCVT 郵件匯入工具"
+
+#: kmailcvt.cpp:31
+msgid "Step 1: Select Filter"
+msgstr "步驟一：選擇匯入過濾器"
+
+#: kmailcvt.cpp:34
+msgid "Step 2: Importing..."
+msgstr "步驟二：匯入信件"
+
+#: kmailcvt.cpp:76
+msgid "Import in progress"
+msgstr "匯入中..."
+
+#: kmailcvt.cpp:79
+msgid "Import finished"
+msgstr "信件已匯入完成"
+
+#: kselfilterpage.cpp:78
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>這個過濾器是由 %1 所撰寫</i></p>"
+
+#: main.cpp:33
+msgid "KMailCVT"
+msgstr "KMailCVT"
+
+#: main.cpp:34
+msgid "KMail Import Filters"
+msgstr "KMail 信件匯入過濾器"
+
+#: main.cpp:35
+msgid "(c) 2000-2005, The KMailCVT developers"
+msgstr "(c) 2000-2005, KMailCVT 開發者"
+
+#: main.cpp:36
+msgid "Original author"
+msgstr "作者"
+
+#: main.cpp:37
+msgid "Maintainer & New filters"
+msgstr "維護者及新的過濾器"
+
+#: main.cpp:38 main.cpp:39
+msgid "New GUI & cleanups"
+msgstr "新的 GUI 設計"
+
+#: filter_evolution.cxx:31
+msgid "Import Evolution 1.x Local Mails and Folder Structure"
+msgstr "匯入 Evolution 1.x 的信件"
+
+#: filter_evolution.cxx:33
+msgid ""
+"<p><b>Evolution 1.x import filter</b></p><p>Select the base directory of "
+"Evolution's mails (usually ~/evolution/local).</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"Evolution-"
+"Import\".</p>"
 msgstr ""
-"<p><b>Outlook 信件匯入過濾器</b></p>"
-"<p>這個過濾器會讀取 Outlook 的 pst 檔並匯入信件。若您使用的是 Windows 2000 或之後的系統，您必須在 <i>"
-"C:\\Documents and Settings</i> 中找尋 .pst 檔。</p>"
-"<p><b>注意：</b>這個過濾器會產生一個新的信件夾，名稱為 pst 檔的檔名前面加上 OUTLOOK-。</p>"
+"<p><b>Evolution 1.x 信件匯入過濾器</b></p><p>請選擇 Evolution 的信件目錄（通"
+"常是 ~/evolution/local）。</p><p>這個過濾器會產生一個叫 Evolution-Import 的信"
+"件夾，並幫您保存原先的目錄結構。</p>"
 
 #: filter_evolution.cxx:57 filter_evolution_v2.cxx:66
 #: filter_kmail_maildir.cxx:57 filter_mailapp.cxx:52 filter_oe.cxx:60
@@ -46,27 +103,6 @@ msgstr ""
 msgid "No directory selected."
 msgstr "沒有選擇任何目錄"
 
-#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
-#: filter_pmail.cxx:61
-msgid "Counting files..."
-msgstr "計算檔案中..."
-
-#: filter_outlook.cxx:46
-msgid "Counting mail..."
-msgstr "計算信件中..."
-
-#: filter_outlook.cxx:47
-msgid "Counting directories..."
-msgstr "計算目錄中..."
-
-#: filter_outlook.cxx:48
-msgid "Counting folders..."
-msgstr "計算資料夾中..."
-
-#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
-msgid "Importing new mail files..."
-msgstr "正在匯入新的信件檔..."
-
 #: filter_evolution.cxx:64 filter_evolution_v2.cxx:73
 #: filter_kmail_maildir.cxx:64 filter_mailapp.cxx:53 filter_opera.cxx:67
 #: filter_opera.cxx:152 filter_outlook.cxx:50 filter_sylpheed.cxx:63
@@ -74,6 +110,22 @@ msgstr "正在匯入新的信件檔..."
 msgid "No files found for import."
 msgstr "沒有選擇任何檔案"
 
+#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
+#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
+#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
+#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
+#, c-format
+msgid "Finished importing emails from %1"
+msgstr "匯入信件夾 %1 完成。"
+
+#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
+#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
+#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
+#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
+#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
+msgid "Unable to open %1, skipping"
+msgstr "無法開啟檔案 '%1'"
+
 #: filter_evolution.cxx:145 filter_mailapp.cxx:70 filter_mbox.cxx:60
 #: filter_opera.cxx:89 filter_outlook.cxx:57
 msgid "Importing emails from %1..."
@@ -89,37 +141,36 @@ msgid ""
 "%n duplicate messages not imported"
 msgstr "%n 封重複的信件未匯入"
 
-#: filter_evolution.cxx:124 filter_evolution_v2.cxx:160
-#: filter_kmail_maildir.cxx:128 filter_lnotes.cxx:88 filter_mailapp.cxx:62
-#: filter_mbox.cxx:54 filter_opera.cxx:87 filter_outlook.cxx:59
-#: filter_pmail.cxx:165 filter_pmail.cxx:235 filter_pmail.cxx:253
-#: filter_pmail.cxx:294 filter_thebat.cxx:151 filter_thunderbird.cxx:161
-msgid "Unable to open %1, skipping"
-msgstr "無法開啟檔案 '%1'"
-
-#: filter_evolution.cxx:31
-msgid "Import Evolution 1.x Local Mails and Folder Structure"
-msgstr "匯入 Evolution 1.x 的信件"
+#: filter_evolution_v2.cxx:29
+msgid "Import Evolution 2.x Local Mails and Folder Structure"
+msgstr "匯入 Evolution 2.x 的信件"
 
-#: filter_evolution.cxx:33
+#: filter_evolution_v2.cxx:31
 msgid ""
-"<p><b>Evolution 1.x import filter</b></p>"
-"<p>Select the base directory of Evolution's mails (usually "
-"~/evolution/local).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
+"<p><b>Evolution 2.x import filter</b></p><p>Select the base directory of "
+"your local Evolution mailfolder (usually ~/.evolution/mail/local/).</"
+"p><p><b>Note:</b> Never choose a Folder which <u>does not</u> contain mbox-"
+"files (for example a maildir): if you do, you will get many new folders.</"
+"p><p>Since it is possible to recreate the folder structure, the folders will "
+"be stored under: \"Evolution-Import\".</p>"
 msgstr ""
-"<p><b>Evolution 1.x 信件匯入過濾器</b></p>"
-"<p>請選擇 Evolution 的信件目錄（通常是 ~/evolution/local）。</p>"
-"<p>這個過濾器會產生一個叫 Evolution-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
+"<p><b>Evolution 2.x 信件匯入過濾器</b></p><p>請選擇您要匯入的 Evolution 信件"
+"根目錄（通常是在 ~/.evolution/mail/local/ 中）。</p><p><b>注意：</b>請不要選"
+"擇<u>不含</u> mbox 格式郵件的目錄（例如使用 maildir 的目錄），不然會產生很多"
+"新的信件夾。</p><p>這個過濾器會產生一個叫 Evolution-Import 的信件夾，並幫您保"
+"存原先的目錄結構。</p>"
 
-#: filter_evolution.cxx:76 filter_evolution_v2.cxx:90
-#: filter_kmail_maildir.cxx:83 filter_mailapp.cxx:126 filter_mbox.cxx:132
-#: filter_opera.cxx:141 filter_plain.cxx:80 filter_pmail.cxx:79
-#: filter_sylpheed.cxx:78 filter_thebat.cxx:84 filter_thunderbird.cxx:99
-#, c-format
-msgid "Finished importing emails from %1"
-msgstr "匯入信件夾 %1 完成。"
+#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
+#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
+#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
+#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
+msgid "Finished import, canceled by user."
+msgstr "已取消匯入。"
+
+#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
+#: filter_thunderbird.cxx:129
+msgid "Start import file %1..."
+msgstr "開始匯入檔案 %1..."
 
 #: filter_kmail_archive.cxx:24
 msgid "Import KMail Archive File"
@@ -127,118 +178,30 @@ msgstr ""
 
 #: filter_kmail_archive.cxx:26
 msgid ""
-"<p><b>KMail Archive File Import Filter</b></p>"
-"<p>This filter will import archives files previously exported by KMail.</p>"
-"<p>Archive files contain a complete folder subtree compressed into a single "
-"file.</p>"
+"<p><b>KMail Archive File Import Filter</b></p><p>This filter will import "
+"archives files previously exported by KMail.</p><p>Archive files contain a "
+"complete folder subtree compressed into a single file.</p>"
 msgstr ""
 
-#: filter_pmail.cxx:31
-msgid "Import Folders From Pegasus-Mail"
-msgstr "匯入 Pegasus-Mail 的信件"
-
-#: filter_pmail.cxx:33
-msgid ""
-"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
-"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or "
-"C:\\pmail\\mail\\admin</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"folders will be stored under: \"PegasusMail-Import\".</p>"
-msgstr ""
-"<p>請選擇您系統上的 Pegasus-Mail 的郵件目錄（那些 *.CNM、*.PMM、*.MBX檔）。大部份系統都是放在 C:\\pmail\\mail "
-"或 C:\\pmail\\mail\\admin 中</p>"
-"<p><b>注意：</b>這個過濾器會產生一個叫 PegasusMail-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
-
-#: filter_pmail.cxx:69
-msgid ""
-"Cannot parse the folder structure; continuing import without subfolder support."
-msgstr "無法剖析目錄結構：改成不匯入子目錄。"
-
-#: filter_pmail.cxx:72
-msgid "Importing new mail files ('.cnm')..."
-msgstr "正在匯入新的信件檔('.cnm')..."
-
-#: filter_pmail.cxx:74
-msgid "Importing mail folders ('.pmm')..."
-msgstr "正在匯入信件夾('.pmm')..."
-
-#: filter_pmail.cxx:76
-msgid "Importing 'UNIX' mail folders ('.mbx')..."
-msgstr "正在匯入'UNIX'信件夾('.mbx')..."
-
-#: filter_pmail.cxx:175 filter_pmail.cxx:255
-#, c-format
-msgid "Importing %1"
-msgstr "匯入 %1 中"
-
-#: filter_lnotes.cxx:109 filter_pmail.cxx:279
-#, c-format
-msgid "Message %1"
-msgstr "信件 %1"
-
-#: filter_pmail.cxx:290
-msgid "Parsing the folder structure..."
-msgstr "剖析目錄結構中..."
-
-#: kselfilterpage.cpp:78
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>這個過濾器是由 %1 所撰寫</i></p>"
-
-#: filter_lnotes.cxx:30
-msgid "Import Lotus Notes Emails"
-msgstr "匯入 Lotus Notes 信件"
-
-#: filter_lnotes.cxx:32
-msgid ""
-"<p><b>Lotus Notes Structured Text mail import filter</b></p>"
-"<p>This filter will import Structured Text files from an exported Lotus Notes "
-"email client into KMail. Use this filter if you want to import mails from Lotus "
-"or other mailers that use the Lotus Notes Structured Text format.</p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
-"imported messages will be stored in subfolders under: \"LNotes-Import\", in "
-"your local folder, named using the names of the files the messages came "
-"from.</p>"
-msgstr ""
-"<p><b>Lotus Notes 信件匯入過濾器</b></p>"
-"<p>這個過濾器會讀取您先前匯出的 Lotus Notes 信件格式檔，並將其中信件匯入 KMail 中。</p>"
-"<p><b>注意：</b>這個過濾器會產生一個叫 LNotes-Import 的信件夾，並幫您保存原先的目錄格式。</p>"
-
-#: filter_lnotes.cxx:55
-msgid "All Files (*)"
-msgstr "所有檔案 (*)"
-
-#: filter_lnotes.cxx:64
-#, c-format
-msgid "Importing emails from %1"
-msgstr "正在匯入從 %1 中匯入信件..."
-
 #: filter_kmail_maildir.cxx:26
 msgid "Import KMail Maildirs and Folder Structure"
 msgstr "匯入 KMail 的信件"
 
 #: filter_kmail_maildir.cxx:28
 msgid ""
-"<p><b>KMail import filter</b></p>"
-"<p>Select the base directory of the KMail mailfolder you want to import.</p>"
-"<p><b>Note:</b> Never select your current local KMail maildir (usually ~/Mail "
-"or ~/.trinity/share/apps/kmail/mail ): in this case, KMailCVT may become stuck "
-"in a continuous loop. </p>"
-"<p>This filter does not import KMail mailfolders with mbox files.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"KMail-Import\" in your local folder.</p>"
+"<p><b>KMail import filter</b></p><p>Select the base directory of the KMail "
+"mailfolder you want to import.</p><p><b>Note:</b> Never select your current "
+"local KMail maildir (usually ~/Mail or ~/.trinity/share/apps/kmail/mail ): "
+"in this case, KMailCVT may become stuck in a continuous loop. </p><p>This "
+"filter does not import KMail mailfolders with mbox files.</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"KMail-Import\" in your local folder.</p>"
 msgstr ""
-"<p><b>KMail 信件匯入過濾器</b></p>"
-"<p>請選擇您要匯入的 KMail 的信件根目錄。</p>"
-"<p><b>注意：</b>請不要選擇您現在所使用的 KMail 目錄 (通常是 ~/Mail 或 "
-"~/.trinity/share/apps/kmail/mail），否則 KMailCVT 有可能會陷入無窮迴圈中。</p>"
-"<p>這個過濾器會產生一個叫 KMail-Import 的資料夾，並幫您保存原先的目錄結構。</p>"
-
-#: filter_evolution_v2.cxx:94 filter_kmail_maildir.cxx:87
-#: filter_mailapp.cxx:137 filter_mbox.cxx:138 filter_oe.cxx:102
-#: filter_opera.cxx:155 filter_plain.cxx:84 filter_sylpheed.cxx:82
-#: filter_thebat.cxx:88 filter_thunderbird.cxx:104
-msgid "Finished import, canceled by user."
-msgstr "已取消匯入。"
+"<p><b>KMail 信件匯入過濾器</b></p><p>請選擇您要匯入的 KMail 的信件根目錄。</"
+"p><p><b>注意：</b>請不要選擇您現在所使用的 KMail 目錄 (通常是 ~/Mail 或 ~/."
+"trinity/share/apps/kmail/mail），否則 KMailCVT 有可能會陷入無窮迴圈中。</"
+"p><p>這個過濾器會產生一個叫 KMail-Import 的資料夾，並幫您保存原先的目錄結構。"
+"</p>"
 
 #: filter_kmail_maildir.cxx:196 filter_sylpheed.cxx:140 filter_thebat.cxx:199
 msgid "Import folder %1..."
@@ -251,178 +214,37 @@ msgstr "正在匯入信件夾 %1..."
 msgid "Could not import %1"
 msgstr "無法匯入 %1"
 
-#: filter_thunderbird.cxx:28
-msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
-msgstr "匯入 Thunderbird/Mozilla 郵件"
-
-#: filter_thunderbird.cxx:30
-msgid ""
-"<p><b>Thunderbird/Mozilla import filter</b></p>"
-"<p>Select your base Thunderbird/Mozilla mailfolder (usually "
-"~/.thunderbird/*.default/Mail/Local Folders/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example, a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Thunderbird-Import\".</p>"
-msgstr ""
-"<p><b>Thunderbird/Mozilla 信件匯入過濾器</b></p>"
-"<p>請選擇您在 Thunder/Mozilla 信件的根目錄（通常是在 "
-"~/.thunderbird/*.default/Mail/Local/Folders/）。</p>"
-"<p><b>注意：</b>不要選擇<u>不含</u> mbox 格式郵件的目錄（例如使用 maildir 的目錄），不然會產生很多新的信件夾。</p>"
-"<p>這個過濾器會產生一個叫 Thunderbird-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
-
-#: filter_evolution_v2.cxx:124 filter_thunderbird.cxx:94
-#: filter_thunderbird.cxx:129
-msgid "Start import file %1..."
-msgstr "開始匯入檔案 %1..."
-
-#: filter_opera.cxx:28
-msgid "Import Opera Emails"
-msgstr "匯入 Opera 的信件"
-
-#: filter_opera.cxx:30
-msgid ""
-"<p><b>Opera email import filter</b></p>"
-"<p>This filter will import mails from Opera mail folder. Use this filter if you "
-"want to import all mails within a account in the Opera maildir.</p>"
-"<p>Select the directory of the account (usually "
-"~/.opera/mail/store/account*).</p>"
-"<p><b>Note:</b> Emails will be imported into a folder named after the account "
-"they came from, prefixed with OPERA-</p>"
-msgstr ""
-"<p><b>Opera 信件匯入過濾器</b></p>"
-"<p>請選擇要匯入帳號的目錄（通常是 ~/.opera/mail/store/account*）。</p>"
-"<p>這個過濾器將 Opera 中某個帳號的所有郵件匯入，並存在信件夾內，信件夾的名稱會用 OPERA-您的帳號名稱。</p>"
-
-#: filter_evolution_v2.cxx:29
-msgid "Import Evolution 2.x Local Mails and Folder Structure"
-msgstr "匯入 Evolution 2.x 的信件"
-
-#: filter_evolution_v2.cxx:31
-msgid ""
-"<p><b>Evolution 2.x import filter</b></p>"
-"<p>Select the base directory of your local Evolution mailfolder (usually "
-"~/.evolution/mail/local/).</p>"
-"<p><b>Note:</b> Never choose a Folder which <u>does not</u> "
-"contain mbox-files (for example a maildir): if you do, you will get many new "
-"folders.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Evolution-Import\".</p>"
-msgstr ""
-"<p><b>Evolution 2.x 信件匯入過濾器</b></p>"
-"<p>請選擇您要匯入的 Evolution 信件根目錄（通常是在 ~/.evolution/mail/local/ 中）。</p>"
-"<p><b>注意：</b>請不要選擇<u>不含</u> mbox 格式郵件的目錄（例如使用 maildir 的目錄），不然會產生很多新的信件夾。</p>"
-"<p>這個過濾器會產生一個叫 Evolution-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
-
-#. i18n: file kimportpagedlg.ui line 91
-#: rc.cpp:3
-#, no-c-format
-msgid "From:"
-msgstr "從:"
-
-#. i18n: file kimportpagedlg.ui line 99
-#: rc.cpp:6
-#, no-c-format
-msgid "To:"
-msgstr "到:"
-
-#. i18n: file kimportpagedlg.ui line 107
-#: rc.cpp:9
-#, no-c-format
-msgid "Current:"
-msgstr "目前的:"
-
-#. i18n: file kimportpagedlg.ui line 115
-#: rc.cpp:12
-#, no-c-format
-msgid "Importing in progress..."
-msgstr "匯入中..."
-
-#. i18n: file kimportpagedlg.ui line 134
-#: rc.cpp:15 rc.cpp:18 rc.cpp:24
-#, no-c-format
-msgid "..."
-msgstr "..."
-
-#. i18n: file kimportpagedlg.ui line 158
-#: rc.cpp:21
-#, no-c-format
-msgid "Total:"
-msgstr "總計:"
-
-#. i18n: file kimportpagedlg.ui line 199
-#: rc.cpp:27
-#, no-c-format
-msgid "Click 'Back' to import more emails or contacts"
-msgstr "按「上一頁」可以繼續匯入其他的郵件跟聯絡人等"
+#: filter_lnotes.cxx:30
+msgid "Import Lotus Notes Emails"
+msgstr "匯入 Lotus Notes 信件"
 
-#. i18n: file kselfilterpagedlg.ui line 94
-#: rc.cpp:30
-#, no-c-format
+#: filter_lnotes.cxx:32
 msgid ""
-"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
-"<br>"
-"<br>\n"
-"This program will help you import your email from your previous email program "
-"into KMail."
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-" Please select the program you would like to import from, then click 'Next'."
+"<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter "
+"will import Structured Text files from an exported Lotus Notes email client "
+"into KMail. Use this filter if you want to import mails from Lotus or other "
+"mailers that use the Lotus Notes Structured Text format.</p><p><b>Note:</b> "
+"Since it is possible to recreate the folder structure, the imported messages "
+"will be stored in subfolders under: \"LNotes-Import\", in your local folder, "
+"named using the names of the files the messages came from.</p>"
 msgstr ""
-"<b>歡迎使用 KMailCVT - KMail 的郵件匯入工具</b>\n"
-"<br>"
-"<br>\n"
-"這個工具會幫忙您將您之前使用的收發信軟體中的信件搬到 KMail 中。"
-"<br>"
-"<br>"
-"<br>"
-"<br>\n"
-"請選擇您要使用的匯入過濾器，並按「下一頁」。"
-
-#. i18n: file kselfilterpagedlg.ui line 133
-#: rc.cpp:36
-#, no-c-format
-msgid "Remove &duplicate messages during import"
-msgstr "匯入過程中移除重複的信件 (&d)"
-
-#: main.cpp:33
-msgid "KMailCVT"
-msgstr "KMailCVT"
-
-#: main.cpp:34
-msgid "KMail Import Filters"
-msgstr "KMail 信件匯入過濾器"
-
-#: main.cpp:35
-msgid "(c) 2000-2005, The KMailCVT developers"
-msgstr "(c) 2000-2005, KMailCVT 開發者"
-
-#: main.cpp:36
-msgid "Original author"
-msgstr "作者"
+"<p><b>Lotus Notes 信件匯入過濾器</b></p><p>這個過濾器會讀取您先前匯出的 "
+"Lotus Notes 信件格式檔，並將其中信件匯入 KMail 中。</p><p><b>注意：</b>這個過"
+"濾器會產生一個叫 LNotes-Import 的信件夾，並幫您保存原先的目錄格式。</p>"
 
-#: main.cpp:37
-msgid "Maintainer & New filters"
-msgstr "維護者及新的過濾器"
-
-#: main.cpp:38 main.cpp:39
-msgid "New GUI & cleanups"
-msgstr "新的 GUI 設計"
+#: filter_lnotes.cxx:55
+msgid "All Files (*)"
+msgstr "所有檔案 (*)"
 
-#: _translatorinfo.cpp:1
-msgid ""
-"_: NAME OF TRANSLATORS\n"
-"Your names"
-msgstr "曾賢舜，高嘉璘"
+#: filter_lnotes.cxx:64
+#, c-format
+msgid "Importing emails from %1"
+msgstr "正在匯入從 %1 中匯入信件..."
 
-#: _translatorinfo.cpp:3
-msgid ""
-"_: EMAIL OF TRANSLATORS\n"
-"Your emails"
-msgstr "id5id5@tcts1.seed.net.tw, acelan@kde.linux.org.tw"
+#: filter_lnotes.cxx:109 filter_pmail.cxx:279
+#, c-format
+msgid "Message %1"
+msgstr "信件 %1"
 
 #: filter_mailapp.cxx:32
 msgid "Import From OS X Mail"
@@ -430,11 +252,11 @@ msgstr "匯入 OS X 的信件"
 
 #: filter_mailapp.cxx:34
 msgid ""
-"<p><b>OS X Mail Import Filter</b></p>"
-"<p>This filter imports e-mails from the Mail client in Apple Mac OS X.</p>"
+"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
+"Mail client in Apple Mac OS X.</p>"
 msgstr ""
-"<p><b>OS X 信件匯入過濾器</b></p>"
-"<p>這個過濾器會幫忙您將 Apple Mac OS X 的收發信軟體中的郵件匯入 Kmail 中。</p>"
+"<p><b>OS X 信件匯入過濾器</b></p><p>這個過濾器會幫忙您將 Apple Mac OS X 的收"
+"發信軟體中的郵件匯入 Kmail 中。</p>"
 
 #: filter_mailapp.cxx:129 filter_mbox.cxx:135
 msgid ""
@@ -442,25 +264,26 @@ msgid ""
 "%n duplicate messages not imported to folder %1 in KMail"
 msgstr "有 %n 封重複信件未匯入信件夾 %1。"
 
-#: kmailcvt.cpp:28
-msgid "KMailCVT Import Tool"
-msgstr "KMailCVT 郵件匯入工具"
-
-#: kmailcvt.cpp:31
-msgid "Step 1: Select Filter"
-msgstr "步驟一：選擇匯入過濾器"
-
-#: kmailcvt.cpp:34
-msgid "Step 2: Importing..."
-msgstr "步驟二：匯入信件"
+#: filter_mbox.cxx:28
+msgid "Import mbox Files (UNIX, Evolution)"
+msgstr "匯入 mbox 檔（UNIX 或 Evolution 使用的信件檔）"
 
-#: kmailcvt.cpp:76
-msgid "Import in progress"
-msgstr "匯入中..."
+#: filter_mbox.cxx:30
+msgid ""
+"<p><b>mbox import filter</b></p><p>This filter will import mbox files into "
+"KMail. Use this filter if you want to import mails from Ximian Evolution or "
+"other mailers that use this traditional UNIX format.</p><p><b>Note:</b> "
+"Emails will be imported into folders named after the file they came from, "
+"prefixed with MBOX-</p>"
+msgstr ""
+"<p><b>mbox 信件匯入過濾器</b></p><p>這個過濾器可以將 mbox 檔案中的信件匯入 "
+"KMail 中。如果您原先是使用 Ximian Evolution 或其他使用傳統 UNIX 信件檔格式的"
+"軟體，您可以用這個過濾器來將信件匯入。</p><p><b>注意：</b>信件會匯入到新的信"
+"件夾，信件夾名稱為原來的檔名前面加上 MBOX-。</p>"
 
-#: kmailcvt.cpp:79
-msgid "Import finished"
-msgstr "信件已匯入完成"
+#: filter_mbox.cxx:48
+msgid "mbox Files (*)"
+msgstr "mbox 檔案 (*)"
 
 #: filter_oe.cxx:40
 msgid "Import Outlook Express Emails"
@@ -468,21 +291,18 @@ msgstr "匯入 Outelook Express 的信件"
 
 #: filter_oe.cxx:42
 msgid ""
-"<p><b>Outlook Express 4/5/6 import filter</b></p>"
-"<p>You will need to locate the folder where the mailbox has been stored by "
-"searching for .dbx or .mbx files under "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> in Windows 9x"
-"<li><i>Documents and Settings</i> in Windows 2000 or later</ul></p>"
-"<p><b>Note:</b> Since it is possible to recreate the folder structure, the "
+"<p><b>Outlook Express 4/5/6 import filter</b></p><p>You will need to locate "
+"the folder where the mailbox has been stored by searching for .dbx or .mbx "
+"files under <ul><li><i>C:\\Windows\\Application Data</i> in Windows "
+"9x<li><i>Documents and Settings</i> in Windows 2000 or later</ul></"
+"p><p><b>Note:</b> Since it is possible to recreate the folder structure, the "
 "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in "
 "your local folder.</p>"
 msgstr ""
-"<p><b>Outlook Express 4/5/6 信件匯入過濾器</b></p>"
-"<p>若您使用的是 Windows 2000 或之後的版本，您可能必需在 "
-"<ul>"
-"<li><i>C:\\Windows\\Application Data</i> 找尋有 .dbx 或 .mbx 檔案的信件目錄。</p>"
-"<p><b>注意：</b>這個過濾器會產生一個叫 OE-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
+"<p><b>Outlook Express 4/5/6 信件匯入過濾器</b></p><p>若您使用的是 Windows "
+"2000 或之後的版本，您可能必需在 <ul><li><i>C:\\Windows\\Application Data</i> "
+"找尋有 .dbx 或 .mbx 檔案的信件目錄。</p><p><b>注意：</b>這個過濾器會產生一個"
+"叫 OE-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
 
 #: filter_oe.cxx:67
 #, c-format
@@ -517,29 +337,181 @@ msgstr "匯入 OE5+ 信件夾 %1 中..."
 msgid "Importing OE5+ Folder file %1"
 msgstr "正在匯入 OE5+ 信件檔 %1 中..."
 
+#: filter_opera.cxx:28
+msgid "Import Opera Emails"
+msgstr "匯入 Opera 的信件"
+
+#: filter_opera.cxx:30
+msgid ""
+"<p><b>Opera email import filter</b></p><p>This filter will import mails from "
+"Opera mail folder. Use this filter if you want to import all mails within a "
+"account in the Opera maildir.</p><p>Select the directory of the account "
+"(usually ~/.opera/mail/store/account*).</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OPERA-</p>"
+msgstr ""
+"<p><b>Opera 信件匯入過濾器</b></p><p>請選擇要匯入帳號的目錄（通常是 ~/.opera/"
+"mail/store/account*）。</p><p>這個過濾器將 Opera 中某個帳號的所有郵件匯入，並"
+"存在信件夾內，信件夾的名稱會用 OPERA-您的帳號名稱。</p>"
+
+#: filter_opera.cxx:75 filter_outlook.cxx:45 filter_plain.cxx:51
+#: filter_pmail.cxx:61
+msgid "Counting files..."
+msgstr "計算檔案中..."
+
+#: filter_opera.cxx:82 filter_outlook.cxx:49 filter_plain.cxx:55
+msgid "Importing new mail files..."
+msgstr "正在匯入新的信件檔..."
+
+#: filter_outlook.cxx:28
+msgid "Import Outlook Emails"
+msgstr "匯入 Outlook 的信件"
+
+#: filter_outlook.cxx:30
+msgid ""
+"<p><b>Outlook email import filter</b></p><p>This filter will import mails "
+"from a Outlook pst-file. You will need to locate the folder where the pst-"
+"file has been stored by searching for .pst files under: <i>C:\\Documents and "
+"Settings</i> in Windows 2000 or later</p><p><b>Note:</b> Emails will be "
+"imported into a folder named after the account they came from, prefixed with "
+"OUTLOOK-</p>"
+msgstr ""
+"<p><b>Outlook 信件匯入過濾器</b></p><p>這個過濾器會讀取 Outlook 的 pst 檔並匯"
+"入信件。若您使用的是 Windows 2000 或之後的系統，您必須在 <i>C:\\Documents "
+"and Settings</i> 中找尋 .pst 檔。</p><p><b>注意：</b>這個過濾器會產生一個新的"
+"信件夾，名稱為 pst 檔的檔名前面加上 OUTLOOK-。</p>"
+
+#: filter_outlook.cxx:46
+msgid "Counting mail..."
+msgstr "計算信件中..."
+
+#: filter_outlook.cxx:47
+msgid "Counting directories..."
+msgstr "計算目錄中..."
+
+#: filter_outlook.cxx:48
+msgid "Counting folders..."
+msgstr "計算資料夾中..."
+
+#: filter_plain.cxx:27
+msgid "Import Plain Text Emails"
+msgstr "匯入純文字信件"
+
+#: filter_plain.cxx:29
+msgid ""
+"<p>Select the directory containing the emails on your system. The emails are "
+"placed in a folder with the same name as the directory they were in, "
+"prefixed by PLAIN-</p><p>This filter will import all .msg, .eml and .txt "
+"emails.</p>"
+msgstr ""
+"<p>這個過濾器會匯入所有的 .msg、.eml 與 .txt 檔。</p><p>請選擇包含以上郵件檔"
+"的目錄。這些信件將會匯入到新的信件夾中，名稱為原來目錄的名稱，前面加上 "
+"PLAIN-。</p>"
+
+#: filter_pmail.cxx:31
+msgid "Import Folders From Pegasus-Mail"
+msgstr "匯入 Pegasus-Mail 的信件"
+
+#: filter_pmail.cxx:33
+msgid ""
+"<p>Select the Pegasus-Mail directory on your system (containing *.CNM, *.PMM "
+"and *.MBX files). On many systems this is stored in C:\\pmail\\mail or C:"
+"\\pmail\\mail\\admin</p><p><b>Note:</b> Since it is possible to recreate the "
+"folder structure, the folders will be stored under: \"PegasusMail-Import\".</"
+"p>"
+msgstr ""
+"<p>請選擇您系統上的 Pegasus-Mail 的郵件目錄（那些 *.CNM、*.PMM、*.MBX檔）。大"
+"部份系統都是放在 C:\\pmail\\mail 或 C:\\pmail\\mail\\admin 中</p><p><b>注意："
+"</b>這個過濾器會產生一個叫 PegasusMail-Import 的信件夾，並幫您保存原先的目錄"
+"結構。</p>"
+
+#: filter_pmail.cxx:69
+msgid ""
+"Cannot parse the folder structure; continuing import without subfolder "
+"support."
+msgstr "無法剖析目錄結構：改成不匯入子目錄。"
+
+#: filter_pmail.cxx:72
+msgid "Importing new mail files ('.cnm')..."
+msgstr "正在匯入新的信件檔('.cnm')..."
+
+#: filter_pmail.cxx:74
+msgid "Importing mail folders ('.pmm')..."
+msgstr "正在匯入信件夾('.pmm')..."
+
+#: filter_pmail.cxx:76
+msgid "Importing 'UNIX' mail folders ('.mbx')..."
+msgstr "正在匯入'UNIX'信件夾('.mbx')..."
+
+#: filter_pmail.cxx:175 filter_pmail.cxx:255
+#, c-format
+msgid "Importing %1"
+msgstr "匯入 %1 中"
+
+#: filter_pmail.cxx:290
+msgid "Parsing the folder structure..."
+msgstr "剖析目錄結構中..."
+
 #: filter_sylpheed.cxx:27
 msgid "Import Sylpheed Maildirs and Folder Structure"
 msgstr "匯入 Sylpheed 的信件"
 
 #: filter_sylpheed.cxx:29
 msgid ""
-"<p><b>Sylpheed import filter</b></p>"
-"<p>Select the base directory of the Sylpheed mailfolder you want to import "
-"(usually: ~/Mail ).</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"Sylpheed-Import\" in your local folder.</p>"
-"<p>This filter also recreates the status of message, e.g. new or forwarded."
+"<p><b>Sylpheed import filter</b></p><p>Select the base directory of the "
+"Sylpheed mailfolder you want to import (usually: ~/Mail ).</p><p>Since it is "
+"possible to recreate the folder structure, the folders will be stored under: "
+"\"Sylpheed-Import\" in your local folder.</p><p>This filter also recreates "
+"the status of message, e.g. new or forwarded."
+msgstr ""
+"<p><b>Sylpheed 信件匯入過濾器</b></p><p>請選擇您要匯入的 Sylpheed 郵件的根目"
+"錄（通常是 ~/Mail）。</p><p>這個過濾器會產生一個叫 Sylpheed-Import 的信件夾，"
+"並幫您保存原先的目錄結構。</p><p>它並且會重新產生每一封信件的狀態，例如是未讀"
+"的或是已轉寄之類。</p>"
+
+#: filter_thebat.cxx:33
+msgid "Import The Bat! Mails and Folder Structure"
+msgstr "匯入 The Bat! 的信件"
+
+#: filter_thebat.cxx:35
+msgid ""
+"<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The "
+"Bat!' local mailfolder you want to import.</p><p><b>Note:</b> This filter "
+"imports the *.tbb-files from 'The Bat!' local folder, e.g. from POP "
+"accounts, and not from IMAP/DIMAP accounts.</p><p>Since it is possible to "
+"recreate the folder structure, the folders will be stored under: \"TheBat-"
+"Import\" in your local account.</p>"
 msgstr ""
-"<p><b>Sylpheed 信件匯入過濾器</b></p>"
-"<p>請選擇您要匯入的 Sylpheed 郵件的根目錄（通常是 ~/Mail）。</p>"
-"<p>這個過濾器會產生一個叫 Sylpheed-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
-"<p>它並且會重新產生每一封信件的狀態，例如是未讀的或是已轉寄之類。</p>"
+"<p><b>The Bat! 信件匯入過濾器</b></p><p>請選擇您要匯入的 `The Bat!' 的信件根"
+"目錄。</p><p><b>注意：</b>這個過濾器會讀取 The Bat! 資料夾中的 .tbb 檔並匯"
+"入，也就是只匯入 POP 帳號的信件，而不會匯入 IMAP/DIMAP 帳號中的信件。</p><p>"
+"這個過濾器會產生一個叫 TheBat-Import 的信件夾，並幫您保存原來的目錄結構。</p>"
+
+#: filter_thunderbird.cxx:28
+msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure"
+msgstr "匯入 Thunderbird/Mozilla 郵件"
+
+#: filter_thunderbird.cxx:30
+msgid ""
+"<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base "
+"Thunderbird/Mozilla mailfolder (usually ~/.thunderbird/*.default/Mail/Local "
+"Folders/).</p><p><b>Note:</b> Never choose a Folder which <u>does not</u> "
+"contain mbox-files (for example, a maildir): if you do, you will get many "
+"new folders.</p><p>Since it is possible to recreate the folder structure, "
+"the folders will be stored under: \"Thunderbird-Import\".</p>"
+msgstr ""
+"<p><b>Thunderbird/Mozilla 信件匯入過濾器</b></p><p>請選擇您在 Thunder/"
+"Mozilla 信件的根目錄（通常是在 ~/.thunderbird/*.default/Mail/Local/"
+"Folders/）。</p><p><b>注意：</b>不要選擇<u>不含</u> mbox 格式郵件的目錄（例如"
+"使用 maildir 的目錄），不然會產生很多新的信件夾。</p><p>這個過濾器會產生一個"
+"叫 Thunderbird-Import 的信件夾，並幫您保存原先的目錄結構。</p>"
 
 #: filters.cxx:145 filters.cxx:180 filters.cxx:208
 msgid ""
-"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure <i>"
-"kmail</i> is installed."
-msgstr "<b>嚴重錯誤:</b>無法啟動 KMail DCOP 通訊。請確定您有安裝 <i>KMail</i>。"
+"<b>Fatal:</b> Unable to start KMail for DCOP communication. Make sure "
+"<i>kmail</i> is installed."
+msgstr ""
+"<b>嚴重錯誤:</b>無法啟動 KMail DCOP 通訊。請確定您有安裝 <i>KMail</i>。"
 
 #: filters.cxx:153 filters.cxx:188
 msgid "Cannot make folder %1 in KMail"
@@ -553,58 +525,57 @@ msgstr "無法在 %1 信件夾新增郵件"
 msgid "Error while adding message to folder %1 in KMail"
 msgstr "當在信件夾 %1 新增郵件時發生錯誤"
 
-#: filter_plain.cxx:27
-msgid "Import Plain Text Emails"
-msgstr "匯入純文字信件"
+#: kimportpagedlg.ui:91
+#, no-c-format
+msgid "From:"
+msgstr "從:"
 
-#: filter_plain.cxx:29
-msgid ""
-"<p>Select the directory containing the emails on your system. The emails are "
-"placed in a folder with the same name as the directory they were in, prefixed "
-"by PLAIN-</p>"
-"<p>This filter will import all .msg, .eml and .txt emails.</p>"
-msgstr ""
-"<p>這個過濾器會匯入所有的 .msg、.eml 與 .txt 檔。</p>"
-"<p>請選擇包含以上郵件檔的目錄。這些信件將會匯入到新的信件夾中，名稱為原來目錄的名稱，前面加上 PLAIN-。</p>"
+#: kimportpagedlg.ui:99
+#, no-c-format
+msgid "To:"
+msgstr "到:"
 
-#: filter_mbox.cxx:28
-msgid "Import mbox Files (UNIX, Evolution)"
-msgstr "匯入 mbox 檔（UNIX 或 Evolution 使用的信件檔）"
+#: kimportpagedlg.ui:107
+#, no-c-format
+msgid "Current:"
+msgstr "目前的:"
 
-#: filter_mbox.cxx:30
-msgid ""
-"<p><b>mbox import filter</b></p>"
-"<p>This filter will import mbox files into KMail. Use this filter if you want "
-"to import mails from Ximian Evolution or other mailers that use this "
-"traditional UNIX format.</p>"
-"<p><b>Note:</b> Emails will be imported into folders named after the file they "
-"came from, prefixed with MBOX-</p>"
-msgstr ""
-"<p><b>mbox 信件匯入過濾器</b></p>"
-"<p>這個過濾器可以將 mbox 檔案中的信件匯入 KMail 中。如果您原先是使用 Ximian Evolution 或其他使用傳統 UNIX "
-"信件檔格式的軟體，您可以用這個過濾器來將信件匯入。</p>"
-"<p><b>注意：</b>信件會匯入到新的信件夾，信件夾名稱為原來的檔名前面加上 MBOX-。</p>"
+#: kimportpagedlg.ui:115
+#, no-c-format
+msgid "Importing in progress..."
+msgstr "匯入中..."
 
-#: filter_mbox.cxx:48
-msgid "mbox Files (*)"
-msgstr "mbox 檔案 (*)"
+#: kimportpagedlg.ui:134 kimportpagedlg.ui:150 kimportpagedlg.ui:174
+#, no-c-format
+msgid "..."
+msgstr "..."
 
-#: filter_thebat.cxx:33
-msgid "Import The Bat! Mails and Folder Structure"
-msgstr "匯入 The Bat! 的信件"
+#: kimportpagedlg.ui:158
+#, no-c-format
+msgid "Total:"
+msgstr "總計:"
 
-#: filter_thebat.cxx:35
+#: kimportpagedlg.ui:199
+#, no-c-format
+msgid "Click 'Back' to import more emails or contacts"
+msgstr "按「上一頁」可以繼續匯入其他的郵件跟聯絡人等"
+
+#: kselfilterpagedlg.ui:91
+#, no-c-format
 msgid ""
-"<p><b>The Bat! import filter</b></p>"
-"<p>Select the base directory of the 'The Bat!' local mailfolder you want to "
-"import.</p>"
-"<p><b>Note:</b> This filter imports the *.tbb-files from 'The Bat!' local "
-"folder, e.g. from POP accounts, and not from IMAP/DIMAP accounts.</p>"
-"<p>Since it is possible to recreate the folder structure, the folders will be "
-"stored under: \"TheBat-Import\" in your local account.</p>"
+"<b>Welcome to KMailCVT - The KMail Import Tool</b>\n"
+"<br><br>\n"
+"This program will help you import your email from your previous email "
+"program into KMail.<br><br><br><br>\n"
+" Please select the program you would like to import from, then click 'Next'."
 msgstr ""
-"<p><b>The Bat! 信件匯入過濾器</b></p>"
-"<p>請選擇您要匯入的 `The Bat!' 的信件根目錄。</p>"
-"<p><b>注意：</b>這個過濾器會讀取 The Bat! 資料夾中的 .tbb 檔並匯入，也就是只匯入 POP 帳號的信件，而不會匯入 "
-"IMAP/DIMAP 帳號中的信件。</p>"
-"<p>這個過濾器會產生一個叫 TheBat-Import 的信件夾，並幫您保存原來的目錄結構。</p>"
+"<b>歡迎使用 KMailCVT - KMail 的郵件匯入工具</b>\n"
+"<br><br>\n"
+"這個工具會幫忙您將您之前使用的收發信軟體中的信件搬到 KMail 中。"
+"<br><br><br><br>\n"
+"請選擇您要使用的匯入過濾器，並按「下一頁」。"
+
+#: kselfilterpagedlg.ui:133
+#, no-c-format
+msgid "Remove &duplicate messages during import"
+msgstr "匯入過程中移除重複的信件 (&d)"