diff -Nru akonadi-import-wizard-17.04.3/CMakeLists.txt akonadi-import-wizard-17.08.3/CMakeLists.txt
--- akonadi-import-wizard-17.04.3/CMakeLists.txt	2017-07-11 21:15:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/CMakeLists.txt	2017-11-07 01:26:36.000000000 +0000
@@ -1,7 +1,8 @@
-project(akonadi-import-wizard)
-
 cmake_minimum_required(VERSION 3.1)
-set(KF5_VERSION "5.32.0")
+set(PIM_VERSION "5.6.3")
+project(AkonadiImportWizard VERSION ${PIM_VERSION})
+
+set(KF5_VERSION "5.35.0")
 find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
 include(ECMInstallIcons)
@@ -33,25 +34,25 @@
 
 
 
-set(KDEPIM_VERSION_NUMBER "5.5.3")
+set(KDEPIM_VERSION_NUMBER "${PIM_VERSION}")
 set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
 
-set(KMAILTRANSPORT_LIB_VERSION "5.5.3")
-set(AKONADI_VERSION "5.5.3")
+set(KMAILTRANSPORT_LIB_VERSION "5.6.3")
+set(AKONADI_VERSION "5.6.3")
 
 set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
 set(KDEPIM_LIB_SOVERSION "5")
 
-set(QT_REQUIRED_VERSION "5.6.0")
+set(QT_REQUIRED_VERSION "5.7.0")
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Gui)
-set(MAILIMPORTER_VERSION_LIB "5.5.3")
-set(MAILCOMMON_LIB_VERSION_LIB "5.5.3")
-set(MESSAGELIB_LIB_VERSION_LIB "5.5.3")
-set(PIMCOMMON_LIB_VERSION_LIB "5.5.3")
-set(LIBKDEPIM_LIB_VERSION_LIB "5.5.3")
-set(IDENTITYMANAGEMENT_LIB_VERSION "5.5.3")
-set(KCONTACTS_LIB_VERSION "5.5.3")
+set(MAILIMPORTER_VERSION_LIB "5.6.3")
+set(MAILCOMMON_LIB_VERSION_LIB "5.6.3")
+set(MESSAGELIB_LIB_VERSION_LIB "5.6.3")
+set(PIMCOMMON_LIB_VERSION_LIB "5.6.3")
+set(LIBKDEPIM_LIB_VERSION_LIB "5.6.3")
+set(IDENTITYMANAGEMENT_LIB_VERSION "5.6.3")
+set(KCONTACTS_LIB_VERSION "5.6.3")
 
 # Find KF5 package
 find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
@@ -78,10 +79,7 @@
 
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 add_definitions(-DQT_USE_QSTRINGBUILDER)
-include_directories(
-    ${akonadi-import-wizard_SOURCE_DIR}/src/autodetect/
-    )
-
+add_definitions( -DQT_DISABLE_DEPRECATED_BEFORE=0x060000 )
 if(BUILD_TESTING)
    add_definitions(-DBUILD_TESTING)
 endif(BUILD_TESTING)
diff -Nru akonadi-import-wizard-17.04.3/debian/akonadi-import-wizard.install akonadi-import-wizard-17.08.3/debian/akonadi-import-wizard.install
--- akonadi-import-wizard-17.04.3/debian/akonadi-import-wizard.install	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/debian/akonadi-import-wizard.install	2017-12-01 15:00:03.000000000 +0000
@@ -0,0 +1,10 @@
+etc/xdg/importwizard.categories
+etc/xdg/importwizard.renamecategories
+usr/bin/importwizard
+usr/lib/*/qt5/plugins
+usr/share/applications/org.kde.importwizard.desktop
+usr/share/doc
+usr/share/icons
+usr/share/importwizard
+usr/share/kconf_update
+usr/share/locale
diff -Nru akonadi-import-wizard-17.04.3/debian/akonadi-import-wizard.lintian-overrides akonadi-import-wizard-17.08.3/debian/akonadi-import-wizard.lintian-overrides
--- akonadi-import-wizard-17.04.3/debian/akonadi-import-wizard.lintian-overrides	2017-08-21 13:34:13.000000000 +0000
+++ akonadi-import-wizard-17.08.3/debian/akonadi-import-wizard.lintian-overrides	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-akonadi-import-wizard: package-name-doesnt-match-sonames libimportwizard5
diff -Nru akonadi-import-wizard-17.04.3/debian/changelog akonadi-import-wizard-17.08.3/debian/changelog
--- akonadi-import-wizard-17.04.3/debian/changelog	2017-08-21 13:34:13.000000000 +0000
+++ akonadi-import-wizard-17.08.3/debian/changelog	2017-12-01 15:00:03.000000000 +0000
@@ -1,3 +1,11 @@
+akonadi-import-wizard (17.08.3-0ubuntu1) bionic; urgency=medium
+
+  * New build depend on libkf5contacteditor-dev
+  * Split out library and development files into their own packages
+  * New upstream release (17.08.3)
+
+ -- Rik Mills <rikmills@kubuntu.org>  Fri, 01 Dec 2017 15:00:03 +0000
+
 akonadi-import-wizard (17.04.3-0ubuntu1) artful; urgency=medium
 
   [ Rik Mills ]
diff -Nru akonadi-import-wizard-17.04.3/debian/control akonadi-import-wizard-17.08.3/debian/control
--- akonadi-import-wizard-17.04.3/debian/control	2017-08-21 13:34:13.000000000 +0000
+++ akonadi-import-wizard-17.08.3/debian/control	2017-12-01 15:00:03.000000000 +0000
@@ -14,14 +14,15 @@
                extra-cmake-modules (>= 5.31.0~),
                kross-dev (>= 5.31.0~),
                libassuan-dev,
-               libkf5akonadi-dev (>= 4:17.04.3~),
-               libkf5akonadiserver-dev (>= 4:17.04.3~),
+               libkf5akonadi-dev (>= 4:17.08.3~),
+               libkf5akonadiserver-dev (>= 4:17.08.3~),
                libkf5archive-dev (>= 5.31.0~),
                libkf5auth-dev (>= 5.31.0~),
                libkf5codecs-dev (>= 5.31.0~),
                libkf5completion-dev (>= 5.31.0~),
                libkf5config-dev (>= 5.31.0~),
-               libkf5contacts-dev (>= 4:17.04.3~),
+               libkf5contacteditor-dev (>= 4:17.08.3~),
+               libkf5contacts-dev (>= 4:17.08.3~),
                libkf5coreaddons-dev (>= 5.31.0~),
                libkf5crash-dev (>= 5.31.0~),
                libkf5dbusaddons-dev (>= 5.31.0~),
@@ -31,26 +32,26 @@
                libkf5gpgmepp-dev,
                libkf5i18n-dev (>= 5.31.0~),
                libkf5iconthemes-dev (>= 5.31.0~),
-               libkf5identitymanagement-dev (>= 17.04.3~),
+               libkf5identitymanagement-dev (>= 17.08.3~),
                libkf5itemviews-dev (>= 5.31.0~),
                libkf5kcmutils-dev (>= 5.31.0~),
                libkf5kdelibs4support-dev (>= 5.31.0~),
                libkf5khtml-dev (>= 5.31.0~),
-               libkf5libkdepim-dev (>= 4:17.04.3~),
-               libkf5mailcommon-dev (>= 4:17.04.3~),
-               libkf5mailimporter-dev (>= 4:17.04.3~),
-               libkf5mailtransport-dev (>= 17.04.3~),
-               libkf5messagecomposer-dev (>= 4:17.04.3~),
-               libkf5messagecore-dev (>= 4:17.04.3~),
-               libkf5messagelist-dev (>= 4:17.04.3~),
-               libkf5messageviewer-dev (>= 4:17.04.3~),
-               libkf5mimetreeparser-dev (>= 4:17.04.3~),
+               libkf5libkdepim-dev (>= 4:17.08.3~),
+               libkf5mailcommon-dev (>= 4:17.08.3~),
+               libkf5mailimporter-dev (>= 4:17.08.3~),
+               libkf5mailtransport-dev (>= 17.08.3~),
+               libkf5messagecomposer-dev (>= 4:17.08.3~),
+               libkf5messagecore-dev (>= 4:17.08.3~),
+               libkf5messagelist-dev (>= 4:17.08.3~),
+               libkf5messageviewer-dev (>= 4:17.08.3~),
+               libkf5mimetreeparser-dev (>= 4:17.08.3~),
                libkf5newstuff-dev (>= 5.31.0~),
                libkf5notifyconfig-dev (>= 5.31.0~),
-               libkf5pimcommon-dev (>= 4:17.04.3~),
+               libkf5pimcommon-dev (>= 4:17.08.3~),
                libkf5service-dev (>= 5.31.0~),
                libkf5sonnet-dev (>= 5.31.0~),
-               libkf5templateparser-dev (>= 4:17.04.3~),
+               libkf5templateparser-dev (>= 4:17.08.3~),
                libkf5texteditor-dev (>= 5.31.0~),
                libkf5textwidgets-dev (>= 5.31.0~),
                libkf5wallet-dev (>= 5.31.0~),
@@ -74,12 +75,39 @@
 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/akonadi-import-wizard
 Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/akonadi-import-wizard
 
-Package: akonadi-import-wizard
+Package: libkpimimportwizard-dev
+Section: libdevel
+Architecture: any
+Depends: libkf5mailtransport-dev (>= 17.08.3~),
+         libkpimimportwizard5  (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: PIM data import wizard
+ akonadi-import-wizard is an assistant to import PIM data from other
+ applications into Akonadi for use in KDE PIM applications
+ .
+ This package contains the import wizard developmentt files.
+
+Package: libkpimimportwizard5
+Section: libs
 Architecture: any
-Section: mail
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: PIM data import wizard
+ akonadi-import-wizard is an assistant to import PIM data from other
+ applications into Akonadi for use in KDE PIM applications
+ .
+ This package contains the import wizard shared libraries.
+
+Package: akonadi-import-wizard
+Section: mail
+Architecture: any
+Depends: libkpimimportwizard5  (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: ${kde-l10n:all}
 Replaces: ${kde-l10n:all}
+Homepage: http://pim.kde.org/
 Description: PIM data import wizard
  akonadi-import-wizard is an assistant to import PIM data from other
  applications into Akonadi for use in KDE PIM applications
+ .
diff -Nru akonadi-import-wizard-17.04.3/debian/docs akonadi-import-wizard-17.08.3/debian/docs
--- akonadi-import-wizard-17.04.3/debian/docs	2017-08-21 13:34:13.000000000 +0000
+++ akonadi-import-wizard-17.08.3/debian/docs	2017-12-01 15:00:03.000000000 +0000
@@ -0,0 +1 @@
+
diff -Nru akonadi-import-wizard-17.04.3/debian/libkpimimportwizard5.install akonadi-import-wizard-17.08.3/debian/libkpimimportwizard5.install
--- akonadi-import-wizard-17.04.3/debian/libkpimimportwizard5.install	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/debian/libkpimimportwizard5.install	2017-12-01 15:00:03.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/libKPimImportWizard.so.*
diff -Nru akonadi-import-wizard-17.04.3/debian/libkpimimportwizard-dev.install akonadi-import-wizard-17.08.3/debian/libkpimimportwizard-dev.install
--- akonadi-import-wizard-17.04.3/debian/libkpimimportwizard-dev.install	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/debian/libkpimimportwizard-dev.install	2017-12-01 15:00:03.000000000 +0000
@@ -0,0 +1,4 @@
+usr/include/KF5/KPim
+usr/include/KPim/importwizard_version.h
+usr/lib/*/cmake/KPimImportWizard/*
+usr/lib/*/libKPimImportWizard.so
diff -Nru akonadi-import-wizard-17.04.3/debian/not-installed akonadi-import-wizard-17.08.3/debian/not-installed
--- akonadi-import-wizard-17.04.3/debian/not-installed	2017-08-21 13:34:13.000000000 +0000
+++ akonadi-import-wizard-17.08.3/debian/not-installed	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-# TODO: get upstream to remove all of this
-./usr/lib/*/libakregatorinterfaces.so
-./usr/lib/*/libcalendarsupportcollectionpage.so
-./usr/lib/*/libcalendarsupport.so
-./usr/lib/*/libcomposereditorng.so
-./usr/lib/*/libeventviews.so
-./usr/lib/*/libfollowupreminder.so
-./usr/lib/*/libgrantleethemeeditor.so
-./usr/lib/*/libgrantleetheme.so
-./usr/lib/*/libincidenceeditorsngmobile.so
-./usr/lib/*/libincidenceeditorsng.so
-./usr/lib/*/libkdepimdbusinterfaces.so
-./usr/lib/*/libkdepim.so
-./usr/lib/*/libkdgantt2.so
-./usr/lib/*/libkleopatraclientcore.so
-./usr/lib/*/libkleopatraclientgui.so
-./usr/lib/*/libkleo.so
-./usr/lib/*/libkorganizer_core.so
-./usr/lib/*/libkorganizer_interfaces.so
-./usr/lib/*/libkpgp.so
-./usr/lib/*/libksieve.so
-./usr/lib/*/libmailcommon.so
-./usr/lib/*/libmailimporter.so
-./usr/lib/*/libmessagecomposer.so
-./usr/lib/*/libmessagecore.so
-./usr/lib/*/libmessagelist.so
-./usr/lib/*/libmessageviewer.so
-./usr/lib/*/libnoteshared.so
-./usr/lib/*/libpimcommon.so
-./usr/lib/*/libsendlater.so
-./usr/lib/*/libtemplateparser.so
-./usr/lib/*/libpimsettingexporterprivate.so
-./usr/lib/*/libKF5KManageSieve.so
-./usr/lib/*/libKF5KSieveUi.so
-./usr/share/dbus-1/interfaces/org.kde.addressbook.service.xml
-./usr/share/dbus-1/interfaces/org.kde.akregator.part.xml
-./usr/share/dbus-1/interfaces/org.kde.kalarm.kalarm.xml
-./usr/share/dbus-1/interfaces/org.kde.kmail.kmailpart.xml
-./usr/share/dbus-1/interfaces/org.kde.kmail.kmail.xml
-./usr/share/dbus-1/interfaces/org.kde.KNotes.xml
-./usr/share/dbus-1/interfaces/org.kde.kontact.KNotes.xml
-./usr/share/dbus-1/interfaces/org.kde.Korganizer.Calendar.xml
-./usr/share/dbus-1/interfaces/org.kde.korganizer.KOrgac.xml
-./usr/share/dbus-1/interfaces/org.kde.korganizer.Korganizer.xml
-./usr/share/dbus-1/interfaces/org.kde.mailtransport.service.xml
-
-# https://bugs.kde.org/show_bug.cgi?id=351252
-./usr/share/knode/pics/key_bad.png
-./usr/share/knode/pics/key_ok.png
-./usr/share/knode/pics/key.png
-./usr/share/knode/pics/key_unknown.png
diff -Nru akonadi-import-wizard-17.04.3/.gitignore akonadi-import-wizard-17.08.3/.gitignore
--- akonadi-import-wizard-17.04.3/.gitignore	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/.gitignore	2017-10-29 07:12:25.000000000 +0000
@@ -18,3 +18,4 @@
 random_seed
 /build/
 CMakeLists.txt.user*
+*.unc-backup*
diff -Nru akonadi-import-wizard-17.04.3/importwizard.categories akonadi-import-wizard-17.08.3/importwizard.categories
--- akonadi-import-wizard-17.04.3/importwizard.categories	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/importwizard.categories	2017-10-29 07:12:25.000000000 +0000
@@ -1 +1,11 @@
 org.kde.pim.importwizard importwizard (importwizard)
+org.kde.pim.importwizard.lib importwizard (libimportwizard)
+org.kde.pim.importwizard.balsaplugin importwizard (balsa plugin)
+org.kde.pim.importwizard.evolutionplugin importwizard (evolution v3 plugin)
+org.kde.pim.importwizard.gearyplugin importwizard (geary plugin)
+org.kde.pim.importwizard.operaplugin importwizard (opera plugin)
+org.kde.pim.importwizard.trojitaplugin importwizard (trojita plugin)
+org.kde.pim.importwizard.thunderbirdplugin importwizard (thunderbird plugin)
+org.kde.pim.importwizard.sylpheedplugin importwizard (sylpheed plugin)
+org.kde.pim.importwizard.clawsmailplugin importwizard (claws-mail plugin)
+
diff -Nru akonadi-import-wizard-17.04.3/po/ar/importwizard.po akonadi-import-wizard-17.08.3/po/ar/importwizard.po
--- akonadi-import-wizard-17.04.3/po/ar/importwizard.po	2017-07-11 21:15:24.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/ar/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2015-01-10 19:35+0300\n"
 "Last-Translator: Safa Alfulaij <safa1996alfulaij@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -28,48 +28,164 @@
 msgid "Your emails"
 msgstr "safa1996alfulaij@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, fuzzy, kde-format
+#| msgid "No program found"
+msgid "No program found."
+msgstr "لم يُعثر على برامج"
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr ""
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr "أغلق بريدك قبل استيراد البيانات. ستعدّل بعض الملحقات ملفّ ضبط بريدك."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr ""
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "اكتشف البرنامج"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "اختر الموادّ لاستيرادها"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "استورد رسائل البريد"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "استورد مرشّحات البريد"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "استورد الإعدادات"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "استورد دفاتر العناوين"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "استورد التّقاويم"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "أنهِ"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "استورد دفتر العناوين من %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "استورد المرشّحات من %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "استورد البُرد من %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "استورد الإعدادات من %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "استورد التّقويم من %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "الاستيراد يتقدّم"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "اكتمل الاستيراد"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "ينشئ متراسلًا جديدًا..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "اختر دفتر عناوين"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "اختر دفتر العناوين الذي يجب حفظ المتراسل الجديد فيه:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "لم يُحدَّد دفتر عناوين."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "مستورد من \"%1\""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "خطأ أثناء إنشاء المتراسل: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "اكتمل إنشاء المتراسل"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import filter was canceled."
-msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "أُلغي استيراد المرشّحات."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
@@ -80,262 +196,146 @@
 msgstr[4] "استُورد %1 مرشّحًا من \"%2\""
 msgstr[5] "استُورد %1 مرشّح من \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "لم يُعثر على ملفّات المرشّحات"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "يعدّ الهويّة..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "أُعدّت الهويّة."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "يعدّ النّقل..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "أُعدّ النّقل."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr ""
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr ""
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "المصين"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr ""
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "لم يُعثر على دفتر عناوين"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "أُنشئ دفتر عناوين جديد: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "الاستيراد يتقدّم"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "اكتمل الاستيراد"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
 "KAddressBook."
 msgstr "دفتر عناوين إفُلوشن سيُستورَد كَـ vCard. استورد vCard في دفتر عناوينك."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "صدّر دفتر عناوين إفُلوشن"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "حدّد الدّليل حيث ستُخزَّن فيه بطاقات vCard."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "صُدِّر دفتر العناوين \"%1\"."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "فشل تصدير دفتر العناوين \"%1\"."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "لم يُعر على إعدادات إفُلوشن."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "لم يُعر على تقويم إفُلوشن."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "لم يُعر على إعدادات ثندربيرد."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "لم يُعر على إعدادات Sylpheed."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "لم يُعر على إعدادات Sylpheed."
+
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "لم يُعثر على متراسلين في %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "لم يُعر على إعدادات Sylpheed."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, fuzzy, kde-format
 #| msgid "Filters file was not found"
 msgid "Contacts file '%1' not found"
 msgstr "لم يُعثر على ملفّات المرشّحات"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, fuzzy, kde-format
-#| msgid "No program found"
-msgid "No program found."
-msgstr "لم يُعثر على برامج"
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr ""
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr "أغلق بريدك قبل استيراد البيانات. ستعدّل بعض الملحقات ملفّ ضبط بريدك."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr ""
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "اكتشف البرنامج"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "اختر الموادّ لاستيرادها"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "استورد رسائل البريد"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "استورد مرشّحات البريد"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "استورد الإعدادات"
-
-#: importwizard.cpp:208
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import addressbooks"
-msgstr "استورد دفاتر العناوين"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "استورد التّقاويم"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "أنهِ"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "استورد دفتر العناوين من %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "استورد المرشّحات من %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "استورد البُرد من %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "استورد الإعدادات من %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "استورد التّقويم من %1..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr ""
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr ""
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "المصين"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr ""
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
+msgid "Thunderbird settings not found."
+msgstr "لم يُعر على إعدادات ثندربيرد."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/ast/importwizard.po akonadi-import-wizard-17.08.3/po/ast/importwizard.po
--- akonadi-import-wizard-17.04.3/po/ast/importwizard.po	2017-07-11 21:15:24.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/ast/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2016-12-21 16:43+0100\n"
 "Last-Translator: enolp <enolp@softastur.org>\n"
 "Language-Team: Asturian <alministradores@softastur.org>\n"
@@ -27,306 +27,304 @@
 msgid "Your emails"
 msgstr "alministradores@softastur.org"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
 #, kde-format
-msgid "Creating new contact..."
+msgid "No program found."
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:51
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
 #, kde-format
-msgid "Select Address Book"
+msgid "PIM Import Tool"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:52
+#: importwizard.cpp:84
 #, kde-format
-msgid "Select the address book the new contact shall be saved in:"
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:57
+#: importwizard.cpp:139
 #, kde-format
-msgid "Address Book was not selected."
+msgid "Step 1: Select Filter"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:84
+#: importwizard.cpp:144
 #, kde-format
-msgid "Imported from \"%1\""
+msgid "Step 2: Importing..."
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: importwizard.cpp:173
 #, kde-format
-msgid "Error during contact creation: %1"
+msgid "Detect program"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:106
+#: importwizard.cpp:178
 #, kde-format
-msgid "Contact creation complete"
+msgid "Select material to import"
 msgstr ""
 
-#: autodetect/abstractimporter.cpp:88
+#: importwizard.cpp:182
 #, kde-format
-msgid "Importing of filters was canceled."
+msgid "Import mail messages"
 msgstr ""
 
-#: autodetect/abstractimporter.cpp:90
+#: importwizard.cpp:186
 #, kde-format
-msgid "1 filter was imported from \"%2\""
-msgid_plural "%1 filters were imported from \"%2\""
-msgstr[0] ""
-msgstr[1] ""
+msgid "Import mail filters"
+msgstr ""
 
-#: autodetect/abstractimporter.cpp:94
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
 #, kde-format
-msgid "Filters file was not found"
+msgid "Import settings"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:54
+#: importwizard.cpp:194
 #, kde-format
-msgid "Setting up identity..."
+msgid "Import addressbooks"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:62
+#: importwizard.cpp:198
 #, kde-format
-msgid "Identity set up."
+msgid "Import calendars"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:79
+#: importwizard.cpp:202
 #, kde-format
-msgid "Setting up transport..."
+msgid "Finish"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:91
+#: importwizard.cpp:224
 #, kde-format
-msgid "Transport set up."
+msgid "Import addressbook from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: importwizard.cpp:232
 #, kde-format
-msgid "No addressbook found"
+msgid "Import filters from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: importwizard.cpp:240
 #, kde-format
-msgid "Ldap created"
+msgid "Import mails from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: importwizard.cpp:248
 #, kde-format
-msgid "New addressbook created: %1"
+msgid "Import settings from %1..."
+msgstr ""
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
 #, kde-format
 msgid "Import in progress"
 msgstr ""
 
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
 #, kde-format
 msgid "Import finished"
 msgstr ""
 
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
-msgid "Claws Mail settings not found."
+msgid "Creating new contact..."
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
-msgid ""
-"Evolution address book will be exported as vCard. Import vCard in "
-"KAddressBook."
+msgid "Select Address Book"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
-msgid "Export Evolution Address Book"
+msgid "Select the address book the new contact shall be saved in:"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
-msgid "Select the directory where vCards will be stored."
+msgid "Address Book was not selected."
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
-msgid "Address book \"%1\" exported."
+msgid "Imported from \"%1\""
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
-msgid "Failed to export address book \"%1\"."
+msgid "Error during contact creation: %1"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
-msgid "Evolution settings not found."
+msgid "Contact creation complete"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Evolution calendar not found."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr ""
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
-msgid "Thunderbird settings not found."
+msgid "1 filter was imported from \"%2\""
+msgid_plural "%1 filters were imported from \"%2\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: libimportwizard/abstractimporter.cpp:88
+#, kde-format
+msgid "Filters file was not found"
 msgstr ""
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
-msgid "No contact found in %1"
+msgid "Setting up identity..."
 msgstr ""
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
-msgid "Sylpheed settings not found."
+msgid "Identity set up."
 msgstr ""
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
-msgid "Contacts file '%1' not found"
+msgid "Setting up transport..."
 msgstr ""
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
-msgid "No program found."
+msgid "Transport set up."
 msgstr ""
 
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
+#: main.cpp:52
 #, kde-format
-msgid "PIM Import Tool"
+msgid "Copyright © 2012-2017 ImportWizard authors"
 msgstr ""
 
-#: importwizard.cpp:97
+#: main.cpp:54
 #, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
+msgid "Laurent Montel"
 msgstr ""
 
-#: importwizard.cpp:153
+#: main.cpp:54
 #, kde-format
-msgid "Step 1: Select Filter"
+msgid "Maintainer"
 msgstr ""
 
-#: importwizard.cpp:158
+#: main.cpp:61
 #, kde-format
-msgid "Step 2: Importing..."
+msgid "Mode: %1"
 msgstr ""
 
-#: importwizard.cpp:187
+#: manual/manualselectfilterpage.cpp:96
 #, kde-format
-msgid "Detect program"
+msgid "<p><i>Written by %1.</i></p>"
 msgstr ""
 
-#: importwizard.cpp:192
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
-msgid "Select material to import"
+msgid "No addressbook found"
 msgstr ""
 
-#: importwizard.cpp:196
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
-msgid "Import mail messages"
+msgid "Ldap created"
 msgstr ""
 
-#: importwizard.cpp:200
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
-msgid "Import mail filters"
+msgid "New addressbook created: %1"
 msgstr ""
 
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
-msgid "Import settings"
+msgid "Claws Mail settings not found."
 msgstr ""
 
-#: importwizard.cpp:208
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
-msgid "Import addressbooks"
+msgid ""
+"Evolution address book will be exported as vCard. Import vCard in "
+"KAddressBook."
 msgstr ""
 
-#: importwizard.cpp:212
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
-msgid "Import calendars"
+msgid "Export Evolution Address Book"
 msgstr ""
 
-#: importwizard.cpp:216
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
-msgid "Finish"
+msgid "Select the directory where vCards will be stored."
 msgstr ""
 
-#: importwizard.cpp:255
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
-msgid "Import addressbook from %1..."
+msgid "Address book \"%1\" exported."
 msgstr ""
 
-#: importwizard.cpp:263
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
-msgid "Import filters from %1..."
+msgid "Failed to export address book \"%1\"."
 msgstr ""
 
-#: importwizard.cpp:271
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
-msgid "Import mails from %1..."
+msgid "Evolution settings not found."
 msgstr ""
 
-#: importwizard.cpp:279
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
-msgid "Import settings from %1..."
+msgid "Evolution calendar not found."
 msgstr ""
 
-#: importwizard.cpp:287
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Import calendar from %1..."
+msgid "Icedove settings not found."
 msgstr ""
 
-#: main.cpp:52
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
 #, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
+msgid "SeaMonkey settings not found."
 msgstr ""
 
-#: main.cpp:54
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
-msgid "Laurent Montel"
+msgid "No contact found in %1"
 msgstr ""
 
-#: main.cpp:54
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
-msgid "Maintainer"
+msgid "Sylpheed settings not found."
 msgstr ""
 
-#: main.cpp:61
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
-msgid "Mode"
+msgid "Contacts file '%1' not found"
 msgstr ""
 
-#: manual/manualselectfilterpage.cpp:96
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "<p><i>Written by %1.</i></p>"
+msgid "Thunderbird settings not found."
 msgstr ""
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
diff -Nru akonadi-import-wizard-17.04.3/po/bs/importwizard.po akonadi-import-wizard-17.08.3/po/bs/importwizard.po
--- akonadi-import-wizard-17.04.3/po/bs/importwizard.po	2017-07-11 21:15:24.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/bs/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: bosnianuniversetranslation\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2013-10-18 20:24+0000\n"
 "Last-Translator: Samir Ribić <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
@@ -30,47 +30,165 @@
 msgid "Your emails"
 msgstr "Asalkanovi2@etf.unsa.ba,samir.ribic@etf.unsa.ba"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, fuzzy, kde-format
+#| msgid "No program found"
+msgid "No program found."
+msgstr "Nijedan program nije nađen"
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "PiM import alatka"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Zatvori KMail prije importovanja podataka. Neki plugini će podesiti KMail "
+"konfiguracijsku datoteku."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr ""
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Detektuj program"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Odaberi materijal za import"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importuj elektronsku poštu"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importuj filter elektronske pošte"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Uvezi postavke"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importuj adresare"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importuj kalendare"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Završi"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importuj adresar iz %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importuj filtere iz %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importuj poštu iz %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importuj postavke iz %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importuj kalendar iz %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Uvoz je u toku"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Uvoz je završen"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Stvaram novi kontakt..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Izaberi adresar"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Izaberi adresar u koji će se sačuvati novi kontakt:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Adresar nije izabran."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, fuzzy, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importuj kalendar iz %1..."
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Greska pri pravljenju kontakta: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Kreiranje kontakta završeno"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, fuzzy, kde-format
-msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "Importuj filtere"
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
@@ -78,86 +196,78 @@
 msgstr[1] "%1 filtera su importovana iz \"%2\""
 msgstr[2] "%1 filtera je importovano iz \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Filter datoteka nije pronadjena"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Postavljam identitet..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identitet postavljen."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Postavljam transport..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Transport postavljen."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Autorska prava © 2012-2013 importwizard autori"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Održavalac"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr ""
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, fuzzy, kde-format
 msgid "No addressbook found"
 msgstr "Importuj adresare"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, fuzzy, kde-format
 msgid "New addressbook created: %1"
 msgstr "Importuj adresar iz %1..."
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Uvoz je u toku"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Uvoz je završen"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Postavke za Claws Mail nisu pronađene."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -166,178 +276,68 @@
 "Evolucija adresar ce biti eksportovan kao vcard. Importujte vcard in "
 "KAdressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Izvedi Evolution Adresar"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Odaberite direktorij gdje ce vCard biti sacuvane."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Adresar \"%1\" eksportovan."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Neuspješno eksportovanje adresara \"%1\"."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Postavke za evoluciju nisu pronađene."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Kalendar evolucije nije pronađen."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Thunderbird postavke nisu pronađene."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "Sylpheed postavke nisu pronađene."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "Sylpheed postavke nisu pronađene."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Nema kontakta nađenog u %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Sylpheed postavke nisu pronađene."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, fuzzy, kde-format
 #| msgid "Filters file was not found"
 msgid "Contacts file '%1' not found"
 msgstr "Filter datoteka nije pronadjena"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, fuzzy, kde-format
-#| msgid "No program found"
-msgid "No program found."
-msgstr "Nijedan program nije nađen"
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "PiM import alatka"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Zatvori KMail prije importovanja podataka. Neki plugini će podesiti KMail "
-"konfiguracijsku datoteku."
-
-#: importwizard.cpp:153
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr ""
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Detektuj program"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Odaberi materijal za import"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importuj elektronsku poštu"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importuj filter elektronske pošte"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Uvezi postavke"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Importuj adresare"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importuj kalendare"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Završi"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importuj adresar iz %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importuj filtere iz %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importuj poštu iz %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importuj postavke iz %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importuj kalendar iz %1..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Autorska prava © 2012-2013 importwizard autori"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Održavalac"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr ""
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
+msgid "Thunderbird settings not found."
+msgstr "Thunderbird postavke nisu pronađene."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/ca/importwizard.po akonadi-import-wizard-17.08.3/po/ca/importwizard.po
--- akonadi-import-wizard-17.04.3/po/ca/importwizard.po	2017-07-11 21:15:24.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/ca/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -3,14 +3,14 @@
 # This file is distributed under the license LGPL version 2.1 or
 # version 3 or later versions approved by the membership of KDE e.V.
 #
-# Josep Ma. Ferrer <txemaq@gmail.com>, 2012, 2015.
+# Josep Ma. Ferrer <txemaq@gmail.com>, 2012, 2015, 2017.
 # Antoni Bella Pérez <antonibella5@yahoo.com>, 2013, 2014, 2015, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-01-14 16:00+0100\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-05-17 17:41+0100\n"
 "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca\n"
@@ -31,133 +31,242 @@
 msgid "Your emails"
 msgstr "txemaq@gmail.com,antonibella5@yahoo.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "No s'ha trobat cap programa."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Eina d'importació del PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Tanqueu el KMail abans d'importar les dades. Alguns connectors modificaran "
+"el fitxer de configuració del KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Pas 1: Seleccionar el filtre"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Pas 2: Importar..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Detecta el programa"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Seleccioneu el material a importar"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importa els missatges de correu"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importa els filtres de correu"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importa la configuració"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importa les llibretes d'adreces"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importa els calendaris"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Finalitza"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importa la llibreta d'adreces des de %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importa els filtres des de %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importa els correus des de %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importa la configuració des de %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importa un calendari des de %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Importació en curs"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Importació finalitzada"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "S'està creant un contacte nou..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Selecció de la llibreta d'adreces"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Seleccioneu la llibreta d'adreces on es desarà el nou contacte:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "No s'ha seleccionat cap llibreta d'adreces."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "S'ha importat des de «%1»"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Error en crear el contacte: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "S'ha completat la creació del contacte"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "S'ha cancel·lat la importació dels filtres."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "S'ha cancel·lat la importació dels filtres des de «%1»."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "S'ha importat 1 filtre des de «%2»"
 msgstr[1] "S'han importat %1 filtres des de «%2»"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "No s'ha trobat el fitxer «filters»"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "S'està arranjant la identitat..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "S'ha arranjat la identitat."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "S'està arranjant el transport..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "S'ha arranjat el transport."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2017, els autors de l'ImportWizard"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Mantenidor"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Mode: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Escrit per %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "No s'ha trobat la llibreta d'adreces"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "S'ha creat LDAP"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "S'ha creat una llibreta d'adreces nova: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Importació en curs"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Importació finalitzada"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "No s'ha trobat la configuració del Claws Mail."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -166,176 +275,65 @@
 "La llibreta d'adreces de l'Evolution s'exportarà com a vCard. S'importarà la "
 "vCard al KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Exporta la llibreta d'adreces de l'Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Selecciona el directori a on es desaran les vCard."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "S'ha exportat la llibreta d'adreces «%1»."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Ha fallat en exportar la llibreta d'adreces «%1»."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "No s'ha trobat la configuració de l'Evolution."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "No s'ha trobat el calendari de l'Evolution."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "No s'ha trobat la configuració del Thunderbird."
+msgid "Icedove settings not found."
+msgstr "No s'ha trobat la configuració de l'Icedove."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "No s'ha trobat la configuració del SeaMonkey."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "No s'ha trobat cap contacte a %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "No s'ha trobat la configuració del Sylpheed."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "No s'ha trobat el fitxer de contactes «%1»"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "No s'ha trobat cap programa."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Eina d'importació del PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Tanqueu el KMail abans d'importar les dades. Alguns connectors modificaran "
-"el fitxer de configuració del KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Pas 1: Seleccionar el filtre"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Pas 2: Importar..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Detecta el programa"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Seleccioneu el material a importar"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importa els missatges de correu"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importa els filtres de correu"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importa la configuració"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Importa les llibretes d'adreces"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importa els calendaris"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Finalitza"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importa la llibreta d'adreces des de %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importa els filtres des de %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importa els correus des de %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importa la configuració des de %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importa un calendari des de %1..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2017, els autors de l'importwizard"
-
-#: main.cpp:54
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Mantenidor"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Mode"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Escrit per %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "No s'ha trobat la configuració del Thunderbird."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/ca@valencia/importwizard.po akonadi-import-wizard-17.08.3/po/ca@valencia/importwizard.po
--- akonadi-import-wizard-17.04.3/po/ca@valencia/importwizard.po	2017-07-11 21:15:24.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/ca@valencia/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -3,14 +3,14 @@
 # This file is distributed under the license LGPL version 2.1 or
 # version 3 or later versions approved by the membership of KDE e.V.
 #
-# Josep Ma. Ferrer <txemaq@gmail.com>, 2012, 2015.
+# Josep Ma. Ferrer <txemaq@gmail.com>, 2012, 2015, 2017.
 # Antoni Bella Pérez <antonibella5@yahoo.com>, 2013, 2014, 2015, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-01-14 16:00+0100\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-05-17 17:41+0100\n"
 "Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca@valencia\n"
@@ -31,133 +31,242 @@
 msgid "Your emails"
 msgstr "txemaq@gmail.com,antonibella5@yahoo.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "No s'ha trobat cap programa."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Eina d'importació del PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Tanqueu el KMail abans d'importar les dades. Alguns connectors modificaran "
+"el fitxer de configuració del KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Pas 1: Seleccionar el filtre"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Pas 2: Importar..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Detecta el programa"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Seleccioneu el material a importar"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importa els missatges de correu"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importa els filtres de correu"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importa la configuració"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importa les llibretes d'adreces"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importa els calendaris"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Finalitza"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importa la llibreta d'adreces des de %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importa els filtres des de %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importa els correus des de %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importa la configuració des de %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importa un calendari des de %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Importació en curs"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Importació finalitzada"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "S'està creant un contacte nou..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Selecció de la llibreta d'adreces"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Seleccioneu la llibreta d'adreces on es guardarà el nou contacte:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "No s'ha seleccionat cap llibreta d'adreces."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "S'ha importat des de «%1»"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Error en crear el contacte: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "S'ha completat la creació del contacte"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "S'ha cancel·lat la importació dels filtres."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "S'ha cancel·lat la importació dels filtres des de «%1»."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "S'ha importat 1 filtre des de «%2»"
 msgstr[1] "S'han importat %1 filtres des de «%2»"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "No s'ha trobat el fitxer «filters»"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "S'està arranjant la identitat..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "S'ha arranjat la identitat."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "S'està arranjant el transport..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "S'ha arranjat el transport."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2017, els autors de l'ImportWizard"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Mantenidor"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Mode: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Escrit per %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "No s'ha trobat la llibreta d'adreces"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "S'ha creat LDAP"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "S'ha creat una llibreta d'adreces nova: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Importació en curs"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Importació finalitzada"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "No s'ha trobat la configuració del Claws Mail."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -166,176 +275,65 @@
 "La llibreta d'adreces de l'Evolution s'exportarà com a vCard. S'importarà la "
 "vCard al KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Exporta la llibreta d'adreces de l'Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Selecciona el directori a on es guardaran les vCard."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "S'ha exportat la llibreta d'adreces «%1»."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Ha fallat en exportar la llibreta d'adreces «%1»."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "No s'ha trobat la configuració de l'Evolution."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "No s'ha trobat el calendari de l'Evolution."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "No s'ha trobat la configuració del Thunderbird."
+msgid "Icedove settings not found."
+msgstr "No s'ha trobat la configuració de l'Icedove."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "No s'ha trobat la configuració del SeaMonkey."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "No s'ha trobat cap contacte a %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "No s'ha trobat la configuració del Sylpheed."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "No s'ha trobat el fitxer de contactes «%1»"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "No s'ha trobat cap programa."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Eina d'importació del PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Tanqueu el KMail abans d'importar les dades. Alguns connectors modificaran "
-"el fitxer de configuració del KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Pas 1: Seleccionar el filtre"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Pas 2: Importar..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Detecta el programa"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Seleccioneu el material a importar"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importa els missatges de correu"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importa els filtres de correu"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importa la configuració"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Importa les llibretes d'adreces"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importa els calendaris"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Finalitza"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importa la llibreta d'adreces des de %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importa els filtres des de %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importa els correus des de %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importa la configuració des de %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importa un calendari des de %1..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2017, els autors de l'importwizard"
-
-#: main.cpp:54
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Mantenidor"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Mode"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Escrit per %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "No s'ha trobat la configuració del Thunderbird."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/cs/importwizard.po akonadi-import-wizard-17.08.3/po/cs/importwizard.po
--- akonadi-import-wizard-17.04.3/po/cs/importwizard.po	2017-07-11 21:15:24.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/cs/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-02-27 11:17+0100\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-09-11 13:40+0100\n"
 "Last-Translator: Vít Pelčák <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: cs\n"
@@ -28,47 +28,162 @@
 msgid "Your emails"
 msgstr "vit@pelcak.org, tomas.chvatal@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Program nebyl nalezen."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Nástroj pro import PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Krok 1: Vybrat filtr"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Krok 2: Importování..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Detekovat program"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Vyberte věci pro import"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importovat poštu"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importovat filtry pošty"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importovat nastavení"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importovat knihy adres"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importovat kalendáře"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Dokončit"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importovat knihu adres z %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importní filtry z %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importovat poštu z %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importovat nastavení z %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importovat kalendář z %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Probíhá import"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Import dokončen"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Vytvářím nový kontakt..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Vybrat knihu adres"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Zvolte knihu adres, kam má být nový kontakt uložen:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Kniha adres nebyla vybrána."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importováno z \"%1\""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Chyba při vytváření kontaktu: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Vytvoření kontaktu dokončeno"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "Import filtrů byl zrušen."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "Import filtrů z \"%1\" byl zrušen."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
@@ -76,260 +191,143 @@
 msgstr[1] "Byly importovány %1 filtry z \"%2\""
 msgstr[2] "Bylo importováno %1 filtrů z \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Soubor filtrů nebyl nalezen"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Nastavuji identitu..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identita nastavena."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Nastavuji transport..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Transport nastaven."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2017, Vývojáři importwizard"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Správce"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Režim: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Napsal %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Nebyla nalezena žádná adresa"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Vytvořen ldap"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Byla vytvořena nová kniha adres: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Probíhá import"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Import dokončen"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Nastavení Claws Mail nebylo nalezeno."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
 "KAddressBook."
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Exportovat Evolution do knihy adres"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Vyberte adresář, kam budou uloženy vizitky."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Kniha adres \"%1\" byla exportována."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Export knihy adres \"%1\" selhal."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Nastavení Evolution nebylo nalezeno."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Kalendář Evolution nebyl nalezen."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Nastavení Thunderbirdu nebylo nalezeno."
+msgid "Icedove settings not found."
+msgstr "Nastavení Icedove nebylo nalezeno."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "Nastavení SeaMonkey nebylo nalezeno."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr ""
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Nastavení Sylpheed nebylo nalezeno."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Soubor kontaktů '%1' nebyl nalezen"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Program nebyl nalezen."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Nástroj pro import PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Krok 1: Vybrat filtr"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Krok 2: Importování..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Detekovat program"
-
-#: importwizard.cpp:192
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Select material to import"
-msgstr "Vyberte věci pro import"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importovat poštu"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importovat filtry pošty"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importovat nastavení"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Importovat knihy adres"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importovat kalendáře"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Dokončit"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importovat knihu adres z %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importní filtry z %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importovat poštu z %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importovat nastavení z %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importovat kalendář z %1..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2017, Vývojáři importwizard"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Správce"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Režim"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Napsal %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Nastavení Thunderbirdu nebylo nalezeno."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/da/importwizard.po akonadi-import-wizard-17.08.3/po/da/importwizard.po
--- akonadi-import-wizard-17.04.3/po/da/importwizard.po	2017-07-11 21:15:24.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/da/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2016-08-11 20:51+0100\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
@@ -27,133 +27,245 @@
 msgid "Your emails"
 msgstr "mschlander@opensuse.org"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Intet program fundet."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Importværktøj til personlig information (PIM)"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Luk KMail før du importerer data. Nogle plugins vil ændre KMails "
+"konfigurationsfil."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Trin 1: Vælg filter"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Trin 2: Importerer..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Detektér program"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Vælg materiale som skal importeres"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importér e-mails"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importér e-mail-filtre"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importér indstillinger"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importér adressebøger"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importér kalendere"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Færdig"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importér adressebog fra %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importér filtre fra %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importér e-mails fra %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importér indstillinger fra %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importér kalender fra %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Import i gang"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Import gennemført"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Opretter ny kontakt..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Vælg adressebog"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Vælg den adressebog den ny kontakt skal gemmes i:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Der blev ikke valgt en adressebog."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importeret fra \"%1\""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Fejl under oprettelse af kontakt: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Oprettelse af kontakt gennemført"
 
-#: autodetect/abstractimporter.cpp:88
-#, kde-format
-msgid "Importing of filters was canceled."
+#: libimportwizard/abstractimporter.cpp:82
+#, fuzzy, kde-format
+#| msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "Import af filtre blev annulleret."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "1 filter blev importeret fra \"%2\""
 msgstr[1] "%1 filtre blev importeret fra \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Filen med filtre blev ikke fundet"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Opsætning af identitet..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identitet er sat op."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Opsætning af transport..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Transport er sat op."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2016 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Ophavsret © 2012-2016 importguide-udviklerne"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Vedligeholder"
+
+#: main.cpp:61
+#, fuzzy, kde-format
+#| msgid "Mode"
+msgid "Mode: %1"
+msgstr "Tilstand"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Skrevet af %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Ingen adressebog fundet"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Ldap oprettet"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Ny adressebog oprettet: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Import i gang"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Import gennemført"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Claws Mail-indstillinger blev ikke fundet."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -162,177 +274,67 @@
 "Evolutions adressebog vil blive eksporteret som vCard. Importér vCard i "
 "KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Eksportér Evolutions adressebog"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Vælg mappen hvor vCards skal gemmes."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Adressebogen \"%1\" blev eksporteret."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Kunne ikke eksportere adressebogen \"%1\"."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Evolution-indstillinger blev ikke fundet."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Evolution-kalender blev ikke fundet."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Thunderbird-indstillinger blev ikke fundet."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "Sylpheed-indstillinger blev ikke fundet."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "Sylpheed-indstillinger blev ikke fundet."
+
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Ingen kontakter fundet i %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Sylpheed-indstillinger blev ikke fundet."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Kontaktfilen \"%1\" blev ikke fundet"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Intet program fundet."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Importværktøj til personlig information (PIM)"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Luk KMail før du importerer data. Nogle plugins vil ændre KMails "
-"konfigurationsfil."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Trin 1: Vælg filter"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Trin 2: Importerer..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Detektér program"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Vælg materiale som skal importeres"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importér e-mails"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importér e-mail-filtre"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importér indstillinger"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Importér adressebøger"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importér kalendere"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Færdig"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importér adressebog fra %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importér filtre fra %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importér e-mails fra %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importér indstillinger fra %1..."
-
-#: importwizard.cpp:287
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importér kalender fra %1..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2016 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Ophavsret © 2012-2016 importguide-udviklerne"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Vedligeholder"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Tilstand"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Skrevet af %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Thunderbird-indstillinger blev ikke fundet."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/de/importwizard.po akonadi-import-wizard-17.08.3/po/de/importwizard.po
--- akonadi-import-wizard-17.04.3/po/de/importwizard.po	2017-07-11 21:15:24.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/de/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -4,8 +4,8 @@
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-01-20 22:04+0100\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-08-06 17:17+0100\n"
 "Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "Language: de\n"
@@ -25,134 +25,243 @@
 msgid "Your emails"
 msgstr "schwarzer@kde.org"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Kein Programm gefunden."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "PIM-Import-Werkzeug"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Schließen Sie KMail vor dem Import von Daten.\n"
+"Einige Module werden die Einrichtungsdatei für KMail ändern."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "1. Schritt: Filter auswählen"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "2. Schritt: Importieren ..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Anwendung erkennen"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Wählen Sie die zu importierenden Daten"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "E-Mail-Nachrichten importieren"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "E-Mailfilter importieren"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Einstellungen importieren"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Adressbücher importieren"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Kalender importieren"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Fertigstellen"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Adressbuch von %1 importieren ..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Filter von %1 importieren ..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "E-Mails von %1 importieren ..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Einstellungen von %1 importieren ..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Kalender von %1 importieren ..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Importvorgang läuft"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Import abgeschlossen"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Neuer Kontakt wird erstellt ..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Adressbuch auswählen"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr ""
 "Wählen Sie das Adressbuch, in dem der neue Kontakt gespeichert werden soll:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Das Adressbuch war nicht ausgewählt."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importiert von „%1“"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Fehler beim Erstellen des Kontakts: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Kontakt fertig erstellt"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "Der Import der Filter wurde abgebrochen."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "Der Import der Filter von „%1“wurde abgebrochen."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "1 Filter wurde von „%2“ importiert"
 msgstr[1] "%1 Filter wurden von „%2“ importiert"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Es kann keine Filterdatei gefunden werden"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Identität wird eingerichtet ..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identität ist eingerichtet."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Versandarten einrichten ..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Versandarten wurden eingerichtet."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2017 Importwizard-Autoren"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Betreuer"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Modus: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Geschrieben von %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Kein Adressbuch gefunden"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "LDAP erstellt"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Neues Adressbuch erstellt: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Importvorgang läuft"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Import abgeschlossen"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Die Einstellungen für Claws Mail wurden nicht gefunden."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -161,176 +270,65 @@
 "Das Adressbuch von Evolution wird als vCard-Datei exportiert. Importieren "
 "Sie diese Datei in KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Evolution-Adressbuch exportieren"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Wählen Sie den Ordner, in dem die vCards gespeichert werden."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Adressbuch „%1“ exportiert."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Export des Adressbuchs „%1“ ist fehlgeschlagen."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Die Einstellungen für Evolution wurden nicht gefunden."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Der Evolution-Kalender wurde nicht gefunden."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Die Einstellungen für Thunderbird wurden nicht gefunden."
+msgid "Icedove settings not found."
+msgstr "Die Einstellungen für Icedove wurden nicht gefunden."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "Die Einstellungen für SeaMonkey wurden nicht gefunden."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Kein Kontakt in %1 gefunden"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Die Einstellungen für Sylpheed wurden nicht gefunden."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Die Kontaktdatei „%1“ wurde nicht gefunden"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Kein Programm gefunden."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "PIM-Import-Werkzeug"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Schließen Sie KMail vor dem Import von Daten.\n"
-"Einige Module werden die Einrichtungsdatei für KMail ändern."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "1. Schritt: Filter auswählen"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "2. Schritt: Importieren ..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Anwendung erkennen"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Wählen Sie die zu importierenden Daten"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "E-Mail-Nachrichten importieren"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "E-Mailfilter importieren"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Einstellungen importieren"
-
-#: importwizard.cpp:208
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import addressbooks"
-msgstr "Adressbücher importieren"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Kalender importieren"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Fertigstellen"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Adressbuch von %1 importieren ..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Filter von %1 importieren ..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "E-Mails von %1 importieren ..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Einstellungen von %1 importieren ..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Kalender von %1 importieren ..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2017 Importwizard-Autoren"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Betreuer"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Modus"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Geschrieben von %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Die Einstellungen für Thunderbird wurden nicht gefunden."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/el/importwizard.po akonadi-import-wizard-17.08.3/po/el/importwizard.po
--- akonadi-import-wizard-17.04.3/po/el/importwizard.po	2017-07-11 21:15:24.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/el/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2013-01-17 21:31+0200\n"
 "Last-Translator: Stelios <sstavra@gmail.com>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -29,137 +29,248 @@
 msgid "Your emails"
 msgstr "panos@echidna-band.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, fuzzy, kde-format
+#| msgid "No program found"
+msgid "No program found."
+msgstr "Δεν βρέθηκε πρόγραμμα"
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Εργαλείο εισαγωγής PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Κλείσιμο του KMail πριν την εισαγωγή δεδομένων. Μερικά πρόσθετα θα "
+"τροποποιήσουν το αρχείο ρυθμίσεων του KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr ""
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Εντοπισμός προγράμματος"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Επιλογή υλικού για εισαγωγή"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Εισαγωγή φίλτρων αλληλογραφίας"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Εισαγωγή ρυθμίσεων"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Εισαγωγή βιβλίων διευθύνσεων"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Εισαγωγή ημερολογίων"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Τέλος"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Εισαγωγή βιβλίου διευθύνσεων από %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Εισαγωγή φίλτρων από %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Εισαγωγή αλληλογραφίας από %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Εισαγωγή ρυθμίσεων από %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Εισαγωγή ημερολογίου από %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Εισαγωγή σε εξέλιξη"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Η εισαγωγή ολοκληρώθηκε"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Δημιουργία νέας επαφής..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Επιλογή βιβλίου διευθύνσεων"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Επιλέξτε το βιβλίο διευθύνσεων όπου πρέπει να αποθηκευτεί η νέα επαφή:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Δεν επιλέχθηκε βιβλίο διευθύνσεων."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import calendar from %1..."
 msgid "Imported from \"%1\""
 msgstr "Εισαγωγή ημερολογίου από %1..."
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Σφάλμα κατά τη δημιουργία της επαφής: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Η δημιουργία της επαφής ολοκληρώθηκε"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import Filters"
-msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "Εισαγωγή φίλτρων"
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "1 φίλτρο έγινε εισαγωγή από \"%2\""
 msgstr[1] "%1 φίλτρα έγιναν εισαγωγή από \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Το αρχείο φίλτρων δε βρέθηκε"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Ρύθμιση ταυτότητας..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Η ταυτότητα ρυθμίστηκε."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Ρύθμιση μεταφοράς..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Η μεταφορά ρυθμίστηκε."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2013 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Πνευματικά δικαιώματα © 2012-2013 οι συγγραφείς του importwizard"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Συντηρητής"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr ""
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, fuzzy, kde-format
 #| msgid "Import addressbook"
 msgid "No addressbook found"
 msgstr "Εισαγωγή βιβλίου διευθύνσεων"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, fuzzy, kde-format
 #| msgid "Import addressbook from %1..."
 msgid "New addressbook created: %1"
 msgstr "Εισαγωγή βιβλίου διευθύνσεων από %1..."
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Εισαγωγή σε εξέλιξη"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Η εισαγωγή ολοκληρώθηκε"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Δε βρέθηκαν οι ρυθμίσεις του ClawsMails."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -168,179 +279,68 @@
 "Το βιβλίο διευθύνσεων του Evolution θα εξαχθεί ως vCard. Εισάγετε το vCard "
 "στο KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Εξαγωγή βιβλίου διευθύνσεων του Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Επιλογή καταλόγου όπου θα αποθηκευτούν τα vcards."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Έγινε εξαγωγή του βιβλίου διευθύνσεων \"%1\"."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Αποτυχία εξαγωγής του βιβλίου διευθύνσεων \"%1\"."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Δε βρέθηκαν οι ρυθμίσεις του Evolution."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Δε βρέθηκε το ημερολόγιο του Evolution."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Δε βρέθηκαν οι ρυθμίσεις του Thunderbird."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "Δε βρέθηκαν οι ρυθμίσεις του Sylpheed."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "Δε βρέθηκαν οι ρυθμίσεις του Sylpheed."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Δε βρέθηκε επαφή στο %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Δε βρέθηκαν οι ρυθμίσεις του Sylpheed."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, fuzzy, kde-format
 #| msgid "Filters file was not found"
 msgid "Contacts file '%1' not found"
 msgstr "Το αρχείο φίλτρων δε βρέθηκε"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, fuzzy, kde-format
-#| msgid "No program found"
-msgid "No program found."
-msgstr "Δεν βρέθηκε πρόγραμμα"
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Εργαλείο εισαγωγής PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Κλείσιμο του KMail πριν την εισαγωγή δεδομένων. Μερικά πρόσθετα θα "
-"τροποποιήσουν το αρχείο ρυθμίσεων του KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr ""
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Εντοπισμός προγράμματος"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Επιλογή υλικού για εισαγωγή"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Εισαγωγή μηνυμάτων αλληλογραφίας"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Εισαγωγή φίλτρων αλληλογραφίας"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Εισαγωγή ρυθμίσεων"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Εισαγωγή βιβλίων διευθύνσεων"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Εισαγωγή ημερολογίων"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Τέλος"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Εισαγωγή βιβλίου διευθύνσεων από %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Εισαγωγή φίλτρων από %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Εισαγωγή αλληλογραφίας από %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Εισαγωγή ρυθμίσεων από %1..."
-
-#: importwizard.cpp:287
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import calendar from %1..."
-msgstr "Εισαγωγή ημερολογίου από %1..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2013 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Πνευματικά δικαιώματα © 2012-2013 οι συγγραφείς του importwizard"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Συντηρητής"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr ""
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
+msgid "Thunderbird settings not found."
+msgstr "Δε βρέθηκαν οι ρυθμίσεις του Thunderbird."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/en_GB/importwizard.po akonadi-import-wizard-17.08.3/po/en_GB/importwizard.po
--- akonadi-import-wizard-17.04.3/po/en_GB/importwizard.po	2017-07-11 21:15:24.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/en_GB/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,10 +6,10 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-01-15 11:57+0000\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-05-21 15:29+0000\n"
 "Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
-"Language-Team: English <kde-l10n-en_gb@kde.org>\n"
+"Language-Team: English <kde-i18n-doc@kde.org>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,133 +27,242 @@
 msgid "Your emails"
 msgstr "steve.allewell@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "No program found."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "PIM Import Tool"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Step 1: Select Filter"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Step 2: Importing..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Detect program"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Select material to import"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Import mail messages"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Import mail filters"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Import settings"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Import addressbooks"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Import calendars"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Finish"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Import addressbook from %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Import filters from %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Import mails from %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Import settings from %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Import calendar from %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Import in progress"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Import finished"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Creating new contact..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Select Address Book"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Select the address book the new contact shall be saved in:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Address Book was not selected."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Imported from \"%1\""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Error during contact creation: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Contact creation complete"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "Importing of filters was cancelled."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "Importing of filters from \"%1\" was cancelled."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "1 filter was imported from \"%2\""
 msgstr[1] "%1 filters were imported from \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Filters file was not found"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Setting up identity..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identity set up."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Setting up transport..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Transport set up."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2017 ImportWizard authors"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Maintainer"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Mode: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Written by %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "No addressbook found"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "LDAP created"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "New addressbook created: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Import in progress"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Import finished"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Claws Mail settings not found."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -162,176 +271,65 @@
 "Evolution address book will be exported as vCard. Import vCard in "
 "KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Export Evolution Address Book"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Select the directory where vCards will be stored."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Address book \"%1\" exported."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Failed to export address book \"%1\"."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Evolution settings not found."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Evolution calendar not found."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Thunderbird settings not found."
+msgid "Icedove settings not found."
+msgstr "Icedove settings not found."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "SeaMonkey settings not found."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "No contact found in %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Sylpheed settings not found."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Contacts file '%1' not found"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "No program found."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "PIM Import Tool"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Step 1: Select Filter"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Step 2: Importing..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Detect program"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Select material to import"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Import mail messages"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Import mail filters"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Import settings"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Import addressbooks"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Import calendars"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Finish"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Import addressbook from %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Import filters from %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Import mails from %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Import settings from %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Import calendar from %1..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2017 importwizard authors"
-
-#: main.cpp:54
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Maintainer"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Mode"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Written by %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Thunderbird settings not found."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/es/importwizard.po akonadi-import-wizard-17.08.3/po/es/importwizard.po
--- akonadi-import-wizard-17.04.3/po/es/importwizard.po	2017-07-11 21:15:24.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/es/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-01-15 22:23+0100\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-05-21 23:25+0100\n"
 "Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
 "Language-Team: Spanish <l10n-kde-es@kde.org>\n"
 "Language: es\n"
@@ -28,135 +28,244 @@
 msgid "Your emails"
 msgstr "fjvinal@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "No se encontró ningún programa."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Herramienta de importación PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Cierre KMail antes de importar datos. Algunos complementos modificarán el "
+"archivo de configuración de KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Paso 1: seleccionar filtro"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Paso 2: importando..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Detectar programa"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Seleccionar material a importar"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importar mensajes de correo"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importar filtros de correo"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importar preferencias"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importar libretas de direcciones"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importar calendarios"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Terminar"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importar libreta de direcciones desde %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importar filtros desde %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importar correos desde %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importar preferencias desde %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importar calendario desde %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Importación en curso"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Importación terminada"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Creando nuevo contacto..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Seleccione libreta de direcciones"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr ""
 "Seleccione la libreta de direcciones en la que se deberá guardar el nuevo "
 "contacto:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "No se seleccionó libreta de direcciones."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importado desde «%1»"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Error durante la creación del contacto: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Terminada la creación del contacto"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "La importación de filtros se canceló."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "La importación de filtros desde «%1» se canceló."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "Se importó un filtro desde «%2»"
 msgstr[1] "Se importaron %1 filtros desde «%2»"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "No se encontró el archivo de filtros"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Configurando identidad..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identidad configurada."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Configurando transporte..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Transporte configurado."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Derechos de autor © 2012-2017 los autores de ImportWizard"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Responsable"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Modo: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Escrito por %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Libreta de direcciones no encontrada"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Ldap creado"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Creada nueva libreta de direcciones: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Importación en curso"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Importación terminada"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Preferencias de Claws Mail no encontradas."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -165,176 +274,65 @@
 "La libreta de direcciones de Evolution se exportará como vCard. Importe "
 "vCard en KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Exportar libreta de direcciones de Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Seleccione el directorio donde se almacenarán las vCards."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Libreta de direcciones «%1» exportada."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Ha fallado la exportación de la libreta de direcciones %1."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Preferencias de Evolution no encontradas."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Calendario de Evolution no encontrado."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Preferencias de Thunderbird no encontradas."
+msgid "Icedove settings not found."
+msgstr "Preferencias de Icedove no encontradas."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "Preferencias de SeaMonkey no encontradas."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Contacto no encontrado en %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Preferencias de Sylpheed no encontradas."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "No se encontró el archivo de contactos «%1»"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "No se encontró ningún programa."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Herramienta de importación PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Cierre KMail antes de importar datos. Algunos complementos modificarán el "
-"archivo de configuración de KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Paso 1: seleccionar filtro"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Paso 2: importando..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Detectar programa"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Seleccionar material a importar"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importar mensajes de correo"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importar filtros de correo"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importar preferencias"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Importar libretas de direcciones"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importar calendarios"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Terminar"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importar libreta de direcciones desde %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importar filtros desde %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importar correos desde %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importar preferencias desde %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importar calendario desde %1..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Derechos de autor © 2012-2017 los autores de importwizard"
-
-#: main.cpp:54
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Responsable"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Modo"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Escrito por %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Preferencias de Thunderbird no encontradas."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/et/importwizard.po akonadi-import-wizard-17.08.3/po/et/importwizard.po
--- akonadi-import-wizard-17.04.3/po/et/importwizard.po	2017-07-11 21:15:24.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/et/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2016-07-27 20:04+0300\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -27,133 +27,245 @@
 msgid "Your emails"
 msgstr "qiilaq69@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Rakendust ei leitud."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "PIM importimise tööriist"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Sulge enne andmete importimist KMail. Mõned pluginad muudavad KMaili "
+"seadistustefaili."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "1. samm: filtri valimine"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "2. samm: importimine..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Programmi tuvastamine"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Imporditava materjali valimine"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Kirjade importimine"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Kirjafiltrite importimine"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Seadistuste importimine"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Aadressiraamatute importimine"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Kalendrite importimine"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Lõpetamine"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Aadressiraamatu import programmist %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Filtrite import programmist %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Kirjade import programmist %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Seadistuste import programmist %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Kalendri import programmist %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Import käib"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Import on lõpetatud"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Uue kontakti loomine..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Aadressiraamatu valik"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Aadressiraamat, kuhu salvestada uus kontakt:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Aadressiraamat on valimata."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Imporditud asukohast \"%1\""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Tõrge kontakti loomisel: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Kontakt on loodud"
 
-#: autodetect/abstractimporter.cpp:88
-#, kde-format
-msgid "Importing of filters was canceled."
+#: libimportwizard/abstractimporter.cpp:82
+#, fuzzy, kde-format
+#| msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "Filtrite import katkestati."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "Imporditi 1 filter rakendusest \"%2\""
 msgstr[1] "Imporditi %1 filtrit rakendusest \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Filtrite faili ei leitud"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Identiteedi määramine..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identiteet on määratud."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Kirjade saatmise viisi määramine..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Kirjade saatmise viis on määratud."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2016 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Autoriõigus © 2012-2016: importwizardi autorid"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Hooldaja"
+
+#: main.cpp:61
+#, fuzzy, kde-format
+#| msgid "Mode"
+msgid "Mode: %1"
+msgstr "Režiim"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Kirjutanud %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Ühtegi aadressiraamatut ei leitud"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "LDAP on loodud"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Uus aadressiraamat on loodud: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Import käib"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Import on lõpetatud"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Claws Maili seadistusi ei leitud."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -162,177 +274,67 @@
 "Evolutioni aadressiraamat eksporditakse vCardina. Impordi vCard KDE "
 "aadressiraamatusse."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Evolutioni aadressiraamatu eksport"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Vali kataloog, kuhu vCardid salvestada."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Aadressiraamat \"%1\" on eksporditud."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Aadressiraamatu \"%1\" eksport nurjus."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Evolutioni seadistusi ei leitud."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Evolutioni kalendrit ei leitud."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Thunderbirdi seadistusi ei leitud."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "Sylpheedi seadistusi ei leitud."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "Sylpheedi seadistusi ei leitud."
+
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "%1 ei paista sisaldavat ühtegi kontakti"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Sylpheedi seadistusi ei leitud."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Kontaktide faili \"%1\" ei leitud"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Rakendust ei leitud."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "PIM importimise tööriist"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Sulge enne andmete importimist KMail. Mõned pluginad muudavad KMaili "
-"seadistustefaili."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "1. samm: filtri valimine"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "2. samm: importimine..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Programmi tuvastamine"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Imporditava materjali valimine"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Kirjade importimine"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Kirjafiltrite importimine"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Seadistuste importimine"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Aadressiraamatute importimine"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Kalendrite importimine"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Lõpetamine"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Aadressiraamatu import programmist %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Filtrite import programmist %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Kirjade import programmist %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Seadistuste import programmist %1..."
-
-#: importwizard.cpp:287
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import calendar from %1..."
-msgstr "Kalendri import programmist %1..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2016 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Autoriõigus © 2012-2016: importwizardi autorid"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Hooldaja"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Režiim"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Kirjutanud %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Thunderbirdi seadistusi ei leitud."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/fi/importwizard.po akonadi-import-wizard-17.08.3/po/fi/importwizard.po
--- akonadi-import-wizard-17.04.3/po/fi/importwizard.po	2017-07-11 21:15:24.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/fi/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-05-07 19:01+0200\n"
-"Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2016-01-03 15:28+0200\n"
+"Last-Translator: Lasse Liehu <lasse.liehu@gmail.com>\n"
 "Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
@@ -29,309 +29,312 @@
 msgid "Your emails"
 msgstr "translator@legisign.org"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Ohjelmia ei löytynyt."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "PIMin tuontityökalu"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Sulje KMail ennen tietojen tuomista. Jotkin liitännäiset muuttavat KMailin "
+"asetustiedostoa."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Vaihe 1: Valitse suodatin"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Vaihe 2: Tuodaan…"
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Tunnista ohjelma"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Valitse tuotavat tiedot"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Tuo sähköpostiviestit"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Tuo sähköpostisuodattimet"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Tuo asetukset"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Tuo osoitekirjat"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Tuo kalenterit"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Valmis"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Tuo osoitekirja kohteesta %1…"
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Tuo suotimet kohteesta %1…"
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Tuo sähköpostit kohteesta %1…"
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Tuo asetukset kohteesta %1…"
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Tuo kalenteri kohteesta %1…"
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Tuonti käynnissä"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Tuonti valmis"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Luodaan uusi yhteystieto…"
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Valitse osoitekirja"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Valitse osoitekirja, johon uusi yhteystieto tallennetaan:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Osoitekirjaa ei valittu."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Tuotu ohjelmasta %1…"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Virhe luotaessa yhteystietoa: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Yhteystiedon luonti valmis"
 
-#: autodetect/abstractimporter.cpp:88
-#, kde-format
-msgid "Importing of filters was canceled."
+#: libimportwizard/abstractimporter.cpp:82
+#, fuzzy, kde-format
+#| msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "Suodatinten tuonti peruttiin."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "Tuotiin yksi suodin kohteesta ”%2”"
 msgstr[1] "Tuotiin %1 suodinta kohteesta ”%2”"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Suodintiedostoa ei löytynyt"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Asetetaan henkilöyttä…"
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Henkilöys asetettu."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Asetetaan postinvälitystä…"
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Postinvälitys asetettu."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2016 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Tekijänoikeudet © 2012–2016 importwizardin tekijät"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Ylläpitäjä"
+
+#: main.cpp:61
+#, fuzzy, kde-format
+#| msgid "Mode"
+msgid "Mode: %1"
+msgstr "Toimintatapa"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Tehnyt %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Osoitekirjaa ei löytynyt"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Ldap luotiin"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Luotiin uusi osoitekirja: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Tuonti käynnissä"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Tuonti valmis"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Claws Mailin asetuksia ei löytynyt."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
 "KAddressBook."
 msgstr "Evolutionin osoitekirja viedään vCardina. Tuo vCard KAddressBookiin."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Vie Evolutionin osoitekirjaksi"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Valitse kansio, jonne vCardit tallennetaan."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Osoitekirja ”%1” viety."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Osoitekirjan ”%1” vienti epäonnistui."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Evolutionin asetuksia ei löytynyt."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Evolutionin kalenteria ei löytynyt."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Thunderbirdin asetuksia ei löytynyt."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "Sylpheedin asetuksia ei löytynyt."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "Sylpheedin asetuksia ei löytynyt."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Kohteesta %1 ei löytynyt yhteystietoja"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Sylpheedin asetuksia ei löytynyt."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Yhteystiedot sisältävää tiedostoa ”%1” ei löydy"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Ohjelmia ei löytynyt."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "PIMin tuontityökalu"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Sulje KMail ennen tietojen tuomista. Jotkin liitännäiset muuttavat KMailin "
-"asetustiedostoa."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Vaihe 1: Valitse suodatin"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Vaihe 2: Tuodaan…"
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Tunnista ohjelma"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Valitse tuotavat tiedot"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Tuo sähköpostiviestit"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Tuo sähköpostisuodattimet"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Tuo asetukset"
-
-#: importwizard.cpp:208
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import addressbooks"
-msgstr "Tuo osoitekirjat"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Tuo kalenterit"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Valmis"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Tuo osoitekirja kohteesta %1…"
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Tuo suotimet kohteesta %1…"
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Tuo sähköpostit kohteesta %1…"
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Tuo asetukset kohteesta %1…"
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Tuo kalenteri kohteesta %1…"
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Tekijänoikeudet © 2012–2017 importwizardin tekijät"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Ylläpitäjä"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Toimintatapa"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Tehnyt %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Thunderbirdin asetuksia ei löytynyt."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/fr/importwizard.po akonadi-import-wizard-17.08.3/po/fr/importwizard.po
--- akonadi-import-wizard-17.04.3/po/fr/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/fr/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2017-06-14 23:46+0100\n"
 "Last-Translator: Vincent Pinon <vpinon@kde.org>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
@@ -34,135 +34,244 @@
 msgid "Your emails"
 msgstr "jcorn@free.fr, vpinon@kde.org"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Aucun programme n'a été trouvé."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Outil d'importation pour PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Fermez KMail avant d'importer des données. Certains modules externes "
+"modifieront le fichier de configuration de KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Étape 1 : sélectionner le filtre"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Étape 2 : import en cours..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Détecter un programme"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Sélectionner des éléments à importer"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importer des messages de courriers électroniques"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importer des filtres de courriers électroniques"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importer des paramètres"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importer des carnets d'adresses"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importer des agendas"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Terminer"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importer un carnet d'adresses depuis %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importer des filtres depuis %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importe des messages depuis %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importer des paramètres depuis %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importer un agenda depuis %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Importation en cours"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Importation terminée"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Création d'un nouveau contact..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Sélectionner un carnet d'adresses"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr ""
 "Sélectionnez le carnet d'adresses dans lequel sera enregistré le nouveau "
 "contact :"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Le carnet d'adresses n'a pas été sélectionné."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importé depuis « %1 »"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Erreur durant la création du contact : %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Création du contact terminée"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "L'import des filtres a été annulé."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "L'import des filtres depuis « %1 » a été annulé."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "Un seul filtre a été importé depuis « %2 »"
 msgstr[1] "%1 filtres ont été importés depuis « %2 »"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Impossible de trouver le fichier des filtres"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Configuration d'une identité..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identité configurée."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Configuration d'un transport..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Transport configuré."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2017 Les auteurs de Importwizard"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Mainteneur"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Mode : %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Écrit par %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Aucun carnet d'adresses trouvé"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "LDAP créé"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Nouveau carnet d'adresses créé : %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Importation en cours"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Importation terminée"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Impossible de trouver les paramètres de messagerie Claws."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -171,176 +280,65 @@
 "Le carnet d'adresses de Evolution va être exporté en tant que « vCard ». "
 "Importez des « vCard » dans KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Exporter le carnet d'adresses de Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Sélectionnez le dossier dans lequel les « vCard » seront enregistrées."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Carnet d'adresses « %1 » exporté."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Impossible d'exporter le carnet d'adresses « %1 »."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Impossible de trouver les paramètres de Evolution."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Impossible de trouver l'agenda de Evolution."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Impossible de trouver les paramètres de Thunderbird."
+msgid "Icedove settings not found."
+msgstr "Impossible de trouver les paramètres de Icedove."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "Impossible de trouver les paramètres de SeaMonkey."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Aucun contact n'a été trouvé dans %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Impossible de trouver les paramètres de Sylpheed."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Fichier de contacts « %1 » introuvable"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Aucun programme n'a été trouvé."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Outil d'importation pour PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Fermez KMail avant d'importer des données. Certains modules externes "
-"modifieront le fichier de configuration de KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Étape 1 : sélectionner le filtre"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Étape 2 : import en cours..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Détecter un programme"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Sélectionner des éléments à importer"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importer des messages de courriers électroniques"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importer des filtres de courriers électroniques"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importer des paramètres"
-
-#: importwizard.cpp:208
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import addressbooks"
-msgstr "Importer des carnets d'adresses"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importer des agendas"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Terminer"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importer un carnet d'adresses depuis %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importer des filtres depuis %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importe des messages depuis %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importer des paramètres depuis %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importer un agenda depuis %1..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2017 Les auteurs de Importwizard"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Mainteneur"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Mode"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Écrit par %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Impossible de trouver les paramètres de Thunderbird."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/ga/importwizard.po akonadi-import-wizard-17.08.3/po/ga/importwizard.po
--- akonadi-import-wizard-17.04.3/po/ga/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/ga/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2012-02-27 21:35-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -27,312 +27,310 @@
 msgid "Your emails"
 msgstr "kscanne@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
 #, kde-format
-msgid "Creating new contact..."
-msgstr "Teagmháil nua á cruthú..."
+msgid "No program found."
+msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:51
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
 #, kde-format
-msgid "Select Address Book"
-msgstr "Roghnaigh Leabhar Seoltaí"
+msgid "PIM Import Tool"
+msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:52
+#: importwizard.cpp:84
 #, kde-format
-msgid "Select the address book the new contact shall be saved in:"
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
 msgstr ""
-"Roghnaigh an leabhar seoltaí ar mian leat an teagmháil nua a shábháil ann:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: importwizard.cpp:139
 #, kde-format
-msgid "Address Book was not selected."
+msgid "Step 1: Select Filter"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:84
+#: importwizard.cpp:144
 #, kde-format
-msgid "Imported from \"%1\""
+msgid "Step 2: Importing..."
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: importwizard.cpp:173
 #, kde-format
-msgid "Error during contact creation: %1"
+msgid "Detect program"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:106
+#: importwizard.cpp:178
 #, kde-format
-msgid "Contact creation complete"
+msgid "Select material to import"
 msgstr ""
 
-#: autodetect/abstractimporter.cpp:88
-#, fuzzy, kde-format
-#| msgid "Import Filters"
-msgid "Importing of filters was canceled."
-msgstr "Iompórtáil Scagairí"
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr ""
 
-#: autodetect/abstractimporter.cpp:90
+#: importwizard.cpp:186
 #, kde-format
-msgid "1 filter was imported from \"%2\""
-msgid_plural "%1 filters were imported from \"%2\""
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
-msgstr[3] ""
-msgstr[4] ""
+msgid "Import mail filters"
+msgstr ""
 
-#: autodetect/abstractimporter.cpp:94
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
 #, kde-format
-msgid "Filters file was not found"
+msgid "Import settings"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:54
+#: importwizard.cpp:194
 #, kde-format
-msgid "Setting up identity..."
+msgid "Import addressbooks"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:62
+#: importwizard.cpp:198
 #, kde-format
-msgid "Identity set up."
+msgid "Import calendars"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:79
+#: importwizard.cpp:202
 #, kde-format
-msgid "Setting up transport..."
+msgid "Finish"
+msgstr "Críochnaigh"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:91
+#: importwizard.cpp:232
 #, kde-format
-msgid "Transport set up."
+msgid "Import filters from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
-#, fuzzy, kde-format
-#| msgid "Import addressbook"
-msgid "No addressbook found"
-msgstr "Iompórtáil leabhar seoltaí"
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: importwizard.cpp:248
 #, kde-format
-msgid "Ldap created"
+msgid "Import settings from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: importwizard.cpp:256
 #, kde-format
-msgid "New addressbook created: %1"
+msgid "Import calendar from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
 #, kde-format
 msgid "Import in progress"
 msgstr "Iompórtáil ar siúl"
 
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
 #, kde-format
 msgid "Import finished"
 msgstr "Iompórtáil críochnaithe"
 
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
-msgid "Claws Mail settings not found."
-msgstr ""
+msgid "Creating new contact..."
+msgstr "Teagmháil nua á cruthú..."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
-msgid ""
-"Evolution address book will be exported as vCard. Import vCard in "
-"KAddressBook."
-msgstr ""
+msgid "Select Address Book"
+msgstr "Roghnaigh Leabhar Seoltaí"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
-msgid "Export Evolution Address Book"
+msgid "Select the address book the new contact shall be saved in:"
 msgstr ""
+"Roghnaigh an leabhar seoltaí ar mian leat an teagmháil nua a shábháil ann:"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
-msgid "Select the directory where vCards will be stored."
+msgid "Address Book was not selected."
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
-msgid "Address book \"%1\" exported."
+msgid "Imported from \"%1\""
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
-msgid "Failed to export address book \"%1\"."
+msgid "Error during contact creation: %1"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
-msgid "Evolution settings not found."
+msgid "Contact creation complete"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
-#, kde-format
-msgid "Evolution calendar not found."
-msgstr ""
+#: libimportwizard/abstractimporter.cpp:82
+#, fuzzy, kde-format
+#| msgid "Import Filters"
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "Iompórtáil Scagairí"
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr ""
+msgid "1 filter was imported from \"%2\""
+msgid_plural "%1 filters were imported from \"%2\""
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+msgstr[4] ""
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
-msgid "No contact found in %1"
+msgid "Filters file was not found"
 msgstr ""
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
-msgid "Sylpheed settings not found."
+msgid "Setting up identity..."
 msgstr ""
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
-msgid "Contacts file '%1' not found"
+msgid "Identity set up."
 msgstr ""
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
-msgid "No program found."
+msgid "Setting up transport..."
 msgstr ""
 
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
-msgid "PIM Import Tool"
+msgid "Transport set up."
 msgstr ""
 
-#: importwizard.cpp:97
+#: main.cpp:52
 #, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
+msgid "Copyright © 2012-2017 ImportWizard authors"
 msgstr ""
 
-#: importwizard.cpp:153
+#: main.cpp:54
 #, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
 
-#: importwizard.cpp:158
+#: main.cpp:54
 #, kde-format
-msgid "Step 2: Importing..."
-msgstr ""
+msgid "Maintainer"
+msgstr "Cothaitheoir"
 
-#: importwizard.cpp:187
+#: main.cpp:61
 #, kde-format
-msgid "Detect program"
+msgid "Mode: %1"
 msgstr ""
 
-#: importwizard.cpp:192
+#: manual/manualselectfilterpage.cpp:96
 #, kde-format
-msgid "Select material to import"
+msgid "<p><i>Written by %1.</i></p>"
 msgstr ""
 
-#: importwizard.cpp:196
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
+#, fuzzy, kde-format
+#| msgid "Import addressbook"
+msgid "No addressbook found"
+msgstr "Iompórtáil leabhar seoltaí"
+
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
-msgid "Import mail messages"
+msgid "Ldap created"
 msgstr ""
 
-#: importwizard.cpp:200
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
-msgid "Import mail filters"
+msgid "New addressbook created: %1"
 msgstr ""
 
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
-msgid "Import settings"
+msgid "Claws Mail settings not found."
 msgstr ""
 
-#: importwizard.cpp:208
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
-msgid "Import addressbooks"
+msgid ""
+"Evolution address book will be exported as vCard. Import vCard in "
+"KAddressBook."
 msgstr ""
 
-#: importwizard.cpp:212
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
-msgid "Import calendars"
+msgid "Export Evolution Address Book"
 msgstr ""
 
-#: importwizard.cpp:216
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
-msgid "Finish"
-msgstr "Críochnaigh"
+msgid "Select the directory where vCards will be stored."
+msgstr ""
 
-#: importwizard.cpp:255
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
-msgid "Import addressbook from %1..."
+msgid "Address book \"%1\" exported."
 msgstr ""
 
-#: importwizard.cpp:263
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
-msgid "Import filters from %1..."
+msgid "Failed to export address book \"%1\"."
 msgstr ""
 
-#: importwizard.cpp:271
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
-msgid "Import mails from %1..."
+msgid "Evolution settings not found."
 msgstr ""
 
-#: importwizard.cpp:279
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
-msgid "Import settings from %1..."
+msgid "Evolution calendar not found."
 msgstr ""
 
-#: importwizard.cpp:287
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Import calendar from %1..."
+msgid "Icedove settings not found."
 msgstr ""
 
-#: main.cpp:52
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
 #, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
+msgid "SeaMonkey settings not found."
 msgstr ""
 
-#: main.cpp:54
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
+msgid "No contact found in %1"
+msgstr ""
 
-#: main.cpp:54
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
-msgid "Maintainer"
-msgstr "Cothaitheoir"
+msgid "Sylpheed settings not found."
+msgstr ""
 
-#: main.cpp:61
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
-msgid "Mode"
+msgid "Contacts file '%1' not found"
 msgstr ""
 
-#: manual/manualselectfilterpage.cpp:96
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "<p><i>Written by %1.</i></p>"
+msgid "Thunderbird settings not found."
 msgstr ""
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
diff -Nru akonadi-import-wizard-17.04.3/po/gl/importwizard.po akonadi-import-wizard-17.08.3/po/gl/importwizard.po
--- akonadi-import-wizard-17.04.3/po/gl/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/gl/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2016-01-03 16:57+0100\n"
 "Last-Translator: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail."
 "com>\n"
@@ -33,312 +33,314 @@
 msgid "Your emails"
 msgstr "xosecalvo@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Non se atopou ningún programa."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Ferramenta de importación de PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Peche KMail antes de importar datos. Algúns complementos modifican o "
+"ficheiro de configuración de KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Paso 1: Escolla do filtro"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Paso 2: Importación…"
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Detectar o programa"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Escoller material para importar"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importar mensaxes de correo"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importar filtros de correo"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importar configuracións"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importar cadernos de enderezos"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importar calendarios"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Rematar"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importar un caderno de enderezos de %1…"
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importar filtros de correo de %1…"
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importar mensaxes de %1…"
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importar configuracións de %1…"
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importar un calendario de %1"
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Importación en progreso"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Rematou a importación"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Estase a crear un contacto novo…"
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Seleccione un caderno de enderezos"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Seleccione o caderno de enderezos no que gardar o novo contacto:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Non se escolleu ningún caderno de enderezos."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importado de «%1»"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Houbo un erro durante a creación do contacto: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Rematou a creación do contacto"
 
-#: autodetect/abstractimporter.cpp:88
-#, kde-format
-msgid "Importing of filters was canceled."
+#: libimportwizard/abstractimporter.cpp:82
+#, fuzzy, kde-format
+#| msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "Cancelouse a importación de filtros."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "Importouse un filtro de «%2»."
 msgstr[1] "Importáronse %1 filtros de «%2»."
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Non se atopou o ficheiro de filtros"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Estase a configurar a identidade…"
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Configurouse a identidade."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Estase a configurar o transporte…"
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Configurouse o transporte."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2016 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "© 2012-2016 Autores de importwizard"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Mantedor"
+
+#: main.cpp:61
+#, fuzzy, kde-format
+#| msgid "Mode"
+msgid "Mode: %1"
+msgstr "Modo"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Escrito por %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Non se atopou ningún caderno de enderezos"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Creado o LDAP"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Creouse un caderno de enderezos novo: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Importación en progreso"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Rematou a importación"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Non foi posíbel atopar a configuración de Claws Mail."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
 "KAddressBook."
 msgstr ""
 "Vaise exportar o caderno de enderezos do Evolution como vCard. Importe vCard "
-"ao KAddressBook."
+"a KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Exportar o caderno de enderezos do Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Escolla o directorio no que quere almacenar as vCards."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Exportouse o caderno de enderezos «%1»."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Fallou a exportación do caderno de enderezos «%1»."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Non foi posíbel atopar a configuración do Evolution."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Non foi posíbel atopar o calendario do Evolution."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Non foi posíbel atopar a configuración do Thunderbird."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "Non foi posíbel atopar a configuración do Sylpheed."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "Non foi posíbel atopar a configuración do Sylpheed."
+
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Non se atopou ningún contacto en %1."
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Non foi posíbel atopar a configuración do Sylpheed."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Non foi posíbel atopar o ficheiro de contactos «%1»."
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Non se atopou ningún programa."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Ferramenta de importación de PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Peche o KMail antes de importar datos. Algúns engadidos modifican o ficheiro "
-"de configuración do KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Paso 1: Escolla do filtro"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Paso 2: Importación…"
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Detectar o programa"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Escoller material para importar"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importar mensaxes de correo"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importar filtros de correo"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importar configuracións"
-
-#: importwizard.cpp:208
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import addressbooks"
-msgstr "Importar cadernos de enderezos"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importar calendarios"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Rematar"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importar un caderno de enderezos de %1…"
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importar filtros de correo de %1…"
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importar mensaxes de %1…"
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importar configuracións de %1…"
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importar un calendario de %1"
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2016 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "© 2012-2016 Autores de importwizard"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Mantedor"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Modo"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Escrito por %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Non foi posíbel atopar a configuración do Thunderbird."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/hu/importwizard.po akonadi-import-wizard-17.08.3/po/hu/importwizard.po
--- akonadi-import-wizard-17.04.3/po/hu/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/hu/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2014-10-09 09:43+0200\n"
 "Last-Translator: Kristóf Kiszel <ulysses@kubuntu.org>\n"
 "Language-Team: Hungarian <kde-l10n-hu@kde.org>\n"
@@ -28,134 +28,245 @@
 msgid "Your emails"
 msgstr "urbalazs@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, fuzzy, kde-format
+#| msgid "No program found"
+msgid "No program found."
+msgstr "Nem található program"
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "PIM importáló eszköz"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Zárja be a KMail programot az adatimportálás előtt. Néhány bővítmény "
+"módosítani fogja a KMail beállítófájlt."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr ""
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Program felismerése"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Válassza ki az importálandó anyagot"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Levélüzenetek importálása"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Levélszűrők importálása"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Beállítások importálása"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Címjegyzékek importálása"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Naptárak importálása"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Befejezés"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Címjegyzék importálása innen: %1…"
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Szűrők importálása innen: %1…"
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Levelek importálása innen: %1…"
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Beállítások importálása innen: %1…"
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Naptár importálása innen: %1…"
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Az importálás folyamatban"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Az importálás befejeződött"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Új névjegy létrehozása…"
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Címjegyzék kiválasztása"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Válassza ki, hogy melyik címjegyzékbe legyen elmentve az új névjegy:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Címjegyzék nem lett kiválasztva."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importálva innen: „%1”"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Hiba a partner létrehozása során: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Partner létrehozása kész"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import filter was canceled."
-msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "A szűrők importálása megszakadt."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "1 szűrő importálása történt meg innen: „%2”"
 msgstr[1] "%1 szűrő importálása történt meg innen: „%2”"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Szűrőfájl nem található"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Identitás beállítása…"
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identitás beállítva."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Továbbítás beállítása…"
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Továbbítás beállítva."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2013-2014 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © Az importvarázsló szerzői, 2012-2013-2014."
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Karbantartó"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr ""
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Nem található címjegyzék"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Ldap létrehozva"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Új címjegyzék létrehozva: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Az importálás folyamatban"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Az importálás befejeződött"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "A Claws Mail beállítások nem találhatók."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -164,179 +275,68 @@
 "Az Evolution címjegyzék vCard formátumban kerül exportálásra. Importálja a "
 "vCardot a KAddressBookba."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Evolution címjegyzék exportálása"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Válasszon könyvtárat a vCard fájlok tárolásához."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "A(z) „%1” címjegyzék exportálva."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "A(z) „%1” címjegyzék exportálása nem sikerült."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Az Evolution beállítások nem találhatók."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Evolution naptár nem található."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "A Thunderbird beállítások nem találhatók."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "A Sylpheed beállítások nem találhatók."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "A Sylpheed beállítások nem találhatók."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Nem található névjegy ebben: %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "A Sylpheed beállítások nem találhatók."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, fuzzy, kde-format
 #| msgid "Filters file was not found"
 msgid "Contacts file '%1' not found"
 msgstr "Szűrőfájl nem található"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, fuzzy, kde-format
-#| msgid "No program found"
-msgid "No program found."
-msgstr "Nem található program"
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "PIM importáló eszköz"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Zárja be a KMail programot az adatimportálás előtt. Néhány bővítmény "
-"módosítani fogja a KMail beállítófájlt."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr ""
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Program felismerése"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Válassza ki az importálandó anyagot"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Levélüzenetek importálása"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Levélszűrők importálása"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Beállítások importálása"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Címjegyzékek importálása"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Naptárak importálása"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Befejezés"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Címjegyzék importálása innen: %1…"
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Szűrők importálása innen: %1…"
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Levelek importálása innen: %1…"
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Beállítások importálása innen: %1…"
-
-#: importwizard.cpp:287
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import calendar from %1..."
-msgstr "Naptár importálása innen: %1…"
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2013-2014 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © Az importvarázsló szerzői, 2012-2013-2014."
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Karbantartó"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr ""
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
+msgid "Thunderbird settings not found."
+msgstr "A Thunderbird beállítások nem találhatók."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/ia/importwizard.po akonadi-import-wizard-17.08.3/po/ia/importwizard.po
--- akonadi-import-wizard-17.04.3/po/ia/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/ia/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2014-04-08 15:00+0200\n"
 "Last-Translator: G.Sora <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua <kde-l10n-ia@kde.org>\n"
@@ -27,137 +27,248 @@
 msgid "Your emails"
 msgstr "g.sora@tiscali.it"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, fuzzy, kde-format
+#| msgid "No program found"
+msgid "No program found."
+msgstr "Nulle programma trovate"
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Utensile de importation de PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Claude KMail ante importar datos. Alcun plugins modificara file de "
+"configuration de KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr ""
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Releva programma"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Selige material de importar"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importa messages de posta"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importa filtros de posta"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importa preferentias"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importa adressario"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importa calendarios"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Termina"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importa adressario ex %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importa filtros ex %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importa messages de e-posta ex %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importa preferentias ex %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importa calendarios ex %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Importation in progresso"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Importation finite"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Creante nove contacto..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Selige adressario"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Selige le adressario ubi on debera salveguardar le nove contacto:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Adressario non esseva seligite."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import calendar from %1..."
 msgid "Imported from \"%1\""
 msgstr "Importa calendarios ex %1..."
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Error quando on creava contacto: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Creation de contacto completate"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import Filters"
-msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "Importa filtros"
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "1 filtro esseva importate ex \"%2\""
 msgstr[1] "%1 filtros esseva importate ex \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "File de filtro non trovate"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Il configura identitate..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identitate configurate."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Configurante transporto..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Configuration de  transporto."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2013-2014 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2013-2014 le autores de importwizard"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Mantenitor"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr ""
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, fuzzy, kde-format
 #| msgid "Import addressbook"
 msgid "No addressbook found"
 msgstr "Importa adressario"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, fuzzy, kde-format
 #| msgid "Import addressbook from %1..."
 msgid "New addressbook created: %1"
 msgstr "Importa adressario ex %1..."
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Importation in progresso"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Importation finite"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Il non trovava preferentias de Claws Mail."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -166,179 +277,68 @@
 "Adressario de Evolution essera exportate como vCard. Importa vCard in "
 "KAddressBook"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Exporta adressario de Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Selige directorio ubi on immagazinara vCards."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Adressario \"%1\" exportate."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Il falleva exportar adressario  \"%1\"."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Il non trovava preferentias de Evolution"
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Il non trovava calendario de Evolution"
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Il non trovava preferentias de Thunderbird"
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "Il non trovava preferentias de Sylpheed"
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "Il non trovava preferentias de Sylpheed"
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Necun contactio trovate in %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Il non trovava preferentias de Sylpheed"
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, fuzzy, kde-format
 #| msgid "Filters file was not found"
 msgid "Contacts file '%1' not found"
 msgstr "File de filtro non trovate"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, fuzzy, kde-format
-#| msgid "No program found"
-msgid "No program found."
-msgstr "Nulle programma trovate"
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Utensile de importation de PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Claude KMail ante importar datos. Alcun plugins modificara file de "
-"configuration de KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr ""
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Releva programma"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Selige material de importar"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importa messages de posta"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importa filtros de posta"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importa preferentias"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Importa adressario"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importa calendarios"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Termina"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importa adressario ex %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importa filtros ex %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importa messages de e-posta ex %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importa preferentias ex %1..."
-
-#: importwizard.cpp:287
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importa calendarios ex %1..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2013-2014 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2013-2014 le autores de importwizard"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Mantenitor"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr ""
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
+msgid "Thunderbird settings not found."
+msgstr "Il non trovava preferentias de Thunderbird"
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/it/importwizard.po akonadi-import-wizard-17.08.3/po/it/importwizard.po
--- akonadi-import-wizard-17.04.3/po/it/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/it/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-01-14 14:17+0100\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-05-18 22:10+0100\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
 "Language: it\n"
@@ -27,133 +27,242 @@
 msgid "Your emails"
 msgstr "luigi.toscano@tiscali.it"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Nessun programma trovato."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Strumento di importazione di PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Chiudi KMail prima di importare i dati. Alcune estensioni modificheranno i "
+"file di configurazione di KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Passo 1: seleziona filtro"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Passo 2: importazione..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Rileva programma"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Seleziona il materiale da importare"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importa messaggi di posta"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importa filtri di posta"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importa impostazioni"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importa rubriche"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importa calendari"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Termina"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importa rubrica da %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importa filtri da %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importa messaggi di posta da %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importa impostazioni da %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importa calendario da %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Importazione in corso"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Importazione conclusa"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Creazione di un nuovo contatto..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Scegli rubrica"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Seleziona la rubrica dove salvare il nuovo contatto:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Non è stata selezionata la rubrica."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importato da «%1»"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Errore durante la creazione del contatto: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Creazione del contatto completata"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "L'importazione dei filtri è stato annullata."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "L'importazione dei filtri da «%1» è stato annullata."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "È stato importato un filtro da «%2»"
 msgstr[1] "Sono stati importati %1 filtri da «%2»"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Il file dei filtri non è stato trovato"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Configurazione dell'identità..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identità configurata."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Impostazione trasporto..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Trasporto impostato."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2017 gli autori di ImportWizard"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Responsabile"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Modalità: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Scritto da %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Nessuna rubrica trovata"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Creato LDAP"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Nuova rubrica creata: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Importazione in corso"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Importazione conclusa"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Impostazioni di Claws Mail non trovate."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -162,176 +271,65 @@
 "La rubrica di Evolution sarà esportata in formato vCard. Importa le vCard in "
 "KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Esportazione rubrica di Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Seleziona la cartella dove memorizzare le vCard."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Rubrica «%1» esportata."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Esportazione della rubrica «%1» non riuscita."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Impostazioni di Evolution non trovate."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Calendario di Evolution non trovato."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Impostazioni di Thunderbird non trovate."
+msgid "Icedove settings not found."
+msgstr "Impostazioni di Icedove non trovate."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "Impostazioni di SeaMonkey non trovate."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Nessun contatto trovato in %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Impostazioni di Sylpheed non trovate."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "File di contatti «%1» non trovato"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Nessun programma trovato."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Strumento di importazione di PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Chiudi KMail prima di importare i dati. Alcune estensioni modificheranno i "
-"file di configurazione di KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Passo 1: seleziona filtro"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Passo 2: importazione..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Rileva programma"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Seleziona il materiale da importare"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importa messaggi di posta"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importa filtri di posta"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importa impostazioni"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Importa rubriche"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importa calendari"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Termina"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importa rubrica da %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importa filtri da %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importa messaggi di posta da %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importa impostazioni da %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importa calendario da %1..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2017 gli autori di importwizard"
-
-#: main.cpp:54
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Responsabile"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Modalità"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Scritto da %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Impostazioni di Thunderbird non trovate."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/ja/importwizard.po akonadi-import-wizard-17.08.3/po/ja/importwizard.po
--- akonadi-import-wizard-17.04.3/po/ja/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/ja/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2012-02-26 14:43-0800\n"
 "Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
 "Language-Team: Japanese <kde-jp@kde.org>\n"
@@ -24,306 +24,304 @@
 msgid "Your emails"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
 #, kde-format
-msgid "Creating new contact..."
+msgid "No program found."
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:51
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
 #, kde-format
-msgid "Select Address Book"
+msgid "PIM Import Tool"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:52
+#: importwizard.cpp:84
 #, kde-format
-msgid "Select the address book the new contact shall be saved in:"
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:57
+#: importwizard.cpp:139
 #, kde-format
-msgid "Address Book was not selected."
+msgid "Step 1: Select Filter"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:84
+#: importwizard.cpp:144
 #, kde-format
-msgid "Imported from \"%1\""
+msgid "Step 2: Importing..."
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: importwizard.cpp:173
 #, kde-format
-msgid "Error during contact creation: %1"
+msgid "Detect program"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:106
+#: importwizard.cpp:178
 #, kde-format
-msgid "Contact creation complete"
+msgid "Select material to import"
 msgstr ""
 
-#: autodetect/abstractimporter.cpp:88
+#: importwizard.cpp:182
 #, kde-format
-msgid "Importing of filters was canceled."
+msgid "Import mail messages"
 msgstr ""
 
-#: autodetect/abstractimporter.cpp:90
+#: importwizard.cpp:186
 #, kde-format
-msgid "1 filter was imported from \"%2\""
-msgid_plural "%1 filters were imported from \"%2\""
-msgstr[0] ""
-msgstr[1] ""
+msgid "Import mail filters"
+msgstr ""
 
-#: autodetect/abstractimporter.cpp:94
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
 #, kde-format
-msgid "Filters file was not found"
+msgid "Import settings"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:54
+#: importwizard.cpp:194
 #, kde-format
-msgid "Setting up identity..."
+msgid "Import addressbooks"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:62
+#: importwizard.cpp:198
 #, kde-format
-msgid "Identity set up."
+msgid "Import calendars"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:79
+#: importwizard.cpp:202
 #, kde-format
-msgid "Setting up transport..."
+msgid "Finish"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:91
+#: importwizard.cpp:224
 #, kde-format
-msgid "Transport set up."
+msgid "Import addressbook from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: importwizard.cpp:232
 #, kde-format
-msgid "No addressbook found"
+msgid "Import filters from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: importwizard.cpp:240
 #, kde-format
-msgid "Ldap created"
+msgid "Import mails from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: importwizard.cpp:248
 #, kde-format
-msgid "New addressbook created: %1"
+msgid "Import settings from %1..."
+msgstr ""
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
 #, kde-format
 msgid "Import in progress"
 msgstr ""
 
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
 #, kde-format
 msgid "Import finished"
 msgstr ""
 
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
-msgid "Claws Mail settings not found."
+msgid "Creating new contact..."
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
-msgid ""
-"Evolution address book will be exported as vCard. Import vCard in "
-"KAddressBook."
+msgid "Select Address Book"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
-msgid "Export Evolution Address Book"
+msgid "Select the address book the new contact shall be saved in:"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
-msgid "Select the directory where vCards will be stored."
+msgid "Address Book was not selected."
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
-msgid "Address book \"%1\" exported."
+msgid "Imported from \"%1\""
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
-msgid "Failed to export address book \"%1\"."
+msgid "Error during contact creation: %1"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
-msgid "Evolution settings not found."
+msgid "Contact creation complete"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Evolution calendar not found."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr ""
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
-msgid "Thunderbird settings not found."
+msgid "1 filter was imported from \"%2\""
+msgid_plural "%1 filters were imported from \"%2\""
+msgstr[0] ""
+msgstr[1] ""
+
+#: libimportwizard/abstractimporter.cpp:88
+#, kde-format
+msgid "Filters file was not found"
 msgstr ""
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
-msgid "No contact found in %1"
+msgid "Setting up identity..."
 msgstr ""
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
-msgid "Sylpheed settings not found."
+msgid "Identity set up."
 msgstr ""
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
-msgid "Contacts file '%1' not found"
+msgid "Setting up transport..."
 msgstr ""
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
-msgid "No program found."
+msgid "Transport set up."
 msgstr ""
 
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
+#: main.cpp:52
 #, kde-format
-msgid "PIM Import Tool"
+msgid "Copyright © 2012-2017 ImportWizard authors"
 msgstr ""
 
-#: importwizard.cpp:97
+#: main.cpp:54
 #, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
+msgid "Laurent Montel"
 msgstr ""
 
-#: importwizard.cpp:153
+#: main.cpp:54
 #, kde-format
-msgid "Step 1: Select Filter"
+msgid "Maintainer"
 msgstr ""
 
-#: importwizard.cpp:158
+#: main.cpp:61
 #, kde-format
-msgid "Step 2: Importing..."
+msgid "Mode: %1"
 msgstr ""
 
-#: importwizard.cpp:187
+#: manual/manualselectfilterpage.cpp:96
 #, kde-format
-msgid "Detect program"
+msgid "<p><i>Written by %1.</i></p>"
 msgstr ""
 
-#: importwizard.cpp:192
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
-msgid "Select material to import"
+msgid "No addressbook found"
 msgstr ""
 
-#: importwizard.cpp:196
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
-msgid "Import mail messages"
+msgid "Ldap created"
 msgstr ""
 
-#: importwizard.cpp:200
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
-msgid "Import mail filters"
+msgid "New addressbook created: %1"
 msgstr ""
 
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
-msgid "Import settings"
+msgid "Claws Mail settings not found."
 msgstr ""
 
-#: importwizard.cpp:208
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
-msgid "Import addressbooks"
+msgid ""
+"Evolution address book will be exported as vCard. Import vCard in "
+"KAddressBook."
 msgstr ""
 
-#: importwizard.cpp:212
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
-msgid "Import calendars"
+msgid "Export Evolution Address Book"
 msgstr ""
 
-#: importwizard.cpp:216
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
-msgid "Finish"
+msgid "Select the directory where vCards will be stored."
 msgstr ""
 
-#: importwizard.cpp:255
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
-msgid "Import addressbook from %1..."
+msgid "Address book \"%1\" exported."
 msgstr ""
 
-#: importwizard.cpp:263
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
-msgid "Import filters from %1..."
+msgid "Failed to export address book \"%1\"."
 msgstr ""
 
-#: importwizard.cpp:271
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
-msgid "Import mails from %1..."
+msgid "Evolution settings not found."
 msgstr ""
 
-#: importwizard.cpp:279
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
-msgid "Import settings from %1..."
+msgid "Evolution calendar not found."
 msgstr ""
 
-#: importwizard.cpp:287
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Import calendar from %1..."
+msgid "Icedove settings not found."
 msgstr ""
 
-#: main.cpp:52
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
 #, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
+msgid "SeaMonkey settings not found."
 msgstr ""
 
-#: main.cpp:54
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
-msgid "Laurent Montel"
+msgid "No contact found in %1"
 msgstr ""
 
-#: main.cpp:54
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
-msgid "Maintainer"
+msgid "Sylpheed settings not found."
 msgstr ""
 
-#: main.cpp:61
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
-msgid "Mode"
+msgid "Contacts file '%1' not found"
 msgstr ""
 
-#: manual/manualselectfilterpage.cpp:96
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "<p><i>Written by %1.</i></p>"
+msgid "Thunderbird settings not found."
 msgstr ""
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
diff -Nru akonadi-import-wizard-17.04.3/po/kk/importwizard.po akonadi-import-wizard-17.08.3/po/kk/importwizard.po
--- akonadi-import-wizard-17.04.3/po/kk/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/kk/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2013-09-25 05:32+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh <kde-i18n-doc@kde.org>\n"
@@ -27,136 +27,247 @@
 msgid "Your emails"
 msgstr "sairan@computer.org"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, fuzzy, kde-format
+#| msgid "No program found"
+msgid "No program found."
+msgstr "Бағдарламасы табылмады"
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "PIM импорт құралы"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"KMail-ді деректерді импорттау алдында жабу. Кейбір плагиндері KMail баптау "
+"файлын өзгертеді."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr ""
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Бағдарламаны байқау"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Экспортайтын материалды таңдау"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Пошта хаттарын импорттау"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Пошта сүзгілерін импорттау"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Код импортын баптау"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Адрестік кітапшаларды импорттау"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Күнтібелерді импорттау"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Аяқтау"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Адрестік кітапшаны %1 дегеннен импорттау..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "%1 дегеннен сүзгілерді импорттау..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Хаттарды %1 дегеннен импорттау..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Параметрлерді %1 дегеннен импорттау..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Күнтізбені %1 дегеннен импорттау..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Импорт ету"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Импорт аяқталды"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Жаңа контактты құру..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Адрестік кітапшаны таңдау"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Жаңа контактты жазып алатын адрестік кітапшасы:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Адрестік кітапша таңдалмаған."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import calendar from %1..."
 msgid "Imported from \"%1\""
 msgstr "Күнтізбені %1 дегеннен импорттау..."
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Контактты құру қатесі: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Контакт құруы бітті"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import Filters"
-msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "Сүзгілерді импорттау"
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "\"%2\" дегеннен %1 сүзгі импортталды"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Сүзгілер файлы табылмады"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Іс-әлпетін орнату..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Іс-әлпетін орнатылды."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Тасымалдау жолын орнату..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Тасымалдауын орнатылды."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2013 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2013 importwizard авторлары"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Желілдірушісі"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr ""
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, fuzzy, kde-format
 #| msgid "Import addressbook"
 msgid "No addressbook found"
 msgstr "Адрестік кітапшаны импорттау"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, fuzzy, kde-format
 #| msgid "Import addressbook from %1..."
 msgid "New addressbook created: %1"
 msgstr "Адрестік кітапшаны %1 дегеннен импорттау..."
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Импорт ету"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Импорт аяқталды"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "ClawsMail параметрлері табылған жоқ."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -165,179 +276,68 @@
 "Evolution адрестік ктапшасы vCard пішімінде экспортталады. vCard-ты "
 "KAddressBook-қа импорттап алыңыз."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Evolution адрес кітапшасына экспорттау"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "vCard-тарды сақтайтын қапшығын таңдау."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "\"%1\" адрестік кітапшасы экспортталды."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "\"%1\" адрес кітапшасын экспорттау жаңылысы."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Evolution параметрлері табылған жоқ."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Evolution күнтізбесі табылған жоқ."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Thunderbird параметрлері табылған жоқ."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "Sylpheed параметрлері табылған жоқ."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "Sylpheed параметрлері табылған жоқ."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "%1 дегенде контакт табылған жоқ"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Sylpheed параметрлері табылған жоқ."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, fuzzy, kde-format
 #| msgid "Filters file was not found"
 msgid "Contacts file '%1' not found"
 msgstr "Сүзгілер файлы табылмады"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, fuzzy, kde-format
-#| msgid "No program found"
-msgid "No program found."
-msgstr "Бағдарламасы табылмады"
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "PIM импорт құралы"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"KMail-ді деректерді импорттау алдында жабу. Кейбір плагиндері KMail баптау "
-"файлын өзгертеді."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr ""
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Бағдарламаны байқау"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Экспортайтын материалды таңдау"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Пошта хаттарын импорттау"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Пошта сүзгілерін импорттау"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Код импортын баптау"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Адрестік кітапшаларды импорттау"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Күнтібелерді импорттау"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Аяқтау"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Адрестік кітапшаны %1 дегеннен импорттау..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "%1 дегеннен сүзгілерді импорттау..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Хаттарды %1 дегеннен импорттау..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Параметрлерді %1 дегеннен импорттау..."
-
-#: importwizard.cpp:287
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import calendar from %1..."
-msgstr "Күнтізбені %1 дегеннен импорттау..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2013 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2013 importwizard авторлары"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Желілдірушісі"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr ""
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
+msgid "Thunderbird settings not found."
+msgstr "Thunderbird параметрлері табылған жоқ."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/km/importwizard.po akonadi-import-wizard-17.08.3/po/km/importwizard.po
--- akonadi-import-wizard-17.04.3/po/km/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/km/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2012-12-25 16:30+0700\n"
 "Last-Translator: sutha <sutha@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros>\n"
@@ -30,138 +30,248 @@
 msgid "Your emails"
 msgstr "sokhem@open.org.kh,sutha@open.org.kh,sophea@open.org.kh"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, fuzzy, kde-format
+#| msgid "No program found"
+msgid "No program found."
+msgstr "រក​មិន​ឃើញ​កម្មវិធី​ឡើយ"
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "ឧបករណ៍​នាំចូល​របស់ PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"បិទ KMail មុន​ពេល​នាំចូល​ទិន្ន័យ ។ កម្មវិធី​មួយ​ចំនួន​នឹង​កែប្រែ​ឯកសារ​ការ​កំណត់​រចនាសម្ព័ន្ធ​របស់ KMail ។"
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr ""
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "លុប​កម្មវិធី"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "ជ្រើស​វត្ថុ​ធាតុ​ដើម្បី​នាំចូល"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "នាំចូល​សារ​ទាំងអស់"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "នាំចូល​តម្រង​សារ"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "នាំចូល​ការ​កំណត់"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "នាំចូល​សៀវភៅ​អាសយដ្ឋាន"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "នាំចូល​ប្រតិទិន"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "បញ្ចប់"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "នាំចូល​សៀវភៅ​អាសយដ្ឋាន​ពី %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "នាំចូល​តម្រង​ពី %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "នាំចូល​សារ​ពី %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "នាំចូល​ការ​កំណត់​ពី %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "នាំចូល​ប្រតិទិន​ពី %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "ការ​នាំចូល​កំពុង​ដំណើរការ"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "បាន​បញ្ចប់​ការ​នាំចូល"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "បង្កើត​ទំនាក់ទំនង​ថ្មី..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "ជ្រើស​សៀវភៅ​អាសយដ្ឋាន"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "ជ្រើស​សៀវភៅ​អាសយដ្ឋាន​ដែល​ត្រូវ​រក្សាទុក​ទំនាក់ទំនង​ថ្មី ៖"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "មិន​បាន​ជ្រើស​សៀវភៅ​អាសយដ្ឋាន ។"
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import calendar from %1..."
 msgid "Imported from \"%1\""
 msgstr "នាំចូល​ប្រតិទិន​ពី %1..."
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, fuzzy, kde-format
 #| msgid "Error during create contact : %1"
 msgid "Error during contact creation: %1"
 msgstr "មាន​កំហុស​នៅ​ពេល​បង្កើត​ទំនាក់ទំនង ៖ %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, fuzzy, kde-format
 #| msgid "Contact created done"
 msgid "Contact creation complete"
 msgstr "បាន​បង្កើត​ទំនាក់ទំនង​ដោយ​ជោគជ័យ"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import Filters"
-msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "នាំចូល​តម្រង​"
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "តម្រង %1 នឹង​ត្រូវ​បាន​នាំ​ចូល​ពី \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "រក​មិន​ឃើញ​ឯកសារ​ត្រង"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "កំពុង​រៀបចំ​អត្តសញ្ញាណ..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "បាន​រៀបចំអត្តសញ្ញាណ ។"
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "កំពុង​រៀបចំ​ការ​ធ្វើ​ដំណើរ..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "បាន​រៀបចំ​ការ​ធ្វើ​ដំណើរ ។"
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "រក្សាសិទ្ធិ​ឆ្នាំ ២០១២ ដោយ​អ្នក​និពន្ធ​អ្នកជំនួយការ​នាំចូល"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "អ្នក​ថែទាំ"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr ""
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, fuzzy, kde-format
 #| msgid "Import addressbook"
 msgid "No addressbook found"
 msgstr "នាំចូល​សៀវភៅ​អាសយដ្ឋាន"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, fuzzy, kde-format
 #| msgid "Import addressbook from %1..."
 msgid "New addressbook created: %1"
 msgstr "នាំចូល​សៀវភៅ​អាសយដ្ឋាន​ពី %1..."
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "ការ​នាំចូល​កំពុង​ដំណើរការ"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "បាន​បញ្ចប់​ការ​នាំចូល"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "រក​មិន​ឃើញ​ការ​កំណត់​សំបុត្រ Claws ។"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, fuzzy, kde-format
 #| msgid ""
 #| "Evolution address book will be exported as vcard. Import vcard in "
@@ -173,178 +283,68 @@
 "សៀវភៅ​អាសយដ្ឋាន​របស់ Evolution នឹង​ត្រូវ​បាន​នាំចេញ​ជា vcard ។ នាំចូល vcard ក្នុង "
 "KAddressBook ។"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "នាំចេញ​សៀវភៅ​អាសយដ្ឋាន​របស់ Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "ជ្រើស​ថយ​ដែល vCards នឹង​ត្រូវ​បាន​ស្ដារ ។"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "បាន​នាំចូល​សៀវភៅ​អាសយដ្ឋាន \"%1\" ។"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "បាន​បរាជ័យ​ក្នុង​ការនាំចេញ​សៀវភៅ​អាសយដ្ឋាន \"%1\" ។"
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "រក​មិន​ឃើញ​ការ​កំណត់ Evolution ។"
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "រក​មិន​ឃើញ​ប្រតិទិន Evolution ។"
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "រក​មិន​ឃើញ​ការ​កំណត់ Thunderbird ។"
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "រក​មិន​ឃើញ​ការ​កំណត់ Sylpheed"
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "រក​មិន​ឃើញ​ការ​កំណត់ Sylpheed"
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "រក​មិន​ឃើញ​ទំនាក់ទំនង​នៅ​ក្នុង %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "រក​មិន​ឃើញ​ការ​កំណត់ Sylpheed"
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, fuzzy, kde-format
 #| msgid "Filters file was not found"
 msgid "Contacts file '%1' not found"
 msgstr "រក​មិន​ឃើញ​ឯកសារ​ត្រង"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, fuzzy, kde-format
-#| msgid "No program found"
-msgid "No program found."
-msgstr "រក​មិន​ឃើញ​កម្មវិធី​ឡើយ"
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "ឧបករណ៍​នាំចូល​របស់ PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"បិទ KMail មុន​ពេល​នាំចូល​ទិន្ន័យ ។ កម្មវិធី​មួយ​ចំនួន​នឹង​កែប្រែ​ឯកសារ​ការ​កំណត់​រចនាសម្ព័ន្ធ​របស់ KMail ។"
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr ""
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "លុប​កម្មវិធី"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "ជ្រើស​វត្ថុ​ធាតុ​ដើម្បី​នាំចូល"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "នាំចូល​សារ​ទាំងអស់"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "នាំចូល​តម្រង​សារ"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "នាំចូល​ការ​កំណត់"
-
-#: importwizard.cpp:208
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import addressbooks"
-msgstr "នាំចូល​សៀវភៅ​អាសយដ្ឋាន"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "នាំចូល​ប្រតិទិន"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "បញ្ចប់"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "នាំចូល​សៀវភៅ​អាសយដ្ឋាន​ពី %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "នាំចូល​តម្រង​ពី %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "នាំចូល​សារ​ពី %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "នាំចូល​ការ​កំណត់​ពី %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "នាំចូល​ប្រតិទិន​ពី %1..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "រក្សាសិទ្ធិ​ឆ្នាំ ២០១២ ដោយ​អ្នក​និពន្ធ​អ្នកជំនួយការ​នាំចូល"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "អ្នក​ថែទាំ"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr ""
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
+msgid "Thunderbird settings not found."
+msgstr "រក​មិន​ឃើញ​ការ​កំណត់ Thunderbird ។"
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/ko/importwizard.po akonadi-import-wizard-17.08.3/po/ko/importwizard.po
--- akonadi-import-wizard-17.04.3/po/ko/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/ko/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2016-02-14 16:08+0100\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean <kde@peremen.name>\n"
@@ -27,132 +27,244 @@
 msgid "Your emails"
 msgstr "kde@peremen.name"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "프로그램을 찾을 수 없습니다."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "PIM 가져오기 도구"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"데이터를 가져오기 전에 KMail을 닫으십시오. 일부 플러그인은 KMail 설정 파일을 "
+"편집합니다."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "단계 1: 필터 선택"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "단계 2: 가져오는 중..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "프로그램 감지"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "가져올 자원 선택"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "메일 메시지 가져오기"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "메일 필터 가져오기"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "설정 가져오기"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "주소록 가져오기"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "달력 가져오기"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "완료"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "%1에서 주소록 가져오는 중..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "%1에서 필터 가져오는 중..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "%1에서 메일 가져오는 중..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "%1에서 설정 가져오는 중..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "%1에서 달력 가져오는 중..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "가져오는 중"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "가져오기 완료됨"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "새 연락처 만드는 중..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "주소록 선택"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "새 연락처를 저장할 주소록을 선택하십시오:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "주소록을 선택하지 않았습니다."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "\"%1\"에서 가져옴"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "콘텐츠 생성 중 오류 발생: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "콘텐츠 생성 완료됨"
 
-#: autodetect/abstractimporter.cpp:88
-#, kde-format
-msgid "Importing of filters was canceled."
+#: libimportwizard/abstractimporter.cpp:82
+#, fuzzy, kde-format
+#| msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "필터 가져오기 작업이 취소되었습니다."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "\"%2\"에서 필터 %1개 가져옴"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "필터 파일을 찾을 수 없음"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "프로필 설정 중..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "프로필을 설정했습니다."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "전송 방식 설정 중..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "전송 방식을 설정했습니다."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2016 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2016 importwizard authors"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "관리자"
+
+#: main.cpp:61
+#, fuzzy, kde-format
+#| msgid "Mode"
+msgid "Mode: %1"
+msgstr "모드"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>%1이(가) 작성함.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "주소록을 찾을 수 없음"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "LDAP 생성됨"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "새 주소록 생성됨: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "가져오는 중"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "가져오기 완료됨"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Claws 메일 설정을 찾을 수 없습니다."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -160,177 +272,67 @@
 msgstr ""
 "에볼루션 주소록을 vCard로 내보내며, vCard를 KAddressBook에서 가져옵니다."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "에볼루션 주소록 내보내기"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "vCard를 저장할 디렉터리를 지정합니다."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "주소록 \"%1\"을(를) 내보냈습니다."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "주소록 \"%1\"을(를) 내보낼 수 없습니다."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "에볼루션 설정을 찾을 수 없습니다."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "에볼루션 달력을 찾을 수 없습니다."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Thunderbird 설정을 찾을 수 없습니다."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "실피드 설정을 찾을 수 없습니다."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "실피드 설정을 찾을 수 없습니다."
+
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "%1에서 연락처 찾을 수 없음"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "실피드 설정을 찾을 수 없습니다."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "연락처 파일 '%1'을(를) 찾을 수 없음"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "프로그램을 찾을 수 없습니다."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "PIM 가져오기 도구"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"데이터를 가져오기 전에 KMail을 닫으십시오. 일부 플러그인은 KMail 설정 파일을 "
-"편집합니다."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "단계 1: 필터 선택"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "단계 2: 가져오는 중..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "프로그램 감지"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "가져올 자원 선택"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "메일 메시지 가져오기"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "메일 필터 가져오기"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "설정 가져오기"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "주소록 가져오기"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "달력 가져오기"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "완료"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "%1에서 주소록 가져오는 중..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "%1에서 필터 가져오는 중..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "%1에서 메일 가져오는 중..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "%1에서 설정 가져오는 중..."
-
-#: importwizard.cpp:287
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import calendar from %1..."
-msgstr "%1에서 달력 가져오는 중..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2016 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2016 importwizard authors"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "관리자"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "모드"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>%1이(가) 작성함.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Thunderbird 설정을 찾을 수 없습니다."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/lt/importwizard.po akonadi-import-wizard-17.08.3/po/lt/importwizard.po
--- akonadi-import-wizard-17.04.3/po/lt/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/lt/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: l 10n\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2015-12-29 20:26+0200\n"
 "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba@gmail.com>\n"
 "Language-Team: lt <kde-i18n-lt@kde.org>\n"
@@ -31,49 +31,167 @@
 msgid "Your emails"
 msgstr "liudas@akmc.lt"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, fuzzy, kde-format
+#| msgid "No program found"
+msgid "No program found."
+msgstr "Nerasta programų"
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "PIM importo įrankis"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Uždarykite KMail prieš importuojant duomenis. Kai kurie plėtiniai pakeis "
+"KMail konfigūracijos failus."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr ""
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Aptikti programą"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Pasirinkite importuotinas vertybes"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importuoti laiškus"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importuoti pašto filtrus"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importavimo nuostatos"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importuoti adresų knygas"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importuoti kalendorius"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Baigti"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importuoti adresų knygą iš %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importuoti filtrus iš %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importuoti laiškus iš %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importuoti nuostatas iš %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importuoti kalendorių iš %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Vyksta importavimas"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Importavimas baigtas"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Kuriamas naujas kontaktas..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Parinkti adresų knygą"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Pasirinkite į kurią adresų knygą įrašyti naująjį adresatą:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Adresų knygelė nebuvo neparinkta."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import calendar from %1..."
 msgid "Imported from \"%1\""
 msgstr "Importuoti kalendorių iš %1..."
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Klaida kuriant kontaktą: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Kontakto kūrimas baigtas"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import Filters"
-msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "Importavimo filtrai"
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
@@ -82,88 +200,81 @@
 msgstr[2] "%1 filtrų buvo importuota iš „%2“"
 msgstr[3] "%1 filtras buvo importuotas iš „%2“"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Nerastas filtrų failas"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Nustatoma tapatybė..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Tapatybės nustatymas."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Nustatomas perdavimas..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Perdavimo nustatymas."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2013 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Autorinės teisės © 2012-2013 importovedlys autoriai"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Palaikytojas"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr ""
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, fuzzy, kde-format
 #| msgid "Import addressbook"
 msgid "No addressbook found"
 msgstr "Importuoti adresų knygą"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, fuzzy, kde-format
 #| msgid "Import addressbook from %1..."
 msgid "New addressbook created: %1"
 msgstr "Importuoti adresų knygą iš %1..."
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Vyksta importavimas"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Importavimas baigtas"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Claws Mail nuostatos nerasti."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -172,179 +283,68 @@
 "Evolution adresų knyga bus eksportuota kaip vCard. Importuokite vCard į "
 "KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Eksportuoti Evolution adresų knygą"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Nurodykite direktoriją, kurioje vCards bus saugomos."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Adresų knyga „%1“ eksportuota."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Nepavyko eksportuoti adresų knygos „%1“."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Nerasti Evolution nuostatos."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Nerastas Evolution kalendorius."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Thunderbird nuostatos nerasti."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "Sylpheed nuostatos nerasti."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "Sylpheed nuostatos nerasti."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Nerasta kontaktų šaltinyje %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Sylpheed nuostatos nerasti."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, fuzzy, kde-format
 #| msgid "Filters file was not found"
 msgid "Contacts file '%1' not found"
 msgstr "Nerastas filtrų failas"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, fuzzy, kde-format
-#| msgid "No program found"
-msgid "No program found."
-msgstr "Nerasta programų"
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "PIM importo įrankis"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Uždarykite KMail prieš importuojant duomenis. Kai kurie plėtiniai pakeis "
-"KMail konfigūracijos failus."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr ""
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Aptikti programą"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Pasirinkite importuotinas vertybes"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importuoti laiškus"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importuoti pašto filtrus"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importavimo nuostatos"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Importuoti adresų knygas"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importuoti kalendorius"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Baigti"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importuoti adresų knygą iš %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importuoti filtrus iš %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importuoti laiškus iš %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importuoti nuostatas iš %1..."
-
-#: importwizard.cpp:287
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importuoti kalendorių iš %1..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2013 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Autorinės teisės © 2012-2013 importovedlys autoriai"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Palaikytojas"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr ""
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
+msgid "Thunderbird settings not found."
+msgstr "Thunderbird nuostatos nerasti."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/mr/importwizard.po akonadi-import-wizard-17.08.3/po/mr/importwizard.po
--- akonadi-import-wizard-17.04.3/po/mr/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/mr/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2013-03-11 16:11+0530\n"
 "Last-Translator: Chetan Khona <chetan@kompkin.com>\n"
 "Language-Team: Marathi <kde-i18n-doc@kde.org>\n"
@@ -27,307 +27,305 @@
 msgid "Your emails"
 msgstr "chetan@kompkin.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
 #, kde-format
-msgid "Creating new contact..."
+msgid "No program found."
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:51
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
 #, kde-format
-msgid "Select Address Book"
+msgid "PIM Import Tool"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:52
+#: importwizard.cpp:84
 #, kde-format
-msgid "Select the address book the new contact shall be saved in:"
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:57
+#: importwizard.cpp:139
 #, kde-format
-msgid "Address Book was not selected."
+msgid "Step 1: Select Filter"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:84
+#: importwizard.cpp:144
 #, kde-format
-msgid "Imported from \"%1\""
+msgid "Step 2: Importing..."
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: importwizard.cpp:173
 #, kde-format
-msgid "Error during contact creation: %1"
+msgid "Detect program"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:106
+#: importwizard.cpp:178
 #, kde-format
-msgid "Contact creation complete"
+msgid "Select material to import"
 msgstr ""
 
-#: autodetect/abstractimporter.cpp:88
-#, fuzzy, kde-format
-#| msgid "Import Filters"
-msgid "Importing of filters was canceled."
-msgstr "गाळणी आयात करा"
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "मेल संदेश आयात करा"
 
-#: autodetect/abstractimporter.cpp:90
+#: importwizard.cpp:186
 #, kde-format
-msgid "1 filter was imported from \"%2\""
-msgid_plural "%1 filters were imported from \"%2\""
-msgstr[0] ""
-msgstr[1] ""
+msgid "Import mail filters"
+msgstr "मेल गाळणी आयात करा"
 
-#: autodetect/abstractimporter.cpp:94
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
 #, kde-format
-msgid "Filters file was not found"
-msgstr ""
+msgid "Import settings"
+msgstr "संयोजना  आयात करा"
 
-#: autodetect/abstractsettings.cpp:54
+#: importwizard.cpp:194
 #, kde-format
-msgid "Setting up identity..."
+msgid "Import addressbooks"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:62
+#: importwizard.cpp:198
 #, kde-format
-msgid "Identity set up."
-msgstr ""
+msgid "Import calendars"
+msgstr "दिनदर्शिका आयात करा"
 
-#: autodetect/abstractsettings.cpp:79
+#: importwizard.cpp:202
 #, kde-format
-msgid "Setting up transport..."
+msgid "Finish"
+msgstr "संपले"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:91
+#: importwizard.cpp:232
 #, kde-format
-msgid "Transport set up."
+msgid "Import filters from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: importwizard.cpp:240
 #, kde-format
-msgid "No addressbook found"
+msgid "Import mails from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: importwizard.cpp:248
 #, kde-format
-msgid "Ldap created"
+msgid "Import settings from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: importwizard.cpp:256
 #, kde-format
-msgid "New addressbook created: %1"
+msgid "Import calendar from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
 #, kde-format
 msgid "Import in progress"
 msgstr ""
 
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
 #, kde-format
 msgid "Import finished"
 msgstr "आयात पूर्ण झाले"
 
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
-msgid "Claws Mail settings not found."
+msgid "Creating new contact..."
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
-msgid ""
-"Evolution address book will be exported as vCard. Import vCard in "
-"KAddressBook."
+msgid "Select Address Book"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
-msgid "Export Evolution Address Book"
+msgid "Select the address book the new contact shall be saved in:"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
-msgid "Select the directory where vCards will be stored."
+msgid "Address Book was not selected."
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
-msgid "Address book \"%1\" exported."
+msgid "Imported from \"%1\""
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
-msgid "Failed to export address book \"%1\"."
+msgid "Error during contact creation: %1"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
-msgid "Evolution settings not found."
+msgid "Contact creation complete"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: libimportwizard/abstractimporter.cpp:82
+#, fuzzy, kde-format
+#| msgid "Import Filters"
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "गाळणी आयात करा"
+
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
-msgid "Evolution calendar not found."
-msgstr ""
+msgid "1 filter was imported from \"%2\""
+msgid_plural "%1 filters were imported from \"%2\""
+msgstr[0] ""
+msgstr[1] ""
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
-msgid "Thunderbird settings not found."
+msgid "Filters file was not found"
 msgstr ""
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
-msgid "No contact found in %1"
+msgid "Setting up identity..."
 msgstr ""
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
-msgid "Sylpheed settings not found."
+msgid "Identity set up."
 msgstr ""
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
-msgid "Contacts file '%1' not found"
+msgid "Setting up transport..."
 msgstr ""
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
-msgid "No program found."
+msgid "Transport set up."
 msgstr ""
 
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
+#: main.cpp:52
 #, kde-format
-msgid "PIM Import Tool"
+msgid "Copyright © 2012-2017 ImportWizard authors"
 msgstr ""
 
-#: importwizard.cpp:97
+#: main.cpp:54
 #, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
+msgid "Laurent Montel"
+msgstr "लोरेन्ट मोन्टेल"
 
-#: importwizard.cpp:153
+#: main.cpp:54
 #, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
+msgid "Maintainer"
+msgstr "पालक"
 
-#: importwizard.cpp:158
+#: main.cpp:61
 #, kde-format
-msgid "Step 2: Importing..."
+msgid "Mode: %1"
 msgstr ""
 
-#: importwizard.cpp:187
+#: manual/manualselectfilterpage.cpp:96
 #, kde-format
-msgid "Detect program"
+msgid "<p><i>Written by %1.</i></p>"
 msgstr ""
 
-#: importwizard.cpp:192
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
-msgid "Select material to import"
+msgid "No addressbook found"
 msgstr ""
 
-#: importwizard.cpp:196
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
-msgid "Import mail messages"
-msgstr "मेल संदेश आयात करा"
+msgid "Ldap created"
+msgstr ""
 
-#: importwizard.cpp:200
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
-msgid "Import mail filters"
-msgstr "मेल गाळणी आयात करा"
+msgid "New addressbook created: %1"
+msgstr ""
 
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
-msgid "Import settings"
-msgstr "संयोजना  आयात करा"
+msgid "Claws Mail settings not found."
+msgstr ""
 
-#: importwizard.cpp:208
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
-msgid "Import addressbooks"
+msgid ""
+"Evolution address book will be exported as vCard. Import vCard in "
+"KAddressBook."
 msgstr ""
 
-#: importwizard.cpp:212
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
-msgid "Import calendars"
-msgstr "दिनदर्शिका आयात करा"
+msgid "Export Evolution Address Book"
+msgstr ""
 
-#: importwizard.cpp:216
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
-msgid "Finish"
-msgstr "संपले"
+msgid "Select the directory where vCards will be stored."
+msgstr ""
 
-#: importwizard.cpp:255
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
-msgid "Import addressbook from %1..."
+msgid "Address book \"%1\" exported."
 msgstr ""
 
-#: importwizard.cpp:263
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
-msgid "Import filters from %1..."
+msgid "Failed to export address book \"%1\"."
 msgstr ""
 
-#: importwizard.cpp:271
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
-msgid "Import mails from %1..."
+msgid "Evolution settings not found."
 msgstr ""
 
-#: importwizard.cpp:279
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
-msgid "Import settings from %1..."
+msgid "Evolution calendar not found."
 msgstr ""
 
-#: importwizard.cpp:287
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Import calendar from %1..."
+msgid "Icedove settings not found."
 msgstr ""
 
-#: main.cpp:52
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
 #, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
+msgid "SeaMonkey settings not found."
 msgstr ""
 
-#: main.cpp:54
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
-msgid "Laurent Montel"
-msgstr "लोरेन्ट मोन्टेल"
+msgid "No contact found in %1"
+msgstr ""
 
-#: main.cpp:54
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
-msgid "Maintainer"
-msgstr "पालक"
+msgid "Sylpheed settings not found."
+msgstr ""
 
-#: main.cpp:61
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
-msgid "Mode"
+msgid "Contacts file '%1' not found"
 msgstr ""
 
-#: manual/manualselectfilterpage.cpp:96
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "<p><i>Written by %1.</i></p>"
+msgid "Thunderbird settings not found."
 msgstr ""
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
diff -Nru akonadi-import-wizard-17.04.3/po/nb/importwizard.po akonadi-import-wizard-17.08.3/po/nb/importwizard.po
--- akonadi-import-wizard-17.04.3/po/nb/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/nb/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -1,11 +1,11 @@
-# Translation of importwizard to Norwegian Bokmål
+# Translation of akonadiimportwizard to Norwegian Bokmål
 #
 # Bjørn Steensrud <bjornst@skogkatt.homelinux.org>, 2012, 2013, 2014, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2015-02-07 19:07+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -29,133 +29,242 @@
 msgid "Your emails"
 msgstr "bjornst@skogkatt.homelinux.org"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr ""
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "PIM importverktøy"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Lukk KMail før data importeres. Noen programtilleg vil endre oppsettsfila "
+"til KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr ""
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Finn program"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Velg stoff som skal importeres"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importer e-postmeldinger"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importer e-postfiltre"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importer innstillinger"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importer adressebøker"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importer kalendere"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Fullfør"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importer adressebøker fra %1 …"
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importer filtre fra %1 …"
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importer e-poster fra %1 …"
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importer innstillinger fra %1 …"
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importer kalender fra %1 …"
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Import pågår"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Import fullført"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Oppretter en ny kontakt …"
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Velg adressebok"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Velg den adresseboka der den nye kontakten skal lagres:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Adressebok var ikke valgt."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importert fra «%1»"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Feil mens kontakt ble opprettet: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Kontakt ferdig opprettet"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr ""
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "1 filter ble importert fra «%2»"
 msgstr[1] "%1 filtre ble importert fra «%2»"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Fant ikke fil med filtre"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Setter opp identitet …"
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identitet er satt opp."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Setter opp transport …"
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Transport satt opp."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr ""
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Vedlikeholder"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr ""
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Fant ingen adressebok"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Ldap opprettet."
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Ny adressebok opprettet: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Import pågår"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Import fullført"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Fant ikke Claws Mail-innstillinger."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -164,176 +273,65 @@
 "Evolution adressebok vil bli eksportert som vCard. Importer vCard i "
 "KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Eksporter Evolution adressebok"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Velg mappa der vcard-data blir lagret."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Adressebok «%1» eksportert."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Klarte ikke å eksportere adresseboka «%1»."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Fant ikke Evolution-innstillinger."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Fant ikke Evolution-kalender."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Fant ikke Thunderbird-innstillinger."
+msgid "Icedove settings not found."
+msgstr ""
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr ""
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Fant ingen kontakt i %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Fant ikke Sylpheed-innstillinger."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr ""
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr ""
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "PIM importverktøy"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Lukk KMail før data importeres. Noen programtilleg vil endre oppsettsfila "
-"til KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr ""
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Finn program"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Velg stoff som skal importeres"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importer e-postmeldinger"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importer e-postfiltre"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importer innstillinger"
-
-#: importwizard.cpp:208
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import addressbooks"
-msgstr "Importer adressebøker"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importer kalendere"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Fullfør"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importer adressebøker fra %1 …"
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importer filtre fra %1 …"
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importer e-poster fra %1 …"
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importer innstillinger fra %1 …"
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importer kalender fra %1 …"
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr ""
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Vedlikeholder"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr ""
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
+msgid "Thunderbird settings not found."
+msgstr "Fant ikke Thunderbird-innstillinger."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/nds/importwizard.po akonadi-import-wizard-17.08.3/po/nds/importwizard.po
--- akonadi-import-wizard-17.04.3/po/nds/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/nds/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2014-04-16 00:48+0200\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -29,134 +29,245 @@
 msgid "Your emails"
 msgstr "s_dibbern@web.de"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, fuzzy, kde-format
+#| msgid "No program found"
+msgid "No program found."
+msgstr "Keen Programm funnen"
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "PIM-Importwarktüüch"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Maak KMail to, ehr Du Daten importeerst. En Reeg Modulen ännert de KMail-"
+"Instellendatei."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr ""
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Programm opdecken"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Daten utsöken, de Du importeren wullt"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Nettbreven importeren"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Nettpostfiltern importeren"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importinstellen"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Adressböker importeren"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Kalenners importeren"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Fardig maken"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Adressbook vun %1 importeren..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Filtern vun %1 importeren..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Nettpost vun %1 importeren..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Instellen vun %1 importeren..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Kalenner vun %1 importeren..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Import löppt"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Import afslaten"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Nieg Kontakt warrt opstellt..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Adressbook utsöken"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Dat Adressbook utsöken, binnen dat en nieg Kontakt sekert warrt:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Keen Adressbook weer utsöcht."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Ut \"%1\" importeert"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Fehler bi't Opstellen vun en Kontakt: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Kontaktenopstellen afslaten"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import Filters"
-msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "Filtern importeren"
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "1 Filter wöör ut \"%2\" importeert"
 msgstr[1] "%1 Filtern wöörn ut \"%2\" importeet"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Filterdatei lett sik nich finnen"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Identiteet warrt inricht..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identiteet wöör inricht."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Överdreegmetood warrt opstellt..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Överdreegmetood opstellt."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2013-2014 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2013-2014 de Schrievers vun Importwizard"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Pleger"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr ""
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Keen Adressbook funnen"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "LDAP opstellt"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Nieg Adressbook opstellt: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Import löppt"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Import afslaten"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Claws-Mail-Instellen laat sik nich finnen."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -165,179 +276,68 @@
 "Evolution-Adressbook warrt as VCard exporteert. Importeren vun VCard na "
 "KAddressbook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Evolution-Adressbook exporteren"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Den Orner utsöken, binnen den de VCards afleggt warrt"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Adressbook \"%1\" exporteert."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Adressbook \"%1\" lett sik nich exporteren"
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Evolution-Instellen laat sik nich finnen."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Evolution-Kalenner lett sik nich finnen."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Thunderbird-Instellen laat sik nich finnen."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "Sylpheed-Instellen laat sik nich finnen."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "Sylpheed-Instellen laat sik nich finnen."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Keen Kontakt funnen binnen %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Sylpheed-Instellen laat sik nich finnen."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, fuzzy, kde-format
 #| msgid "Filters file was not found"
 msgid "Contacts file '%1' not found"
 msgstr "Filterdatei lett sik nich finnen"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, fuzzy, kde-format
-#| msgid "No program found"
-msgid "No program found."
-msgstr "Keen Programm funnen"
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "PIM-Importwarktüüch"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Maak KMail to, ehr Du Daten importeerst. En Reeg Modulen ännert de KMail-"
-"Instellendatei."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr ""
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Programm opdecken"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Daten utsöken, de Du importeren wullt"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Nettbreven importeren"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Nettpostfiltern importeren"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importinstellen"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Adressböker importeren"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Kalenners importeren"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Fardig maken"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Adressbook vun %1 importeren..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Filtern vun %1 importeren..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Nettpost vun %1 importeren..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Instellen vun %1 importeren..."
-
-#: importwizard.cpp:287
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import calendar from %1..."
-msgstr "Kalenner vun %1 importeren..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2013-2014 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2013-2014 de Schrievers vun Importwizard"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Pleger"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr ""
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
+msgid "Thunderbird settings not found."
+msgstr "Thunderbird-Instellen laat sik nich finnen."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/nl/importwizard.po akonadi-import-wizard-17.08.3/po/nl/importwizard.po
--- akonadi-import-wizard-17.04.3/po/nl/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/nl/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-01-13 12:40+0100\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-05-17 12:18+0100\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
 "Language: nl\n"
@@ -27,135 +27,244 @@
 msgid "Your emails"
 msgstr "freekdekruijf@kde.nl"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Geen programma gevonden."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "PIM-hulpprogramma voor importeren"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"KMail afsluiten alvorens gegevens te importeren. Sommige plug-ins zullen het "
+"configuratiebestand van KMail wijzigen."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Stap 1: selecteer het filter"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Stap 2: importeren..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Programma detecteren"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Te importeren materiaal selecteren"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "E-mailberichten importeren"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "E-mailfilters importeren "
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Instellingen importeren"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Adresboeken importeren"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Agenda's importeren "
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Voltooien"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Adresboek importeren uit %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "E-mailfilters importeren uit %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "E-mail importeren uit %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Instellingen importeren uit %1"
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Agenda importeren uit %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Importeren wordt uitgevoerd"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Import is voltooid"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Nieuw contactpersoon wordt aangemaakt..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Adresboek selecteren"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr ""
 "Het adresboek selecteren waarin de nieuwe contactpersoon moet worden "
 "opgeslagen:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Geen adresboek geselecteerd."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Geïmporteerd uit \"%1\""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Fout bij het aanmaken van een contactpersoon: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Contactpersoon is aangemaakt"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "Filters importeren is geannuleerd."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "Filters uit \"%1\" importeren is geannuleerd."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "1 filter was uit \"%2\" geïmporteerd"
 msgstr[1] "%1 filters waren uit \"%2\" geïmporteerd"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Bestand met filters is niet gevonden"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Identiteit instellen..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identiteit ingesteld."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Verzenden instellen..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Verzenden ingesteld."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2017 auteurs van ImportWizard"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Onderhouder"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Modus: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Geschreven door %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Geen adresboek gevonden"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Ldap aangemaakt"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Nieuw adresboek aangemaakt: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Importeren wordt uitgevoerd"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Import is voltooid"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Instellingen van Claws-e-mail niet gevonden."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -164,176 +273,65 @@
 "Adresboek van Evolution zal als vCard worden geëxporteerd. vCard in "
 "KAddressBook importeren."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Adresboek van Evolution exporteren"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Selecteer de map waar vCards zullen worden opgeslagen."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Adresboek \"%1\" geëxporteerd."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Adresboek \"%1\" exporteren is mislukt."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Instellingen van Evolution niet gevonden."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Agenda van Evolution niet gevonden."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Instellingen van Thunderbird niet gevonden."
+msgid "Icedove settings not found."
+msgstr "Instellingen van Icedove niet gevonden."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "Instellingen van SeaMonkey niet gevonden."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Geen contactpersoon gevonden in %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Instellingen van Sylpheed niet gevonden."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Contactpersonenbestand '%1' niet gevonden"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Geen programma gevonden."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "PIM-hulpprogramma voor importeren"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"KMail afsluiten alvorens gegevens te importeren. Sommige plug-ins zullen het "
-"configuratiebestand van KMail wijzigen."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Stap 1: selecteer het filter"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Stap 2: importeren..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Programma detecteren"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Te importeren materiaal selecteren"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "E-mailberichten importeren"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "E-mailfilters importeren "
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Instellingen importeren"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Adresboeken importeren"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Agenda's importeren "
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Voltooien"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Adresboek importeren uit %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "E-mailfilters importeren uit %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "E-mail importeren uit %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Instellingen importeren uit %1"
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Agenda importeren uit %1..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2017 auteurs van importwizard"
-
-#: main.cpp:54
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Onderhouder"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Modus"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Geschreven door %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Instellingen van Thunderbird niet gevonden."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/nn/importwizard.po akonadi-import-wizard-17.08.3/po/nn/importwizard.po
--- akonadi-import-wizard-17.04.3/po/nn/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/nn/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -1,4 +1,4 @@
-# Translation of importwizard to Norwegian Nynorsk
+# Translation of akonadiimportwizard to Norwegian Nynorsk
 #
 # Håvard Korsvoll <korsvoll@skulelinux.no>, 2003.
 # Karl Ove Hufthammer <karl@huftis.org>, 2007.
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: kmail_importing\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2007-08-21 18:10+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -38,307 +38,305 @@
 msgid "Your emails"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
 #, kde-format
-msgid "Creating new contact..."
+msgid "No program found."
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:51
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
 #, kde-format
-msgid "Select Address Book"
-msgstr "Vel adressebok"
+msgid "PIM Import Tool"
+msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:52
+#: importwizard.cpp:84
 #, kde-format
-msgid "Select the address book the new contact shall be saved in:"
-msgstr "Vel kva adressebok du vil lagra den nye kontakten i:"
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:57
+#: importwizard.cpp:139
 #, kde-format
-msgid "Address Book was not selected."
-msgstr ""
+msgid "Step 1: Select Filter"
+msgstr "Steg 1: Vel filter"
 
-#: autodetect/abstractaddressbook.cpp:84
+#: importwizard.cpp:144
 #, kde-format
-msgid "Imported from \"%1\""
+msgid "Step 2: Importing..."
+msgstr "Steg 2: Import …"
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: importwizard.cpp:178
 #, kde-format
-msgid "Error during contact creation: %1"
+msgid "Select material to import"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:106
+#: importwizard.cpp:182
 #, kde-format
-msgid "Contact creation complete"
+msgid "Import mail messages"
 msgstr ""
 
-#: autodetect/abstractimporter.cpp:88
+#: importwizard.cpp:186
 #, kde-format
-msgid "Importing of filters was canceled."
+msgid "Import mail filters"
 msgstr ""
 
-#: autodetect/abstractimporter.cpp:90
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
 #, kde-format
-msgid "1 filter was imported from \"%2\""
-msgid_plural "%1 filters were imported from \"%2\""
-msgstr[0] ""
-msgstr[1] ""
+msgid "Import settings"
+msgstr ""
 
-#: autodetect/abstractimporter.cpp:94
+#: importwizard.cpp:194
 #, kde-format
-msgid "Filters file was not found"
+msgid "Import addressbooks"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:54
+#: importwizard.cpp:198
 #, kde-format
-msgid "Setting up identity..."
-msgstr "Set opp identitet …"
+msgid "Import calendars"
+msgstr ""
 
-#: autodetect/abstractsettings.cpp:62
+#: importwizard.cpp:202
 #, kde-format
-msgid "Identity set up."
-msgstr "Identiteten er sett opp."
+msgid "Finish"
+msgstr "Fullfør"
 
-#: autodetect/abstractsettings.cpp:79
+#: importwizard.cpp:224
 #, kde-format
-msgid "Setting up transport..."
+msgid "Import addressbook from %1..."
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:91
+#: importwizard.cpp:232
 #, kde-format
-msgid "Transport set up."
+msgid "Import filters from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: importwizard.cpp:240
 #, kde-format
-msgid "No addressbook found"
+msgid "Import mails from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: importwizard.cpp:248
 #, kde-format
-msgid "Ldap created"
+msgid "Import settings from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: importwizard.cpp:256
 #, kde-format
-msgid "New addressbook created: %1"
+msgid "Import calendar from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
 #, kde-format
 msgid "Import in progress"
 msgstr "I gang med å importera"
 
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
 #, kde-format
 msgid "Import finished"
 msgstr "Ferdig med å importera"
 
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
-msgid "Claws Mail settings not found."
+msgid "Creating new contact..."
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
-msgid ""
-"Evolution address book will be exported as vCard. Import vCard in "
-"KAddressBook."
-msgstr ""
+msgid "Select Address Book"
+msgstr "Vel adressebok"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
-msgid "Export Evolution Address Book"
-msgstr ""
+msgid "Select the address book the new contact shall be saved in:"
+msgstr "Vel kva adressebok du vil lagra den nye kontakten i:"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
-msgid "Select the directory where vCards will be stored."
+msgid "Address Book was not selected."
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
-msgid "Address book \"%1\" exported."
+msgid "Imported from \"%1\""
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
-msgid "Failed to export address book \"%1\"."
+msgid "Error during contact creation: %1"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
-msgid "Evolution settings not found."
+msgid "Contact creation complete"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Evolution calendar not found."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr ""
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr ""
+msgid "1 filter was imported from \"%2\""
+msgid_plural "%1 filters were imported from \"%2\""
+msgstr[0] ""
+msgstr[1] ""
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
-msgid "No contact found in %1"
+msgid "Filters file was not found"
 msgstr ""
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
-msgid "Sylpheed settings not found."
-msgstr ""
+msgid "Setting up identity..."
+msgstr "Set opp identitet …"
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
-msgid "Contacts file '%1' not found"
-msgstr ""
+msgid "Identity set up."
+msgstr "Identiteten er sett opp."
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
-msgid "No program found."
+msgid "Setting up transport..."
 msgstr ""
 
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
-msgid "PIM Import Tool"
+msgid "Transport set up."
 msgstr ""
 
-#: importwizard.cpp:97
+#: main.cpp:52
 #, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
+msgid "Copyright © 2012-2017 ImportWizard authors"
 msgstr ""
 
-#: importwizard.cpp:153
+#: main.cpp:54
 #, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Steg 1: Vel filter"
+msgid "Laurent Montel"
+msgstr ""
 
-#: importwizard.cpp:158
+#: main.cpp:54
 #, kde-format
-msgid "Step 2: Importing..."
-msgstr "Steg 2: Import …"
+msgid "Maintainer"
+msgstr "Vedlikehaldar"
 
-#: importwizard.cpp:187
+#: main.cpp:61
 #, kde-format
-msgid "Detect program"
+msgid "Mode: %1"
 msgstr ""
 
-#: importwizard.cpp:192
+#: manual/manualselectfilterpage.cpp:96
 #, kde-format
-msgid "Select material to import"
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Skrive av %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
+#, kde-format
+msgid "No addressbook found"
 msgstr ""
 
-#: importwizard.cpp:196
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
-msgid "Import mail messages"
+msgid "Ldap created"
 msgstr ""
 
-#: importwizard.cpp:200
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
-msgid "Import mail filters"
+msgid "New addressbook created: %1"
 msgstr ""
 
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
-msgid "Import settings"
+msgid "Claws Mail settings not found."
 msgstr ""
 
-#: importwizard.cpp:208
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
-msgid "Import addressbooks"
+msgid ""
+"Evolution address book will be exported as vCard. Import vCard in "
+"KAddressBook."
 msgstr ""
 
-#: importwizard.cpp:212
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
-msgid "Import calendars"
+msgid "Export Evolution Address Book"
 msgstr ""
 
-#: importwizard.cpp:216
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
-msgid "Finish"
-msgstr "Fullfør"
+msgid "Select the directory where vCards will be stored."
+msgstr ""
 
-#: importwizard.cpp:255
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
-msgid "Import addressbook from %1..."
+msgid "Address book \"%1\" exported."
 msgstr ""
 
-#: importwizard.cpp:263
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
-msgid "Import filters from %1..."
+msgid "Failed to export address book \"%1\"."
 msgstr ""
 
-#: importwizard.cpp:271
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
-msgid "Import mails from %1..."
+msgid "Evolution settings not found."
 msgstr ""
 
-#: importwizard.cpp:279
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
-msgid "Import settings from %1..."
+msgid "Evolution calendar not found."
 msgstr ""
 
-#: importwizard.cpp:287
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Import calendar from %1..."
+msgid "Icedove settings not found."
 msgstr ""
 
-#: main.cpp:52
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
 #, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
+msgid "SeaMonkey settings not found."
 msgstr ""
 
-#: main.cpp:54
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
-msgid "Laurent Montel"
+msgid "No contact found in %1"
 msgstr ""
 
-#: main.cpp:54
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
-msgid "Maintainer"
-msgstr "Vedlikehaldar"
+msgid "Sylpheed settings not found."
+msgstr ""
 
-#: main.cpp:61
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
-msgid "Mode"
-msgstr "Modus"
+msgid "Contacts file '%1' not found"
+msgstr ""
 
-#: manual/manualselectfilterpage.cpp:96
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Skrive av %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr ""
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/pl/importwizard.po akonadi-import-wizard-17.08.3/po/pl/importwizard.po
--- akonadi-import-wizard-17.04.3/po/pl/importwizard.po	2017-07-11 21:15:25.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/pl/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-02-25 07:27+0100\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-08-12 07:30+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
 "Language: pl\n"
@@ -28,47 +28,164 @@
 msgid "Your emails"
 msgstr "lukasz.wojnilowicz@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Nie znaleziono żadnego programu."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Narzędzie importu ZIO"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Zamknij KMail przed importowaniem danych. Pewne wtyczki zmienią plik "
+"ustawień KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Krok 1: Wybór filtra"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Krok 2: Importowanie..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Wybór programu"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Wybierz materiał do zaimportowania"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importuj wiadomości pocztowe"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importuj filtry pocztowe"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importuj ustawienia"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importuj książki adresowe"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importuj kalendarze"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Zakończ"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Zaimportuj książkę adresową z %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Zaimportuj filtry z %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Zaimportuj wiadomości pocztowe z %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Zaimportuj ustawienia z %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Zaimportuj kalendarz z %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Importowanie w trakcie"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Ukończono importowanie"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Tworzenie nowego kontaktu..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Wybierz książkę adresową"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Wybierz książkę adresową, w której zostanie zapisany nowy kontakt:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Nie wybrano książki adresowej."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Zaimportowano z \"%1\""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Błąd przy tworzeniu kontaktu: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Ukończono tworzenie kontaktu"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "Importowanie filtrów zostało anulowane."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "Importowanie filtrów z \"%1\" zostało anulowane."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
@@ -76,86 +193,78 @@
 msgstr[1] "zaimportowano %1 filtry z \"%2\""
 msgstr[2] "zaimportowano %1 filtrów z \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Nie znaleziono plików filtrów"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Ustawianie tożsamości..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Tożsamość została ustawiona."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Ustawianie serwerów pocztowych..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Ustawiono serwery pocztowe."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Prawa autorskie © 2012-2017 Autorzy Pomocnika Importowania"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Opiekun"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Tryb: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Autorem jest %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Brak książki adresowej"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Utworzono Ldap"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Utworzono nową książkę adresową: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Importowanie w trakcie"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Ukończono importowanie"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Nie znaleziono ustawień Poczty Claws."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -164,176 +273,65 @@
 "Książka adresowa Evolution zostanie wyeksportowana jako vCard. Zaimportuj "
 "vCard w Książce adresowej."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Eksportuj książkę adresową Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Wybierz katalog przechowywania wizytówek vCard."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Wyeksportowano książkę adresową \"%1\"."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Nieudane eksportowanie książki adresowej \"%1\"."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Nie znaleziono ustawień Evolution."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Nie znaleziono kalendarza Evolution."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Nie znaleziono ustawień Thunderbirda."
+msgid "Icedove settings not found."
+msgstr "Nie znaleziono ustawień Icedove."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "Nie znaleziono ustawień SeaMonkey."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Nie znaleziono kontaktu w %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Nie znaleziono ustawień Sylpheed."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Nie znaleziono pliku kontaktów '%1'"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Nie znaleziono żadnego programu."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Narzędzie importu ZIO"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Zamknij KMail przed importowaniem danych. Pewne wtyczki zmienią plik "
-"ustawień KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Krok 1: Wybór filtra"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Krok 2: Importowanie..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Wybór programu"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Wybierz materiał do zaimportowania"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importuj wiadomości pocztowe"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importuj filtry pocztowe"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importuj ustawienia"
-
-#: importwizard.cpp:208
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import addressbooks"
-msgstr "Importuj książki adresowe"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importuj kalendarze"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Zakończ"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Zaimportuj książkę adresową z %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Zaimportuj filtry z %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Zaimportuj wiadomości pocztowe z %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Zaimportuj ustawienia z %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Zaimportuj kalendarz z %1..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Prawa autorskie © 2012-2017 Autorzy Pomocnika Importowania"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Opiekun"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Tryb"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Autorem jest %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Nie znaleziono ustawień Thunderbirda."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/pt/docs/importwizard/index.docbook akonadi-import-wizard-17.08.3/po/pt/docs/importwizard/index.docbook
--- akonadi-import-wizard-17.04.3/po/pt/docs/importwizard/index.docbook	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/pt/docs/importwizard/index.docbook	2017-11-07 01:26:36.000000000 +0000
@@ -0,0 +1,296 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+  <!ENTITY i18n-importwizard "<application
+>Assistente de Importação</application
+>">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % Portuguese "INCLUDE"
+> 
+]>
+
+<article id="importwizard" lang="&language;">
+
+<articleinfo id="importwizardinfo">
+
+<title
+>O Manual do &i18n-importwizard;</title>
+
+<authorgroup>
+<author
+><personname
+> <firstname
+>Laurent</firstname
+> <surname
+>Montel</surname
+> </personname
+> <email
+>montel@kde.org</email
+> </author>
+<othercredit role="translator"
+><firstname
+>José</firstname
+><surname
+>Pires</surname
+><affiliation
+><address
+><email
+>zepires@gmail.com</email
+></address
+></affiliation
+><contrib
+>Tradução</contrib
+></othercredit
+> 
+</authorgroup>
+
+<copyright>
+<year
+>2013</year>
+<holder
+>Laurent Montel</holder>
+</copyright>
+
+<date
+>2016-07-27</date>
+<releaseinfo
+>5.3.40 (Aplicações 16.08)</releaseinfo>
+
+</articleinfo>
+
+<sect1 id="introduction">
+<title
+>Introdução</title>
+
+<para
+>O &i18n-importwizard; permite importar as mensagens de e-mail, a configuração e os livros de endereços das seguintes aplicações de e-mail:</para>
+
+<para
+><application
+>Trojitá</application
+>, <application
+>Evolution 1.x - 3.x</application
+>, <application
+>OS X Mail</application
+>, <application
+>Opera</application
+>, <application
+>Sylpheed</application
+>, <application
+>Thunderbird/Mozilla</application
+>, <application
+>The Bat!</application
+>, <application
+>Outlook Express</application
+>, <application
+>Balsa</application
+>, <application
+>Pegasus-Mail</application
+> e <application
+>Claws Mail</application
+> </para>
+
+<para
+>Para além disso, pode usar a importação manual do <application
+>Arquivo do KMail</application
+>, bem como dos arquivos de <application
+>mbox (Unix, Evolution)</application
+>, 'Maildirs' do &kmail;, <application
+>Icedove</application
+>, <application
+>Lotus Notes</application
+>, <application
+>Texto Simples</application
+> e <application
+>Mailman</application
+>. </para>
+
+<para
+>Se não forem detectados automaticamente nenhuns dados de e-mail, então carregue na <guibutton
+>Selecção Manual</guibutton
+> da janela inicial e use as funcionalidades de <link linkend="manual-import"
+>Importação Manual</link
+>. </para>
+
+<para
+>Poderá iniciar o &i18n-importwizard; quer através do lançador de aplicações ou a partir do &kmail; com a opção <menuchoice
+><guimenu
+>Ferramentas</guimenu
+><guimenuitem
+>Assistente de Importação</guimenuitem
+></menuchoice
+>, no caso da detecção automática, ou com <menuchoice
+><guimenu
+>Ficheiro</guimenu
+> <guimenuitem
+>Importar as Mensagens</guimenuitem
+></menuchoice
+>, no caso da importação manual. </para>
+
+<note>
+<para
+>Feche o &kmail; antes de importar os dados. Alguns 'plugins' irão modificar o ficheiro de configuração do &kmail;.</para>
+</note>
+
+<para
+>Para mais informações sobre outros utilitários para importar mensagens de e-mail, leia por favor o manual <ulink url="help:/pimsettingexporter"
+>Exportação das Definições PIM</ulink
+>.</para>
+
+<sect2 id="detected-mailers">
+<title
+>Aplicações de E-Mail Detectadas</title>
+
+<para
+>No arranque, o assistente de importação irá detectar todas as aplicações de e-mail suportadas e apresentá-las para si na janela. Seleccione a aplicação de e-mail de onde deseja importar e carregue no botão <guibutton
+>Seguinte</guibutton
+>. O assistente irá então perguntar se deseja importar tudo ou então dar-lhe opções para seleccionar os tipos de materiais que deseja importar.</para>
+
+<screenshot>
+<screeninfo
+>Importar a Selecção</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="import-selection.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>Importar a Selecção</phrase>
+    </textobject>
+    <caption>
+      <para
+>Importar a Selecção</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+
+<para
+>Dependendo das suas selecções dos itens a importar, irá ver um ou mais dos ecrãs seguintes:</para>
+
+<itemizedlist>
+
+<listitem
+><para
+>Para importar as mensagens de e-mail, terá de seleccionar a pasta para onde deseja importar as suas mensagens de e-mail. Assim que a seleccionar, carregue no botão <guibutton
+>Importar o Correio</guibutton
+>. Logo que a barra de progresso chegue aos 100%, carregue no botão <guibutton
+>Seguinte</guibutton
+> ou no botão <guibutton
+>Terminar</guibutton
+>, caso tenha sido a sua última selecção.</para
+></listitem>
+
+<listitem
+><para
+>Para importar os filtros de e-mail, carregue em <guibutton
+>Importar os Filtros</guibutton
+>, para que ele importe todos os filtros que encontrar; quando terminar, carregue no botão <guibutton
+>Seguinte</guibutton
+> ou em <guibutton
+>Terminar</guibutton
+>, caso seja a última selecção.</para
+></listitem>
+
+<listitem
+><para
+>Para importar a configuração, carregue no botão <guibutton
+>Importar a Configuração</guibutton
+>. O assistente perguntar-lhe-á algumas informações &eg; qual a pasta a usar para as pastas de contas que não existam. O assistente também irá criar a sua identidade. Assim que terminar, carregue no botão <guibutton
+>Seguinte</guibutton
+>, ou então em <guibutton
+>Terminar</guibutton
+> caso tenha sido a sua última selecção de itens.</para
+></listitem>
+
+<listitem
+><para
+>Para importar os livros de endereços, carregue no botão <guibutton
+>Importar o livro de endereços</guibutton
+> ou <guibutton
+>Importar o calendário</guibutton
+>, para que ele importe todos os livros de endereços ou calendários que encontrar. Logo que terminar, carregue no botão <guibutton
+>Seguinte</guibutton
+>.</para
+></listitem>
+</itemizedlist>
+
+<para
+>Carregue no botão <guibutton
+>Terminar</guibutton
+> para finalizar e sair do assistente. Se, em qualquer altura, desejar terminar o assistente, poderá carregar no botão <guibutton
+>Cancelar</guibutton
+>.</para>
+
+</sect2>
+
+<sect2 id="manual-import">
+<title
+>Importação Manual</title>
+
+<para>
+<screenshot>
+<screeninfo
+>Importação Manual</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="manual-import.png" format="PNG"/>
+    </imageobject>
+  </mediaobject>
+</screenshot>
+</para>
+
+<note
+><para
+>Certifique-se por favor que compacta as suas pastas no outro cliente de e-mail.</para
+></note>
+<para
+>Seleccione o seu programa de e-mail anterior na lista. A área de texto central será actualizada com instruções especiais (se for válido) e a localização conhecida do armazenamento das mensagens de e-mail para essa aplicação. Siga essas instruções e depois seleccione a pasta para onde deseja importar as suas mensagens.</para>
+<para
+>Se quiser remover as mensagens duplicadas, assinale a opção <guilabel
+>Remover as mensagens duplicadas durante a importação</guilabel
+>. Uma janela de selecção de ficheiros irá aparecer e terá de seleccionar o ficheiro/pasta indicado nas instruções. Carregue no botão <guibutton
+>Seguinte</guibutton
+> para terminar a importação. Quando esta terminar, poderá carregar no botão <guibutton
+>Recuar</guibutton
+> para importar a partir de outra aplicação ou o botão <guibutton
+>Terminar</guibutton
+> para sair. </para>
+</sect2>
+
+</sect1>
+
+<sect1 id="credits">
+
+<title
+>Créditos e Licença</title>
+
+<para
+>&i18n-importwizard;</para>
+<para
+>Programa com 'copyright' 2013 de Laurent Montel montel@kde.org </para>
+<para
+>A Secção da Importação Manual é uma cópia modificada do Manual do KMailCVT</para>
+<para
+>Documentação com 'copyright' &copy; 2013 de Laurent Montel montel@kde.org e Scarlett Clark scarlett@scarlettgatelyclark.com </para>
+
+<para
+>Tradução de José Nuno Pires <email
+>zepires@gmail.com</email
+></para
+> 
+&underFDL; &underGPL; </sect1>
+
+</article>
+
+<!--
+Local Variables:
+mode: xml
+sgml-minimize-attributes:nil
+sgml-general-insert-case:lower
+sgml-indent-step:0
+sgml-indent-data:nil
+End:
+
+vim:tabstop=2:shiftwidth=2:expandtab
+kate: space-indent on; indent-width 2; tab-width 2; indent-mode none;
+-->
diff -Nru akonadi-import-wizard-17.04.3/po/pt/importwizard.po akonadi-import-wizard-17.08.3/po/pt/importwizard.po
--- akonadi-import-wizard-17.04.3/po/pt/importwizard.po	2017-07-11 21:15:26.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/pt/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-01-13 09:46+0000\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-05-17 10:51+0100\n"
 "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
 "Language: pt\n"
@@ -13,7 +13,7 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-POFile-SpellExtra: pre Claws Evolution Laurent Sylpheed mails space\n"
 "X-POFile-SpellExtra: ImportWizard KAddressBook wrap importwizard KMail\n"
-"X-POFile-SpellExtra: white Montel\n"
+"X-POFile-SpellExtra: white Montel SeaMonkey Icedove\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -25,134 +25,243 @@
 msgid "Your emails"
 msgstr "zepires@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Nenhum programa encontrado."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Ferramenta de Importação de PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Feche o KMail antes de importar os dados. Alguns 'plugins' irão modificar a "
+"configuração do KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Passo 1: Seleccionar o Filtro"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Passo 2: A importar..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Detectar o programa"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Seleccionar o material a importar"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importar as mensagens de correio"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importar os filtros de correio"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importar a configuração"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importar os livros de endereços"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importar os calendários"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Terminar"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importar o livro de endereços do %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importar os filtros do %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importar o correio do %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importar a configuração do %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importar o calendário de %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Importação a decorrer"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Importação terminou"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "A criar um novo contacto..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Seleccionar o Livro de Endereços"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr ""
 "Seleccione o livro de endereços onde deverá ser gravado o novo contacto:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Não foi seleccionado o livro de endereços."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importado de \"%1\""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Erro na criação do contacto: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Terminou a criação do contacto"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "A importação de filtros foi cancelada."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "A importação dos filtros do \"%1\" foi cancelada."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "foi importado 1 filtro de \"%2\""
 msgstr[1] "foram importados %1 filtros de \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "O ficheiro de filtros não foi encontrado"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "A configurar a identidade..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "A identidade foi configurada."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "A configurar o transporte..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "O transporte foi configurado."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2017 dos autores do Assistente de Importação"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Manutenção"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Modo: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Criado por %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Não foi encontrado nenhum livro de endereços"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "O item LDAP foi criado"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Novo livro de endereços criado: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Importação a decorrer"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Importação terminou"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "A configuração do Claws Mail não foi encontrada."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -161,176 +270,65 @@
 "O livro de endereços do Evolution será exportado como vCard. Importe o vCard "
 "no KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Exportar o Livro de Endereços do Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Seleccione a pasta onde os vCard's serão gravados."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "O livro de endereços \"%1\" foi exportado."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Não foi possível exportar o livro de endereços \"%1\"."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "A configuração do Evolution não foi encontrada."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "O calendário do Evolution não foi encontrado."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "A configuração do Thunderbird não foi encontrada."
+msgid "Icedove settings not found."
+msgstr "A configuração do Icedove não foi encontrada."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "A configuração do SeaMonkey não foi encontrada."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Não foi encontrado nenhum contacto em %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "A configuração do Sylpheed não foi encontrada."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "O ficheiro de contactos '%1' não foi encontrado"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Nenhum programa encontrado."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Ferramenta de Importação de PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Feche o KMail antes de importar os dados. Alguns 'plugins' irão modificar a "
-"configuração do KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Passo 1: Seleccionar o Filtro"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Passo 2: A importar..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Detectar o programa"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Seleccionar o material a importar"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importar as mensagens de correio"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importar os filtros de correio"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importar a configuração"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Importar os livros de endereços"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importar os calendários"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Terminar"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importar o livro de endereços do %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importar os filtros do %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importar o correio do %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importar a configuração do %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importar o calendário de %1..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2017 dos autores do 'importwizard'"
-
-#: main.cpp:54
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Manutenção"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Modo"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Criado por %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "A configuração do Thunderbird não foi encontrada."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/pt_BR/importwizard.po akonadi-import-wizard-17.08.3/po/pt_BR/importwizard.po
--- akonadi-import-wizard-17.04.3/po/pt_BR/importwizard.po	2017-07-11 21:15:26.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/pt_BR/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2016-01-02 10:12-0200\n"
 "Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -30,133 +30,245 @@
 msgid "Your emails"
 msgstr "alvarenga@kde.org"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Nenhum programa encontrado."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Ferramenta de importação de PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Feche o KMail antes de importar os dados. Alguns plugins irão modificar o "
+"arquivo de configuração do KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "1º Passo: Selecionar o filtro"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "2º Passo: Importando..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Detectar programa"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Selecionar o material a ser importado"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importar as mensagens"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importar os filtros de e-mail"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importar as configurações"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importar os livros de endereços"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importar os calendários"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Concluir"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importar os livros de endereços de %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importar os filtros do %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importar os e-mails do %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importar as configurações do %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importar os calendários do %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Importação em andamento"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Importação concluída"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Criando novo contato..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Selecionar livro de endereços"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Selecione o livro de endereços onde o novo contato deve ser salvo:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Não foi selecionado o livro de endereços."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importado de \"%1\""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Erro na criação do contato : %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Criação do contato concluída"
 
-#: autodetect/abstractimporter.cpp:88
-#, kde-format
-msgid "Importing of filters was canceled."
+#: libimportwizard/abstractimporter.cpp:82
+#, fuzzy, kde-format
+#| msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "A importação dos filtros foi cancelada."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "1 filtro foi importado de \"%2\""
 msgstr[1] "%1 filtros foram importados de \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "O arquivo de filtros não foi encontrado"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Configurando a identidade..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "A identidade foi configurada."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Configurando o transporte..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "O transporte foi configurado."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2016 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2016, dos autores do Assistente de Importação"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Mantenedor"
+
+#: main.cpp:61
+#, fuzzy, kde-format
+#| msgid "Mode"
+msgid "Mode: %1"
+msgstr "Modo"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Escrito por %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Nenhum livro de endereços encontrado"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "LDAP criado"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Novo livro de endereços criado: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Importação em andamento"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Importação concluída"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "As configurações do Claws Mail não foram encontradas."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -165,177 +277,67 @@
 "O livro de endereços do Evolution será exportado como vCard. Importe o vCard "
 "no KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Exportar o livro de endereços do Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Selecione a pasta onde os vCards serão armazenados."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "O livro de endereços \"%1\" foi exportado."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Não foi possível exportar o livro de endereços \"%1\"."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "As configurações do Evolution não foram encontradas."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "O calendário do Evolution não foi encontrado."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "As configurações do Thunderbird não foram encontradas."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "As configurações do Sylpheed não foram encontradas."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "As configurações do Sylpheed não foram encontradas."
+
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Nenhum contato encontrado em %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "As configurações do Sylpheed não foram encontradas."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Arquivo de contatos '%1' não encontrado"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Nenhum programa encontrado."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Ferramenta de importação de PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Feche o KMail antes de importar os dados. Alguns plugins irão modificar o "
-"arquivo de configuração do KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "1º Passo: Selecionar o filtro"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "2º Passo: Importando..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Detectar programa"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Selecionar o material a ser importado"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importar as mensagens"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importar os filtros de e-mail"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importar as configurações"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Importar os livros de endereços"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importar os calendários"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Concluir"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importar os livros de endereços de %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importar os filtros do %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importar os e-mails do %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importar as configurações do %1..."
-
-#: importwizard.cpp:287
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importar os calendários do %1..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2016 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2016, dos autores do Assistente de Importação"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Mantenedor"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Modo"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Escrito por %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "As configurações do Thunderbird não foram encontradas."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/ro/importwizard.po akonadi-import-wizard-17.08.3/po/ro/importwizard.po
--- akonadi-import-wizard-17.04.3/po/ro/importwizard.po	2017-07-11 21:15:26.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/ro/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2013-01-13 22:19+0200\n"
 "Last-Translator: Sergiu Bivol <sergiu@ase.md>\n"
 "Language-Team: Romanian <kde-i18n-ro@kde.org>\n"
@@ -28,51 +28,169 @@
 msgid "Your emails"
 msgstr "sergiu@ase.md"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, fuzzy, kde-format
+#| msgid "No program found"
+msgid "No program found."
+msgstr "Nu s-a găsit niciun program"
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Unealtă de import PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Închideți KMail înainte de a importa date. Unele extensii vor modifica "
+"fișierul cu configurări KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr ""
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr ""
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Detectează programul"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Alege materialul de importat"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importă toate mesajele"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importă filtrele de poștă"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importă configurările"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importă cărțile de adrese"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importă calendarele"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Finalizează"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Import carte de adrese din %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Import filtre din %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Import scrisori din %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Import configurări din %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Import calendar din %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Importare în curs"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Importare încheiată"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Se creează contact nou..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Alegeți cartea de adrese"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Alege cartea de adrese în care se va salva contactul nou:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Cartea de adrese nu a fost aleasă."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import calendar from %1..."
 msgid "Imported from \"%1\""
 msgstr "Import calendar din %1..."
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, fuzzy, kde-format
 #| msgid "Error during create contact : %1"
 msgid "Error during contact creation: %1"
 msgstr "Eroare la crearea contactului: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, fuzzy, kde-format
 #| msgid "Contact created done"
 msgid "Contact creation complete"
 msgstr "Crearea contactului s-a terminat"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import Filters"
-msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "Importă filtre"
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
@@ -80,88 +198,81 @@
 msgstr[1] "%1 filtre au fost importate din „%2”"
 msgstr[2] "%1 de filtre au fost importate din „%2”"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Fișierul cu filtre nu a fost găsit"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Se configurează identitatea..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identitate configurată."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Se configurează transportul..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Transport configurat."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2013 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Drept de autor © 2012-2013, Autorii importwizard"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Responsabil"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr ""
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr ""
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, fuzzy, kde-format
 #| msgid "Import addressbook"
 msgid "No addressbook found"
 msgstr "Importă carte de adrese"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, fuzzy, kde-format
 #| msgid "Import addressbook from %1..."
 msgid "New addressbook created: %1"
 msgstr "Import carte de adrese din %1..."
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Importare în curs"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Importare încheiată"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Nu s-au găsit configurări Claws Mail."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -170,179 +281,68 @@
 "Cartea de adrese Evolution va fi exportată ca vCard. Importați vCard-ul în "
 "KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Exportă carte de adrese Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Alegeți dosarul în care se vor păstra vCard-urile."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Cartea de adrese „%1” a fost exportată."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Exportul cărții de adrese „%1” a eșuat."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Configurările Evolution nu au fost găsite."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Calendarul Evolution nu a fost găsit."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Nu s-au găsit configurări Thunderbird."
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "Nu s-au găsit configurări Sylpheed."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "Nu s-au găsit configurări Sylpheed."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Nu s-au găsit contacte în %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Nu s-au găsit configurări Sylpheed."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, fuzzy, kde-format
 #| msgid "Filters file was not found"
 msgid "Contacts file '%1' not found"
 msgstr "Fișierul cu filtre nu a fost găsit"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, fuzzy, kde-format
-#| msgid "No program found"
-msgid "No program found."
-msgstr "Nu s-a găsit niciun program"
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Unealtă de import PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Închideți KMail înainte de a importa date. Unele extensii vor modifica "
-"fișierul cu configurări KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr ""
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Detectează programul"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Alege materialul de importat"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importă toate mesajele"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importă filtrele de poștă"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importă configurările"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Importă cărțile de adrese"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importă calendarele"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Finalizează"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Import carte de adrese din %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Import filtre din %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Import scrisori din %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Import configurări din %1..."
-
-#: importwizard.cpp:287
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import calendar from %1..."
-msgstr "Import calendar din %1..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2013 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Drept de autor © 2012-2013, Autorii importwizard"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Responsabil"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr ""
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
+msgid "Thunderbird settings not found."
+msgstr "Nu s-au găsit configurări Thunderbird."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/ru/importwizard.po akonadi-import-wizard-17.08.3/po/ru/importwizard.po
--- akonadi-import-wizard-17.04.3/po/ru/importwizard.po	2017-07-11 21:15:26.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/ru/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -2,13 +2,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Alexander Lakhin <exclusion@gmail.com>, 2013.
-# Alexander Potashev <aspotashev@gmail.com>, 2014, 2015, 2016.
+# Alexander Potashev <aspotashev@gmail.com>, 2014, 2015, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2016-09-04 11:06+0300\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-10-08 20:51+0300\n"
 "Last-Translator: Alexander Potashev <aspotashev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
 "Language: ru\n"
@@ -32,47 +32,164 @@
 msgid "Your emails"
 msgstr "exclusion@gmail.com,aspotashev@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Программ не найдено."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Средство импорта данных PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Прежде чем импортировать данные, закройте KMail. Некоторые модули импорта "
+"изменяют файл конфигурации KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Шаг 1. Выбор фильтра"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Шаг 2. Импорт"
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Определение программы"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Выбор импортируемых данных"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Импорт электронных писем"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Импорт почтовых фильтров"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Импорт параметров"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Импорт адресных книг"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Импорт календарей"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Готово"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Импорт адресной книги из «%1»..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Импорт фильтров из «%1»..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Импорт почты из «%1»..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Импорт настроек из «%1»..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Импорт календаря из «%1»..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Выполняется импорт"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Импорт завершён"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Создание нового контакта..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Выбор адресной книги"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Выберите адресную книгу, в которой следует сохранить новый контакт:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Адресная книга не выбрана."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Импортировано из «%1»"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "При создании контакта произошла ошибка: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Создание контакта завершено"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "Импорт фильтров был отменён."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "Импорт фильтров из «%1» был отменён."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
@@ -81,87 +198,79 @@
 msgstr[2] "Из «%2» импортированы %1 фильтров."
 msgstr[3] "Из «%2» импортирован %1 фильтр."
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Файл фильтров не был найден."
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Настройка профиля..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Профиль настроен."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Настройка транспорта..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Транспорт настроен."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "© Разработчики мастера импорта, 2012–2017"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Лоран Монтель (Laurent Montel)"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Сопровождающий"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Режим работы: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Автор — %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Не найдена адресная книга."
 
 # BUGME: please change to "LDAP server added" --aspotashev
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Добавлен сервер LDAP."
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Создана адресная книга: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Выполняется импорт"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Импорт завершён"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Файл настроек Claws Mail не найден."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -170,177 +279,65 @@
 "Адресная книга Evolution будет экспортирована в формате vCard, чтобы вы "
 "могли импортировать её в KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Экспорт адресной книги Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Выберите каталог для сохранения файлов vCard."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Адресная книга «%1» экспортирована."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Экспортировать адресную книгу «%1» не удалось."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Файл настроек Evolution не найден."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Календарь Evolution не найден."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Файл настроек Thunderbird не найден."
+msgid "Icedove settings not found."
+msgstr "Файл конфигурации Icedove не найден."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "Файл конфигурации SeaMonkey не найден."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "В файле %1 не найдены контакты"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Файл конфигурации Sylpheed не найден."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Не удалось найти файл контактов «%1»."
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Программ не найдено."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Средство импорта данных PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Прежде чем импортировать данные, закройте KMail. Некоторые модули импорта "
-"изменяют файл конфигурации KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Шаг 1. Выбор фильтра"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Шаг 2. Импорт"
-
-#: importwizard.cpp:187
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Detect program"
-msgstr "Определение программы"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Выбор импортируемых данных"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Импорт электронных писем"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Импорт почтовых фильтров"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Импорт параметров"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Импорт адресных книг"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Импорт календарей"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Готово"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Импорт адресной книги из «%1»..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Импорт фильтров из «%1»..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Импорт почты из «%1»..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Импорт настроек из «%1»..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Импорт календаря из «%1»..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2016 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "© Разработчики мастера импорта, 2012–2016"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Лоран Монтель (Laurent Montel)"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Сопровождающий"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Режим работы."
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Автор — %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Файл настроек Thunderbird не найден."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/sk/importwizard.po akonadi-import-wizard-17.08.3/po/sk/importwizard.po
--- akonadi-import-wizard-17.04.3/po/sk/importwizard.po	2017-07-11 21:15:26.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/sk/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -4,8 +4,8 @@
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-01-13 20:21+0100\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-06-18 20:59+0100\n"
 "Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
 "Language-Team: Slovak <kde-sk@linux.sk>\n"
 "Language: sk\n"
@@ -25,47 +25,164 @@
 msgid "Your emails"
 msgstr "wizzardsk@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Nenájdený program."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Importovací nástroj PIM"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Zatvorte KMail pred importovaním dát. Niektoré pluginy menia konfiguračný "
+"súbor KMailu."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Krok 1: Výber filtra"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Krok 2: Importovanie..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Detekovať program"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Vybrať materiál na import"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importovať mailové správy"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importovať mailové filtre"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importovať nastavenia"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importovať adresáre"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importovať kalendáre"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Dokončiť"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importovať adresáre z %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importovať filtre z %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importovať maily z %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importovať nastavenia z %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importovať kalendár z %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Prebieha import"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Import bol ukončený"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Vytváram nový kontakt..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Vybrať knihu adries"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Vyberte adresár, kam sa má uložiť nový kontakt:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Adresár nebol vybraný."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importované z \"%1\""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Chyba počas vytvárania kontaktu: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Vytvorenie kontaktu ukončené"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "Import filtrov bol zrušený."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "Import filtrov z \"%1\" bol zrušený."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
@@ -73,86 +190,78 @@
 msgstr[1] "%1 filtre boli importované z \"%2\""
 msgstr[2] "%1 filtrov bolo importovaných z \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Súbor filtrov nenájdený."
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Pripravujem identitu..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identita nastavená."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Nastavujem prenos..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Prenos nastavený."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2017 Autori ImportWizard"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Správca"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Režim: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Napísal %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Nenašiel sa adresár kontaktov"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Ldap vytvorený"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Nový adresár kontaktov vytvorený: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Prebieha import"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Import bol ukončený"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Nastavenia Claws Mail nenájdené."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -161,176 +270,65 @@
 "Adresár Evolution bude exportovaný ako vCard. Importujte vCard v "
 "KAddressBooku."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Exportovať adresár Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Vyberte adresár, kde majú byť uložené vCards."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Adresár \"%1\" exportovaný."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Zlyhal export adresára \"%1\"."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Nastavenia Evolution nenájdené."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Kalendár Evolution nenájdený."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Nastavenia Thunderbirdu nenájdené."
+msgid "Icedove settings not found."
+msgstr "Nastavenia Icedove nenájdené."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "Nastavenia Ivedoce nenájdené."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Nenašiel sa žiadny kontakt v %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Nastavenia Sylpheed nenájdené."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Súbor kontaktov '%1' nenájdený"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Nenájdený program."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Importovací nástroj PIM"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Zatvorte KMail pred importovaním dát. Niektoré pluginy menia konfiguračný "
-"súbor KMailu."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Krok 1: Výber filtra"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Krok 2: Importovanie..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Detekovať program"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Vybrať materiál na import"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importovať mailové správy"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importovať mailové filtre"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importovať nastavenia"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Importovať adresáre"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importovať kalendáre"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Dokončiť"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importovať adresáre z %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importovať filtre z %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importovať maily z %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importovať nastavenia z %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importovať kalendár z %1..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2017 autori importwizard"
-
-#: main.cpp:54
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Správca"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Režim"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Napísal %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Nastavenia Thunderbirdu nenájdené."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/sl/importwizard.po akonadi-import-wizard-17.08.3/po/sl/importwizard.po
--- akonadi-import-wizard-17.04.3/po/sl/importwizard.po	2017-07-11 21:15:26.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/sl/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-03-01 17:09+0100\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-07-16 11:47+0100\n"
 "Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
 "Language: sl\n"
@@ -32,47 +32,164 @@
 "jlp@holodeck1.com,andrej.vernekar@gmail.com,mihamerkun@gmail.com,"
 "andrejm@ubuntu.si"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Najden ni bil noben program."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Orodje za uvoz osebnih podatkov"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Pred uvažanjem podatkov zaprite KMail. Nekateri vstavki bodo spremenili "
+"KMailove nastavitve."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Korak 1: Izbira filtra"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Korak 2: Uvažanje ..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Zaznaj program"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Izberite podatke za uvoz"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Uvozi e-poštna sporočila"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Uvozi e-poštne filtre"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Uvozi nastavitve"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Uvozi imenike"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Uvozi koledarje"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Zaključi"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Uvozi imenik iz %1 ..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Uvozi filtre iz %1 ..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Uvozi e-pošto iz %1 ..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Uvozi nastavitve iz %1 ..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Uvozi koledar iz %1 ..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Uvažanje je v teku"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Uvoz končan"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Ustvarjanje novega stika ..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Izberite imenik"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Izberite imenik, v katerega naj se shrani nov stik:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Niste izbrali imenika."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Uvoženo iz »%1«"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Napaka med ustvarjanjem stika: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Ustvarjanje stika zaključeno"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "Uvoz filtrov je bil preklican"
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "Uvažanje filtrov iz »%1« je bilo preklicano."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
@@ -81,86 +198,78 @@
 msgstr[2] "Iz »%2« sta bila uvožena %1 filtra"
 msgstr[3] "Iz »%2« so bili uvoženi %1 filtri"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Datoteka s filtri ni bila najdena"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Nastavljanje istovetnosti ..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Istovetnost je nastavljena."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Nastavljanje prenosa ..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Prenos je nastavljen."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Avtorske pravice © 2012-2017 avtorji ImportWizard-a"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Vzdrževalec"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Način: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Napisal(a) %1</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Imenik ni bil najden"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Ldap ustvarjen"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Nov imenik je ustvarjen: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Uvažanje je v teku"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Uvoz končan"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Nastavitve programa Claws Mail niso bile najdene."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -169,176 +278,65 @@
 "Imenik programa Evolution bo izvožen kot vCard, ki ga nato uvozite v program "
 "KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Izvozi imenik Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Izberite mapo, v katero bodo shranjene datoteke vCard."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Imenik »%1« je bil izvožen."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Izvoz imenika »%1« ni uspel."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Nastavitve programa Evolution niso bile najdene."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Koledar programa Evolution ni bil najden."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Nastavitve programa Thunderbird niso bile najdene."
+msgid "Icedove settings not found."
+msgstr "Nastavitve programa Icedove niso bile najdene."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "Nastavitve programa SeaMonkey niso bile najdene."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "V %1 ni bil najden noben stik"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Nastavitve programa Sylpheed niso bile najdene."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Datoteka s stiki »%1« ni bila najdena"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Najden ni bil noben program."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Orodje za uvoz osebnih podatkov"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Pred uvažanjem podatkov zaprite KMail. Nekateri vstavki bodo spremenili "
-"KMailove nastavitve."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Korak 1: Izbira filtra"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Korak 2: Uvažanje ..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Zaznaj program"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Izberite podatke za uvoz"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Uvozi e-poštna sporočila"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Uvozi e-poštne filtre"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Uvozi nastavitve"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Uvozi imenike"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Uvozi koledarje"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Zaključi"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Uvozi imenik iz %1 ..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Uvozi filtre iz %1 ..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Uvozi e-pošto iz %1 ..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Uvozi nastavitve iz %1 ..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Uvozi koledar iz %1 ..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Avtorske pravice © 2012-2017 avtorji importwizard-a"
-
-#: main.cpp:54
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Vzdrževalec"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Način"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Napisal(a) %1</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Nastavitve programa Thunderbird niso bile najdene."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/sv/importwizard.po akonadi-import-wizard-17.08.3/po/sv/importwizard.po
--- akonadi-import-wizard-17.04.3/po/sv/importwizard.po	2017-07-11 21:15:26.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/sv/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-01-13 17:42+0100\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-05-18 17:08+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
 "Language: sv\n"
@@ -27,133 +27,242 @@
 msgid "Your emails"
 msgstr "stefan.asserhall@bredband.net"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Inget program hittades."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Importverktyg för personlig information"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Stäng Kmail innan data importeras. Vissa insticksprogram ändrar Kmails "
+"inställningsfil."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Steg 1: Välj filter"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Steg 2: Importerar..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Detektera program"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Välj material att importera"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Importera e-post"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Importera e-postfilter"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Importera inställningar"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Importera adressböcker"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Importera kalendrar"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Slutför"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Importera adressbok från %1..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Importera filter från %1..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Importera e-post från %1..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Importera inställningar från %1..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Importera kalender från %1..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Import pågår"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Import klar"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Skapar ny kontakt..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Välj adressbok"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Välj adressboken den nya kontakten ska sparas i:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Adressbok valdes inte."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Importerade från \"%1\""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Fel när kontakt skulle skapas: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Skapade kontakt"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "Import av filter avbröts."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "Import av filter från \"%1\" avbröts."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "1 filter importerades från \"%2\""
 msgstr[1] "%1 filter importerades från \"%2\""
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Filterfilen hittades inte"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Ställer in identitet..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Identitet inställd."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Ställer in överföring..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Överföring inställd."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2017 Upphovsmännen till importguiden"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Underhåll"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Läge: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Skriven av %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Ingen adressbok hittades"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "LDAP skapad"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Ny adressbok skapad: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Import pågår"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Import klar"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Inställningar av Claws Mail hittades inte."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -161,176 +270,65 @@
 msgstr ""
 "Adressbok från Evolution exporteras som vCard. Importera vCard i adressboken."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Exportera adressbok från Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Välj katalog där vCard ska lagras."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Adressbok \"%1\" exporterad."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Misslyckades exportera adressbok \"%1\"."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Inställningar av Evolution hittades inte."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Kalendern i Evolution hittades inte."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Inställningar av Thunderbird hittades inte."
+msgid "Icedove settings not found."
+msgstr "Inställningar av Icedove hittades inte."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "Inställningar av SeaMonkey hittades inte."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "Ingen kontakt hittades i %1"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Inställningar av Sylpheed hittades inte."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Kontaktfil '%1' hittades inte"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Inget program hittades."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Importverktyg för personlig information"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Stäng Kmail innan data importeras. Vissa insticksprogram ändrar Kmails "
-"inställningsfil."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Steg 1: Välj filter"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Steg 2: Importerar..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Detektera program"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Välj material att importera"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Importera e-post"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Importera e-postfilter"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Importera inställningar"
-
-#: importwizard.cpp:208
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import addressbooks"
-msgstr "Importera adressböcker"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Importera kalendrar"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Slutför"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Importera adressbok från %1..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Importera filter från %1..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Importera e-post från %1..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Importera inställningar från %1..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Importera kalender från %1..."
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2017 Upphovsmännen till importguiden"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Underhåll"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Läge"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Skriven av %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Inställningar av Thunderbird hittades inte."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/tr/importwizard.po akonadi-import-wizard-17.08.3/po/tr/importwizard.po
--- akonadi-import-wizard-17.04.3/po/tr/importwizard.po	2017-07-11 21:15:26.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/tr/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2017-06-05 11:39+0000\n"
 "Last-Translator: Mesutcan <mesutcank@gmail.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
@@ -27,134 +27,242 @@
 msgid "Your emails"
 msgstr "necdetyucel@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Program bulunamadı."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "PIM İçe Aktarım Aracı"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Verileri içe aktarmadan önce KMail'i kapatın. Bazı eklentiler KMail "
+"yapılandırma dosyasında değişiklik yapacak."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "1. Adım: Süzgeç Seçin"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "2. Adım: İçe Aktarılıyor..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Program Algıla"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "İçe aktarılacak malzemeyi seçin"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Posta iletilerini içe aktar"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Posta filtrelerini içe aktar"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Ayarları içe aktar"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Adres defterini içe aktar"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Takvimi içe aktar"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Bitir"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "%1 konumundan adres defteri içe aktar..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "%1 konumundan filtreleri içe aktar..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "%1 konumundan postaları içe aktar..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "%1 konumundan ayarları içe aktar..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "%1 konumundan takvimi içe aktar..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "İçe aktarma devam ediyor"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "İçe aktarma tamamlandı"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Yeni kişi oluşturuluyor..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Adres Defterini Seç"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Yeni kişinin kaydedileceği adres defterini seçin:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Adres Defteri."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "%1 dosyasından içe aktarıldı"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Kişi oluşturulurken hata oluştu: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Kişi oluşturma tamamlandı"
 
-#: autodetect/abstractimporter.cpp:88
-#, fuzzy, kde-format
-#| msgid "Import filter was canceled."
-msgid "Importing of filters was canceled."
-msgstr "İçe aktarma filtresi iptal edildi."
+#: libimportwizard/abstractimporter.cpp:82
+#, kde-format
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "\"%1\" üzerinden süzgeçleri içe aktarma iptal edildi."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "\"%2\" dosyasından %1 filtre içe aktarıldı"
 msgstr[1] "\"%2\" dosyasından %1 filtre içe aktarıldı"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Filtre dosyası bulunamadı"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Kimlik ayarlanıyor..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Kimlik ayarlandı."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Taşıma ayarlanıyor..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Taşıma ayarlandı."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Telif Hakkı © 2012-2017 ImportWizard yazarları"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Projeyi Yürüten"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Kip: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>%1 tarafından yazılmıştır.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Adres defteri bulunamadı"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Ldap oluşturuldu"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Yeni adres defteri oluşturuldu: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "İçe aktarma devam ediyor"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "İçe aktarma tamamlandı"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Claws Eposta ayarları bulunamadı."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -163,177 +271,65 @@
 "Evolution adres defteri vCard olarak dışa aktarılacak. vCard'ı KAddressBook "
 "içine aktarın."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Evolution Adres Defterini Dışa Aktar"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "vCard'ların saklanacağı dizini seçin."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "\"%1\" adres defteri dışa aktarıldı."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "\"%1\" adres defteri dışa aktarılamadı."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Evolution ayarları bulunamadı."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Evolution takvimi bulunamadı."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Thunderbird ayarları bulunamadı."
+msgid "Icedove settings not found."
+msgstr "Icedove ayarları bulunamadı."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "SeaMonkey ayarları bulunamadı."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "%1 konumunda hiç bağlantı bulunamadı"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Sylpheed ayarları bulunamadı."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "'%1' bağlantılar dosyası bulunamadı"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Program bulunamadı."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "PIM İçe Aktarım Aracı"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Verileri içe aktarmadan önce KMail'i kapatın. Bazı eklentiler KMail "
-"yapılandırma dosyasında değişiklik yapacak."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "1. Adım: Süzgeç Seçin"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "2. Adım: İçe Aktarılıyor..."
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Program Algıla"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "İçe aktarılacak malzemeyi seçin"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Posta iletilerini içe aktar"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Posta filtrelerini içe aktar"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Ayarları içe aktar"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Adres defterini içe aktar"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Takvimi içe aktar"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Bitir"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "%1 konumundan adres defteri içe aktar..."
-
-#: importwizard.cpp:263
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import filters from %1..."
-msgstr "%1 konumundan filtreleri içe aktar..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "%1 konumundan postaları içe aktar..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "%1 konumundan ayarları içe aktar..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "%1 konumundan takvimi içe aktar..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2015 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Telif Hakkı © 2012-2015 importwizard yazarları"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Projeyi Yürüten"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Kip"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>%1 tarafından yazılmıştır.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Thunderbird ayarları bulunamadı."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
@@ -467,21 +463,21 @@
 "you would like to import from. Next, select the folder you would like to "
 "import to, then click 'Next'.</span></p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR"
-"/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\""
-">\n"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:"
-"'DejaVu Sans'; font-size:9pt; font-weight:600;\">KMailCVT'ye Hoş Geldiniz- "
-"Posta İçe Aktarma Aracı</span><span style=\" font-family:'DejaVu Sans'; font-"
-"size:9pt;\"> <br /><br />Bu program, e-postanızı önceki e-posta programından "
-"içe aktarmanıza yardım edecek.<br /><br />Lütfen içe aktarılacak programı "
-"seçin. Artından içe aktarmak istediğiniz klasörü seçtikten sonra 'İleri' "
-"tıklayın.</span></p></body></html>"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"family:'DejaVu Sans'; font-size:9pt; font-weight:600;\">KMailCVT'ye Hoş "
+"Geldiniz- Posta İçe Aktarma Aracı</span><span style=\" font-family:'DejaVu "
+"Sans'; font-size:9pt;\"> <br /><br />Bu program, e-postanızı önceki e-posta "
+"programından içe aktarmanıza yardım edecek.<br /><br />Lütfen içe "
+"aktarılacak programı seçin. Artından içe aktarmak istediğiniz klasörü "
+"seçtikten sonra 'İleri' tıklayın.</span></p></body></html>"
 
 #. i18n: ectx: property (text), widget (QCheckBox, remDupMsg)
 #: ui/manual/manualselectfilterpage.ui:146
diff -Nru akonadi-import-wizard-17.04.3/po/ug/importwizard.po akonadi-import-wizard-17.08.3/po/ug/importwizard.po
--- akonadi-import-wizard-17.04.3/po/ug/importwizard.po	2017-07-11 21:15:26.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/ug/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2013-09-08 07:05+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur <kde-i18n-doc@kde.org>\n"
@@ -27,305 +27,303 @@
 msgid "Your emails"
 msgstr "sahran.ug@gmail.com,  gheyret@gmail.com"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
 #, kde-format
-msgid "Creating new contact..."
+msgid "No program found."
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:51
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
 #, kde-format
-msgid "Select Address Book"
-msgstr "ئادرېس دەپتىرى تاللاش"
+msgid "PIM Import Tool"
+msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:52
+#: importwizard.cpp:84
 #, kde-format
-msgid "Select the address book the new contact shall be saved in:"
-msgstr "يېڭى ئالاقەدەش ساقلىنىدىغان ئادرېس دەپتىرىنى تاللاڭ:"
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:57
+#: importwizard.cpp:139
 #, kde-format
-msgid "Address Book was not selected."
+msgid "Step 1: Select Filter"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:84
+#: importwizard.cpp:144
 #, kde-format
-msgid "Imported from \"%1\""
+msgid "Step 2: Importing..."
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:103
+#: importwizard.cpp:173
 #, kde-format
-msgid "Error during contact creation: %1"
+msgid "Detect program"
 msgstr ""
 
-#: autodetect/abstractaddressbook.cpp:106
+#: importwizard.cpp:178
 #, kde-format
-msgid "Contact creation complete"
+msgid "Select material to import"
 msgstr ""
 
-#: autodetect/abstractimporter.cpp:88
+#: importwizard.cpp:182
 #, kde-format
-msgid "Importing of filters was canceled."
+msgid "Import mail messages"
 msgstr ""
 
-#: autodetect/abstractimporter.cpp:90
+#: importwizard.cpp:186
 #, kde-format
-msgid "1 filter was imported from \"%2\""
-msgid_plural "%1 filters were imported from \"%2\""
-msgstr[0] ""
+msgid "Import mail filters"
+msgstr ""
 
-#: autodetect/abstractimporter.cpp:94
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
 #, kde-format
-msgid "Filters file was not found"
+msgid "Import settings"
+msgstr "ئىمپورت قىلىش تەڭشەكلىرى"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:54
+#: importwizard.cpp:198
 #, kde-format
-msgid "Setting up identity..."
-msgstr "كىملىك تەڭشەۋاتىدۇ…"
+msgid "Import calendars"
+msgstr ""
 
-#: autodetect/abstractsettings.cpp:62
+#: importwizard.cpp:202
 #, kde-format
-msgid "Identity set up."
-msgstr "كىملىك تەڭشەلدى."
+msgid "Finish"
+msgstr "تامام"
 
-#: autodetect/abstractsettings.cpp:79
+#: importwizard.cpp:224
 #, kde-format
-msgid "Setting up transport..."
+msgid "Import addressbook from %1..."
 msgstr ""
 
-#: autodetect/abstractsettings.cpp:91
+#: importwizard.cpp:232
 #, kde-format
-msgid "Transport set up."
+msgid "Import filters from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: importwizard.cpp:240
 #, kde-format
-msgid "No addressbook found"
+msgid "Import mails from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: importwizard.cpp:248
 #, kde-format
-msgid "Ldap created"
+msgid "Import settings from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: importwizard.cpp:256
 #, kde-format
-msgid "New addressbook created: %1"
+msgid "Import calendar from %1..."
 msgstr ""
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
 #, kde-format
 msgid "Import in progress"
 msgstr "ئىمپورت قىلىۋاتىدۇ"
 
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
 #, kde-format
 msgid "Import finished"
 msgstr "ئىمپورت قىلىش تاماملاندى"
 
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
-msgid "Claws Mail settings not found."
+msgid "Creating new contact..."
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
-msgid ""
-"Evolution address book will be exported as vCard. Import vCard in "
-"KAddressBook."
-msgstr ""
+msgid "Select Address Book"
+msgstr "ئادرېس دەپتىرى تاللاش"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
-msgid "Export Evolution Address Book"
-msgstr ""
+msgid "Select the address book the new contact shall be saved in:"
+msgstr "يېڭى ئالاقەدەش ساقلىنىدىغان ئادرېس دەپتىرىنى تاللاڭ:"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
-msgid "Select the directory where vCards will be stored."
+msgid "Address Book was not selected."
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
-msgid "Address book \"%1\" exported."
+msgid "Imported from \"%1\""
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
-msgid "Failed to export address book \"%1\"."
+msgid "Error during contact creation: %1"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
-msgid "Evolution settings not found."
+msgid "Contact creation complete"
 msgstr ""
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Evolution calendar not found."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr ""
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr ""
+msgid "1 filter was imported from \"%2\""
+msgid_plural "%1 filters were imported from \"%2\""
+msgstr[0] ""
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
-msgid "No contact found in %1"
+msgid "Filters file was not found"
 msgstr ""
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
-msgid "Sylpheed settings not found."
-msgstr ""
+msgid "Setting up identity..."
+msgstr "كىملىك تەڭشەۋاتىدۇ…"
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
-msgid "Contacts file '%1' not found"
-msgstr ""
+msgid "Identity set up."
+msgstr "كىملىك تەڭشەلدى."
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
-msgid "No program found."
+msgid "Setting up transport..."
 msgstr ""
 
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
-msgid "PIM Import Tool"
+msgid "Transport set up."
 msgstr ""
 
-#: importwizard.cpp:97
+#: main.cpp:52
 #, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
+msgid "Copyright © 2012-2017 ImportWizard authors"
 msgstr ""
 
-#: importwizard.cpp:153
+#: main.cpp:54
 #, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
 
-#: importwizard.cpp:158
+#: main.cpp:54
 #, kde-format
-msgid "Step 2: Importing..."
+msgid "Maintainer"
+msgstr "مەسئۇل كىشى"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
 msgstr ""
 
-#: importwizard.cpp:187
+#: manual/manualselectfilterpage.cpp:96
 #, kde-format
-msgid "Detect program"
+msgid "<p><i>Written by %1.</i></p>"
 msgstr ""
 
-#: importwizard.cpp:192
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
-msgid "Select material to import"
+msgid "No addressbook found"
 msgstr ""
 
-#: importwizard.cpp:196
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
-msgid "Import mail messages"
+msgid "Ldap created"
 msgstr ""
 
-#: importwizard.cpp:200
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
-msgid "Import mail filters"
+msgid "New addressbook created: %1"
 msgstr ""
 
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
-msgid "Import settings"
-msgstr "ئىمپورت قىلىش تەڭشەكلىرى"
+msgid "Claws Mail settings not found."
+msgstr ""
 
-#: importwizard.cpp:208
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
-msgid "Import addressbooks"
+msgid ""
+"Evolution address book will be exported as vCard. Import vCard in "
+"KAddressBook."
 msgstr ""
 
-#: importwizard.cpp:212
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
-msgid "Import calendars"
+msgid "Export Evolution Address Book"
 msgstr ""
 
-#: importwizard.cpp:216
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
-msgid "Finish"
-msgstr "تامام"
+msgid "Select the directory where vCards will be stored."
+msgstr ""
 
-#: importwizard.cpp:255
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
-msgid "Import addressbook from %1..."
+msgid "Address book \"%1\" exported."
 msgstr ""
 
-#: importwizard.cpp:263
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
-msgid "Import filters from %1..."
+msgid "Failed to export address book \"%1\"."
 msgstr ""
 
-#: importwizard.cpp:271
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
-msgid "Import mails from %1..."
+msgid "Evolution settings not found."
 msgstr ""
 
-#: importwizard.cpp:279
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
-msgid "Import settings from %1..."
+msgid "Evolution calendar not found."
 msgstr ""
 
-#: importwizard.cpp:287
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Import calendar from %1..."
+msgid "Icedove settings not found."
 msgstr ""
 
-#: main.cpp:52
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
 #, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
+msgid "SeaMonkey settings not found."
 msgstr ""
 
-#: main.cpp:54
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
+msgid "No contact found in %1"
+msgstr ""
 
-#: main.cpp:54
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
-msgid "Maintainer"
-msgstr "مەسئۇل كىشى"
+msgid "Sylpheed settings not found."
+msgstr ""
 
-#: main.cpp:61
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
-msgid "Mode"
+msgid "Contacts file '%1' not found"
 msgstr ""
 
-#: manual/manualselectfilterpage.cpp:96
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "<p><i>Written by %1.</i></p>"
+msgid "Thunderbird settings not found."
 msgstr ""
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
diff -Nru akonadi-import-wizard-17.04.3/po/uk/importwizard.po akonadi-import-wizard-17.08.3/po/uk/importwizard.po
--- akonadi-import-wizard-17.04.3/po/uk/importwizard.po	2017-07-11 21:15:26.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/uk/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: importwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2017-01-13 10:44+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-05-17 18:41+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -30,47 +30,164 @@
 msgid "Your emails"
 msgstr "yurchor@ukr.net"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "Програми не знайдено."
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "Засіб імпортування особистих даних"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr ""
+"Перш ніж імпортувати дані, завершіть роботу KMail. Деякі з додатків внесуть "
+"зміни до файла налаштувань KMail."
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "Крок 1. Вибір фільтра"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "Крок 2. Імпортування…"
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "Виявлення програми"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "Виберіть дані, які слід імпортувати"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "Імпортування поштових повідомлень"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "Імпортування фільтрів пошти"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "Імпортування налаштувань"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "Імпортування адресних книг"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "Імпортування календарів"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "Завершити"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "Імпортування адресної книги з %1…"
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "Імпортування фільтрів пошти з %1…"
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "Імпортування пошти з %1…"
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "Імпортування налаштувань з %1…"
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "Імпортування календаря з %1…"
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "Триває імпортування"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "Імпортування завершено"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "Створення запису контакту…"
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "Виберіть адресну книгу"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "Виберіть адресну книгу, у якій слід зберегти новий запис контакту:"
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "Не було вибрано адресної книги."
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "Імпортовано з «%1»"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "Помилка під час створення запису контакту: %1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "Створення запису контакту завершено"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, kde-format
-msgid "Importing of filters was canceled."
-msgstr "Імпортування фільтрів було скасовано."
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "Імпортування фільтрів з «%1» було скасовано."
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
@@ -79,86 +196,78 @@
 msgstr[2] "З «%2» було імпортовано %1 фільтрів"
 msgstr[3] "З «%2» було імпортовано один фільтр"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "Файл фільтрів не знайдено"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "Налаштування профілю…"
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "Профіль налаштовано."
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "Налаштування пересилання…"
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "Пересилання налаштовано."
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "© Розробники ImportWizard, 2012–2017"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "Супровідник"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "Режим: %1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>Написано %1.</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "Не знайдено адресної книги"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Створено запис LDAP"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "Створено адресну книгу: %1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "Триває імпортування"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "Імпортування завершено"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "Налаштування Claws Mail не знайдено."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -167,176 +276,65 @@
 "Адресну книгу Evolution буде експортовано у форматі vCard. Імпортуйте дані "
 "vCard до KAddressBook."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "Експортування адресної книги Evolution"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "Виберіть каталог, у якому зберігатимуться файли vcard."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "Адресну книгу «%1» експортовано."
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "Не вдалося експортувати адресну книгу «%1»."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "Налаштування Evolution не знайдено."
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "Календар Evolution не знайдено."
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "Налаштування Thunderbird не знайдено."
+msgid "Icedove settings not found."
+msgstr "Налаштування Icedove не знайдено."
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "Налаштування SeaMonkey не знайдено."
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "У %1 записів контактів не виявлено"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "Налаштування Sylpheed не знайдено."
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
 msgid "Contacts file '%1' not found"
 msgstr "Файл контактів із назвою «%1» не знайдено"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "Програми не знайдено."
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "Засіб імпортування особистих даних"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr ""
-"Перш ніж імпортувати дані, завершіть роботу KMail. Деякі з додатків внесуть "
-"зміни до файла налаштувань KMail."
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "Крок 1. Вибір фільтра"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "Крок 2. Імпортування…"
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "Виявлення програми"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "Виберіть дані, які слід імпортувати"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "Імпортування поштових повідомлень"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "Імпортування фільтрів пошти"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "Імпортування налаштувань"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "Імпортування адресних книг"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "Імпортування календарів"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "Завершити"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "Імпортування адресної книги з %1…"
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "Імпортування фільтрів пошти з %1…"
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "Імпортування пошти з %1…"
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "Імпортування налаштувань з %1…"
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "Імпортування календаря з %1…"
-
-#: main.cpp:52
-#, kde-format
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "© Розробники importwizard, 2012–2017"
-
-#: main.cpp:54
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "Супровідник"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "Режим"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Написано %1.</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "Налаштування Thunderbird не знайдено."
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/po/zh_CN/importwizard.po akonadi-import-wizard-17.08.3/po/zh_CN/importwizard.po
--- akonadi-import-wizard-17.04.3/po/zh_CN/importwizard.po	2017-07-11 21:15:26.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/zh_CN/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -5,18 +5,21 @@
 # Phoenix Nemo <phoenixlzx@archlinuxcn.org>, 2013.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
-"PO-Revision-Date: 2015-01-22 11:19-0800\n"
-"Last-Translator: Weng Xuetian <wengxt@gmail.com>\n"
-"Language-Team: Chinese Simplified <kde-china@kde.org>\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
+"PO-Revision-Date: 2017-10-19 10:50-0400\n"
+"Last-Translator: guoyunhebrave <guoyunhebrave@gmail.com>\n"
+"Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: crowdin.com\n"
+"X-Crowdin-Project: kdeorg\n"
+"X-Crowdin-Language: zh-CN\n"
+"X-Crowdin-File: /kf5-stable/messages/pim/importwizard.pot\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
@@ -28,133 +31,239 @@
 msgid "Your emails"
 msgstr "kde-china@kde.org"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "未找到程序。"
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "个人信息管理导入工具"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr "请在导入数据前关闭 KMail。有些导入插件会修改 KMail 配置文件。"
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "第一步：选择过滤器"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "第二步：导入..."
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "检测程序"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "选择导入来源"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "导入信件"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "导入信件过滤器"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "导入设置"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "导入地址簿"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "导入日历"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "完成"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "从 %1 导入地址簿..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "从 %1 导入过滤器..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "从 %1 导入信件..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "从 %1 导入设置..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "从 %1 导入日历..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "导入中"
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "导入完成"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "新建联系人..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "选择地址簿"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "选择新联系人要保存到的地址簿："
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "未选中地址簿。"
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "导入自“%1”"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "创建联系人时发生错误： %1 "
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "联系人创建完成"
 
-#: autodetect/abstractimporter.cpp:88
-#, fuzzy, kde-format
-#| msgid "Import filter was canceled."
-msgid "Importing of filters was canceled."
-msgstr "已取消导入信件过滤器。"
+#: libimportwizard/abstractimporter.cpp:82
+#, kde-format
+msgid "Importing of filters from \"%1\" was canceled."
+msgstr "已取消从“%1”导入过滤器。"
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "已从“%2”中导入 %1 个过滤器"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "过滤器文件未找到"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "正在设置身份..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "身份已设置。"
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "设置传输..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "传输已设置。"
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, kde-format
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "版权 © 2012-2017 导入向导的作者"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "维护者"
+
+#: main.cpp:61
+#, kde-format
+msgid "Mode: %1"
+msgstr "模式：%1"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>由 %1 编写。</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "未找到地址簿"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Ldap 已创建"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "新建地址簿已创建：%1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "导入中"
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "导入完成"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "未找到 Claws Mail 配置。"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
@@ -162,177 +271,65 @@
 msgstr ""
 "Evolution 的地址簿将导出为 vCard 格式导出。导入 vCard 到 KAddressBook。"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "导出 Evolution 地址簿"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "选择保存 vCard 文件的目录。"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "地址簿“%1”已导出。"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "导出地址簿“%1”失败。"
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "未找到 Evolution 配置。"
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "未找到 Evolution 日历。"
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
+#: plugins/icedove/icedoveimportdata.cpp:85
 #, kde-format
-msgid "Thunderbird settings not found."
-msgstr "未找到 Thunderbird 配置。"
+msgid "Icedove settings not found."
+msgstr "找不到的 Icedove 设置。"
+
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, kde-format
+msgid "SeaMonkey settings not found."
+msgstr "找不到的 SeaMonkey 设置。"
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "在 %1 中未找到联系人"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "未找到 Sylpheed 配置。"
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
-#, fuzzy, kde-format
-#| msgid "Filters file was not found"
-msgid "Contacts file '%1' not found"
-msgstr "过滤器文件未找到"
-
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, fuzzy, kde-format
-#| msgid "No program found"
-msgid "No program found."
-msgstr "未找到程序"
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "个人信息管理导入工具"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr "请在导入数据前关闭 KMail。有些导入插件会修改 KMail 配置文件。"
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr ""
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr ""
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "检测程序"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "选择导入来源"
-
-#: importwizard.cpp:196
-#, kde-format
-msgid "Import mail messages"
-msgstr "导入信件"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "导入信件过滤器"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "导入设置"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "导入地址簿"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "导入日历"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "完成"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "从 %1 导入地址簿..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "从 %1 导入过滤器..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "从 %1 导入信件..."
-
-#: importwizard.cpp:279
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, kde-format
-msgid "Import settings from %1..."
-msgstr "从 %1 导入设置..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "从 %1 导入日历..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2015 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2015 导入向导作者"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "维护者"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr ""
+msgid "Contacts file '%1' not found"
+msgstr "未找到联系人文件“%1”"
 
-#: manual/manualselectfilterpage.cpp:96
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
+msgid "Thunderbird settings not found."
+msgstr "未找到 Thunderbird 配置。"
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
@@ -430,8 +427,7 @@
 
 #. i18n: ectx: property (text), widget (QLabel, label_2)
 #: ui/autodetect/selectprogrampage.ui:86
-#, fuzzy, kde-format
-#| msgid "No program found"
+#, kde-format
 msgid "No program found"
 msgstr "未找到程序"
 
@@ -439,13 +435,13 @@
 #: ui/autodetect/selectprogrampage.ui:112
 #, kde-format
 msgid "Manual Selection"
-msgstr ""
+msgstr "手动选择"
 
 #. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
 #: ui/manual/manualimportmailpage.ui:96
 #, kde-format
 msgid "Click 'Back' to import more emails"
-msgstr ""
+msgstr "点击“后退”以导入更多的电子邮件"
 
 #. i18n: ectx: property (text), widget (QLabel, TextLabel6)
 #: ui/manual/manualselectfilterpage.ui:103
@@ -467,39 +463,23 @@
 "you would like to import from. Next, select the folder you would like to "
 "import to, then click 'Next'.</span></p></body></html>"
 msgstr ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"family:'DejaVu Sans'; font-size:9pt; font-weight:600;\">欢迎使用“导入向导”邮"
+"件导入工具</span><span style=\" font-family:'DejaVu Sans'; font-size:9pt;\"> "
+"<br /><br />此程序将帮助您从您以前使用的电子邮件程序中导入电子邮件。<br /"
+"><br />现在，请选择您想要导入的程序。然后选择您想要导入到的目标文件夹。最后单"
+"击“下一步”。</span></p></body></html>"
 
 #. i18n: ectx: property (text), widget (QCheckBox, remDupMsg)
 #: ui/manual/manualselectfilterpage.ui:146
 #, kde-format
 msgid "Remove &duplicate messages during import"
-msgstr ""
-
-#~ msgid "importwizard"
-#~ msgstr "导入向导"
-
-#~ msgid "Resource type '%1' is not available."
-#~ msgstr "资源类型‘%1’不可用。"
-
-#~ msgid "Resource '%1' is already set up."
-#~ msgstr "资源‘%1’已设置。"
-
-#~ msgid "Creating resource instance for '%1'..."
-#~ msgstr "正在创建‘%1’的资源实例..."
-
-#~ msgid "Configuring resource instance..."
-#~ msgstr "正在配置资源实例..."
-
-#~ msgid "Unable to configure resource instance."
-#~ msgstr "无法配置资源实例。"
-
-#~ msgid "Could not convert value of setting '%1' to required type %2."
-#~ msgstr "无法将设置值‘%1’转换为所需类型 %2。"
-
-#~ msgid "Could not set setting '%1': %2"
-#~ msgstr "无法设置‘%1’: %2"
-
-#~ msgid "Resource setup completed."
-#~ msgstr "资源设置完成。"
-
-#~ msgid "Failed to create resource instance: %1"
-#~ msgstr "创建资源实例失败：%1"
+msgstr "导入时删除重复邮件(&D)"
diff -Nru akonadi-import-wizard-17.04.3/po/zh_TW/importwizard.po akonadi-import-wizard-17.08.3/po/zh_TW/importwizard.po
--- akonadi-import-wizard-17.04.3/po/zh_TW/importwizard.po	2017-07-11 21:15:26.000000000 +0000
+++ akonadi-import-wizard-17.08.3/po/zh_TW/importwizard.po	2017-11-07 01:26:35.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-04-16 04:33+0200\n"
+"POT-Creation-Date: 2017-05-17 05:23+0200\n"
 "PO-Revision-Date: 2015-06-17 09:26+0800\n"
 "Last-Translator: Franklin\n"
 "Language-Team: Chinese Traditional <kde-i18n-doc@kde.org>\n"
@@ -28,309 +28,310 @@
 msgid "Your emails"
 msgstr "franklin@goodhorse.idv.tw"
 
-#: autodetect/abstractaddressbook.cpp:45
+#: autodetect/widgets/selectprogramlistwidget.cpp:62
+#, kde-format
+msgid "No program found."
+msgstr "找不到程式。"
+
+#: importwizard.cpp:55 main.cpp:48 main.cpp:50
+#, kde-format
+msgid "PIM Import Tool"
+msgstr "個人資訊管理匯入工具"
+
+#: importwizard.cpp:84
+#, kde-format
+msgid ""
+"Close KMail before importing data. Some plugins will modify KMail config "
+"file."
+msgstr "匯入資料前請先關閉 KMail。有些外掛程式會變更 KMail 的設定檔。"
+
+#: importwizard.cpp:139
+#, kde-format
+msgid "Step 1: Select Filter"
+msgstr "步驟一：選擇匯入過濾器"
+
+#: importwizard.cpp:144
+#, kde-format
+msgid "Step 2: Importing..."
+msgstr "步驟二：匯入信件"
+
+#: importwizard.cpp:173
+#, kde-format
+msgid "Detect program"
+msgstr "偵測程式"
+
+#: importwizard.cpp:178
+#, kde-format
+msgid "Select material to import"
+msgstr "選擇要匯入的內容"
+
+#: importwizard.cpp:182
+#, kde-format
+msgid "Import mail messages"
+msgstr "匯入郵件"
+
+#: importwizard.cpp:186
+#, kde-format
+msgid "Import mail filters"
+msgstr "匯入郵件過濾器"
+
+#. i18n: ectx: property (text), widget (QPushButton, importSettings)
+#: importwizard.cpp:190 ui/autodetect/importsettingpage.ui:47
+#, kde-format
+msgid "Import settings"
+msgstr "匯入設定"
+
+#: importwizard.cpp:194
+#, kde-format
+msgid "Import addressbooks"
+msgstr "匯入通訊錄"
+
+#: importwizard.cpp:198
+#, kde-format
+msgid "Import calendars"
+msgstr "匯入行事曆"
+
+#: importwizard.cpp:202
+#, kde-format
+msgid "Finish"
+msgstr "完成"
+
+#: importwizard.cpp:224
+#, kde-format
+msgid "Import addressbook from %1..."
+msgstr "從 %1 匯入通訊錄..."
+
+#: importwizard.cpp:232
+#, kde-format
+msgid "Import filters from %1..."
+msgstr "從 %1 匯入郵件過濾器..."
+
+#: importwizard.cpp:240
+#, kde-format
+msgid "Import mails from %1..."
+msgstr "從 %1 匯入郵件..."
+
+#: importwizard.cpp:248
+#, kde-format
+msgid "Import settings from %1..."
+msgstr "從 %1 匯入設定..."
+
+#: importwizard.cpp:256
+#, kde-format
+msgid "Import calendar from %1..."
+msgstr "從 %1 匯入行事曆..."
+
+#: importwizard.cpp:347 plugins/balsa/balsaimportdata.cpp:62
+#: plugins/claws-mail/clawsmailimportdata.cpp:63
+#: plugins/evolutionv3/evolutionv3importdata.cpp:82
+#: plugins/icedove/icedoveimportdata.cpp:95
+#: plugins/seamonkey/seamonkeyimportdata.cpp:95
+#: plugins/sylpheed/sylpheedimportdata.cpp:77
+#: plugins/thunderbird/thunderbirdimportdata.cpp:97
+#, kde-format
+msgid "Import in progress"
+msgstr "匯入中..."
+
+#: importwizard.cpp:354 plugins/balsa/balsaimportdata.cpp:69
+#: plugins/claws-mail/clawsmailimportdata.cpp:71
+#: plugins/evolutionv3/evolutionv3importdata.cpp:90
+#: plugins/icedove/icedoveimportdata.cpp:103
+#: plugins/seamonkey/seamonkeyimportdata.cpp:103
+#: plugins/sylpheed/sylpheedimportdata.cpp:85
+#: plugins/thunderbird/thunderbirdimportdata.cpp:105
+#, kde-format
+msgid "Import finished"
+msgstr "信件已匯入完成"
+
+#: libimportwizard/abstractaddressbook.cpp:43
 #, kde-format
 msgid "Creating new contact..."
 msgstr "建立新聯絡人..."
 
-#: autodetect/abstractaddressbook.cpp:51
+#: libimportwizard/abstractaddressbook.cpp:49
 #, kde-format
 msgid "Select Address Book"
 msgstr "選擇通訊錄"
 
-#: autodetect/abstractaddressbook.cpp:52
+#: libimportwizard/abstractaddressbook.cpp:50
 #, kde-format
 msgid "Select the address book the new contact shall be saved in:"
 msgstr "選擇新聯絡人要儲存到哪個通訊錄："
 
-#: autodetect/abstractaddressbook.cpp:57
+#: libimportwizard/abstractaddressbook.cpp:55
 #, kde-format
 msgid "Address Book was not selected."
 msgstr "未選擇通訊錄。"
 
-#: autodetect/abstractaddressbook.cpp:84
+#: libimportwizard/abstractaddressbook.cpp:82
 #, kde-format
 msgid "Imported from \"%1\""
 msgstr "從 %1 匯入"
 
-#: autodetect/abstractaddressbook.cpp:103
+#: libimportwizard/abstractaddressbook.cpp:101
 #, kde-format
 msgid "Error during contact creation: %1"
 msgstr "建立聯絡人時發生錯誤：%1"
 
-#: autodetect/abstractaddressbook.cpp:106
+#: libimportwizard/abstractaddressbook.cpp:104
 #, kde-format
 msgid "Contact creation complete"
 msgstr "聯絡人已建立"
 
-#: autodetect/abstractimporter.cpp:88
+#: libimportwizard/abstractimporter.cpp:82
 #, fuzzy, kde-format
 #| msgid "Import filter was canceled."
-msgid "Importing of filters was canceled."
+msgid "Importing of filters from \"%1\" was canceled."
 msgstr "匯入過濾器已被取消。"
 
-#: autodetect/abstractimporter.cpp:90
+#: libimportwizard/abstractimporter.cpp:84
 #, kde-format
 msgid "1 filter was imported from \"%2\""
 msgid_plural "%1 filters were imported from \"%2\""
 msgstr[0] "已從 %2 匯入 %1 個過濾器"
 
-#: autodetect/abstractimporter.cpp:94
+#: libimportwizard/abstractimporter.cpp:88
 #, kde-format
 msgid "Filters file was not found"
 msgstr "找不到過濾器檔"
 
-#: autodetect/abstractsettings.cpp:54
+#: libimportwizard/abstractsettings.cpp:52
 #, kde-format
 msgid "Setting up identity..."
 msgstr "設定身份..."
 
-#: autodetect/abstractsettings.cpp:62
+#: libimportwizard/abstractsettings.cpp:60
 #, kde-format
 msgid "Identity set up."
 msgstr "身份已設定。"
 
-#: autodetect/abstractsettings.cpp:79
+#: libimportwizard/abstractsettings.cpp:77
 #, kde-format
 msgid "Setting up transport..."
 msgstr "設定郵件傳遞帳號中..."
 
-#: autodetect/abstractsettings.cpp:91
+#: libimportwizard/abstractsettings.cpp:89
 #, kde-format
 msgid "Transport set up."
 msgstr "郵件傳遞帳號已設定。"
 
-#: autodetect/balsa/balsaaddressbook.cpp:53
-#: autodetect/balsa/balsaaddressbook.cpp:66
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:44
+#: main.cpp:52
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2015 importwizard authors"
+msgid "Copyright © 2012-2017 ImportWizard authors"
+msgstr "Copyright © 2012-2015 importwizard 開發團隊"
+
+#: main.cpp:54
+#, kde-format
+msgid "Laurent Montel"
+msgstr "Laurent Montel"
+
+#: main.cpp:54
+#, kde-format
+msgid "Maintainer"
+msgstr "維護者"
+
+#: main.cpp:61
+#, fuzzy, kde-format
+#| msgid "Mode"
+msgid "Mode: %1"
+msgstr "模式"
+
+#: manual/manualselectfilterpage.cpp:96
+#, kde-format
+msgid "<p><i>Written by %1.</i></p>"
+msgstr "<p><i>這個過濾器是由 %1 所撰寫</i></p>"
+
+#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
+#: plugins/sylpheed/sylpheedaddressbook.cpp:43
 #, kde-format
 msgid "No addressbook found"
 msgstr "找不到通訊錄"
 
-#: autodetect/balsa/balsaaddressbook.cpp:80
+#: plugins/balsa/balsaaddressbook.cpp:77
 #, kde-format
 msgid "Ldap created"
 msgstr "Ldap 已建立"
 
-#: autodetect/balsa/balsaaddressbook.cpp:110
+#: plugins/balsa/balsaaddressbook.cpp:107
 #, kde-format
 msgid "New addressbook created: %1"
 msgstr "已新增通訊錄：%1"
 
-#: autodetect/balsa/balsaimportdata.cpp:61
-#: autodetect/claws-mail/clawsmailimportdata.cpp:61
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:57
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:57
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:79
-#: autodetect/icedove/icedoveimportdata.cpp:92
-#: autodetect/mailapp/mailappimportdata.cpp:61
-#: autodetect/oe/oeimportdata.cpp:61 autodetect/opera/operaimportdata.cpp:60
-#: autodetect/pmail/pmailimportdata.cpp:62
-#: autodetect/sylpheed/sylpheedimportdata.cpp:73
-#: autodetect/thebat/thebatimportdata.cpp:59
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:91 importwizard.cpp:378
-#, kde-format
-msgid "Import in progress"
-msgstr "匯入中..."
-
-#: autodetect/balsa/balsaimportdata.cpp:68
-#: autodetect/claws-mail/clawsmailimportdata.cpp:69
-#: autodetect/evolutionv1/evolutionv1importdata.cpp:65
-#: autodetect/evolutionv2/evolutionv2importdata.cpp:65
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:87
-#: autodetect/icedove/icedoveimportdata.cpp:100
-#: autodetect/mailapp/mailappimportdata.cpp:68
-#: autodetect/oe/oeimportdata.cpp:68 autodetect/opera/operaimportdata.cpp:68
-#: autodetect/pmail/pmailimportdata.cpp:69
-#: autodetect/sylpheed/sylpheedimportdata.cpp:81
-#: autodetect/thebat/thebatimportdata.cpp:66
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:99 importwizard.cpp:385
-#, kde-format
-msgid "Import finished"
-msgstr "信件已匯入完成"
-
-#: autodetect/claws-mail/clawsmailimportdata.cpp:88
+#: plugins/claws-mail/clawsmailimportdata.cpp:92
 #, kde-format
 msgid "Claws Mail settings not found."
 msgstr "找不到 Claws Mail 設定。"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid ""
 "Evolution address book will be exported as vCard. Import vCard in "
 "KAddressBook."
 msgstr "Evolution 通訊錄將被匯出為 vCard 檔。請再將 vCard 匯入 KDE 通訊錄。"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:38
+#: plugins/evolutionv3/evolutionaddressbook.cpp:38
 #, kde-format
 msgid "Export Evolution Address Book"
 msgstr "匯出 Evolution 通訊錄"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:40
+#: plugins/evolutionv3/evolutionaddressbook.cpp:40
 #, kde-format
 msgid "Select the directory where vCards will be stored."
 msgstr "請選擇 vcard 檔要存放的目錄。"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:93
+#: plugins/evolutionv3/evolutionaddressbook.cpp:93
 #, kde-format
 msgid "Address book \"%1\" exported."
 msgstr "通訊錄 \"%1\" 已匯出。"
 
-#: autodetect/evolutionv3/evolutionaddressbook.cpp:95
+#: plugins/evolutionv3/evolutionaddressbook.cpp:95
 #, kde-format
 msgid "Failed to export address book \"%1\"."
 msgstr "匯出通訊錄 \"%1\" 失敗。"
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:70
+#: plugins/evolutionv3/evolutionv3importdata.cpp:73
 #, kde-format
 msgid "Evolution settings not found."
 msgstr "找不到 Evolution 設定。"
 
-#: autodetect/evolutionv3/evolutionv3importdata.cpp:111
+#: plugins/evolutionv3/evolutionv3importdata.cpp:116
 #, kde-format
 msgid "Evolution calendar not found."
 msgstr "找不到行事曆設定。"
 
-#: autodetect/icedove/icedoveimportdata.cpp:82
-#: autodetect/thunderbird/thunderbirdimportdata.cpp:81
-#, kde-format
-msgid "Thunderbird settings not found."
-msgstr "找不到 Thunderbird 設定。"
+#: plugins/icedove/icedoveimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "Icedove settings not found."
+msgstr "找不到 Sylpheed 設定。"
 
-#: autodetect/sylpheed/sylpheedaddressbook.cpp:80
+#: plugins/seamonkey/seamonkeyimportdata.cpp:85
+#, fuzzy, kde-format
+#| msgid "Sylpheed settings not found."
+msgid "SeaMonkey settings not found."
+msgstr "找不到 Sylpheed 設定。"
+
+#: plugins/sylpheed/sylpheedaddressbook.cpp:78
 #, kde-format
 msgid "No contact found in %1"
 msgstr "在 %1 中找不到聯絡人"
 
-#: autodetect/sylpheed/sylpheedimportdata.cpp:64
+#: plugins/sylpheed/sylpheedimportdata.cpp:68
 #, kde-format
 msgid "Sylpheed settings not found."
 msgstr "找不到 Sylpheed 設定。"
 
-#: autodetect/thunderbird/thunderbirdaddressbook.cpp:63
+#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
 #, fuzzy, kde-format
 #| msgid "Filters file was not found"
 msgid "Contacts file '%1' not found"
 msgstr "找不到過濾器檔"
 
-#: autodetect/widgets/selectprogramlistwidget.cpp:63
-#, kde-format
-msgid "No program found."
-msgstr "找不到程式。"
-
-#: importwizard.cpp:69 main.cpp:48 main.cpp:50
-#, kde-format
-msgid "PIM Import Tool"
-msgstr "個人資訊管理匯入工具"
-
-#: importwizard.cpp:97
-#, kde-format
-msgid ""
-"Close KMail before importing data. Some plugins will modify KMail config "
-"file."
-msgstr "匯入資料前請先關閉 KMail。有些外掛程式會變更 KMail 的設定檔。"
-
-#: importwizard.cpp:153
-#, kde-format
-msgid "Step 1: Select Filter"
-msgstr "步驟一：選擇匯入過濾器"
-
-#: importwizard.cpp:158
-#, kde-format
-msgid "Step 2: Importing..."
-msgstr "步驟二：匯入信件"
-
-#: importwizard.cpp:187
-#, kde-format
-msgid "Detect program"
-msgstr "偵測程式"
-
-#: importwizard.cpp:192
-#, kde-format
-msgid "Select material to import"
-msgstr "選擇要匯入的內容"
-
-#: importwizard.cpp:196
+#: plugins/thunderbird/thunderbirdimportdata.cpp:87
 #, kde-format
-msgid "Import mail messages"
-msgstr "匯入郵件"
-
-#: importwizard.cpp:200
-#, kde-format
-msgid "Import mail filters"
-msgstr "匯入郵件過濾器"
-
-#. i18n: ectx: property (text), widget (QPushButton, importSettings)
-#: importwizard.cpp:204 ui/autodetect/importsettingpage.ui:47
-#, kde-format
-msgid "Import settings"
-msgstr "匯入設定"
-
-#: importwizard.cpp:208
-#, kde-format
-msgid "Import addressbooks"
-msgstr "匯入通訊錄"
-
-#: importwizard.cpp:212
-#, kde-format
-msgid "Import calendars"
-msgstr "匯入行事曆"
-
-#: importwizard.cpp:216
-#, kde-format
-msgid "Finish"
-msgstr "完成"
-
-#: importwizard.cpp:255
-#, kde-format
-msgid "Import addressbook from %1..."
-msgstr "從 %1 匯入通訊錄..."
-
-#: importwizard.cpp:263
-#, kde-format
-msgid "Import filters from %1..."
-msgstr "從 %1 匯入郵件過濾器..."
-
-#: importwizard.cpp:271
-#, kde-format
-msgid "Import mails from %1..."
-msgstr "從 %1 匯入郵件..."
-
-#: importwizard.cpp:279
-#, kde-format
-msgid "Import settings from %1..."
-msgstr "從 %1 匯入設定..."
-
-#: importwizard.cpp:287
-#, kde-format
-msgid "Import calendar from %1..."
-msgstr "從 %1 匯入行事曆..."
-
-#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2015 importwizard authors"
-msgid "Copyright © 2012-2017 importwizard authors"
-msgstr "Copyright © 2012-2015 importwizard 開發團隊"
-
-#: main.cpp:54
-#, kde-format
-msgid "Laurent Montel"
-msgstr "Laurent Montel"
-
-#: main.cpp:54
-#, kde-format
-msgid "Maintainer"
-msgstr "維護者"
-
-#: main.cpp:61
-#, kde-format
-msgid "Mode"
-msgstr "模式"
-
-#: manual/manualselectfilterpage.cpp:96
-#, kde-format
-msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>這個過濾器是由 %1 所撰寫</i></p>"
+msgid "Thunderbird settings not found."
+msgstr "找不到 Thunderbird 設定。"
 
 #. i18n: ectx: property (text), widget (QPushButton, importAddressBook)
 #: ui/autodetect/importaddressbookpage.ui:47
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/abstractaddressbook.cpp akonadi-import-wizard-17.08.3/src/autodetect/abstractaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/abstractaddressbook.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/abstractaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#include "abstractaddressbook.h"
-#include "importwizard.h"
-#include "importaddressbookpage.h"
-
-#include <KContacts/Addressee>
-#include <kcontacts/contactgroup.h>
-#include <KLocalizedString>
-#include "importwizard_debug.h"
-#include <AkonadiCore/ItemCreateJob>
-#include <AkonadiCore/Item>
-#include <AkonadiWidgets/CollectionDialog>
-
-#include <QPointer>
-
-AbstractAddressBook::AbstractAddressBook(ImportWizard *parent)
-    : mImportWizard(parent), mCollection(-1)
-{
-}
-
-AbstractAddressBook::~AbstractAddressBook()
-{
-
-}
-
-bool AbstractAddressBook::selectAddressBook()
-{
-    addAddressBookImportInfo(i18n("Creating new contact..."));
-    if (!mCollection.isValid()) {
-        const QStringList mimeTypes(KContacts::Addressee::mimeType());
-        QPointer<Akonadi::CollectionDialog> dlg = new Akonadi::CollectionDialog(mImportWizard);
-        dlg->setMimeTypeFilter(mimeTypes);
-        dlg->setAccessRightsFilter(Akonadi::Collection::CanCreateItem);
-        dlg->setWindowTitle(i18n("Select Address Book"));
-        dlg->setDescription(i18n("Select the address book the new contact shall be saved in:"));
-
-        if (dlg->exec() == QDialog::Accepted && dlg) {
-            mCollection = dlg->selectedCollection();
-        } else {
-            addAddressBookImportError(i18n("Address Book was not selected."));
-            delete dlg;
-            return false;
-        }
-        delete dlg;
-    }
-    return true;
-}
-
-void AbstractAddressBook::createGroup(const KContacts::ContactGroup &group)
-{
-    if (selectAddressBook()) {
-        Akonadi::Item item;
-        item.setPayload<KContacts::ContactGroup>(group);
-        item.setMimeType(KContacts::ContactGroup::mimeType());
-
-        Akonadi::ItemCreateJob *job = new Akonadi::ItemCreateJob(item, mCollection);
-        connect(job, &Akonadi::ItemCreateJob::result, this, &AbstractAddressBook::slotStoreDone);
-    }
-}
-
-void AbstractAddressBook::addImportContactNote(KContacts::Addressee &address, const QString &applicationName)
-{
-    QString currentNote = address.note();
-    if (!currentNote.isEmpty()) {
-        currentNote += QLatin1Char('\n');
-    }
-    currentNote += i18n("Imported from \"%1\"", applicationName);
-    address.setNote(currentNote);
-}
-
-void AbstractAddressBook::createContact(const KContacts::Addressee &address)
-{
-    if (selectAddressBook()) {
-        Akonadi::Item item;
-        item.setPayload<KContacts::Addressee>(address);
-        item.setMimeType(KContacts::Addressee::mimeType());
-        Akonadi::ItemCreateJob *job = new Akonadi::ItemCreateJob(item, mCollection);
-        connect(job, &Akonadi::ItemCreateJob::result, this, &AbstractAddressBook::slotStoreDone);
-    }
-}
-
-void AbstractAddressBook::slotStoreDone(KJob *job)
-{
-    if (job->error()) {
-        qCDebug(IMPORTWIZARD_LOG) << " job->errorString() : " << job->errorString();
-        addAddressBookImportError(i18n("Error during contact creation: %1", job->errorString()));
-        return;
-    }
-    addAddressBookImportInfo(i18n("Contact creation complete"));
-}
-
-void AbstractAddressBook::addImportInfo(const QString &log)
-{
-    addAddressBookImportInfo(log);
-}
-
-void AbstractAddressBook::addImportError(const QString &log)
-{
-    addAddressBookImportError(log);
-}
-
-void AbstractAddressBook::addAddressBookImportInfo(const QString &log)
-{
-    mImportWizard->importAddressBookPage()->addImportInfo(log);
-}
-
-void AbstractAddressBook::addAddressBookImportError(const QString &log)
-{
-    mImportWizard->importAddressBookPage()->addImportError(log);
-}
-
-void AbstractAddressBook::cleanUp()
-{
-    mCollection = Akonadi::Collection();
-}
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/abstractaddressbook.h akonadi-import-wizard-17.08.3/src/autodetect/abstractaddressbook.h
--- akonadi-import-wizard-17.04.3/src/autodetect/abstractaddressbook.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/abstractaddressbook.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef ABSTRACTADDRESSBOOK_H
-#define ABSTRACTADDRESSBOOK_H
-
-#include <AkonadiCore/Collection>
-#include "abstractbase.h"
-
-class ImportWizard;
-
-namespace KContacts
-{
-class Addressee;
-class ContactGroup;
-}
-
-class KJob;
-
-class AbstractAddressBook: public AbstractBase
-{
-    Q_OBJECT
-public:
-    explicit AbstractAddressBook(ImportWizard *parent);
-    ~AbstractAddressBook();
-
-protected:
-    void createGroup(const KContacts::ContactGroup &group);
-    void createContact(const KContacts::Addressee &address);
-
-    void addImportInfo(const QString &log) Q_DECL_OVERRIDE;
-    void addImportError(const QString &log) Q_DECL_OVERRIDE;
-
-    void addAddressBookImportInfo(const QString &log);
-    void addAddressBookImportError(const QString &log);
-    void cleanUp();
-    void addImportContactNote(KContacts::Addressee &address, const QString &applicationName);
-
-protected:
-    ImportWizard *mImportWizard;
-
-private:
-    void slotStoreDone(KJob *job);
-    bool selectAddressBook();
-    Akonadi::Collection mCollection;
-};
-
-#endif // ABSTRACTADDRESSBOOK_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/abstractbase.cpp akonadi-import-wizard-17.08.3/src/autodetect/abstractbase.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/abstractbase.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/abstractbase.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "abstractbase.h"
-#include "PimCommonAkonadi/CreateResource"
-
-#include <KSharedConfig>
-
-#include <AkonadiCore/agenttype.h>
-#include <AkonadiCore/agentmanager.h>
-#include <AkonadiCore/agentinstancecreatejob.h>
-
-#include <QMetaMethod>
-
-using namespace Akonadi;
-
-AbstractBase::AbstractBase()
-{
-    mCreateResource = new PimCommon::CreateResource();
-    connect(mCreateResource, &PimCommon::CreateResource::createResourceInfo, this, &AbstractBase::slotCreateResourceInfo);
-    connect(mCreateResource, &PimCommon::CreateResource::createResourceError, this, &AbstractBase::slotCreateResourceError);
-}
-
-AbstractBase::~AbstractBase()
-{
-    delete mCreateResource;
-}
-
-QString AbstractBase::createResource(const QString &resources, const QString &name, const QMap<QString, QVariant> &settings)
-{
-    return mCreateResource->createResource(resources, name, settings);
-}
-
-void AbstractBase::slotCreateResourceError(const QString &msg)
-{
-    addImportError(msg);
-}
-
-void AbstractBase::slotCreateResourceInfo(const QString &msg)
-{
-    addImportInfo(msg);
-}
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/abstractbase.h akonadi-import-wizard-17.08.3/src/autodetect/abstractbase.h
--- akonadi-import-wizard-17.04.3/src/autodetect/abstractbase.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/abstractbase.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef ABSTRACTBASE_H
-#define ABSTRACTBASE_H
-
-#include <QObject>
-#include <QString>
-#include <QMap>
-#include <QVariant>
-
-namespace PimCommon
-{
-class CreateResource;
-}
-
-class AbstractBase : public QObject
-{
-    Q_OBJECT
-public:
-    explicit AbstractBase();
-    virtual ~AbstractBase();
-
-    QString createResource(const QString &resources, const QString &name, const QMap<QString, QVariant> &settings);
-
-protected:
-    virtual void addImportInfo(const QString &log) = 0;
-    virtual void addImportError(const QString &log) = 0;
-
-private:
-    void slotCreateResourceError(const QString &);
-    void slotCreateResourceInfo(const QString &);
-    PimCommon::CreateResource *mCreateResource;
-};
-
-#endif // ABSTRACTBASE_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/abstractcalendar.cpp akonadi-import-wizard-17.08.3/src/autodetect/abstractcalendar.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/abstractcalendar.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/abstractcalendar.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,56 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "abstractcalendar.h"
-#include "importwizard.h"
-#include "importcalendarpage.h"
-
-#include <KConfigGroup>
-
-AbstractCalendar::AbstractCalendar(ImportWizard *parent)
-    : mImportWizard(parent)
-{
-}
-
-AbstractCalendar::~AbstractCalendar()
-{
-}
-
-void AbstractCalendar::addImportInfo(const QString &log)
-{
-    if (mImportWizard) {
-        mImportWizard->importCalendarPage()->addImportInfo(log);
-    }
-}
-
-void AbstractCalendar::addImportError(const QString &log)
-{
-    if (mImportWizard) {
-        mImportWizard->importCalendarPage()->addImportError(log);
-    }
-}
-
-//eventviewsrc for calendar color for example
-void AbstractCalendar::addEvenViewConfig(const QString &groupName, const QString &key, const QString &value)
-{
-    KSharedConfigPtr eventViewConfig = KSharedConfig::openConfig(QStringLiteral("eventviewsrc"));
-    KConfigGroup group = eventViewConfig->group(groupName);
-    group.writeEntry(key, value);
-    group.sync();
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/abstractcalendar.h akonadi-import-wizard-17.08.3/src/autodetect/abstractcalendar.h
--- akonadi-import-wizard-17.04.3/src/autodetect/abstractcalendar.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/abstractcalendar.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef ABSTRACTCALENDAR_H
-#define ABSTRACTCALENDAR_H
-
-class ImportWizard;
-#include "abstractbase.h"
-
-#include <QString>
-
-class AbstractCalendar : public AbstractBase
-{
-    Q_OBJECT
-public:
-    explicit AbstractCalendar(ImportWizard *parent);
-    virtual ~AbstractCalendar();
-
-protected:
-    void addEvenViewConfig(const QString &groupName, const QString &key, const QString &value);
-    void addImportInfo(const QString &log) Q_DECL_OVERRIDE;
-    void addImportError(const QString &log) Q_DECL_OVERRIDE;
-
-private:
-    ImportWizard *mImportWizard;
-};
-
-#endif // ABSTRACTCALENDAR_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/abstractimporter.cpp akonadi-import-wizard-17.08.3/src/autodetect/abstractimporter.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/abstractimporter.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/abstractimporter.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "abstractimporter.h"
-#include "importwizard.h"
-#include "importmailpage.h"
-#include "importfilterinfogui.h"
-#include "importfilterpage.h"
-#include "importsettingpage.h"
-#include "importcalendarpage.h"
-
-#include "mailimporter/filterinfo.h"
-#include "MailCommon/FilterManager"
-#include <MailImporterAkonadi/FilterImporterAkonadi>
-
-#include <QFile>
-
-AbstractImporter::AbstractImporter(ImportWizard *parent)
-    : mImportWizard(parent)
-{
-}
-
-AbstractImporter::~AbstractImporter()
-{
-}
-
-bool AbstractImporter::importSettings()
-{
-    return false;
-}
-
-bool AbstractImporter::importMails()
-{
-    return false;
-}
-
-bool AbstractImporter::importFilters()
-{
-    return false;
-}
-
-bool AbstractImporter::importAddressBook()
-{
-    return false;
-}
-
-bool AbstractImporter::importCalendar()
-{
-    return false;
-}
-
-void AbstractImporter::initializeFilter(MailImporter::Filter &filter)
-{
-    MailImporter::FilterInfo *info = new MailImporter::FilterInfo();
-    ImportFilterInfoGui *infoGui = new ImportFilterInfoGui(mImportWizard->importMailPage());
-    info->setFilterInfoGui(infoGui);
-    info->clear(); // Clear info from last time
-    MailImporter::FilterImporterAkonadi *filterImporter = new MailImporter::FilterImporterAkonadi(info);
-    filterImporter->setRootCollection(mImportWizard->importMailPage()->selectedCollection());
-    filter.setFilterImporter(filterImporter);
-    filter.setFilterInfo(info);
-}
-
-bool AbstractImporter::addFilters(const QString &filterPath, MailCommon::FilterImporterExporter::FilterType type)
-{
-    if (QFileInfo::exists(filterPath)) {
-        bool canceled = false;
-        MailCommon::FilterImporterExporter importer(mImportWizard);
-        QList<MailCommon::MailFilter *> listFilter = importer.importFilters(canceled, type, filterPath);
-        appendFilters(listFilter);
-        if (canceled) {
-            addImportFilterInfo(i18n("Importing of filters was canceled."));
-        } else {
-            addImportFilterInfo(i18np("1 filter was imported from \"%2\"", "%1 filters were imported from \"%2\"", listFilter.count(), filterPath));
-        }
-        return true;
-    } else {
-        addImportFilterError(i18n("Filters file was not found"));
-        return true;
-    }
-}
-
-void AbstractImporter::appendFilters(const QList<MailCommon::MailFilter *> &filters)
-{
-    if (!filters.isEmpty()) {
-        MailCommon::FilterManager::instance()->appendFilters(filters, false);
-    }
-}
-
-void AbstractImporter::addImportFilterInfo(const QString &log) const
-{
-    mImportWizard->importFilterPage()->addImportInfo(log);
-}
-
-void AbstractImporter::addImportFilterError(const QString &log) const
-{
-    mImportWizard->importFilterPage()->addImportError(log);
-}
-
-void AbstractImporter::addImportSettingsInfo(const QString &log) const
-{
-    mImportWizard->importSettingPage()->addImportError(log);
-}
-
-void AbstractImporter::addImportCalendarInfo(const QString &log) const
-{
-    mImportWizard->importCalendarPage()->addImportError(log);
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/abstractimporter.h akonadi-import-wizard-17.08.3/src/autodetect/abstractimporter.h
--- akonadi-import-wizard-17.04.3/src/autodetect/abstractimporter.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/abstractimporter.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef AbstractImporter_H
-#define AbstractImporter_H
-#include "MailCommon/FilterImporterExporter"
-
-class ImportWizard;
-
-namespace MailImporter
-{
-class FilterInfo;
-class Filter;
-}
-
-namespace MailCommon
-{
-class MailFilter;
-class FilterImporterExporter;
-}
-
-class AbstractImporter
-{
-public:
-    enum TypeSupportedOption {
-        None = 0,
-        Mails = 1,
-        Settings = 2,
-        Filters = 4,
-        AddressBooks = 8,
-        Calendars = 16
-    };
-
-    Q_DECLARE_FLAGS(TypeSupportedOptions, TypeSupportedOption)
-
-    explicit AbstractImporter(ImportWizard *parent);
-    virtual ~AbstractImporter();
-
-    /**
-    * Return true if mail found on system
-    */
-    virtual bool foundMailer() const = 0;
-
-    /**
-    * Return type of data that we can import
-    */
-    virtual TypeSupportedOptions supportedOption() = 0;
-    /**
-    * Return name for plugins
-    */
-    virtual QString name() const = 0;
-
-    virtual bool importSettings();
-    virtual bool importMails();
-    virtual bool importFilters();
-    virtual bool importAddressBook();
-    virtual bool importCalendar();
-
-protected:
-    //TODO we need to redefine it.
-    virtual void initializeFilter(MailImporter::Filter &filter);
-
-    void appendFilters(const QList<MailCommon::MailFilter *> &filters);
-    void addImportFilterInfo(const QString &log) const;
-    void addImportFilterError(const QString &log) const;
-    bool addFilters(const QString &filterPath, MailCommon::FilterImporterExporter::FilterType type);
-    void addImportSettingsInfo(const QString &log) const;
-    void addImportCalendarInfo(const QString &log) const;
-
-    QString mPath;
-    ImportWizard *mImportWizard;
-};
-
-#endif /* AbstractImporter_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/abstractsettings.cpp akonadi-import-wizard-17.08.3/src/autodetect/abstractsettings.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/abstractsettings.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/abstractsettings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,157 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#include "abstractsettings.h"
-#include "importwizard.h"
-#include "importsettingpage.h"
-
-#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <mailtransport/transportmanager.h>
-
-#include <KLocalizedString>
-#include <KSharedConfig>
-
-#include <AkonadiCore/agenttype.h>
-#include <AkonadiCore/agentmanager.h>
-#include <AkonadiCore/agentinstancecreatejob.h>
-
-#include <QMetaMethod>
-
-using namespace Akonadi;
-
-AbstractSettings::AbstractSettings(ImportWizard *parent)
-    : mImportWizard(parent)
-{
-    mManager = KIdentityManagement::IdentityManager::self();
-    mKmailConfig = KSharedConfig::openConfig(QStringLiteral("kmail2rc"));
-}
-
-AbstractSettings::~AbstractSettings()
-{
-    syncKmailConfig();
-}
-
-KIdentityManagement::Identity *AbstractSettings::createIdentity(QString &name)
-{
-    name = uniqueIdentityName(name);
-    KIdentityManagement::Identity *identity = &mManager->newFromScratch(name);
-    addImportInfo(i18n("Setting up identity..."));
-    return identity;
-}
-
-void AbstractSettings::storeIdentity(KIdentityManagement::Identity *identity)
-{
-    mManager->setAsDefault(identity->uoid());
-    mManager->commit();
-    addImportInfo(i18n("Identity set up."));
-}
-
-QString AbstractSettings::uniqueIdentityName(const QString &name)
-{
-    QString newName(name);
-    int i = 0;
-    while (!mManager->isUnique(newName)) {
-        newName = QStringLiteral("%1_%2").arg(name).arg(i);
-        ++i;
-    }
-    return newName;
-}
-
-MailTransport::Transport *AbstractSettings::createTransport()
-{
-    MailTransport::Transport *mt = MailTransport::TransportManager::self()->createTransport();
-    addImportInfo(i18n("Setting up transport..."));
-    return mt;
-}
-
-void AbstractSettings::storeTransport(MailTransport::Transport *mt, bool isDefault)
-{
-    mt->forceUniqueName();
-    mt->save();
-    MailTransport::TransportManager::self()->addTransport(mt);
-    if (isDefault) {
-        MailTransport::TransportManager::self()->setDefaultTransport(mt->id());
-    }
-    addImportInfo(i18n("Transport set up."));
-}
-
-void AbstractSettings::addImportInfo(const QString &log)
-{
-    mImportWizard->importSettingPage()->addImportInfo(log);
-}
-
-void AbstractSettings::addImportError(const QString &log)
-{
-    mImportWizard->importSettingPage()->addImportError(log);
-}
-
-void AbstractSettings::addCheckMailOnStartup(const QString &agentIdentifyName, bool loginAtStartup)
-{
-    if (agentIdentifyName.isEmpty()) {
-        return;
-    }
-    const QString groupName = QStringLiteral("Resource %1").arg(agentIdentifyName);
-    addKmailConfig(groupName, QStringLiteral("CheckOnStartup"), loginAtStartup);
-}
-
-void AbstractSettings::addToManualCheck(const QString &agentIdentifyName, bool manualCheck)
-{
-    if (agentIdentifyName.isEmpty()) {
-        return;
-    }
-    const QString groupName = QStringLiteral("Resource %1").arg(agentIdentifyName);
-    addKmailConfig(groupName, QStringLiteral("IncludeInManualChecks"), manualCheck);
-}
-
-void AbstractSettings::addComposerHeaderGroup(const QString &groupName, const QString &name, const QString &value)
-{
-    KConfigGroup group = mKmailConfig->group(groupName);
-    group.writeEntry(QStringLiteral("name"), name);
-    group.writeEntry(QStringLiteral("value"), value);
-}
-
-void AbstractSettings::addKmailConfig(const QString &groupName, const QString &key, const QString &value)
-{
-    KConfigGroup group = mKmailConfig->group(groupName);
-    group.writeEntry(key, value);
-}
-
-void AbstractSettings::addKmailConfig(const QString &groupName, const QString &key, bool value)
-{
-    KConfigGroup group = mKmailConfig->group(groupName);
-    group.writeEntry(key, value);
-}
-
-void AbstractSettings::addKmailConfig(const QString &groupName, const QString &key, int value)
-{
-    KConfigGroup group = mKmailConfig->group(groupName);
-    group.writeEntry(key, value);
-}
-
-void AbstractSettings::syncKmailConfig()
-{
-    mKmailConfig->sync();
-}
-
-int AbstractSettings::readKmailSettings(const QString &groupName, const QString &key)
-{
-    KConfigGroup group = mKmailConfig->group(groupName);
-    int value = group.readEntry(key, -1);
-    return value;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/abstractsettings.h akonadi-import-wizard-17.08.3/src/autodetect/abstractsettings.h
--- akonadi-import-wizard-17.04.3/src/autodetect/abstractsettings.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/abstractsettings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef ABSTRACTSETTINGS_H
-#define ABSTRACTSETTINGS_H
-
-#include "abstractbase.h"
-#include <KSharedConfig>
-#include <QMap>
-
-class ImportWizard;
-
-namespace KIdentityManagement
-{
-class Identity;
-class IdentityManager;
-}
-
-namespace MailTransport
-{
-class Transport;
-}
-
-class AbstractSettings : public AbstractBase
-{
-    Q_OBJECT
-public:
-    explicit AbstractSettings(ImportWizard *parent);
-    ~AbstractSettings();
-
-protected:
-    void addImportInfo(const QString &log) Q_DECL_OVERRIDE;
-    void addImportError(const QString &log) Q_DECL_OVERRIDE;
-
-    void syncKmailConfig();
-
-    QString uniqueIdentityName(const QString &name);
-
-    QString createResource(const QString &resources, const QString &name, const QMap<QString, QVariant> &settings);
-
-    KIdentityManagement::Identity *createIdentity(QString &name);
-
-    MailTransport::Transport *createTransport();
-
-    void storeTransport(MailTransport::Transport *mt, bool isDefault = false);
-
-    void storeIdentity(KIdentityManagement::Identity *identity);
-
-    void addKmailConfig(const QString &groupName, const QString &key, const QString &value);
-    void addKmailConfig(const QString &groupName, const QString &key, bool value);
-    void addKmailConfig(const QString &groupName, const QString &key, int value);
-
-    void addComposerHeaderGroup(const QString &groupName, const QString &name, const QString &value);
-
-    void addCheckMailOnStartup(const QString &agentIdentifyName, bool loginAtStartup);
-    void addToManualCheck(const QString &agentIdentifyName, bool manualCheck);
-    int readKmailSettings(const QString &groupName, const QString &key);
-
-    ImportWizard *mImportWizard;
-    KIdentityManagement::IdentityManager *mManager;
-    KSharedConfigPtr mKmailConfig;
-};
-
-#endif // ABSTRACTSETTINGS_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/balsa/balsaaddressbook.cpp akonadi-import-wizard-17.08.3/src/autodetect/balsa/balsaaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/balsa/balsaaddressbook.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/balsa/balsaaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,115 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "balsaaddressbook.h"
-#include "importwizardutil.h"
-#include "helper_p.h"
-
-#include <KContacts/Addressee>
-#include <KContacts/LDIFConverter>
-
-#include <KConfig>
-#include <KConfigGroup>
-#include <KLocalizedString>
-#include <QUrl>
-
-#include "importwizard_debug.h"
-#include <QFile>
-#include <QFileInfo>
-#include <QRegularExpression>
-
-BalsaAddressBook::BalsaAddressBook(const QString &filename, ImportWizard *parent)
-    : AbstractAddressBook(parent),
-      mFileName(filename)
-{
-}
-
-BalsaAddressBook::~BalsaAddressBook()
-{
-
-}
-
-void BalsaAddressBook::importAddressBook()
-{
-    KConfig config(mFileName);
-    const QStringList addressBookList = config.groupList().filter(QRegularExpression("address-book-\\d+"));
-    if (addressBookList.isEmpty()) {
-        addAddressBookImportInfo(i18n("No addressbook found"));
-    } else {
-        for (const QString &addressbook : addressBookList) {
-            KConfigGroup grp = config.group(addressbook);
-            readAddressBook(grp);
-        }
-    }
-}
-
-void BalsaAddressBook::readAddressBook(const KConfigGroup &grp)
-{
-    const QString type = grp.readEntry(QStringLiteral("Type"));
-    if (type.isEmpty()) {
-        addAddressBookImportInfo(i18n("No addressbook found"));
-        return;
-    }
-    const QString name = grp.readEntry(QStringLiteral("Name"));
-
-    if (type == QLatin1String("LibBalsaAddressBookLdap")) {
-        ldapStruct ldap;
-        ldap.dn = grp.readEntry(QStringLiteral("BaseDN"));
-        ldap.useTLS = (grp.readEntry(QStringLiteral("EnableTLS")) == QLatin1String("true"));
-        ldap.ldapUrl = QUrl(grp.readEntry(QStringLiteral("Host")));
-        ldap.port = ldap.ldapUrl.port();
-        //TODO: verify
-        const QString bookDN  = grp.readEntry(QStringLiteral("BookDN")); //TODO ?
-        ImportWizardUtil::mergeLdap(ldap);
-        addAddressBookImportInfo(i18n("Ldap created"));
-    } else if (type == QLatin1String("LibBalsaAddressBookGpe")) {
-        qCDebug(IMPORTWIZARD_LOG) << " Import it !";
-    } else if (type == QLatin1String("LibBalsaAddressBookLdif")) {
-        const QString path = grp.readEntry(QStringLiteral("Path"));
-        if (!path.isEmpty()) {
-            KContacts::Addressee::List contacts;
-            KContacts::ContactGroup::List contactsGroup;
-            QFile file(path);
-            if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-                QTextStream stream(&file);
-                stream.setCodec("ISO 8859-1");
-
-                const QString wholeFile = stream.readAll();
-                const QDateTime dtDefault = QFileInfo(file).lastModified();
-                file.close();
-
-                KContacts::LDIFConverter::LDIFToAddressee(wholeFile, contacts, contactsGroup, dtDefault);
-                for (KContacts::Addressee contact : qAsConst(contacts)) {
-                    addImportContactNote(contact, QStringLiteral("Balsa"));
-                    createContact(contact);
-                }
-            }
-        }
-    } else if (type == QLatin1String("LibBalsaAddressBookVcard")) {
-        const QString path = grp.readEntry(QStringLiteral("Path"));
-        if (!path.isEmpty()) {
-            QMap<QString, QVariant> settings;
-            settings.insert(QStringLiteral("Path"), path);
-            settings.insert(QStringLiteral("DisplayName"), name);
-            addAddressBookImportInfo(i18n("New addressbook created: %1", createResource(QStringLiteral("akonadi_vcard_resource"), name, settings)));
-        }
-    } else {
-        qCDebug(IMPORTWIZARD_LOG) << " unknown addressbook type :" << type;
-    }
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/balsa/balsaaddressbook.h akonadi-import-wizard-17.08.3/src/autodetect/balsa/balsaaddressbook.h
--- akonadi-import-wizard-17.04.3/src/autodetect/balsa/balsaaddressbook.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/balsa/balsaaddressbook.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef BalsaAddressBook_H
-#define BalsaAddressBook_H
-
-#include "abstractaddressbook.h"
-
-class ImportWizard;
-class KConfigGroup;
-
-class BalsaAddressBook : public AbstractAddressBook
-{
-public:
-    explicit BalsaAddressBook(const QString &filename, ImportWizard *parent);
-    ~BalsaAddressBook();
-
-    void importAddressBook();
-private:
-    void readAddressBook(const KConfigGroup &grp);
-    QString mFileName;
-};
-
-#endif // BalsaAddressBook_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/balsa/balsaimportdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/balsa/balsaimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/balsa/balsaimportdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/balsa/balsaimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "balsa/balsaimportdata.h"
-#include "balsa/balsasettings.h"
-#include "balsa/balsaaddressbook.h"
-#include "mailimporter/filterbalsa.h"
-#include "mailimporter/filterinfo.h"
-#include "MailCommon/FilterImporterBalsa"
-#include "importfilterinfogui.h"
-#include "importwizard.h"
-
-#include <KLocalizedString>
-
-#include <QDir>
-
-BalsaImportData::BalsaImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = MailImporter::FilterBalsa::defaultSettingsPath();
-}
-
-BalsaImportData::~BalsaImportData()
-{
-}
-
-bool BalsaImportData::foundMailer() const
-{
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-    return false;
-}
-
-QString BalsaImportData::name() const
-{
-    return QStringLiteral("Balsa");
-}
-
-bool BalsaImportData::importMails()
-{
-    MailImporter::FilterBalsa balsa;
-    initializeFilter(balsa);
-    balsa.filterInfo()->setStatusMessage(i18n("Import in progress"));
-    QDir directory(balsa.localMailDirPath());
-    if (directory.exists()) {
-        balsa.importMails(directory.absolutePath());
-    } else {
-        balsa.import();
-    }
-    balsa.filterInfo()->setStatusMessage(i18n("Import finished"));
-    return true;
-}
-
-bool BalsaImportData::importAddressBook()
-{
-    const QString addressbookFile(mPath + QStringLiteral("config"));
-    BalsaAddressBook addressbook(addressbookFile, mImportWizard);
-    addressbook.importAddressBook();
-    return true;
-}
-
-bool BalsaImportData::importSettings()
-{
-    const QString settingFile(mPath + QStringLiteral("config"));
-    BalsaSettings settings(settingFile, mImportWizard);
-    settings.importSettings();
-    return true;
-}
-
-bool BalsaImportData::importFilters()
-{
-    const QString filterPath = mPath + QStringLiteral("config");
-    return addFilters(filterPath, MailCommon::FilterImporterExporter::BalsaFilter);
-}
-
-AbstractImporter::TypeSupportedOptions BalsaImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    options |= AbstractImporter::AddressBooks;
-    options |= AbstractImporter::Settings;
-    options |= AbstractImporter::Filters;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/balsa/balsaimportdata.h akonadi-import-wizard-17.08.3/src/autodetect/balsa/balsaimportdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/balsa/balsaimportdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/balsa/balsaimportdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef BalsaImportData_H
-#define BalsaImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class BalsaImportData : public AbstractImporter
-{
-public:
-    explicit BalsaImportData(ImportWizard *parent);
-    ~BalsaImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importMails() Q_DECL_OVERRIDE;
-    bool importAddressBook() Q_DECL_OVERRIDE;
-    bool importSettings() Q_DECL_OVERRIDE;
-    bool importFilters() Q_DECL_OVERRIDE;
-    QString name() const Q_DECL_OVERRIDE;
-
-};
-
-#endif /* BalsaImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/balsa/balsasettings.cpp akonadi-import-wizard-17.08.3/src/autodetect/balsa/balsasettings.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/balsa/balsasettings.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/balsa/balsasettings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,252 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "balsasettings.h"
-#include "importwizard_debug.h"
-#include <mailtransport/transportmanager.h>
-#include "MailCommon/MailUtil"
-#include "messageviewer/kxface.h"
-
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/signature.h>
-
-#include <KConfig>
-#include <KConfigGroup>
-#include <QImage>
-#include <QRegularExpression>
-
-BalsaSettings::BalsaSettings(const QString &filename, ImportWizard *parent)
-    : AbstractSettings(parent),
-      mFileName(filename)
-{
-}
-
-
-BalsaSettings::~BalsaSettings()
-{
-
-}
-
-void BalsaSettings::importSettings()
-{
-    KConfig config(mFileName);
-
-    bool autoCheck = false;
-    int autoCheckDelay = -1;
-    if (config.hasGroup(QStringLiteral("MailboxChecking"))) {
-        KConfigGroup grp = config.group(QStringLiteral("MailboxChecking"));
-        autoCheck = grp.readEntry(QStringLiteral("Auto"), false);
-        autoCheckDelay = grp.readEntry(QStringLiteral("AutoDelay"), -1);
-    }
-
-    const QStringList mailBoxList = config.groupList().filter(QRegularExpression("mailbox-"));
-    for (const QString &mailBox : mailBoxList) {
-        KConfigGroup grp = config.group(mailBox);
-        readAccount(grp, autoCheck, autoCheckDelay);
-    }
-
-    const QStringList smtpList = config.groupList().filter(QRegularExpression("smtp-server-"));
-    for (const QString &smtp : smtpList) {
-        KConfigGroup grp = config.group(smtp);
-        readTransport(grp);
-    }
-    readGlobalSettings(config);
-}
-
-void BalsaSettings::readAccount(const KConfigGroup &grp, bool autoCheck, int autoDelay)
-{
-    Q_UNUSED(autoDelay);
-    const QString type = grp.readEntry(QStringLiteral("Type"));
-    bool check = grp.readEntry(QStringLiteral("Check"), false);
-    if (type == QLatin1String("LibBalsaMailboxPOP3")) {
-        QMap<QString, QVariant> settings;
-        const QString server = grp.readEntry(QStringLiteral("Server"));
-        settings.insert(QStringLiteral("Host"), server);
-        const QString name = grp.readEntry(QStringLiteral("Name"));
-
-        //const bool apop = grp.readEntry(QStringLiteral("DisableApop"), false);
-        //Q_UNUSED(apop);
-        const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
-
-        addCheckMailOnStartup(agentIdentifyName, autoCheck);
-        addToManualCheck(agentIdentifyName, check);
-
-    } else if (type == QLatin1String("LibBalsaMailboxImap")) {
-        QMap<QString, QVariant> settings;
-        const QString server = grp.readEntry(QStringLiteral("Server"));
-        settings.insert(QStringLiteral("ImapServer"), server);
-        const QString name = grp.readEntry(QStringLiteral("Name"));
-        const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
-        addCheckMailOnStartup(agentIdentifyName, autoCheck);
-        addToManualCheck(agentIdentifyName, check);
-    } else {
-        qCDebug(IMPORTWIZARD_LOG) << " unknown account type :" << type;
-    }
-}
-
-void BalsaSettings::readIdentity(const KConfigGroup &grp)
-{
-    QString name = grp.readEntry(QStringLiteral("FullName"));
-    KIdentityManagement::Identity *newIdentity = createIdentity(name);
-    newIdentity->setFullName(name);
-    newIdentity->setPrimaryEmailAddress(grp.readEntry(QStringLiteral("Address")));
-    newIdentity->setReplyToAddr(grp.readEntry(QStringLiteral("ReplyTo")));
-    newIdentity->setBcc(grp.readEntry(QStringLiteral("Bcc")));
-    const QString smtp = grp.readEntry(QStringLiteral("SmtpServer"));
-    if (!smtp.isEmpty()) {
-        const QString val = mHashSmtp.value(smtp);
-        if (val.isEmpty()) {
-            newIdentity->setTransport(val);
-        }
-    }
-
-    const QString signaturePath = grp.readEntry(QStringLiteral("SignaturePath"));
-    if (!signaturePath.isEmpty()) {
-        KIdentityManagement::Signature signature;
-        if (grp.readEntry(QStringLiteral("SigExecutable"), false)) {
-            signature.setPath(signaturePath, true);
-            signature.setType(KIdentityManagement::Signature::FromCommand);
-        } else {
-            signature.setType(KIdentityManagement::Signature::FromFile);
-        }
-        newIdentity->setSignature(signature);
-    }
-
-    const QString xfacePathStr = grp.readEntry(QStringLiteral("XFacePath"));
-    if (!xfacePathStr.isEmpty()) {
-        newIdentity->setXFaceEnabled(true);
-        MessageViewer::KXFace xf;
-        newIdentity->setXFace(xf.fromImage(QImage(xfacePathStr)));
-    }
-    storeIdentity(newIdentity);
-}
-
-void BalsaSettings::readTransport(const KConfigGroup &grp)
-{
-    MailTransport::Transport *mt = createTransport();
-    const QString smtp = grp.name().remove(QStringLiteral("smtp-server-"));
-    const QString server = grp.readEntry(QStringLiteral("Server"));
-    mt->setHost(server);
-
-    const int tlsMode = grp.readEntry(QStringLiteral("TLSMode"), -1);
-    //TODO
-    switch (tlsMode) {
-    case 0:
-        break;
-    case 1:
-        mt->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
-        break;
-    case 2:
-        break;
-    default:
-        break;
-    }
-
-    const QString ssl = grp.readEntry(QStringLiteral("SSL"));
-    if (ssl == QLatin1String("true")) {
-        mt->setEncryption(MailTransport::Transport::EnumEncryption::SSL);
-    } else if (ssl == QLatin1String("false")) {
-        mt->setEncryption(MailTransport::Transport::EnumEncryption::None);
-    } else {
-        qCDebug(IMPORTWIZARD_LOG) << " unknown ssl value :" << ssl;
-    }
-
-    //TODO const QString anonymous = grp.readEntry(QStringLiteral("Anonymous"));
-
-    //TODO
-    storeTransport(mt, /*( smtp == defaultSmtp )*/true);   //FIXME
-    mHashSmtp.insert(smtp, QString::number(mt->id()));
-
-    //TODO
-    /*
-    Server=localhost:25
-    Anonymous=false
-    RememberPasswd=false
-    SSL=false
-    TLSMode=1
-    BigMessage=0
-    */
-}
-
-void BalsaSettings::readGlobalSettings(const KConfig &config)
-{
-    if (config.hasGroup(QStringLiteral("Compose"))) {
-        KConfigGroup compose = config.group(QStringLiteral("Compose"));
-        if (compose.hasKey(QStringLiteral("QuoteString"))) {
-            const QString quote = compose.readEntry(QStringLiteral("QuoteString"));
-            if (!quote.isEmpty()) {
-                addKmailConfig(QStringLiteral("TemplateParser"), QStringLiteral("QuoteString"), quote);
-            }
-        }
-    }
-    if (config.hasGroup(QStringLiteral("MessageDisplay"))) {
-        KConfigGroup messageDisplay = config.group(QStringLiteral("MessageDisplay"));
-#if 0
-        if (messageDisplay.hasKey(QStringLiteral("WordWrap"))) {
-            //bool wordWrap = messageDisplay.readEntry(QStringLiteral("WordWrap"), false);
-            //Q_UNUSED(wordWrap);
-            //TODO not implemented in kmail.
-        }
-        if (messageDisplay.hasKey(QStringLiteral("WordWrapLength"))) {
-            const int wordWrapLength = messageDisplay.readEntry(QStringLiteral("WordWrapLength"), -1);
-            Q_UNUSED(wordWrapLength);
-            //TODO not implemented in kmail
-        }
-#endif
-        if (messageDisplay.hasKey(QStringLiteral("DateFormat"))) {
-            const QString dateFormat = messageDisplay.readEntry(QStringLiteral("DateFormat"));
-            if (!dateFormat.isEmpty()) {
-                addKmailConfig(QStringLiteral("General"), QStringLiteral("customDateFormat"), dateFormat);
-            }
-        }
-    }
-
-    if (config.hasGroup(QStringLiteral("Sending"))) {
-        KConfigGroup sending = config.group(QStringLiteral("Sending"));
-        if (sending.hasKey(QStringLiteral("WordWrap"))) {
-            const bool wordWrap = sending.readEntry(QStringLiteral("WordWrap"), false);
-            addKmailConfig(QStringLiteral("Composer"), QStringLiteral("word-wrap"), wordWrap);
-        }
-        if (sending.hasKey(QStringLiteral("break-at"))) {
-            const int wordWrapLength = sending.readEntry(QStringLiteral("break-at"), -1);
-            if (wordWrapLength != -1) {
-                addKmailConfig(QStringLiteral("Composer"), QStringLiteral("break-at"), wordWrapLength);
-            }
-        }
-    }
-    if (config.hasGroup(QStringLiteral("Global"))) {
-        KConfigGroup global = config.group(QStringLiteral("Global"));
-        if (global.hasKey(QStringLiteral("EmptyTrash"))) {
-            const bool emptyTrash = global.readEntry(QStringLiteral("EmptyTrash"), false);
-            addKmailConfig(QStringLiteral("General"), QStringLiteral("empty-trash-on-exit"), emptyTrash);
-        }
-    }
-    if (config.hasGroup(QStringLiteral("Spelling"))) {
-        KConfigGroup spellChecking = config.group(QStringLiteral("Spelling"));
-        if (spellChecking.hasKey(QStringLiteral("SpellCheckActive"))) {
-            const bool active = spellChecking.readEntry(QStringLiteral("SpellCheckActive"), false);
-            addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("backgroundCheckerEnabled"), active);
-            addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("checkerEnabledByDefault"), active);
-        }
-        if (spellChecking.hasKey(QStringLiteral("SpellCheckLanguage"))) {
-            const QString spellCheck = spellChecking.readEntry(QStringLiteral("defaultLanguage"));
-            addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("defaultLanguage"), spellCheck);
-        }
-    }
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/balsa/balsasettings.h akonadi-import-wizard-17.08.3/src/autodetect/balsa/balsasettings.h
--- akonadi-import-wizard-17.04.3/src/autodetect/balsa/balsasettings.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/balsa/balsasettings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef BalsaSettings_H
-#define BalsaSettings_H
-
-#include "abstractsettings.h"
-
-class ImportWizard;
-class KConfigGroup;
-
-class BalsaSettings : public AbstractSettings
-{
-public:
-    explicit BalsaSettings(const QString &filename, ImportWizard *parent);
-    ~BalsaSettings();
-
-    void importSettings();
-private:
-    void readAccount(const KConfigGroup &grp, bool autoCheck, int autoDelay);
-    void readIdentity(const KConfigGroup &grp);
-    void readTransport(const KConfigGroup &grp);
-    void readGlobalSettings(const KConfig &config);
-
-    QHash<QString, QString> mHashSmtp;
-    QString mFileName;
-};
-
-#endif // BalsaSettings_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/claws-mail/clawsmailaddressbook.cpp akonadi-import-wizard-17.08.3/src/autodetect/claws-mail/clawsmailaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/claws-mail/clawsmailaddressbook.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/claws-mail/clawsmailaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "clawsmailaddressbook.h"
-#include "importwizardutil.h"
-
-ClawsMailAddressBook::ClawsMailAddressBook(const QDir &dir, ImportWizard *parent)
-    : SylpheedAddressBook(dir, parent)
-{
-}
-
-ClawsMailAddressBook::~ClawsMailAddressBook()
-{
-
-}
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/claws-mail/clawsmailaddressbook.h akonadi-import-wizard-17.08.3/src/autodetect/claws-mail/clawsmailaddressbook.h
--- akonadi-import-wizard-17.04.3/src/autodetect/claws-mail/clawsmailaddressbook.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/claws-mail/clawsmailaddressbook.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef ClawsMailAddressBook_H
-#define ClawsMailAddressBook_H
-
-#include "sylpheed/sylpheedaddressbook.h"
-#include <QDir>
-
-class ImportWizard;
-
-class ClawsMailAddressBook : public SylpheedAddressBook
-{
-public:
-    explicit ClawsMailAddressBook(const QDir &dir, ImportWizard *parent);
-    ~ClawsMailAddressBook();
-};
-
-#endif // ClawsMailAddressBook_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/claws-mail/clawsmailimportdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/claws-mail/clawsmailimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/claws-mail/clawsmailimportdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/claws-mail/clawsmailimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "claws-mail/clawsmailimportdata.h"
-#include "claws-mail/clawsmailsettings.h"
-#include "claws-mail/clawsmailaddressbook.h"
-#include "mailimporter/filterclawsmail.h"
-#include "MailCommon/FilterImporterClawsMail"
-#include "mailimporter/filterinfo.h"
-#include "importfilterinfogui.h"
-#include "importwizard.h"
-
-#include <KLocalizedString>
-
-#include <QDir>
-
-ClawsMailImportData::ClawsMailImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = MailImporter::FilterClawsMail::defaultSettingsPath();
-}
-
-ClawsMailImportData::~ClawsMailImportData()
-{
-}
-
-bool ClawsMailImportData::foundMailer() const
-{
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-    return false;
-}
-
-QString ClawsMailImportData::name() const
-{
-    return QStringLiteral("Claws Mails");
-}
-
-bool ClawsMailImportData::importMails()
-{
-    MailImporter::FilterClawsMail clawsMail;
-    initializeFilter(clawsMail);
-    clawsMail.filterInfo()->setStatusMessage(i18n("Import in progress"));
-    const QString mailsPath = clawsMail.localMailDirPath();
-    QDir directory(mailsPath);
-    if (directory.exists()) {
-        clawsMail.importMails(mailsPath);
-    } else {
-        clawsMail.import();
-    }
-    clawsMail.filterInfo()->setStatusMessage(i18n("Import finished"));
-    return true;
-}
-
-bool ClawsMailImportData::importAddressBook()
-{
-    const QDir addressbookDir(mPath + QLatin1String("addrbook/"));
-    ClawsMailAddressBook account(addressbookDir, mImportWizard);
-    account.importAddressBook();
-    return true;
-}
-
-bool ClawsMailImportData::importSettings()
-{
-    const QString accountFile = mPath + QLatin1String("accountrc");
-    if (QFileInfo::exists(accountFile)) {
-        ClawsMailSettings account(mImportWizard);
-        account.importSettings(accountFile, mPath);
-    } else {
-        addImportSettingsInfo(i18n("Claws Mail settings not found."));
-    }
-    return true;
-}
-
-bool ClawsMailImportData::importFilters()
-{
-    const QString filterPath(mPath + QLatin1String("matcherrc"));
-    return addFilters(filterPath, MailCommon::FilterImporterExporter::ClawsMailFilter);
-}
-
-AbstractImporter::TypeSupportedOptions ClawsMailImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    options |= AbstractImporter::AddressBooks;
-    options |= AbstractImporter::Settings;
-    options |= AbstractImporter::Filters;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/claws-mail/clawsmailimportdata.h akonadi-import-wizard-17.08.3/src/autodetect/claws-mail/clawsmailimportdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/claws-mail/clawsmailimportdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/claws-mail/clawsmailimportdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef ClawsMailImportData_H
-#define ClawsMailImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class ClawsMailImportData : public AbstractImporter
-{
-public:
-    explicit ClawsMailImportData(ImportWizard *parent);
-    ~ClawsMailImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importMails() Q_DECL_OVERRIDE;
-    bool importAddressBook() Q_DECL_OVERRIDE;
-    bool importSettings() Q_DECL_OVERRIDE;
-    bool importFilters() Q_DECL_OVERRIDE;
-
-    QString name() const Q_DECL_OVERRIDE;
-
-};
-
-#endif /* ClawsMailImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/claws-mail/clawsmailsettings.cpp akonadi-import-wizard-17.08.3/src/autodetect/claws-mail/clawsmailsettings.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/claws-mail/clawsmailsettings.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/claws-mail/clawsmailsettings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,198 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "clawsmailsettings.h"
-#include "importwizardutil.h"
-
-#include <mailtransport/transportmanager.h>
-#include "MailCommon/MailUtil"
-
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/signature.h>
-
-#include "importwizard_debug.h"
-#include <KConfig>
-#include <KConfigGroup>
-#include <QFileInfo>
-
-#include <QRegularExpression>
-
-ClawsMailSettings::ClawsMailSettings(ImportWizard *parent)
-    : SylpheedSettings(parent)
-{
-}
-
-ClawsMailSettings::~ClawsMailSettings()
-{
-
-}
-
-void ClawsMailSettings::importSettings(const QString &filename, const QString &path)
-{
-    bool checkMailOnStartup = true;
-    int intervalCheckMail = -1;
-    const QString clawsmailrc = path + QLatin1String("/clawsrc");
-    if (QFileInfo::exists(clawsmailrc)) {
-        KConfig configCommon(clawsmailrc);
-        if (configCommon.hasGroup("Common")) {
-            KConfigGroup common = configCommon.group("Common");
-            checkMailOnStartup = (common.readEntry("check_on_startup", 1) == 1);
-            if (common.readEntry(QStringLiteral("autochk_newmail"), 1) == 1) {
-                intervalCheckMail = common.readEntry(QStringLiteral("autochk_interval"), -1);
-            }
-            readGlobalSettings(common);
-        }
-    }
-    KConfig config(filename);
-    const QStringList accountList = config.groupList().filter(QRegularExpression(QStringLiteral("Account: \\d+")));
-    const QStringList::const_iterator end(accountList.constEnd());
-    for (QStringList::const_iterator it = accountList.constBegin(); it != end; ++it) {
-        KConfigGroup group = config.group(*it);
-        readAccount(group, checkMailOnStartup, intervalCheckMail);
-        readIdentity(group);
-    }
-    const QString customheaderrc = path + QLatin1String("/customheaderrc");
-    QFile customHeaderFile(customheaderrc);
-    if (customHeaderFile.exists()) {
-        if (!customHeaderFile.open(QIODevice::ReadOnly)) {
-            qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << customheaderrc;
-        } else {
-            readCustomHeader(&customHeaderFile);
-        }
-    }
-}
-
-void ClawsMailSettings::readSettingsColor(const KConfigGroup &group)
-{
-    const bool enableColor = group.readEntry("enable_color", false);
-    if (enableColor) {
-        const QString colorLevel1 = group.readEntry("quote_level1_color");
-        if (!colorLevel1.isEmpty()) {
-            const QColor col = QColor(colorLevel1);
-            if (col.isValid()) {
-                addKmailConfig(QStringLiteral("Reader"), QStringLiteral("QuotedText1"), writeColor(col));
-            }
-            //[Reader]  QuotedText1
-        }
-        const QString colorLevel2 = group.readEntry("quote_level2_color");
-        if (!colorLevel2.isEmpty()) {
-            const QColor col = QColor(colorLevel2);
-            if (col.isValid()) {
-                addKmailConfig(QStringLiteral("Reader"), QStringLiteral("QuotedText2"), writeColor(col));
-            }
-            //[Reader]  QuotedText2
-        }
-        const QString colorLevel3 = group.readEntry("quote_level3_color");
-        if (!colorLevel3.isEmpty()) {
-            const QColor col = QColor(colorLevel3);
-            if (col.isValid()) {
-                addKmailConfig(QStringLiteral("Reader"), QStringLiteral("QuotedText3"), writeColor(col));
-            }
-            //[Reader]  QuotedText3
-        }
-        const QString misspellColor = group.readEntry(QStringLiteral("misspelled_color"));
-        if (!misspellColor.isEmpty()) {
-            const QColor col = QColor(misspellColor);
-            if (col.isValid()) {
-                addKmailConfig(QStringLiteral("Reader"), QStringLiteral("MisspelledColor"), writeColor(col));
-            }
-        }
-        const QString uriColor = group.readEntry(QStringLiteral("uri_color"));
-        if (!uriColor.isEmpty()) {
-            const QColor col(uriColor);
-            if (col.isValid()) {
-                addKmailConfig(QStringLiteral("Reader"), QStringLiteral("LinkColor"), writeColor(col));
-            }
-        }
-        const QString newColor = group.readEntry(QStringLiteral("color_new"));
-        if (!newColor.isEmpty()) {
-            const QColor col(newColor);
-            if (col.isValid()) {
-                addKmailConfig(QStringLiteral("MessageListView::Colors"), QStringLiteral("UnreadMessageColor"), writeColor(col));
-            }
-        }
-    }
-}
-
-QString ClawsMailSettings::writeColor(const QColor &col)
-{
-    QStringList list;
-    list.insert(0, QString::number(col.red()));
-    list.insert(1, QString::number(col.green()));
-    list.insert(2, QString::number(col.blue()));
-    if (col.alpha() != 255) {
-        list.insert(3, QString::number(col.alpha()));
-    }
-    return list.join(QLatin1Char(','));
-}
-
-void ClawsMailSettings::readTemplateFormat(const KConfigGroup &group)
-{
-    SylpheedSettings::readTemplateFormat(group);
-    const QString composerNewMessage = group.readEntry(QStringLiteral("compose_body_format"));
-    if (!composerNewMessage.isEmpty()) {
-        addKmailConfig(QStringLiteral("TemplateParser"), QStringLiteral("TemplateNewMessage"), convertToKmailTemplate(composerNewMessage));
-    }
-}
-
-void ClawsMailSettings::readGlobalSettings(const KConfigGroup &group)
-{
-    SylpheedSettings::readGlobalSettings(group);
-    if (group.readEntry(QStringLiteral("check_while_typing"), 0) == 1) {
-        addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("backgroundCheckerEnabled"), true);
-    }
-    const int markAsRead = group.readEntry(QStringLiteral("mark_as_read_delay"), -1);
-    if (markAsRead != -1) {
-        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkTime"), markAsRead);
-        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkAsRead"), true);
-    }
-
-    const int warnLargeFileInserting = group.readEntry(QStringLiteral("warn_large_insert"), 0);
-    if (warnLargeFileInserting == 0) {
-        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("MaximumAttachmentSize"), -1);
-    } else {
-        const int warnLargeFileSize = group.readEntry(QStringLiteral("warn_large_insert_size"), -1);
-        if (warnLargeFileSize > 0) {
-            addKmailConfig(QStringLiteral("Composer"), QStringLiteral("MaximumAttachmentSize"), warnLargeFileSize * 1024);
-        }
-    }
-}
-
-void ClawsMailSettings::readTagColor(const KConfigGroup &group)
-{
-    const QString customColorPattern(QStringLiteral("custom_color%1"));
-    const QString customColorLabelPattern(QStringLiteral("custom_colorlabel%1"));
-    QVector<tagStruct> listTag;
-    for (int i = 1; i <= 15; ++i) {
-        if (group.hasKey(customColorPattern.arg(i))
-                && group.hasKey(customColorLabelPattern.arg(i))) {
-            tagStruct tag;
-            const QString colorStr = group.readEntry(customColorPattern.arg(i));
-            const QString labelStr = group.readEntry(customColorLabelPattern.arg(i));
-            if (!colorStr.isEmpty() && !labelStr.isEmpty()) {
-                tag.color = QColor(colorStr).name();
-                tag.name = labelStr;
-                listTag << tag;
-            }
-        }
-    }
-    if (!listTag.isEmpty()) {
-        ImportWizardUtil::addAkonadiTag(listTag);
-    }
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/claws-mail/clawsmailsettings.h akonadi-import-wizard-17.08.3/src/autodetect/claws-mail/clawsmailsettings.h
--- akonadi-import-wizard-17.04.3/src/autodetect/claws-mail/clawsmailsettings.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/claws-mail/clawsmailsettings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef ClawsMailSettings_H
-#define ClawsMailSettings_H
-
-#include "sylpheed/sylpheedsettings.h"
-
-class ImportWizard;
-class KConfigGroup;
-
-class ClawsMailSettings : public SylpheedSettings
-{
-public:
-    explicit ClawsMailSettings(ImportWizard *parent);
-    ~ClawsMailSettings();
-
-    void importSettings(const QString &filename, const QString &path) Q_DECL_OVERRIDE;
-
-protected:
-    //Reimplement from sylpheed
-    void readSettingsColor(const KConfigGroup &group) Q_DECL_OVERRIDE;
-    void readTemplateFormat(const KConfigGroup &group) Q_DECL_OVERRIDE;
-    void readGlobalSettings(const KConfigGroup &group) Q_DECL_OVERRIDE;
-    void readTagColor(const KConfigGroup &group) Q_DECL_OVERRIDE;
-
-private:
-    QString writeColor(const QColor &col);
-};
-
-#endif // ClawsMailSettings_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv1/evolutionv1importdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/evolutionv1/evolutionv1importdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv1/evolutionv1importdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv1/evolutionv1importdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "evolutionv1/evolutionv1importdata.h"
-#include "mailimporter/filterevolution.h"
-#include "mailimporter/filterinfo.h"
-#include "importfilterinfogui.h"
-
-#include <KLocalizedString>
-
-#include <QDir>
-
-Evolutionv1ImportData::Evolutionv1ImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = MailImporter::FilterEvolution::defaultSettingsPath();
-}
-
-Evolutionv1ImportData::~Evolutionv1ImportData()
-{
-}
-
-bool Evolutionv1ImportData::foundMailer() const
-{
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-    return false;
-}
-
-QString Evolutionv1ImportData::name() const
-{
-    return QStringLiteral("Evolution 1.x");
-}
-
-bool Evolutionv1ImportData::importMails()
-{
-    MailImporter::FilterEvolution evolution;
-    initializeFilter(evolution);
-    evolution.filterInfo()->setStatusMessage(i18n("Import in progress"));
-    const QString mailsPath = mPath;
-    QDir directory(mailsPath);
-    if (directory.exists()) {
-        evolution.importMails(mailsPath);
-    } else {
-        evolution.import();
-    }
-    evolution.filterInfo()->setStatusMessage(i18n("Import finished"));
-    return true;
-}
-
-AbstractImporter::TypeSupportedOptions Evolutionv1ImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv1/evolutionv1importdata.h akonadi-import-wizard-17.08.3/src/autodetect/evolutionv1/evolutionv1importdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv1/evolutionv1importdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv1/evolutionv1importdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef Evolutionv1ImportData_H
-#define Evolutionv1ImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class Evolutionv1ImportData : public AbstractImporter
-{
-public:
-    explicit Evolutionv1ImportData(ImportWizard *parent);
-    ~Evolutionv1ImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importMails() Q_DECL_OVERRIDE;
-    QString name() const Q_DECL_OVERRIDE;
-};
-
-#endif /* Evolutionv1ImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv2/evolutionv2importdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/evolutionv2/evolutionv2importdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv2/evolutionv2importdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv2/evolutionv2importdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "evolutionv2/evolutionv2importdata.h"
-#include "mailimporter/filterevolution_v2.h"
-#include "mailimporter/filterinfo.h"
-#include "importfilterinfogui.h"
-
-#include <KLocalizedString>
-
-#include <QDir>
-
-Evolutionv2ImportData::Evolutionv2ImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = MailImporter::FilterEvolution_v2::defaultSettingsPath();
-}
-
-Evolutionv2ImportData::~Evolutionv2ImportData()
-{
-}
-
-bool Evolutionv2ImportData::foundMailer() const
-{
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-    return false;
-}
-
-QString Evolutionv2ImportData::name() const
-{
-    return QStringLiteral("Evolution 2.x");
-}
-
-bool Evolutionv2ImportData::importMails()
-{
-    MailImporter::FilterEvolution_v2 evolution;
-    initializeFilter(evolution);
-    evolution.filterInfo()->setStatusMessage(i18n("Import in progress"));
-    const QString mailsPath = mPath;
-    QDir directory(mailsPath);
-    if (directory.exists()) {
-        evolution.importMails(mailsPath);
-    } else {
-        evolution.import();
-    }
-    evolution.filterInfo()->setStatusMessage(i18n("Import finished"));
-    return true;
-}
-
-AbstractImporter::TypeSupportedOptions Evolutionv2ImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv2/evolutionv2importdata.h akonadi-import-wizard-17.08.3/src/autodetect/evolutionv2/evolutionv2importdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv2/evolutionv2importdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv2/evolutionv2importdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef Evolutionv2ImportData_H
-#define Evolutionv2ImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class Evolutionv2ImportData : public AbstractImporter
-{
-public:
-    explicit Evolutionv2ImportData(ImportWizard *parent);
-    ~Evolutionv2ImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importMails() Q_DECL_OVERRIDE;
-    QString name() const Q_DECL_OVERRIDE;
-};
-
-#endif /* Evolutionv2ImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionaddressbook.cpp akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionaddressbook.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#include "evolutionaddressbook.h"
-#include "importwizard.h"
-#include <QProcess>
-#include <KMessageBox>
-#include <KLocalizedString>
-#include <QFileDialog>
-
-EvolutionAddressBook::EvolutionAddressBook(ImportWizard *parent)
-    : AbstractAddressBook(parent)
-{
-}
-
-EvolutionAddressBook::~EvolutionAddressBook()
-{
-
-}
-
-void EvolutionAddressBook::exportEvolutionAddressBook()
-{
-    KMessageBox::information(mImportWizard, i18n("Evolution address book will be exported as vCard. Import vCard in KAddressBook."), i18n("Export Evolution Address Book"));
-
-    const QString directory = QFileDialog::getExistingDirectory(mImportWizard, i18n("Select the directory where vCards will be stored."));
-    if (directory.isEmpty()) {
-        return;
-    }
-    QFile evolutionFile;
-    bool found = false;
-    for (int i = 0; i < 9; ++i) {
-        evolutionFile.setFileName(QStringLiteral("/usr/lib/evolution/3.%1/evolution-addressbook-export").arg(i));
-        if (evolutionFile.exists()) {
-            found = true;
-            break;
-        }
-    }
-    if (found) {
-        QStringList arguments;
-        arguments << QStringLiteral("-l");
-        QProcess proc;
-        proc.start(evolutionFile.fileName(), arguments);
-        if (!proc.waitForFinished()) {
-            return;
-        }
-        QByteArray result = proc.readAll();
-        proc.close();
-        if (!result.isEmpty()) {
-            result = result.replace('\n', ',');
-            const QString value(result.trimmed());
-            const QStringList listAddressBook = value.split(QLatin1Char(','));
-            //qCDebug(IMPORTWIZARD_LOG)<<" listAddressBook"<<listAddressBook;
-            int i = 0;
-            QString name;
-            QString displayname;
-            for (const QString &arg : listAddressBook) {
-                switch (i) {
-                case 0:
-                    name = arg;
-                    name = name.remove(0, 1);
-                    name = name.remove(name.length() - 1, 1);
-                    ++i;
-                    //name
-                    break;
-                case 1:
-                    displayname = arg;
-                    displayname = displayname.remove(0, 1);
-                    displayname = displayname.remove(displayname.length() - 1, 1);
-                    //display name
-                    ++i;
-                    break;
-                case 2:
-                    if (!displayname.isEmpty() && !name.isEmpty()) {
-                        arguments.clear();
-                        arguments << QStringLiteral("--format=vcard") << name << QStringLiteral("--output=%1/%2.vcard").arg(directory, displayname);
-                        proc.start(evolutionFile.fileName(), arguments);
-                        if (proc.waitForFinished()) {
-                            addAddressBookImportInfo(i18n("Address book \"%1\" exported.", displayname));
-                        } else {
-                            addAddressBookImportError(i18n("Failed to export address book \"%1\".", displayname));
-                        }
-                    }
-                    i = 0; //reset
-                    break;
-                }
-            }
-        }
-    }
-}
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionaddressbook.h akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionaddressbook.h
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionaddressbook.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionaddressbook.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,36 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef EVOLUTIONADDRESSBOOK_H
-#define EVOLUTIONADDRESSBOOK_H
-
-#include "abstractaddressbook.h"
-
-class ImportWizard;
-
-class EvolutionAddressBook: public AbstractAddressBook
-{
-    Q_OBJECT
-public:
-    explicit EvolutionAddressBook(ImportWizard *parent);
-    ~EvolutionAddressBook();
-    void exportEvolutionAddressBook();
-};
-
-#endif // ABSTRACTADDRESSBOOK_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutioncalendar.cpp akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutioncalendar.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutioncalendar.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutioncalendar.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "evolutioncalendar.h"
-#include "evolutionutil.h"
-
-#include "importwizard_debug.h"
-
-#include <QFile>
-#include <QDir>
-#include <QDomDocument>
-#include <QDomElement>
-
-EvolutionCalendar::EvolutionCalendar(ImportWizard *parent)
-    : AbstractCalendar(parent)
-{
-}
-
-EvolutionCalendar::~EvolutionCalendar()
-{
-
-}
-
-void EvolutionCalendar::loadCalendar(const QString &filename)
-{
-    //Read gconf file
-    QFile file(filename);
-    if (!file.open(QIODevice::ReadOnly)) {
-        qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << filename;
-        return;
-    }
-    QDomDocument doc;
-    if (!EvolutionUtil::loadInDomDocument(&file, doc)) {
-        return;
-    }
-    QDomElement config = doc.documentElement();
-
-    if (config.isNull()) {
-        qCDebug(IMPORTWIZARD_LOG) << "No config found";
-        return;
-    }
-    mCalendarPath = QDir::homePath() + QLatin1String("/.local/share/evolution/calendar/");
-    for (QDomElement e = config.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
-        const QString tag = e.tagName();
-        if (tag == QLatin1String("entry")) {
-            if (e.hasAttribute("name")) {
-                const QString attr = e.attribute("name");
-                if (attr == QLatin1String("sources")) {
-                    readCalendar(e);
-                } else {
-                    qCDebug(IMPORTWIZARD_LOG) << " attr unknown " << attr;
-                }
-            }
-        }
-    }
-}
-
-void EvolutionCalendar::readCalendar(const QDomElement &calendar)
-{
-    for (QDomElement calendarConfig = calendar.firstChildElement(); !calendarConfig.isNull(); calendarConfig = calendarConfig.nextSiblingElement()) {
-        if (calendarConfig.tagName() == QLatin1String("li")) {
-            const QDomElement stringValue = calendarConfig.firstChildElement();
-            extractCalendarInfo(stringValue.text());
-        }
-    }
-}
-
-void EvolutionCalendar::extractCalendarInfo(const QString &info)
-{
-    //qCDebug(IMPORTWIZARD_LOG)<<" info "<<info;
-    //Read QDomElement
-    QDomDocument cal;
-    if (!EvolutionUtil::loadInDomDocument(info, cal)) {
-        return;
-    }
-    QDomElement domElement = cal.documentElement();
-
-    if (domElement.isNull()) {
-        qCDebug(IMPORTWIZARD_LOG) << "Account not found";
-        return;
-    }
-    QString base_uri;
-    if (domElement.hasAttribute(QStringLiteral("base_uri"))) {
-        base_uri = domElement.attribute(QStringLiteral("base_uri"));
-    }
-    if (base_uri == QLatin1String("local:")) {
-        for (QDomElement e = domElement.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
-            const QString tag = e.tagName();
-            if (tag == QLatin1String("source")) {
-                QString name;
-                QMap<QString, QVariant> settings;
-                if (e.hasAttribute(QStringLiteral("uid"))) {
-                }
-                if (e.hasAttribute(QStringLiteral("name"))) {
-                    name = e.attribute(QStringLiteral("name"));
-                    settings.insert(QStringLiteral("DisplayName"), name);
-                }
-                if (e.hasAttribute(QStringLiteral("relative_uri"))) {
-                    const QString path = mCalendarPath + e.attribute(QStringLiteral("relative_uri")) + QLatin1String("/calendar.ics");
-                    settings.insert(QStringLiteral("Path"), path);
-                }
-                if (e.hasAttribute(QStringLiteral("color_spec"))) {
-                    //const QString color = e.attribute(QStringLiteral("color_spec"));
-                    //Need id.
-                    //TODO: Need to get id for collection to add color.
-                }
-                QDomElement propertiesElement = e.firstChildElement();
-                if (!propertiesElement.isNull()) {
-                    for (QDomElement property = propertiesElement.firstChildElement(); !property.isNull(); property = property.nextSiblingElement()) {
-                        const QString propertyTag = property.tagName();
-                        if (propertyTag == QLatin1String("property")) {
-                            if (property.hasAttribute(QStringLiteral("name"))) {
-                                const QString propertyName = property.attribute(QStringLiteral("name"));
-                                if (propertyName == QLatin1String("custom-file-readonly")) {
-                                    if (property.hasAttribute(QStringLiteral("value"))) {
-                                        if (property.attribute(QStringLiteral("value")) == QLatin1String("1")) {
-                                            settings.insert(QStringLiteral("ReadOnly"), true);
-                                        }
-                                    }
-                                } else if (propertyName == QLatin1String("alarm")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " need to implement alarm property";
-                                } else {
-                                    qCDebug(IMPORTWIZARD_LOG) << " property unknown :" << propertyName;
-                                }
-                            }
-                        } else {
-                            qCDebug(IMPORTWIZARD_LOG) << " tag unknown :" << propertyTag;
-                        }
-                    }
-                }
-                AbstractBase::createResource(QStringLiteral("akonadi_ical_resource"), name, settings);
-            } else {
-                qCDebug(IMPORTWIZARD_LOG) << " tag unknown :" << tag;
-            }
-        }
-    } else if (base_uri == QLatin1String("webcal://")) {
-        qCDebug(IMPORTWIZARD_LOG) << " need to implement webcal protocol";
-    } else if (base_uri == QLatin1String("google://")) {
-        qCDebug(IMPORTWIZARD_LOG) << " need to implement google protocol";
-    } else if (base_uri == QLatin1String("caldav://")) {
-        qCDebug(IMPORTWIZARD_LOG) << " need to implement caldav protocol";
-    } else {
-        qCDebug(IMPORTWIZARD_LOG) << " base_uri unknown" << base_uri;
-    }
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutioncalendar.h akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutioncalendar.h
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutioncalendar.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutioncalendar.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef EVOLUTIONCALENDAR_H
-#define EVOLUTIONCALENDAR_H
-
-#include "abstractcalendar.h"
-
-class QDomElement;
-
-class ImportWizard;
-
-class EvolutionCalendar : public AbstractCalendar
-{
-public:
-    explicit EvolutionCalendar(ImportWizard *parent);
-    ~EvolutionCalendar();
-
-    void loadCalendar(const QString &filename);
-private:
-    void readCalendar(const QDomElement &calendar);
-    void extractCalendarInfo(const QString &info);
-    QString mCalendarPath;
-};
-
-#endif // EVOLUTIONCALENDAR_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionsettings.cpp akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionsettings.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionsettings.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionsettings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,595 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "evolutionsettings.h"
-#include "evolutionutil.h"
-#include "MailCommon/MailUtil"
-#include "importwizardutil.h"
-
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-
-#include <mailtransport/transportmanager.h>
-
-#include "importwizard_debug.h"
-
-#include <QFile>
-#include <QDir>
-#include <QDomDocument>
-#include <QDomElement>
-
-EvolutionSettings::EvolutionSettings(ImportWizard *parent)
-    : AbstractSettings(parent)
-{
-}
-
-EvolutionSettings::~EvolutionSettings()
-{
-}
-
-void EvolutionSettings::loadAccount(const QString &filename)
-{
-    //Read gconf file
-    QFile file(filename);
-    if (!file.open(QIODevice::ReadOnly)) {
-        qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << filename;
-        return;
-    }
-    QDomDocument doc;
-    if (!EvolutionUtil::loadInDomDocument(&file, doc)) {
-        return;
-    }
-    QDomElement config = doc.documentElement();
-
-    if (config.isNull()) {
-        qCDebug(IMPORTWIZARD_LOG) << "No config found in filename " << filename;
-        return;
-    }
-    for (QDomElement e = config.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
-        const QString tag = e.tagName();
-        if (tag == QLatin1String("entry")) {
-            if (e.hasAttribute("name")) {
-                const QString attr = e.attribute("name");
-                if (attr == QLatin1String("accounts")) {
-                    readAccount(e);
-                } else if (attr == QLatin1String("signatures")) {
-                    readSignatures(e);
-                } else if (attr == QLatin1String("send_recv_all_on_start")) {
-                    //TODO: implement it.
-                } else if (attr == QLatin1String("send_recv_on_start")) {
-                    //TODO: implement it.
-                } else {
-                    qCDebug(IMPORTWIZARD_LOG) << " attr unknown " << attr;
-                }
-            }
-        }
-    }
-}
-
-void EvolutionSettings::loadLdap(const QString &filename)
-{
-    QFile file(filename);
-    if (!file.open(QIODevice::ReadOnly)) {
-        qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << filename;
-        return;
-    }
-    QDomDocument doc;
-    if (!EvolutionUtil::loadInDomDocument(&file, doc)) {
-        return;
-    }
-    QDomElement ldapConfig = doc.documentElement();
-    for (QDomElement e = ldapConfig.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
-        const QString tag = e.tagName();
-        if (tag == QLatin1String("entry")) {
-            for (QDomElement serverConfig = e.firstChildElement(); !serverConfig.isNull(); serverConfig = serverConfig.nextSiblingElement()) {
-                if (serverConfig.tagName() == QLatin1String("li")) {
-                    QDomElement ldapValue = serverConfig.firstChildElement();
-                    readLdap(ldapValue.text());
-                }
-            }
-        }
-    }
-}
-
-void EvolutionSettings::readLdap(const QString &ldapStr)
-{
-    qCDebug(IMPORTWIZARD_LOG) << " ldap " << ldapStr;
-    QDomDocument ldap;
-    if (!EvolutionUtil::loadInDomDocument(ldapStr, ldap)) {
-        return;
-    }
-
-    QDomElement domElement = ldap.documentElement();
-
-    if (domElement.isNull()) {
-        qCDebug(IMPORTWIZARD_LOG) << "ldap not found";
-        return;
-    }
-    //Ldap server
-    if (domElement.attribute(QStringLiteral("base_uri")) == QLatin1String("ldap://")) {
-        for (QDomElement e = domElement.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
-            //const QString name = e.attribute( QLatin1String( "name" ) ); We don't use it in kmail
-
-            ldapStruct ldap;
-            const QString relative_uri = e.attribute(QStringLiteral("relative_uri"));
-            const QString uri = e.attribute(QStringLiteral("uri"));
-            QUrl url(uri);
-            ldap.port = url.port();
-            ldap.ldapUrl = url;
-            qCDebug(IMPORTWIZARD_LOG) << " relative_uri" << relative_uri;
-
-            QDomElement propertiesElement = e.firstChildElement();
-            if (!propertiesElement.isNull()) {
-                for (QDomElement property = propertiesElement.firstChildElement(); !property.isNull(); property = property.nextSiblingElement()) {
-                    const QString propertyTag = property.tagName();
-                    if (propertyTag == QLatin1String("property")) {
-                        if (property.hasAttribute(QStringLiteral("name"))) {
-                            const QString propertyName = property.attribute(QStringLiteral("name"));
-                            if (propertyName == QLatin1String("timeout")) {
-                                ldap.timeout = property.attribute(QStringLiteral("value")).toInt();
-                            } else if (propertyName == QLatin1String("ssl")) {
-                                const QString value = property.attribute(QStringLiteral("value"));
-                                if (value == QLatin1String("always")) {
-                                    ldap.useSSL = true;
-                                } else if (value == QLatin1String("whenever_possible")) {
-                                    ldap.useTLS = true;
-                                } else {
-                                    qCDebug(IMPORTWIZARD_LOG) << " ssl attribute unknown" << value;
-                                }
-                            } else if (propertyName == QLatin1String("limit")) {
-                                ldap.limit = property.attribute(QStringLiteral("value")).toInt();
-                            } else if (propertyName == QLatin1String("binddn")) {
-                                ldap.dn = property.attribute(QStringLiteral("value"));
-                            } else if (propertyName == QLatin1String("auth")) {
-                                const QString value = property.attribute(QStringLiteral("value"));
-                                if (value == QLatin1String("ldap/simple-email")) {
-                                    //TODO:
-                                } else if (value == QLatin1String("none")) {
-                                    //TODO:
-                                } else if (value == QLatin1String("ldap/simple-binddn")) {
-                                    //TODO:
-                                } else {
-                                    qCDebug(IMPORTWIZARD_LOG) << " Unknown auth value " << value;
-                                }
-                                qCDebug(IMPORTWIZARD_LOG) << " auth" << value;
-                            } else {
-                                qCDebug(IMPORTWIZARD_LOG) << " property unknown :" << propertyName;
-                            }
-                        }
-                    } else {
-                        qCDebug(IMPORTWIZARD_LOG) << " tag unknown :" << propertyTag;
-                    }
-                }
-                ImportWizardUtil::mergeLdap(ldap);
-            }
-        }
-    }
-}
-
-void EvolutionSettings::readSignatures(const QDomElement &account)
-{
-    for (QDomElement signatureConfig = account.firstChildElement(); !signatureConfig.isNull(); signatureConfig = signatureConfig.nextSiblingElement()) {
-        if (signatureConfig.tagName() == QLatin1String("li")) {
-            QDomElement stringValue = signatureConfig.firstChildElement();
-            extractSignatureInfo(stringValue.text());
-        }
-    }
-}
-
-void EvolutionSettings::extractSignatureInfo(const QString &info)
-{
-    //qCDebug(IMPORTWIZARD_LOG)<<" signature info "<<info;
-    QDomDocument signature;
-    if (!EvolutionUtil::loadInDomDocument(info, signature)) {
-        return;
-    }
-
-    QDomElement domElement = signature.documentElement();
-
-    if (domElement.isNull()) {
-        qCDebug(IMPORTWIZARD_LOG) << "Signature not found";
-        return;
-    }
-    for (QDomElement e = domElement.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
-        KIdentityManagement::Signature signature;
-
-        const QString tag = e.tagName();
-        const QString uid = e.attribute(QStringLiteral("uid"));
-        const QString signatureName = e.attribute(QStringLiteral("name"));     //Use it ?
-        const QString format = e.attribute(QStringLiteral("text"));
-        const bool automatic = (e.attribute(QStringLiteral("auto")) == QLatin1String("true"));
-        if (automatic) {
-            //TODO:
-        } else {
-            if (format == QLatin1String("text/html")) {
-                signature.setInlinedHtml(true);
-            } else if (format == QLatin1String("text/plain")) {
-                signature.setInlinedHtml(false);
-            }
-
-            if (tag == QLatin1String("filename")) {
-                if (e.hasAttribute(QStringLiteral("script")) && e.attribute(QStringLiteral("script")) == QLatin1String("true")) {
-                    signature.setPath(e.text(), true);
-                    signature.setType(KIdentityManagement::Signature::FromCommand);
-                } else {
-                    signature.setPath(QDir::homePath() + QLatin1String("/.local/share/evolution/signatures/") + e.text(), false);
-                    signature.setType(KIdentityManagement::Signature::FromFile);
-                }
-            }
-        }
-        mMapSignature.insert(uid, signature);
-
-        qCDebug(IMPORTWIZARD_LOG) << " signature tag :" << tag;
-    }
-}
-
-void EvolutionSettings::readAccount(const QDomElement &account)
-{
-    for (QDomElement accountConfig = account.firstChildElement(); !accountConfig.isNull(); accountConfig = accountConfig.nextSiblingElement()) {
-        if (accountConfig.tagName() == QLatin1String("li")) {
-            QDomElement stringValue = accountConfig.firstChildElement();
-            extractAccountInfo(stringValue.text());
-        }
-    }
-}
-
-void EvolutionSettings::extractAccountInfo(const QString &info)
-{
-    qCDebug(IMPORTWIZARD_LOG) << " info " << info;
-    //Read QDomElement
-    QDomDocument account;
-    if (!EvolutionUtil::loadInDomDocument(info, account)) {
-        return;
-    }
-
-    QDomElement domElement = account.documentElement();
-
-    if (domElement.isNull()) {
-        qCDebug(IMPORTWIZARD_LOG) << "Account not found";
-        return;
-    }
-
-    QString name;
-    if (domElement.hasAttribute(QStringLiteral("name"))) {
-        name = domElement.attribute(QStringLiteral("name"));
-    }
-
-    KIdentityManagement::Identity *newIdentity = createIdentity(name);
-
-    const bool enableManualCheck = (domElement.attribute(QStringLiteral("enabled")) == QLatin1String("true"));
-
-    for (QDomElement e = domElement.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
-        const QString tag = e.tagName();
-        if (tag == QLatin1String("identity")) {
-            for (QDomElement identity = e.firstChildElement(); !identity.isNull(); identity = identity.nextSiblingElement()) {
-                const QString identityTag = identity.tagName();
-                if (identityTag == QLatin1String("name")) {
-                    const QString fullName(identity.text());
-                    newIdentity->setIdentityName(fullName);
-                    newIdentity->setFullName(fullName);
-                } else if (identityTag == QLatin1String("addr-spec")) {
-                    newIdentity->setPrimaryEmailAddress(identity.text());
-                } else if (identityTag == QLatin1String("organization")) {
-                    newIdentity->setOrganization(identity.text());
-                } else if (identityTag == QLatin1String("signature")) {
-                    if (identity.hasAttribute("uid")) {
-                        newIdentity->setSignature(mMapSignature.value(identity.attribute(QStringLiteral("uid"))));
-                    }
-                } else if (identityTag == QLatin1String("reply-to")) {
-                    newIdentity->setReplyToAddr(identity.text());
-                } else {
-                    qCDebug(IMPORTWIZARD_LOG) << " tag identity not found :" << identityTag;
-                }
-            }
-        } else if (tag == QLatin1String("source")) {
-            if (e.hasAttribute(QStringLiteral("save-passwd")) && e.attribute(QStringLiteral("save-passwd")) == QLatin1String("true")) {
-                //TODO
-            }
-            int interval = -1;
-            bool intervalCheck = false;
-            if (e.hasAttribute(QStringLiteral("auto-check"))) {
-                intervalCheck = (e.attribute(QStringLiteral("auto-check")) == QLatin1String("true"));
-            }
-            if (e.hasAttribute(QStringLiteral("auto-check-timeout"))) {
-                interval = e.attribute(QStringLiteral("auto-check-timeout")).toInt();
-            }
-            for (QDomElement server = e.firstChildElement(); !server.isNull(); server = server.nextSiblingElement()) {
-                const QString serverTag = server.tagName();
-                if (serverTag == QLatin1String("url")) {
-                    qCDebug(IMPORTWIZARD_LOG) << " server.text() :" << server.text();
-                    QUrl serverUrl(server.text());
-                    const QString scheme = serverUrl.scheme();
-                    QMap<QString, QVariant> settings;
-                    const int port = serverUrl.port();
-
-                    const QString path = serverUrl.path();
-                    qCDebug(IMPORTWIZARD_LOG) << " path !" << path;
-                    const QString userName = serverUrl.userInfo();
-
-                    const QStringList listArgument = path.split(QLatin1Char(';'));
-
-                    //imapx://name@pop3.xx.org:993/;security-method=ssl-on-alternate-port;namespace;shell-command=ssh%20-C%20-l%20%25u%20%25h%20exec%20/usr/sbin/imapd%20;use-shell-command=true
-                    if (scheme == QLatin1String("imap") || scheme == QLatin1String("imapx")) {
-                        if (port > 0) {
-                            settings.insert(QStringLiteral("ImapPort"), port);
-                        }
-                        //Perhaps imapx is specific don't know
-                        if (intervalCheck) {
-                            settings.insert(QStringLiteral("IntervalCheckEnabled"), true);
-                        }
-                        if (interval > -1) {
-                            settings.insert(QStringLiteral("IntervalCheckTime"), interval);
-                        }
-
-                        bool found = false;
-                        const QString securityMethod = getSecurityMethod(listArgument, found);
-                        if (found) {
-                            if (securityMethod == QLatin1String("none")) {
-                                settings.insert(QStringLiteral("Safety"), QStringLiteral("None"));
-                                //Nothing
-                            } else if (securityMethod == QLatin1String("ssl-on-alternate-port")) {
-                                settings.insert(QStringLiteral("Safety"), QStringLiteral("SSL"));
-                            } else {
-                                qCDebug(IMPORTWIZARD_LOG) << " security method unknown : " << path;
-                            }
-                        } else {
-                            settings.insert(QStringLiteral("Safety"), QStringLiteral("STARTTLS"));
-                        }
-
-                        addAuth(settings, QStringLiteral("Authentication"), userName);
-                        const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
-                        //By default
-                        addCheckMailOnStartup(agentIdentifyName, enableManualCheck);
-                        addToManualCheck(agentIdentifyName, enableManualCheck);
-                    } else if (scheme == QLatin1String("pop")) {
-                        if (port > 0) {
-                            settings.insert(QStringLiteral("Port"), port);
-                        }
-                        bool found = false;
-                        const QString securityMethod = getSecurityMethod(listArgument, found);
-                        if (found) {
-                            if (securityMethod == QLatin1String("none")) {
-                                //Nothing
-                            } else if (securityMethod == QLatin1String("ssl-on-alternate-port")) {
-                                settings.insert(QStringLiteral("UseSSL"), true);
-                            } else {
-                                qCDebug(IMPORTWIZARD_LOG) << " security method unknown : " << path;
-                            }
-                        } else {
-                            settings.insert(QStringLiteral("UseTLS"), true);
-                        }
-
-                        if (intervalCheck) {
-                            settings.insert(QStringLiteral("IntervalCheckEnabled"), true);
-                        }
-                        if (interval > -1) {
-                            settings.insert(QStringLiteral("IntervalCheckInterval"), interval);
-                        }
-                        if (e.hasAttribute(QStringLiteral("keep-on-server")) && e.attribute(QStringLiteral("keep-on-server")) == QLatin1String("true")) {
-                            settings.insert(QStringLiteral("LeaveOnServer"), true);
-                        }
-                        addAuth(settings, QStringLiteral("AuthenticationMethod"), userName);
-                        const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
-                        //By default
-                        addCheckMailOnStartup(agentIdentifyName, enableManualCheck);
-                        addToManualCheck(agentIdentifyName, enableManualCheck);
-                    } else if (scheme == QLatin1String("spool") || scheme == QLatin1String("mbox")) {
-                        //mbox file
-                        settings.insert(QStringLiteral("Path"), path);
-                        settings.insert(QStringLiteral("DisplayName"), name);
-                        AbstractBase::createResource(QStringLiteral("akonadi_mbox_resource"), name, settings);
-
-                    } else if (scheme == QLatin1String("maildir") || scheme == QLatin1String("spooldir")) {
-                        settings.insert(QStringLiteral("Path"), path);
-                        AbstractBase::createResource(QStringLiteral("akonadi_maildir_resource"), name, settings);
-                    } else if (scheme == QLatin1String("nntp")) {
-                        //FIXME in the future
-                        qCDebug(IMPORTWIZARD_LOG) << " For the moment we can't import nntp resource";
-                    } else {
-                        qCDebug(IMPORTWIZARD_LOG) << " unknown scheme " << scheme;
-                    }
-                } else {
-                    qCDebug(IMPORTWIZARD_LOG) << " server tag unknown :" << serverTag;
-                }
-            }
-        } else if (tag == QLatin1String("transport")) {
-            if (e.hasAttribute(QStringLiteral("save-passwd")) && e.attribute(QStringLiteral("save-passwd")) == QLatin1String("true")) {
-                //TODO save to kwallet ?
-            }
-
-            MailTransport::Transport *transport = createTransport();
-            transport->setType(MailTransport::Transport::EnumType::SMTP);
-            for (QDomElement smtp = e.firstChildElement(); !smtp.isNull(); smtp = smtp.nextSiblingElement()) {
-                const QString smtpTag = smtp.tagName();
-                if (smtpTag == QLatin1String("url")) {
-                    qCDebug(IMPORTWIZARD_LOG) << " smtp.text() :" << smtp.text();
-                    QUrl smtpUrl(smtp.text());
-                    const QString scheme = smtpUrl.scheme();
-                    if (scheme != QLatin1String("sendmail")) {
-                        transport->setHost(smtpUrl.host());
-                        transport->setName(smtpUrl.host());
-                        //TODO setUserName :
-                        //transport->setRequiresAuthentication(true);
-                        //transport->setUserName(....);
-                        const int port = smtpUrl.port();
-                        if (port > 0) {
-                            transport->setPort(port);
-                        }
-
-                        const QString userName = smtpUrl.userInfo();
-                        bool found = false;
-                        const QString authMethod = getAuthMethod(userName, found);
-                        if (found) {
-                            if (authMethod == QLatin1String("PLAIN")) {
-                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN);
-                            } else if (authMethod == QLatin1String("NTLM")) {
-                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::NTLM);
-                            } else if (authMethod == QLatin1String("DIGEST-MD5")) {
-                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::DIGEST_MD5);
-                            } else if (authMethod == QLatin1String("CRAM-MD5")) {
-                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::CRAM_MD5);
-                            } else if (authMethod == QLatin1String("LOGIN")) {
-                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::LOGIN);
-                            } else if (authMethod == QLatin1String("GSSAPI")) {
-                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::GSSAPI);
-                            } else if (authMethod == QLatin1String("POPB4SMTP")) {
-                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::APOP); //????
-                            } else {
-                                qCDebug(IMPORTWIZARD_LOG) << " smtp auth method unknown " << authMethod;
-                            }
-                        }
-
-                        const QString path = smtpUrl.path();
-                        found = false;
-                        const QStringList listArgument = path.split(QLatin1Char(';'));
-                        const QString securityMethod = getSecurityMethod(listArgument, found);
-                        if (found) {
-                            if (securityMethod == QLatin1String("none")) {
-                                transport->setEncryption(MailTransport::Transport::EnumEncryption::None);
-
-                            } else if (securityMethod == QLatin1String("ssl-on-alternate-port")) {
-                                transport->setEncryption(MailTransport::Transport::EnumEncryption::SSL);
-                            } else {
-                                qCDebug(IMPORTWIZARD_LOG) << " security method unknown : " << path;
-                            }
-                        } else {
-                            transport->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
-                        }
-                    }
-                } else {
-                    qCDebug(IMPORTWIZARD_LOG) << " smtp tag unknown :" << smtpTag;
-                }
-            }
-            storeTransport(transport, true);
-        } else if (tag == QLatin1String("drafts-folder")) {
-            const QString selectedFolder = MailCommon::Util::convertFolderPathToCollectionStr(e.text().remove(QStringLiteral("folder://")));
-            newIdentity->setDrafts(selectedFolder);
-        } else if (tag == QLatin1String("sent-folder")) {
-            const QString selectedFolder = MailCommon::Util::convertFolderPathToCollectionStr(e.text().remove(QStringLiteral("folder://")));
-            newIdentity->setFcc(selectedFolder);
-        } else if (tag == QLatin1String("auto-cc")) {
-            if (e.hasAttribute(QStringLiteral("always")) && (e.attribute(QStringLiteral("always")) == QLatin1String("true"))) {
-                QDomElement recipient = e.firstChildElement();
-                const QString text = recipient.text();
-                newIdentity->setCc(text);
-            }
-        } else if (tag == QLatin1String("reply-to")) {
-            newIdentity->setReplyToAddr(e.text());
-        } else if (tag == QLatin1String("auto-bcc")) {
-            if (e.hasAttribute(QStringLiteral("always")) && (e.attribute(QStringLiteral("always")) == QLatin1String("true"))) {
-                QDomElement recipient = e.firstChildElement();
-                const QString text = recipient.text();
-                newIdentity->setBcc(text);
-            }
-        } else if (tag == QLatin1String("receipt-policy")) {
-            if (e.hasAttribute(QStringLiteral("policy"))) {
-                const QString policy = e.attribute(QStringLiteral("policy"));
-                //TODO
-            }
-        } else if (tag == QLatin1String("pgp")) {
-            if (e.hasAttribute(QStringLiteral("encrypt-to-self")) &&
-                    (e.attribute(QStringLiteral("encrypt-to-self")) == QLatin1String("true"))) {
-                //TODO
-            }
-            if (e.hasAttribute(QStringLiteral("always-trust")) &&
-                    (e.attribute(QStringLiteral("always-trust")) == QLatin1String("true"))) {
-                //TODO
-            }
-            if (e.hasAttribute(QStringLiteral("always-sign")) &&
-                    (e.attribute(QStringLiteral("always-sign")) == QLatin1String("true"))) {
-                //TODO
-            }
-            if (e.hasAttribute(QStringLiteral("no-imip-sign")) &&
-                    (e.attribute(QStringLiteral("no-imip-sign")) == QLatin1String("true"))) {
-                //TODO
-            }
-        } else if (tag == QLatin1String("smime")) {
-            if (e.hasAttribute(QStringLiteral("sign-default")) &&
-                    (e.attribute(QStringLiteral("sign-default")) == QLatin1String("true"))) {
-                //TODO
-            }
-            if (e.hasAttribute(QStringLiteral("encrypt-default")) &&
-                    (e.attribute(QStringLiteral("encrypt-default")) == QLatin1String("true"))) {
-                //TODO
-            }
-            if (e.hasAttribute(QStringLiteral("encrypt-to-self")) &&
-                    (e.attribute(QStringLiteral("encrypt-to-self")) == QLatin1String("true"))) {
-                //TODO
-            }
-            //TODO
-        } else {
-            qCDebug(IMPORTWIZARD_LOG) << " tag not know :" << tag;
-        }
-
-    }
-    storeIdentity(newIdentity);
-}
-
-QString EvolutionSettings::getSecurityMethod(const QStringList &listArgument, bool &found)
-{
-    found = false;
-    if (listArgument.isEmpty()) {
-        return QString();
-    }
-    for (const QString &str : listArgument) {
-        if (str.contains(QStringLiteral("security-method="))) {
-            const int index = str.indexOf(QLatin1String("security-method="));
-            if (index != -1) {
-                const QString securityMethod = str.right(str.length() - index - 16 /*security-method=*/);
-                found = true;
-                return securityMethod;
-            }
-        }
-    }
-    return QString();
-}
-
-QString EvolutionSettings::getAuthMethod(const QString &path, bool &found)
-{
-    const int index = path.indexOf(QLatin1String("auth="));
-    if (index != -1) {
-        const QString securityMethod = path.right(path.length() - index - 5 /*auth=*/);
-        found = true;
-        return securityMethod;
-    }
-    found = false;
-    return QString();
-}
-
-void EvolutionSettings::addAuth(QMap<QString, QVariant> &settings, const QString &argument, const QString &userName)
-{
-    bool found = false;
-    const QString authMethod = getAuthMethod(userName, found);
-    if (found) {
-        if (authMethod == QLatin1String("PLAIN")) {
-            settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::PLAIN);
-        } else if (authMethod == QLatin1String("NTLM")) {
-            settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::NTLM);
-        } else if (authMethod == QLatin1String("DIGEST-MD5")) {
-            settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::DIGEST_MD5);
-        } else if (authMethod == QLatin1String("CRAM-MD5")) {
-            settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::CRAM_MD5);
-        } else if (authMethod == QLatin1String("LOGIN")) {
-            settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::LOGIN);
-        } else if (authMethod == QLatin1String("POPB4SMTP")) {
-            settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::APOP);   //????
-        } else {
-            qCDebug(IMPORTWIZARD_LOG) << " smtp auth method unknown " << authMethod;
-        }
-    }
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionsettings.h akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionsettings.h
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionsettings.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionsettings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef EVOLUTIONSETTINGS_H
-#define EVOLUTIONSETTINGS_H
-
-#include "abstractsettings.h"
-#include <KIdentityManagement/kidentitymanagement/signature.h>
-#include <QString>
-
-class ImportWizard;
-class QDomElement;
-
-class EvolutionSettings : public AbstractSettings
-{
-public:
-    explicit EvolutionSettings(ImportWizard *parent);
-    ~EvolutionSettings();
-    void loadAccount(const QString &filename);
-    void loadLdap(const QString &filename);
-private:
-    void readAccount(const QDomElement &account);
-    void readLdap(const QString &account);
-    void extractAccountInfo(const QString &info);
-    void readSignatures(const QDomElement &account);
-    void extractSignatureInfo(const QString &info);
-    QString getSecurityMethod(const QStringList &listArgument, bool &found);
-    QString getAuthMethod(const QString &path, bool &found);
-    void addAuth(QMap<QString, QVariant> &settings, const QString &argument, const QString &userName);
-
-    QMap<QString, KIdentityManagement::Signature> mMapSignature;
-};
-
-#endif /* EVOLUTIONSETTINGS_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionutil.cpp akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionutil.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionutil.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionutil.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "evolutionutil.h"
-
-#include "importwizard_debug.h"
-
-#include <QDomDocument>
-#include <QFile>
-
-bool EvolutionUtil::loadInDomDocument(QFile *file, QDomDocument &doc)
-{
-    QString errorMsg;
-    int errorRow;
-    int errorCol;
-    if (!doc.setContent(file, &errorMsg, &errorRow, &errorCol)) {
-        qCDebug(IMPORTWIZARD_LOG) << "Unable to load document.Parse error in line " << errorRow
-                                  << ", col " << errorCol << ": " << errorMsg;
-        return false;
-    }
-    return true;
-}
-
-bool EvolutionUtil::loadInDomDocument(const QString &file, QDomDocument &doc)
-{
-    QString errorMsg;
-    int errorRow;
-    int errorCol;
-    if (!doc.setContent(file, &errorMsg, &errorRow, &errorCol)) {
-        qCDebug(IMPORTWIZARD_LOG) << "Unable to load document.Parse error in line " << errorRow
-                                  << ", col " << errorCol << ": " << errorMsg;
-        return false;
-    }
-    return true;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionutil.h akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionutil.h
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionutil.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionutil.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef EVOLUTIONUTIL_H
-#define EVOLUTIONUTIL_H
-#include <QString>
-class QFile;
-class QDomDocument;
-
-namespace EvolutionUtil
-{
-bool loadInDomDocument(QFile *file, QDomDocument &doc);
-bool loadInDomDocument(const QString &file, QDomDocument &doc);
-}
-
-#endif // EVOLUTIONUTIL_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionv3importdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionv3importdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionv3importdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionv3importdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,125 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "evolutionv3importdata.h"
-#include "evolutionsettings.h"
-#include "evolutioncalendar.h"
-#include "evolutionaddressbook.h"
-#include "mailimporter/filterevolution_v3.h"
-#include "mailimporter/filterinfo.h"
-#include "importfilterinfogui.h"
-#include "MailCommon/FilterImporterExporter"
-
-#include "importwizard.h"
-
-#include <KLocalizedString>
-
-#include <QDir>
-
-Evolutionv3ImportData::Evolutionv3ImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = MailImporter::FilterEvolution_v3::defaultSettingsPath();
-}
-
-Evolutionv3ImportData::~Evolutionv3ImportData()
-{
-}
-
-bool Evolutionv3ImportData::foundMailer() const
-{
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-    return false;
-}
-
-QString Evolutionv3ImportData::name() const
-{
-    return QStringLiteral("Evolution 3.x");
-}
-
-bool Evolutionv3ImportData::importSettings()
-{
-    const QString accountFile = QDir::homePath() + QLatin1String("/.gconf/apps/evolution/mail/%gconf.xml");
-    if (QFileInfo::exists(accountFile)) {
-        EvolutionSettings account(mImportWizard);
-        account.loadAccount(accountFile);
-        const QString ldapFile = QDir::homePath() + QLatin1String("/.gconf/apps/evolution/addressbook/%gconf.xml");
-        if (QFileInfo::exists(ldapFile)) {
-            account.loadLdap(ldapFile);
-        }
-    } else {
-        addImportSettingsInfo(i18n("Evolution settings not found."));
-    }
-    return true;
-}
-
-bool Evolutionv3ImportData::importMails()
-{
-    MailImporter::FilterEvolution_v3 evolution;
-    initializeFilter(evolution);
-    evolution.filterInfo()->setStatusMessage(i18n("Import in progress"));
-    const QString mailsPath = mPath;
-    QDir directory(mailsPath);
-    if (directory.exists()) {
-        evolution.importMails(mailsPath);
-    } else {
-        evolution.import();
-    }
-    evolution.filterInfo()->setStatusMessage(i18n("Import finished"));
-    return true;
-}
-
-bool Evolutionv3ImportData::importFilters()
-{
-    const QString filterPath = QDir::homePath() + QLatin1String("/.config/evolution/mail/filter.xml");
-    return addFilters(filterPath, MailCommon::FilterImporterExporter::EvolutionFilter);
-}
-
-bool Evolutionv3ImportData::importAddressBook()
-{
-    EvolutionAddressBook addressbook(mImportWizard);
-    addressbook.exportEvolutionAddressBook();
-    return true;
-}
-
-bool Evolutionv3ImportData::importCalendar()
-{
-    const QString calendarFile = QDir::homePath() + QLatin1String("/.gconf/apps/evolution/calendar/%gconf.xml");
-    if (QFileInfo::exists(calendarFile)) {
-        EvolutionCalendar calendar(mImportWizard);
-        calendar.loadCalendar(calendarFile);
-    } else {
-        addImportCalendarInfo(i18n("Evolution calendar not found."));
-    }
-    return true;
-}
-
-AbstractImporter::TypeSupportedOptions Evolutionv3ImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    options |= AbstractImporter::Filters;
-    options |= AbstractImporter::Settings;
-    options |= AbstractImporter::Calendars;
-    options |= AbstractImporter::AddressBooks;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionv3importdata.h akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionv3importdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/evolutionv3/evolutionv3importdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/evolutionv3/evolutionv3importdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef Evolutionv3ImportData_H
-#define Evolutionv3ImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class Evolutionv3ImportData : public AbstractImporter
-{
-public:
-    explicit Evolutionv3ImportData(ImportWizard *parent);
-    ~Evolutionv3ImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importSettings() Q_DECL_OVERRIDE;
-    bool importMails() Q_DECL_OVERRIDE;
-    bool importFilters() Q_DECL_OVERRIDE;
-    bool importAddressBook() Q_DECL_OVERRIDE;
-    bool importCalendar() Q_DECL_OVERRIDE;
-
-    QString name() const Q_DECL_OVERRIDE;
-};
-
-#endif /* Evolutionv3ImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/geary/gearyaddressbook.cpp akonadi-import-wizard-17.08.3/src/autodetect/geary/gearyaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/geary/gearyaddressbook.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/geary/gearyaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
-   Copyright (C) 2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "gearyaddressbook.h"
-#include <KContacts/Addressee>
-
-#include <QUrl>
-
-#include <QSettings>
-
-GearyAddressBook::GearyAddressBook(const QString &filename, ImportWizard *parent)
-    : AbstractAddressBook(parent)
-{
-}
-
-GearyAddressBook::~GearyAddressBook()
-{
-}
-
-void GearyAddressBook::importAddressBook()
-{
-
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/geary/gearyaddressbook.h akonadi-import-wizard-17.08.3/src/autodetect/geary/gearyaddressbook.h
--- akonadi-import-wizard-17.04.3/src/autodetect/geary/gearyaddressbook.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/geary/gearyaddressbook.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-/*
-   Copyright (C) 2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef GearyAddressBook_H
-#define GearyAddressBook_H
-
-#include "abstractaddressbook.h"
-#include <QHash>
-class QSettings;
-
-class ImportWizard;
-
-class GearyAddressBook : public AbstractAddressBook
-{
-public:
-    explicit GearyAddressBook(const QString &filename, ImportWizard *parent);
-    ~GearyAddressBook();
-    void importAddressBook();
-};
-
-#endif /* GearyAddressBook_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/geary/gearyimportdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/geary/gearyimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/geary/gearyimportdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/geary/gearyimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/*
-   Copyright (C) 2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "geary/gearyimportdata.h"
-#include "geary/gearysettings.h"
-#include "geary/gearyaddressbook.h"
-#include "mailimporter/filterinfo.h"
-#include "mailimporter/othermailerutil.h"
-#include "importfilterinfogui.h"
-#include "importwizard.h"
-#include "importwizard_debug.h"
-
-#include <QDir>
-
-GearyImportData::GearyImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = MailImporter::OtherMailerUtil::gearyDefaultPath();
-}
-
-GearyImportData::~GearyImportData()
-{
-}
-
-bool GearyImportData::foundMailer() const
-{
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-    return false;
-}
-
-QString GearyImportData::name() const
-{
-    return QStringLiteral("Geary");
-}
-
-bool GearyImportData::importMails()
-{
-    return false;
-}
-
-bool GearyImportData::importSettings()
-{
-    QDir directory(mPath);
-    const QStringList lstDir = directory.entryList(QDir::AllDirs);
-    qCDebug(IMPORTWIZARD_LOG) << "Number of directory " << lstDir.count();
-    const QString configName = QStringLiteral("geary.ini");
-    for (int i = 0; i < lstDir.count(); ++i) {
-        const QString fullPath = lstDir.at(i) + QDir::separator() + configName;
-        if (QFileInfo::exists(fullPath)) {
-            GearySettings setting(fullPath, mImportWizard);
-            setting.importSettings();
-        }
-    }
-    return true;
-}
-
-bool GearyImportData::importAddressBook()
-{
-    return false;
-}
-
-AbstractImporter::TypeSupportedOptions GearyImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    //options |=AbstractImporter::Mails;
-    options |= AbstractImporter::Settings;
-    //options |= AbstractImporter::AddressBooks;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/geary/gearyimportdata.h akonadi-import-wizard-17.08.3/src/autodetect/geary/gearyimportdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/geary/gearyimportdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/geary/gearyimportdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
-   Copyright (C) 2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef GearyImportData_H
-#define GearyImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class GearyImportData : public AbstractImporter
-{
-public:
-    explicit GearyImportData(ImportWizard *parent);
-    ~GearyImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importMails() Q_DECL_OVERRIDE;
-    bool importSettings() Q_DECL_OVERRIDE;
-    bool importAddressBook() Q_DECL_OVERRIDE;
-
-    QString name() const Q_DECL_OVERRIDE;
-
-};
-
-#endif /* TrojiraImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/geary/gearysettings.cpp akonadi-import-wizard-17.08.3/src/autodetect/geary/gearysettings.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/geary/gearysettings.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/geary/gearysettings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,177 +0,0 @@
-/*
-   Copyright (C) 2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "gearysettings.h"
-#include "importwizardutil.h"
-
-#include <mailtransport/transportmanager.h>
-
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/signature.h>
-
-#include "importwizard_debug.h"
-
-#include <QSettings>
-
-GearySettings::GearySettings(const QString &filename, ImportWizard *parent)
-    : AbstractSettings(parent)
-{
-    settings = new QSettings(filename, QSettings::IniFormat, this);
-}
-
-GearySettings::~GearySettings()
-{
-    delete settings;
-}
-
-void GearySettings::importSettings()
-{
-    readImapAccount();
-    readTransport();
-    readIdentity();
-    readGlobalSettings();
-}
-
-void GearySettings::readImapAccount()
-{
-    QMap<QString, QVariant> newSettings;
-
-    QString name;
-
-    name = settings->value(QStringLiteral("imap_host")).toString();
-    if (!name.isEmpty()) {
-        newSettings.insert(QStringLiteral("ImapServer"), name);
-    }
-
-    const int port = settings->value(QStringLiteral("imap_port"), -1).toInt();
-    if (port > -1) {
-        newSettings.insert(QStringLiteral("ImapPort"), port);
-    }
-
-    if (settings->contains(QStringLiteral("imap_starttls"))) {
-        const bool useTLS = settings->value(QStringLiteral("imap_starttls")).toBool();
-        if (useTLS) {
-            newSettings.insert(QStringLiteral("Safety"), QStringLiteral("STARTTLS"));
-        }
-    }
-
-    const QString userName = settings->value(QStringLiteral("imap_username")).toString();
-    if (!userName.isEmpty()) {
-        newSettings.insert(QStringLiteral("Username"), userName);
-    }
-
-    if (!name.isEmpty()) {
-        const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, newSettings);
-        //Check by default
-        addCheckMailOnStartup(agentIdentifyName, true);
-    }
-}
-
-void GearySettings::readTransport()
-{
-    const QString host = settings->value(QStringLiteral("smtp_host")).toString();
-    if (!host.isEmpty()) {
-        MailTransport::Transport *mt = createTransport();
-        mt->setType(MailTransport::Transport::EnumType::SMTP);
-        mt->setHost(host);
-        const int port = settings->value(QStringLiteral("msa.smtp.port"), -1).toInt();
-        if (port != -1) {
-            mt->setPort(port);
-        }
-        //ADD more settings
-        storeTransport(mt, true);   //only one smtp for the moment
-    }
-#if 0
-    smtp_host=smtp.bla.bla
-    smtp_port=465
-    smtp_ssl=true
-    smtp_starttls=false
-    smtp_use_imap_credentials=false
-    smtp_noauth=true
-#endif
-#if 0
-    const QString smtpMethod = settings->value(QStringLiteral("msa.method")).toString();
-    if (!smtpMethod.isEmpty()) {
-        MailTransport::Transport *mt = createTransport();
-        if (smtpMethod == QLatin1String("IMAP-SENDMAIL")) {
-            //see http://tools.ietf.org/html/draft-kundrat-imap-submit-01
-        } else if (smtpMethod == QLatin1String("SMTP") || smtpMethod == QLatin1String("SSMTP")) {
-            if (settings->contains(QStringLiteral("msa.smtp.host"))) {
-                mt->setHost(settings->value(QStringLiteral("msa.smtp.host")).toString());
-            }
-            if (settings->contains(QStringLiteral("msa.smtp.port"))) {
-                mt->setPort(settings->value(QStringLiteral("msa.smtp.port")).toInt());
-            }
-            if (settings->contains(QStringLiteral("msa.smtp.auth"))) {
-                if (settings->value(QStringLiteral("msa.smtp.auth")).toBool()) {
-                    if (settings->contains(QStringLiteral("msa.smtp.auth.user"))) {
-                        mt->setUserName(settings->value(QStringLiteral("msa.smtp.auth.user")).toString());
-                    }
-                    if (settings->contains(QStringLiteral("msa.smtp.auth.pass"))) {
-                        mt->setPassword(settings->value(QStringLiteral("msa.smtp.auth.pass")).toString());
-                    }
-                }
-            }
-
-            if (settings->contains(QStringLiteral("msa.smtp.starttls"))) {
-                if (settings->value(QStringLiteral("msa.smtp.starttls")).toBool()) {
-                    mt->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
-                }
-            }
-            mt->setType(MailTransport::Transport::EnumType::SMTP);
-        } else {
-            qCWarning(IMPORTWIZARD_LOG) << " smtpMethod unknown " << smtpMethod;
-        }
-        storeTransport(mt, true);   //only one smtp for the moment
-    }
-#endif
-}
-
-void GearySettings::readIdentity()
-{
-    QString realName = settings->value(QStringLiteral("realName")).toString();
-    if (!realName.isEmpty()) {
-        KIdentityManagement::Identity *identity  = createIdentity(realName);
-        identity->setFullName(realName);
-        identity->setIdentityName(realName);
-        const QString address = settings->value(QStringLiteral("primary_email")).toString();
-        identity->setPrimaryEmailAddress(address);
-        const QString alias = settings->value(QStringLiteral("alternate_emails")).toString();
-        if (!alias.isEmpty()) {
-            identity->setEmailAliases(alias.split(QLatin1Char(';'), QString::SkipEmptyParts));
-        }
-        const QString signatureStr = settings->value(QStringLiteral("email_signature")).toString();
-        if (!signatureStr.isEmpty()) {
-            KIdentityManagement::Signature signature;
-            signature.setType(KIdentityManagement::Signature::Inlined);
-            signature.setText(signatureStr);
-            const bool useSignature = settings->value(QStringLiteral("use_email_signature"), true).toBool();
-            signature.setEnabledSignature(useSignature);
-            identity->setSignature(signature);
-        }
-
-        //TODO add "nickname=bli@kde.org"
-        storeIdentity(identity);
-    }
-}
-
-void GearySettings::readGlobalSettings()
-{
-    //TODO
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/geary/gearysettings.h akonadi-import-wizard-17.08.3/src/autodetect/geary/gearysettings.h
--- akonadi-import-wizard-17.04.3/src/autodetect/geary/gearysettings.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/geary/gearysettings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
-   Copyright (C) 2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef GearySettings_H
-#define GearySettings_H
-
-#include "abstractsettings.h"
-
-class ImportWizard;
-class QSettings;
-
-class GearySettings : public AbstractSettings
-{
-public:
-    explicit GearySettings(const QString &filename, ImportWizard *parent);
-    ~GearySettings();
-    void importSettings();
-private:
-    void readImapAccount();
-    void readIdentity();
-    void readGlobalSettings();
-    void readTransport();
-    QSettings *settings;
-};
-
-#endif // ClawsMailSettings_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/icedove/icedoveimportdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/icedove/icedoveimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/icedove/icedoveimportdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/icedove/icedoveimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "icedoveimportdata.h"
-#include "importfilterinfogui.h"
-#include "thunderbird/thunderbirdsettings.h"
-#include "thunderbird/thunderbirdaddressbook.h"
-
-#include "mailimporter/filtericedove.h"
-#include "mailimporter/filterinfo.h"
-#include "MailCommon/FilterImporterExporter"
-#include "importwizard.h"
-
-#include <KLocalizedString>
-#include <KConfig>
-
-#include <QDir>
-
-IcedoveImportData::IcedoveImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = MailImporter::FilterIcedove::defaultSettingsPath();
-}
-
-IcedoveImportData::~IcedoveImportData()
-{
-}
-
-QString IcedoveImportData::defaultProfile()
-{
-    if (mDefaultProfile.isEmpty()) {
-        mDefaultProfile = MailImporter::FilterThunderbird::defaultProfile(mPath, mImportWizard);
-    }
-    return mDefaultProfile;
-}
-
-bool IcedoveImportData::foundMailer() const
-{
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-    return false;
-}
-
-bool IcedoveImportData::importAddressBook()
-{
-    const QDir addressbookDir(mPath + defaultProfile());
-    ThunderBirdAddressBook account(addressbookDir, mImportWizard);
-    account.importAddressBook();
-    return true;
-}
-
-QString IcedoveImportData::name() const
-{
-    return QStringLiteral("Icedove");
-}
-
-bool IcedoveImportData::importSettings()
-{
-    const QString accountFile = mPath + defaultProfile() + QLatin1String("/prefs.js");
-    if (QFileInfo::exists(accountFile)) {
-        ThunderbirdSettings account(accountFile, mImportWizard);
-        account.importSettings();
-    } else {
-        addImportSettingsInfo(i18n("Thunderbird settings not found."));
-    }
-    return true;
-}
-
-bool IcedoveImportData::importMails()
-{
-    //* This should be usually ~/.icedove/xxxx.default/Mail/Local Folders/
-    MailImporter::FilterThunderbird thunderbird;
-    initializeFilter(thunderbird);
-    thunderbird.filterInfo()->setStatusMessage(i18n("Import in progress"));
-    const QString mailsPath = mPath + defaultProfile() + QLatin1String("/Mail/Local Folders/");
-    QDir directory(mailsPath);
-    if (directory.exists()) {
-        thunderbird.importMails(mailsPath);
-    } else {
-        thunderbird.import();
-    }
-    thunderbird.filterInfo()->setStatusMessage(i18n("Import finished"));
-    return true;
-}
-
-bool IcedoveImportData::importFilters()
-{
-    const QString path(mPath + defaultProfile());
-    QDir dir(path);
-    bool filtersAdded = false;
-    const QStringList subDir = dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
-    if (subDir.isEmpty()) {
-        return true;
-    }
-
-    for (const QString &mailPath : subDir) {
-        const QString subMailPath(path + QLatin1Char('/') + mailPath);
-        QDir dirMail(subMailPath);
-        const QStringList subDirMail = dirMail.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
-        bool foundFilterFile = false;
-        for (const QString &file : subDirMail) {
-            const QString filterFile(subMailPath + QLatin1Char('/') + file + QLatin1String("/msgFilterRules.dat"));
-            if (QFileInfo::exists(filterFile)) {
-                foundFilterFile = true;
-                const bool added = addFilters(filterFile, MailCommon::FilterImporterExporter::ThunderBirdFilter);
-                if (!filtersAdded && added) {
-                    filtersAdded = true;
-                }
-            }
-        }
-        if (!foundFilterFile) {
-            return true;
-        }
-    }
-    return filtersAdded;
-}
-
-AbstractImporter::TypeSupportedOptions IcedoveImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    options |= AbstractImporter::Filters;
-    options |= AbstractImporter::Settings;
-    options |= AbstractImporter::AddressBooks;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/icedove/icedoveimportdata.h akonadi-import-wizard-17.08.3/src/autodetect/icedove/icedoveimportdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/icedove/icedoveimportdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/icedove/icedoveimportdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef IcedoveImportData_H
-#define IcedoveImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class IcedoveImportData : public AbstractImporter
-{
-public:
-    explicit IcedoveImportData(ImportWizard *parent);
-    ~IcedoveImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importSettings() Q_DECL_OVERRIDE;
-    bool importMails() Q_DECL_OVERRIDE;
-    bool importFilters() Q_DECL_OVERRIDE;
-    bool importAddressBook() Q_DECL_OVERRIDE;
-    QString name() const Q_DECL_OVERRIDE;
-private:
-    QString defaultProfile();
-
-    QString mDefaultProfile;
-};
-
-#endif /* IcedoveImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importaddressbookpage.cpp akonadi-import-wizard-17.08.3/src/autodetect/importaddressbookpage.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/importaddressbookpage.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importaddressbookpage.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -20,9 +20,9 @@
 #include "importaddressbookpage.h"
 #include "ui_importaddressbookpage.h"
 
-ImportAddressbookPage::ImportAddressbookPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::ImportAddressbookPage)
+ImportAddressbookPage::ImportAddressbookPage(QWidget *parent)
+    : QWidget(parent)
+    , ui(new Ui::ImportAddressbookPage)
 {
     ui->setupUi(this);
     connect(ui->importAddressBook, &QPushButton::clicked, this, &ImportAddressbookPage::importAddressbookClicked);
@@ -47,4 +47,3 @@
 {
     ui->importAddressBook->setEnabled(enabled);
 }
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importaddressbookpage.h akonadi-import-wizard-17.08.3/src/autodetect/importaddressbookpage.h
--- akonadi-import-wizard-17.04.3/src/autodetect/importaddressbookpage.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importaddressbookpage.h	2017-10-29 07:12:25.000000000 +0000
@@ -22,8 +22,7 @@
 
 #include <QWidget>
 
-namespace Ui
-{
+namespace Ui {
 class ImportAddressbookPage;
 }
 
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importcalendarpage.cpp akonadi-import-wizard-17.08.3/src/autodetect/importcalendarpage.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/importcalendarpage.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importcalendarpage.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -20,9 +20,9 @@
 #include "importcalendarpage.h"
 #include "ui_importcalendarpage.h"
 
-ImportCalendarPage::ImportCalendarPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::ImportCalendarPage)
+ImportCalendarPage::ImportCalendarPage(QWidget *parent)
+    : QWidget(parent)
+    , ui(new Ui::ImportCalendarPage)
 {
     ui->setupUi(this);
     connect(ui->importCalendar, &QPushButton::clicked, this, &ImportCalendarPage::importCalendarClicked);
@@ -47,4 +47,3 @@
 {
     ui->importCalendar->setEnabled(enabled);
 }
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importcalendarpage.h akonadi-import-wizard-17.08.3/src/autodetect/importcalendarpage.h
--- akonadi-import-wizard-17.04.3/src/autodetect/importcalendarpage.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importcalendarpage.h	2017-10-29 07:12:25.000000000 +0000
@@ -22,8 +22,7 @@
 
 #include <QWidget>
 
-namespace Ui
-{
+namespace Ui {
 class ImportCalendarPage;
 }
 
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importfilterinfogui.cpp akonadi-import-wizard-17.08.3/src/autodetect/importfilterinfogui.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/importfilterinfogui.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importfilterinfogui.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -28,8 +28,8 @@
 #include <QListWidgetItem>
 
 ImportFilterInfoGui::ImportFilterInfoGui(ImportMailPage *parent)
-    : MailImporter::FilterInfoGui(),
-      m_parent(parent)
+    : MailImporter::FilterInfoGui()
+    , m_parent(parent)
 {
 }
 
@@ -58,13 +58,13 @@
     qApp->processEvents();
 }
 
-void  ImportFilterInfoGui::setCurrent(int percent)
+void ImportFilterInfoGui::setCurrent(int percent)
 {
     m_parent->mailWidget()->setCurrent(percent);
     qApp->processEvents(); // Be careful - back & finish buttons disabled, so only user event that can happen is cancel/close button
 }
 
-void  ImportFilterInfoGui::setOverall(int percent)
+void ImportFilterInfoGui::setOverall(int percent)
 {
     m_parent->mailWidget()->setOverall(percent);
 }
@@ -101,4 +101,3 @@
 {
     return m_parent;
 }
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importfilterinfogui.h akonadi-import-wizard-17.08.3/src/autodetect/importfilterinfogui.h
--- akonadi-import-wizard-17.04.3/src/autodetect/importfilterinfogui.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importfilterinfogui.h	2017-10-29 07:12:25.000000000 +0000
@@ -29,21 +29,20 @@
     explicit ImportFilterInfoGui(ImportMailPage *parent);
     ~ImportFilterInfoGui();
 
-    void setStatusMessage(const QString &status) Q_DECL_OVERRIDE;
-    void setFrom(const QString &from) Q_DECL_OVERRIDE;
-    void setTo(const QString &to) Q_DECL_OVERRIDE;
-    void setCurrent(const QString &current) Q_DECL_OVERRIDE;
-    void setCurrent(int percent = 0) Q_DECL_OVERRIDE;
-    void setOverall(int percent = 0) Q_DECL_OVERRIDE;
-    void addErrorLogEntry(const QString &log) Q_DECL_OVERRIDE;
-    void addInfoLogEntry(const QString &log) Q_DECL_OVERRIDE;
-    void clear() Q_DECL_OVERRIDE;
-    void alert(const QString &message) Q_DECL_OVERRIDE;
-    QWidget *parent() const  Q_DECL_OVERRIDE;
+    void setStatusMessage(const QString &status) override;
+    void setFrom(const QString &from) override;
+    void setTo(const QString &to) override;
+    void setCurrent(const QString &current) override;
+    void setCurrent(int percent = 0) override;
+    void setOverall(int percent = 0) override;
+    void addErrorLogEntry(const QString &log) override;
+    void addInfoLogEntry(const QString &log) override;
+    void clear() override;
+    void alert(const QString &message) override;
+    QWidget *parent() const override;
 
 private:
     ImportMailPage *m_parent;
 };
 
 #endif /* IMPORTFILTERINFOGUI_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importfilterpage.cpp akonadi-import-wizard-17.08.3/src/autodetect/importfilterpage.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/importfilterpage.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importfilterpage.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -19,9 +19,9 @@
 #include "importfilterpage.h"
 #include "ui_importfilterpage.h"
 
-ImportFilterPage::ImportFilterPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::ImportFilterPage)
+ImportFilterPage::ImportFilterPage(QWidget *parent)
+    : QWidget(parent)
+    , ui(new Ui::ImportFilterPage)
 {
     ui->setupUi(this);
     connect(ui->importFilters, &QPushButton::clicked, this, &ImportFilterPage::importFiltersClicked);
@@ -46,4 +46,3 @@
 {
     ui->importFilters->setEnabled(enabled);
 }
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importfilterpage.h akonadi-import-wizard-17.08.3/src/autodetect/importfilterpage.h
--- akonadi-import-wizard-17.04.3/src/autodetect/importfilterpage.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importfilterpage.h	2017-10-29 07:12:25.000000000 +0000
@@ -22,8 +22,7 @@
 
 #include <QWidget>
 
-namespace Ui
-{
+namespace Ui {
 class ImportFilterPage;
 }
 
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importfinishpage.cpp akonadi-import-wizard-17.08.3/src/autodetect/importfinishpage.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/importfinishpage.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importfinishpage.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -20,9 +20,9 @@
 #include "importfinishpage.h"
 #include "ui_importfinishpage.h"
 
-ImportFinishPage::ImportFinishPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::ImportFinishPage)
+ImportFinishPage::ImportFinishPage(QWidget *parent)
+    : QWidget(parent)
+    , ui(new Ui::ImportFinishPage)
 {
     ui->setupUi(this);
 }
@@ -41,4 +41,3 @@
 {
     ui->logFinish->addErrorLogEntry(log);
 }
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importfinishpage.h akonadi-import-wizard-17.08.3/src/autodetect/importfinishpage.h
--- akonadi-import-wizard-17.04.3/src/autodetect/importfinishpage.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importfinishpage.h	2017-10-29 07:12:25.000000000 +0000
@@ -21,8 +21,7 @@
 
 #include <QWidget>
 
-namespace Ui
-{
+namespace Ui {
 class ImportFinishPage;
 }
 
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importmailpage.cpp akonadi-import-wizard-17.08.3/src/autodetect/importmailpage.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/importmailpage.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importmailpage.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -20,9 +20,9 @@
 #include "importmailpage.h"
 #include "ui_importmailpage.h"
 
-ImportMailPage::ImportMailPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::ImportMailPage)
+ImportMailPage::ImportMailPage(QWidget *parent)
+    : QWidget(parent)
+    , ui(new Ui::ImportMailPage)
 {
     ui->setupUi(this);
     connect(ui->importMails, &QPushButton::clicked, this, &ImportMailPage::importMailsClicked);
@@ -53,4 +53,3 @@
 {
     ui->importMails->setEnabled(enabled);
 }
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importmailpage.h akonadi-import-wizard-17.08.3/src/autodetect/importmailpage.h
--- akonadi-import-wizard-17.04.3/src/autodetect/importmailpage.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importmailpage.h	2017-10-29 07:12:25.000000000 +0000
@@ -22,18 +22,15 @@
 
 #include <QWidget>
 
-namespace Ui
-{
+namespace Ui {
 class ImportMailPage;
 }
 
-namespace Akonadi
-{
+namespace Akonadi {
 class Collection;
 }
 
-namespace MailImporter
-{
+namespace MailImporter {
 class ImportMailsWidget;
 }
 
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importsettingpage.cpp akonadi-import-wizard-17.08.3/src/autodetect/importsettingpage.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/importsettingpage.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importsettingpage.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -20,9 +20,9 @@
 #include "importsettingpage.h"
 #include "ui_importsettingpage.h"
 
-ImportSettingPage::ImportSettingPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::ImportSettingPage)
+ImportSettingPage::ImportSettingPage(QWidget *parent)
+    : QWidget(parent)
+    , ui(new Ui::ImportSettingPage)
 {
     ui->setupUi(this);
     connect(ui->importSettings, &QPushButton::clicked, this, &ImportSettingPage::importSettingsClicked);
@@ -47,4 +47,3 @@
 {
     ui->importSettings->setEnabled(enabled);
 }
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importsettingpage.h akonadi-import-wizard-17.08.3/src/autodetect/importsettingpage.h
--- akonadi-import-wizard-17.04.3/src/autodetect/importsettingpage.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importsettingpage.h	2017-10-29 07:12:25.000000000 +0000
@@ -22,8 +22,7 @@
 
 #include <QWidget>
 
-namespace Ui
-{
+namespace Ui {
 class ImportSettingPage;
 }
 
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importwizardutil.cpp akonadi-import-wizard-17.08.3/src/autodetect/importwizardutil.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/importwizardutil.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importwizardutil.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,130 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "importwizardutil.h"
-#include <KSharedConfig>
-#include <KConfigGroup>
-#include "importwizard_debug.h"
-#include <kwallet.h>
-#include <AkonadiCore/Tag>
-#include <AkonadiCore/TagAttribute>
-#include <AkonadiCore/TagCreateJob>
-
-void ImportWizardUtil::mergeLdap(const ldapStruct &ldap)
-{
-    KSharedConfigPtr ldapConfig = KSharedConfig::openConfig(QStringLiteral("kabldaprc"));
-    int numberOfLdapSelected = 0;
-    KConfigGroup grp;
-    if (ldapConfig->hasGroup(QStringLiteral("LDAP"))) {
-        grp = ldapConfig->group(QStringLiteral("LDAP"));
-        numberOfLdapSelected = grp.readEntry(QStringLiteral("NumSelectedHosts"), 0);
-        grp.writeEntry(QStringLiteral("NumSelectedHosts"), (numberOfLdapSelected + 1));
-    } else {
-        grp = ldapConfig->group(QStringLiteral("LDAP"));
-        grp.writeEntry(QStringLiteral("NumSelectedHosts"), 1);
-
-        KConfigGroup ldapSeach = ldapConfig->group(QStringLiteral("LDAPSearch"));
-        ldapSeach.writeEntry(QStringLiteral("SearchType"), 0);
-    }
-    const int port = ldap.port;
-    if (port != -1) {
-        grp.writeEntry(QStringLiteral("SelectedPort%1").arg(numberOfLdapSelected), port);
-    }
-    grp.writeEntry(QStringLiteral("SelectedHost%1").arg(numberOfLdapSelected), ldap.ldapUrl.host());
-    if (ldap.useSSL) {
-        grp.writeEntry(QStringLiteral("SelectedSecurity%1").arg(numberOfLdapSelected), QStringLiteral("SSL"));
-    } else if (ldap.useTLS) {
-        grp.writeEntry(QStringLiteral("SelectedSecurity%1").arg(numberOfLdapSelected), QStringLiteral("TLS"));
-    } else {
-        grp.writeEntry(QStringLiteral("SelectedSecurity%1").arg(numberOfLdapSelected), QStringLiteral("None"));
-    }
-
-    if (ldap.saslMech == QLatin1String("GSSAPI")) {
-        grp.writeEntry(QStringLiteral("SelectedMech%1").arg(numberOfLdapSelected), QStringLiteral("GSSAPI"));
-        grp.writeEntry(QStringLiteral("SelectedAuth%1").arg(numberOfLdapSelected), QStringLiteral("SASL"));
-    } else if (ldap.saslMech.isEmpty()) {
-        grp.writeEntry(QStringLiteral("SelectedMech%1").arg(numberOfLdapSelected), QStringLiteral("PLAIN"));
-        grp.writeEntry(QStringLiteral("SelectedAuth%1").arg(numberOfLdapSelected), QStringLiteral("Simple"));
-    } else {
-        qCDebug(IMPORTWIZARD_LOG) << " Mech SASL undefined" << ldap.saslMech;
-    }
-    grp.writeEntry(QStringLiteral("SelectedVersion%1").arg(numberOfLdapSelected), QString::number(3));
-    grp.writeEntry(QStringLiteral("SelectedBind%1").arg(numberOfLdapSelected), ldap.dn);
-    //TODO: Verify selectedbase
-    grp.writeEntry(QStringLiteral("SelectedBase%1").arg(numberOfLdapSelected), ldap.ldapUrl.path());
-    if (ldap.timeout != -1) {
-        grp.writeEntry(QStringLiteral("SelectedTimeLimit%1").arg(numberOfLdapSelected), ldap.timeout);
-    }
-    if (ldap.limit != -1) {
-        grp.writeEntry(QStringLiteral("SelectedSizeLimit%1").arg(numberOfLdapSelected), ldap.limit);
-    }
-    if (!ldap.password.isEmpty()) {
-        storeInKWallet(QStringLiteral("SelectedPwdBind%1").arg(numberOfLdapSelected), ImportWizardUtil::Ldap, ldap.password);
-    }
-    grp.sync();
-}
-
-void ImportWizardUtil::addAkonadiTag(const QVector<tagStruct> &tagList)
-{
-    for (int i = 0; i < tagList.size(); ++i) {
-        Akonadi::Tag tag(tagList.at(i).name);
-        if (tagList.at(i).color.isValid()) {
-            tag.attribute<Akonadi::TagAttribute>(Akonadi::Tag::AddIfMissing)->setTextColor(tagList.at(i).color);
-        }
-        new Akonadi::TagCreateJob(tag);
-    }
-}
-
-void ImportWizardUtil::storeInKWallet(const QString &name, ImportWizardUtil::ResourceType type, const QString &password)
-{
-    KWallet::Wallet *wallet = nullptr;
-    switch (type) {
-    case Imap:
-        wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0);
-        if (wallet && wallet->isOpen()) {
-            if (!wallet->hasFolder(QStringLiteral("imap"))) {
-                wallet->createFolder(QStringLiteral("imap"));
-            }
-            wallet->setFolder(QStringLiteral("imap"));
-            wallet->writePassword(name + QLatin1String("rc"), password);
-        }
-        break;
-    case Pop3:
-        wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0);
-        if (wallet && wallet->isOpen()) {
-            if (!wallet->hasFolder(QStringLiteral("pop3"))) {
-                wallet->createFolder(QStringLiteral("pop3"));
-            }
-            wallet->setFolder(QStringLiteral("pop3"));
-            wallet->writePassword(name, password);
-        }
-        break;
-    case Ldap:
-        wallet = KWallet::Wallet::openWallet(KWallet::Wallet::LocalWallet(), 0);
-        if (wallet && wallet->isOpen()) {
-            if (!wallet->hasFolder(QStringLiteral("ldapclient"))) {
-                wallet->createFolder(QStringLiteral("ldapclient"));
-            }
-            wallet->setFolder(QStringLiteral("ldapclient"));
-            wallet->writePassword(name, password);
-        }
-    }
-    delete wallet;
-
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/importwizardutil.h akonadi-import-wizard-17.08.3/src/autodetect/importwizardutil.h
--- akonadi-import-wizard-17.04.3/src/autodetect/importwizardutil.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/importwizardutil.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef IMPORTWIZARDUTIL_H
-#define IMPORTWIZARDUTIL_H
-#include <QUrl>
-#include <QList>
-#include <QColor>
-#include <QString>
-
-struct ldapStruct {
-    ldapStruct()
-        : maxHint(-1),
-          port(-1),
-          limit(-1),
-          timeout(-1),
-          useSSL(false),
-          useTLS(false)
-    {
-    }
-
-    QUrl ldapUrl;
-    QString dn;
-    QString saslMech;
-    QString fileName;
-    QString description;
-    QString password;
-    int maxHint;
-    int port;
-    int limit;
-    int timeout;
-    bool useSSL;
-    bool useTLS;
-
-};
-
-struct tagStruct {
-    QString name;
-    QColor color;
-};
-Q_DECLARE_TYPEINFO(tagStruct, Q_MOVABLE_TYPE);
-
-namespace ImportWizardUtil
-{
-enum ResourceType {
-    Imap,
-    Pop3,
-    Ldap
-};
-
-void mergeLdap(const ldapStruct &ldap);
-void addAkonadiTag(const QVector<tagStruct> &tagList);
-void storeInKWallet(const QString &name, ImportWizardUtil::ResourceType type, const QString &password);
-}
-
-#endif // IMPORTWIZARDUTIL_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/mailapp/mailappimportdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/mailapp/mailappimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/mailapp/mailappimportdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/mailapp/mailappimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "mailapp/mailappimportdata.h"
-#include "mailimporter/filtermailapp.h"
-#include "mailimporter/filterinfo.h"
-#include "importfilterinfogui.h"
-#include "importwizard.h"
-
-#include <KLocalizedString>
-
-#include <QDir>
-
-MailAppImportData::MailAppImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = QDir::homePath();
-}
-
-MailAppImportData::~MailAppImportData()
-{
-}
-
-bool MailAppImportData::foundMailer() const
-{
-#ifdef Q_OS_MAC
-    //TODO find a method to search it. Perhaps look at binary.
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-#endif
-    return false;
-}
-
-QString MailAppImportData::name() const
-{
-    return QStringLiteral("Mail App");
-}
-
-bool MailAppImportData::importMails()
-{
-    MailImporter::FilterMailApp mailapp;
-    initializeFilter(mailapp);
-    mailapp.filterInfo()->setStatusMessage(i18n("Import in progress"));
-    QDir directory(mPath);
-    if (directory.exists()) {
-        mailapp.importMails(mPath);
-    } else {
-        mailapp.import();
-    }
-    mailapp.filterInfo()->setStatusMessage(i18n("Import finished"));
-    return true;
-}
-
-AbstractImporter::TypeSupportedOptions MailAppImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/mailapp/mailappimportdata.h akonadi-import-wizard-17.08.3/src/autodetect/mailapp/mailappimportdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/mailapp/mailappimportdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/mailapp/mailappimportdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef MailAppImportData_H
-#define MailAppImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class MailAppImportData : public AbstractImporter
-{
-public:
-    explicit MailAppImportData(ImportWizard *parent);
-    ~MailAppImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importMails() Q_DECL_OVERRIDE;
-    QString name() const Q_DECL_OVERRIDE;
-
-};
-
-#endif /* MailApp ImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/oe/oeimportdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/oe/oeimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/oe/oeimportdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/oe/oeimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "oe/oeimportdata.h"
-#include "mailimporter/filteroe.h"
-#include "mailimporter/filterinfo.h"
-#include "importfilterinfogui.h"
-#include "importwizard.h"
-
-#include <KLocalizedString>
-
-#include <QDir>
-
-OeImportData::OeImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = QDir::homePath();
-}
-
-OeImportData::~OeImportData()
-{
-}
-
-bool OeImportData::foundMailer() const
-{
-#ifdef Q_OS_WIN
-    //TODO find a method to search it. Perhaps look at binary.
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-#endif
-    return false;
-}
-
-QString OeImportData::name() const
-{
-    return QStringLiteral("Outlook Express");
-}
-
-bool OeImportData::importMails()
-{
-    MailImporter::FilterOE opera;
-    initializeFilter(opera);
-    opera.filterInfo()->setStatusMessage(i18n("Import in progress"));
-    QDir directory(mPath);
-    if (directory.exists()) {
-        opera.importMails(mPath);
-    } else {
-        opera.import();
-    }
-    opera.filterInfo()->setStatusMessage(i18n("Import finished"));
-    return true;
-}
-
-AbstractImporter::TypeSupportedOptions OeImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/oe/oeimportdata.h akonadi-import-wizard-17.08.3/src/autodetect/oe/oeimportdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/oe/oeimportdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/oe/oeimportdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef OeImportData_H
-#define OeImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class OeImportData : public AbstractImporter
-{
-public:
-    explicit OeImportData(ImportWizard *parent);
-    ~OeImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importMails() Q_DECL_OVERRIDE;
-    QString name() const Q_DECL_OVERRIDE;
-
-};
-
-#endif /* Oe ImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/opera/operaaddressbook.cpp akonadi-import-wizard-17.08.3/src/autodetect/opera/operaaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/opera/operaaddressbook.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/opera/operaaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "operaaddressbook.h"
-
-#include <KContacts/Addressee>
-#include <QUrl>
-#include "importwizard_debug.h"
-#include <QFile>
-
-OperaAddressBook::OperaAddressBook(const QString &filename, ImportWizard *parent)
-    : AbstractAddressBook(parent),
-      mFileName(filename)
-{
-}
-
-void OperaAddressBook::importAddressBook()
-{
-    QFile file(mFileName);
-    if (!file.open(QIODevice::ReadOnly)) {
-        qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << mFileName;
-        return;
-    }
-
-    QTextStream stream(&file);
-    bool foundContact = false;
-    KContacts::Addressee *contact = nullptr;
-    while (!stream.atEnd()) {
-        QString line = stream.readLine();
-        if (line == QLatin1String("#CONTACT")) {
-            appendContact(contact);
-            foundContact = true;
-        } else if (line == QLatin1String("#FOLDER")) {
-            appendContact(contact);
-            foundContact = false;
-            //TODO
-        } else if (foundContact) {
-            line = line.trimmed();
-            if (!contact) {
-                contact = new KContacts::Addressee;
-            }
-            if (line.startsWith(QStringLiteral("ID"))) {
-                //Nothing
-            } else if (line.startsWith(QStringLiteral("NAME"))) {
-                contact->setName(line.remove(QStringLiteral("NAME=")));
-            } else if (line.startsWith(QStringLiteral("URL"))) {
-                KContacts::ResourceLocatorUrl url;
-                url.setUrl(QUrl(line.remove(QStringLiteral("URL="))));
-                contact->setUrl(url);
-            } else if (line.startsWith(QStringLiteral("DESCRIPTION"))) {
-                contact->setNote(line.remove(QStringLiteral("DESCRIPTION=")));
-            } else if (line.startsWith(QStringLiteral("PHONE"))) {
-                contact->insertPhoneNumber(KContacts::PhoneNumber(line.remove(QStringLiteral("PHONE=")), KContacts::PhoneNumber::Home));
-            } else if (line.startsWith(QStringLiteral("FAX"))) {
-                contact->insertPhoneNumber(KContacts::PhoneNumber(line.remove(QStringLiteral("FAX=")), KContacts::PhoneNumber::Fax));
-            } else if (line.startsWith(QStringLiteral("POSTALADDRESS"))) {
-                //TODO
-            } else if (line.startsWith(QStringLiteral("PICTUREURL"))) {
-                //TODO
-            } else if (line.startsWith(QStringLiteral("ICON"))) {
-                //TODO
-            } else if (line.startsWith(QStringLiteral("SHORT NAME"))) {
-                contact->setNickName(line.remove(QStringLiteral("SHORT NAME=")));
-            }
-        }
-    }
-    appendContact(contact);
-}
-
-OperaAddressBook::~OperaAddressBook()
-{
-
-}
-
-void OperaAddressBook::appendContact(KContacts::Addressee *contact)
-{
-    if (contact) {
-        addImportContactNote(*contact, QStringLiteral("Opera"));
-        createContact(*contact);
-        delete contact;
-    }
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/opera/operaaddressbook.h akonadi-import-wizard-17.08.3/src/autodetect/opera/operaaddressbook.h
--- akonadi-import-wizard-17.04.3/src/autodetect/opera/operaaddressbook.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/opera/operaaddressbook.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef OPERAADDRESSBOOK_H
-#define OPERAADDRESSBOOK_H
-
-#include "abstractaddressbook.h"
-
-class ImportWizard;
-
-class OperaAddressBook : public AbstractAddressBook
-{
-public:
-    explicit OperaAddressBook(const QString &filename, ImportWizard *parent);
-    ~OperaAddressBook();
-
-    void importAddressBook();
-private:
-    void appendContact(KContacts::Addressee *contact);
-    QString mFileName;
-};
-
-#endif // OPERAADDRESSBOOK_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/opera/operaimportdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/opera/operaimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/opera/operaimportdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/opera/operaimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "opera/operaimportdata.h"
-#include "opera/operaaddressbook.h"
-#include "opera/operasettings.h"
-#include "mailimporter/filteropera.h"
-#include "mailimporter/filterinfo.h"
-#include "importfilterinfogui.h"
-#include "importwizard.h"
-
-#include <KLocalizedString>
-
-#include <QDir>
-
-OperaImportData::OperaImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = MailImporter::FilterOpera::defaultSettingsPath();
-}
-
-OperaImportData::~OperaImportData()
-{
-}
-
-bool OperaImportData::foundMailer() const
-{
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-    return false;
-}
-
-QString OperaImportData::name() const
-{
-    return QStringLiteral("Opera");
-}
-
-bool OperaImportData::importMails()
-{
-    MailImporter::FilterOpera opera;
-    initializeFilter(opera);
-    opera.filterInfo()->setStatusMessage(i18n("Import in progress"));
-    const QString mailPath(mPath + QLatin1String("mail/store/"));
-    QDir directory(mailPath);
-    if (directory.exists()) {
-        opera.importMails(mailPath);
-    } else {
-        opera.import();
-    }
-    opera.filterInfo()->setStatusMessage(i18n("Import finished"));
-    return true;
-}
-
-bool OperaImportData::importAddressBook()
-{
-    const QString addressbookFile(mPath + QLatin1String("bookmarks.adr"));
-    OperaAddressBook addressbook(addressbookFile, mImportWizard);
-    addressbook.importAddressBook();
-    return true;
-}
-
-bool OperaImportData::importSettings()
-{
-    const QString settingFile(mPath + QLatin1String("mail/accounts.ini"));
-    OperaSettings settings(settingFile, mImportWizard);
-    settings.importSettings();
-    return true;
-}
-
-AbstractImporter::TypeSupportedOptions OperaImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    options |= AbstractImporter::AddressBooks;
-    options |= AbstractImporter::Settings;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/opera/operaimportdata.h akonadi-import-wizard-17.08.3/src/autodetect/opera/operaimportdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/opera/operaimportdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/opera/operaimportdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef OperaImportData_H
-#define OperaImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class OperaImportData : public AbstractImporter
-{
-public:
-    explicit OperaImportData(ImportWizard *parent);
-    ~OperaImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importMails() Q_DECL_OVERRIDE;
-    bool importAddressBook() Q_DECL_OVERRIDE;
-    bool importSettings() Q_DECL_OVERRIDE;
-
-    QString name() const Q_DECL_OVERRIDE;
-
-};
-
-#endif /* OperaImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/opera/operasettings.cpp akonadi-import-wizard-17.08.3/src/autodetect/opera/operasettings.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/opera/operasettings.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/opera/operasettings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,297 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "operasettings.h"
-#include "importwizard_debug.h"
-#include "mailimporter/filteropera.h"
-
-#include <mailtransport/transportmanager.h>
-#include "MailCommon/MailUtil"
-
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/signature.h>
-
-#include <KConfig>
-#include <KConfigGroup>
-#include <QFile>
-#include <QRegularExpression>
-
-OperaSettings::OperaSettings(const QString &filename, ImportWizard *parent)
-    : AbstractSettings(parent),
-      mFileName(filename)
-{
-}
-
-void OperaSettings::importSettings()
-{
-    if (QFileInfo::exists(mFileName)) {
-        KConfig config(mFileName);
-        KConfigGroup grp = config.group(QStringLiteral("Accounts"));
-        readGlobalAccount(grp);
-        const QStringList accountList = config.groupList().filter(QRegularExpression(QStringLiteral("Account\\d+")));
-        const QStringList::const_iterator end(accountList.constEnd());
-        for (QStringList::const_iterator it = accountList.constBegin(); it != end; ++it) {
-            KConfigGroup group = config.group(*it);
-            readAccount(group);
-            readTransport(group);
-            readIdentity(group);
-        }
-    }
-}
-
-OperaSettings::~OperaSettings()
-{
-
-}
-
-void OperaSettings::readAccount(const KConfigGroup &grp)
-{
-    const QString incomingProtocol = grp.readEntry(QStringLiteral("Incoming Protocol"));
-    const int port = grp.readEntry(QStringLiteral("Incoming Port"), -1);
-
-    const QString serverName = grp.readEntry(QStringLiteral("Incoming Servername"));
-    const QString userName = grp.readEntry(QStringLiteral("Incoming Username"));
-
-    const int secure = grp.readEntry(QStringLiteral("Secure Connection In"), -1);
-
-    const int pollInterval = grp.readEntry(QStringLiteral("Poll Interval"), -1);
-
-    const int authMethod = grp.readEntry(QStringLiteral("Incoming Authentication Method"), -1);
-
-    const QString name = grp.readEntry(QStringLiteral("Account Name"));
-
-    const bool enableManualCheck = (grp.readEntry(QStringLiteral("Manual Check Enabled"), 0) == 1);
-
-    //TODO
-    const bool markAsSeen = (grp.readEntry(QStringLiteral("Mark Read If Seen"), 0) == 1);
-    Q_UNUSED(markAsSeen);
-
-    QMap<QString, QVariant> settings;
-    if (incomingProtocol == QLatin1String("IMAP")) {
-        settings.insert(QStringLiteral("ImapServer"), serverName);
-        settings.insert(QStringLiteral("UserName"), userName);
-        if (port != -1) {
-            settings.insert(QStringLiteral("ImapPort"), port);
-        }
-        if (secure == 1) {
-            settings.insert(QStringLiteral("Safety"), QStringLiteral("STARTTLS"));
-        } else if (secure == 0) {
-            settings.insert(QStringLiteral("Safety"), QStringLiteral("None"));
-        }
-
-        if (pollInterval == 0) {
-            settings.insert(QStringLiteral("IntervalCheckEnabled"), false);
-        } else {
-            settings.insert(QStringLiteral("IntervalCheckEnabled"), true);
-            settings.insert(QStringLiteral("IntervalCheckTime"), pollInterval);
-        }
-
-        const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
-        addToManualCheck(agentIdentifyName, enableManualCheck);
-        //We have not settings for it => same than manual check
-        addCheckMailOnStartup(agentIdentifyName, enableManualCheck);
-    } else if (incomingProtocol == QLatin1String("POP")) {
-        settings.insert(QStringLiteral("Host"), serverName);
-        settings.insert(QStringLiteral("Login"), userName);
-
-        const int leaveOnServer = grp.readEntry(QStringLiteral("Leave On Server"), -1);
-        if (leaveOnServer == 1) {
-            settings.insert(QStringLiteral("LeaveOnServer"), true);
-        } else if (leaveOnServer == 0) {
-            settings.insert(QStringLiteral("LeaveOnServer"), false);
-        } else {
-            qCDebug(IMPORTWIZARD_LOG) << " leave on server option unknown : " << leaveOnServer;
-        }
-
-        const int removeMailFromSever = grp.readEntry(QStringLiteral("Remove From Server Delay Enabled"), -1);
-        if (removeMailFromSever == 1) {
-            int removeDelay = grp.readEntry(QStringLiteral("Remove From Server Delay"), -1);
-            if (removeDelay != -1) {
-                //Opera store delay as second !!! :)
-                removeDelay = removeDelay / (24 * 60 * 60);
-                settings.insert(QStringLiteral("LeaveOnServerDays"), removeDelay);
-            }
-        } //TODO: else
-
-        if (port != -1) {
-            settings.insert(QStringLiteral("Port"), port);
-        }
-        //TODO:
-        const int delay = grp.readEntry(QStringLiteral("Initial Poll Delay"), -1);
-        Q_UNUSED(delay);
-
-        if (pollInterval == 0) {
-            settings.insert(QStringLiteral("IntervalCheckEnabled"), false);
-        } else {
-            settings.insert(QStringLiteral("IntervalCheckEnabled"), true);
-            settings.insert(QStringLiteral("IntervalCheckInterval"), pollInterval);
-        }
-
-        if (secure == 1) {
-            settings.insert(QStringLiteral("UseTLS"), true);
-        }
-
-        switch (authMethod) {
-        case 0: //NONE
-            settings.insert(QStringLiteral("AuthenticationMethod"), MailTransport::Transport::EnumAuthenticationType::ANONYMOUS);
-            break;
-        case 1: //Clear Text
-            settings.insert(QStringLiteral("AuthenticationMethod"), MailTransport::Transport::EnumAuthenticationType::CLEAR);   //Verify
-            break;
-        case 6: //APOP
-            settings.insert(QStringLiteral("AuthenticationMethod"), MailTransport::Transport::EnumAuthenticationType::APOP);
-            break;
-        case 10: //CRAM-MD5
-            settings.insert(QStringLiteral("AuthenticationMethod"), MailTransport::Transport::EnumAuthenticationType::CRAM_MD5);
-            break;
-        case 31: //Automatic
-            settings.insert(QStringLiteral("AuthenticationMethod"), MailTransport::Transport::EnumAuthenticationType::APOP);   //TODO: verify
-            break;
-        default:
-            qCDebug(IMPORTWIZARD_LOG) << " unknown authentication method :" << authMethod;
-            break;
-        }
-
-        const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
-        //We have not settings for it => same than manual check
-        addCheckMailOnStartup(agentIdentifyName, enableManualCheck);
-        addToManualCheck(agentIdentifyName, enableManualCheck);
-    } else {
-        qCDebug(IMPORTWIZARD_LOG) << " protocol unknown : " << incomingProtocol;
-    }
-}
-
-void OperaSettings::readTransport(const KConfigGroup &grp)
-{
-    const QString outgoingProtocol = grp.readEntry(QStringLiteral("Outgoing Protocol"));
-    if (outgoingProtocol == QLatin1String("SMTP")) {
-        const int authMethod = grp.readEntry(QStringLiteral("Outgoing Authentication Method"), -1);
-        MailTransport::Transport *mt = createTransport();
-        const int port = grp.readEntry(QStringLiteral("Outgoing Port"), -1);
-        const int secure = grp.readEntry(QStringLiteral("Secure Connection Out"), -1);
-        if (secure == 1) {
-            mt->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
-        }
-        if (port > 0) {
-            mt->setPort(port);
-        }
-
-        const QString hostName = grp.readEntry(QStringLiteral("Outgoing Servername"));
-        mt->setHost(hostName);
-
-        const QString userName = grp.readEntry(QStringLiteral("Outgoing Username"));
-        if (!userName.isEmpty()) {
-            mt->setUserName(userName);
-        }
-
-        const int outgoingTimeOut = grp.readEntry(QStringLiteral("Outgoing Timeout"), -1); //TODO ?
-        Q_UNUSED(outgoingTimeOut);
-
-        switch (authMethod) {
-        case 0: //NONE
-            break;
-        case 2: //PLAIN
-            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN);
-            break;
-        case 5: //LOGIN
-            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::LOGIN);
-            break;
-        case 10: //CRAM-MD5
-            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::CRAM_MD5);
-            break;
-        case 31: //Automatic
-            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN); //Don't know... Verify
-            break;
-        default:
-            qCDebug(IMPORTWIZARD_LOG) << " authMethod unknown :" << authMethod;
-        }
-
-        //We can't specify a default smtp...
-        storeTransport(mt, true);
-    }
-}
-
-void OperaSettings::readIdentity(const KConfigGroup &grp)
-{
-    QString realName = grp.readEntry(QStringLiteral("Real Name"));
-    KIdentityManagement::Identity *newIdentity = createIdentity(realName);
-    const QString cc = grp.readEntry(QStringLiteral("Auto CC"));
-    newIdentity->setCc(cc);
-
-    const QString bcc = grp.readEntry(QStringLiteral("Auto BCC"));
-    newIdentity->setBcc(bcc);
-
-    const QString replyTo = grp.readEntry(QStringLiteral("Replyto"));
-    if (!replyTo.isEmpty()) {
-        newIdentity->setReplyToAddr(replyTo);
-    }
-
-    newIdentity->setFullName(realName);
-    newIdentity->setIdentityName(realName);
-
-    const QString email = grp.readEntry(QStringLiteral("Email"));
-    newIdentity->setPrimaryEmailAddress(email);
-
-    const QString organization = grp.readEntry(QStringLiteral("Organization"));
-    if (!organization.isEmpty()) {
-        newIdentity->setOrganization(organization);
-    }
-
-    QString signatureFile = grp.readEntry(QStringLiteral("Signature File"));
-    if (!signatureFile.isEmpty()) {
-        KIdentityManagement::Signature signature;
-        const int signatureHtml = grp.readEntry(QStringLiteral("Signature is HTML"), -1);
-        if (signatureFile.contains(QStringLiteral("{Preferences}"))) {
-            signatureFile.replace(QStringLiteral("{Preferences}"), MailImporter::FilterOpera::defaultSettingsPath() + QLatin1String("/"));
-        }
-
-        QFile file(signatureFile);
-        if (file.exists()) {
-            if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
-                QByteArray sigText = file.readAll();
-
-                switch (signatureHtml) {
-                case -1:
-                    break;
-                case 0:
-                    signature.setInlinedHtml(false);
-                    signature.setType(KIdentityManagement::Signature::Inlined);
-                    signature.setText(QString(sigText));
-                    break;
-                case 1:
-                    signature.setInlinedHtml(true);
-                    signature.setType(KIdentityManagement::Signature::Inlined);
-                    signature.setText(QString(sigText));
-                    break;
-                default:
-                    qCDebug(IMPORTWIZARD_LOG) << " pb with Signature is HTML " << signatureHtml;
-                    break;
-                }
-                newIdentity->setSignature(signature);
-            }
-        }
-    }
-    storeIdentity(newIdentity);
-}
-
-void OperaSettings::readGlobalAccount(const KConfigGroup &grp)
-{
-    Q_UNUSED(grp);
-    //TODO
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/opera/operasettings.h akonadi-import-wizard-17.08.3/src/autodetect/opera/operasettings.h
--- akonadi-import-wizard-17.04.3/src/autodetect/opera/operasettings.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/opera/operasettings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef OPERASETTINGS_H
-#define OPERASETTINGS_H
-
-#include "abstractsettings.h"
-
-class ImportWizard;
-class KConfigGroup;
-
-class OperaSettings : public AbstractSettings
-{
-public:
-    explicit OperaSettings(const QString &filename, ImportWizard *parent);
-    ~OperaSettings();
-
-    void importSettings();
-private:
-    void readAccount(const KConfigGroup &grp);
-    void readTransport(const KConfigGroup &grp);
-    void readGlobalAccount(const KConfigGroup &grp);
-    void readIdentity(const KConfigGroup &grp);
-    QString mFileName;
-};
-
-#endif // OPERASETTINGS_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/pmail/pmailimportdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/pmail/pmailimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/pmail/pmailimportdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/pmail/pmailimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "pmail/pmailimportdata.h"
-#include "pmail/pmailsettings.h"
-#include "mailimporter/filterpmail.h"
-#include "mailimporter/filterinfo.h"
-#include "importfilterinfogui.h"
-#include "importwizard.h"
-
-#include <KLocalizedString>
-
-#include <QDir>
-
-PMailImportData::PMailImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = QDir::homePath();
-}
-
-PMailImportData::~PMailImportData()
-{
-}
-
-bool PMailImportData::foundMailer() const
-{
-#ifdef Q_OS_WIN
-    //TODO find a method to search it. Perhaps look at binary.
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-#endif
-    return false;
-}
-
-QString PMailImportData::name() const
-{
-    return QStringLiteral("Pegasus Mail");
-}
-
-bool PMailImportData::importMails()
-{
-    MailImporter::FilterPMail pmail;
-    initializeFilter(pmail);
-    pmail.filterInfo()->setStatusMessage(i18n("Import in progress"));
-    QDir directory(mPath);
-    if (directory.exists()) {
-        pmail.importMails(mPath);
-    } else {
-        pmail.import();
-    }
-    pmail.filterInfo()->setStatusMessage(i18n("Import finished"));
-    return true;
-}
-
-bool PMailImportData::importSettings()
-{
-    //TODO verify path
-    const QString settingFile(mPath + QLatin1String("pmail.ini"));
-    PMailSettings settings(settingFile, mImportWizard);
-    settings.importSettings();
-    return true;
-}
-
-AbstractImporter::TypeSupportedOptions PMailImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    //options |=AbstractImporter::Settings;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/pmail/pmailimportdata.h akonadi-import-wizard-17.08.3/src/autodetect/pmail/pmailimportdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/pmail/pmailimportdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/pmail/pmailimportdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef PMailImportData_H
-#define PMailImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class PMailImportData : public AbstractImporter
-{
-public:
-    explicit PMailImportData(ImportWizard *parent);
-    ~PMailImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importMails() Q_DECL_OVERRIDE;
-    bool importSettings() Q_DECL_OVERRIDE;
-
-    QString name() const Q_DECL_OVERRIDE;
-
-};
-
-#endif /* PMail ImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/pmail/pmailsettings.cpp akonadi-import-wizard-17.08.3/src/autodetect/pmail/pmailsettings.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/pmail/pmailsettings.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/pmail/pmailsettings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,87 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "pmailsettings.h"
-#include "importwizardutil.h"
-
-#include <mailtransport/transportmanager.h>
-#include "MailCommon/MailUtil"
-
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/signature.h>
-
-#include <KConfig>
-#include <KConfigGroup>
-#include <QFile>
-#include <QFileInfo>
-#include <QRegularExpression>
-
-PMailSettings::PMailSettings(const QString &filename, ImportWizard *parent)
-    : AbstractSettings(parent),
-      mFileName(filename)
-{
-
-}
-
-void PMailSettings::importSettings()
-{
-    if (QFileInfo::exists(mFileName)) {
-        KConfig config(mFileName);
-
-        const QStringList accountList = config.groupList().filter(QRegularExpression(QStringLiteral("WinPMail Identity - *")));
-        const QStringList::const_iterator end(accountList.constEnd());
-        for (QStringList::const_iterator it = accountList.constBegin(); it != end; ++it) {
-            KConfigGroup group = config.group(*it);
-            readIdentity(group);
-        }
-    }
-}
-
-PMailSettings::~PMailSettings()
-{
-
-}
-
-void PMailSettings::readIdentity(const KConfigGroup &group)
-{
-
-    QString personalNameStr = QStringLiteral("Personal name                             ");
-    QString personalName;
-    if (group.hasKey(personalNameStr)) {
-        personalName = group.readEntry(personalNameStr);
-        personalName.remove(0, 1); //Remove first space
-    }
-    KIdentityManagement::Identity *newIdentity = createIdentity(personalName);
-    newIdentity->setFullName(personalName);
-    newIdentity->setIdentityName(personalName);
-
-    const QString emailStr = QStringLiteral("Internet E-mail Address                   ");
-    if (group.hasKey(emailStr)) {
-        QString email = group.readEntry(emailStr);
-        email.remove(0, 1); //Remove first space
-        newIdentity->setPrimaryEmailAddress(email);
-    }
-    const QString replytoStr = QStringLiteral("Default reply-to address                  ");
-    if (group.hasKey(replytoStr)) {
-        QString reply = group.readEntry(replytoStr);
-        reply.remove(0, 1); //Remove first space
-        newIdentity->setReplyToAddr(reply);
-    }
-    storeIdentity(newIdentity);
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/pmail/pmailsettings.h akonadi-import-wizard-17.08.3/src/autodetect/pmail/pmailsettings.h
--- akonadi-import-wizard-17.04.3/src/autodetect/pmail/pmailsettings.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/pmail/pmailsettings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef PMailSettings_H
-#define PMailSettings_H
-
-#include "abstractsettings.h"
-
-class ImportWizard;
-class KConfigGroup;
-
-class PMailSettings : public AbstractSettings
-{
-public:
-    explicit PMailSettings(const QString &filename, ImportWizard *parent);
-    ~PMailSettings();
-
-    void importSettings();
-private:
-    void readIdentity(const KConfigGroup &group);
-    QString mFileName;
-};
-
-#endif // ClawsMailSettings_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/selectcomponentpage.cpp akonadi-import-wizard-17.08.3/src/autodetect/selectcomponentpage.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/selectcomponentpage.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/selectcomponentpage.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -19,9 +19,9 @@
 #include "selectcomponentpage.h"
 #include "ui_selectcomponentpage.h"
 
-SelectComponentPage::SelectComponentPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::SelectComponentPage)
+SelectComponentPage::SelectComponentPage(QWidget *parent)
+    : QWidget(parent)
+    , ui(new Ui::SelectComponentPage)
 {
     ui->setupUi(this);
     connect(ui->everything, &QCheckBox::clicked, this, &SelectComponentPage::slotEverythingClicked);
@@ -39,49 +39,49 @@
 
 void SelectComponentPage::slotComponentClicked()
 {
-    const bool componentSelected = (ui->addressbooks->isChecked() || ui->filters->isChecked() || ui->mails->isChecked() || ui->settings->isChecked() || ui->calendars->isChecked() || ui->everything->isChecked());
+    const bool componentSelected
+        = (ui->addressbooks->isChecked() || ui->filters->isChecked() || ui->mails->isChecked() || ui->settings->isChecked() || ui->calendars->isChecked() || ui->everything->isChecked());
     Q_EMIT atLeastOneComponentSelected(componentSelected);
 }
 
 void SelectComponentPage::slotEverythingClicked(bool clicked)
 {
-    ui->addressbooks->setEnabled(!clicked && (mOptions & AbstractImporter::AddressBooks));
-    ui->filters->setEnabled(!clicked && (mOptions & AbstractImporter::Filters));
-    ui->mails->setEnabled(!clicked && (mOptions & AbstractImporter::Mails));
-    ui->settings->setEnabled(!clicked && (mOptions & AbstractImporter::Settings));
-    ui->calendars->setEnabled(!clicked && (mOptions & AbstractImporter::Calendars));
+    ui->addressbooks->setEnabled(!clicked && (mOptions & LibImportWizard::AbstractImporter::AddressBooks));
+    ui->filters->setEnabled(!clicked && (mOptions & LibImportWizard::AbstractImporter::Filters));
+    ui->mails->setEnabled(!clicked && (mOptions & LibImportWizard::AbstractImporter::Mails));
+    ui->settings->setEnabled(!clicked && (mOptions & LibImportWizard::AbstractImporter::Settings));
+    ui->calendars->setEnabled(!clicked && (mOptions & LibImportWizard::AbstractImporter::Calendars));
     slotComponentClicked();
 }
 
-void SelectComponentPage::setEnabledComponent(AbstractImporter::TypeSupportedOptions options)
+void SelectComponentPage::setEnabledComponent(LibImportWizard::AbstractImporter::TypeSupportedOptions options)
 {
     mOptions = options;
     slotEverythingClicked(ui->everything->isChecked());
 }
 
-AbstractImporter::TypeSupportedOptions SelectComponentPage::selectedComponents() const
+LibImportWizard::AbstractImporter::TypeSupportedOptions SelectComponentPage::selectedComponents() const
 {
     if (ui->everything->isChecked()) {
         return mOptions;
     } else {
-        AbstractImporter::TypeSupportedOptions newOptions;
+        LibImportWizard::AbstractImporter::TypeSupportedOptions newOptions;
         if (ui->addressbooks->isChecked()) {
-            newOptions |= AbstractImporter::AddressBooks;
+            newOptions |= LibImportWizard::AbstractImporter::AddressBooks;
         }
         if (ui->filters->isChecked()) {
-            newOptions |= AbstractImporter::Filters;
+            newOptions |= LibImportWizard::AbstractImporter::Filters;
         }
         if (ui->mails->isChecked()) {
-            newOptions |= AbstractImporter::Mails;
+            newOptions |= LibImportWizard::AbstractImporter::Mails;
         }
         if (ui->settings->isChecked()) {
-            newOptions |= AbstractImporter::Settings;
+            newOptions |= LibImportWizard::AbstractImporter::Settings;
         }
         if (ui->calendars->isChecked()) {
-            newOptions |= AbstractImporter::Calendars;
+            newOptions |= LibImportWizard::AbstractImporter::Calendars;
         }
 
         return newOptions;
     }
 }
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/selectcomponentpage.h akonadi-import-wizard-17.08.3/src/autodetect/selectcomponentpage.h
--- akonadi-import-wizard-17.04.3/src/autodetect/selectcomponentpage.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/selectcomponentpage.h	2017-10-29 07:12:25.000000000 +0000
@@ -22,8 +22,7 @@
 #include <QWidget>
 #include "abstractimporter.h"
 
-namespace Ui
-{
+namespace Ui {
 class SelectComponentPage;
 }
 
@@ -35,8 +34,8 @@
     explicit SelectComponentPage(QWidget *parent = nullptr);
     ~SelectComponentPage();
 
-    void setEnabledComponent(AbstractImporter::TypeSupportedOptions options);
-    AbstractImporter::TypeSupportedOptions selectedComponents() const;
+    void setEnabledComponent(LibImportWizard::AbstractImporter::TypeSupportedOptions options);
+    LibImportWizard::AbstractImporter::TypeSupportedOptions selectedComponents() const;
 
 Q_SIGNALS:
     void atLeastOneComponentSelected(bool componentSelected);
@@ -44,7 +43,7 @@
 private:
     void slotEverythingClicked(bool clicked);
     void slotComponentClicked();
-    AbstractImporter::TypeSupportedOptions mOptions;
+    LibImportWizard::AbstractImporter::TypeSupportedOptions mOptions;
     Ui::SelectComponentPage *ui;
 };
 
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/selectprogrampage.cpp akonadi-import-wizard-17.08.3/src/autodetect/selectprogrampage.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/selectprogrampage.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/selectprogrampage.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -20,9 +20,9 @@
 #include "selectprogrampage.h"
 #include "ui_selectprogrampage.h"
 
-SelectProgramPage::SelectProgramPage(QWidget *parent) :
-    QWidget(parent),
-    ui(new Ui::SelectProgramPage)
+SelectProgramPage::SelectProgramPage(QWidget *parent)
+    : QWidget(parent)
+    , ui(new Ui::SelectProgramPage)
 {
     ui->setupUi(this);
     connect(ui->listProgramFound, &QListWidget::itemSelectionChanged, this, &SelectProgramPage::slotItemSelectionChanged);
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/selectprogrampage.h akonadi-import-wizard-17.08.3/src/autodetect/selectprogrampage.h
--- akonadi-import-wizard-17.04.3/src/autodetect/selectprogrampage.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/selectprogrampage.h	2017-10-29 07:12:25.000000000 +0000
@@ -24,8 +24,7 @@
 
 class QListWidgetItem;
 
-namespace Ui
-{
+namespace Ui {
 class SelectProgramPage;
 }
 
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedaddressbook.cpp akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedaddressbook.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,189 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "sylpheedaddressbook.h"
-#include <KContacts/Addressee>
-#include <kcontacts/contactgroup.h>
-
-#include "importwizard_debug.h"
-#include <KLocalizedString>
-
-#include <QDir>
-#include <QDomDocument>
-
-SylpheedAddressBook::SylpheedAddressBook(const QDir &dir, ImportWizard *parent)
-    : AbstractAddressBook(parent),
-      mDir(dir)
-{
-}
-
-SylpheedAddressBook::~SylpheedAddressBook()
-{
-}
-
-void SylpheedAddressBook::importAddressBook()
-{
-    const QStringList files = mDir.entryList(QStringList(QStringLiteral("addrbook-[0-9]*.xml")), QDir::Files, QDir::Name);
-    if (files.isEmpty()) {
-        addAddressBookImportInfo(i18n("No addressbook found"));
-    } else {
-        for (const QString &file : files) {
-            readAddressBook(mDir.path() + QLatin1Char('/') + file);
-        }
-    }
-    cleanUp();
-}
-
-
-void SylpheedAddressBook::readAddressBook(const QString &filename)
-{
-    QFile file(filename);
-    //qCDebug(IMPORTWIZARD_LOG)<<" import filename :"<<filename;
-    if (!file.open(QIODevice::ReadOnly)) {
-        qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << filename;
-        return;
-    }
-    QString errorMsg;
-    int errorRow;
-    int errorCol;
-    QDomDocument doc;
-    if (!doc.setContent(&file, &errorMsg, &errorRow, &errorCol)) {
-        qCDebug(IMPORTWIZARD_LOG) << "Unable to load document.Parse error in line " << errorRow
-                                  << ", col " << errorCol << ": " << errorMsg;
-        return;
-    }
-    QDomElement domElement = doc.documentElement();
-
-    if (domElement.isNull()) {
-        qCDebug(IMPORTWIZARD_LOG) << "addressbook not found";
-        return;
-    }
-
-    QDomElement e = domElement.firstChildElement();
-    if (e.isNull()) {
-        addAddressBookImportError(i18n("No contact found in %1", filename));
-        return;
-    }
-
-    for (; !e.isNull(); e = e.nextSiblingElement()) {
-        //TODO ?? const QString name = e.attribute(QStringLiteral("name"));
-
-        const QString tag = e.tagName();
-        if (tag == QLatin1String("person")) {
-            KContacts::Addressee contact;
-            //uid="333304265" first-name="dd" last-name="ccc" nick-name="" cn="laurent"
-            QString uidPerson;
-            if (e.hasAttribute(QStringLiteral("uid"))) {
-                uidPerson = e.attribute(QStringLiteral("uid"));
-            }
-            if (e.hasAttribute(QStringLiteral("first-name"))) {
-                contact.setName(e.attribute(QStringLiteral("first-name")));
-            }
-            if (e.hasAttribute(QStringLiteral("last-name"))) {
-                contact.setFamilyName(e.attribute(QStringLiteral("last-name")));
-
-            }
-            if (e.hasAttribute(QStringLiteral("nick-name"))) {
-                contact.setNickName(e.attribute(QStringLiteral("nick-name")));
-            }
-            if (e.hasAttribute(QStringLiteral("cn"))) {
-                contact.setFormattedName(e.attribute(QStringLiteral("cn")));
-            }
-            QStringList uidAddress;
-            for (QDomElement addressElement = e.firstChildElement(); !addressElement.isNull(); addressElement = addressElement.nextSiblingElement()) {
-                const QString addressTag = addressElement.tagName();
-                if (addressTag == QLatin1String("address-list")) {
-                    QStringList emails;
-                    for (QDomElement addresslist = addressElement.firstChildElement(); !addresslist.isNull(); addresslist = addresslist.nextSiblingElement()) {
-                        const QString tagAddressList = addresslist.tagName();
-                        if (tagAddressList == QLatin1String("address")) {
-                            if (addresslist.hasAttribute(QStringLiteral("email"))) {
-                                emails << addresslist.attribute(QStringLiteral("email"));
-                            } else if (addresslist.hasAttribute(QStringLiteral("alias"))) {
-                                //TODO:
-                            } else if (addresslist.hasAttribute(QStringLiteral("uid"))) {
-                                uidAddress << addresslist.attribute(QStringLiteral("uid"));
-                            }
-                        } else {
-                            qCDebug(IMPORTWIZARD_LOG) << " tagAddressList unknown :" << tagAddressList;
-                        }
-                    }
-                    if (!emails.isEmpty()) {
-                        contact.setEmails(emails);
-                    }
-
-                } else if (addressTag == QLatin1String("attribute-list")) {
-                    for (QDomElement attributelist = addressElement.firstChildElement(); !attributelist.isNull(); attributelist = attributelist.nextSiblingElement()) {
-                        const QString tagAttributeList = attributelist.tagName();
-                        if (tagAttributeList == QLatin1String("attribute")) {
-                            if (attributelist.hasAttribute(QStringLiteral("name"))) {
-                                const QString name = attributelist.attribute(QStringLiteral("name"));
-                                const QString value = attributelist.text();
-                                contact.insertCustom(QStringLiteral("KADDRESSBOOK"), name, value);
-                            }
-                        } else {
-                            qCDebug(IMPORTWIZARD_LOG) << "tagAttributeList not implemented " << tagAttributeList;
-                        }
-                    }
-
-                } else {
-                    qCDebug(IMPORTWIZARD_LOG) << " addressTag unknown :" << addressTag;
-                }
-            }
-            if (!mAddressBookUid.contains(uidPerson)) {
-                mAddressBookUid.insert(uidPerson, uidAddress);
-            } else {
-                qCDebug(IMPORTWIZARD_LOG) << " problem uidPerson already stored" << uidPerson;
-            }
-            addImportContactNote(contact, QStringLiteral("Sylpheed"));
-            createContact(contact);
-        } else if (tag == QLatin1String("group")) {
-            QString name = e.attribute(QStringLiteral("name"));
-            KContacts::ContactGroup group(name);
-            //TODO: create Group
-            for (QDomElement groupElement = e.firstChildElement(); !groupElement.isNull(); groupElement = groupElement.nextSiblingElement()) {
-                const QString groupTag = groupElement.tagName();
-                if (groupTag == QLatin1String("member-list")) {
-                    for (QDomElement memberlist = groupElement.firstChildElement(); !memberlist.isNull(); memberlist = memberlist.nextSiblingElement()) {
-                        const QString tagMemberList = memberlist.tagName();
-                        if (tagMemberList == QLatin1String("member")) {
-                            QString pid;
-                            QString eid;
-                            if (memberlist.hasAttribute(QStringLiteral("pid"))) {
-                                pid = memberlist.attribute(QStringLiteral("pid"));
-                            }
-                            if (memberlist.hasAttribute(QStringLiteral("eid"))) {
-                                eid = memberlist.attribute(QStringLiteral("eid"));
-                            }
-                            if (!pid.isEmpty() && !eid.isEmpty()) {
-                                //TODO
-                            } else {
-                                qCDebug(IMPORTWIZARD_LOG) << " Problem with group" << name;
-                            }
-                            //TODO
-                        }
-                    }
-                }
-            }
-            createGroup(group);
-        } else {
-            qCDebug(IMPORTWIZARD_LOG) << " SylpheedAddressBook::readAddressBook  tag unknown :" << tag;
-        }
-    }
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedaddressbook.h akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedaddressbook.h
--- akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedaddressbook.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedaddressbook.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef SYLPHEEDADDRESSBOOK_H
-#define SYLPHEEDADDRESSBOOK_H
-
-#include "abstractaddressbook.h"
-#include <QHash>
-#include <QDir>
-class QString;
-
-class ImportWizard;
-
-class SylpheedAddressBook : public AbstractAddressBook
-{
-    Q_OBJECT
-public:
-    explicit SylpheedAddressBook(const QDir &dir, ImportWizard *parent);
-    ~SylpheedAddressBook();
-
-    void importAddressBook();
-private:
-    void readAddressBook(const QString &filename);
-    QHash<QString, QStringList > mAddressBookUid;
-    QDir mDir;
-};
-
-#endif /* SYLPHEEDADDRESSBOOK_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedimportdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedimportdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "sylpheed/sylpheedimportdata.h"
-#include "mailimporter/filtersylpheed.h"
-#include "mailimporter/filterinfo.h"
-#include "importfilterinfogui.h"
-#include "MailCommon/FilterImporterExporter"
-#include "importwizard.h"
-#include "sylpheed/sylpheedsettings.h"
-#include "sylpheed/sylpheedaddressbook.h"
-
-#include <KLocalizedString>
-
-#include <QDir>
-
-SylpheedImportData::SylpheedImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = MailImporter::FilterSylpheed::defaultSettingsPath();
-}
-
-SylpheedImportData::~SylpheedImportData()
-{
-}
-
-bool SylpheedImportData::foundMailer() const
-{
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-    return false;
-}
-
-QString SylpheedImportData::name() const
-{
-    return QStringLiteral("Sylpheed");
-}
-
-bool SylpheedImportData::importSettings()
-{
-    const QString accountFile = mPath + QLatin1String("/accountrc");
-    if (QFileInfo::exists(accountFile)) {
-        SylpheedSettings account(mImportWizard);
-        account.importSettings(accountFile, mPath);
-    } else {
-        addImportSettingsInfo(i18n("Sylpheed settings not found."));
-    }
-    return true;
-}
-
-bool SylpheedImportData::importMails()
-{
-    MailImporter::FilterSylpheed sylpheed;
-    initializeFilter(sylpheed);
-    sylpheed.filterInfo()->setStatusMessage(i18n("Import in progress"));
-    const QString mailsPath = sylpheed.localMailDirPath();
-    QDir directory(mailsPath);
-    if (directory.exists()) {
-        sylpheed.importMails(mailsPath);
-    } else {
-        sylpheed.import();
-    }
-    sylpheed.filterInfo()->setStatusMessage(i18n("Import finished"));
-    return true;
-}
-
-bool SylpheedImportData::importFilters()
-{
-    const QString filterPath = mPath + QLatin1String("/filter.xml");
-    return addFilters(filterPath, MailCommon::FilterImporterExporter::SylpheedFilter);
-}
-
-bool SylpheedImportData::importAddressBook()
-{
-    const QDir addressbookDir(mPath);
-    SylpheedAddressBook account(addressbookDir, mImportWizard);
-    account.importAddressBook();
-    return true;
-}
-
-AbstractImporter::TypeSupportedOptions SylpheedImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    options |= AbstractImporter::Filters;
-    options |= AbstractImporter::Settings;
-    options |= AbstractImporter::AddressBooks;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedimportdata.h akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedimportdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedimportdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedimportdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef SylpheedImportData_H
-#define SylpheedImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class SylpheedImportData : public AbstractImporter
-{
-public:
-    explicit SylpheedImportData(ImportWizard *parent);
-    ~SylpheedImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importSettings() Q_DECL_OVERRIDE;
-    bool importMails() Q_DECL_OVERRIDE;
-    bool importFilters() Q_DECL_OVERRIDE;
-    bool importAddressBook() Q_DECL_OVERRIDE;
-    QString name() const Q_DECL_OVERRIDE;
-};
-
-#endif /* SylpheedImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedsettings.cpp akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedsettings.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedsettings.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedsettings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,562 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "sylpheedsettings.h"
-#include "sylpheedsettingsutils.h"
-#include <mailtransport/transportmanager.h>
-#include "MailCommon/MailUtil"
-#include <QFileInfo>
-
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/signature.h>
-
-#include <KConfig>
-#include <KConfigGroup>
-#include "importwizard_debug.h"
-
-#include <QStringList>
-#include <QFile>
-#include <QRegularExpression>
-
-SylpheedSettings::SylpheedSettings(ImportWizard *parent)
-    : AbstractSettings(parent)
-{
-}
-
-SylpheedSettings::~SylpheedSettings()
-{
-}
-
-void SylpheedSettings::importSettings(const QString &filename, const QString &path)
-{
-    bool checkMailOnStartup = true;
-    int intervalCheckMail = -1;
-    const QString sylpheedrc = path + QLatin1String("/sylpheedrc");
-    if (QFileInfo::exists(sylpheedrc)) {
-        KConfig configCommon(sylpheedrc);
-        if (configCommon.hasGroup("Common")) {
-            KConfigGroup common = configCommon.group("Common");
-            checkMailOnStartup = (common.readEntry("check_on_startup", 1) == 1);
-
-            if (common.readEntry(QStringLiteral("autochk_newmail"), 1) == 1) {
-                intervalCheckMail = common.readEntry(QStringLiteral("autochk_interval"), -1);
-            }
-            readGlobalSettings(common);
-        }
-    }
-    KConfig config(filename);
-    const QStringList accountList = config.groupList().filter(QRegularExpression(QStringLiteral("Account: \\d+")));
-    const QStringList::const_iterator end(accountList.constEnd());
-    for (QStringList::const_iterator it = accountList.constBegin(); it != end; ++it) {
-        KConfigGroup group = config.group(*it);
-        readAccount(group, checkMailOnStartup, intervalCheckMail);
-        readIdentity(group);
-    }
-    const QString customheaderrc = path + QLatin1String("/customheaderrc");
-    QFile customHeaderFile(customheaderrc);
-    if (customHeaderFile.exists()) {
-        if (!customHeaderFile.open(QIODevice::ReadOnly)) {
-            qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << customheaderrc;
-        } else {
-            readCustomHeader(&customHeaderFile);
-        }
-    }
-}
-
-void SylpheedSettings::readCustomHeader(QFile *customHeaderFile)
-{
-    //In sylpheed we define custom header from account.
-    //In kmail it's global
-    QTextStream stream(customHeaderFile);
-    QMap<QString, QString> header;
-    while (!stream.atEnd()) {
-        const QString line = stream.readLine();
-        const QStringList lst = line.split(QLatin1Char(':'));
-        if (lst.count() == 3) {
-            QString str = lst.at(2);
-            str.remove(0, 1);
-            header.insert(lst.at(1), str);
-        }
-    }
-    if (!header.isEmpty()) {
-        const int oldValue = readKmailSettings(QStringLiteral("General"), QStringLiteral("mime-header-count"));
-        int newValue = header.count();
-        if (oldValue != -1) {
-            newValue += oldValue;
-        }
-        addKmailConfig(QStringLiteral("General"), QStringLiteral("mime-header-count"), newValue);
-        int currentHeader = (oldValue > 0) ? oldValue : 0;
-        for (QMapIterator<QString, QString> it(header);  it.hasNext();) {
-            it.next();
-            addComposerHeaderGroup(QStringLiteral("Mime #%1").arg(currentHeader), (it).key(), (it).value());
-            ++currentHeader;
-        }
-    }
-}
-
-void SylpheedSettings::readGlobalSettings(const KConfigGroup &group)
-{
-    const bool showTrayIcon = (group.readEntry("show_trayicon", 0) == 1);
-    addKmailConfig(QStringLiteral("General"), QStringLiteral("SystemTrayEnabled"), showTrayIcon);
-
-    const bool cleanTrashOnExit = (group.readEntry("clean_trash_on_exit", 0) == 1);
-    addKmailConfig(QStringLiteral("General"), QStringLiteral("empty-trash-on-exit"), cleanTrashOnExit);
-
-    const bool alwaysMarkReadOnShowMsg = (group.readEntry("always_mark_read_on_show_msg", 0) == 1);
-    if (alwaysMarkReadOnShowMsg) {
-        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkAsRead"), true);
-        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkTime"), 0);
-    }
-
-    if (group.readEntry("enable_autosave", 0) == 1) {
-        const int autosaveInterval = group.readEntry("autosave_interval", 5);
-        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("autosave"), autosaveInterval);
-    }
-    const bool checkAttach = (group.readEntry("check_attach", 0) == 1);
-    addKmailConfig(QStringLiteral("Composer"), QStringLiteral("showForgottenAttachmentWarning"), checkAttach);
-
-    const QString attachStr = group.readEntry("check_attach_str");
-    if (!attachStr.isEmpty()) {
-        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("attachment-keywords"), attachStr);
-    }
-
-    const int lineWrap = group.readEntry("linewrap_length", 80);
-    addKmailConfig(QStringLiteral("Composer"), QStringLiteral("break-at"), lineWrap);
-    addKmailConfig(QStringLiteral("Composer"), QStringLiteral("word-wrap"), true);
-
-    if (group.readEntry(QStringLiteral("recycle_quote_colors"), 0) == 1) {
-        addKmailConfig(QStringLiteral("Reader"), QStringLiteral("RecycleQuoteColors"), true);
-    }
-
-    if (group.readEntry(QStringLiteral("auto_signature"), 0) == 0) {
-        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("signature"), QStringLiteral("manual"));
-    }
-
-    if (group.readEntry(QStringLiteral("auto_ext_editor"), -1) == 1) {
-        addKmailConfig(QStringLiteral("General"), QStringLiteral("use-external-editor"), true);
-
-        const QString externalEditor = group.readEntry(QStringLiteral("mime_open_command"));
-        if (!externalEditor.isEmpty()) {
-            addKmailConfig(QStringLiteral("General"), QStringLiteral("external-editor"), externalEditor);
-        }
-    }
-
-    readSettingsColor(group);
-    readTemplateFormat(group);
-    readTagColor(group);
-    readDateFormat(group);
-}
-
-void SylpheedSettings::readTemplateFormat(const KConfigGroup &group)
-{
-    const QString replyQuote = group.readEntry(QStringLiteral("reply_quote_mark"));
-    if (!replyQuote.isEmpty()) {
-        addKmailConfig(QStringLiteral("TemplateParser"), QStringLiteral("QuoteString"), replyQuote);
-    }
-    const QString forwardQuote = group.readEntry(QStringLiteral("forward_quote_mark"));
-    if (!forwardQuote.isEmpty()) {
-        //Not implemented in kmail
-    }
-    const QString replyQuoteFormat = group.readEntry(QStringLiteral("reply_quote_format"));
-    if (!replyQuoteFormat.isEmpty()) {
-        addKmailConfig(QStringLiteral("TemplateParser"), QStringLiteral("TemplateReply"), convertToKmailTemplate(replyQuoteFormat));
-    }
-    const QString forwardQuoteFormat = group.readEntry(QStringLiteral("forward_quote_format"));
-    if (!forwardQuoteFormat.isEmpty()) {
-        addKmailConfig(QStringLiteral("TemplateParser"), QStringLiteral("TemplateForward"), convertToKmailTemplate(forwardQuoteFormat));
-    }
-}
-
-void SylpheedSettings::readDateFormat(const KConfigGroup &group)
-{
-    const QString dateFormat = group.readEntry(QStringLiteral("date_format"));
-    if (!dateFormat.isEmpty()) {
-        addKmailConfig(QStringLiteral("General"), QStringLiteral("customDateFormat"), dateFormat);
-    }
-}
-
-void SylpheedSettings::readTagColor(const KConfigGroup &group)
-{
-    Q_UNUSED(group);
-    //TODO
-}
-
-void SylpheedSettings::readSettingsColor(const KConfigGroup &group)
-{
-    const bool enableColor = group.readEntry("enable_color", false);
-    if (enableColor) {
-        const int colorLevel1 = group.readEntry("quote_level1_color", -1);
-        if (colorLevel1 != -1) {
-            //[Reader]  QuotedText1
-        }
-        const int colorLevel2 = group.readEntry("quote_level2_color", -1);
-        if (colorLevel2 != -1) {
-            //[Reader]  QuotedText2
-        }
-        const int colorLevel3 = group.readEntry("quote_level3_color", -1);
-        if (colorLevel3 != -1) {
-            //[Reader]  QuotedText3
-        }
-    }
-}
-
-QString SylpheedSettings::convertToKmailTemplate(const QString &templateStr)
-{
-    QString newTemplate = templateStr;
-    newTemplate.replace(QStringLiteral("%date"), QStringLiteral("%DATE"));
-    newTemplate.replace(QStringLiteral("%d"), QStringLiteral("%DATE"));
-    newTemplate.replace(QStringLiteral("%from"), QStringLiteral("%OTONAME"));
-    newTemplate.replace(QStringLiteral("%f"), QStringLiteral("%OTONAME"));
-    newTemplate.replace(QStringLiteral("%to"), QStringLiteral("%TONAME"));
-    newTemplate.replace(QStringLiteral("%t"), QStringLiteral("%TONAME"));
-    newTemplate.replace(QStringLiteral("%cc"), QStringLiteral("%CCNAME"));
-    newTemplate.replace(QStringLiteral("%c"), QStringLiteral("%CCNAME"));
-
-    newTemplate.replace(QStringLiteral("%email"), QStringLiteral("%OFROMNAME"));
-    newTemplate.replace(QStringLiteral("%A"), QStringLiteral("%OFROMNAME"));
-
-    newTemplate.replace(QStringLiteral("%cursor"), QStringLiteral("%CURSOR"));
-    newTemplate.replace(QStringLiteral("%X"), QStringLiteral("%CURSOR"));
-
-    newTemplate.replace(QStringLiteral("%msg"), QStringLiteral("%TEXT"));
-    newTemplate.replace(QStringLiteral("%M"), QStringLiteral("%TEXT"));
-
-    newTemplate.replace(QStringLiteral("%quoted_msg"), QStringLiteral("%QUOTE"));
-    newTemplate.replace(QStringLiteral("%Q"), QStringLiteral("%QUOTE"));
-
-    newTemplate.replace(QStringLiteral("%subject"), QStringLiteral("%OFULLSUBJECT"));
-    newTemplate.replace(QStringLiteral("%s"), QStringLiteral("%OFULLSUBJECT"));
-
-    newTemplate.replace(QStringLiteral("%messageid"), QStringLiteral("%MSGID"));
-    newTemplate.replace(QStringLiteral("%i"), QStringLiteral("%MSGID"));
-
-    newTemplate.replace(QStringLiteral("%firstname"), QStringLiteral("%OFROMNAME"));
-    newTemplate.replace(QStringLiteral("%F"), QStringLiteral("%OFROMNAME"));
-
-    newTemplate.replace(QStringLiteral("%lastname"), QStringLiteral("%OFROMLNAME"));
-    newTemplate.replace(QStringLiteral("%L"), QStringLiteral("%OFROMLNAME"));
-
-    newTemplate.replace(QStringLiteral("%fullname"), QStringLiteral("%OFROMFNAME"));
-    newTemplate.replace(QStringLiteral("%N"), QStringLiteral("%OFROMFNAME"));
-    //TODO add more variable
-    return newTemplate;
-}
-
-void SylpheedSettings::readSignature(const KConfigGroup &accountConfig, KIdentityManagement::Identity *identity)
-{
-    KIdentityManagement::Signature signature;
-    const int signatureType = accountConfig.readEntry("signature_type", 0);
-    switch (signatureType) {
-    case 0: //File
-        signature.setType(KIdentityManagement::Signature::FromFile);
-        signature.setPath(accountConfig.readEntry("signature_path"), false);
-        break;
-    case 1: //Output
-        signature.setType(KIdentityManagement::Signature::FromCommand);
-        signature.setPath(accountConfig.readEntry("signature_path"), true);
-        break;
-    case 2: //Text
-        signature.setType(KIdentityManagement::Signature::Inlined);
-        signature.setText(accountConfig.readEntry("signature_text"));
-        break;
-    default:
-        qCDebug(IMPORTWIZARD_LOG) << " signature type unknown :" << signatureType;
-    }
-    const int signatureEnabled = accountConfig.readEntry("auto_signature", -1);
-    switch (signatureEnabled) {
-    case -1:
-        break;
-    case 0:
-        signature.setEnabledSignature(false);
-        break;
-    case 1:
-        signature.setEnabledSignature(true);
-        break;
-    default:
-        qCDebug(IMPORTWIZARD_LOG) << " auto_signature undefined " << signatureEnabled;
-    }
-
-    //TODO  const bool signatureBeforeQuote = ( accountConfig.readEntry( "signature_before_quote", 0 ) == 1 ); not implemented in kmail
-
-    identity->setSignature(signature);
-}
-
-void SylpheedSettings::readPop3Account(const KConfigGroup &accountConfig, bool checkMailOnStartup, int intervalCheckMail)
-{
-    QMap<QString, QVariant> settings;
-    const QString host = accountConfig.readEntry("receive_server");
-    settings.insert(QStringLiteral("Host"), host);
-
-    const QString name = accountConfig.readEntry(QStringLiteral("name"));
-    const QString inbox = MailCommon::Util::convertFolderPathToCollectionStr(accountConfig.readEntry(QStringLiteral("inbox")));
-    settings.insert(QStringLiteral("TargetCollection"), inbox);
-    int port = 0;
-    if (SylpheedSettingsUtils::readConfig(QStringLiteral("pop_port"), accountConfig, port, true)) {
-        settings.insert(QStringLiteral("Port"), port);
-    }
-    if (accountConfig.hasKey(QStringLiteral("ssl_pop"))) {
-        const int sslPop = accountConfig.readEntry(QStringLiteral("ssl_pop"), 0);
-        switch (sslPop) {
-        case 0:
-            //Nothing
-            break;
-        case 1:
-            settings.insert(QStringLiteral("UseSSL"), true);
-            break;
-        case 2:
-            settings.insert(QStringLiteral("UseTLS"), true);
-            break;
-        default:
-            qCDebug(IMPORTWIZARD_LOG) << " unknown ssl_pop value " << sslPop;
-            break;
-        }
-    }
-    if (accountConfig.hasKey(QStringLiteral("remove_mail"))) {
-        const bool removeMail = (accountConfig.readEntry(QStringLiteral("remove_mail"), 1) == 1);
-        settings.insert(QStringLiteral("LeaveOnServer"), removeMail);
-    }
-
-    if (accountConfig.hasKey(QStringLiteral("message_leave_time"))) {
-        settings.insert(QStringLiteral("LeaveOnServerDays"), accountConfig.readEntry(QStringLiteral("message_leave_time")));
-    }
-    const QString user = accountConfig.readEntry(QStringLiteral("user_id"));
-    settings.insert(QStringLiteral("Login"), user);
-
-    const QString password = accountConfig.readEntry(QStringLiteral("password"));
-    settings.insert(QStringLiteral("Password"), password);
-
-    //use_apop_auth
-    if (accountConfig.hasKey(QStringLiteral("use_apop_auth"))) {
-        const bool useApop = (accountConfig.readEntry(QStringLiteral("use_apop_auth"), 1) == 1);
-        if (useApop) {
-            settings.insert(QStringLiteral("AuthenticationMethod"), MailTransport::Transport::EnumAuthenticationType::APOP);
-        }
-    }
-    if (intervalCheckMail != -1) {
-        settings.insert(QStringLiteral("IntervalCheckEnabled"), true);
-        settings.insert(QStringLiteral("IntervalCheckInterval"), intervalCheckMail);
-    }
-
-    const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
-    addCheckMailOnStartup(agentIdentifyName, checkMailOnStartup);
-    const bool enableManualCheck = (accountConfig.readEntry(QStringLiteral("receive_at_get_all"), 0) == 1);
-    addToManualCheck(agentIdentifyName, enableManualCheck);
-}
-
-void SylpheedSettings::readImapAccount(const KConfigGroup &accountConfig, bool checkMailOnStartup, int intervalCheckMail)
-{
-    QMap<QString, QVariant> settings;
-    const QString host = accountConfig.readEntry("receive_server");
-    settings.insert(QStringLiteral("ImapServer"), host);
-
-    const QString name = accountConfig.readEntry(QStringLiteral("name"));
-    const int sslimap = accountConfig.readEntry(QStringLiteral("ssl_imap"), 0);
-    switch (sslimap) {
-    case 0:
-        //None
-        settings.insert(QStringLiteral("Safety"), QStringLiteral("NONE"));
-        break;
-    case 1:
-        //SSL
-        settings.insert(QStringLiteral("Safety"), QStringLiteral("SSL"));
-        break;
-    case 2:
-        //TLS
-        settings.insert(QStringLiteral("Safety"), QStringLiteral("STARTTLS"));
-        break;
-    default:
-        qCDebug(IMPORTWIZARD_LOG) << " sslimap unknown " << sslimap;
-        break;
-    }
-
-    int port = 0;
-    if (SylpheedSettingsUtils::readConfig(QStringLiteral("imap_port"), accountConfig, port, true)) {
-        settings.insert(QStringLiteral("ImapPort"), port);
-    }
-
-    QString trashFolder;
-    if (SylpheedSettingsUtils::readConfig(QStringLiteral("trash_folder"), accountConfig, trashFolder, false)) {
-        settings.insert(QStringLiteral("TrashCollection"), MailCommon::Util::convertFolderPathToCollectionId(trashFolder));
-    }
-
-    const int auth = accountConfig.readEntry(QStringLiteral("imap_auth_method"), 0);
-    switch (auth) {
-    case 0:
-        break;
-    case 1: //Login
-        settings.insert(QStringLiteral("Authentication"), MailTransport::Transport::EnumAuthenticationType::LOGIN);
-        break;
-    case 2: //Cram-md5
-        settings.insert(QStringLiteral("Authentication"), MailTransport::Transport::EnumAuthenticationType::CRAM_MD5);
-        break;
-    case 4: //Plain
-        settings.insert(QStringLiteral("Authentication"), MailTransport::Transport::EnumAuthenticationType::PLAIN);
-        break;
-    default:
-        qCDebug(IMPORTWIZARD_LOG) << " imap auth unknown " << auth;
-        break;
-    }
-
-    if (intervalCheckMail != -1) {
-        settings.insert(QStringLiteral("IntervalCheckEnabled"), true);
-        settings.insert(QStringLiteral("IntervalCheckTime"), intervalCheckMail);
-    }
-
-    const QString password = accountConfig.readEntry(QStringLiteral("password"));
-    settings.insert(QStringLiteral("Password"), password);
-
-    const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
-    addCheckMailOnStartup(agentIdentifyName, checkMailOnStartup);
-
-    const bool enableManualCheck = (accountConfig.readEntry(QStringLiteral("receive_at_get_all"), 0) == 1);
-    addToManualCheck(agentIdentifyName, enableManualCheck);
-}
-
-void SylpheedSettings::readAccount(const KConfigGroup &accountConfig, bool checkMailOnStartup, int intervalCheckMail)
-{
-    if (accountConfig.hasKey(QStringLiteral("protocol"))) {
-        const int protocol = accountConfig.readEntry(QStringLiteral("protocol"), 0);
-        switch (protocol) {
-        case 0:
-            readPop3Account(accountConfig, checkMailOnStartup, intervalCheckMail);
-            break;
-        case 3:
-            //imap
-            readImapAccount(accountConfig, checkMailOnStartup, intervalCheckMail);
-            break;
-        case 4:
-            qCDebug(IMPORTWIZARD_LOG) << " Add it when nntp resource will implemented";
-            //news
-            break;
-        case 5:
-            //local
-            break;
-        default:
-            qCDebug(IMPORTWIZARD_LOG) << " protocol not defined" << protocol;
-        }
-    }
-}
-
-void SylpheedSettings::readIdentity(const KConfigGroup &accountConfig)
-{
-    QString name = accountConfig.readEntry(QStringLiteral("name"));
-    KIdentityManagement::Identity *identity  = createIdentity(name);
-
-    identity->setFullName(name);
-    identity->setIdentityName(name);
-    const QString organization = accountConfig.readEntry(QStringLiteral("organization"), QString());
-    identity->setOrganization(organization);
-    const QString email = accountConfig.readEntry(QStringLiteral("address"));
-    identity->setPrimaryEmailAddress(email);
-
-    QString value;
-    if (SylpheedSettingsUtils::readConfig(QStringLiteral("auto_bcc"), accountConfig, value, true)) {
-        identity->setBcc(value);
-    }
-    if (SylpheedSettingsUtils::readConfig(QStringLiteral("auto_cc"), accountConfig, value, true)) {
-        identity->setCc(value);
-    }
-    if (SylpheedSettingsUtils::readConfig(QStringLiteral("auto_replyto"), accountConfig, value, true)) {
-        identity->setReplyToAddr(value);
-    }
-
-    if (SylpheedSettingsUtils::readConfig(QStringLiteral("daft_folder"), accountConfig, value, false)) {
-        identity->setDrafts(MailCommon::Util::convertFolderPathToCollectionStr(value));
-    }
-
-    if (SylpheedSettingsUtils::readConfig(QStringLiteral("sent_folder"), accountConfig, value, false)) {
-        identity->setFcc(MailCommon::Util::convertFolderPathToCollectionStr(value));
-    }
-
-    const QString transportId = readTransport(accountConfig);
-    if (!transportId.isEmpty()) {
-        identity->setTransport(transportId);
-    }
-    readSignature(accountConfig, identity);
-    storeIdentity(identity);
-}
-
-QString SylpheedSettings::readTransport(const KConfigGroup &accountConfig)
-{
-    const QString smtpserver = accountConfig.readEntry("smtp_server");
-
-    if (!smtpserver.isEmpty()) {
-        MailTransport::Transport *mt = createTransport();
-        mt->setType(MailTransport::Transport::EnumType::SMTP);
-        mt->setName(smtpserver);
-        mt->setHost(smtpserver);
-        int port = 0;
-        if (SylpheedSettingsUtils::readConfig(QStringLiteral("smtp_port"), accountConfig, port, true)) {
-            mt->setPort(port);
-        }
-        const QString user = accountConfig.readEntry(QStringLiteral("smtp_user_id"));
-
-        if (!user.isEmpty()) {
-            mt->setUserName(user);
-            mt->setRequiresAuthentication(true);
-        }
-        const QString password = accountConfig.readEntry(QStringLiteral("smtp_password"));
-        if (!password.isEmpty()) {
-            mt->setStorePassword(true);
-            mt->setPassword(password);
-        }
-        if (accountConfig.readEntry(QStringLiteral("use_smtp_auth"), 0) == 1) {
-            const int authMethod = accountConfig.readEntry(QStringLiteral("smtp_auth_method"), 0);
-            switch (authMethod) {
-            case 0: //Automatic:
-                mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN); //????
-                break;
-            case 1: //Login
-                mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::LOGIN);
-                break;
-            case 2: //Cram-MD5
-                mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::CRAM_MD5);
-                break;
-            case 8: //Plain
-                mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN);
-                break;
-            default:
-                qCDebug(IMPORTWIZARD_LOG) << " smtp authentication unknown :" << authMethod;
-            }
-        }
-        const int sslSmtp = accountConfig.readEntry(QStringLiteral("ssl_smtp"), 0);
-        switch (sslSmtp) {
-        case 0:
-            mt->setEncryption(MailTransport::Transport::EnumEncryption::None);
-            break;
-        case 1:
-            mt->setEncryption(MailTransport::Transport::EnumEncryption::SSL);
-            break;
-        case 2:
-            mt->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
-            break;
-        default:
-            qCDebug(IMPORTWIZARD_LOG) << " smtp ssl config unknown :" << sslSmtp;
-
-        }
-        QString domainName;
-        if (SylpheedSettingsUtils::readConfig(QStringLiteral("domain"), accountConfig, domainName, false)) {
-            mt->setLocalHostname(domainName);
-        }
-
-        storeTransport(mt, true);
-        return QString::number(mt->id());
-    }
-    return QString();
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedsettings.h akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedsettings.h
--- akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedsettings.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedsettings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef SYLPHEEDSETTINGS_H
-#define SYLPHEEDSETTINGS_H
-
-#include "abstractsettings.h"
-#include <QString>
-
-class ImportWizard;
-class KConfigGroup;
-class QFile;
-
-class SylpheedSettings : public AbstractSettings
-{
-public:
-    explicit SylpheedSettings(ImportWizard *parent);
-    ~SylpheedSettings();
-    virtual void importSettings(const QString &filename, const QString &path);
-
-protected:
-    void readCustomHeader(QFile *customHeaderFile);
-    virtual void readGlobalSettings(const KConfigGroup &group);
-    void readAccount(const KConfigGroup &accountConfig, bool checkMailOnStartup, int intervalCheckMail);
-    void readIdentity(const KConfigGroup &accountConfig);
-    QString readTransport(const KConfigGroup &accountConfig);
-    void readPop3Account(const KConfigGroup &accountConfig, bool checkMailOnStartup, int intervalCheckMail);
-    void readImapAccount(const KConfigGroup &accountConfig, bool checkMailOnStartup, int intervalCheckMail);
-    void readSignature(const KConfigGroup &accountConfig, KIdentityManagement::Identity *identity);
-
-    virtual void readSettingsColor(const KConfigGroup &group);
-    virtual void readTemplateFormat(const KConfigGroup &group);
-
-    virtual void readTagColor(const KConfigGroup &group);
-
-    virtual void readDateFormat(const KConfigGroup &group);
-    QString convertToKmailTemplate(const QString &templateStr);
-
-};
-
-#endif /* SYLPHEEDSETTINGS_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedsettingsutils.cpp akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedsettingsutils.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedsettingsutils.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedsettingsutils.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "sylpheedsettingsutils.h"
-
-bool SylpheedSettingsUtils::readConfig(const QString &key, const KConfigGroup &accountConfig, int &value, bool remove_underscore)
-{
-    QString cleanedKey(key);
-    if (remove_underscore) {
-        cleanedKey.remove(QLatin1Char('_'));
-    }
-    const QString useKey = QLatin1String("set_") + cleanedKey;
-    if (accountConfig.hasKey(useKey) && (accountConfig.readEntry(useKey, 0) == 1)) {
-        value = accountConfig.readEntry(key, 0);
-        return true;
-    }
-    return false;
-}
-
-bool SylpheedSettingsUtils::readConfig(const QString &key, const KConfigGroup &accountConfig, QString &value, bool remove_underscore)
-{
-    QString cleanedKey(key);
-    if (remove_underscore) {
-        cleanedKey.remove(QLatin1Char('_'));
-    }
-    const QString useKey = QLatin1String("set_") + cleanedKey;
-    if (accountConfig.hasKey(useKey) && (accountConfig.readEntry(useKey, 0) == 1)) {
-        value = accountConfig.readEntry(key);
-        return true;
-    }
-    return false;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedsettingsutils.h akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedsettingsutils.h
--- akonadi-import-wizard-17.04.3/src/autodetect/sylpheed/sylpheedsettingsutils.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/sylpheed/sylpheedsettingsutils.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef SYLPHEEDSETTINGSUTILS_H
-#define SYLPHEEDSETTINGSUTILS_H
-
-#include <QString>
-#include <KConfigGroup>
-
-namespace SylpheedSettingsUtils
-{
-bool readConfig(const QString &key, const KConfigGroup &accountConfig, int &value, bool remove_underscore);
-bool readConfig(const QString &key, const KConfigGroup &accountConfig, QString &value, bool remove_underscore);
-}
-
-#endif // SYLPHEEDSETTINGSUTILS_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/thebat/thebatimportdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/thebat/thebatimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/thebat/thebatimportdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/thebat/thebatimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "thebat/thebatimportdata.h"
-#include "mailimporter/filterthebat.h"
-#include "mailimporter/filterinfo.h"
-#include "importfilterinfogui.h"
-#include "importwizard.h"
-
-#include <KLocalizedString>
-
-#include <QDir>
-
-TheBatImportData::TheBatImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    //TODO fix it
-    mPath = QDir::homePath();
-}
-
-TheBatImportData::~TheBatImportData()
-{
-}
-
-bool TheBatImportData::foundMailer() const
-{
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-    return false;
-}
-
-QString TheBatImportData::name() const
-{
-    return QStringLiteral("TheBat");
-}
-
-bool TheBatImportData::importMails()
-{
-    MailImporter::FilterTheBat thebat;
-    initializeFilter(thebat);
-    thebat.filterInfo()->setStatusMessage(i18n("Import in progress"));
-    QDir directory(mPath);
-    if (directory.exists()) {
-        thebat.importMails(mPath);
-    } else {
-        thebat.import();
-    }
-    thebat.filterInfo()->setStatusMessage(i18n("Import finished"));
-    return true;
-}
-
-AbstractImporter::TypeSupportedOptions TheBatImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/thebat/thebatimportdata.h akonadi-import-wizard-17.08.3/src/autodetect/thebat/thebatimportdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/thebat/thebatimportdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/thebat/thebatimportdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef TheBatImportData_H
-#define TheBatImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class TheBatImportData : public AbstractImporter
-{
-public:
-    explicit TheBatImportData(ImportWizard *parent);
-    ~TheBatImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importMails() Q_DECL_OVERRIDE;
-    QString name() const Q_DECL_OVERRIDE;
-
-};
-
-#endif /* TheBatImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/addressbook/license.txt akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/addressbook/license.txt
--- akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/addressbook/license.txt	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/addressbook/license.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-Software License Agreement (BSD License)
-
-Copyright (c) 2006, ScalingWeb.com
-All rights reserved.
-
-Redistribution and use of this software in source and binary forms, with or without modification, are
-permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the above
-  copyright notice, this list of conditions and the
-  following disclaimer in the documentation and/or other
-  materials provided with the distribution.
-
-* Neither the name of ScalingWeb.com nor the names of its
-  contributors may be used to endorse or promote products
-  derived from this software without specific prior
-  written permission of ScalingWeb.com.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/addressbook/MorkParser.cpp akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/addressbook/MorkParser.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/addressbook/MorkParser.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/addressbook/MorkParser.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,542 +0,0 @@
-////////////////////////////////////////////////////////////////////
-///
-///   MorkParser.cpp - Mozilla Mork Format Parser/Reader implementation
-///
-///   Copyright (C) 2007 ScalingWeb.com
-///   All rights reserved.
-///
-///   Authors: Yuriy Soroka <ysoroka@scalingweb.com>
-///               Anton Fedoruk <afedoruk@scalingweb.com>
-///
-///
-///////////////////////////////////////////////////////////////////
-
-#include "MorkParser.h"
-#include <QFile>
-#include <QIODevice>
-//        =============================================================
-//        MorkParser::MorkParser
-
-MorkParser::MorkParser(int DefaultScope)
-{
-    initVars();
-    mDefaultScope = DefaultScope;
-}
-
-//        =============================================================
-//        MorkParser::open
-
-bool MorkParser::open(const QString &path)
-{
-    initVars();
-
-    QFile MorkFile(path);
-
-    // Open file
-    if (!MorkFile.exists() ||
-            !MorkFile.open(QIODevice::ReadOnly)) {
-        mError = FailedToOpen;
-        return false;
-    }
-
-    // Check magic header
-    QByteArray MagicHeader = MorkFile.readLine();
-
-    if (!MagicHeader.contains(MorkMagicHeader)) {
-        mError = UnsupportedVersion;
-        return false;
-    }
-
-    mMorkData = MorkFile.readAll();
-    MorkFile.close();
-
-    // Parse mork
-    return parse();
-}
-
-//        =============================================================
-//        MorkParser::error
-
-MorkErrors MorkParser::error() const
-{
-    return mError;
-}
-
-//        =============================================================
-//        MorkParser::initVars
-
-void MorkParser::initVars()
-{
-    mError = NoError;
-    mMorkPos = 0;
-    nowParsing_ = NPValues;
-    mCurrentCells = nullptr;
-    mNextAddValueId = 0x7fffffff;
-}
-
-//        =============================================================
-//        MorkParser::parse
-
-bool MorkParser::parse()
-{
-    bool Result = true;
-    char cur = 0;
-
-    // Run over mork chars and parse each term
-    cur = nextChar();
-
-    while (Result && cur) {
-        if (!isWhiteSpace(cur)) {
-            // Figure out what a term
-            switch (cur) {
-            case '<':
-                // Dict
-                Result = parseDict();
-                break;
-            case '/':
-                // Comment
-                Result = parseComment();
-                break;
-            case '{':
-                Result = parseTable();
-                // Table
-                break;
-            case '[':
-                Result = parseRow(0, 0);
-                // Row
-                break;
-            case '@':
-                Result = parseGroup();
-                // Group
-                break;
-            default:
-                mError = DefectedFormat;
-                Result = false;
-                break;
-            }
-        }
-
-        // Get next char
-        cur = nextChar();
-    }
-
-    return Result;
-}
-
-//        =============================================================
-//        MorkParser::isWhiteSpace
-
-bool MorkParser::isWhiteSpace(char c) const
-{
-    switch (c) {
-    case ' ':
-    case '\t':
-    case '\r':
-    case '\n':
-    case '\f':
-        return true;
-    default:
-        return false;
-    }
-}
-
-//        =============================================================
-//        MorkParser::nextChar
-
-char MorkParser::nextChar()
-{
-    char cur = 0;
-
-    if (mMorkPos < mMorkData.length()) {
-        cur = mMorkData[ mMorkPos ];
-        mMorkPos++;
-    }
-
-    if (!cur) {
-        cur = 0;
-    }
-
-    return cur;
-}
-
-//        =============================================================
-//        MorkParser::parseDict
-
-bool MorkParser::parseDict()
-{
-    char cur = nextChar();
-    bool Result = true;
-    nowParsing_ = NPValues;
-
-    while (Result && cur != '>' && cur) {
-        if (!isWhiteSpace(cur)) {
-            switch (cur) {
-            case '<':
-                if (mMorkData.mid(mMorkPos - 1, strlen(MorkDictColumnMeta))
-                        == MorkDictColumnMeta) {
-                    nowParsing_ = NPColumns;
-                    mMorkPos += strlen(MorkDictColumnMeta) - 1;
-                }
-                break;
-            case '(':
-                Result = parseCell();
-                break;
-            case '/':
-                Result = parseComment();
-                break;
-
-            }
-        }
-
-        cur = nextChar();
-    }
-
-    return Result;
-}
-
-//        =============================================================
-//        MorkParser::parseComment
-
-bool MorkParser::parseComment()
-{
-    char cur = nextChar();
-    if ('/' != cur) {
-        return false;
-    }
-
-    while (cur != '\r' && cur != '\n' && cur) {
-        cur = nextChar();
-    }
-
-    return true;
-}
-
-//        =============================================================
-//        MorkParser::parseCell
-
-bool MorkParser::parseCell()
-{
-    bool Result = true;
-    bool bColumnOid = false;
-    bool bValueOid = false;
-    bool bColumn = true;
-    int Corners = 0;
-
-    // Column = Value
-    QString Column;
-    QString Text;
-
-    char cur = nextChar();
-
-    // Process cell start with column (bColumn == true)
-    while (Result && cur != ')' && cur) {
-        switch (cur) {
-        case '^':
-            // Oids
-            Corners++;
-            if (Corners == 1) {
-                bColumnOid = true;
-            } else if (Corners == 2) {
-                bColumn = false;
-                bValueOid = true;
-            } else {
-                Text += cur;
-            }
-
-            break;
-        case '=':
-            // From column to value
-            if (bColumn) {
-                bColumn = false;
-            } else {
-                Text += cur;
-            }
-            break;
-        case '\\': {
-            // Get next two chars
-            char NextChar = nextChar();
-            if ('\r' != NextChar && '\n' != NextChar) {
-                Text += NextChar;
-            } else {
-                nextChar();
-            }
-        }
-        break;
-        case '$': {
-            // Get next two chars
-            QString HexChar;
-            HexChar += nextChar();
-            HexChar += nextChar();
-            Text += (char) HexChar.toInt(nullptr, 16);
-        }
-        break;
-        default:
-            // Just a char
-            if (bColumn) {
-                Column += cur;
-            } else {
-                Text += cur;
-            }
-            break;
-        }
-
-        cur = nextChar();
-    }
-    Q_UNUSED(bColumnOid);
-    // Apply column and text
-    int ColumnId = Column.toInt(nullptr, 16);
-
-    if (NPRows != nowParsing_) {
-        // Dicts
-        if (!Text.isEmpty()) {
-            if (nowParsing_ == NPColumns) {
-                mColumns[ ColumnId ] = Text;
-                //qCDebug(IMPORTWIZARD_LOG)<<" column :"<<ColumnId<<" Text "<<Text;
-            } else {
-                mValues[ ColumnId ] = Text;
-                //qCDebug(IMPORTWIZARD_LOG)<<" ColumnId "<<ColumnId<<" Value : "<<Text;
-            }
-        }
-    } else {
-        if (!Text.isEmpty()) {
-            // Rows
-            int ValueId = Text.toInt(nullptr, 16);
-
-            if (bValueOid) {
-                (*mCurrentCells)[ ColumnId ] = ValueId;
-            } else {
-                mNextAddValueId--;
-                mValues[ mNextAddValueId ] = Text;
-                (*mCurrentCells)[ ColumnId ] = mNextAddValueId;
-            }
-        }
-    }
-    return Result;
-}
-
-//        =============================================================
-//        MorkParser::parseTable
-
-bool MorkParser::parseTable()
-{
-    bool Result = true;
-    QString TextId;
-    int Id = 0, Scope = 0;
-
-    char cur = nextChar();
-
-    // Get id
-    while (cur != '{' && cur != '[' && cur != '}' && cur) {
-        if (!isWhiteSpace(cur)) {
-            TextId += cur;
-        }
-
-        cur = nextChar();
-    }
-
-    parseScopeId(TextId, Id, Scope);
-
-    // Parse the table
-    while (Result && cur != '}' && cur) {
-        if (!isWhiteSpace(cur)) {
-            switch (cur) {
-            case '{':
-                Result = parseMeta('}');
-                break;
-            case '[':
-                Result = parseRow(Id, Scope);
-                break;
-            case '-':
-            case '+':
-                break;
-            default: {
-                QString JustId;
-                while (!isWhiteSpace(cur) && cur) {
-                    JustId += cur;
-                    cur = nextChar();
-
-                    if (cur == '}') {
-                        return Result;
-                    }
-                }
-
-                int JustIdNum = 0, JustScopeNum = 0;
-                parseScopeId(JustId, JustIdNum, JustScopeNum);
-
-                setCurrentRow(Scope, Id, JustScopeNum, JustIdNum);
-            }
-            break;
-            }
-        }
-
-        cur = nextChar();
-    }
-
-    return Result;
-}
-
-//        =============================================================
-//        MorkParser::parseScopeId
-
-void MorkParser::parseScopeId(const QString &textId, int &Id, int &Scope) const
-{
-    int Pos = 0;
-
-    if ((Pos = textId.indexOf(QLatin1Char(':'))) >= 0) {
-        QString tId = textId.mid(0, Pos);
-        QString tSc = textId.mid(Pos + 1, textId.length() - Pos);
-
-        if (tSc.length() > 1 && tSc[ 0 ] == '^') {
-            // Delete '^'
-            tSc.remove(0, 1);
-        }
-
-        Id =  tId.toInt(nullptr, 16);
-        Scope = tSc.toInt(nullptr, 16);
-    } else {
-        Id = textId.toInt(nullptr, 16);
-    }
-}
-
-//        =============================================================
-//        MorkParser::setCurrentRow
-
-void MorkParser::setCurrentRow(int TableScope, int TableId, int RowScope, int RowId)
-{
-    if (!RowScope) {
-        RowScope = mDefaultScope;
-    }
-
-    if (!TableScope) {
-        TableScope = mDefaultScope;
-    }
-
-    mCurrentCells = &(mMork[ abs(TableScope) ][ abs(TableId) ][ abs(RowScope) ][ abs(RowId) ]);
-}
-
-//        =============================================================
-//        MorkParser::parseRow
-
-bool MorkParser::parseRow(int TableId, int TableScope)
-{
-    bool Result = true;
-    QString TextId;
-    int Id = 0, Scope = 0;
-    nowParsing_ = NPRows;
-
-    char cur = nextChar();
-
-    // Get id
-    while (cur != '(' && cur != ']' && cur != '[' && cur) {
-        if (!isWhiteSpace(cur)) {
-            TextId += cur;
-        }
-
-        cur = nextChar();
-    }
-
-    parseScopeId(TextId, Id, Scope);
-    setCurrentRow(TableScope, TableId, Scope, Id);
-
-    // Parse the row
-    while (Result && cur != ']' && cur) {
-        if (!isWhiteSpace(cur)) {
-            switch (cur) {
-            case '(':
-                Result = parseCell();
-                break;
-            case '[':
-                Result = parseMeta(']');
-                break;
-            default:
-                Result = false;
-                break;
-            }
-        }
-
-        cur = nextChar();
-    }
-
-    return Result;
-}
-
-//        =============================================================
-//        MorkParser::parseGroup
-
-bool MorkParser::parseGroup()
-{
-    return parseMeta('@');
-}
-
-//        =============================================================
-//        MorkParser::parseMeta
-
-bool MorkParser::parseMeta(char c)
-{
-    char cur = nextChar();
-
-    while (cur != c && cur) {
-        cur = nextChar();
-    }
-
-    return true;
-}
-
-//        =============================================================
-//        MorkParser::getTables
-
-MorkTableMap *MorkParser::getTables(int TableScope)
-{
-    TableScopeMap::iterator iter;
-    iter = mMork.find(TableScope);
-
-    if (iter == mMork.end()) {
-        return nullptr;
-    }
-
-    return &iter.value();
-}
-
-//        =============================================================
-//        MorkParser::getRows
-
-MorkRowMap *MorkParser::getRows(int RowScope, RowScopeMap *table)
-{
-    RowScopeMap::iterator iter;
-    iter = table->find(RowScope);
-
-    if (iter == table->end()) {
-        return nullptr;
-    }
-
-    return &iter.value();
-}
-
-//        =============================================================
-//        MorkParser::getValue
-
-QString MorkParser::getValue(int oid)
-{
-    MorkDict::ConstIterator foundIter = mValues.constFind(oid);
-
-    if (foundIter == mValues.constEnd()) {
-        return QString();
-    }
-
-    return *foundIter;
-}
-
-//        =============================================================
-//        MorkParser::getColumn
-
-QString MorkParser::getColumn(int oid)
-{
-    MorkDict::ConstIterator foundIter = mColumns.constFind(oid);
-
-    if (foundIter == mColumns.constEnd()) {
-        return QString();
-    }
-
-    return *foundIter;
-}
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/addressbook/MorkParser.h akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/addressbook/MorkParser.h
--- akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/addressbook/MorkParser.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/addressbook/MorkParser.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +0,0 @@
-////////////////////////////////////////////////////////////////////
-///
-///   MorkParser.h - Mozilla Mork Format Parser/Reader
-///
-///   Copyright (C) 2007 ScalingWeb.com
-///   All rights reserved.
-///
-///   Authors: Yuriy Soroka <ysoroka@scalingweb.com>
-///               Anton Fedoruk <afedoruk@scalingweb.com>
-///
-///
-///////////////////////////////////////////////////////////////////
-
-#ifndef __MorkParser_h__
-#define __MorkParser_h__
-
-#include <QMap>
-#include <QByteArray>
-#include <iostream>
-class QString;
-// Types
-
-typedef QMap< int, QString > MorkDict;
-typedef QMap< int, int > MorkCells;                                        // ColumnId : ValueId
-typedef QMap< int, MorkCells > MorkRowMap;                        // Row id
-typedef QMap< int, MorkRowMap > RowScopeMap;                // Row scope
-typedef QMap< int, RowScopeMap > MorkTableMap;                // Table id
-typedef QMap< int, MorkTableMap > TableScopeMap;        // Table Scope
-
-// Mork header of supported format version
-const char MorkMagicHeader[] = "// <!-- <mdb:mork:z v=\"1.4\"/> -->";
-
-const char MorkDictColumnMeta[] = "<(a=c)>";
-
-// Error codes
-enum MorkErrors {
-    NoError = 0,
-    FailedToOpen,
-    UnsupportedVersion,
-    DefectedFormat
-};
-
-// Mork term types
-enum MorkTerm {
-    NoneTerm = 0,
-    DictTerm,
-    GroupTerm,
-    TableTerm,
-    RowTerm,
-    CellTerm,
-    CommentTerm,
-    LiteralTerm
-};
-
-/// Class MorkParser
-
-class MorkParser
-{
-public:
-
-    explicit MorkParser(int defaultScope = 0x80);
-
-    ///
-    /// Open and parse mork file
-
-    bool open(const QString &path);
-
-    ///
-    /// Return error status
-
-    MorkErrors error() const;
-
-    ///
-    /// Returns all tables of specified scope
-
-    MorkTableMap *getTables(int tableScope);
-
-    ///
-    /// Rerturns all rows under specified scope
-
-    MorkRowMap *getRows(int rowScope, RowScopeMap *table);
-
-    ///
-    /// Return value of specified value oid
-
-    QString getValue(int oid);
-
-    ///
-    /// Return value of specified column oid
-
-    QString getColumn(int oid);
-
-protected: // Members
-
-    void initVars();
-
-    bool isWhiteSpace(char c) const;
-    char nextChar();
-
-    void parseScopeId(const QString &TextId, int &Id, int &Scope) const;
-    void setCurrentRow(int TableScope, int TableId, int RowScope, int RowId);
-
-    // Parse methods
-    bool parse();
-    bool parseDict();
-    bool parseComment();
-    bool parseCell();
-    bool parseTable();
-    bool parseMeta(char c);
-    bool parseRow(int TableId, int TableScope);
-    bool parseGroup();
-
-protected: // Data
-
-    // Columns in mork means value names
-    MorkDict mColumns;
-    MorkDict mValues;
-
-    // All mork file data
-    TableScopeMap mMork;
-    MorkCells *mCurrentCells;
-
-    // Error status of last operation
-    MorkErrors mError;
-
-    // All Mork data
-    QByteArray mMorkData;
-
-    int mMorkPos;
-    int mNextAddValueId;
-    int mDefaultScope;
-
-    // Indicates intity is being parsed
-    enum { NPColumns, NPValues, NPRows } nowParsing_;
-
-};
-
-#endif // __MorkParser_h__
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/thunderbirdaddressbook.cpp akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/thunderbirdaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/thunderbirdaddressbook.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/thunderbirdaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,267 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "thunderbirdaddressbook.h"
-#include "addressbook/MorkParser.h"
-
-#include <KLocalizedString>
-#include <KContacts/Addressee>
-#include <QUrl>
-#include "importwizard_debug.h"
-
-ThunderBirdAddressBook::ThunderBirdAddressBook(const QDir &dir, ImportWizard *parent)
-    : AbstractAddressBook(parent),
-      mDir(dir)
-{
-}
-
-ThunderBirdAddressBook::~ThunderBirdAddressBook()
-{
-
-}
-
-void ThunderBirdAddressBook::importAddressBook()
-{
-    const QString path = mDir.path();
-    readAddressBook(path + QLatin1String("/impab.mab"));
-    const QStringList filesimportab = mDir.entryList(QStringList(QStringLiteral("impab-[0-9]*.map")), QDir::Files, QDir::Name);
-    for (const QString &file : filesimportab) {
-        readAddressBook(path + QLatin1Char('/') + file);
-    }
-    readAddressBook(path + QLatin1String("/abook.mab"));
-
-    const QStringList files = mDir.entryList(QStringList(QStringLiteral("abook-[0-9]*.map")), QDir::Files, QDir::Name);
-    for (const QString &file : files) {
-        readAddressBook(path + QLatin1Char('/') + file);
-    }
-    readAddressBook(path + QLatin1String("/history.mab"));
-
-    cleanUp();
-}
-
-void ThunderBirdAddressBook::readAddressBook(const QString &filename)
-{
-    MorkParser mork;
-    if (!mork.open(filename)) {
-        if (mork.error() == FailedToOpen) {
-            addAddressBookImportError(i18n("Contacts file '%1' not found", filename));
-        }
-        qCDebug(IMPORTWIZARD_LOG) << " error during read file " << filename << " Error type " << mork.error();
-        return;
-    }
-    MorkTableMap *tables = mork.getTables(0x80);
-    if (tables) {
-        MorkTableMap::iterator tableIterEnd(tables->end());
-        MorkRowMap *rows = nullptr;
-        for (MorkTableMap::iterator tableIter = tables->begin(); tableIter != tableIterEnd; ++tableIter) {
-            if (tableIter.key() != 0) {
-                rows = mork.getRows(0x80, &tableIter.value());
-                if (rows) {
-                    MorkRowMap::iterator endRow(rows->end());
-                    for (MorkRowMap::iterator rowIter = rows->begin(); rowIter != endRow; ++rowIter) {
-                        if (rowIter.key() != 0) {
-                            KContacts::Addressee contact;
-                            MorkCells cells = rowIter.value();
-                            MorkCells::iterator endCellIter = cells.end();
-                            KContacts::Address homeAddr = KContacts::Address(KContacts::Address::Home);
-                            KContacts::Address workAddr = KContacts::Address(KContacts::Address::Work);
-                            int birthday = -1;
-                            int birthmonth = -1;
-                            int birthyear = -1;
-
-                            for (MorkCells::iterator cellsIter = cells.begin(); cellsIter != endCellIter; ++cellsIter) {
-                                const QString value = mork.getValue(cellsIter.value());
-                                const QString column = mork.getColumn(cellsIter.key());
-                                qCDebug(IMPORTWIZARD_LOG) << "column :" << column << " value :" << value;
-                                if (column == QLatin1String("LastModifiedDate")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("RecordKey")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("AddrCharSet")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("LastRecordKey")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("ns:addrbk:db:table:kind:pab")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("ListName")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("ListNickName")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("ListDescription")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("ListTotalAddresses")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("LowercaseListName")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("ns:addrbk:db:table:kind:deleted")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("PhotoType")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("PreferDisplayName")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("PhotoURI")) {
-                                    KContacts::Picture photo;
-                                    photo.setUrl(value);
-                                    contact.setLogo(photo);
-                                } else if (column == QLatin1String("PhotoName")) {
-                                    //TODO: verify it
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("DbRowID")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("ns:addrbk:db:row:scope:card:all")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("ns:addrbk:db:row:scope:list:all")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("ns:addrbk:db:row:scope:data:all")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("FirstName")) {
-                                    contact.setName(value);
-                                } else if (column == QLatin1String("LastName")) {
-                                    contact.setFamilyName(value);
-                                } else if (column == QLatin1String("PhoneticFirstName")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("PhoneticLastName")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("DisplayName")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("NickName")) {
-                                    contact.setNickName(value);
-                                } else if (column == QLatin1String("PrimaryEmail")) {
-                                    contact.setEmails(QStringList() << value);
-                                } else if (column == QLatin1String("LowercasePrimaryEmail")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("SecondEmail")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("PreferMailFormat")) {
-                                    contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("MailPreferedFormatting"), value);
-                                } else if (column == QLatin1String("PopularityIndex")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("AllowRemoteContent")) {
-                                    contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("MailAllowToRemoteContent"), value);
-                                } else if (column == QLatin1String("WorkPhone")) {
-                                    contact.insertPhoneNumber(KContacts::PhoneNumber(value, KContacts::PhoneNumber::Work));
-                                } else if (column == QLatin1String("HomePhone")) {
-                                    contact.insertPhoneNumber(KContacts::PhoneNumber(value, KContacts::PhoneNumber::Home));
-                                } else if (column == QLatin1String("FaxNumber")) {
-                                    contact.insertPhoneNumber(KContacts::PhoneNumber(value, KContacts::PhoneNumber::Fax));
-                                } else if (column == QLatin1String("PagerNumber")) {
-                                    contact.insertPhoneNumber(KContacts::PhoneNumber(value, KContacts::PhoneNumber::Pager));
-                                } else if (column == QLatin1String("CellularNumber")) {
-                                    contact.insertPhoneNumber(KContacts::PhoneNumber(value, KContacts::PhoneNumber::Cell));
-                                } else if (column == QLatin1String("WorkPhoneType")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("HomePhoneType")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("FaxNumberType")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("PagerNumberType")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("CellularNumberType")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("HomeAddress")) {
-                                    homeAddr.setStreet(value);
-                                } else if (column == QLatin1String("HomeAddress2")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("HomeCity")) {
-                                    homeAddr.setLocality(value);
-                                } else if (column == QLatin1String("HomeState")) {
-                                    homeAddr.setRegion(value);
-                                } else if (column == QLatin1String("HomeZipCode")) {
-                                    homeAddr.setPostalCode(value);
-                                } else if (column == QLatin1String("HomeCountry")) {
-                                    homeAddr.setCountry(value);
-                                } else if (column == QLatin1String("WorkAddress")) {
-                                    workAddr.setStreet(value);
-                                } else if (column == QLatin1String("WorkAddress2")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("WorkCity")) {
-                                    workAddr.setLocality(value);
-                                } else if (column == QLatin1String("WorkState")) {
-                                    workAddr.setRegion(value);
-                                } else if (column == QLatin1String("WorkZipCode")) {
-                                    workAddr.setPostalCode(value);
-                                } else if (column == QLatin1String("WorkCountry")) {
-                                    workAddr.setCountry(value);
-                                } else if (column == QLatin1String("JobTitle")) {
-                                    contact.setTitle(value);
-                                } else if (column == QLatin1String("Department")) {
-                                    contact.setDepartment(value);
-                                } else if (column == QLatin1String("Company")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("_AimScreenName")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("AnniversaryYear")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("AnniversaryMonth")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("AnniversaryDay")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("SpouseName")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("FamilyName")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("WebPage1")) {
-                                    KContacts::ResourceLocatorUrl url;
-                                    url.setUrl(QUrl(value));
-                                    contact.setUrl(url);
-                                } else if (column == QLatin1String("WebPage2")) {
-                                    qCDebug(IMPORTWIZARD_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
-                                } else if (column == QLatin1String("BirthYear")) {
-                                    birthyear = value.toInt();
-                                } else if (column == QLatin1String("BirthMonth")) {
-                                    birthmonth = value.toInt();
-                                } else if (column == QLatin1String("BirthDay")) {
-                                    birthday = value.toInt();
-                                } else if (column == QLatin1String("Custom1")) {
-                                    contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("Custom1"), value);
-                                } else if (column == QLatin1String("Custom2")) {
-                                    contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("Custom2"), value);
-                                } else if (column == QLatin1String("Custom3")) {
-                                    contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("Custom3"), value);
-                                } else if (column == QLatin1String("Custom4")) {
-                                    contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("Custom4"), value);
-                                } else if (column == QLatin1String("Notes")) {
-                                    contact.setNote(value);
-                                } else {
-                                    qCDebug(IMPORTWIZARD_LOG) << " Columnn not implemented " << column;
-                                }
-                                //qCDebug(IMPORTWIZARD_LOG)<<" value :"<<value<<" column"<<column;
-                            }
-
-                            if (!homeAddr.isEmpty()) {
-                                contact.insertAddress(homeAddr);
-                            }
-                            if (!workAddr.isEmpty()) {
-                                contact.insertAddress(workAddr);
-                            }
-
-                            const QDate birthDate(birthyear, birthmonth, birthday);
-                            if (birthDate.isValid()) {
-                                contact.setBirthday(birthDate);
-                            }
-                            addImportContactNote(contact, QStringLiteral("Thunderbird"));
-                            createContact(contact);
-                            qCDebug(IMPORTWIZARD_LOG) << "-----------------------";
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/thunderbirdaddressbook.h akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/thunderbirdaddressbook.h
--- akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/thunderbirdaddressbook.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/thunderbirdaddressbook.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef THUNDERBIRDADDRESSBOOK_H
-#define THUNDERBIRDADDRESSBOOK_H
-
-#include "abstractaddressbook.h"
-#include <QDir>
-
-class ImportWizard;
-
-class ThunderBirdAddressBook: public AbstractAddressBook
-{
-    Q_OBJECT
-public:
-    explicit ThunderBirdAddressBook(const QDir &dir, ImportWizard *parent);
-    ~ThunderBirdAddressBook();
-
-    void importAddressBook();
-private:
-    void readAddressBook(const QString &filename);
-    QDir mDir;
-};
-
-#endif // THUNDERBIRDADDRESSBOOK_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/thunderbirdimportdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/thunderbirdimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/thunderbirdimportdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/thunderbirdimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,143 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "thunderbirdimportdata.h"
-#include "importfilterinfogui.h"
-#include "thunderbirdsettings.h"
-#include "thunderbirdaddressbook.h"
-
-#include "mailimporter/filterthunderbird.h"
-#include "mailimporter/filterinfo.h"
-#include "MailCommon/FilterImporterExporter"
-#include "importwizard.h"
-
-#include <KLocalizedString>
-
-#include <QDir>
-
-ThunderbirdImportData::ThunderbirdImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = MailImporter::FilterThunderbird::defaultSettingsPath();
-}
-
-ThunderbirdImportData::~ThunderbirdImportData()
-{
-}
-
-QString ThunderbirdImportData::defaultProfile()
-{
-    if (mDefaultProfile.isEmpty()) {
-        mDefaultProfile = MailImporter::FilterThunderbird::defaultProfile(mPath, mImportWizard);
-    }
-    return mDefaultProfile;
-}
-
-bool ThunderbirdImportData::foundMailer() const
-{
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-    return false;
-}
-
-bool ThunderbirdImportData::importAddressBook()
-{
-    const QDir addressbookDir(mPath + defaultProfile());
-    ThunderBirdAddressBook account(addressbookDir, mImportWizard);
-    account.importAddressBook();
-    return true;
-}
-
-QString ThunderbirdImportData::name() const
-{
-    return QStringLiteral("Thunderbird");
-}
-
-bool ThunderbirdImportData::importSettings()
-{
-    const QString accountFile = mPath + defaultProfile() + QLatin1String("/prefs.js");
-    if (QFileInfo::exists(accountFile)) {
-        ThunderbirdSettings account(accountFile, mImportWizard);
-        account.importSettings();
-    } else {
-        addImportSettingsInfo(i18n("Thunderbird settings not found."));
-    }
-    return true;
-}
-
-bool ThunderbirdImportData::importMails()
-{
-    //* This should be usually ~/.thunderbird/xxxx.default/Mail/Local Folders/
-    MailImporter::FilterThunderbird thunderbird;
-    initializeFilter(thunderbird);
-    thunderbird.filterInfo()->setStatusMessage(i18n("Import in progress"));
-    const QString mailsPath = mPath + defaultProfile() + QLatin1String("/Mail/Local Folders/");
-    QDir directory(mailsPath);
-    if (directory.exists()) {
-        thunderbird.importMails(mailsPath);
-    } else {
-        thunderbird.import();
-    }
-    thunderbird.filterInfo()->setStatusMessage(i18n("Import finished"));
-    return true;
-}
-
-bool ThunderbirdImportData::importFilters()
-{
-    const QString path(mPath + defaultProfile());
-    QDir dir(path);
-    bool filtersAdded = false;
-    const QStringList subDir = dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
-    if (subDir.isEmpty()) {
-        return true;
-    }
-
-    for (const QString &mailPath : subDir) {
-        const QString subMailPath(path + QLatin1Char('/') + mailPath);
-        QDir dirMail(subMailPath);
-        const QStringList subDirMail = dirMail.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
-        bool foundFilterFile = false;
-        for (const QString &file : subDirMail) {
-            const QString filterFile(subMailPath + QLatin1Char('/') + file + QLatin1String("/msgFilterRules.dat"));
-            if (QFileInfo::exists(filterFile)) {
-                foundFilterFile = true;
-                const bool added = addFilters(filterFile, MailCommon::FilterImporterExporter::ThunderBirdFilter);
-                if (!filtersAdded && added) {
-                    filtersAdded = true;
-                }
-            }
-        }
-        if (!foundFilterFile) {
-            return true;
-        }
-    }
-    return filtersAdded;
-}
-
-AbstractImporter::TypeSupportedOptions ThunderbirdImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    options |= AbstractImporter::Mails;
-    options |= AbstractImporter::Filters;
-    options |= AbstractImporter::Settings;
-    options |= AbstractImporter::AddressBooks;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/thunderbirdimportdata.h akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/thunderbirdimportdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/thunderbirdimportdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/thunderbirdimportdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef THUNDERBIRDIMPORTDATA_H
-#define THUNDERBIRDIMPORTDATA_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class ThunderbirdImportData : public AbstractImporter
-{
-public:
-    explicit ThunderbirdImportData(ImportWizard *parent);
-    ~ThunderbirdImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importSettings() Q_DECL_OVERRIDE;
-    bool importMails() Q_DECL_OVERRIDE;
-    bool importFilters() Q_DECL_OVERRIDE;
-    bool importAddressBook() Q_DECL_OVERRIDE;
-    QString name() const Q_DECL_OVERRIDE;
-private:
-    QString defaultProfile();
-
-    QString mDefaultProfile;
-};
-
-#endif /* THUNDERBIRDIMPORTDATA_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/thunderbirdsettings.cpp akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/thunderbirdsettings.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/thunderbirdsettings.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/thunderbirdsettings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1052 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "thunderbirdsettings.h"
-#include <mailtransport/transportmanager.h>
-#include "MailCommon/MailUtil"
-#include "importwizardutil.h"
-#include "helper_p.h"
-
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/signature.h>
-
-#include <QUrl>
-#include <KContacts/VCardConverter>
-#include <QTextStream>
-#include <QStringList>
-#include <QFile>
-#include "importwizard_debug.h"
-#include <QStandardPaths>
-#include <QFileInfo>
-#include <QDir>
-
-ThunderbirdSettings::ThunderbirdSettings(const QString &filename, ImportWizard *parent)
-    : AbstractSettings(parent),
-      mFileName(filename)
-{
-
-}
-
-ThunderbirdSettings::~ThunderbirdSettings()
-{
-}
-
-void ThunderbirdSettings::importSettings()
-{
-    QFile file(mFileName);
-    if (!file.open(QIODevice::ReadOnly)) {
-        qCDebug(IMPORTWIZARD_LOG) << " We can't open file" << mFileName;
-        return;
-    }
-    QTextStream stream(&file);
-    while (!stream.atEnd()) {
-        const QString line = stream.readLine();
-        if (line.startsWith(QStringLiteral("user_pref"))) {
-            if (line.contains(QStringLiteral("mail.smtpserver")) ||
-                    line.contains(QStringLiteral("mail.server.")) ||
-                    line.contains(QStringLiteral("mail.identity.")) ||
-                    line.contains(QStringLiteral("mail.account.")) ||
-                    line.contains(QStringLiteral("mail.accountmanager.")) ||
-                    line.contains(QStringLiteral("mailnews.")) ||
-                    line.contains(QStringLiteral("mail.compose.")) ||
-                    line.contains(QStringLiteral("mail.spellcheck")) ||
-                    line.contains(QStringLiteral("mail.SpellCheckBeforeSend")) ||
-                    line.contains(QStringLiteral("spellchecker.dictionary")) ||
-                    line.contains(QStringLiteral("ldap_")) ||
-                    line.contains(QStringLiteral("mail.biff.")) ||
-                    line.contains(QStringLiteral("mailnews.tags.")) ||
-                    line.contains(QStringLiteral("extensions.AutoResizeImage.")) ||
-                    line.contains(QStringLiteral("mail.phishing.")) ||
-                    line.contains(QStringLiteral("mail.display_glyph")) ||
-                    line.contains(QStringLiteral("extensions.sieve.account."))) {
-                insertIntoMap(line);
-            }
-        } else {
-            if (!line.startsWith(QLatin1Char('#')) ||
-                    line.isEmpty() ||
-                    line.startsWith(QStringLiteral("/*")) ||
-                    line.startsWith(QStringLiteral(" */")) ||
-                    line.startsWith(QStringLiteral(" *"))) {
-                qCDebug(IMPORTWIZARD_LOG) << " unstored line :" << line;
-            }
-
-        }
-    }
-    const QString mailAccountPreference = mHashConfig.value(QStringLiteral("mail.accountmanager.accounts")).toString();
-    if (mailAccountPreference.isEmpty()) {
-        return;
-    }
-    mAccountList = mailAccountPreference.split(QLatin1Char(','));
-    readTransport();
-    readAccount();
-    readGlobalSettings();
-    readLdapSettings();
-    readTagSettings();
-    readExtensionsSettings();
-}
-
-
-void ThunderbirdSettings::readExtensionsSettings()
-{
-    //AutoResizeImage
-    const QString filterPatternEnabledStr = QStringLiteral("extensions.AutoResizeImage.filterPatterns");
-    if (mHashConfig.contains(filterPatternEnabledStr)) {
-        const int filterPatternType = mHashConfig.value(filterPatternEnabledStr).toInt();
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("filter-source-type"), filterPatternType);
-    }
-    const QString filterPatternListStr = QStringLiteral("extensions.AutoResizeImage.filteringPatternsList");
-    if (mHashConfig.contains(filterPatternListStr)) {
-        const QString filterPatternList = mHashConfig.value(filterPatternListStr).toString();
-        //TODO decode it.
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("filter-source-pattern"), filterPatternList);
-    }
-
-    const QString enlargeImagesStr = QStringLiteral("extensions.AutoResizeImage.enlargeImages");
-    if (mHashConfig.contains(enlargeImagesStr)) {
-        const bool enlargeImages = mHashConfig.value(enlargeImagesStr).toBool();
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("enlarge-image-to-minimum"), enlargeImages);
-    }
-
-    const QString maxResolutionXStr = QStringLiteral("extensions.AutoResizeImage.maxResolutionX");
-    if (mHashConfig.contains(maxResolutionXStr)) {
-        const int val = mHashConfig.value(maxResolutionXStr).toInt();
-        int adaptedValue = adaptAutoResizeResolution(val, QStringLiteral("extensions.AutoResizeImage.maxResolutionXList"));
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("maximum-width"), adaptedValue);
-    }
-    const QString maxResolutionYStr = QStringLiteral("extensions.AutoResizeImage.maxResolutionY");
-    if (mHashConfig.contains(maxResolutionYStr)) {
-        const int val = mHashConfig.value(maxResolutionYStr).toInt();
-        int adaptedValue = adaptAutoResizeResolution(val, QStringLiteral("extensions.AutoResizeImage.maxResolutionYList"));
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("maximum-height"), adaptedValue);
-    }
-    const QString minResolutionXStr = QStringLiteral("extensions.AutoResizeImage.minResolutionX");
-    if (mHashConfig.contains(minResolutionXStr)) {
-        const int val = mHashConfig.value(minResolutionXStr).toInt();
-        int adaptedValue = adaptAutoResizeResolution(val, QStringLiteral("extensions.AutoResizeImage.minResolutionXList"));
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("minimum-width"), adaptedValue);
-    }
-    const QString minResolutionYStr = QStringLiteral("extensions.AutoResizeImage.minResolutionY");
-    if (mHashConfig.contains(minResolutionYStr)) {
-        const int val = mHashConfig.value(minResolutionYStr).toInt();
-        int adaptedValue = adaptAutoResizeResolution(val, QStringLiteral("extensions.AutoResizeImage.minResolutionYList"));
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("minimum-height"), adaptedValue);
-    }
-
-    //Default is true.
-    const QString reduceImageStr(QStringLiteral("extensions.AutoResizeImage.reduceImages"));
-    if (mHashConfig.contains(reduceImageStr)) {
-        const bool reduce = mHashConfig.value(reduceImageStr).toBool();
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("reduce-image-to-maximum"), reduce);
-    } else {
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("reduce-image-to-maximum"), false);
-    }
-
-    const QString filterMinimumStr(QStringLiteral("extensions.AutoResizeImage.filterMinimumSize"));
-    if (mHashConfig.contains(filterMinimumStr)) {
-        const bool filterMinimum = mHashConfig.value(filterMinimumStr).toBool();
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("skip-image-lower-size-enabled"), filterMinimum);
-    }
-    const QString skipMinimumSizeStr(QStringLiteral("extensions.AutoResizeImage.minimumSize"));
-    if (mHashConfig.contains(skipMinimumSizeStr)) {
-        const int skipMinimumSize = mHashConfig.value(skipMinimumSizeStr).toInt();
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("skip-image-lower-size"), skipMinimumSize);
-    }
-    const QString confirmBeforeResizingStr(QStringLiteral("extensions.AutoResizeImage.confirmResizing"));
-    if (mHashConfig.contains(confirmBeforeResizingStr)) {
-        const bool confirmBeforeResizing = mHashConfig.value(confirmBeforeResizingStr).toBool();
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("ask-before-resizing"), confirmBeforeResizing);
-    }
-    //extensions.AutoResizeImage.convertImages : not implemented in kmail
-
-    const QString conversionFormatStr(QStringLiteral("extensions.AutoResizeImage.conversionFormat"));
-    if (mHashConfig.contains(conversionFormatStr)) {
-        QString conversionFormat = mHashConfig.value(conversionFormatStr).toString();
-        if (conversionFormat == QLatin1String("png")) {
-            conversionFormat = QStringLiteral("PNG");
-        } else {
-            conversionFormat = QStringLiteral("JPG");
-        }
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("write-format"), conversionFormat);
-    }
-
-    const QString filterRecipientsStr(QStringLiteral("extensions.AutoResizeImage.filterRecipients"));
-    if (mHashConfig.contains(filterRecipientsStr)) {
-        const int filterRecipients = mHashConfig.value(filterRecipientsStr).toInt();
-        switch (filterRecipients) {
-        case 0:
-            addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("FilterRecipientType"), QStringLiteral("NoFilter"));
-            break;
-        case 1:
-            addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("FilterRecipientType"), QStringLiteral("ResizeEachEmailsContainsPattern"));
-            break;
-        case 2:
-            addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("FilterRecipientType"), QStringLiteral("ResizeOneEmailContainsPattern"));
-            break;
-        case 3:
-            addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("FilterRecipientType"), QStringLiteral("DontResizeEachEmailsContainsPattern"));
-            break;
-        case 4:
-            addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("FilterRecipientType"), QStringLiteral("DontResizeOneEmailContainsPattern"));
-            break;
-        default:
-            qCDebug(IMPORTWIZARD_LOG) << " unknown FilterRecipientType: " << filterRecipients;
-            break;
-        }
-    }
-
-    const QString filteringRecipientsPatternsWhiteListStr(QStringLiteral("extensions.AutoResizeImage.filteringRecipientsPatternsWhiteList"));
-    if (mHashConfig.contains(filteringRecipientsPatternsWhiteListStr)) {
-        const QString filteringRecipientsPatternsWhiteList = mHashConfig.value(filteringRecipientsPatternsWhiteListStr).toString();
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("resize-emails-pattern"), filteringRecipientsPatternsWhiteList);
-    }
-
-    const QString filteringRecipientsPatternsBlackListStr(QStringLiteral("extensions.AutoResizeImage.filteringRecipientsPatternsBlackList"));
-    if (mHashConfig.contains(filteringRecipientsPatternsBlackListStr)) {
-        const QString filteringRecipientsPatternsBlackList = mHashConfig.value(filteringRecipientsPatternsBlackListStr).toString();
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("do-not-resize-emails-pattern"), filteringRecipientsPatternsBlackList);
-    }
-
-    const QString filteringRenamingPatternStr(QStringLiteral("extensions.AutoResizeImage.renamingPattern"));
-    if (mHashConfig.contains(filteringRenamingPatternStr)) {
-        QString filteringRenamingPattern = mHashConfig.value(filteringRenamingPatternStr).toString();
-        filteringRenamingPattern.replace(QStringLiteral("%3Fn"), QStringLiteral("%n"));
-        filteringRenamingPattern.replace(QStringLiteral("%3Ft"), QStringLiteral("%t"));
-        filteringRenamingPattern.replace(QStringLiteral("%3Fd"), QStringLiteral("%d"));
-        filteringRenamingPattern.replace(QStringLiteral("%3Fe"), QStringLiteral("%e"));
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("rename-resized-images-pattern"), filteringRenamingPattern);
-    }
-
-    const QString filteringRenamingImageStr(QStringLiteral("extensions.AutoResizeImage.renameResizedImages"));
-    if (mHashConfig.contains(filteringRenamingImageStr)) {
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("rename-resized-images"), true);
-    }
-
-    const QString filteringImageFormatsStr(QStringLiteral("extensions.AutoResizeImage.imageFormats"));
-    if (mHashConfig.contains(filteringImageFormatsStr)) {
-        const QString filteringImageFormats = mHashConfig.value(filteringImageFormatsStr).toString();
-        //convert it.
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("resize-image-with-formats-type"), filteringImageFormats);
-    }
-
-    const QString filteringImageFormatsEnabledStr(QStringLiteral("extensions.AutoResizeImage.filterFormats"));
-    if (mHashConfig.contains(filteringImageFormatsEnabledStr)) {
-        const bool filteringImageFormatsEnabled = mHashConfig.value(filteringImageFormatsEnabledStr).toBool();
-        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("resize-image-with-formats"), filteringImageFormatsEnabled);
-    }
-}
-
-int ThunderbirdSettings::adaptAutoResizeResolution(int index, const QString &configStrList)
-{
-    switch (index) {
-    case 0:
-        return 240;
-    case 1:
-        return 320;
-    case 2:
-        return 512;
-    case 3:
-        return 640;
-    case 4:
-        return 800;
-    case 5:
-        return 1024;
-    case 6:
-        return 1280;
-    case 7:
-        return 2048;
-    case 8:
-        return 1024;
-    case 9: { //custom case
-        if (mHashConfig.contains(configStrList)) {
-            const QString res =  mHashConfig.value(configStrList).toString();
-            const QStringList lst = res.split(QLatin1Char(';'));
-            int val = lst.last().toInt();
-            return val;
-        }
-    }
-    default:
-        return -1;
-    }
-}
-
-void ThunderbirdSettings::readTagSettings()
-{
-    QVector<tagStruct> v;
-    v.reserve(mHashTag.size());
-    for (const tagStruct &tag : qAsConst(mHashTag)) {
-        v.push_back(tag);
-    }
-
-    ImportWizardUtil::addAkonadiTag(v);
-}
-
-void ThunderbirdSettings::readLdapSettings()
-{
-    //qCDebug(IMPORTWIZARD_LOG)<<" mLdapAccountList:"<<mLdapAccountList;
-    for (const QString &ldapAccountName : qAsConst(mLdapAccountList)) {
-        ldapStruct ldap;
-        const QString ldapDescription = QStringLiteral("%1.description").arg(ldapAccountName);
-        if (mHashConfig.contains(ldapDescription)) {
-            ldap.description = mHashConfig.value(ldapDescription).toString();
-        }
-        const QString ldapAuthDn = QStringLiteral("%1.auth.dn").arg(ldapAccountName);
-        if (mHashConfig.contains(ldapAuthDn)) {
-            ldap.dn = mHashConfig.value(ldapAuthDn).toString();
-        }
-        const QString ldapAuthSaslMech = QStringLiteral("%1.auth.saslmech").arg(ldapAccountName);
-        if (mHashConfig.contains(ldapAuthSaslMech)) {
-            ldap.saslMech = mHashConfig.value(ldapAuthSaslMech).toString();
-        }
-        const QString ldapFilename = QStringLiteral("%1.filename").arg(ldapAccountName);
-        if (mHashConfig.contains(ldapFilename)) {
-            ldap.fileName = mHashConfig.value(ldapFilename).toString();
-        }
-        const QString ldapMaxHits = QStringLiteral("%1.maxHits").arg(ldapAccountName);
-        if (mHashConfig.contains(ldapMaxHits)) {
-            ldap.fileName = mHashConfig.value(ldapMaxHits).toInt();
-        }
-        const QString ldapUri = QStringLiteral("%1.uri").arg(ldapAccountName);
-        if (mHashConfig.contains(ldapUri)) {
-            ldap.ldapUrl = QUrl(mHashConfig.value(ldapUri).toString());
-            ldap.port = ldap.ldapUrl.port();
-
-            if (ldap.ldapUrl.scheme() == QLatin1String("ldaps")) {
-                ldap.useSSL = true;
-            } else if (ldap.ldapUrl.scheme() == QLatin1String("ldap")) {
-                ldap.useSSL = false;
-            } else {
-                qCDebug(IMPORTWIZARD_LOG) << " Security not implemented :" << ldap.ldapUrl.scheme();
-            }
-        }
-        ImportWizardUtil::mergeLdap(ldap);
-    }
-}
-
-void ThunderbirdSettings::readGlobalSettings()
-{
-    const QString markMessageReadStr = QStringLiteral("mailnews.mark_message_read.delay");
-    if (mHashConfig.contains(markMessageReadStr)) {
-        const bool markMessageRead = mHashConfig.value(markMessageReadStr).toBool();
-        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkAsRead"), markMessageRead);
-    } else {
-        //Default value
-        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkAsRead"), true);
-    }
-    const QString markMessageReadIntervalStr = QStringLiteral("mailnews.mark_message_read.delay.interval");
-    if (mHashConfig.contains(markMessageReadIntervalStr)) {
-        bool found = false;
-        const int markMessageReadInterval = mHashConfig.value(markMessageReadIntervalStr).toInt(&found);
-        if (found) {
-            addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkTime"), markMessageReadInterval);
-        }
-    } else {
-        //Default 5 seconds
-        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkTime"), 5);
-    }
-
-    const QString mailComposeAttachmentReminderStr = QStringLiteral("mail.compose.attachment_reminder");
-    if (mHashConfig.contains(mailComposeAttachmentReminderStr)) {
-        const bool mailComposeAttachmentReminder = mHashConfig.value(mailComposeAttachmentReminderStr).toBool();
-        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("showForgottenAttachmentWarning"), mailComposeAttachmentReminder);
-    } else {
-        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("showForgottenAttachmentWarning"), true);
-    }
-
-    const QString mailComposeAttachmentReminderKeywordsStr = QStringLiteral("mail.compose.attachment_reminder_keywords");
-    if (mHashConfig.contains(mailComposeAttachmentReminderKeywordsStr)) {
-        const QString mailComposeAttachmentReminderKeywords = mHashConfig.value(mailComposeAttachmentReminderKeywordsStr).toString();
-        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("attachment-keywords"), mailComposeAttachmentReminderKeywords);
-    } //not default value keep kmail use one default value
-
-    const QString mailComposeAutosaveStr = QStringLiteral("mail.compose.autosave");
-    if (mHashConfig.contains(mailComposeAutosaveStr)) {
-        const bool mailComposeAutosave = mHashConfig.value(mailComposeAutosaveStr).toBool();
-        if (mailComposeAutosave) {
-            const QString mailComposeAutosaveintervalStr = QStringLiteral("mail.compose.autosaveinterval");
-            if (mHashConfig.contains(mailComposeAutosaveintervalStr)) {
-                bool found = false;
-                const int mailComposeAutosaveinterval = mHashConfig.value(mailComposeAutosaveintervalStr).toInt(&found);
-                if (found) {
-                    addKmailConfig(QStringLiteral("Composer"), QStringLiteral("autosave"), mailComposeAutosaveinterval);
-                } else {
-                    addKmailConfig(QStringLiteral("Composer"), QStringLiteral("autosave"), 5);
-                }
-            } else {
-                //Default value
-                addKmailConfig(QStringLiteral("Composer"), QStringLiteral("autosave"), 5);
-            }
-        } else {
-            //Don't autosave
-            addKmailConfig(QStringLiteral("Composer"), QStringLiteral("autosave"), 0);
-        }
-    }
-
-    const QString mailSpellCheckInlineStr = QStringLiteral("mail.spellcheck.inline");
-    if (mHashConfig.contains(mailSpellCheckInlineStr)) {
-        const bool mailSpellCheckInline = mHashConfig.value(mailSpellCheckInlineStr).toBool();
-        addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("backgroundCheckerEnabled"), mailSpellCheckInline);
-    } else {
-        addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("backgroundCheckerEnabled"), false);
-    }
-
-    const QString mailAlertShowSubjectStr = QStringLiteral("mail.biff.alert.show_subject");
-    if (mHashConfig.contains(mailAlertShowSubjectStr)) {
-        const bool mailAlertShowSubject = mHashConfig.value(mailAlertShowSubjectStr).toBool();
-        addNewMailNotifier(QStringLiteral("General"), QStringLiteral("showSubject"), mailAlertShowSubject);
-    } else {
-        //Default value in thunderbird
-        addNewMailNotifier(QStringLiteral("General"), QStringLiteral("showSubject"), true);
-    }
-
-    const QString mailAlertShowPreviewStr = QStringLiteral("mail.biff.alert.show_preview");
-    //TODO add show preview
-    if (mHashConfig.contains(mailAlertShowPreviewStr)) {
-        const bool mailAlertShowPreview = mHashConfig.value(mailAlertShowPreviewStr).toBool();
-        //addNewMailNotifier(QStringLiteral("General"),QStringLiteral("showSubject"), mailAlertShowPreview);
-    } else {
-        //Default value in thunderbird
-        //addNewMailNotifier(QStringLiteral("General"),QStringLiteral("showSubject"), true);
-    }
-
-    const QString mailAlertShowSenderStr = QStringLiteral("mail.biff.alert.show_sender");
-    if (mHashConfig.contains(mailAlertShowSenderStr)) {
-        const bool mailAlertShowSender = mHashConfig.value(mailAlertShowSenderStr).toBool();
-        addNewMailNotifier(QStringLiteral("General"), QStringLiteral("showFrom"), mailAlertShowSender);
-    } else {
-        //Default value in thunderbird
-        addNewMailNotifier(QStringLiteral("General"), QStringLiteral("showFrom"), true);
-    }
-
-    const QString mailSpellCheckBeforeSendStr = QStringLiteral("mail.SpellCheckBeforeSend");
-    if (mHashConfig.contains(mailSpellCheckBeforeSendStr)) {
-        const bool mailSpellCheckBeforeSend = mHashConfig.value(mailSpellCheckBeforeSendStr).toBool();
-        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("check-spelling-before-send"), mailSpellCheckBeforeSend);
-    } else {
-        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("check-spelling-before-send"), false);
-    }
-
-    const QString mailSpellCheckLanguageStr = QStringLiteral("spellchecker.dictionary");
-    if (mHashConfig.contains(mailSpellCheckLanguageStr)) {
-        const QString mailSpellCheckLanguage = mHashConfig.value(mailSpellCheckLanguageStr).toString();
-        addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("defaultLanguage"), mailSpellCheckLanguage);
-        //TODO create map to convert thunderbird name to aspell name
-    }
-
-    const QString mailPhishingDetectionStr = QStringLiteral("mail.phishing.detection.enabled");
-    if (mHashConfig.contains(mailPhishingDetectionStr)) {
-        const bool mailPhishingDetectionEnabled = mHashConfig.value(mailPhishingDetectionStr).toBool();
-        addKmailConfig(QStringLiteral("Reader"), QStringLiteral("ScamDetectionEnabled"), mailPhishingDetectionEnabled);
-    } else { //Default
-        addKmailConfig(QStringLiteral("Reader"), QStringLiteral("ScamDetectionEnabled"), true);
-    }
-
-    const QString mailDisplayGlyphStr = QStringLiteral("mail.display_glyph");
-    if (mHashConfig.contains(mailDisplayGlyphStr)) {
-        const bool mailDisplayGlyphEnabled = mHashConfig.value(mailDisplayGlyphStr).toBool();
-        addKmailConfig(QStringLiteral("Reader"), QStringLiteral("ShowEmoticons"), mailDisplayGlyphEnabled);
-    } else { //Default
-        addKmailConfig(QStringLiteral("Reader"), QStringLiteral("ShowEmoticons"), true);
-    }
-
-}
-
-void ThunderbirdSettings::importSieveSettings(QMap<QString, QVariant> &settings, const QString &userName, const QString &imapServerName)
-{
-    QString userNameSieveConverted = userName;
-    userNameSieveConverted.replace(QLatin1Char('@'), QStringLiteral("%40"));
-
-    const QString sieveKeyServerUserName = QStringLiteral("extensions.sieve.account.") + userNameSieveConverted + QLatin1Char('@') + imapServerName;
-    //user_pref("extensions.sieve.account.<username>@<server>.enabled", true);
-    if (mHashConfig.value(sieveKeyServerUserName + QStringLiteral(".enabled"), false).toBool()) {
-        settings.insert(QStringLiteral("SieveSupport"), true);
-        settings.insert(QStringLiteral("SievePort"), mHashConfig.value(sieveKeyServerUserName + QStringLiteral(".port"), 4190).toInt());
-        //TODO add more
-    }
-#if 0
-    <group name="siever">
-      <entry name="SieveSupport" type="Bool">
-        <label>Define if server supports sieve</label>
-        <default>false</default>
-      </entry>
-      <entry name="SieveReuseConfig" type="Bool">
-        <label>Define if we reuse host and login configuration</label>
-        <default>true</default>
-      </entry>
-      <entry name="SievePort" type="Int">
-        <label>Define sieve port</label>
-        <default>4190</default>
-      </entry>
-      <entry name="SieveAlternateUrl" type="String">
-        <label>Define alternate URL</label>
-      </entry>
-      <entry name="AlternateAuthentication" type="Int">
-        <label>Defines the authentication type to use for alternate server</label>
-        <default>1</default>
-      </entry>
-      <entry name="SieveVacationFilename" type="String">
-        <label>Define default sieve vacation filename</label>
-        <default>kmail-vacation.siv</default>
-      </entry>
-      <entry name="SieveCustomUsername" type="String">
-        <label>Define username used from custom server sieve url</label>
-        <default></default>
-      </entry>
-      <entry name="SieveCustomAuthentification" type="String">
-        <label>Defines the type of identification used by custom sieve server</label>
-        <default>ImapUserPassword</default>
-      </entry>
-    </group>
-
-#endif
-#if 0
-    if (mHashConfig.value(sieveKeyServerUserName + QStringLiteral(".enabled"), false).toBool()) {
-        //TODO
-        //user_pref("extensions.sieve.account.<username>@<server>.TLS", true);
-        //user_pref("extensions.sieve.account.<username>@<server>.TLS.forced", true);
-        //user_pref("extensions.sieve.account.<username>@<server>.activeAuthorization", 1);
-        //user_pref("extensions.sieve.account.<username>@<server>.activeHost", 1);
-        //user_pref("extensions.sieve.account.<username>@<server>.activeLogin", 1);
-        SieveEditorUtil::SieveServerConfig config;
-        //0 4190
-        //1 2000
-        //2 custom
-        //Default == 4190
-        //user_pref("extensions.sieve.account.<username>@<server>.port", 1255);
-        config.sieveSettings.port = mHashConfig.value(sieveKeyServerUserName + QStringLiteral(".port"), 4190).toInt();
-        //not necessary to import this one : user_pref("extensions.sieve.account.<username>@<server>.port.type", 1);
-
-        //user_pref("extensions.sieve.account.<username>@<server>.hostname", "sdfsfsqsdf");
-        const QString sieveHostName = mHashConfig.value(sieveKeyServerUserName + QStringLiteral(".hostname")).toString();
-        if (sieveHostName.isEmpty()) {
-            config.sieveSettings.serverName = imapServerName;
-        } else {
-            config.sieveSettings.serverName = sieveHostName;
-        }
-
-        const QString sieveUserName = mHashConfig.value(sieveKeyServerUserName + QStringLiteral(".login.username")).toString();
-        //user_pref("extensions.sieve.account.<username>@<server>.login.username", "newuser");
-        if (sieveUserName.isEmpty()) {
-            config.sieveSettings.userName = userName;
-        } else {
-            config.sieveSettings.userName = sieveUserName;
-        }
-
-        //not necessary to import this one : user_pref("extensions.sieve.account.<username>@<server>.proxy.type", 1);
-
-
-        //qCDebug(SIEVEEDITOR_LOG) << "imap account " << accountName;
-        const QString name = mHashConfig.value(accountName + QStringLiteral(".name")).toString();
-        bool found;
-        const int sievePort = mHashConfig.value(accountName + QStringLiteral(".port")).toInt(&found);
-        if (found) {
-            config.sieveImapAccountSettings.setPort(sievePort);
-        }
-        encryption(config, accountName);
-        addAuth(config, accountName);
-        config.sieveImapAccountSettings.setUserName(userName);
-        config.sieveImapAccountSettings.setServerName(imapServerName);
-
-        if (config.isValid()) {
-            atLeastAnAccountFound = true;
-            Q_EMIT importSetting(name, config);
-        }
-    }
-
-#endif
-}
-
-void ThunderbirdSettings::addAuth(QMap<QString, QVariant> &settings, const QString &argument, const QString &accountName)
-{
-    bool found = false;
-    if (mHashConfig.contains(accountName + QStringLiteral(".authMethod"))) {
-        const int authMethod = mHashConfig.value(accountName + QStringLiteral(".authMethod")).toInt(&found);
-        if (found) {
-            switch (authMethod) {
-            case 0:
-                settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::PLAIN);   //????
-                break;
-            case 4: //Encrypted password ???
-                settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::LOGIN);   //????
-                qCDebug(IMPORTWIZARD_LOG) << " authmethod == encrypt password";
-                break;
-            case 5: //GSSAPI
-                settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::GSSAPI);
-                break;
-            case 6: //NTLM
-                settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::NTLM);
-                break;
-            case 7: //TLS
-                qCDebug(IMPORTWIZARD_LOG) << " authmethod method == TLS"; //????
-                break;
-            case 10: //OAuth2 verify it.
-                settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::XOAUTH2);
-                qCDebug(IMPORTWIZARD_LOG) << " authmethod method == OAuth2"; //????
-                break;
-            default:
-                qCDebug(IMPORTWIZARD_LOG) << " ThunderbirdSettings::addAuth unknown :" << authMethod;
-                break;
-            }
-        }
-    }
-}
-
-void ThunderbirdSettings::readAccount()
-{
-    for (const QString &account : qAsConst(mAccountList)) {
-        const QString serverName = mHashConfig.value(QStringLiteral("mail.account.%1").arg(account) + QStringLiteral(".server")).toString();
-        const QString accountName = QStringLiteral("mail.server.%1").arg(serverName);
-        const QString host = mHashConfig.value(accountName + QStringLiteral(".hostname")).toString();
-        const QString userName = mHashConfig.value(accountName + QStringLiteral(".userName")).toString();
-        const QString name = mHashConfig.value(accountName + QStringLiteral(".name")).toString();
-
-        const QString type = mHashConfig.value(accountName + QStringLiteral(".type")).toString();
-        //TODO use it ?
-        //const QString directory = mHashConfig.value(accountName + QStringLiteral(".directory")).toString();
-
-        const QString loginAtStartupStr = accountName + QStringLiteral(".login_at_startup");
-        bool loginAtStartup = true; //Default for thunderbird;
-        if (mHashConfig.contains(loginAtStartupStr)) {
-            loginAtStartup = mHashConfig.value(loginAtStartupStr).toBool();
-        }
-        bool found = false;
-        if (type == QLatin1String("imap")) {
-            QMap<QString, QVariant> settings;
-            settings.insert(QStringLiteral("ImapServer"), host);
-            settings.insert(QStringLiteral("UserName"), userName);
-            const int port = mHashConfig.value(accountName + QStringLiteral(".port")).toInt(&found);
-            if (found) {
-                settings.insert(QStringLiteral("ImapPort"), port);
-            }
-            addAuth(settings, QStringLiteral("Authentication"), accountName);
-            const QString offline = accountName + QStringLiteral(".offline_download");
-            if (mHashConfig.contains(offline)) {
-                const bool offlineStatus = mHashConfig.value(offline).toBool();
-                if (offlineStatus) {
-                    settings.insert(QStringLiteral("DisconnectedModeEnabled"), offlineStatus);
-                }
-            } else {
-                //default value == true
-                settings.insert(QStringLiteral("DisconnectedModeEnabled"), true);
-            }
-
-            found = false;
-            const int socketType = mHashConfig.value(accountName + QStringLiteral(".socketType")).toInt(&found);
-            if (found) {
-                switch (socketType) {
-                case 0:
-                    //None
-                    settings.insert(QStringLiteral("Safety"), QStringLiteral("None"));
-                    break;
-                case 2:
-                    //STARTTLS
-                    settings.insert(QStringLiteral("Safety"), QStringLiteral("STARTTLS"));
-                    break;
-                case 3:
-                    //SSL/TLS
-                    settings.insert(QStringLiteral("Safety"), QStringLiteral("SSL"));
-                    break;
-                default:
-                    qCDebug(IMPORTWIZARD_LOG) << " socketType " << socketType;
-                }
-            }
-            const QString checkNewMailStr = accountName + QStringLiteral(".check_new_mail");
-            if (mHashConfig.contains(checkNewMailStr)) {
-                const bool checkNewMail = mHashConfig.value(checkNewMailStr).toBool();
-                settings.insert(QStringLiteral("IntervalCheckEnabled"), checkNewMail);
-            }
-
-            const QString checkTimeStr = accountName + QStringLiteral(".check_time");
-            if (mHashConfig.contains(checkTimeStr)) {
-                found = false;
-                const int checkTime = mHashConfig.value(checkTimeStr).toInt(&found);
-                if (found) {
-                    settings.insert(QStringLiteral("IntervalCheckTime"), checkTime);
-                }
-            } else {
-                //Default value from thunderbird
-                settings.insert(QStringLiteral("IntervalCheckTime"), 10);
-            }
-            const QString trashFolderStr = accountName + QStringLiteral(".trash_folder_name");
-            if (mHashConfig.contains(trashFolderStr)) {
-                settings.insert(QStringLiteral("TrashCollection"), MailCommon::Util::convertFolderPathToCollectionId(mHashConfig.value(trashFolderStr).toString()));
-            }
-            importSieveSettings(settings, userName, serverName);
-
-
-            const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
-            addCheckMailOnStartup(agentIdentifyName, loginAtStartup);
-            //Not find a method to disable it in thunderbird
-            addToManualCheck(agentIdentifyName, true);
-        } else if (type == QLatin1String("pop3")) {
-            QMap<QString, QVariant> settings;
-            settings.insert(QStringLiteral("Host"), host);
-            settings.insert(QStringLiteral("Login"), userName);
-
-            const bool leaveOnServer = mHashConfig.value(accountName + QStringLiteral(".leave_on_server")).toBool();
-            if (leaveOnServer) {
-                settings.insert(QStringLiteral("LeaveOnServer"), leaveOnServer);
-            }
-
-            found = false;
-            const int numberDayToLeave = mHashConfig.value(accountName + QStringLiteral(".num_days_to_leave_on_server")).toInt(&found);
-            if (found) {
-                settings.insert(QStringLiteral("LeaveOnServerDays"), numberDayToLeave);
-            }
-
-            found = false;
-            const int port = mHashConfig.value(accountName + QStringLiteral(".port")).toInt(&found);
-            if (found) {
-                settings.insert(QStringLiteral("Port"), port);
-            }
-
-            found = false;
-            const int socketType = mHashConfig.value(accountName + QStringLiteral(".socketType")).toInt(&found);
-            if (found) {
-                switch (socketType) {
-                case 0:
-                    //None
-                    //nothing
-                    break;
-                case 2:
-                    //STARTTLS
-                    settings.insert(QStringLiteral("UseTLS"), true);
-                    break;
-                case 3:
-                    //SSL/TLS
-                    settings.insert(QStringLiteral("UseSSL"), true);
-                    break;
-                default:
-                    qCDebug(IMPORTWIZARD_LOG) << " socketType " << socketType;
-                }
-            }
-            addAuth(settings, QStringLiteral("AuthenticationMethod"), accountName);
-            const QString checkNewMailStr = accountName + QStringLiteral(".check_new_mail");
-            if (mHashConfig.contains(checkNewMailStr)) {
-                const bool checkNewMail = mHashConfig.value(checkNewMailStr).toBool();
-                settings.insert(QStringLiteral("IntervalCheckEnabled"), checkNewMail);
-            }
-            const QString checkTimeStr = accountName + QStringLiteral(".check_time");
-            if (mHashConfig.contains(checkTimeStr)) {
-                found = false;
-                const int checkTime = mHashConfig.value(checkTimeStr).toInt(&found);
-                if (found) {
-                    settings.insert(QStringLiteral("IntervalCheckInterval"), checkTime);
-                }
-            } else {
-                //Default value from thunderbird
-                settings.insert(QStringLiteral("IntervalCheckInterval"), 10);
-            }
-
-            const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
-            addCheckMailOnStartup(agentIdentifyName, loginAtStartup);
-            //Not find a method to disable it in thunderbird
-            addToManualCheck(agentIdentifyName, true);
-        } else if (type == QLatin1String("none")) {
-            //FIXME look at if we can implement it
-            qCDebug(IMPORTWIZARD_LOG) << " account type none!";
-        } else if (type == QLatin1String("movemail")) {
-            qCDebug(IMPORTWIZARD_LOG) << " movemail accound found and not implemented in importthunderbird";
-        } else if (type == QLatin1String("rss")) {
-            qCDebug(IMPORTWIZARD_LOG) << " rss resource needs to be implemented";
-            continue;
-        } else if (type == QLatin1String("nntp")) {
-            qCDebug(IMPORTWIZARD_LOG) << " nntp resource need to be implemented";
-            continue;
-        } else {
-            qCDebug(IMPORTWIZARD_LOG) << " type unknown : " << type;
-            continue;
-        }
-
-        const QString identityConfig = QStringLiteral("mail.account.%1").arg(account) + QStringLiteral(".identities");
-        if (mHashConfig.contains(identityConfig)) {
-            const QStringList idList = mHashConfig.value(identityConfig).toString().split(QLatin1Char(','));
-            for (const QString &id : idList) {
-                readIdentity(id);
-            }
-        }
-    }
-}
-
-void ThunderbirdSettings::readTransport()
-{
-    const QString mailSmtpServer = mHashConfig.value(QStringLiteral("mail.smtpservers")).toString();
-    if (mailSmtpServer.isEmpty()) {
-        return;
-    }
-    const QStringList smtpList = mailSmtpServer.split(QLatin1Char(','));
-    QString defaultSmtp = mHashConfig.value(QStringLiteral("mail.smtp.defaultserver")).toString();
-    if (smtpList.count() == 1 && defaultSmtp.isEmpty()) {
-        //Be sure to define default smtp
-        defaultSmtp = smtpList.at(0);
-    }
-
-    for (const QString &smtp : smtpList) {
-        const QString smtpName = QStringLiteral("mail.smtpserver.%1").arg(smtp);
-        MailTransport::Transport *mt = createTransport();
-        mt->setType(MailTransport::Transport::EnumType::SMTP);
-        const QString name = mHashConfig.value(smtpName + QStringLiteral(".description")).toString();
-        mt->setName(name);
-        const QString hostName = mHashConfig.value(smtpName + QStringLiteral(".hostname")).toString();
-        mt->setHost(hostName);
-
-        const int port = mHashConfig.value(smtpName + QStringLiteral(".port")).toInt();
-        if (port > 0) {
-            mt->setPort(port);
-        }
-
-        const int authMethod = mHashConfig.value(smtpName + QStringLiteral(".authMethod")).toInt();
-        switch (authMethod) {
-        case 0:
-            break;
-        case 1: //No authentication
-            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN); //????
-            break;
-        case 3: //Unencrypted password
-            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::CLEAR); //???
-            break;
-        case 4: //crypted password
-            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::LOGIN); //???
-            break;
-        case 5: //GSSAPI
-            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::GSSAPI);
-            break;
-        case 6: //NTLM
-            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::NTLM);
-            break;
-        default:
-            qCDebug(IMPORTWIZARD_LOG) << " authMethod unknown :" << authMethod;
-        }
-
-        const int trySsl = mHashConfig.value(smtpName + QStringLiteral(".try_ssl")).toInt();
-        switch (trySsl) {
-        case 0:
-            mt->setEncryption(MailTransport::Transport::EnumEncryption::None);
-            break;
-        case 2:
-            mt->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
-            break;
-        case 3:
-            mt->setEncryption(MailTransport::Transport::EnumEncryption::SSL);
-            break;
-        default:
-            qCDebug(IMPORTWIZARD_LOG) << " trySsl unknown :" << trySsl;
-        }
-
-        const QString userName = mHashConfig.value(smtpName + QStringLiteral(".username")).toString();
-        if (!userName.isEmpty()) {
-            mt->setUserName(userName);
-            if (authMethod > 1) {
-                mt->setRequiresAuthentication(true);
-            }
-        }
-
-        storeTransport(mt, (smtp == defaultSmtp));
-        mHashSmtp.insert(smtp, QString::number(mt->id()));
-    }
-}
-
-QString convertThunderbirdPath(const QString &path)
-{
-    QString newPath;
-    QUrl url(path);
-    newPath = url.path();
-    newPath.remove(0, 1);
-    return MailCommon::Util::convertFolderPathToCollectionStr(newPath);
-}
-
-void ThunderbirdSettings::readIdentity(const QString &account)
-{
-    const QString identity = QStringLiteral("mail.identity.%1").arg(account);
-    QString fullName = mHashConfig.value(identity + QStringLiteral(".fullName")).toString();
-    KIdentityManagement::Identity *newIdentity = createIdentity(fullName);
-
-    const QString smtpServer = mHashConfig.value(identity + QStringLiteral(".smtpServer")).toString();
-    if (!smtpServer.isEmpty() && mHashSmtp.contains(smtpServer)) {
-        newIdentity->setTransport(mHashSmtp.value(smtpServer));
-    }
-
-    const QString userEmail = mHashConfig.value(identity + QStringLiteral(".useremail")).toString();
-    newIdentity->setPrimaryEmailAddress(userEmail);
-
-    newIdentity->setFullName(fullName);
-    newIdentity->setIdentityName(fullName);
-
-    const QString organization = mHashConfig.value(identity + QStringLiteral(".organization")).toString();
-    newIdentity->setOrganization(organization);
-
-    bool doBcc = mHashConfig.value(identity + QStringLiteral(".doBcc")).toBool();
-    if (doBcc) {
-        const QString bcc = mHashConfig.value(identity + QStringLiteral(".doBccList")).toString();
-        newIdentity->setBcc(bcc);
-    }
-
-    bool doCc = mHashConfig.value(identity + QStringLiteral(".doCc")).toBool();
-    if (doCc) {
-        const QString cc = mHashConfig.value(identity + QStringLiteral(".doCcList")).toString();
-        newIdentity->setCc(cc);
-    }
-
-    const QString replyTo = mHashConfig.value(identity + QStringLiteral(".reply_to")).toString();
-    newIdentity->setReplyToAddr(replyTo);
-
-    KIdentityManagement::Signature signature;
-    const bool signatureHtml = mHashConfig.value(identity + QStringLiteral(".htmlSigFormat")).toBool();
-    if (signatureHtml) {
-        signature.setInlinedHtml(true);
-    }
-
-    const bool attachSignature = mHashConfig.value(identity + QStringLiteral(".attach_signature")).toBool();
-    if (attachSignature) {
-        const QString fileSignature = mHashConfig.value(identity + QStringLiteral(".sig_file")).toString();
-        signature.setType(KIdentityManagement::Signature::FromFile);
-        signature.setPath(fileSignature, false);
-    } else {
-        const QString textSignature = mHashConfig.value(identity + QStringLiteral(".htmlSigText")).toString();
-        signature.setType(KIdentityManagement::Signature::Inlined);
-        signature.setText(textSignature);
-    }
-
-    if (mHashConfig.contains(identity + QStringLiteral(".drafts_folder_picker_mode"))) {
-        const int useSpecificDraftFolder = mHashConfig.value(identity + QStringLiteral(".drafts_folder_picker_mode")).toInt();
-        if (useSpecificDraftFolder == 1) {
-            const QString draftFolder = convertThunderbirdPath(mHashConfig.value(identity + QStringLiteral(".draft_folder")).toString());
-            newIdentity->setDrafts(draftFolder);
-        }
-    }
-
-    if (mHashConfig.contains(identity + QStringLiteral(".fcc"))) {
-        const bool fccEnabled = mHashConfig.value(identity + QStringLiteral(".fcc")).toBool();
-        newIdentity->setDisabledFcc(!fccEnabled);
-    }
-
-    //fcc_reply_follows_parent not implemented in kmail
-    //fcc_folder_picker_mode is just a flag for thunderbird. Not necessary during import.
-    //if ( mHashConfig.contains( identity + QStringLiteral( ".fcc_folder_picker_mode" ) ) )
-    {
-        if (mHashConfig.contains(identity + QStringLiteral(".fcc_folder"))) {
-            const QString fccFolder = convertThunderbirdPath(mHashConfig.value(identity + QStringLiteral(".fcc_folder")).toString());
-            newIdentity->setFcc(fccFolder);
-        }
-    }
-
-    //if ( mHashConfig.contains( identity + QStringLiteral( ".tmpl_folder_picker_mode" ) ) )
-    {
-        if (mHashConfig.contains(identity + QStringLiteral(".stationery_folder"))) {
-            const QString templateFolder = convertThunderbirdPath(mHashConfig.value(identity + QStringLiteral(".stationery_folder")).toString());
-            newIdentity->setTemplates(templateFolder);
-        }
-    }
-
-    const QString attachVcardStr(identity + QStringLiteral(".attach_vcard"));
-    if (mHashConfig.contains(attachVcardStr)) {
-        const bool attachVcard = mHashConfig.value(attachVcardStr).toBool();
-        newIdentity->setAttachVcard(attachVcard);
-    }
-    const QString attachVcardContentStr(identity + QStringLiteral(".escapedVCard"));
-    if (mHashConfig.contains(attachVcardContentStr)) {
-        const QString str = mHashConfig.value(attachVcardContentStr).toString();
-        QByteArray vcard = QByteArray::fromPercentEncoding(str.toLocal8Bit());
-        KContacts::VCardConverter converter;
-        KContacts::Addressee addr = converter.parseVCard(vcard);
-
-        const QString filename = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + QLatin1Char('/') + newIdentity->identityName() + QStringLiteral(".vcf");
-        QFileInfo fileInfo(filename);
-        QDir().mkpath(fileInfo.absolutePath());
-        QFile file(filename);
-        if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-            const QByteArray data = converter.exportVCard(addr, KContacts::VCardConverter::v3_0);
-            file.write(data);
-            file.flush();
-            file.close();
-            newIdentity->setVCardFile(filename);
-        }
-    }
-    const QString signMailStr(identity + QStringLiteral(".sign_mail"));
-    if (mHashConfig.contains(signMailStr)) {
-        const bool signMail = mHashConfig.value(signMailStr).toBool();
-        newIdentity->setPgpAutoSign(signMail);
-    }
-
-    const QString composeHtmlStr(identity + QStringLiteral(".compose_html"));
-    //TODO: implement it in kmail
-
-    newIdentity->setSignature(signature);
-
-    storeIdentity(newIdentity);
-}
-
-void ThunderbirdSettings::insertIntoMap(const QString &line)
-{
-    QString newLine = line;
-    newLine.remove(QStringLiteral("user_pref(\""));
-    newLine.remove(QStringLiteral(");"));
-    const int pos = newLine.indexOf(QLatin1Char(','));
-    QString key = newLine.left(pos);
-    key.remove(key.length() - 1, 1);
-    QString valueStr = newLine.right(newLine.length() - pos - 2);
-    if (valueStr.at(0) == QLatin1Char('"')) {
-        valueStr.remove(0, 1);
-        const int pos(valueStr.length() - 1);
-        if (valueStr.at(pos) == QLatin1Char('"')) {
-            valueStr.remove(pos, 1);
-        }
-        //Store as String
-        mHashConfig.insert(key, valueStr);
-    } else {
-        if (valueStr == QLatin1String("true")) {
-            mHashConfig.insert(key, true);
-        } else if (valueStr == QLatin1String("false")) {
-            mHashConfig.insert(key, false);
-        } else {
-            //Store as integer
-            const int value = valueStr.toInt();
-            mHashConfig.insert(key, value);
-        }
-    }
-    if (key.contains(QStringLiteral("ldap_")) && key.endsWith(QStringLiteral(".description"))) {
-        QString ldapAccountName = key;
-        mLdapAccountList.append(ldapAccountName.remove(QStringLiteral(".description")));
-    }
-    if (key.contains(QStringLiteral("mailnews.tags.")) &&
-            (key.endsWith(QStringLiteral(".color")) || key.endsWith(QStringLiteral(".tag")))) {
-        QString name = key;
-        name.remove(QStringLiteral("mailnews.tags."));
-        name.remove(QStringLiteral(".color"));
-        name.remove(QStringLiteral(".tag"));
-        tagStruct tag;
-        if (mHashTag.contains(name)) {
-            tag = mHashTag.value(name);
-            mHashTag.remove(name);
-        }
-        if (key.endsWith(QStringLiteral(".color"))) {
-            tag.color = QColor(mHashConfig.value(key).toString());
-        } else {
-            tag.name = mHashConfig.value(key).toString();
-        }
-        mHashTag.insert(name, tag);
-        qCDebug(IMPORTWIZARD_LOG) << " tag :" << name << " tag.name" << tag.name << " color :" << tag.color;
-    }
-}
-
-void ThunderbirdSettings::addNewMailNotifier(const QString &group, const QString &key, bool value)
-{
-    KConfig config(QStringLiteral("akonadi_newmailnotifier_agentrc"));
-    KConfigGroup grp = config.group(group);
-    grp.writeEntry(key, value);
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/thunderbirdsettings.h akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/thunderbirdsettings.h
--- akonadi-import-wizard-17.04.3/src/autodetect/thunderbird/thunderbirdsettings.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/thunderbird/thunderbirdsettings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef THUNDERBIRDSETTINGS_H
-#define THUNDERBIRDSETTINGS_H
-
-#include "abstractsettings.h"
-#include "importwizardutil.h"
-#include <QHash>
-#include <QStringList>
-
-class ImportWizard;
-
-class ThunderbirdSettings : public AbstractSettings
-{
-public:
-    explicit ThunderbirdSettings(const QString &filename, ImportWizard *parent);
-    ~ThunderbirdSettings();
-    void importSettings();
-private:
-    void readAccount();
-    void readIdentity(const QString &account);
-    void readTransport();
-    void readGlobalSettings();
-    void readLdapSettings();
-    void readTagSettings();
-    void readExtensionsSettings();
-    int adaptAutoResizeResolution(int index, const QString &configStrList);
-
-    void insertIntoMap(const QString &line);
-
-    void addAuth(QMap<QString, QVariant> &settings, const QString &argument, const QString &accountName);
-    void importSieveSettings(QMap<QString, QVariant> &settings, const QString &userName, const QString &imapServerName);
-
-    void addNewMailNotifier(const QString &group, const QString &key, bool value);
-
-    QHash<QString, QVariant> mHashConfig;
-    QHash<QString, QString> mHashSmtp;
-    QStringList mAccountList;
-    QStringList mLdapAccountList;
-
-    QHash<QString, tagStruct> mHashTag;
-    QString mFileName;
-};
-
-#endif /* THUNDERBIRDSETTINGS_H */
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/trojita/trojitaaddressbook.cpp akonadi-import-wizard-17.08.3/src/autodetect/trojita/trojitaaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/trojita/trojitaaddressbook.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/trojita/trojitaaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,76 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "trojitaaddressbook.h"
-#include <KContacts/Addressee>
-
-#include <QUrl>
-
-#include <QSettings>
-
-TrojitaAddressBook::TrojitaAddressBook(const QString &filename, ImportWizard *parent)
-    : AbstractAddressBook(parent)
-{
-    settings = new QSettings(filename, QSettings::IniFormat, this);
-    settings->setIniCodec("UTF-8");
-}
-
-TrojitaAddressBook::~TrojitaAddressBook()
-{
-    delete settings;
-}
-
-void TrojitaAddressBook::readAddressBook()
-{
-    const QStringList contacts = settings->childGroups();
-    for (const QString &contact : contacts) {
-        KContacts::Addressee contactABC;
-        settings->beginGroup(contact);
-        contactABC.setEmails(QStringList() << settings->value(QStringLiteral("email")).toStringList());
-
-        KContacts::Address homeAddr = KContacts::Address(KContacts::Address::Home);
-        homeAddr.setLocality(settings->value(QStringLiteral("city")).toString());
-        homeAddr.setRegion(settings->value(QStringLiteral("state")).toString());
-        homeAddr.setPostalCode(settings->value(QStringLiteral("zip")).toString());
-        homeAddr.setCountry(settings->value(QStringLiteral("country")).toString());
-        homeAddr.setStreet(settings->value(QStringLiteral("address")).toString());
-        if (!homeAddr.isEmpty()) {
-            contactABC.insertAddress(homeAddr);
-        }
-
-        contactABC.insertPhoneNumber(KContacts::PhoneNumber(settings->value(QStringLiteral("phone")).toString(), KContacts::PhoneNumber::Home));
-        contactABC.insertPhoneNumber(KContacts::PhoneNumber(settings->value(QStringLiteral("workphone")).toString(), KContacts::PhoneNumber::Work));
-        contactABC.insertPhoneNumber(KContacts::PhoneNumber(settings->value(QStringLiteral("fax")).toString(), KContacts::PhoneNumber::Fax));
-        contactABC.insertPhoneNumber(KContacts::PhoneNumber(settings->value(QStringLiteral("mobile")).toString(), KContacts::PhoneNumber::Cell));
-        contactABC.setNickName(settings->value(QStringLiteral("nick")).toString());
-        KContacts::ResourceLocatorUrl url;
-        url.setUrl(QUrl(settings->value(QStringLiteral("url")).toString()));
-        contactABC.setUrl(url);
-
-        const QDate birthDate = QDate::fromString(settings->value(QStringLiteral("anniversary")).toString());
-        if (birthDate.isValid()) {
-            contactABC.setBirthday(birthDate);
-        }
-        //TODO
-        //ADD(Photo, "photo");
-        addImportContactNote(contactABC, QStringLiteral("Trojita"));
-        createContact(contactABC);
-        settings->endGroup();
-    }
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/trojita/trojitaaddressbook.h akonadi-import-wizard-17.08.3/src/autodetect/trojita/trojitaaddressbook.h
--- akonadi-import-wizard-17.04.3/src/autodetect/trojita/trojitaaddressbook.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/trojita/trojitaaddressbook.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TrojitaAddressBook_H
-#define TrojitaAddressBook_H
-
-#include "abstractaddressbook.h"
-#include <QHash>
-class QSettings;
-
-class ImportWizard;
-
-class TrojitaAddressBook : public AbstractAddressBook
-{
-public:
-    explicit TrojitaAddressBook(const QString &filename, ImportWizard *parent);
-    ~TrojitaAddressBook();
-
-    void readAddressBook();
-
-private:
-    QSettings *settings;
-};
-
-#endif /* TrojitaAddressBook_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/trojita/trojitaimportdata.cpp akonadi-import-wizard-17.08.3/src/autodetect/trojita/trojitaimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/trojita/trojitaimportdata.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/trojita/trojitaimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "trojita/trojitaimportdata.h"
-#include "trojita/trojitasettings.h"
-#include "trojita/trojitaaddressbook.h"
-#include "mailimporter/filterinfo.h"
-#include "mailimporter/othermailerutil.h"
-#include "importfilterinfogui.h"
-#include "importwizard.h"
-
-#include <QDir>
-
-TrojitaImportData::TrojitaImportData(ImportWizard *parent)
-    : AbstractImporter(parent)
-{
-    mPath = MailImporter::OtherMailerUtil::trojitaDefaultPath();
-}
-
-TrojitaImportData::~TrojitaImportData()
-{
-}
-
-bool TrojitaImportData::foundMailer() const
-{
-    QDir directory(mPath);
-    if (directory.exists()) {
-        return true;
-    }
-    return false;
-}
-
-QString TrojitaImportData::name() const
-{
-    return QStringLiteral("Trojita");
-}
-
-bool TrojitaImportData::importMails()
-{
-    return false;
-}
-
-bool TrojitaImportData::importSettings()
-{
-    const QString settingsPath = mPath + QLatin1String("trojita.conf");
-    TrojitaSettings settings(settingsPath, mImportWizard);
-    settings.importSettings();
-    return true;
-}
-
-bool TrojitaImportData::importAddressBook()
-{
-    const QString addressbookPath = QDir::homePath() + QLatin1String("/.abook/addressbook");
-    TrojitaAddressBook addressBooks(addressbookPath, mImportWizard);
-    addressBooks.readAddressBook();
-    return true;
-}
-
-AbstractImporter::TypeSupportedOptions TrojitaImportData::supportedOption()
-{
-    TypeSupportedOptions options;
-    //options |=AbstractImporter::Mails;
-    options |= AbstractImporter::Settings;
-    options |= AbstractImporter::AddressBooks;
-    return options;
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/trojita/trojitaimportdata.h akonadi-import-wizard-17.08.3/src/autodetect/trojita/trojitaimportdata.h
--- akonadi-import-wizard-17.04.3/src/autodetect/trojita/trojitaimportdata.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/trojita/trojitaimportdata.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,43 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-#ifndef TrojitaImportData_H
-#define TrojitaImportData_H
-
-#include "abstractimporter.h"
-class ImportWizard;
-
-class TrojitaImportData : public AbstractImporter
-{
-public:
-    explicit TrojitaImportData(ImportWizard *parent);
-    ~TrojitaImportData();
-
-    TypeSupportedOptions supportedOption() Q_DECL_OVERRIDE;
-    bool foundMailer() const Q_DECL_OVERRIDE;
-
-    bool importMails() Q_DECL_OVERRIDE;
-    bool importSettings() Q_DECL_OVERRIDE;
-    bool importAddressBook() Q_DECL_OVERRIDE;
-
-    QString name() const Q_DECL_OVERRIDE;
-
-};
-
-#endif /* TrojiraImportData_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/trojita/trojitasettings.cpp akonadi-import-wizard-17.08.3/src/autodetect/trojita/trojitasettings.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/trojita/trojitasettings.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/trojita/trojitasettings.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,181 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#include "trojitasettings.h"
-#include "importwizardutil.h"
-
-#include <mailtransport/transportmanager.h>
-
-#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <KIdentityManagement/kidentitymanagement/signature.h>
-
-#include "importwizard_debug.h"
-
-#include <QSettings>
-
-TrojitaSettings::TrojitaSettings(const QString &filename, ImportWizard *parent)
-    : AbstractSettings(parent)
-{
-    settings = new QSettings(filename, QSettings::IniFormat, this);
-}
-
-TrojitaSettings::~TrojitaSettings()
-{
-    delete settings;
-}
-
-void TrojitaSettings::importSettings()
-{
-    readImapAccount();
-    readTransport();
-    readIdentity();
-    readGlobalSettings();
-}
-
-void TrojitaSettings::readImapAccount()
-{
-    QMap<QString, QVariant> newSettings;
-    QString name;
-
-    name = settings->value(QStringLiteral("imap.host")).toString();
-    if (!name.isEmpty()) {
-        newSettings.insert(QStringLiteral("ImapServer"), name);
-    }
-
-    const int port = settings->value(QStringLiteral("imap.port"), -1).toInt();
-    if (port > -1) {
-        newSettings.insert(QStringLiteral("ImapPort"), port);
-    }
-
-    if (settings->contains(QStringLiteral("imap.starttls"))) {
-        const bool useTLS = settings->value(QStringLiteral("imap.starttls")).toBool();
-        if (useTLS) {
-            newSettings.insert(QStringLiteral("Safety"), QStringLiteral("STARTTLS"));
-        }
-    }
-
-    const QString userName = settings->value(QStringLiteral("imap.auth.user")).toString();
-    if (!userName.isEmpty()) {
-        newSettings.insert(QStringLiteral("Username"), userName);
-    }
-    const QString password = settings->value(QStringLiteral("imap.auth.pass")).toString();
-    if (!password.isEmpty()) {
-        newSettings.insert(QStringLiteral("Password"), password);
-    }
-
-#if 0
-    if (settings->contains(QStringLiteral("imap.process"))) {
-        //What's this ?
-    }
-
-    if (settings->contains(QStringLiteral("imap.offline"))) {
-        //const bool offlineStatus = settings->value(QStringLiteral("imap.offline")).toBool();
-        //It's not a deconnected mode as imap disconnected #317023
-        //Will implement soon.
-        //TODO use akonadi cache.
-    }
-    if (settings->contains(QStringLiteral("imap.enableId"))) {
-        //Not supported by Akonadi.
-    }
-
-    if (settings->contains(QStringLiteral("imap.ssl.pemCertificate"))) {
-        //Not supported by akonadi.
-    }
-
-    if (settings->contains(QStringLiteral("imap.capabilities.blacklist"))) {
-        //Not supported by akonadi-imap-resource.
-    }
-#endif
-    if (!name.isEmpty()) {
-        const QString agentIdentifyName = AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, newSettings);
-        //Check by default
-        addCheckMailOnStartup(agentIdentifyName, true);
-    }
-}
-
-void TrojitaSettings::readTransport()
-{
-    settings->beginGroup(QStringLiteral("General"));
-    const QString smtpMethod = settings->value(QStringLiteral("msa.method")).toString();
-    if (!smtpMethod.isEmpty()) {
-        MailTransport::Transport *mt = createTransport();
-        if (smtpMethod == QLatin1String("IMAP-SENDMAIL")) {
-            //see http://tools.ietf.org/html/draft-kundrat-imap-submit-01
-        } else if (smtpMethod == QLatin1String("SMTP") || smtpMethod == QLatin1String("SSMTP")) {
-            if (settings->contains(QStringLiteral("msa.smtp.host"))) {
-                mt->setHost(settings->value(QStringLiteral("msa.smtp.host")).toString());
-            }
-            if (settings->contains(QStringLiteral("msa.smtp.port"))) {
-                mt->setPort(settings->value(QStringLiteral("msa.smtp.port")).toInt());
-            }
-            if (settings->contains(QStringLiteral("msa.smtp.auth"))) {
-                if (settings->value(QStringLiteral("msa.smtp.auth")).toBool()) {
-                    if (settings->contains(QStringLiteral("msa.smtp.auth.user"))) {
-                        mt->setUserName(settings->value(QStringLiteral("msa.smtp.auth.user")).toString());
-                    }
-                    if (settings->contains(QStringLiteral("msa.smtp.auth.pass"))) {
-                        mt->setPassword(settings->value(QStringLiteral("msa.smtp.auth.pass")).toString());
-                    }
-                }
-            }
-
-            if (settings->contains(QStringLiteral("msa.smtp.starttls"))) {
-                if (settings->value(QStringLiteral("msa.smtp.starttls")).toBool()) {
-                    mt->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
-                }
-            }
-            mt->setType(MailTransport::Transport::EnumType::SMTP);
-        } else {
-            qCWarning(IMPORTWIZARD_LOG) << " smtpMethod unknown " << smtpMethod;
-        }
-        storeTransport(mt, true);   //only one smtp for the moment
-    }
-    settings->endGroup();
-}
-
-void TrojitaSettings::readIdentity()
-{
-    const int size = settings->beginReadArray(QStringLiteral("identities"));
-    for (int i = 0; i < size; ++i) {
-        settings->setArrayIndex(i);
-        QString realName = settings->value(QStringLiteral("realName")).toString();
-        KIdentityManagement::Identity *identity  = createIdentity(realName);
-        identity->setFullName(realName);
-        identity->setIdentityName(realName);
-        const QString address = settings->value(QStringLiteral("address")).toString();
-        identity->setPrimaryEmailAddress(address);
-        const QString organisation = settings->value(QStringLiteral("organisation")).toString();
-        identity->setOrganization(organisation);
-        QString signatureStr = settings->value(QStringLiteral("signature")).toString();
-        if (!signatureStr.isEmpty()) {
-            KIdentityManagement::Signature signature;
-            signature.setType(KIdentityManagement::Signature::Inlined);
-            signature.setText(signatureStr);
-            identity->setSignature(signature);
-        }
-        qCDebug(IMPORTWIZARD_LOG) << " realName :" << realName << " address : " << address << " organisation : " << organisation << " signature: " << signatureStr;
-        storeIdentity(identity);
-    }
-    settings->endArray();
-}
-
-void TrojitaSettings::readGlobalSettings()
-{
-    //TODO
-}
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/trojita/trojitasettings.h akonadi-import-wizard-17.08.3/src/autodetect/trojita/trojitasettings.h
--- akonadi-import-wizard-17.04.3/src/autodetect/trojita/trojitasettings.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/trojita/trojitasettings.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
-   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public
-   License as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-*/
-
-#ifndef TrojitaSettings_H
-#define TrojitaSettings_H
-
-#include "abstractsettings.h"
-
-class ImportWizard;
-class QSettings;
-
-class TrojitaSettings : public AbstractSettings
-{
-public:
-    explicit TrojitaSettings(const QString &filename, ImportWizard *parent);
-    ~TrojitaSettings();
-    void importSettings();
-private:
-    void readImapAccount();
-    void readIdentity();
-    void readGlobalSettings();
-    void readTransport();
-    QSettings *settings;
-};
-
-#endif // ClawsMailSettings_H
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/widgets/selectprogramlistwidget.cpp akonadi-import-wizard-17.08.3/src/autodetect/widgets/selectprogramlistwidget.cpp
--- akonadi-import-wizard-17.04.3/src/autodetect/widgets/selectprogramlistwidget.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/widgets/selectprogramlistwidget.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -23,16 +23,15 @@
 #include <QPainter>
 
 SelectProgramListWidget::SelectProgramListWidget(QWidget *parent)
-    : QListWidget(parent),
-      mNoProgramFound(false)
+    : QListWidget(parent)
+    , mNoProgramFound(false)
 {
-
 }
 
 SelectProgramListWidget::~SelectProgramListWidget()
 {
-
 }
+
 void SelectProgramListWidget::setNoProgramFound(bool noProgramFound)
 {
     mNoProgramFound = noProgramFound;
@@ -48,7 +47,7 @@
 
 void SelectProgramListWidget::paintEvent(QPaintEvent *event)
 {
-    if (mNoProgramFound  && (!model() || model()->rowCount() == 0)) {
+    if (mNoProgramFound && (!model() || model()->rowCount() == 0)) {
         QPainter p(viewport());
 
         QFont font = p.font();
@@ -65,4 +64,3 @@
         QListWidget::paintEvent(event);
     }
 }
-
diff -Nru akonadi-import-wizard-17.04.3/src/autodetect/widgets/selectprogramlistwidget.h akonadi-import-wizard-17.08.3/src/autodetect/widgets/selectprogramlistwidget.h
--- akonadi-import-wizard-17.04.3/src/autodetect/widgets/selectprogramlistwidget.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/autodetect/widgets/selectprogramlistwidget.h	2017-10-29 07:12:25.000000000 +0000
@@ -32,7 +32,7 @@
     void setNoProgramFound(bool noProgramFound);
 
 protected:
-    void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
+    void paintEvent(QPaintEvent *event) override;
 private:
     void generalPaletteChanged();
     QColor mTextColor;
diff -Nru akonadi-import-wizard-17.04.3/src/CMakeLists.txt akonadi-import-wizard-17.08.3/src/CMakeLists.txt
--- akonadi-import-wizard-17.04.3/src/CMakeLists.txt	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/CMakeLists.txt	2017-10-29 07:12:25.000000000 +0000
@@ -3,20 +3,28 @@
 configure_file(importwizard-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/importwizard-version.h @ONLY)
 add_subdirectory(icons)
 add_subdirectory(kconf_update)
+add_subdirectory(libimportwizard)
 
-set(libimportwizard_SRCS
+file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kontact-import-wizard.png")
+ecm_add_app_icon(importwizard_SRCS ICONS ${ICONS_SRCS})
+
+set(importwizard_SRCS
+    main.cpp
     importwizard.cpp
     importwizardkernel.cpp
+    importmailpluginmanager.cpp
+    importwizarddisplayinfo.cpp
+
     )
-set(libimportwizard_manual_SRCS
+
+set(importwizard_manual_SRCS
     manual/manualimportmailpage.cpp
     manual/importwizardfilterinfogui.cpp
     manual/manualselectfilterpage.cpp
     )
 
-set(libimportwizard_autodetect_SRCS
+set(importwizard_autodetect_SRCS
     autodetect/widgets/selectprogramlistwidget.cpp
-    autodetect/importwizardutil.cpp
     autodetect/selectprogrampage.cpp
     autodetect/importaddressbookpage.cpp
     autodetect/importfilterpage.cpp
@@ -26,51 +34,10 @@
     autodetect/selectcomponentpage.cpp
     autodetect/importfilterinfogui.cpp
     autodetect/importcalendarpage.cpp
-    autodetect/abstractimporter.cpp
-    autodetect/abstractsettings.cpp
-    autodetect/abstractaddressbook.cpp
-    autodetect/abstractcalendar.cpp
-    autodetect/abstractbase.cpp
-    autodetect/thunderbird/thunderbirdimportdata.cpp
-    autodetect/thunderbird/thunderbirdsettings.cpp
-    autodetect/thunderbird/thunderbirdaddressbook.cpp
-    autodetect/thunderbird/addressbook/MorkParser.cpp
-    autodetect/sylpheed/sylpheedimportdata.cpp
-    autodetect/sylpheed/sylpheedsettings.cpp
-    autodetect/sylpheed/sylpheedaddressbook.cpp
-    autodetect/sylpheed/sylpheedsettingsutils.cpp
-    autodetect/evolutionv3/evolutionv3importdata.cpp
-    autodetect/evolutionv3/evolutionsettings.cpp
-    autodetect/evolutionv3/evolutioncalendar.cpp
-    autodetect/evolutionv3/evolutionaddressbook.cpp
-    autodetect/evolutionv3/evolutionutil.cpp
-    autodetect/evolutionv2/evolutionv2importdata.cpp
-    autodetect/evolutionv1/evolutionv1importdata.cpp
-    autodetect/opera/operaimportdata.cpp
-    autodetect/opera/operaaddressbook.cpp
-    autodetect/opera/operasettings.cpp
-    autodetect/oe/oeimportdata.cpp
-    autodetect/mailapp/mailappimportdata.cpp
-    autodetect/pmail/pmailimportdata.cpp
-    autodetect/pmail/pmailsettings.cpp
-    autodetect/thebat/thebatimportdata.cpp
-    autodetect/balsa/balsaimportdata.cpp
-    autodetect/balsa/balsasettings.cpp
-    autodetect/balsa/balsaaddressbook.cpp
-    autodetect/claws-mail/clawsmailimportdata.cpp
-    autodetect/claws-mail/clawsmailsettings.cpp
-    autodetect/claws-mail/clawsmailaddressbook.cpp
-    autodetect/trojita/trojitasettings.cpp
-    autodetect/trojita/trojitaimportdata.cpp
-    autodetect/trojita/trojitaaddressbook.cpp
-    autodetect/icedove/icedoveimportdata.cpp
-    autodetect/geary/gearysettings.cpp
-    autodetect/geary/gearyimportdata.cpp
-    autodetect/geary/gearyaddressbook.cpp
     )
 
 
-ki18n_wrap_ui(libimportwizard_SRCS
+ki18n_wrap_ui(importwizard_SRCS
     ui/autodetect/selectprogrampage.ui
     ui/autodetect/importaddressbookpage.ui
     ui/autodetect/importfilterpage.ui
@@ -83,58 +50,35 @@
     ui/manual/manualselectfilterpage.ui
     )
 
-ecm_qt_declare_logging_category(libimportwizard_SRCS HEADER importwizard_debug.h IDENTIFIER IMPORTWIZARD_LOG CATEGORY_NAME org.kde.pim.importwizard)
-
-file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kontact-import-wizard.png")
-ecm_add_app_icon(importwizard_SRCS ICONS ${ICONS_SRCS})
 
+ecm_qt_declare_logging_category(importwizard_SRCS HEADER importwizard_debug.h IDENTIFIER IMPORTWIZARD_LOG CATEGORY_NAME org.kde.pim.importwizard)
 
-add_library(libimportwizard ${libimportwizard_autodetect_SRCS} ${libimportwizard_manual_SRCS} ${libimportwizard_SRCS})
-
-generate_export_header(libimportwizard BASE_NAME libimportwizard)
+add_executable(importwizard
+    ${importwizard_SRCS}
+    ${importwizard_manual_SRCS}
+    ${importwizard_autodetect_SRCS}
+    )
 
-target_link_libraries(libimportwizard
-    PRIVATE
+target_link_libraries(importwizard
+    KPimImportWizard
     KF5::AkonadiCore
-    KF5::MailTransport
     KF5::XmlGui
     KF5::MailImporterAkonadi
     KF5::PimCommon
     KF5::MailCommon
     KF5::Libkdepim
-    KF5::MessageViewer
     KF5::Completion
     KF5::I18n
     KF5::CoreAddons
-    )
-
-set_target_properties(libimportwizard
-    PROPERTIES OUTPUT_NAME importwizard VERSION ${KDEPIM_LIB_VERSION} SOVERSION ${KDEPIM_LIB_SOVERSION}
-    )
-
-
-set(importwizard_SRCS
-    main.cpp
-    )
-
-add_executable(importwizard ${importwizard_SRCS})
-
-target_link_libraries(importwizard
-    libimportwizard
-    KF5::I18n
     KF5::Crash
-    KF5::CoreAddons
     KF5::DBusAddons
     Qt5::Widgets
     KF5::ConfigCore
     KF5::WidgetsAddons
-    KF5::MailCommon
     )
 
 install(TARGETS importwizard  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(PROGRAMS data/org.kde.importwizard.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 
-install(TARGETS libimportwizard ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
-
 add_subdirectory(manual/pics)
-
+add_subdirectory(plugins/)
diff -Nru akonadi-import-wizard-17.04.3/src/helper_p.h akonadi-import-wizard-17.08.3/src/helper_p.h
--- akonadi-import-wizard-17.04.3/src/helper_p.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/helper_p.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-/*
-    Copyright (c) 2017 Laurent Montel <montel@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef _HELPER_H
-#define _HELPER_H
-#include <qglobal.h>
-
-#if QT_VERSION < QT_VERSION_CHECK(5,7,0)
-template <typename... Args>
-struct QNonConstOverload
-{
-    template <typename R, typename T>
-    Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr)
-    { return ptr; }
-
-    template <typename R, typename T>
-    static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr)
-    { return ptr; }
-};
-
-template <typename... Args>
-struct QConstOverload
-{
-    template <typename R, typename T>
-    Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...) const) const Q_DECL_NOTHROW -> decltype(ptr)
-    { return ptr; }
-
-    template <typename R, typename T>
-    static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...) const) Q_DECL_NOTHROW -> decltype(ptr)
-    { return ptr; }
-};
-
-template <typename... Args>
-struct QOverload : QConstOverload<Args...>, QNonConstOverload<Args...>
-{
-    using QConstOverload<Args...>::of;
-    using QConstOverload<Args...>::operator();
-    using QNonConstOverload<Args...>::of;
-    using QNonConstOverload<Args...>::operator();
-
-    template <typename R>
-    Q_DECL_CONSTEXPR auto operator()(R (*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr)
-    { return ptr; }
-
-    template <typename R>
-    static Q_DECL_CONSTEXPR auto of(R (*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr)
-    { return ptr; }
-};
-
-namespace QtPrivate
-{
-template <typename T> struct QAddConst {
-    typedef const T Type;
-};
-}
-
-// this adds const to non-const objects (like std::as_const)
-template <typename T>
-Q_DECL_CONSTEXPR typename QtPrivate::QAddConst<T>::Type &qAsConst(T &t) Q_DECL_NOTHROW { return t; }
-// prevent rvalue arguments:
-template <typename T>
-void qAsConst(const T &&) Q_DECL_EQ_DELETE;
-#endif
-
-#endif
diff -Nru akonadi-import-wizard-17.04.3/src/importmailpluginmanager.cpp akonadi-import-wizard-17.08.3/src/importmailpluginmanager.cpp
--- akonadi-import-wizard-17.04.3/src/importmailpluginmanager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/importmailpluginmanager.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,119 @@
+/*
+   Copyright (C) 2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "importmailpluginmanager.h"
+#include "importwizard_debug.h"
+#include "abstractimporter.h"
+
+#include <KPluginMetaData>
+#include <KPluginLoader>
+#include <KPluginFactory>
+
+#include <QFileInfo>
+#include <QVector>
+
+Q_GLOBAL_STATIC(ImportMailPluginManager, s_instance)
+
+namespace {
+QString pluginVersion()
+{
+    return QStringLiteral("1.0");
+}
+}
+
+ImportMailPluginManager::ImportMailPluginManager(QObject *parent)
+    : QObject(parent)
+{
+    initializePluginList();
+}
+
+ImportMailPluginManager::~ImportMailPluginManager()
+{
+}
+
+ImportMailPluginManager *ImportMailPluginManager::self()
+{
+    return s_instance;
+}
+
+bool ImportMailPluginManager::initializePluginList()
+{
+    const QVector<KPluginMetaData> plugins = KPluginLoader::findPlugins(QStringLiteral("importwizard"), [](const KPluginMetaData &md) {
+        return md.serviceTypes().contains(QStringLiteral("ImportWizard/PluginMailImporter"));
+    });
+
+    QVectorIterator<KPluginMetaData> i(plugins);
+    i.toBack();
+    QSet<QString> unique;
+    while (i.hasPrevious()) {
+        ImportMailPluginManagerInfo info;
+        const KPluginMetaData data = i.previous();
+
+        //1) get plugin data => name/description etc.
+        info.pluginData = createPluginMetaData(data);
+        //2) look at if plugin is activated
+        info.metaDataFileNameBaseName = QFileInfo(data.fileName()).baseName();
+        info.metaDataFileName = data.fileName();
+        if (pluginVersion() == data.version()) {
+            // only load plugins once, even if found multiple times!
+            if (unique.contains(info.metaDataFileNameBaseName)) {
+                continue;
+            }
+            info.plugin = nullptr;
+            mPluginList.push_back(info);
+            unique.insert(info.metaDataFileNameBaseName);
+        } else {
+            qCWarning(IMPORTWIZARD_LOG) << "Plugin " << data.name() << " doesn't have correction plugin version. It will not be loaded.";
+        }
+    }
+    QVector<ImportMailPluginManagerInfo>::iterator end(mPluginList.end());
+    for (QVector<ImportMailPluginManagerInfo>::iterator it = mPluginList.begin(); it != end; ++it) {
+        loadPlugin(&(*it));
+    }
+    return true;
+}
+
+void ImportMailPluginManager::loadPlugin(ImportMailPluginManagerInfo *item)
+{
+    KPluginLoader pluginLoader(item->metaDataFileName);
+    if (pluginLoader.factory()) {
+        item->plugin = pluginLoader.factory()->create<LibImportWizard::AbstractImporter>(this, QVariantList() << item->metaDataFileNameBaseName);
+        mPluginDataList.append(item->pluginData);
+    }
+}
+
+QVector<LibImportWizard::AbstractImporter *> ImportMailPluginManager::pluginsList() const
+{
+    QVector<LibImportWizard::AbstractImporter *> lst;
+    QVector<ImportMailPluginManagerInfo>::ConstIterator end(mPluginList.constEnd());
+    for (QVector<ImportMailPluginManagerInfo>::ConstIterator it = mPluginList.constBegin(); it != end; ++it) {
+        if (auto plugin = (*it).plugin) {
+            lst << plugin;
+        }
+    }
+    return lst;
+}
+
+PluginUtilData ImportMailPluginManager::createPluginMetaData(const KPluginMetaData &metaData)
+{
+    PluginUtilData pluginData;
+    pluginData.mName = metaData.name();
+    pluginData.mIdentifier = metaData.pluginId();
+    return pluginData;
+}
diff -Nru akonadi-import-wizard-17.04.3/src/importmailpluginmanager.h akonadi-import-wizard-17.08.3/src/importmailpluginmanager.h
--- akonadi-import-wizard-17.04.3/src/importmailpluginmanager.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/importmailpluginmanager.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,73 @@
+/*
+   Copyright (C) 2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#ifndef IMPORTMAILPLUGINMANAGER_H
+#define IMPORTMAILPLUGINMANAGER_H
+
+#include <QObject>
+#include <KPluginMetaData>
+namespace LibImportWizard {
+class AbstractImporter;
+}
+
+class PluginUtilData
+{
+public:
+    PluginUtilData()
+    {
+    }
+
+    QStringList mExtraInfo;
+    QString mIdentifier;
+    QString mName;
+};
+
+class ImportMailPluginManagerInfo
+{
+public:
+    ImportMailPluginManagerInfo()
+        : plugin(nullptr)
+    {
+    }
+
+    QString metaDataFileNameBaseName;
+    QString metaDataFileName;
+    PluginUtilData pluginData;
+    LibImportWizard::AbstractImporter *plugin;
+};
+
+class ImportMailPluginManager : public QObject
+{
+    Q_OBJECT
+public:
+    explicit ImportMailPluginManager(QObject *parent = nullptr);
+    ~ImportMailPluginManager();
+
+    static ImportMailPluginManager *self();
+    bool initializePluginList();
+
+    QVector<LibImportWizard::AbstractImporter *> pluginsList() const;
+
+private:
+    void loadPlugin(ImportMailPluginManagerInfo *item);
+    PluginUtilData createPluginMetaData(const KPluginMetaData &metaData);
+    QVector<ImportMailPluginManagerInfo> mPluginList;
+    QVector<PluginUtilData> mPluginDataList;
+};
+
+#endif // IMPORTMAILPLUGINMANAGER_H
diff -Nru akonadi-import-wizard-17.04.3/src/importwizard.cpp akonadi-import-wizard-17.08.3/src/importwizard.cpp
--- akonadi-import-wizard-17.04.3/src/importwizard.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/importwizard.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -18,30 +18,16 @@
 */
 #include "importwizard.h"
 #include "importwizardkernel.h"
-#include "selectprogrampage.h"
-#include "selectcomponentpage.h"
-#include "importmailpage.h"
-#include "importfilterpage.h"
-#include "importsettingpage.h"
-#include "importaddressbookpage.h"
-#include "importcalendarpage.h"
-#include "importfinishpage.h"
-
-#include "autodetect/thunderbird/thunderbirdimportdata.h"
-#include "autodetect/sylpheed/sylpheedimportdata.h"
-#include "autodetect/evolutionv3/evolutionv3importdata.h"
-#include "autodetect/evolutionv2/evolutionv2importdata.h"
-#include "autodetect/evolutionv1/evolutionv1importdata.h"
-#include "autodetect/icedove/icedoveimportdata.h"
-#include "autodetect/opera/operaimportdata.h"
-#include "autodetect/oe/oeimportdata.h"
-#include "autodetect/mailapp/mailappimportdata.h"
-#include "autodetect/pmail/pmailimportdata.h"
-#include "autodetect/thebat/thebatimportdata.h"
-#include "autodetect/balsa/balsaimportdata.h"
-#include "autodetect/claws-mail/clawsmailimportdata.h"
-#include "autodetect/trojita/trojitaimportdata.h"
-#include "autodetect/geary/gearyimportdata.h"
+#include "autodetect/selectprogrampage.h"
+#include "autodetect/selectcomponentpage.h"
+#include "autodetect/importmailpage.h"
+#include "autodetect/importfilterpage.h"
+#include "autodetect/importsettingpage.h"
+#include "autodetect/importaddressbookpage.h"
+#include "autodetect/importcalendarpage.h"
+#include "autodetect/importfinishpage.h"
+#include "importmailpluginmanager.h"
+#include "importwizarddisplayinfo.h"
 
 #include "manual/manualimportmailpage.h"
 #include "manual/manualselectfilterpage.h"
@@ -61,13 +47,14 @@
 #include <QPushButton>
 
 ImportWizard::ImportWizard(WizardMode mode, QWidget *parent)
-    : KAssistantDialog(parent),
-      mMode(mode),
-      mSelectedPim(nullptr)
+    : KAssistantDialog(parent)
+    , mMode(mode)
+    , mSelectedPim(nullptr)
 {
     setModal(true);
     setWindowTitle(i18n("PIM Import Tool"));
     setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Help);
+    mAbstractDisplayInfo = new ImportWizardDisplayInfo(this);
 
     ImportWizardKernel *kernel = new ImportWizardKernel(this);
     CommonKernel->registerKernelIf(kernel);   //register KernelIf early, it is used by the Filter classes
@@ -92,7 +79,7 @@
     resize(640, 480);
     Akonadi::ControlGui::widgetNeedsAkonadi(this);
 
-    if (mode == AutoDetect) {
+    if (mode == WizardMode::AutoDetect) {
         checkModules();
         KMessageBox::information(this, i18n("Close KMail before importing data. Some plugins will modify KMail config file."));
     }
@@ -107,7 +94,6 @@
 
 ImportWizard::~ImportWizard()
 {
-    qDeleteAll(mlistImport);
     writeConfig();
 }
 
@@ -128,7 +114,7 @@
 
 void ImportWizard::updatePagesFromMode()
 {
-    const bool autodetectMode = (mMode == AutoDetect);
+    const bool autodetectMode = (mMode == WizardMode::AutoDetect);
     setAppropriate(mSelectProgramPageItem, autodetectMode);
     setAppropriate(mSelectComponentPageItem, autodetectMode);
     setAppropriate(mImportMailPageItem, autodetectMode);
@@ -219,30 +205,13 @@
 
 void ImportWizard::initializeImportModule()
 {
-    //Import module
-    addImportModule(new ThunderbirdImportData(this));
-    addImportModule(new IcedoveImportData(this));
-    addImportModule(new SylpheedImportData(this));
-    addImportModule(new Evolutionv3ImportData(this));
-    addImportModule(new Evolutionv2ImportData(this));
-    addImportModule(new Evolutionv1ImportData(this));
-    addImportModule(new OperaImportData(this));
-#ifdef Q_OS_WIN
-    addImportModule(new OeImportData(this));
-#endif
-#ifdef Q_OS_MAC
-    addImportModule(new MailAppImportData(this));
-#endif
-
-#ifdef Q_OS_WIN
-    addImportModule(new PMailImportData(this));
-    addImportModule(new TheBatImportData(this));
-#endif
-
-    addImportModule(new BalsaImportData(this));
-    addImportModule(new ClawsMailImportData(this));
-    addImportModule(new TrojitaImportData(this));
-    addImportModule(new GearyImportData(this));
+    const QVector<LibImportWizard::AbstractImporter *> lstPlugins = ImportMailPluginManager::self()->pluginsList();
+    for (LibImportWizard::AbstractImporter *abstractPlugin : qAsConst(lstPlugins)) {
+        if (abstractPlugin->foundMailer()) {
+            abstractPlugin->setAbstractDisplayInfo(mAbstractDisplayInfo);
+            mlistImport.insert(abstractPlugin->name(), abstractPlugin);
+        }
+    }
 }
 
 void ImportWizard::slotProgramDoubleClicked()
@@ -292,7 +261,7 @@
 
 void ImportWizard::slotProgramSelected(const QString &program)
 {
-    AbstractImporter *importer = mlistImport.value(program);
+    LibImportWizard::AbstractImporter *importer = mlistImport.value(program);
     if (importer) {
         mSelectedPim = importer;
         setValid(currentPage(), true);
@@ -304,7 +273,7 @@
     mSelectProgramPage->setFoundProgram(mlistImport.keys());
 }
 
-void ImportWizard::addImportModule(AbstractImporter *import)
+void ImportWizard::addImportModule(LibImportWizard::AbstractImporter *import)
 {
     if (import->foundMailer()) {
         mlistImport.insert(import->name(), import);
@@ -318,13 +287,13 @@
     setValid(mSelectComponentPageItem, result);
 }
 
-void ImportWizard::setAppropriatePage(AbstractImporter::TypeSupportedOptions options)
+void ImportWizard::setAppropriatePage(LibImportWizard::AbstractImporter::TypeSupportedOptions options)
 {
-    setAppropriate(mImportMailPageItem, (options & AbstractImporter::Mails));
-    setAppropriate(mImportFilterPageItem, (options & AbstractImporter::Filters));
-    setAppropriate(mImportSettingPageItem, (options & AbstractImporter::Settings));
-    setAppropriate(mImportAddressbookPageItem, (options & AbstractImporter::AddressBooks));
-    setAppropriate(mImportCalendarPageItem, (options & AbstractImporter::Calendars));
+    setAppropriate(mImportMailPageItem, (options & LibImportWizard::AbstractImporter::Mails));
+    setAppropriate(mImportFilterPageItem, (options & LibImportWizard::AbstractImporter::Filters));
+    setAppropriate(mImportSettingPageItem, (options & LibImportWizard::AbstractImporter::Settings));
+    setAppropriate(mImportAddressbookPageItem, (options & LibImportWizard::AbstractImporter::AddressBooks));
+    setAppropriate(mImportCalendarPageItem, (options & LibImportWizard::AbstractImporter::Calendars));
 }
 
 void ImportWizard::next()
@@ -407,11 +376,11 @@
 {
     if (currentPage() == mSelectProgramPageItem) {
         return;
-    } else if (currentPage() == mImportFilterPageItem ||
-               currentPage() == mImportSettingPageItem ||
-               currentPage() == mImportAddressbookPageItem ||
-               currentPage() == mImportCalendarPageItem ||
-               currentPage() == mImportFinishPageItem) {
+    } else if (currentPage() == mImportFilterPageItem
+               || currentPage() == mImportSettingPageItem
+               || currentPage() == mImportAddressbookPageItem
+               || currentPage() == mImportCalendarPageItem
+               || currentPage() == mImportFinishPageItem) {
         enableAllImportButton();
     }
     KAssistantDialog::back();
@@ -459,6 +428,6 @@
 
 void ImportWizard::slotSelectManualSelectionChanged(bool b)
 {
-    mMode = b ? Manual : AutoDetect;
+    mMode = b ? WizardMode::Manual : WizardMode::AutoDetect;
     updatePagesFromMode();
 }
diff -Nru akonadi-import-wizard-17.04.3/src/importwizarddisplayinfo.cpp akonadi-import-wizard-17.08.3/src/importwizarddisplayinfo.cpp
--- akonadi-import-wizard-17.04.3/src/importwizarddisplayinfo.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/importwizarddisplayinfo.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,97 @@
+/*
+   Copyright (C) 2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "importwizarddisplayinfo.h"
+#include "importwizard.h"
+#include "autodetect/importcalendarpage.h"
+#include "autodetect/importsettingpage.h"
+#include "autodetect/importaddressbookpage.h"
+#include "autodetect/importfilterpage.h"
+#include "autodetect/importmailpage.h"
+#include "autodetect/importfilterinfogui.h"
+
+#include <MailImporter/FilterInfo>
+#include <MailImporterAkonadi/FilterImporterAkonadi>
+
+ImportWizardDisplayInfo::ImportWizardDisplayInfo(ImportWizard *wizard)
+    : mImportWizard(wizard)
+{
+    Q_ASSERT_X(mImportWizard, __FUNCTION__, "mImportWizard is null");
+}
+
+ImportWizardDisplayInfo::~ImportWizardDisplayInfo()
+{
+}
+
+void ImportWizardDisplayInfo::calendarImportError(const QString &log)
+{
+    mImportWizard->importCalendarPage()->addImportError(log);
+}
+
+void ImportWizardDisplayInfo::settingsImportError(const QString &log)
+{
+    mImportWizard->importSettingPage()->addImportError(log);
+}
+
+void ImportWizardDisplayInfo::addressbookImportError(const QString &log)
+{
+    mImportWizard->importAddressBookPage()->addImportError(log);
+}
+
+void ImportWizardDisplayInfo::calendarImportInfo(const QString &log)
+{
+    mImportWizard->importCalendarPage()->addImportInfo(log);
+}
+
+void ImportWizardDisplayInfo::settingsImportInfo(const QString &log)
+{
+    mImportWizard->importSettingPage()->addImportInfo(log);
+}
+
+void ImportWizardDisplayInfo::addressbookImportInfo(const QString &log)
+{
+    mImportWizard->importAddressBookPage()->addImportInfo(log);
+}
+
+QWidget *ImportWizardDisplayInfo::parentWidget() const
+{
+    return mImportWizard;
+}
+
+void ImportWizardDisplayInfo::filterImportError(const QString &log)
+{
+    mImportWizard->importFilterPage()->addImportError(log);
+}
+
+void ImportWizardDisplayInfo::filterImportInfo(const QString &log)
+{
+    mImportWizard->importFilterPage()->addImportInfo(log);
+}
+
+void ImportWizardDisplayInfo::initializeFilter(MailImporter::Filter &filter)
+{
+    MailImporter::FilterInfo *info = new MailImporter::FilterInfo();
+    ImportFilterInfoGui *infoGui = new ImportFilterInfoGui(mImportWizard->importMailPage());
+    info->setFilterInfoGui(infoGui);
+    info->clear(); // Clear info from last time
+    MailImporter::FilterImporterAkonadi *filterImporter = new MailImporter::FilterImporterAkonadi(info);
+    filterImporter->setRootCollection(mImportWizard->importMailPage()->selectedCollection());
+    filter.setFilterImporter(filterImporter);
+    filter.setFilterInfo(info);
+}
diff -Nru akonadi-import-wizard-17.04.3/src/importwizarddisplayinfo.h akonadi-import-wizard-17.08.3/src/importwizarddisplayinfo.h
--- akonadi-import-wizard-17.04.3/src/importwizarddisplayinfo.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/importwizarddisplayinfo.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+   Copyright (C) 2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef IMPORTWIZARDDISPLAYINFO_H
+#define IMPORTWIZARDDISPLAYINFO_H
+
+#include "abstractdisplayinfo.h"
+#include <QObject>
+
+class ImportWizard;
+class ImportWizardDisplayInfo : public LibImportWizard::AbstractDisplayInfo
+{
+public:
+    explicit ImportWizardDisplayInfo(ImportWizard *wizard);
+    ~ImportWizardDisplayInfo();
+
+    void calendarImportError(const QString &log) override;
+    void settingsImportError(const QString &log) override;
+    void addressbookImportError(const QString &log) override;
+    void calendarImportInfo(const QString &log) override;
+    void settingsImportInfo(const QString &log) override;
+    void addressbookImportInfo(const QString &log) override;
+    void filterImportError(const QString &log) override;
+    void filterImportInfo(const QString &log) override;
+
+    void initializeFilter(MailImporter::Filter &filter) override;
+
+    QWidget *parentWidget() const override;
+private:
+    ImportWizard *mImportWizard;
+};
+
+#endif // IMPORTWIZARDDISPLAYINFO_H
diff -Nru akonadi-import-wizard-17.04.3/src/importwizard.h akonadi-import-wizard-17.08.3/src/importwizard.h
--- akonadi-import-wizard-17.04.3/src/importwizard.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/importwizard.h	2017-10-29 07:12:25.000000000 +0000
@@ -23,7 +23,10 @@
 #include "libimportwizard_export.h"
 
 #include <KAssistantDialog>
-
+namespace LibImportWizard {
+class AbstractImporter;
+class AbstractDisplayInfo;
+}
 class KPageWidgetItem;
 class SelectProgramPage;
 class SelectComponentPage;
@@ -33,19 +36,17 @@
 class ImportAddressbookPage;
 class ImportFinishPage;
 class ImportCalendarPage;
-class AbstractImporter;
 class ManualSelectFilterPage;
 class ManualImportMailPage;
 
-namespace Akonadi
-{
+namespace Akonadi {
 class Collection;
 }
 class LIBIMPORTWIZARD_EXPORT ImportWizard : public KAssistantDialog
 {
     Q_OBJECT
 public:
-    enum WizardMode {
+    enum class WizardMode {
         AutoDetect = 0,
         Manual = 1
     };
@@ -53,9 +54,9 @@
     explicit ImportWizard(WizardMode mode, QWidget *parent = nullptr);
     ~ImportWizard();
 
-    void next() Q_DECL_OVERRIDE;
-    void reject() Q_DECL_OVERRIDE;
-    void back() Q_DECL_OVERRIDE;
+    void next() override;
+    void reject() override;
+    void back() override;
 
     ImportMailPage *importMailPage() const;
     ImportFilterPage *importFilterPage() const;
@@ -64,9 +65,6 @@
     ImportFinishPage *importFinishPage() const;
     ImportCalendarPage *importCalendarPage() const;
 
-    void addFinishInfo(const QString &log);
-    void addFinishError(const QString &log);
-
 private Q_SLOTS:
     void slotProgramSelected(const QString &program);
     void slotImportMailsClicked();
@@ -80,21 +78,24 @@
     void slotCollectionChanged(const Akonadi::Collection &selectedCollection);
 
 private:
+    void addFinishInfo(const QString &log);
+    void addFinishError(const QString &log);
+
     void readConfig();
     void writeConfig();
     void initializeImportModule();
     void createAutomaticModePage();
-    void addImportModule(AbstractImporter *);
+    void addImportModule(LibImportWizard::AbstractImporter *);
     void checkModules();
-    void setAppropriatePage(AbstractImporter::TypeSupportedOptions options);
+    void setAppropriatePage(LibImportWizard::AbstractImporter::TypeSupportedOptions options);
     void enableAllImportButton();
     void createManualModePage();
     void updatePagesFromMode();
 
-    QMap<QString, AbstractImporter *> mlistImport;
+    QMap<QString, LibImportWizard::AbstractImporter *> mlistImport;
 
     WizardMode mMode;
-    AbstractImporter *mSelectedPim;
+    LibImportWizard::AbstractImporter *mSelectedPim;
 
     KPageWidgetItem *mSelectProgramPageItem;
     KPageWidgetItem *mSelectComponentPageItem;
@@ -118,7 +119,8 @@
     ManualImportMailPage *mImportpage;
     KPageWidgetItem *mSelfilterpageItem;
     KPageWidgetItem *mImportpageItem;
+
+    LibImportWizard::AbstractDisplayInfo *mAbstractDisplayInfo;
 };
 
 #endif /* IMPORTWIZARD_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/importwizardkernel.h akonadi-import-wizard-17.08.3/src/importwizardkernel.h
--- akonadi-import-wizard-17.04.3/src/importwizardkernel.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/importwizardkernel.h	2017-10-29 07:12:25.000000000 +0000
@@ -22,14 +22,12 @@
 
 #include <MailCommon/MailInterfaces>
 
-namespace Akonadi
-{
+namespace Akonadi {
 class EntityTreeModel;
 class EntityMimeTypeFilterModel;
 }
 
-namespace MailCommon
-{
+namespace MailCommon {
 class FolderCollectionMonitor;
 }
 
@@ -39,23 +37,23 @@
 public:
     explicit ImportWizardKernel(QObject *parent = nullptr);
 
-    KIdentityManagement::IdentityManager *identityManager() Q_DECL_OVERRIDE;
-    MessageComposer::MessageSender *msgSender() Q_DECL_OVERRIDE;
+    KIdentityManagement::IdentityManager *identityManager() override;
+    MessageComposer::MessageSender *msgSender() override;
 
-    Akonadi::EntityMimeTypeFilterModel *collectionModel() const Q_DECL_OVERRIDE;
-    KSharedConfig::Ptr config() Q_DECL_OVERRIDE;
-    void syncConfig() Q_DECL_OVERRIDE;
-    MailCommon::JobScheduler *jobScheduler() const Q_DECL_OVERRIDE;
-    Akonadi::ChangeRecorder *folderCollectionMonitor() const Q_DECL_OVERRIDE;
-    void updateSystemTray() Q_DECL_OVERRIDE;
-
-    qreal closeToQuotaThreshold() Q_DECL_OVERRIDE;
-    bool excludeImportantMailFromExpiry() Q_DECL_OVERRIDE;
-    QStringList customTemplates() Q_DECL_OVERRIDE;
-    Akonadi::Collection::Id lastSelectedFolder() Q_DECL_OVERRIDE;
-    void setLastSelectedFolder(Akonadi::Collection::Id col) Q_DECL_OVERRIDE;
-    bool showPopupAfterDnD() Q_DECL_OVERRIDE;
-    void expunge(Akonadi::Collection::Id col, bool sync) Q_DECL_OVERRIDE;
+    Akonadi::EntityMimeTypeFilterModel *collectionModel() const override;
+    KSharedConfig::Ptr config() override;
+    void syncConfig() override;
+    MailCommon::JobScheduler *jobScheduler() const override;
+    Akonadi::ChangeRecorder *folderCollectionMonitor() const override;
+    void updateSystemTray() override;
+
+    qreal closeToQuotaThreshold() override;
+    bool excludeImportantMailFromExpiry() override;
+    QStringList customTemplates() override;
+    Akonadi::Collection::Id lastSelectedFolder() override;
+    void setLastSelectedFolder(Akonadi::Collection::Id col) override;
+    bool showPopupAfterDnD() override;
+    void expunge(Akonadi::Collection::Id col, bool sync) override;
 
 private:
     KIdentityManagement::IdentityManager *mIdentityManager;
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/abstractaddressbook.cpp akonadi-import-wizard-17.08.3/src/libimportwizard/abstractaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/libimportwizard/abstractaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/abstractaddressbook.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#include "abstractaddressbook.h"
+#include "abstractdisplayinfo.h"
+
+#include <KContacts/Addressee>
+#include <kcontacts/contactgroup.h>
+#include <KLocalizedString>
+#include "libimportwizard_debug.h"
+#include <AkonadiCore/ItemCreateJob>
+#include <AkonadiCore/Item>
+#include <AkonadiWidgets/CollectionDialog>
+
+#include <QPointer>
+using namespace LibImportWizard;
+AbstractAddressBook::AbstractAddressBook()
+    : mCollection(-1)
+{
+}
+
+AbstractAddressBook::~AbstractAddressBook()
+{
+}
+
+bool AbstractAddressBook::selectAddressBook()
+{
+    addAddressBookImportInfo(i18n("Creating new contact..."));
+    if (!mCollection.isValid()) {
+        const QStringList mimeTypes(KContacts::Addressee::mimeType());
+        QPointer<Akonadi::CollectionDialog> dlg = new Akonadi::CollectionDialog(mAbstractDisplayInfo ? mAbstractDisplayInfo->parentWidget() : nullptr);
+        dlg->setMimeTypeFilter(mimeTypes);
+        dlg->setAccessRightsFilter(Akonadi::Collection::CanCreateItem);
+        dlg->setWindowTitle(i18n("Select Address Book"));
+        dlg->setDescription(i18n("Select the address book the new contact shall be saved in:"));
+
+        if (dlg->exec() == QDialog::Accepted && dlg) {
+            mCollection = dlg->selectedCollection();
+        } else {
+            addAddressBookImportError(i18n("Address Book was not selected."));
+            delete dlg;
+            return false;
+        }
+        delete dlg;
+    }
+    return true;
+}
+
+void AbstractAddressBook::createGroup(const KContacts::ContactGroup &group)
+{
+    if (selectAddressBook()) {
+        Akonadi::Item item;
+        item.setPayload<KContacts::ContactGroup>(group);
+        item.setMimeType(KContacts::ContactGroup::mimeType());
+
+        Akonadi::ItemCreateJob *job = new Akonadi::ItemCreateJob(item, mCollection);
+        connect(job, &Akonadi::ItemCreateJob::result, this, &AbstractAddressBook::slotStoreDone);
+    }
+}
+
+void AbstractAddressBook::addImportContactNote(KContacts::Addressee &address, const QString &applicationName)
+{
+    QString currentNote = address.note();
+    if (!currentNote.isEmpty()) {
+        currentNote += QLatin1Char('\n');
+    }
+    currentNote += i18n("Imported from \"%1\"", applicationName);
+    address.setNote(currentNote);
+}
+
+void AbstractAddressBook::createContact(const KContacts::Addressee &address)
+{
+    if (selectAddressBook()) {
+        Akonadi::Item item;
+        item.setPayload<KContacts::Addressee>(address);
+        item.setMimeType(KContacts::Addressee::mimeType());
+        Akonadi::ItemCreateJob *job = new Akonadi::ItemCreateJob(item, mCollection);
+        connect(job, &Akonadi::ItemCreateJob::result, this, &AbstractAddressBook::slotStoreDone);
+    }
+}
+
+void AbstractAddressBook::slotStoreDone(KJob *job)
+{
+    if (job->error()) {
+        qCDebug(LIBIMPORTWIZARD_LOG) << " job->errorString() : " << job->errorString();
+        addAddressBookImportError(i18n("Error during contact creation: %1", job->errorString()));
+        return;
+    }
+    addAddressBookImportInfo(i18n("Contact creation complete"));
+}
+
+void AbstractAddressBook::addImportInfo(const QString &log)
+{
+    addAddressBookImportInfo(log);
+}
+
+void AbstractAddressBook::addImportError(const QString &log)
+{
+    addAddressBookImportError(log);
+}
+
+void AbstractAddressBook::addAddressBookImportInfo(const QString &log)
+{
+    if (mAbstractDisplayInfo) {
+        mAbstractDisplayInfo->addressbookImportInfo(log);
+    }
+}
+
+void AbstractAddressBook::addAddressBookImportError(const QString &log)
+{
+    if (mAbstractDisplayInfo) {
+        mAbstractDisplayInfo->addressbookImportError(log);
+    }
+}
+
+void AbstractAddressBook::cleanUp()
+{
+    mCollection = Akonadi::Collection();
+}
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/abstractaddressbook.h akonadi-import-wizard-17.08.3/src/libimportwizard/abstractaddressbook.h
--- akonadi-import-wizard-17.04.3/src/libimportwizard/abstractaddressbook.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/abstractaddressbook.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ABSTRACTADDRESSBOOK_H
+#define ABSTRACTADDRESSBOOK_H
+
+#include <AkonadiCore/Collection>
+#include "abstractbase.h"
+#include "libimportwizard_export.h"
+
+namespace KContacts {
+class Addressee;
+class ContactGroup;
+}
+
+class KJob;
+namespace LibImportWizard {
+class AbstractDisplayInfo;
+class LIBIMPORTWIZARD_EXPORT AbstractAddressBook : public LibImportWizard::AbstractBase
+{
+    Q_OBJECT
+public:
+    AbstractAddressBook();
+    ~AbstractAddressBook();
+
+protected:
+    void createGroup(const KContacts::ContactGroup &group);
+    void createContact(const KContacts::Addressee &address);
+
+    void addImportInfo(const QString &log) override;
+    void addImportError(const QString &log) override;
+
+    void addAddressBookImportInfo(const QString &log);
+    void addAddressBookImportError(const QString &log);
+    void cleanUp();
+    void addImportContactNote(KContacts::Addressee &address, const QString &applicationName);
+
+private:
+    void slotStoreDone(KJob *job);
+    bool selectAddressBook();
+    Akonadi::Collection mCollection;
+};
+}
+#endif // ABSTRACTADDRESSBOOK_H
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/abstractbase.cpp akonadi-import-wizard-17.08.3/src/libimportwizard/abstractbase.cpp
--- akonadi-import-wizard-17.04.3/src/libimportwizard/abstractbase.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/abstractbase.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,64 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "abstractbase.h"
+#include "PimCommonAkonadi/CreateResource"
+
+#include <KSharedConfig>
+
+#include <AkonadiCore/agenttype.h>
+#include <AkonadiCore/agentmanager.h>
+#include <AkonadiCore/agentinstancecreatejob.h>
+
+#include <QMetaMethod>
+
+using namespace Akonadi;
+using namespace LibImportWizard;
+AbstractBase::AbstractBase()
+    : mAbstractDisplayInfo(nullptr)
+{
+    mCreateResource = new PimCommon::CreateResource();
+    connect(mCreateResource, &PimCommon::CreateResource::createResourceInfo, this, &AbstractBase::slotCreateResourceInfo);
+    connect(mCreateResource, &PimCommon::CreateResource::createResourceError, this, &AbstractBase::slotCreateResourceError);
+}
+
+AbstractBase::~AbstractBase()
+{
+    delete mCreateResource;
+}
+
+QString LibImportWizard::AbstractBase::createResource(const QString &resources, const QString &name, const QMap<QString, QVariant> &settings)
+{
+    return mCreateResource->createResource(resources, name, settings);
+}
+
+void AbstractBase::setAbstractDisplayInfo(AbstractDisplayInfo *abstractDisplayInfo)
+{
+    mAbstractDisplayInfo = abstractDisplayInfo;
+}
+
+void AbstractBase::slotCreateResourceError(const QString &msg)
+{
+    addImportError(msg);
+}
+
+void AbstractBase::slotCreateResourceInfo(const QString &msg)
+{
+    addImportInfo(msg);
+}
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/abstractbase.h akonadi-import-wizard-17.08.3/src/libimportwizard/abstractbase.h
--- akonadi-import-wizard-17.04.3/src/libimportwizard/abstractbase.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/abstractbase.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ABSTRACTBASE_H
+#define ABSTRACTBASE_H
+
+#include <QObject>
+#include "libimportwizard_export.h"
+#include <QMap>
+#include <QVariant>
+
+namespace PimCommon {
+class CreateResource;
+}
+
+namespace LibImportWizard {
+class AbstractDisplayInfo;
+class LIBIMPORTWIZARD_EXPORT AbstractBase : public QObject
+{
+    Q_OBJECT
+public:
+    explicit AbstractBase();
+    virtual ~AbstractBase();
+
+    QString createResource(const QString &resources, const QString &name, const QMap<QString, QVariant> &settings);
+
+    void setAbstractDisplayInfo(AbstractDisplayInfo *abstractDisplayInfo);
+
+protected:
+    virtual void addImportInfo(const QString &log) = 0;
+    virtual void addImportError(const QString &log) = 0;
+
+    AbstractDisplayInfo *mAbstractDisplayInfo;
+
+private:
+    void slotCreateResourceError(const QString &);
+    void slotCreateResourceInfo(const QString &);
+    PimCommon::CreateResource *mCreateResource;
+};
+}
+#endif // ABSTRACTBASE_H
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/abstractcalendar.cpp akonadi-import-wizard-17.08.3/src/libimportwizard/abstractcalendar.cpp
--- akonadi-import-wizard-17.04.3/src/libimportwizard/abstractcalendar.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/abstractcalendar.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "abstractcalendar.h"
+#include "abstractdisplayinfo.h"
+#include <KSharedConfig>
+#include <KConfigGroup>
+using namespace LibImportWizard;
+
+AbstractCalendar::AbstractCalendar()
+{
+}
+
+AbstractCalendar::~AbstractCalendar()
+{
+}
+
+void AbstractCalendar::addImportInfo(const QString &log)
+{
+    Q_ASSERT_X(mAbstractDisplayInfo, __FUNCTION__, "mAbstractDisplayInfo is not setting");
+    if (mAbstractDisplayInfo) {
+        mAbstractDisplayInfo->calendarImportInfo(log);
+    }
+}
+
+void AbstractCalendar::addImportError(const QString &log)
+{
+    Q_ASSERT_X(mAbstractDisplayInfo, __FUNCTION__, "mAbstractDisplayInfo is not setting");
+    if (mAbstractDisplayInfo) {
+        mAbstractDisplayInfo->calendarImportError(log);
+    }
+}
+
+//eventviewsrc for calendar color for example
+void AbstractCalendar::addEvenViewConfig(const QString &groupName, const QString &key, const QString &value)
+{
+    KSharedConfigPtr eventViewConfig = KSharedConfig::openConfig(QStringLiteral("eventviewsrc"));
+    KConfigGroup group = eventViewConfig->group(groupName);
+    group.writeEntry(key, value);
+    group.sync();
+}
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/abstractcalendar.h akonadi-import-wizard-17.08.3/src/libimportwizard/abstractcalendar.h
--- akonadi-import-wizard-17.04.3/src/libimportwizard/abstractcalendar.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/abstractcalendar.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ABSTRACTCALENDAR_H
+#define ABSTRACTCALENDAR_H
+
+#include "abstractbase.h"
+#include "libimportwizard_export.h"
+namespace LibImportWizard {
+class LIBIMPORTWIZARD_EXPORT AbstractCalendar : public LibImportWizard::AbstractBase
+{
+    Q_OBJECT
+public:
+    AbstractCalendar();
+    virtual ~AbstractCalendar();
+
+protected:
+    void addEvenViewConfig(const QString &groupName, const QString &key, const QString &value);
+    void addImportInfo(const QString &log) override;
+    void addImportError(const QString &log) override;
+};
+}
+#endif // ABSTRACTCALENDAR_H
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/abstractdisplayinfo.cpp akonadi-import-wizard-17.08.3/src/libimportwizard/abstractdisplayinfo.cpp
--- akonadi-import-wizard-17.04.3/src/libimportwizard/abstractdisplayinfo.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/abstractdisplayinfo.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+   Copyright (C) 2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "abstractdisplayinfo.h"
+
+using namespace LibImportWizard;
+
+AbstractDisplayInfo::AbstractDisplayInfo()
+{
+}
+
+void AbstractDisplayInfo::calendarImportError(const QString &log)
+{
+    Q_UNUSED(log);
+}
+
+void AbstractDisplayInfo::settingsImportError(const QString &log)
+{
+    Q_UNUSED(log);
+}
+
+void AbstractDisplayInfo::addressbookImportError(const QString &log)
+{
+    Q_UNUSED(log);
+}
+
+void AbstractDisplayInfo::filterImportError(const QString &log)
+{
+    Q_UNUSED(log);
+}
+
+void AbstractDisplayInfo::calendarImportInfo(const QString &log)
+{
+    Q_UNUSED(log);
+}
+
+void AbstractDisplayInfo::settingsImportInfo(const QString &log)
+{
+    Q_UNUSED(log);
+}
+
+void AbstractDisplayInfo::addressbookImportInfo(const QString &log)
+{
+    Q_UNUSED(log);
+}
+
+void AbstractDisplayInfo::filterImportInfo(const QString &log)
+{
+    Q_UNUSED(log);
+}
+
+QWidget *AbstractDisplayInfo::parentWidget() const
+{
+    return nullptr;
+}
+
+void AbstractDisplayInfo::initializeFilter(MailImporter::Filter &filter)
+{
+    Q_UNUSED(filter);
+}
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/abstractdisplayinfo.h akonadi-import-wizard-17.08.3/src/libimportwizard/abstractdisplayinfo.h
--- akonadi-import-wizard-17.04.3/src/libimportwizard/abstractdisplayinfo.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/abstractdisplayinfo.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,53 @@
+/*
+   Copyright (C) 2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ABSTRACTDISPLAYINFO_H
+#define ABSTRACTDISPLAYINFO_H
+
+#include "libimportwizard_export.h"
+#include <QString>
+class QWidget;
+
+namespace MailImporter {
+class Filter;
+}
+
+namespace LibImportWizard {
+class LIBIMPORTWIZARD_EXPORT AbstractDisplayInfo
+{
+public:
+    AbstractDisplayInfo();
+    virtual ~AbstractDisplayInfo() = default;
+
+    virtual void calendarImportError(const QString &log);
+    virtual void settingsImportError(const QString &log);
+    virtual void addressbookImportError(const QString &log);
+    virtual void filterImportError(const QString &log);
+
+    virtual void calendarImportInfo(const QString &log);
+    virtual void settingsImportInfo(const QString &log);
+    virtual void addressbookImportInfo(const QString &log);
+    virtual void filterImportInfo(const QString &log);
+
+    virtual QWidget *parentWidget() const;
+    virtual void initializeFilter(MailImporter::Filter &filter);
+};
+}
+
+#endif // ABSTRACTDISPLAYINFO_H
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/abstractimporter.cpp akonadi-import-wizard-17.08.3/src/libimportwizard/abstractimporter.cpp
--- akonadi-import-wizard-17.04.3/src/libimportwizard/abstractimporter.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/abstractimporter.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,135 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "abstractimporter.h"
+#include "abstractdisplayinfo.h"
+
+#include "mailimporter/filterinfo.h"
+#include "MailCommon/FilterManager"
+#include <MailImporterAkonadi/FilterImporterAkonadi>
+
+#include <QFileInfo>
+#include <QFile>
+
+using namespace LibImportWizard;
+
+AbstractImporter::AbstractImporter(QObject *parent)
+    : QObject(parent)
+    , mAbstractDisplayInfo(nullptr)
+    , mParentWidget(nullptr)
+{
+}
+
+AbstractImporter::~AbstractImporter()
+{
+}
+
+bool AbstractImporter::importSettings()
+{
+    return false;
+}
+
+bool AbstractImporter::importMails()
+{
+    return false;
+}
+
+bool AbstractImporter::importFilters()
+{
+    return false;
+}
+
+bool AbstractImporter::importAddressBook()
+{
+    return false;
+}
+
+bool AbstractImporter::importCalendar()
+{
+    return false;
+}
+
+void AbstractImporter::initializeFilter(MailImporter::Filter &filter)
+{
+    Q_ASSERT_X(mAbstractDisplayInfo, __FUNCTION__, "mAbstractDisplayInfo is not setting");
+    mAbstractDisplayInfo->initializeFilter(filter);
+}
+
+bool AbstractImporter::addFilters(const QString &filterPath, MailCommon::FilterImporterExporter::FilterType type)
+{
+    if (QFileInfo::exists(filterPath)) {
+        bool canceled = false;
+        MailCommon::FilterImporterExporter importer(mAbstractDisplayInfo->parentWidget());
+        QList<MailCommon::MailFilter *> listFilter = importer.importFilters(canceled, type, filterPath);
+        appendFilters(listFilter);
+        if (canceled) {
+            addImportFilterInfo(i18n("Importing of filters from \"%1\" was canceled.", filterPath));
+        } else {
+            addImportFilterInfo(i18np("1 filter was imported from \"%2\"", "%1 filters were imported from \"%2\"", listFilter.count(), filterPath));
+        }
+        return true;
+    } else {
+        addImportFilterError(i18n("Filters file was not found"));
+        return true;
+    }
+}
+
+void AbstractImporter::appendFilters(const QList<MailCommon::MailFilter *> &filters)
+{
+    if (!filters.isEmpty()) {
+        MailCommon::FilterManager::instance()->appendFilters(filters, false);
+    }
+}
+
+void AbstractImporter::addImportFilterInfo(const QString &log) const
+{
+    Q_ASSERT_X(mAbstractDisplayInfo, __FUNCTION__, "mAbstractDisplayInfo is not setting");
+    if (mAbstractDisplayInfo) {
+        mAbstractDisplayInfo->filterImportInfo(log);
+    }
+}
+
+void AbstractImporter::addImportFilterError(const QString &log) const
+{
+    Q_ASSERT_X(mAbstractDisplayInfo, __FUNCTION__, "mAbstractDisplayInfo is not setting");
+    if (mAbstractDisplayInfo) {
+        mAbstractDisplayInfo->filterImportError(log);
+    }
+}
+
+void AbstractImporter::addImportSettingsInfo(const QString &log) const
+{
+    Q_ASSERT_X(mAbstractDisplayInfo, __FUNCTION__, "mAbstractDisplayInfo is not setting");
+    if (mAbstractDisplayInfo) {
+        mAbstractDisplayInfo->settingsImportInfo(log);
+    }
+}
+
+void AbstractImporter::addImportCalendarInfo(const QString &log) const
+{
+    Q_ASSERT_X(mAbstractDisplayInfo, __FUNCTION__, "mAbstractDisplayInfo is not setting");
+    if (mAbstractDisplayInfo) {
+        mAbstractDisplayInfo->calendarImportInfo(log);
+    }
+}
+
+void AbstractImporter::setAbstractDisplayInfo(AbstractDisplayInfo *info)
+{
+    mAbstractDisplayInfo = info;
+}
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/abstractimporter.h akonadi-import-wizard-17.08.3/src/libimportwizard/abstractimporter.h
--- akonadi-import-wizard-17.04.3/src/libimportwizard/abstractimporter.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/abstractimporter.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,93 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef AbstractImporter_H
+#define AbstractImporter_H
+#include <MailCommon/FilterImporterExporter>
+#include "libimportwizard_export.h"
+
+namespace MailImporter {
+class FilterInfo;
+class Filter;
+}
+
+namespace MailCommon {
+class MailFilter;
+class FilterImporterExporter;
+}
+
+namespace LibImportWizard {
+class AbstractDisplayInfo;
+class LIBIMPORTWIZARD_EXPORT AbstractImporter : public QObject
+{
+    Q_OBJECT
+public:
+    enum TypeSupportedOption {
+        None = 0,
+        Mails = 1,
+        Settings = 2,
+        Filters = 4,
+        AddressBooks = 8,
+        Calendars = 16
+    };
+
+    Q_DECLARE_FLAGS(TypeSupportedOptions, TypeSupportedOption)
+
+    explicit AbstractImporter(QObject *parent);
+    virtual ~AbstractImporter();
+
+    /**
+    * Return true if mail found on system
+    */
+    virtual bool foundMailer() const = 0;
+
+    /**
+    * Return type of data that we can import
+    */
+    virtual TypeSupportedOptions supportedOption() = 0;
+    /**
+    * Return name for plugins
+    */
+    virtual QString name() const = 0;
+
+    virtual bool importSettings();
+    virtual bool importMails();
+    virtual bool importFilters();
+    virtual bool importAddressBook();
+    virtual bool importCalendar();
+
+    void setAbstractDisplayInfo(AbstractDisplayInfo *info);
+
+protected:
+    void initializeFilter(MailImporter::Filter &filter);
+
+    void appendFilters(const QList<MailCommon::MailFilter *> &filters);
+    void addImportFilterInfo(const QString &log) const;
+    void addImportFilterError(const QString &log) const;
+    bool addFilters(const QString &filterPath, MailCommon::FilterImporterExporter::FilterType type);
+    void addImportSettingsInfo(const QString &log) const;
+    void addImportCalendarInfo(const QString &log) const;
+
+    QString mPath;
+    AbstractDisplayInfo *mAbstractDisplayInfo;
+    QWidget *mParentWidget;
+};
+}
+
+#endif /* AbstractImporter_H */
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/abstractsettings.cpp akonadi-import-wizard-17.08.3/src/libimportwizard/abstractsettings.cpp
--- akonadi-import-wizard-17.04.3/src/libimportwizard/abstractsettings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/abstractsettings.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,161 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#include "abstractsettings.h"
+#include "abstractdisplayinfo.h"
+
+#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
+#include <KIdentityManagement/kidentitymanagement/identity.h>
+#include <mailtransport/transportmanager.h>
+
+#include <KLocalizedString>
+#include <KSharedConfig>
+
+#include <AkonadiCore/agenttype.h>
+#include <AkonadiCore/agentmanager.h>
+#include <AkonadiCore/agentinstancecreatejob.h>
+
+#include <QMetaMethod>
+
+using namespace Akonadi;
+
+AbstractSettings::AbstractSettings()
+{
+    mManager = KIdentityManagement::IdentityManager::self();
+    mKmailConfig = KSharedConfig::openConfig(QStringLiteral("kmail2rc"));
+}
+
+AbstractSettings::~AbstractSettings()
+{
+    syncKmailConfig();
+}
+
+KIdentityManagement::Identity *AbstractSettings::createIdentity(QString &name)
+{
+    name = uniqueIdentityName(name);
+    KIdentityManagement::Identity *identity = &mManager->newFromScratch(name);
+    addImportInfo(i18n("Setting up identity..."));
+    return identity;
+}
+
+void AbstractSettings::storeIdentity(KIdentityManagement::Identity *identity)
+{
+    mManager->setAsDefault(identity->uoid());
+    mManager->commit();
+    addImportInfo(i18n("Identity set up."));
+}
+
+QString AbstractSettings::uniqueIdentityName(const QString &name)
+{
+    QString newName(name);
+    int i = 0;
+    while (!mManager->isUnique(newName)) {
+        newName = QStringLiteral("%1_%2").arg(name).arg(i);
+        ++i;
+    }
+    return newName;
+}
+
+MailTransport::Transport *AbstractSettings::createTransport()
+{
+    MailTransport::Transport *mt = MailTransport::TransportManager::self()->createTransport();
+    addImportInfo(i18n("Setting up transport..."));
+    return mt;
+}
+
+void AbstractSettings::storeTransport(MailTransport::Transport *mt, bool isDefault)
+{
+    mt->forceUniqueName();
+    mt->save();
+    MailTransport::TransportManager::self()->addTransport(mt);
+    if (isDefault) {
+        MailTransport::TransportManager::self()->setDefaultTransport(mt->id());
+    }
+    addImportInfo(i18n("Transport set up."));
+}
+
+void AbstractSettings::addImportInfo(const QString &log)
+{
+    Q_ASSERT_X(mAbstractDisplayInfo, __FUNCTION__, "mAbstractDisplayInfo is not setting");
+    if (mAbstractDisplayInfo) {
+        mAbstractDisplayInfo->settingsImportInfo(log);
+    }
+}
+
+void AbstractSettings::addImportError(const QString &log)
+{
+    Q_ASSERT_X(mAbstractDisplayInfo, __FUNCTION__, "mAbstractDisplayInfo is not setting");
+    if (mAbstractDisplayInfo) {
+        mAbstractDisplayInfo->settingsImportError(log);
+    }
+}
+
+void AbstractSettings::addCheckMailOnStartup(const QString &agentIdentifyName, bool loginAtStartup)
+{
+    if (agentIdentifyName.isEmpty()) {
+        return;
+    }
+    const QString groupName = QStringLiteral("Resource %1").arg(agentIdentifyName);
+    addKmailConfig(groupName, QStringLiteral("CheckOnStartup"), loginAtStartup);
+}
+
+void AbstractSettings::addToManualCheck(const QString &agentIdentifyName, bool manualCheck)
+{
+    if (agentIdentifyName.isEmpty()) {
+        return;
+    }
+    const QString groupName = QStringLiteral("Resource %1").arg(agentIdentifyName);
+    addKmailConfig(groupName, QStringLiteral("IncludeInManualChecks"), manualCheck);
+}
+
+void AbstractSettings::addComposerHeaderGroup(const QString &groupName, const QString &name, const QString &value)
+{
+    KConfigGroup group = mKmailConfig->group(groupName);
+    group.writeEntry(QStringLiteral("name"), name);
+    group.writeEntry(QStringLiteral("value"), value);
+}
+
+void AbstractSettings::addKmailConfig(const QString &groupName, const QString &key, const QString &value)
+{
+    KConfigGroup group = mKmailConfig->group(groupName);
+    group.writeEntry(key, value);
+}
+
+void AbstractSettings::addKmailConfig(const QString &groupName, const QString &key, bool value)
+{
+    KConfigGroup group = mKmailConfig->group(groupName);
+    group.writeEntry(key, value);
+}
+
+void AbstractSettings::addKmailConfig(const QString &groupName, const QString &key, int value)
+{
+    KConfigGroup group = mKmailConfig->group(groupName);
+    group.writeEntry(key, value);
+}
+
+void AbstractSettings::syncKmailConfig()
+{
+    mKmailConfig->sync();
+}
+
+int AbstractSettings::readKmailSettings(const QString &groupName, const QString &key)
+{
+    KConfigGroup group = mKmailConfig->group(groupName);
+    int value = group.readEntry(key, -1);
+    return value;
+}
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/abstractsettings.h akonadi-import-wizard-17.08.3/src/libimportwizard/abstractsettings.h
--- akonadi-import-wizard-17.04.3/src/libimportwizard/abstractsettings.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/abstractsettings.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,76 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ABSTRACTSETTINGS_H
+#define ABSTRACTSETTINGS_H
+
+#include "abstractbase.h"
+#include "libimportwizard_export.h"
+#include <KSharedConfig>
+#include <QMap>
+
+namespace KIdentityManagement {
+class Identity;
+class IdentityManager;
+}
+
+namespace MailTransport {
+class Transport;
+}
+
+class LIBIMPORTWIZARD_EXPORT AbstractSettings : public LibImportWizard::AbstractBase
+{
+    Q_OBJECT
+public:
+    AbstractSettings();
+    ~AbstractSettings();
+
+protected:
+    void addImportInfo(const QString &log) override;
+    void addImportError(const QString &log) override;
+
+    void syncKmailConfig();
+
+    QString uniqueIdentityName(const QString &name);
+
+    QString createResource(const QString &resources, const QString &name, const QMap<QString, QVariant> &settings);
+
+    KIdentityManagement::Identity *createIdentity(QString &name);
+
+    MailTransport::Transport *createTransport();
+
+    void storeTransport(MailTransport::Transport *mt, bool isDefault = false);
+
+    void storeIdentity(KIdentityManagement::Identity *identity);
+
+    void addKmailConfig(const QString &groupName, const QString &key, const QString &value);
+    void addKmailConfig(const QString &groupName, const QString &key, bool value);
+    void addKmailConfig(const QString &groupName, const QString &key, int value);
+
+    void addComposerHeaderGroup(const QString &groupName, const QString &name, const QString &value);
+
+    void addCheckMailOnStartup(const QString &agentIdentifyName, bool loginAtStartup);
+    void addToManualCheck(const QString &agentIdentifyName, bool manualCheck);
+    int readKmailSettings(const QString &groupName, const QString &key);
+
+    KIdentityManagement::IdentityManager *mManager;
+    KSharedConfigPtr mKmailConfig;
+};
+
+#endif // ABSTRACTSETTINGS_H
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/CMakeLists.txt akonadi-import-wizard-17.08.3/src/libimportwizard/CMakeLists.txt
--- akonadi-import-wizard-17.04.3/src/libimportwizard/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/CMakeLists.txt	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,112 @@
+ecm_setup_version(PROJECT
+    VARIABLE_PREFIX IMPORTWIZARD
+    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/importwizard_version.h"
+    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPimImportWizardConfigVersion.cmake"
+    SOVERSION 5
+)
+
+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPimImportWizard")
+
+
+configure_package_config_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/KPimImportWizardConfig.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/KPimImportWizardConfig.cmake"
+    INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+)
+
+install(FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/KPimImportWizardConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/KPimImportWizardConfigVersion.cmake"
+    DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+    COMPONENT Devel
+)
+
+install(EXPORT KPimImportWizardTargets
+    DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+    FILE KPimImportWizardTargets.cmake
+    NAMESPACE KPim::
+)
+
+install(FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/importwizard_version.h"
+    DESTINATION "${KDE_INSTALL_INCLUDEDIR}/KPim/"
+    COMPONENT Devel
+)
+
+
+
+set(libimportwizard_abstract_SRCS
+    abstractimporter.cpp
+    abstractsettings.cpp
+    abstractaddressbook.cpp
+    abstractcalendar.cpp
+    abstractbase.cpp
+    abstractdisplayinfo.cpp
+    )
+set(libimportwizard_utils_SRCS
+    importwizardutil.cpp
+    )
+
+ecm_qt_declare_logging_category(libimportwizard_abstract_SRCS HEADER libimportwizard_debug.h IDENTIFIER LIBIMPORTWIZARD_LOG CATEGORY_NAME org.kde.pim.importwizard.lib)
+
+add_library(KPimImportWizard ${libimportwizard_abstract_SRCS} ${libimportwizard_utils_SRCS})
+
+add_library(KPim::ImportWizard ALIAS KPimImportWizard)
+
+
+target_include_directories(KPimImportWizard INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KPim/ImportWizard;${KDE_INSTALL_INCLUDEDIR_KF5}/KPim/>")
+
+
+generate_export_header(KPimImportWizard BASE_NAME libimportwizard)
+
+target_link_libraries(KPimImportWizard
+    PUBLIC
+    KF5::MailTransport
+    PRIVATE
+    KF5::Archive
+    KF5::PimCommon
+    KF5::MailCommon
+    KF5::MailImporter
+    KF5::I18n
+    )
+
+set_target_properties(KPimImportWizard PROPERTIES
+    VERSION ${IMPORTWIZARD_VERSION_STRING}
+    SOVERSION ${IMPORTWIZARD_SOVERSION}
+    EXPORT_NAME ImportWizard
+)
+
+install(TARGETS
+    KPimImportWizard
+    EXPORT KPimImportWizardTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+
+install(TARGETS KPimImportWizard ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} ${LIBRARY_NAMELINK})
+
+ecm_generate_headers(ImportWizard_CamelCase_HEADERS
+    HEADER_NAMES
+    AbstractBase
+    AbstractDisplayInfo
+    AbstractImporter
+    AbstractSettings
+    AbstractAddressBook
+    AbstractCalendar
+    ImportWizardUtil
+    PREFIX ImportWizard
+    REQUIRED_HEADERS ImportWizard_HEADERS
+    )
+
+install(FILES
+    ${ImportWizard_CamelCase_HEADERS}
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPim/ImportWizard/
+    COMPONENT Devel
+    )
+
+install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/libimportwizard_export.h
+    ${ImportWizard_HEADERS}
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPim/importwizard/
+    COMPONENT Devel
+    )
+
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/importwizardutil.cpp akonadi-import-wizard-17.08.3/src/libimportwizard/importwizardutil.cpp
--- akonadi-import-wizard-17.04.3/src/libimportwizard/importwizardutil.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/importwizardutil.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,129 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "importwizardutil.h"
+#include <KSharedConfig>
+#include <KConfigGroup>
+#include "libimportwizard_debug.h"
+#include <kwallet.h>
+#include <AkonadiCore/Tag>
+#include <AkonadiCore/TagAttribute>
+#include <AkonadiCore/TagCreateJob>
+
+void ImportWizardUtil::mergeLdap(const ldapStruct &ldap)
+{
+    KSharedConfigPtr ldapConfig = KSharedConfig::openConfig(QStringLiteral("kabldaprc"));
+    int numberOfLdapSelected = 0;
+    KConfigGroup grp;
+    if (ldapConfig->hasGroup(QStringLiteral("LDAP"))) {
+        grp = ldapConfig->group(QStringLiteral("LDAP"));
+        numberOfLdapSelected = grp.readEntry(QStringLiteral("NumSelectedHosts"), 0);
+        grp.writeEntry(QStringLiteral("NumSelectedHosts"), (numberOfLdapSelected + 1));
+    } else {
+        grp = ldapConfig->group(QStringLiteral("LDAP"));
+        grp.writeEntry(QStringLiteral("NumSelectedHosts"), 1);
+
+        KConfigGroup ldapSeach = ldapConfig->group(QStringLiteral("LDAPSearch"));
+        ldapSeach.writeEntry(QStringLiteral("SearchType"), 0);
+    }
+    const int port = ldap.port;
+    if (port != -1) {
+        grp.writeEntry(QStringLiteral("SelectedPort%1").arg(numberOfLdapSelected), port);
+    }
+    grp.writeEntry(QStringLiteral("SelectedHost%1").arg(numberOfLdapSelected), ldap.ldapUrl.host());
+    if (ldap.useSSL) {
+        grp.writeEntry(QStringLiteral("SelectedSecurity%1").arg(numberOfLdapSelected), QStringLiteral("SSL"));
+    } else if (ldap.useTLS) {
+        grp.writeEntry(QStringLiteral("SelectedSecurity%1").arg(numberOfLdapSelected), QStringLiteral("TLS"));
+    } else {
+        grp.writeEntry(QStringLiteral("SelectedSecurity%1").arg(numberOfLdapSelected), QStringLiteral("None"));
+    }
+
+    if (ldap.saslMech == QLatin1String("GSSAPI")) {
+        grp.writeEntry(QStringLiteral("SelectedMech%1").arg(numberOfLdapSelected), QStringLiteral("GSSAPI"));
+        grp.writeEntry(QStringLiteral("SelectedAuth%1").arg(numberOfLdapSelected), QStringLiteral("SASL"));
+    } else if (ldap.saslMech.isEmpty()) {
+        grp.writeEntry(QStringLiteral("SelectedMech%1").arg(numberOfLdapSelected), QStringLiteral("PLAIN"));
+        grp.writeEntry(QStringLiteral("SelectedAuth%1").arg(numberOfLdapSelected), QStringLiteral("Simple"));
+    } else {
+        qCDebug(LIBIMPORTWIZARD_LOG) << " Mech SASL undefined" << ldap.saslMech;
+    }
+    grp.writeEntry(QStringLiteral("SelectedVersion%1").arg(numberOfLdapSelected), QString::number(3));
+    grp.writeEntry(QStringLiteral("SelectedBind%1").arg(numberOfLdapSelected), ldap.dn);
+    //TODO: Verify selectedbase
+    grp.writeEntry(QStringLiteral("SelectedBase%1").arg(numberOfLdapSelected), ldap.ldapUrl.path());
+    if (ldap.timeout != -1) {
+        grp.writeEntry(QStringLiteral("SelectedTimeLimit%1").arg(numberOfLdapSelected), ldap.timeout);
+    }
+    if (ldap.limit != -1) {
+        grp.writeEntry(QStringLiteral("SelectedSizeLimit%1").arg(numberOfLdapSelected), ldap.limit);
+    }
+    if (!ldap.password.isEmpty()) {
+        storeInKWallet(QStringLiteral("SelectedPwdBind%1").arg(numberOfLdapSelected), ImportWizardUtil::Ldap, ldap.password);
+    }
+    grp.sync();
+}
+
+void ImportWizardUtil::addAkonadiTag(const QVector<tagStruct> &tagList)
+{
+    for (int i = 0; i < tagList.size(); ++i) {
+        Akonadi::Tag tag(tagList.at(i).name);
+        if (tagList.at(i).color.isValid()) {
+            tag.attribute<Akonadi::TagAttribute>(Akonadi::Tag::AddIfMissing)->setTextColor(tagList.at(i).color);
+        }
+        new Akonadi::TagCreateJob(tag);
+    }
+}
+
+void ImportWizardUtil::storeInKWallet(const QString &name, ImportWizardUtil::ResourceType type, const QString &password)
+{
+    KWallet::Wallet *wallet = nullptr;
+    switch (type) {
+    case Imap:
+        wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0);
+        if (wallet && wallet->isOpen()) {
+            if (!wallet->hasFolder(QStringLiteral("imap"))) {
+                wallet->createFolder(QStringLiteral("imap"));
+            }
+            wallet->setFolder(QStringLiteral("imap"));
+            wallet->writePassword(name + QLatin1String("rc"), password);
+        }
+        break;
+    case Pop3:
+        wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0);
+        if (wallet && wallet->isOpen()) {
+            if (!wallet->hasFolder(QStringLiteral("pop3"))) {
+                wallet->createFolder(QStringLiteral("pop3"));
+            }
+            wallet->setFolder(QStringLiteral("pop3"));
+            wallet->writePassword(name, password);
+        }
+        break;
+    case Ldap:
+        wallet = KWallet::Wallet::openWallet(KWallet::Wallet::LocalWallet(), 0);
+        if (wallet && wallet->isOpen()) {
+            if (!wallet->hasFolder(QStringLiteral("ldapclient"))) {
+                wallet->createFolder(QStringLiteral("ldapclient"));
+            }
+            wallet->setFolder(QStringLiteral("ldapclient"));
+            wallet->writePassword(name, password);
+        }
+    }
+    delete wallet;
+}
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/importwizardutil.h akonadi-import-wizard-17.08.3/src/libimportwizard/importwizardutil.h
--- akonadi-import-wizard-17.04.3/src/libimportwizard/importwizardutil.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/importwizardutil.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef IMPORTWIZARDUTIL_H
+#define IMPORTWIZARDUTIL_H
+#include <QUrl>
+#include <QList>
+#include <QColor>
+#include <QString>
+#include "libimportwizard_export.h"
+
+struct LIBIMPORTWIZARD_EXPORT ldapStruct {
+    ldapStruct()
+        : maxHint(-1)
+        , port(-1)
+        , limit(-1)
+        , timeout(-1)
+        , useSSL(false)
+        , useTLS(false)
+    {
+    }
+
+    QUrl ldapUrl;
+    QString dn;
+    QString saslMech;
+    QString fileName;
+    QString description;
+    QString password;
+    int maxHint;
+    int port;
+    int limit;
+    int timeout;
+    bool useSSL;
+    bool useTLS;
+};
+
+struct tagStruct {
+    QString name;
+    QColor color;
+};
+Q_DECLARE_TYPEINFO(tagStruct, Q_MOVABLE_TYPE);
+
+namespace ImportWizardUtil {
+enum ResourceType {
+    Imap,
+    Pop3,
+    Ldap
+};
+
+LIBIMPORTWIZARD_EXPORT void mergeLdap(const ldapStruct &ldap);
+LIBIMPORTWIZARD_EXPORT void addAkonadiTag(const QVector<tagStruct> &tagList);
+void storeInKWallet(const QString &name, ImportWizardUtil::ResourceType type, const QString &password);
+}
+
+#endif // IMPORTWIZARDUTIL_H
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard/KPimImportWizardConfig.cmake.in akonadi-import-wizard-17.08.3/src/libimportwizard/KPimImportWizardConfig.cmake.in
--- akonadi-import-wizard-17.04.3/src/libimportwizard/KPimImportWizardConfig.cmake.in	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard/KPimImportWizardConfig.cmake.in	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,8 @@
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(KF5MailTransport "@KMAILTRANSPORT_LIB_VERSION@")
+
+include("${CMAKE_CURRENT_LIST_DIR}/KPimImportWizardTargets.cmake")
+
diff -Nru akonadi-import-wizard-17.04.3/src/libimportwizard_private_export.h akonadi-import-wizard-17.08.3/src/libimportwizard_private_export.h
--- akonadi-import-wizard-17.04.3/src/libimportwizard_private_export.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/libimportwizard_private_export.h	2017-10-29 07:12:25.000000000 +0000
@@ -32,4 +32,3 @@
 #endif
 
 #endif
-
diff -Nru akonadi-import-wizard-17.04.3/src/main.cpp akonadi-import-wizard-17.08.3/src/main.cpp
--- akonadi-import-wizard-17.04.3/src/main.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/main.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -49,7 +49,7 @@
                          QStringLiteral(KDEPIM_VERSION),
                          i18n("PIM Import Tool"),
                          KAboutLicense::GPL_V2,
-                         i18n("Copyright © 2012-2017 importwizard authors"));
+                         i18n("Copyright © 2012-2017 ImportWizard authors"));
 
     aboutData.addAuthor(i18n("Laurent Montel"), i18n("Maintainer"), QStringLiteral("montel@kde.org"));
     QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("kontact-import-wizard")));
@@ -58,7 +58,7 @@
     KAboutData::setApplicationData(aboutData);
 
     QCommandLineParser parser;
-    parser.addOption(QCommandLineOption(QStringList() <<  QStringLiteral("mode"), i18n("Mode")));
+    parser.addOption(QCommandLineOption(QStringList() <<  QStringLiteral("mode"), i18n("Mode: %1", QStringLiteral("manual|automatic"))));
     parser.addVersionOption();
     parser.addHelpOption();
     aboutData.setupCommandLine(&parser);
@@ -67,12 +67,12 @@
 
     KDBusService service(KDBusService::Unique);
 
-    ImportWizard::WizardMode mode = ImportWizard::AutoDetect;
+    ImportWizard::WizardMode mode = ImportWizard::WizardMode::AutoDetect;
     if (parser.isSet(QStringLiteral("mode"))) {
         if (!parser.positionalArguments().isEmpty()) {
             const QString modeStr = parser.positionalArguments().at(0);
             if (modeStr == QLatin1String("manual")) {
-                mode = ImportWizard::Manual;
+                mode = ImportWizard::WizardMode::Manual;
             }
         }
     }
diff -Nru akonadi-import-wizard-17.04.3/src/manual/importwizardfilterinfogui.cpp akonadi-import-wizard-17.08.3/src/manual/importwizardfilterinfogui.cpp
--- akonadi-import-wizard-17.04.3/src/manual/importwizardfilterinfogui.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/manual/importwizardfilterinfogui.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -22,9 +22,9 @@
 #include <QApplication>
 
 ImportWizardFilterInfoGui::ImportWizardFilterInfoGui(ManualImportMailPage *dlg, QWidget *parent)
-    : MailImporter::FilterInfoGui(),
-      m_parent(parent),
-      mManualImportMailPage(dlg)
+    : MailImporter::FilterInfoGui()
+    , m_parent(parent)
+    , mManualImportMailPage(dlg)
 {
 }
 
@@ -53,13 +53,13 @@
     qApp->processEvents();
 }
 
-void  ImportWizardFilterInfoGui::setCurrent(int percent)
+void ImportWizardFilterInfoGui::setCurrent(int percent)
 {
     mManualImportMailPage->widget()->mMailImporterWidget->setCurrent(percent);
     qApp->processEvents(); // Be careful - back & finish buttons disabled, so only user event that can happen is cancel/close button
 }
 
-void  ImportWizardFilterInfoGui::setOverall(int percent)
+void ImportWizardFilterInfoGui::setOverall(int percent)
 {
     mManualImportMailPage->widget()->mMailImporterWidget->setOverall(percent);
 }
@@ -92,4 +92,3 @@
 {
     return m_parent;
 }
-
diff -Nru akonadi-import-wizard-17.04.3/src/manual/importwizardfilterinfogui.h akonadi-import-wizard-17.08.3/src/manual/importwizardfilterinfogui.h
--- akonadi-import-wizard-17.04.3/src/manual/importwizardfilterinfogui.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/manual/importwizardfilterinfogui.h	2017-10-29 07:12:25.000000000 +0000
@@ -28,17 +28,17 @@
     explicit ImportWizardFilterInfoGui(ManualImportMailPage *dlg, QWidget *parent);
     ~ImportWizardFilterInfoGui();
 
-    void setStatusMessage(const QString &status) Q_DECL_OVERRIDE;
-    void setFrom(const QString &from) Q_DECL_OVERRIDE;
-    void setTo(const QString &to) Q_DECL_OVERRIDE;
-    void setCurrent(const QString &current) Q_DECL_OVERRIDE;
-    void setCurrent(int percent = 0) Q_DECL_OVERRIDE;
-    void setOverall(int percent = 0) Q_DECL_OVERRIDE;
-    void addErrorLogEntry(const QString &log) Q_DECL_OVERRIDE;
-    void addInfoLogEntry(const QString &log) Q_DECL_OVERRIDE;
-    void clear() Q_DECL_OVERRIDE;
-    void alert(const QString &message) Q_DECL_OVERRIDE;
-    QWidget *parent() const Q_DECL_OVERRIDE;
+    void setStatusMessage(const QString &status) override;
+    void setFrom(const QString &from) override;
+    void setTo(const QString &to) override;
+    void setCurrent(const QString &current) override;
+    void setCurrent(int percent = 0) override;
+    void setOverall(int percent = 0) override;
+    void addErrorLogEntry(const QString &log) override;
+    void addInfoLogEntry(const QString &log) override;
+    void clear() override;
+    void alert(const QString &message) override;
+    QWidget *parent() const override;
 
 private:
     QWidget *m_parent;
@@ -46,4 +46,3 @@
 };
 
 #endif /* IMPORTWIZARDFILTERINFOGUI_H */
-
diff -Nru akonadi-import-wizard-17.04.3/src/manual/manualimportmailpage.cpp akonadi-import-wizard-17.08.3/src/manual/manualimportmailpage.cpp
--- akonadi-import-wizard-17.04.3/src/manual/manualimportmailpage.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/manual/manualimportmailpage.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -36,4 +36,3 @@
 {
     return mWidget;
 }
-
diff -Nru akonadi-import-wizard-17.04.3/src/manual/manualselectfilterpage.cpp akonadi-import-wizard-17.08.3/src/manual/manualselectfilterpage.cpp
--- akonadi-import-wizard-17.04.3/src/manual/manualselectfilterpage.cpp	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/manual/manualselectfilterpage.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -121,4 +121,3 @@
 {
     return mWidget;
 }
-
diff -Nru akonadi-import-wizard-17.04.3/src/manual/manualselectfilterpage.h akonadi-import-wizard-17.08.3/src/manual/manualselectfilterpage.h
--- akonadi-import-wizard-17.04.3/src/manual/manualselectfilterpage.h	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/manual/manualselectfilterpage.h	2017-10-29 07:12:25.000000000 +0000
@@ -20,8 +20,7 @@
 
 #include "ui_manualselectfilterpage.h"
 #include <QList>
-namespace MailImporter
-{
+namespace MailImporter {
 class Filter;
 }
 
@@ -44,7 +43,6 @@
 private:
     Ui::ManualSelectFilterPage *mWidget;
     QList<MailImporter::Filter *> mFilterList;
-
 };
 
 #endif
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/balsa/balsaaddressbook.cpp akonadi-import-wizard-17.08.3/src/plugins/balsa/balsaaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/balsa/balsaaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/balsa/balsaaddressbook.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,112 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "balsaaddressbook.h"
+#include <ImportWizard/ImportWizardUtil>
+
+#include <KContacts/Addressee>
+#include <KContacts/LDIFConverter>
+
+#include <KConfig>
+#include <KConfigGroup>
+#include <KLocalizedString>
+#include <QUrl>
+
+#include "balsaplugin_debug.h"
+#include <QFile>
+#include <QFileInfo>
+#include <QRegularExpression>
+
+BalsaAddressBook::BalsaAddressBook(const QString &filename)
+    : mFileName(filename)
+{
+}
+
+BalsaAddressBook::~BalsaAddressBook()
+{
+}
+
+void BalsaAddressBook::importAddressBook()
+{
+    KConfig config(mFileName);
+    const QStringList addressBookList = config.groupList().filter(QRegularExpression("address-book-\\d+"));
+    if (addressBookList.isEmpty()) {
+        addAddressBookImportInfo(i18n("No addressbook found"));
+    } else {
+        for (const QString &addressbook : addressBookList) {
+            KConfigGroup grp = config.group(addressbook);
+            readAddressBook(grp);
+        }
+    }
+}
+
+void BalsaAddressBook::readAddressBook(const KConfigGroup &grp)
+{
+    const QString type = grp.readEntry(QStringLiteral("Type"));
+    if (type.isEmpty()) {
+        addAddressBookImportInfo(i18n("No addressbook found"));
+        return;
+    }
+    const QString name = grp.readEntry(QStringLiteral("Name"));
+
+    if (type == QLatin1String("LibBalsaAddressBookLdap")) {
+        ldapStruct ldap;
+        ldap.dn = grp.readEntry(QStringLiteral("BaseDN"));
+        ldap.useTLS = (grp.readEntry(QStringLiteral("EnableTLS")) == QLatin1String("true"));
+        ldap.ldapUrl = QUrl(grp.readEntry(QStringLiteral("Host")));
+        ldap.port = ldap.ldapUrl.port();
+        //TODO: verify
+        const QString bookDN = grp.readEntry(QStringLiteral("BookDN"));  //TODO ?
+        ImportWizardUtil::mergeLdap(ldap);
+        addAddressBookImportInfo(i18n("Ldap created"));
+    } else if (type == QLatin1String("LibBalsaAddressBookGpe")) {
+        qCDebug(BALSAPLUGIN_LOG) << " Import it !";
+    } else if (type == QLatin1String("LibBalsaAddressBookLdif")) {
+        const QString path = grp.readEntry(QStringLiteral("Path"));
+        if (!path.isEmpty()) {
+            KContacts::Addressee::List contacts;
+            KContacts::ContactGroup::List contactsGroup;
+            QFile file(path);
+            if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+                QTextStream stream(&file);
+                stream.setCodec("ISO 8859-1");
+
+                const QString wholeFile = stream.readAll();
+                const QDateTime dtDefault = QFileInfo(file).lastModified();
+                file.close();
+
+                KContacts::LDIFConverter::LDIFToAddressee(wholeFile, contacts, contactsGroup, dtDefault);
+                for (KContacts::Addressee contact : qAsConst(contacts)) {
+                    addImportContactNote(contact, QStringLiteral("Balsa"));
+                    createContact(contact);
+                }
+            }
+        }
+    } else if (type == QLatin1String("LibBalsaAddressBookVcard")) {
+        const QString path = grp.readEntry(QStringLiteral("Path"));
+        if (!path.isEmpty()) {
+            QMap<QString, QVariant> settings;
+            settings.insert(QStringLiteral("Path"), path);
+            settings.insert(QStringLiteral("DisplayName"), name);
+            addAddressBookImportInfo(i18n("New addressbook created: %1", createResource(QStringLiteral("akonadi_vcard_resource"), name, settings)));
+        }
+    } else {
+        qCDebug(BALSAPLUGIN_LOG) << " unknown addressbook type :" << type;
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/balsa/balsaaddressbook.h akonadi-import-wizard-17.08.3/src/plugins/balsa/balsaaddressbook.h
--- akonadi-import-wizard-17.04.3/src/plugins/balsa/balsaaddressbook.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/balsa/balsaaddressbook.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef BalsaAddressBook_H
+#define BalsaAddressBook_H
+
+#include <ImportWizard/AbstractAddressBook>
+
+class KConfigGroup;
+
+class BalsaAddressBook : public LibImportWizard::AbstractAddressBook
+{
+public:
+    explicit BalsaAddressBook(const QString &filename);
+    ~BalsaAddressBook();
+
+    void importAddressBook();
+private:
+    void readAddressBook(const KConfigGroup &grp);
+    QString mFileName;
+};
+
+#endif // BalsaAddressBook_H
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/balsa/balsaimportdata.cpp akonadi-import-wizard-17.08.3/src/plugins/balsa/balsaimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/balsa/balsaimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/balsa/balsaimportdata.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,107 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "balsaimportdata.h"
+#include "balsasettings.h"
+#include "balsaaddressbook.h"
+#include "mailimporter/filterbalsa.h"
+#include "mailimporter/filterinfo.h"
+#include "MailCommon/FilterImporterBalsa"
+
+#include <KLocalizedString>
+#include <kpluginfactory.h>
+#include <QDir>
+
+K_PLUGIN_FACTORY_WITH_JSON(BalsaImporterFactory, "balsaimporter.json", registerPlugin<BalsaImportData>();
+                           )
+
+BalsaImportData::BalsaImportData(QObject *parent, const QList<QVariant> &)
+    : LibImportWizard::AbstractImporter(parent)
+{
+    mPath = MailImporter::FilterBalsa::defaultSettingsPath();
+}
+
+BalsaImportData::~BalsaImportData()
+{
+}
+
+bool BalsaImportData::foundMailer() const
+{
+    QDir directory(mPath);
+    if (directory.exists()) {
+        return true;
+    }
+    return false;
+}
+
+QString BalsaImportData::name() const
+{
+    return QStringLiteral("Balsa");
+}
+
+bool BalsaImportData::importMails()
+{
+    MailImporter::FilterBalsa balsa;
+    initializeFilter(balsa);
+    balsa.filterInfo()->setStatusMessage(i18n("Import in progress"));
+    QDir directory(balsa.localMailDirPath());
+    if (directory.exists()) {
+        balsa.importMails(directory.absolutePath());
+    } else {
+        balsa.import();
+    }
+    balsa.filterInfo()->setStatusMessage(i18n("Import finished"));
+    return true;
+}
+
+bool BalsaImportData::importAddressBook()
+{
+    const QString addressbookFile(mPath + QStringLiteral("config"));
+    BalsaAddressBook addressbook(addressbookFile);
+    addressbook.setAbstractDisplayInfo(mAbstractDisplayInfo);
+    addressbook.importAddressBook();
+    return true;
+}
+
+bool BalsaImportData::importSettings()
+{
+    const QString settingFile(mPath + QStringLiteral("config"));
+    BalsaSettings settings(settingFile);
+    settings.setAbstractDisplayInfo(mAbstractDisplayInfo);
+    settings.importSettings();
+    return true;
+}
+
+bool BalsaImportData::importFilters()
+{
+    const QString filterPath = mPath + QStringLiteral("config");
+    return addFilters(filterPath, MailCommon::FilterImporterExporter::BalsaFilter);
+}
+
+LibImportWizard::AbstractImporter::TypeSupportedOptions BalsaImportData::supportedOption()
+{
+    TypeSupportedOptions options;
+    options |= LibImportWizard::AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::AddressBooks;
+    options |= LibImportWizard::AbstractImporter::Settings;
+    options |= LibImportWizard::AbstractImporter::Filters;
+    return options;
+}
+
+#include "balsaimportdata.moc"
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/balsa/balsaimportdata.h akonadi-import-wizard-17.08.3/src/plugins/balsa/balsaimportdata.h
--- akonadi-import-wizard-17.04.3/src/plugins/balsa/balsaimportdata.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/balsa/balsaimportdata.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#ifndef BalsaImportData_H
+#define BalsaImportData_H
+
+#include <ImportWizard/AbstractImporter>
+
+class BalsaImportData : public LibImportWizard::AbstractImporter
+{
+public:
+    explicit BalsaImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
+    ~BalsaImportData();
+
+    TypeSupportedOptions supportedOption() override;
+    bool foundMailer() const override;
+
+    bool importMails() override;
+    bool importAddressBook() override;
+    bool importSettings() override;
+    bool importFilters() override;
+    QString name() const override;
+};
+
+#endif /* BalsaImportData_H */
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/balsa/balsaimporter.json akonadi-import-wizard-17.08.3/src/plugins/balsa/balsaimporter.json
--- akonadi-import-wizard-17.04.3/src/plugins/balsa/balsaimporter.json	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/balsa/balsaimporter.json	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,32 @@
+{
+    "KPlugin": {
+        "Id": "balsaimporter",
+        "Name": "Balsa Importer",
+        "Name[ca@valencia]": "Importador del Balsa",
+        "Name[ca]": "Importador del Balsa",
+        "Name[cs]": "Importér Balsa",
+        "Name[de]": "Import-Modul für Balsa",
+        "Name[es]": "Importador Balsa",
+        "Name[fi]": "Balsa-tuonti",
+        "Name[fr]": "Import Balsa",
+        "Name[it]": "Importatore da Balsa",
+        "Name[nl]": "Balsa-importeur",
+        "Name[pl]": "Importer Balsa",
+        "Name[pt]": "Importador do Balsa",
+        "Name[sk]": "Importér Balsa",
+        "Name[sl]": "Uvoznik iz programa Balsa",
+        "Name[sr@ijekavian]": "Увозник из Балсе",
+        "Name[sr@ijekavianlatin]": "Uvoznik iz Balse",
+        "Name[sr@latin]": "Uvoznik iz Balse",
+        "Name[sr]": "Увозник из Балсе",
+        "Name[sv]": "Balsa-importverktyg",
+        "Name[tr]": "Balsa İçe Aktarıcı",
+        "Name[uk]": "Засіб імпортування з Balsa",
+        "Name[x-test]": "xxBalsa Importerxx",
+        "Name[zh_CN]": "Balsa 导入器",
+        "ServiceTypes": [
+            "ImportWizard/PluginMailImporter"
+        ],
+        "Version": "1.0"
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/balsa/balsasettings.cpp akonadi-import-wizard-17.08.3/src/plugins/balsa/balsasettings.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/balsa/balsasettings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/balsa/balsasettings.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,248 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "balsasettings.h"
+#include "balsaplugin_debug.h"
+#include <mailtransport/transportmanager.h>
+#include "MailCommon/MailUtil"
+#include "messageviewer/kxface.h"
+
+#include <KIdentityManagement/kidentitymanagement/identity.h>
+#include <KIdentityManagement/kidentitymanagement/signature.h>
+
+#include <KConfig>
+#include <KConfigGroup>
+#include <QImage>
+#include <QRegularExpression>
+
+BalsaSettings::BalsaSettings(const QString &filename)
+    : mFileName(filename)
+{
+}
+
+BalsaSettings::~BalsaSettings()
+{
+}
+
+void BalsaSettings::importSettings()
+{
+    KConfig config(mFileName);
+
+    bool autoCheck = false;
+    int autoCheckDelay = -1;
+    if (config.hasGroup(QStringLiteral("MailboxChecking"))) {
+        KConfigGroup grp = config.group(QStringLiteral("MailboxChecking"));
+        autoCheck = grp.readEntry(QStringLiteral("Auto"), false);
+        autoCheckDelay = grp.readEntry(QStringLiteral("AutoDelay"), -1);
+    }
+
+    const QStringList mailBoxList = config.groupList().filter(QRegularExpression("mailbox-"));
+    for (const QString &mailBox : mailBoxList) {
+        KConfigGroup grp = config.group(mailBox);
+        readAccount(grp, autoCheck, autoCheckDelay);
+    }
+
+    const QStringList smtpList = config.groupList().filter(QRegularExpression("smtp-server-"));
+    for (const QString &smtp : smtpList) {
+        KConfigGroup grp = config.group(smtp);
+        readTransport(grp);
+    }
+    readGlobalSettings(config);
+}
+
+void BalsaSettings::readAccount(const KConfigGroup &grp, bool autoCheck, int autoDelay)
+{
+    Q_UNUSED(autoDelay);
+    const QString type = grp.readEntry(QStringLiteral("Type"));
+    bool check = grp.readEntry(QStringLiteral("Check"), false);
+    if (type == QLatin1String("LibBalsaMailboxPOP3")) {
+        QMap<QString, QVariant> settings;
+        const QString server = grp.readEntry(QStringLiteral("Server"));
+        settings.insert(QStringLiteral("Host"), server);
+        const QString name = grp.readEntry(QStringLiteral("Name"));
+
+        //const bool apop = grp.readEntry(QStringLiteral("DisableApop"), false);
+        //Q_UNUSED(apop);
+        const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
+
+        addCheckMailOnStartup(agentIdentifyName, autoCheck);
+        addToManualCheck(agentIdentifyName, check);
+    } else if (type == QLatin1String("LibBalsaMailboxImap")) {
+        QMap<QString, QVariant> settings;
+        const QString server = grp.readEntry(QStringLiteral("Server"));
+        settings.insert(QStringLiteral("ImapServer"), server);
+        const QString name = grp.readEntry(QStringLiteral("Name"));
+        const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
+        addCheckMailOnStartup(agentIdentifyName, autoCheck);
+        addToManualCheck(agentIdentifyName, check);
+    } else {
+        qCDebug(BALSAPLUGIN_LOG) << " unknown account type :" << type;
+    }
+}
+
+void BalsaSettings::readIdentity(const KConfigGroup &grp)
+{
+    QString name = grp.readEntry(QStringLiteral("FullName"));
+    KIdentityManagement::Identity *newIdentity = createIdentity(name);
+    newIdentity->setFullName(name);
+    newIdentity->setPrimaryEmailAddress(grp.readEntry(QStringLiteral("Address")));
+    newIdentity->setReplyToAddr(grp.readEntry(QStringLiteral("ReplyTo")));
+    newIdentity->setBcc(grp.readEntry(QStringLiteral("Bcc")));
+    const QString smtp = grp.readEntry(QStringLiteral("SmtpServer"));
+    if (!smtp.isEmpty()) {
+        const QString val = mHashSmtp.value(smtp);
+        if (val.isEmpty()) {
+            newIdentity->setTransport(val);
+        }
+    }
+
+    const QString signaturePath = grp.readEntry(QStringLiteral("SignaturePath"));
+    if (!signaturePath.isEmpty()) {
+        KIdentityManagement::Signature signature;
+        if (grp.readEntry(QStringLiteral("SigExecutable"), false)) {
+            signature.setPath(signaturePath, true);
+            signature.setType(KIdentityManagement::Signature::FromCommand);
+        } else {
+            signature.setType(KIdentityManagement::Signature::FromFile);
+        }
+        newIdentity->setSignature(signature);
+    }
+
+    const QString xfacePathStr = grp.readEntry(QStringLiteral("XFacePath"));
+    if (!xfacePathStr.isEmpty()) {
+        newIdentity->setXFaceEnabled(true);
+        MessageViewer::KXFace xf;
+        newIdentity->setXFace(xf.fromImage(QImage(xfacePathStr)));
+    }
+    storeIdentity(newIdentity);
+}
+
+void BalsaSettings::readTransport(const KConfigGroup &grp)
+{
+    MailTransport::Transport *mt = createTransport();
+    const QString smtp = grp.name().remove(QStringLiteral("smtp-server-"));
+    const QString server = grp.readEntry(QStringLiteral("Server"));
+    mt->setHost(server);
+
+    const int tlsMode = grp.readEntry(QStringLiteral("TLSMode"), -1);
+    //TODO
+    switch (tlsMode) {
+    case 0:
+        break;
+    case 1:
+        mt->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
+        break;
+    case 2:
+        break;
+    default:
+        break;
+    }
+
+    const QString ssl = grp.readEntry(QStringLiteral("SSL"));
+    if (ssl == QLatin1String("true")) {
+        mt->setEncryption(MailTransport::Transport::EnumEncryption::SSL);
+    } else if (ssl == QLatin1String("false")) {
+        mt->setEncryption(MailTransport::Transport::EnumEncryption::None);
+    } else {
+        qCDebug(BALSAPLUGIN_LOG) << " unknown ssl value :" << ssl;
+    }
+
+    //TODO const QString anonymous = grp.readEntry(QStringLiteral("Anonymous"));
+
+    //TODO
+    storeTransport(mt, /*( smtp == defaultSmtp )*/ true);   //FIXME
+    mHashSmtp.insert(smtp, QString::number(mt->id()));
+
+    //TODO
+    /*
+    Server=localhost:25
+    Anonymous=false
+    RememberPasswd=false
+    SSL=false
+    TLSMode=1
+    BigMessage=0
+    */
+}
+
+void BalsaSettings::readGlobalSettings(const KConfig &config)
+{
+    if (config.hasGroup(QStringLiteral("Compose"))) {
+        KConfigGroup compose = config.group(QStringLiteral("Compose"));
+        if (compose.hasKey(QStringLiteral("QuoteString"))) {
+            const QString quote = compose.readEntry(QStringLiteral("QuoteString"));
+            if (!quote.isEmpty()) {
+                addKmailConfig(QStringLiteral("TemplateParser"), QStringLiteral("QuoteString"), quote);
+            }
+        }
+    }
+    if (config.hasGroup(QStringLiteral("MessageDisplay"))) {
+        KConfigGroup messageDisplay = config.group(QStringLiteral("MessageDisplay"));
+#if 0
+        if (messageDisplay.hasKey(QStringLiteral("WordWrap"))) {
+            //bool wordWrap = messageDisplay.readEntry(QStringLiteral("WordWrap"), false);
+            //Q_UNUSED(wordWrap);
+            //TODO not implemented in kmail.
+        }
+        if (messageDisplay.hasKey(QStringLiteral("WordWrapLength"))) {
+            const int wordWrapLength = messageDisplay.readEntry(QStringLiteral("WordWrapLength"), -1);
+            Q_UNUSED(wordWrapLength);
+            //TODO not implemented in kmail
+        }
+#endif
+        if (messageDisplay.hasKey(QStringLiteral("DateFormat"))) {
+            const QString dateFormat = messageDisplay.readEntry(QStringLiteral("DateFormat"));
+            if (!dateFormat.isEmpty()) {
+                addKmailConfig(QStringLiteral("General"), QStringLiteral("customDateFormat"), dateFormat);
+            }
+        }
+    }
+
+    if (config.hasGroup(QStringLiteral("Sending"))) {
+        KConfigGroup sending = config.group(QStringLiteral("Sending"));
+        if (sending.hasKey(QStringLiteral("WordWrap"))) {
+            const bool wordWrap = sending.readEntry(QStringLiteral("WordWrap"), false);
+            addKmailConfig(QStringLiteral("Composer"), QStringLiteral("word-wrap"), wordWrap);
+        }
+        if (sending.hasKey(QStringLiteral("break-at"))) {
+            const int wordWrapLength = sending.readEntry(QStringLiteral("break-at"), -1);
+            if (wordWrapLength != -1) {
+                addKmailConfig(QStringLiteral("Composer"), QStringLiteral("break-at"), wordWrapLength);
+            }
+        }
+    }
+    if (config.hasGroup(QStringLiteral("Global"))) {
+        KConfigGroup global = config.group(QStringLiteral("Global"));
+        if (global.hasKey(QStringLiteral("EmptyTrash"))) {
+            const bool emptyTrash = global.readEntry(QStringLiteral("EmptyTrash"), false);
+            addKmailConfig(QStringLiteral("General"), QStringLiteral("empty-trash-on-exit"), emptyTrash);
+        }
+    }
+    if (config.hasGroup(QStringLiteral("Spelling"))) {
+        KConfigGroup spellChecking = config.group(QStringLiteral("Spelling"));
+        if (spellChecking.hasKey(QStringLiteral("SpellCheckActive"))) {
+            const bool active = spellChecking.readEntry(QStringLiteral("SpellCheckActive"), false);
+            addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("backgroundCheckerEnabled"), active);
+            addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("checkerEnabledByDefault"), active);
+        }
+        if (spellChecking.hasKey(QStringLiteral("SpellCheckLanguage"))) {
+            const QString spellCheck = spellChecking.readEntry(QStringLiteral("defaultLanguage"));
+            addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("defaultLanguage"), spellCheck);
+        }
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/balsa/balsasettings.h akonadi-import-wizard-17.08.3/src/plugins/balsa/balsasettings.h
--- akonadi-import-wizard-17.04.3/src/plugins/balsa/balsasettings.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/balsa/balsasettings.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef BalsaSettings_H
+#define BalsaSettings_H
+
+#include <ImportWizard/AbstractSettings>
+
+class KConfigGroup;
+
+class BalsaSettings : public AbstractSettings
+{
+public:
+    explicit BalsaSettings(const QString &filename);
+    ~BalsaSettings();
+
+    void importSettings();
+private:
+    void readAccount(const KConfigGroup &grp, bool autoCheck, int autoDelay);
+    void readIdentity(const KConfigGroup &grp);
+    void readTransport(const KConfigGroup &grp);
+    void readGlobalSettings(const KConfig &config);
+
+    QHash<QString, QString> mHashSmtp;
+    QString mFileName;
+};
+
+#endif // BalsaSettings_H
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/balsa/CMakeLists.txt akonadi-import-wizard-17.08.3/src/plugins/balsa/CMakeLists.txt
--- akonadi-import-wizard-17.04.3/src/plugins/balsa/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/balsa/CMakeLists.txt	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,23 @@
+set(balsaimporter_SRCS
+    balsaaddressbook.cpp
+    balsaimportdata.cpp
+    balsasettings.cpp
+    )
+ecm_qt_declare_logging_category(balsaimporter_SRCS HEADER balsaplugin_debug.h
+    IDENTIFIER BALSAPLUGIN_LOG CATEGORY_NAME org.kde.pim.importwizard.balsaplugin)
+
+kcoreaddons_add_plugin(balsaimporterplugin JSON balsaimporter.json SOURCES
+    ${balsaimporter_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(balsaimporterplugin
+    KPim::ImportWizard
+    KF5::XmlGui
+    KF5::I18n
+    KF5::Contacts
+    KF5::MailImporterAkonadi
+    KF5::MailTransport
+    KF5::MailCommon
+    KF5::IdentityManagement
+    KF5::MessageViewer
+    )
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailaddressbook.cpp akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailaddressbook.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "clawsmailaddressbook.h"
+#include <ImportWizard/ImportWizardUtil>
+
+ClawsMailAddressBook::ClawsMailAddressBook(const QDir &dir)
+    : SylpheedAddressBook(dir)
+{
+}
+
+ClawsMailAddressBook::~ClawsMailAddressBook()
+{
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailaddressbook.h akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailaddressbook.h
--- akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailaddressbook.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailaddressbook.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,33 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ClawsMailAddressBook_H
+#define ClawsMailAddressBook_H
+
+#include "../sylpheed/sylpheedaddressbook.h"
+#include <QDir>
+
+class ClawsMailAddressBook : public SylpheedAddressBook
+{
+public:
+    explicit ClawsMailAddressBook(const QDir &dir);
+    ~ClawsMailAddressBook();
+};
+
+#endif // ClawsMailAddressBook_H
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailimportdata.cpp akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailimportdata.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,113 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "clawsmailimportdata.h"
+#include "clawsmailsettings.h"
+#include "clawsmailaddressbook.h"
+#include "mailimporter/filterclawsmail.h"
+#include "MailCommon/FilterImporterClawsMail"
+#include "mailimporter/filterinfo.h"
+
+#include <kpluginfactory.h>
+#include <KLocalizedString>
+
+#include <QDir>
+
+K_PLUGIN_FACTORY_WITH_JSON(ClawsMailImporterFactory, "clawsmailimporter.json", registerPlugin<ClawsMailImportData>();
+                           )
+
+ClawsMailImportData::ClawsMailImportData(QObject *parent, const QList<QVariant> &)
+    : LibImportWizard::AbstractImporter(parent)
+{
+    mPath = MailImporter::FilterClawsMail::defaultSettingsPath();
+}
+
+ClawsMailImportData::~ClawsMailImportData()
+{
+}
+
+bool ClawsMailImportData::foundMailer() const
+{
+    QDir directory(mPath);
+    if (directory.exists()) {
+        return true;
+    }
+    return false;
+}
+
+QString ClawsMailImportData::name() const
+{
+    return QStringLiteral("Claws Mails");
+}
+
+bool ClawsMailImportData::importMails()
+{
+    MailImporter::FilterClawsMail clawsMail;
+    initializeFilter(clawsMail);
+    clawsMail.filterInfo()->setStatusMessage(i18n("Import in progress"));
+    const QString mailsPath = clawsMail.localMailDirPath();
+    QDir directory(mailsPath);
+    if (directory.exists()) {
+        clawsMail.importMails(mailsPath);
+    } else {
+        clawsMail.import();
+    }
+    clawsMail.filterInfo()->setStatusMessage(i18n("Import finished"));
+    return true;
+}
+
+bool ClawsMailImportData::importAddressBook()
+{
+    const QDir addressbookDir(mPath + QLatin1String("addrbook/"));
+    ClawsMailAddressBook account(addressbookDir);
+    account.setAbstractDisplayInfo(mAbstractDisplayInfo);
+    account.importAddressBook();
+    return true;
+}
+
+bool ClawsMailImportData::importSettings()
+{
+    const QString accountFile = mPath + QLatin1String("accountrc");
+    if (QFileInfo::exists(accountFile)) {
+        ClawsMailSettings account;
+        account.setAbstractDisplayInfo(mAbstractDisplayInfo);
+        account.importSettings(accountFile, mPath);
+    } else {
+        addImportSettingsInfo(i18n("Claws Mail settings not found."));
+    }
+    return true;
+}
+
+bool ClawsMailImportData::importFilters()
+{
+    const QString filterPath(mPath + QLatin1String("matcherrc"));
+    return addFilters(filterPath, MailCommon::FilterImporterExporter::ClawsMailFilter);
+}
+
+LibImportWizard::AbstractImporter::TypeSupportedOptions ClawsMailImportData::supportedOption()
+{
+    TypeSupportedOptions options;
+    options |= LibImportWizard::AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::AddressBooks;
+    options |= LibImportWizard::AbstractImporter::Settings;
+    options |= LibImportWizard::AbstractImporter::Filters;
+    return options;
+}
+
+#include "clawsmailimportdata.moc"
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailimportdata.h akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailimportdata.h
--- akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailimportdata.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailimportdata.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#ifndef ClawsMailImportData_H
+#define ClawsMailImportData_H
+
+#include <ImportWizard/AbstractImporter>
+
+class ClawsMailImportData : public LibImportWizard::AbstractImporter
+{
+public:
+    explicit ClawsMailImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
+    ~ClawsMailImportData();
+
+    TypeSupportedOptions supportedOption() override;
+    bool foundMailer() const override;
+
+    bool importMails() override;
+    bool importAddressBook() override;
+    bool importSettings() override;
+    bool importFilters() override;
+
+    QString name() const override;
+};
+
+#endif /* ClawsMailImportData_H */
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailimporter.json akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailimporter.json
--- akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailimporter.json	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailimporter.json	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,32 @@
+{
+    "KPlugin": {
+        "Id": "clawsmailimporter",
+        "Name": "ClawsMail Importer",
+        "Name[ca@valencia]": "Importador del ClawsMail",
+        "Name[ca]": "Importador del ClawsMail",
+        "Name[cs]": "Importér ClawsMail",
+        "Name[de]": "Import-Modul für ClawsMail",
+        "Name[es]": "Importador ClawsMail",
+        "Name[fi]": "ClawsMail-tuonti",
+        "Name[fr]": "Import ClawsMail",
+        "Name[it]": "Importatore da ClawsMail",
+        "Name[nl]": "ClawsMail-importeur",
+        "Name[pl]": "Importer ClawsMail",
+        "Name[pt]": "Importador do ClawsMail",
+        "Name[sk]": "Importér ClawsMail",
+        "Name[sl]": "Uvoznik iz programa ClawsMail",
+        "Name[sr@ijekavian]": "Увозник из Клоз мејла",
+        "Name[sr@ijekavianlatin]": "Uvoznik iz Claws Maila",
+        "Name[sr@latin]": "Uvoznik iz Claws Maila",
+        "Name[sr]": "Увозник из Клоз мејла",
+        "Name[sv]": "ClawsMail-importverktyg",
+        "Name[tr]": "ClawsMail İçe Aktarıcı",
+        "Name[uk]": "Засіб імпортування з ClawsMail",
+        "Name[x-test]": "xxClawsMail Importerxx",
+        "Name[zh_CN]": "ClawsMail 导入器",
+        "ServiceTypes": [
+            "ImportWizard/PluginMailImporter"
+        ],
+        "Version": "1.0"
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailsettings.cpp akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailsettings.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailsettings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailsettings.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,196 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "clawsmailsettings.h"
+#include <ImportWizard/ImportWizardUtil>
+
+#include <mailtransport/transportmanager.h>
+#include "MailCommon/MailUtil"
+
+#include <KIdentityManagement/kidentitymanagement/identity.h>
+#include <KIdentityManagement/kidentitymanagement/signature.h>
+
+#include "clawsmailplugin_debug.h"
+#include <KConfig>
+#include <KConfigGroup>
+#include <QFileInfo>
+
+#include <QRegularExpression>
+
+ClawsMailSettings::ClawsMailSettings()
+{
+}
+
+ClawsMailSettings::~ClawsMailSettings()
+{
+}
+
+void ClawsMailSettings::importSettings(const QString &filename, const QString &path)
+{
+    bool checkMailOnStartup = true;
+    int intervalCheckMail = -1;
+    const QString clawsmailrc = path + QLatin1String("/clawsrc");
+    if (QFileInfo::exists(clawsmailrc)) {
+        KConfig configCommon(clawsmailrc);
+        if (configCommon.hasGroup("Common")) {
+            KConfigGroup common = configCommon.group("Common");
+            checkMailOnStartup = (common.readEntry("check_on_startup", 1) == 1);
+            if (common.readEntry(QStringLiteral("autochk_newmail"), 1) == 1) {
+                intervalCheckMail = common.readEntry(QStringLiteral("autochk_interval"), -1);
+            }
+            readGlobalSettings(common);
+        }
+    }
+    KConfig config(filename);
+    const QStringList accountList = config.groupList().filter(QRegularExpression(QStringLiteral("Account: \\d+")));
+    const QStringList::const_iterator end(accountList.constEnd());
+    for (QStringList::const_iterator it = accountList.constBegin(); it != end; ++it) {
+        KConfigGroup group = config.group(*it);
+        readAccount(group, checkMailOnStartup, intervalCheckMail);
+        readIdentity(group);
+    }
+    const QString customheaderrc = path + QLatin1String("/customheaderrc");
+    QFile customHeaderFile(customheaderrc);
+    if (customHeaderFile.exists()) {
+        if (!customHeaderFile.open(QIODevice::ReadOnly)) {
+            qCDebug(CLAWSMAILPLUGIN_LOG) << " We can't open file" << customheaderrc;
+        } else {
+            readCustomHeader(&customHeaderFile);
+        }
+    }
+}
+
+void ClawsMailSettings::readSettingsColor(const KConfigGroup &group)
+{
+    const bool enableColor = group.readEntry("enable_color", false);
+    if (enableColor) {
+        const QString colorLevel1 = group.readEntry("quote_level1_color");
+        if (!colorLevel1.isEmpty()) {
+            const QColor col = QColor(colorLevel1);
+            if (col.isValid()) {
+                addKmailConfig(QStringLiteral("Reader"), QStringLiteral("QuotedText1"), writeColor(col));
+            }
+            //[Reader]  QuotedText1
+        }
+        const QString colorLevel2 = group.readEntry("quote_level2_color");
+        if (!colorLevel2.isEmpty()) {
+            const QColor col = QColor(colorLevel2);
+            if (col.isValid()) {
+                addKmailConfig(QStringLiteral("Reader"), QStringLiteral("QuotedText2"), writeColor(col));
+            }
+            //[Reader]  QuotedText2
+        }
+        const QString colorLevel3 = group.readEntry("quote_level3_color");
+        if (!colorLevel3.isEmpty()) {
+            const QColor col = QColor(colorLevel3);
+            if (col.isValid()) {
+                addKmailConfig(QStringLiteral("Reader"), QStringLiteral("QuotedText3"), writeColor(col));
+            }
+            //[Reader]  QuotedText3
+        }
+        const QString misspellColor = group.readEntry(QStringLiteral("misspelled_color"));
+        if (!misspellColor.isEmpty()) {
+            const QColor col = QColor(misspellColor);
+            if (col.isValid()) {
+                addKmailConfig(QStringLiteral("Reader"), QStringLiteral("MisspelledColor"), writeColor(col));
+            }
+        }
+        const QString uriColor = group.readEntry(QStringLiteral("uri_color"));
+        if (!uriColor.isEmpty()) {
+            const QColor col(uriColor);
+            if (col.isValid()) {
+                addKmailConfig(QStringLiteral("Reader"), QStringLiteral("LinkColor"), writeColor(col));
+            }
+        }
+        const QString newColor = group.readEntry(QStringLiteral("color_new"));
+        if (!newColor.isEmpty()) {
+            const QColor col(newColor);
+            if (col.isValid()) {
+                addKmailConfig(QStringLiteral("MessageListView::Colors"), QStringLiteral("UnreadMessageColor"), writeColor(col));
+            }
+        }
+    }
+}
+
+QString ClawsMailSettings::writeColor(const QColor &col)
+{
+    QStringList list;
+    list.insert(0, QString::number(col.red()));
+    list.insert(1, QString::number(col.green()));
+    list.insert(2, QString::number(col.blue()));
+    if (col.alpha() != 255) {
+        list.insert(3, QString::number(col.alpha()));
+    }
+    return list.join(QLatin1Char(','));
+}
+
+void ClawsMailSettings::readTemplateFormat(const KConfigGroup &group)
+{
+    SylpheedSettings::readTemplateFormat(group);
+    const QString composerNewMessage = group.readEntry(QStringLiteral("compose_body_format"));
+    if (!composerNewMessage.isEmpty()) {
+        addKmailConfig(QStringLiteral("TemplateParser"), QStringLiteral("TemplateNewMessage"), convertToKmailTemplate(composerNewMessage));
+    }
+}
+
+void ClawsMailSettings::readGlobalSettings(const KConfigGroup &group)
+{
+    SylpheedSettings::readGlobalSettings(group);
+    if (group.readEntry(QStringLiteral("check_while_typing"), 0) == 1) {
+        addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("backgroundCheckerEnabled"), true);
+    }
+    const int markAsRead = group.readEntry(QStringLiteral("mark_as_read_delay"), -1);
+    if (markAsRead != -1) {
+        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkTime"), markAsRead);
+        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkAsRead"), true);
+    }
+
+    const int warnLargeFileInserting = group.readEntry(QStringLiteral("warn_large_insert"), 0);
+    if (warnLargeFileInserting == 0) {
+        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("MaximumAttachmentSize"), -1);
+    } else {
+        const int warnLargeFileSize = group.readEntry(QStringLiteral("warn_large_insert_size"), -1);
+        if (warnLargeFileSize > 0) {
+            addKmailConfig(QStringLiteral("Composer"), QStringLiteral("MaximumAttachmentSize"), warnLargeFileSize * 1024);
+        }
+    }
+}
+
+void ClawsMailSettings::readTagColor(const KConfigGroup &group)
+{
+    const QString customColorPattern(QStringLiteral("custom_color%1"));
+    const QString customColorLabelPattern(QStringLiteral("custom_colorlabel%1"));
+    QVector<tagStruct> listTag;
+    for (int i = 1; i <= 15; ++i) {
+        if (group.hasKey(customColorPattern.arg(i))
+            && group.hasKey(customColorLabelPattern.arg(i))) {
+            tagStruct tag;
+            const QString colorStr = group.readEntry(customColorPattern.arg(i));
+            const QString labelStr = group.readEntry(customColorLabelPattern.arg(i));
+            if (!colorStr.isEmpty() && !labelStr.isEmpty()) {
+                tag.color = QColor(colorStr).name();
+                tag.name = labelStr;
+                listTag << tag;
+            }
+        }
+    }
+    if (!listTag.isEmpty()) {
+        ImportWizardUtil::addAkonadiTag(listTag);
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailsettings.h akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailsettings.h
--- akonadi-import-wizard-17.04.3/src/plugins/claws-mail/clawsmailsettings.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/claws-mail/clawsmailsettings.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,46 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef ClawsMailSettings_H
+#define ClawsMailSettings_H
+
+#include "../sylpheed/sylpheedsettings.h"
+
+class KConfigGroup;
+
+class ClawsMailSettings : public SylpheedSettings
+{
+public:
+    ClawsMailSettings();
+    ~ClawsMailSettings();
+
+    void importSettings(const QString &filename, const QString &path) override;
+
+protected:
+    //Reimplement from sylpheed
+    void readSettingsColor(const KConfigGroup &group) override;
+    void readTemplateFormat(const KConfigGroup &group) override;
+    void readGlobalSettings(const KConfigGroup &group) override;
+    void readTagColor(const KConfigGroup &group) override;
+
+private:
+    QString writeColor(const QColor &col);
+};
+
+#endif // ClawsMailSettings_H
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/claws-mail/CMakeLists.txt akonadi-import-wizard-17.08.3/src/plugins/claws-mail/CMakeLists.txt
--- akonadi-import-wizard-17.04.3/src/plugins/claws-mail/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/claws-mail/CMakeLists.txt	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,28 @@
+set(clawsmailimporter_SRCS
+    clawsmailaddressbook.cpp
+    clawsmailimportdata.cpp
+    clawsmailsettings.cpp
+    ../sylpheed/sylpheedaddressbook.cpp
+    ../sylpheed/sylpheedsettings.cpp
+    ../sylpheed/sylpheedsettingsutils.cpp
+
+    )
+
+ecm_qt_declare_logging_category(clawsmailimporter_SRCS HEADER sylpheedplugin_debug.h
+    IDENTIFIER SYLPHEEDPLUGIN_LOG CATEGORY_NAME org.kde.pim.importwizard.sylpheedplugin)
+ecm_qt_declare_logging_category(clawsmailimporter_SRCS HEADER clawsmailplugin_debug.h
+    IDENTIFIER CLAWSMAILPLUGIN_LOG CATEGORY_NAME org.kde.pim.importwizard.clawsmailplugin)
+kcoreaddons_add_plugin(clawsmailimporterplugin JSON clawsmailimporter.json SOURCES
+    ${clawsmailimporter_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(clawsmailimporterplugin
+    KPim::ImportWizard
+    KF5::XmlGui
+    KF5::I18n
+    KF5::Contacts
+    KF5::MailImporterAkonadi
+    KF5::MailTransport
+    KF5::IdentityManagement
+    KF5::MailCommon
+    )
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/CMakeLists.txt akonadi-import-wizard-17.08.3/src/plugins/CMakeLists.txt
--- akonadi-import-wizard-17.04.3/src/plugins/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/CMakeLists.txt	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,9 @@
+add_subdirectory(trojita)
+add_subdirectory(balsa)
+add_subdirectory(evolutionv3)
+add_subdirectory(sylpheed)
+add_subdirectory(claws-mail)
+add_subdirectory(thunderbird)
+add_subdirectory(icedove)
+add_subdirectory(seamonkey)
+
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/CMakeLists.txt akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/CMakeLists.txt
--- akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/CMakeLists.txt	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,25 @@
+set(evolutionv3importer_SRCS
+    evolutionaddressbook.cpp
+    evolutionv3importdata.cpp
+    evolutionsettings.cpp
+    evolutioncalendar.cpp
+    evolutionutil.cpp
+    )
+ecm_qt_declare_logging_category(evolutionv3importer_SRCS HEADER evolutionv3plugin_debug.h
+    IDENTIFIER EVOLUTIONPLUGIN_LOG CATEGORY_NAME org.kde.pim.importwizard.evolutionplugin)
+
+kcoreaddons_add_plugin(evolutionv3importerplugin JSON evolutionv3importer.json SOURCES
+    ${evolutionv3importer_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(evolutionv3importerplugin
+    KPim::ImportWizard
+    KF5::XmlGui
+    KF5::I18n
+    KF5::Contacts
+    KF5::MailImporterAkonadi
+    KF5::MailTransport
+    KF5::MailCommon
+    KF5::IdentityManagement
+    KF5::MessageViewer
+    )
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionaddressbook.cpp akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionaddressbook.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,104 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#include "evolutionaddressbook.h"
+#include "abstractdisplayinfo.h"
+
+#include "evolutionv3plugin_debug.h"
+#include <QProcess>
+#include <KMessageBox>
+#include <KLocalizedString>
+#include <QFileDialog>
+
+EvolutionAddressBook::EvolutionAddressBook()
+{
+}
+
+EvolutionAddressBook::~EvolutionAddressBook()
+{
+}
+
+void EvolutionAddressBook::exportEvolutionAddressBook()
+{
+    KMessageBox::information(mAbstractDisplayInfo->parentWidget(), i18n("Evolution address book will be exported as vCard. Import vCard in KAddressBook."), i18n("Export Evolution Address Book"));
+
+    const QString directory = QFileDialog::getExistingDirectory(mAbstractDisplayInfo->parentWidget(), i18n("Select the directory where vCards will be stored."));
+    if (directory.isEmpty()) {
+        return;
+    }
+    QFile evolutionFile;
+    bool found = false;
+    for (int i = 0; i < 9; ++i) {
+        evolutionFile.setFileName(QStringLiteral("/usr/lib/evolution/3.%1/evolution-addressbook-export").arg(i));
+        if (evolutionFile.exists()) {
+            found = true;
+            break;
+        }
+    }
+    if (found) {
+        QStringList arguments;
+        arguments << QStringLiteral("-l");
+        QProcess proc;
+        proc.start(evolutionFile.fileName(), arguments);
+        if (!proc.waitForFinished()) {
+            return;
+        }
+        QByteArray result = proc.readAll();
+        proc.close();
+        if (!result.isEmpty()) {
+            result = result.replace('\n', ',');
+            const QString value(result.trimmed());
+            const QStringList listAddressBook = value.split(QLatin1Char(','));
+            //qCDebug(EVOLUTIONPLUGIN_LOG)<<" listAddressBook"<<listAddressBook;
+            int i = 0;
+            QString name;
+            QString displayname;
+            for (const QString &arg : listAddressBook) {
+                switch (i) {
+                case 0:
+                    name = arg;
+                    name = name.remove(0, 1);
+                    name = name.remove(name.length() - 1, 1);
+                    ++i;
+                    //name
+                    break;
+                case 1:
+                    displayname = arg;
+                    displayname = displayname.remove(0, 1);
+                    displayname = displayname.remove(displayname.length() - 1, 1);
+                    //display name
+                    ++i;
+                    break;
+                case 2:
+                    if (!displayname.isEmpty() && !name.isEmpty()) {
+                        arguments.clear();
+                        arguments << QStringLiteral("--format=vcard") << name << QStringLiteral("--output=%1/%2.vcard").arg(directory, displayname);
+                        proc.start(evolutionFile.fileName(), arguments);
+                        if (proc.waitForFinished()) {
+                            addAddressBookImportInfo(i18n("Address book \"%1\" exported.", displayname));
+                        } else {
+                            addAddressBookImportError(i18n("Failed to export address book \"%1\".", displayname));
+                        }
+                    }
+                    i = 0; //reset
+                    break;
+                }
+            }
+        }
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionaddressbook.h akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionaddressbook.h
--- akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionaddressbook.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionaddressbook.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,34 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef EVOLUTIONADDRESSBOOK_H
+#define EVOLUTIONADDRESSBOOK_H
+
+#include <ImportWizard/AbstractAddressBook>
+
+class EvolutionAddressBook : public LibImportWizard::AbstractAddressBook
+{
+    Q_OBJECT
+public:
+    EvolutionAddressBook();
+    ~EvolutionAddressBook();
+    void exportEvolutionAddressBook();
+};
+
+#endif // ABSTRACTADDRESSBOOK_H
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutioncalendar.cpp akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutioncalendar.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutioncalendar.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutioncalendar.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,159 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "evolutioncalendar.h"
+#include "evolutionutil.h"
+
+#include "evolutionv3plugin_debug.h"
+
+#include <QFile>
+#include <QDir>
+#include <QDomDocument>
+#include <QDomElement>
+
+EvolutionCalendar::EvolutionCalendar()
+{
+}
+
+EvolutionCalendar::~EvolutionCalendar()
+{
+}
+
+void EvolutionCalendar::loadCalendar(const QString &filename)
+{
+    //Read gconf file
+    QFile file(filename);
+    if (!file.open(QIODevice::ReadOnly)) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << " We can't open file" << filename;
+        return;
+    }
+    QDomDocument doc;
+    if (!EvolutionUtil::loadInDomDocument(&file, doc)) {
+        return;
+    }
+    QDomElement config = doc.documentElement();
+
+    if (config.isNull()) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << "No config found";
+        return;
+    }
+    mCalendarPath = QDir::homePath() + QLatin1String("/.local/share/evolution/calendar/");
+    for (QDomElement e = config.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
+        const QString tag = e.tagName();
+        if (tag == QLatin1String("entry")) {
+            if (e.hasAttribute("name")) {
+                const QString attr = e.attribute("name");
+                if (attr == QLatin1String("sources")) {
+                    readCalendar(e);
+                } else {
+                    qCDebug(EVOLUTIONPLUGIN_LOG) << " attr unknown " << attr;
+                }
+            }
+        }
+    }
+}
+
+void EvolutionCalendar::readCalendar(const QDomElement &calendar)
+{
+    for (QDomElement calendarConfig = calendar.firstChildElement(); !calendarConfig.isNull(); calendarConfig = calendarConfig.nextSiblingElement()) {
+        if (calendarConfig.tagName() == QLatin1String("li")) {
+            const QDomElement stringValue = calendarConfig.firstChildElement();
+            extractCalendarInfo(stringValue.text());
+        }
+    }
+}
+
+void EvolutionCalendar::extractCalendarInfo(const QString &info)
+{
+    //qCDebug(IMPORTWIZARD_LOG)<<" info "<<info;
+    //Read QDomElement
+    QDomDocument cal;
+    if (!EvolutionUtil::loadInDomDocument(info, cal)) {
+        return;
+    }
+    QDomElement domElement = cal.documentElement();
+
+    if (domElement.isNull()) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << "Account not found";
+        return;
+    }
+    QString base_uri;
+    if (domElement.hasAttribute(QStringLiteral("base_uri"))) {
+        base_uri = domElement.attribute(QStringLiteral("base_uri"));
+    }
+    if (base_uri == QLatin1String("local:")) {
+        for (QDomElement e = domElement.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
+            const QString tag = e.tagName();
+            if (tag == QLatin1String("source")) {
+                QString name;
+                QMap<QString, QVariant> settings;
+                if (e.hasAttribute(QStringLiteral("uid"))) {
+                }
+                if (e.hasAttribute(QStringLiteral("name"))) {
+                    name = e.attribute(QStringLiteral("name"));
+                    settings.insert(QStringLiteral("DisplayName"), name);
+                }
+                if (e.hasAttribute(QStringLiteral("relative_uri"))) {
+                    const QString path = mCalendarPath + e.attribute(QStringLiteral("relative_uri")) + QLatin1String("/calendar.ics");
+                    settings.insert(QStringLiteral("Path"), path);
+                }
+                if (e.hasAttribute(QStringLiteral("color_spec"))) {
+                    //const QString color = e.attribute(QStringLiteral("color_spec"));
+                    //Need id.
+                    //TODO: Need to get id for collection to add color.
+                }
+                QDomElement propertiesElement = e.firstChildElement();
+                if (!propertiesElement.isNull()) {
+                    for (QDomElement property = propertiesElement.firstChildElement(); !property.isNull(); property = property.nextSiblingElement()) {
+                        const QString propertyTag = property.tagName();
+                        if (propertyTag == QLatin1String("property")) {
+                            if (property.hasAttribute(QStringLiteral("name"))) {
+                                const QString propertyName = property.attribute(QStringLiteral("name"));
+                                if (propertyName == QLatin1String("custom-file-readonly")) {
+                                    if (property.hasAttribute(QStringLiteral("value"))) {
+                                        if (property.attribute(QStringLiteral("value")) == QLatin1String("1")) {
+                                            settings.insert(QStringLiteral("ReadOnly"), true);
+                                        }
+                                    }
+                                } else if (propertyName == QLatin1String("alarm")) {
+                                    qCDebug(EVOLUTIONPLUGIN_LOG) << " need to implement alarm property";
+                                } else {
+                                    qCDebug(EVOLUTIONPLUGIN_LOG) << " property unknown :" << propertyName;
+                                }
+                            }
+                        } else {
+                            qCDebug(EVOLUTIONPLUGIN_LOG) << " tag unknown :" << propertyTag;
+                        }
+                    }
+                }
+                LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_ical_resource"), name, settings);
+            } else {
+                qCDebug(EVOLUTIONPLUGIN_LOG) << " tag unknown :" << tag;
+            }
+        }
+    } else if (base_uri == QLatin1String("webcal://")) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << " need to implement webcal protocol";
+    } else if (base_uri == QLatin1String("google://")) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << " need to implement google protocol";
+    } else if (base_uri == QLatin1String("caldav://")) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << " need to implement caldav protocol";
+    } else {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << " base_uri unknown" << base_uri;
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutioncalendar.h akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutioncalendar.h
--- akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutioncalendar.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutioncalendar.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef EVOLUTIONCALENDAR_H
+#define EVOLUTIONCALENDAR_H
+
+#include "abstractcalendar.h"
+
+class QDomElement;
+
+class EvolutionCalendar : public LibImportWizard::AbstractCalendar
+{
+public:
+    EvolutionCalendar();
+    ~EvolutionCalendar();
+
+    void loadCalendar(const QString &filename);
+private:
+    void readCalendar(const QDomElement &calendar);
+    void extractCalendarInfo(const QString &info);
+    QString mCalendarPath;
+};
+
+#endif // EVOLUTIONCALENDAR_H
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionsettings.cpp akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionsettings.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionsettings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionsettings.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,591 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "evolutionsettings.h"
+#include "evolutionutil.h"
+#include "MailCommon/MailUtil"
+#include <ImportWizard/ImportWizardUtil>
+
+#include <KIdentityManagement/kidentitymanagement/identity.h>
+
+#include <mailtransport/transportmanager.h>
+
+#include "evolutionv3plugin_debug.h"
+
+#include <QFile>
+#include <QDir>
+#include <QDomDocument>
+#include <QDomElement>
+
+EvolutionSettings::EvolutionSettings()
+{
+}
+
+EvolutionSettings::~EvolutionSettings()
+{
+}
+
+void EvolutionSettings::loadAccount(const QString &filename)
+{
+    //Read gconf file
+    QFile file(filename);
+    if (!file.open(QIODevice::ReadOnly)) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << " We can't open file" << filename;
+        return;
+    }
+    QDomDocument doc;
+    if (!EvolutionUtil::loadInDomDocument(&file, doc)) {
+        return;
+    }
+    QDomElement config = doc.documentElement();
+
+    if (config.isNull()) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << "No config found in filename " << filename;
+        return;
+    }
+    for (QDomElement e = config.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
+        const QString tag = e.tagName();
+        if (tag == QLatin1String("entry")) {
+            if (e.hasAttribute("name")) {
+                const QString attr = e.attribute("name");
+                if (attr == QLatin1String("accounts")) {
+                    readAccount(e);
+                } else if (attr == QLatin1String("signatures")) {
+                    readSignatures(e);
+                } else if (attr == QLatin1String("send_recv_all_on_start")) {
+                    //TODO: implement it.
+                } else if (attr == QLatin1String("send_recv_on_start")) {
+                    //TODO: implement it.
+                } else {
+                    qCDebug(EVOLUTIONPLUGIN_LOG) << " attr unknown " << attr;
+                }
+            }
+        }
+    }
+}
+
+void EvolutionSettings::loadLdap(const QString &filename)
+{
+    QFile file(filename);
+    if (!file.open(QIODevice::ReadOnly)) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << " We can't open file" << filename;
+        return;
+    }
+    QDomDocument doc;
+    if (!EvolutionUtil::loadInDomDocument(&file, doc)) {
+        return;
+    }
+    QDomElement ldapConfig = doc.documentElement();
+    for (QDomElement e = ldapConfig.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
+        const QString tag = e.tagName();
+        if (tag == QLatin1String("entry")) {
+            for (QDomElement serverConfig = e.firstChildElement(); !serverConfig.isNull(); serverConfig = serverConfig.nextSiblingElement()) {
+                if (serverConfig.tagName() == QLatin1String("li")) {
+                    QDomElement ldapValue = serverConfig.firstChildElement();
+                    readLdap(ldapValue.text());
+                }
+            }
+        }
+    }
+}
+
+void EvolutionSettings::readLdap(const QString &ldapStr)
+{
+    qCDebug(EVOLUTIONPLUGIN_LOG) << " ldap " << ldapStr;
+    QDomDocument ldap;
+    if (!EvolutionUtil::loadInDomDocument(ldapStr, ldap)) {
+        return;
+    }
+
+    QDomElement domElement = ldap.documentElement();
+
+    if (domElement.isNull()) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << "ldap not found";
+        return;
+    }
+    //Ldap server
+    if (domElement.attribute(QStringLiteral("base_uri")) == QLatin1String("ldap://")) {
+        for (QDomElement e = domElement.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
+            //const QString name = e.attribute( QLatin1String( "name" ) ); We don't use it in kmail
+
+            ldapStruct ldap;
+            const QString relative_uri = e.attribute(QStringLiteral("relative_uri"));
+            const QString uri = e.attribute(QStringLiteral("uri"));
+            QUrl url(uri);
+            ldap.port = url.port();
+            ldap.ldapUrl = url;
+            qCDebug(EVOLUTIONPLUGIN_LOG) << " relative_uri" << relative_uri;
+
+            QDomElement propertiesElement = e.firstChildElement();
+            if (!propertiesElement.isNull()) {
+                for (QDomElement property = propertiesElement.firstChildElement(); !property.isNull(); property = property.nextSiblingElement()) {
+                    const QString propertyTag = property.tagName();
+                    if (propertyTag == QLatin1String("property")) {
+                        if (property.hasAttribute(QStringLiteral("name"))) {
+                            const QString propertyName = property.attribute(QStringLiteral("name"));
+                            if (propertyName == QLatin1String("timeout")) {
+                                ldap.timeout = property.attribute(QStringLiteral("value")).toInt();
+                            } else if (propertyName == QLatin1String("ssl")) {
+                                const QString value = property.attribute(QStringLiteral("value"));
+                                if (value == QLatin1String("always")) {
+                                    ldap.useSSL = true;
+                                } else if (value == QLatin1String("whenever_possible")) {
+                                    ldap.useTLS = true;
+                                } else {
+                                    qCDebug(EVOLUTIONPLUGIN_LOG) << " ssl attribute unknown" << value;
+                                }
+                            } else if (propertyName == QLatin1String("limit")) {
+                                ldap.limit = property.attribute(QStringLiteral("value")).toInt();
+                            } else if (propertyName == QLatin1String("binddn")) {
+                                ldap.dn = property.attribute(QStringLiteral("value"));
+                            } else if (propertyName == QLatin1String("auth")) {
+                                const QString value = property.attribute(QStringLiteral("value"));
+                                if (value == QLatin1String("ldap/simple-email")) {
+                                    //TODO:
+                                } else if (value == QLatin1String("none")) {
+                                    //TODO:
+                                } else if (value == QLatin1String("ldap/simple-binddn")) {
+                                    //TODO:
+                                } else {
+                                    qCDebug(EVOLUTIONPLUGIN_LOG) << " Unknown auth value " << value;
+                                }
+                                qCDebug(EVOLUTIONPLUGIN_LOG) << " auth" << value;
+                            } else {
+                                qCDebug(EVOLUTIONPLUGIN_LOG) << " property unknown :" << propertyName;
+                            }
+                        }
+                    } else {
+                        qCDebug(EVOLUTIONPLUGIN_LOG) << " tag unknown :" << propertyTag;
+                    }
+                }
+                ImportWizardUtil::mergeLdap(ldap);
+            }
+        }
+    }
+}
+
+void EvolutionSettings::readSignatures(const QDomElement &account)
+{
+    for (QDomElement signatureConfig = account.firstChildElement(); !signatureConfig.isNull(); signatureConfig = signatureConfig.nextSiblingElement()) {
+        if (signatureConfig.tagName() == QLatin1String("li")) {
+            QDomElement stringValue = signatureConfig.firstChildElement();
+            extractSignatureInfo(stringValue.text());
+        }
+    }
+}
+
+void EvolutionSettings::extractSignatureInfo(const QString &info)
+{
+    //qCDebug(EVOLUTIONPLUGIN_LOG)<<" signature info "<<info;
+    QDomDocument signature;
+    if (!EvolutionUtil::loadInDomDocument(info, signature)) {
+        return;
+    }
+
+    QDomElement domElement = signature.documentElement();
+
+    if (domElement.isNull()) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << "Signature not found";
+        return;
+    }
+    for (QDomElement e = domElement.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
+        KIdentityManagement::Signature signature;
+
+        const QString tag = e.tagName();
+        const QString uid = e.attribute(QStringLiteral("uid"));
+        const QString signatureName = e.attribute(QStringLiteral("name"));     //Use it ?
+        const QString format = e.attribute(QStringLiteral("text"));
+        const bool automatic = (e.attribute(QStringLiteral("auto")) == QLatin1String("true"));
+        if (automatic) {
+            //TODO:
+        } else {
+            if (format == QLatin1String("text/html")) {
+                signature.setInlinedHtml(true);
+            } else if (format == QLatin1String("text/plain")) {
+                signature.setInlinedHtml(false);
+            }
+
+            if (tag == QLatin1String("filename")) {
+                if (e.hasAttribute(QStringLiteral("script")) && e.attribute(QStringLiteral("script")) == QLatin1String("true")) {
+                    signature.setPath(e.text(), true);
+                    signature.setType(KIdentityManagement::Signature::FromCommand);
+                } else {
+                    signature.setPath(QDir::homePath() + QLatin1String("/.local/share/evolution/signatures/") + e.text(), false);
+                    signature.setType(KIdentityManagement::Signature::FromFile);
+                }
+            }
+        }
+        mMapSignature.insert(uid, signature);
+
+        qCDebug(EVOLUTIONPLUGIN_LOG) << " signature tag :" << tag;
+    }
+}
+
+void EvolutionSettings::readAccount(const QDomElement &account)
+{
+    for (QDomElement accountConfig = account.firstChildElement(); !accountConfig.isNull(); accountConfig = accountConfig.nextSiblingElement()) {
+        if (accountConfig.tagName() == QLatin1String("li")) {
+            QDomElement stringValue = accountConfig.firstChildElement();
+            extractAccountInfo(stringValue.text());
+        }
+    }
+}
+
+void EvolutionSettings::extractAccountInfo(const QString &info)
+{
+    qCDebug(EVOLUTIONPLUGIN_LOG) << " info " << info;
+    //Read QDomElement
+    QDomDocument account;
+    if (!EvolutionUtil::loadInDomDocument(info, account)) {
+        return;
+    }
+
+    QDomElement domElement = account.documentElement();
+
+    if (domElement.isNull()) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << "Account not found";
+        return;
+    }
+
+    QString name;
+    if (domElement.hasAttribute(QStringLiteral("name"))) {
+        name = domElement.attribute(QStringLiteral("name"));
+    }
+
+    KIdentityManagement::Identity *newIdentity = createIdentity(name);
+
+    const bool enableManualCheck = (domElement.attribute(QStringLiteral("enabled")) == QLatin1String("true"));
+
+    for (QDomElement e = domElement.firstChildElement(); !e.isNull(); e = e.nextSiblingElement()) {
+        const QString tag = e.tagName();
+        if (tag == QLatin1String("identity")) {
+            for (QDomElement identity = e.firstChildElement(); !identity.isNull(); identity = identity.nextSiblingElement()) {
+                const QString identityTag = identity.tagName();
+                if (identityTag == QLatin1String("name")) {
+                    const QString fullName(identity.text());
+                    newIdentity->setIdentityName(fullName);
+                    newIdentity->setFullName(fullName);
+                } else if (identityTag == QLatin1String("addr-spec")) {
+                    newIdentity->setPrimaryEmailAddress(identity.text());
+                } else if (identityTag == QLatin1String("organization")) {
+                    newIdentity->setOrganization(identity.text());
+                } else if (identityTag == QLatin1String("signature")) {
+                    if (identity.hasAttribute("uid")) {
+                        newIdentity->setSignature(mMapSignature.value(identity.attribute(QStringLiteral("uid"))));
+                    }
+                } else if (identityTag == QLatin1String("reply-to")) {
+                    newIdentity->setReplyToAddr(identity.text());
+                } else {
+                    qCDebug(EVOLUTIONPLUGIN_LOG) << " tag identity not found :" << identityTag;
+                }
+            }
+        } else if (tag == QLatin1String("source")) {
+            if (e.hasAttribute(QStringLiteral("save-passwd")) && e.attribute(QStringLiteral("save-passwd")) == QLatin1String("true")) {
+                //TODO
+            }
+            int interval = -1;
+            bool intervalCheck = false;
+            if (e.hasAttribute(QStringLiteral("auto-check"))) {
+                intervalCheck = (e.attribute(QStringLiteral("auto-check")) == QLatin1String("true"));
+            }
+            if (e.hasAttribute(QStringLiteral("auto-check-timeout"))) {
+                interval = e.attribute(QStringLiteral("auto-check-timeout")).toInt();
+            }
+            for (QDomElement server = e.firstChildElement(); !server.isNull(); server = server.nextSiblingElement()) {
+                const QString serverTag = server.tagName();
+                if (serverTag == QLatin1String("url")) {
+                    qCDebug(EVOLUTIONPLUGIN_LOG) << " server.text() :" << server.text();
+                    QUrl serverUrl(server.text());
+                    const QString scheme = serverUrl.scheme();
+                    QMap<QString, QVariant> settings;
+                    const int port = serverUrl.port();
+
+                    const QString path = serverUrl.path();
+                    qCDebug(EVOLUTIONPLUGIN_LOG) << " path !" << path;
+                    const QString userName = serverUrl.userInfo();
+
+                    const QStringList listArgument = path.split(QLatin1Char(';'));
+
+                    //imapx://name@pop3.xx.org:993/;security-method=ssl-on-alternate-port;namespace;shell-command=ssh%20-C%20-l%20%25u%20%25h%20exec%20/usr/sbin/imapd%20;use-shell-command=true
+                    if (scheme == QLatin1String("imap") || scheme == QLatin1String("imapx")) {
+                        if (port > 0) {
+                            settings.insert(QStringLiteral("ImapPort"), port);
+                        }
+                        //Perhaps imapx is specific don't know
+                        if (intervalCheck) {
+                            settings.insert(QStringLiteral("IntervalCheckEnabled"), true);
+                        }
+                        if (interval > -1) {
+                            settings.insert(QStringLiteral("IntervalCheckTime"), interval);
+                        }
+
+                        bool found = false;
+                        const QString securityMethod = getSecurityMethod(listArgument, found);
+                        if (found) {
+                            if (securityMethod == QLatin1String("none")) {
+                                settings.insert(QStringLiteral("Safety"), QStringLiteral("None"));
+                                //Nothing
+                            } else if (securityMethod == QLatin1String("ssl-on-alternate-port")) {
+                                settings.insert(QStringLiteral("Safety"), QStringLiteral("SSL"));
+                            } else {
+                                qCDebug(EVOLUTIONPLUGIN_LOG) << " security method unknown : " << path;
+                            }
+                        } else {
+                            settings.insert(QStringLiteral("Safety"), QStringLiteral("STARTTLS"));
+                        }
+
+                        addAuth(settings, QStringLiteral("Authentication"), userName);
+                        const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
+                        //By default
+                        addCheckMailOnStartup(agentIdentifyName, enableManualCheck);
+                        addToManualCheck(agentIdentifyName, enableManualCheck);
+                    } else if (scheme == QLatin1String("pop")) {
+                        if (port > 0) {
+                            settings.insert(QStringLiteral("Port"), port);
+                        }
+                        bool found = false;
+                        const QString securityMethod = getSecurityMethod(listArgument, found);
+                        if (found) {
+                            if (securityMethod == QLatin1String("none")) {
+                                //Nothing
+                            } else if (securityMethod == QLatin1String("ssl-on-alternate-port")) {
+                                settings.insert(QStringLiteral("UseSSL"), true);
+                            } else {
+                                qCDebug(EVOLUTIONPLUGIN_LOG) << " security method unknown : " << path;
+                            }
+                        } else {
+                            settings.insert(QStringLiteral("UseTLS"), true);
+                        }
+
+                        if (intervalCheck) {
+                            settings.insert(QStringLiteral("IntervalCheckEnabled"), true);
+                        }
+                        if (interval > -1) {
+                            settings.insert(QStringLiteral("IntervalCheckInterval"), interval);
+                        }
+                        if (e.hasAttribute(QStringLiteral("keep-on-server")) && e.attribute(QStringLiteral("keep-on-server")) == QLatin1String("true")) {
+                            settings.insert(QStringLiteral("LeaveOnServer"), true);
+                        }
+                        addAuth(settings, QStringLiteral("AuthenticationMethod"), userName);
+                        const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
+                        //By default
+                        addCheckMailOnStartup(agentIdentifyName, enableManualCheck);
+                        addToManualCheck(agentIdentifyName, enableManualCheck);
+                    } else if (scheme == QLatin1String("spool") || scheme == QLatin1String("mbox")) {
+                        //mbox file
+                        settings.insert(QStringLiteral("Path"), path);
+                        settings.insert(QStringLiteral("DisplayName"), name);
+                        LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_mbox_resource"), name, settings);
+                    } else if (scheme == QLatin1String("maildir") || scheme == QLatin1String("spooldir")) {
+                        settings.insert(QStringLiteral("Path"), path);
+                        LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_maildir_resource"), name, settings);
+                    } else if (scheme == QLatin1String("nntp")) {
+                        //FIXME in the future
+                        qCDebug(EVOLUTIONPLUGIN_LOG) << " For the moment we can't import nntp resource";
+                    } else {
+                        qCDebug(EVOLUTIONPLUGIN_LOG) << " unknown scheme " << scheme;
+                    }
+                } else {
+                    qCDebug(EVOLUTIONPLUGIN_LOG) << " server tag unknown :" << serverTag;
+                }
+            }
+        } else if (tag == QLatin1String("transport")) {
+            if (e.hasAttribute(QStringLiteral("save-passwd")) && e.attribute(QStringLiteral("save-passwd")) == QLatin1String("true")) {
+                //TODO save to kwallet ?
+            }
+
+            MailTransport::Transport *transport = createTransport();
+            transport->setIdentifier(QStringLiteral("SMTP"));
+            for (QDomElement smtp = e.firstChildElement(); !smtp.isNull(); smtp = smtp.nextSiblingElement()) {
+                const QString smtpTag = smtp.tagName();
+                if (smtpTag == QLatin1String("url")) {
+                    qCDebug(EVOLUTIONPLUGIN_LOG) << " smtp.text() :" << smtp.text();
+                    QUrl smtpUrl(smtp.text());
+                    const QString scheme = smtpUrl.scheme();
+                    if (scheme != QLatin1String("sendmail")) {
+                        transport->setHost(smtpUrl.host());
+                        transport->setName(smtpUrl.host());
+                        //TODO setUserName :
+                        //transport->setRequiresAuthentication(true);
+                        //transport->setUserName(....);
+                        const int port = smtpUrl.port();
+                        if (port > 0) {
+                            transport->setPort(port);
+                        }
+
+                        const QString userName = smtpUrl.userInfo();
+                        bool found = false;
+                        const QString authMethod = getAuthMethod(userName, found);
+                        if (found) {
+                            if (authMethod == QLatin1String("PLAIN")) {
+                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN);
+                            } else if (authMethod == QLatin1String("NTLM")) {
+                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::NTLM);
+                            } else if (authMethod == QLatin1String("DIGEST-MD5")) {
+                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::DIGEST_MD5);
+                            } else if (authMethod == QLatin1String("CRAM-MD5")) {
+                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::CRAM_MD5);
+                            } else if (authMethod == QLatin1String("LOGIN")) {
+                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::LOGIN);
+                            } else if (authMethod == QLatin1String("GSSAPI")) {
+                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::GSSAPI);
+                            } else if (authMethod == QLatin1String("POPB4SMTP")) {
+                                transport->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::APOP); //????
+                            } else {
+                                qCDebug(EVOLUTIONPLUGIN_LOG) << " smtp auth method unknown " << authMethod;
+                            }
+                        }
+
+                        const QString path = smtpUrl.path();
+                        found = false;
+                        const QStringList listArgument = path.split(QLatin1Char(';'));
+                        const QString securityMethod = getSecurityMethod(listArgument, found);
+                        if (found) {
+                            if (securityMethod == QLatin1String("none")) {
+                                transport->setEncryption(MailTransport::Transport::EnumEncryption::None);
+                            } else if (securityMethod == QLatin1String("ssl-on-alternate-port")) {
+                                transport->setEncryption(MailTransport::Transport::EnumEncryption::SSL);
+                            } else {
+                                qCDebug(EVOLUTIONPLUGIN_LOG) << " security method unknown : " << path;
+                            }
+                        } else {
+                            transport->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
+                        }
+                    }
+                } else {
+                    qCDebug(EVOLUTIONPLUGIN_LOG) << " smtp tag unknown :" << smtpTag;
+                }
+            }
+            storeTransport(transport, true);
+        } else if (tag == QLatin1String("drafts-folder")) {
+            const QString selectedFolder = MailCommon::Util::convertFolderPathToCollectionStr(e.text().remove(QStringLiteral("folder://")));
+            newIdentity->setDrafts(selectedFolder);
+        } else if (tag == QLatin1String("sent-folder")) {
+            const QString selectedFolder = MailCommon::Util::convertFolderPathToCollectionStr(e.text().remove(QStringLiteral("folder://")));
+            newIdentity->setFcc(selectedFolder);
+        } else if (tag == QLatin1String("auto-cc")) {
+            if (e.hasAttribute(QStringLiteral("always")) && (e.attribute(QStringLiteral("always")) == QLatin1String("true"))) {
+                QDomElement recipient = e.firstChildElement();
+                const QString text = recipient.text();
+                newIdentity->setCc(text);
+            }
+        } else if (tag == QLatin1String("reply-to")) {
+            newIdentity->setReplyToAddr(e.text());
+        } else if (tag == QLatin1String("auto-bcc")) {
+            if (e.hasAttribute(QStringLiteral("always")) && (e.attribute(QStringLiteral("always")) == QLatin1String("true"))) {
+                QDomElement recipient = e.firstChildElement();
+                const QString text = recipient.text();
+                newIdentity->setBcc(text);
+            }
+        } else if (tag == QLatin1String("receipt-policy")) {
+            if (e.hasAttribute(QStringLiteral("policy"))) {
+                const QString policy = e.attribute(QStringLiteral("policy"));
+                //TODO
+            }
+        } else if (tag == QLatin1String("pgp")) {
+            if (e.hasAttribute(QStringLiteral("encrypt-to-self"))
+                && (e.attribute(QStringLiteral("encrypt-to-self")) == QLatin1String("true"))) {
+                //TODO
+            }
+            if (e.hasAttribute(QStringLiteral("always-trust"))
+                && (e.attribute(QStringLiteral("always-trust")) == QLatin1String("true"))) {
+                //TODO
+            }
+            if (e.hasAttribute(QStringLiteral("always-sign"))
+                && (e.attribute(QStringLiteral("always-sign")) == QLatin1String("true"))) {
+                //TODO
+            }
+            if (e.hasAttribute(QStringLiteral("no-imip-sign"))
+                && (e.attribute(QStringLiteral("no-imip-sign")) == QLatin1String("true"))) {
+                //TODO
+            }
+        } else if (tag == QLatin1String("smime")) {
+            if (e.hasAttribute(QStringLiteral("sign-default"))
+                && (e.attribute(QStringLiteral("sign-default")) == QLatin1String("true"))) {
+                //TODO
+            }
+            if (e.hasAttribute(QStringLiteral("encrypt-default"))
+                && (e.attribute(QStringLiteral("encrypt-default")) == QLatin1String("true"))) {
+                //TODO
+            }
+            if (e.hasAttribute(QStringLiteral("encrypt-to-self"))
+                && (e.attribute(QStringLiteral("encrypt-to-self")) == QLatin1String("true"))) {
+                //TODO
+            }
+            //TODO
+        } else {
+            qCDebug(EVOLUTIONPLUGIN_LOG) << " tag not know :" << tag;
+        }
+    }
+    storeIdentity(newIdentity);
+}
+
+QString EvolutionSettings::getSecurityMethod(const QStringList &listArgument, bool &found)
+{
+    found = false;
+    if (listArgument.isEmpty()) {
+        return QString();
+    }
+    for (const QString &str : listArgument) {
+        if (str.contains(QStringLiteral("security-method="))) {
+            const int index = str.indexOf(QLatin1String("security-method="));
+            if (index != -1) {
+                const QString securityMethod = str.right(str.length() - index - 16 /*security-method=*/);
+                found = true;
+                return securityMethod;
+            }
+        }
+    }
+    return QString();
+}
+
+QString EvolutionSettings::getAuthMethod(const QString &path, bool &found)
+{
+    const int index = path.indexOf(QLatin1String("auth="));
+    if (index != -1) {
+        const QString securityMethod = path.right(path.length() - index - 5 /*auth=*/);
+        found = true;
+        return securityMethod;
+    }
+    found = false;
+    return QString();
+}
+
+void EvolutionSettings::addAuth(QMap<QString, QVariant> &settings, const QString &argument, const QString &userName)
+{
+    bool found = false;
+    const QString authMethod = getAuthMethod(userName, found);
+    if (found) {
+        if (authMethod == QLatin1String("PLAIN")) {
+            settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::PLAIN);
+        } else if (authMethod == QLatin1String("NTLM")) {
+            settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::NTLM);
+        } else if (authMethod == QLatin1String("DIGEST-MD5")) {
+            settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::DIGEST_MD5);
+        } else if (authMethod == QLatin1String("CRAM-MD5")) {
+            settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::CRAM_MD5);
+        } else if (authMethod == QLatin1String("LOGIN")) {
+            settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::LOGIN);
+        } else if (authMethod == QLatin1String("POPB4SMTP")) {
+            settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::APOP);   //????
+        } else {
+            qCDebug(EVOLUTIONPLUGIN_LOG) << " smtp auth method unknown " << authMethod;
+        }
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionsettings.h akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionsettings.h
--- akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionsettings.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionsettings.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef EVOLUTIONSETTINGS_H
+#define EVOLUTIONSETTINGS_H
+
+#include <ImportWizard/AbstractSettings>
+#include <KIdentityManagement/kidentitymanagement/signature.h>
+#include <QString>
+
+class QDomElement;
+
+class EvolutionSettings : public AbstractSettings
+{
+public:
+    EvolutionSettings();
+    ~EvolutionSettings();
+    void loadAccount(const QString &filename);
+    void loadLdap(const QString &filename);
+private:
+    void readAccount(const QDomElement &account);
+    void readLdap(const QString &account);
+    void extractAccountInfo(const QString &info);
+    void readSignatures(const QDomElement &account);
+    void extractSignatureInfo(const QString &info);
+    QString getSecurityMethod(const QStringList &listArgument, bool &found);
+    QString getAuthMethod(const QString &path, bool &found);
+    void addAuth(QMap<QString, QVariant> &settings, const QString &argument, const QString &userName);
+
+    QMap<QString, KIdentityManagement::Signature> mMapSignature;
+};
+
+#endif /* EVOLUTIONSETTINGS_H */
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionutil.cpp akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionutil.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionutil.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionutil.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,51 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "evolutionutil.h"
+
+#include "evolutionv3plugin_debug.h"
+
+#include <QDomDocument>
+#include <QFile>
+
+bool EvolutionUtil::loadInDomDocument(QFile *file, QDomDocument &doc)
+{
+    QString errorMsg;
+    int errorRow;
+    int errorCol;
+    if (!doc.setContent(file, &errorMsg, &errorRow, &errorCol)) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << "Unable to load document.Parse error in line " << errorRow
+                                     << ", col " << errorCol << ": " << errorMsg;
+        return false;
+    }
+    return true;
+}
+
+bool EvolutionUtil::loadInDomDocument(const QString &file, QDomDocument &doc)
+{
+    QString errorMsg;
+    int errorRow;
+    int errorCol;
+    if (!doc.setContent(file, &errorMsg, &errorRow, &errorCol)) {
+        qCDebug(EVOLUTIONPLUGIN_LOG) << "Unable to load document.Parse error in line " << errorRow
+                                     << ", col " << errorCol << ": " << errorMsg;
+        return false;
+    }
+    return true;
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionutil.h akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionutil.h
--- akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionutil.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionutil.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef EVOLUTIONUTIL_H
+#define EVOLUTIONUTIL_H
+#include <QString>
+class QFile;
+class QDomDocument;
+
+namespace EvolutionUtil {
+bool loadInDomDocument(QFile *file, QDomDocument &doc);
+bool loadInDomDocument(const QString &file, QDomDocument &doc);
+}
+
+#endif // EVOLUTIONUTIL_H
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionv3importdata.cpp akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionv3importdata.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionv3importdata.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionv3importdata.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,132 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "evolutionv3importdata.h"
+#include "evolutionsettings.h"
+#include "evolutioncalendar.h"
+#include "evolutionaddressbook.h"
+#include "mailimporter/filterevolution_v3.h"
+#include "mailimporter/filterinfo.h"
+
+#include "MailCommon/FilterImporterExporter"
+#include <kpluginfactory.h>
+
+#include <KLocalizedString>
+
+#include <QDir>
+
+K_PLUGIN_FACTORY_WITH_JSON(Evolutionv3ImporterFactory, "evolutionv3importer.json", registerPlugin<Evolutionv3ImportData>();
+                           )
+
+Evolutionv3ImportData::Evolutionv3ImportData(QObject *parent, const QList<QVariant> &)
+    : LibImportWizard::AbstractImporter(parent)
+{
+    mPath = MailImporter::FilterEvolution_v3::defaultSettingsPath();
+}
+
+Evolutionv3ImportData::~Evolutionv3ImportData()
+{
+}
+
+bool Evolutionv3ImportData::foundMailer() const
+{
+    QDir directory(mPath);
+    if (directory.exists()) {
+        return true;
+    }
+    return false;
+}
+
+QString Evolutionv3ImportData::name() const
+{
+    return QStringLiteral("Evolution 3.x");
+}
+
+bool Evolutionv3ImportData::importSettings()
+{
+    const QString accountFile = QDir::homePath() + QLatin1String("/.gconf/apps/evolution/mail/%gconf.xml");
+    if (QFileInfo::exists(accountFile)) {
+        EvolutionSettings account;
+        account.setAbstractDisplayInfo(mAbstractDisplayInfo);
+        account.loadAccount(accountFile);
+        const QString ldapFile = QDir::homePath() + QLatin1String("/.gconf/apps/evolution/addressbook/%gconf.xml");
+        if (QFileInfo::exists(ldapFile)) {
+            account.loadLdap(ldapFile);
+        }
+    } else {
+        addImportSettingsInfo(i18n("Evolution settings not found."));
+    }
+    return true;
+}
+
+bool Evolutionv3ImportData::importMails()
+{
+    MailImporter::FilterEvolution_v3 evolution;
+    initializeFilter(evolution);
+    evolution.filterInfo()->setStatusMessage(i18n("Import in progress"));
+    const QString mailsPath = mPath;
+    QDir directory(mailsPath);
+    if (directory.exists()) {
+        evolution.importMails(mailsPath);
+    } else {
+        evolution.import();
+    }
+    evolution.filterInfo()->setStatusMessage(i18n("Import finished"));
+    return true;
+}
+
+bool Evolutionv3ImportData::importFilters()
+{
+    const QString filterPath = QDir::homePath() + QLatin1String("/.config/evolution/mail/filter.xml");
+    return addFilters(filterPath, MailCommon::FilterImporterExporter::EvolutionFilter);
+}
+
+bool Evolutionv3ImportData::importAddressBook()
+{
+    EvolutionAddressBook addressbook;
+    addressbook.setAbstractDisplayInfo(mAbstractDisplayInfo);
+    addressbook.exportEvolutionAddressBook();
+    return true;
+}
+
+bool Evolutionv3ImportData::importCalendar()
+{
+    const QString calendarFile = QDir::homePath() + QLatin1String("/.gconf/apps/evolution/calendar/%gconf.xml");
+    if (QFileInfo::exists(calendarFile)) {
+        EvolutionCalendar calendar;
+        calendar.setAbstractDisplayInfo(mAbstractDisplayInfo);
+        calendar.loadCalendar(calendarFile);
+    } else {
+        addImportCalendarInfo(i18n("Evolution calendar not found."));
+    }
+    return true;
+}
+
+LibImportWizard::AbstractImporter::TypeSupportedOptions Evolutionv3ImportData::supportedOption()
+{
+    TypeSupportedOptions options;
+    options |= LibImportWizard::AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::Filters;
+    options |= LibImportWizard::AbstractImporter::Settings;
+    options |= LibImportWizard::AbstractImporter::Calendars;
+    options |= LibImportWizard::AbstractImporter::AddressBooks;
+    return options;
+}
+
+#include "evolutionv3importdata.moc"
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionv3importdata.h akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionv3importdata.h
--- akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionv3importdata.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionv3importdata.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#ifndef Evolutionv3ImportData_H
+#define Evolutionv3ImportData_H
+
+#include <ImportWizard/AbstractImporter>
+
+class Evolutionv3ImportData : public LibImportWizard::AbstractImporter
+{
+public:
+    explicit Evolutionv3ImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
+    ~Evolutionv3ImportData();
+
+    TypeSupportedOptions supportedOption() override;
+    bool foundMailer() const override;
+
+    bool importSettings() override;
+    bool importMails() override;
+    bool importFilters() override;
+    bool importAddressBook() override;
+    bool importCalendar() override;
+
+    QString name() const override;
+};
+
+#endif /* Evolutionv3ImportData_H */
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionv3importer.json akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionv3importer.json
--- akonadi-import-wizard-17.04.3/src/plugins/evolutionv3/evolutionv3importer.json	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/evolutionv3/evolutionv3importer.json	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,32 @@
+{
+    "KPlugin": {
+        "Id": "evolution3importer",
+        "Name": "Evolution3 Importer",
+        "Name[ca@valencia]": "Importador de l'Evolution3",
+        "Name[ca]": "Importador de l'Evolution3",
+        "Name[cs]": "Importér Evolution3",
+        "Name[de]": "Import-Modul für Evolution",
+        "Name[es]": "Importador Evolution3",
+        "Name[fi]": "Evolution3-tuonti",
+        "Name[fr]": "Import Evolution3",
+        "Name[it]": "Importatore da Evolution3",
+        "Name[nl]": "Evolution3-importeur",
+        "Name[pl]": "Importer Evolution3",
+        "Name[pt]": "Importador do Evolution3",
+        "Name[sk]": "Importér Evolution3",
+        "Name[sl]": "Uvoznik iz programa Evolution3",
+        "Name[sr@ijekavian]": "Увозник из Еволуције 3",
+        "Name[sr@ijekavianlatin]": "Uvoznik iz Evolucije 3",
+        "Name[sr@latin]": "Uvoznik iz Evolucije 3",
+        "Name[sr]": "Увозник из Еволуције 3",
+        "Name[sv]": "Evolution3-importverktyg",
+        "Name[tr]": "Evolution3 İçe Aktarıcı",
+        "Name[uk]": "Засіб імпортування з Evolution3",
+        "Name[x-test]": "xxEvolution3 Importerxx",
+        "Name[zh_CN]": "Evolution3 导入器",
+        "ServiceTypes": [
+            "ImportWizard/PluginMailImporter"
+        ],
+        "Version": "1.0"
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/icedove/CMakeLists.txt akonadi-import-wizard-17.08.3/src/plugins/icedove/CMakeLists.txt
--- akonadi-import-wizard-17.04.3/src/plugins/icedove/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/icedove/CMakeLists.txt	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,24 @@
+set(icedoveimporter_SRCS
+    icedoveimportdata.cpp
+    ../thunderbird/thunderbirdaddressbook.cpp
+    ../thunderbird/thunderbirdsettings.cpp
+    ../thunderbird/addressbook/MorkParser.cpp
+
+    )
+
+ecm_qt_declare_logging_category(icedoveimporter_SRCS HEADER thunderbirdplugin_debug.h
+    IDENTIFIER THUNDERBIRDPLUGIN_LOG CATEGORY_NAME org.kde.pim.importwizard.thunderbirdplugin)
+kcoreaddons_add_plugin(icedoveimporterplugin JSON icedoveimporter.json SOURCES
+    ${icedoveimporter_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(icedoveimporterplugin
+    KPim::ImportWizard
+    KF5::XmlGui
+    KF5::I18n
+    KF5::Contacts
+    KF5::MailImporterAkonadi
+    KF5::MailTransport
+    KF5::IdentityManagement
+    KF5::MailCommon
+    )
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/icedove/icedoveimportdata.cpp akonadi-import-wizard-17.08.3/src/plugins/icedove/icedoveimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/icedove/icedoveimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/icedove/icedoveimportdata.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,147 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "icedoveimportdata.h"
+
+#include "abstractdisplayinfo.h"
+#include "../thunderbird/thunderbirdsettings.h"
+#include "../thunderbird/thunderbirdaddressbook.h"
+
+#include "mailimporter/filtericedove.h"
+#include "mailimporter/filterinfo.h"
+#include "MailCommon/FilterImporterExporter"
+
+#include <KLocalizedString>
+#include <kpluginfactory.h>
+#include <KConfig>
+
+#include <QDir>
+
+IcedoveImportData::IcedoveImportData(QObject *parent, const QList<QVariant> &)
+    : LibImportWizard::AbstractImporter(parent)
+{
+    mPath = MailImporter::FilterIcedove::defaultSettingsPath();
+}
+
+IcedoveImportData::~IcedoveImportData()
+{
+}
+
+QString IcedoveImportData::defaultProfile()
+{
+    if (mDefaultProfile.isEmpty()) {
+        mDefaultProfile = MailImporter::FilterThunderbird::defaultProfile(mPath, mAbstractDisplayInfo->parentWidget());
+    }
+    return mDefaultProfile;
+}
+
+bool IcedoveImportData::foundMailer() const
+{
+    QDir directory(mPath);
+    if (directory.exists()) {
+        return true;
+    }
+    return false;
+}
+
+bool IcedoveImportData::importAddressBook()
+{
+    const QDir addressbookDir(mPath + defaultProfile());
+    ThunderBirdAddressBook account(addressbookDir);
+    account.setAbstractDisplayInfo(mAbstractDisplayInfo);
+    account.importAddressBook();
+    return true;
+}
+
+QString IcedoveImportData::name() const
+{
+    return QStringLiteral("Icedove");
+}
+
+bool IcedoveImportData::importSettings()
+{
+    const QString accountFile = mPath + defaultProfile() + QLatin1String("/prefs.js");
+    if (QFileInfo::exists(accountFile)) {
+        ThunderbirdSettings account(accountFile);
+        account.setAbstractDisplayInfo(mAbstractDisplayInfo);
+        account.importSettings();
+    } else {
+        addImportSettingsInfo(i18n("Icedove settings not found."));
+    }
+    return true;
+}
+
+bool IcedoveImportData::importMails()
+{
+    //* This should be usually ~/.icedove/xxxx.default/Mail/Local Folders/
+    MailImporter::FilterThunderbird thunderbird;
+    initializeFilter(thunderbird);
+    thunderbird.filterInfo()->setStatusMessage(i18n("Import in progress"));
+    const QString mailsPath = mPath + defaultProfile() + QLatin1String("/Mail/Local Folders/");
+    QDir directory(mailsPath);
+    if (directory.exists()) {
+        thunderbird.importMails(mailsPath);
+    } else {
+        thunderbird.import();
+    }
+    thunderbird.filterInfo()->setStatusMessage(i18n("Import finished"));
+    return true;
+}
+
+bool IcedoveImportData::importFilters()
+{
+    const QString path(mPath + defaultProfile());
+    QDir dir(path);
+    bool filtersAdded = false;
+    const QStringList subDir = dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
+    if (subDir.isEmpty()) {
+        return true;
+    }
+
+    for (const QString &mailPath : subDir) {
+        const QString subMailPath(path + QLatin1Char('/') + mailPath);
+        QDir dirMail(subMailPath);
+        const QStringList subDirMail = dirMail.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
+        bool foundFilterFile = false;
+        for (const QString &file : subDirMail) {
+            const QString filterFile(subMailPath + QLatin1Char('/') + file + QLatin1String("/msgFilterRules.dat"));
+            if (QFileInfo::exists(filterFile)) {
+                foundFilterFile = true;
+                const bool added = addFilters(filterFile, MailCommon::FilterImporterExporter::IcedoveFilter);
+                if (!filtersAdded && added) {
+                    filtersAdded = true;
+                }
+            }
+        }
+        if (!foundFilterFile) {
+            return true;
+        }
+    }
+    return filtersAdded;
+}
+
+LibImportWizard::AbstractImporter::TypeSupportedOptions IcedoveImportData::supportedOption()
+{
+    TypeSupportedOptions options;
+    options |= LibImportWizard::AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::Filters;
+    options |= LibImportWizard::AbstractImporter::Settings;
+    options |= LibImportWizard::AbstractImporter::AddressBooks;
+    return options;
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/icedove/icedoveimportdata.h akonadi-import-wizard-17.08.3/src/plugins/icedove/icedoveimportdata.h
--- akonadi-import-wizard-17.04.3/src/plugins/icedove/icedoveimportdata.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/icedove/icedoveimportdata.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#ifndef IcedoveImportData_H
+#define IcedoveImportData_H
+
+#include <ImportWizard/AbstractImporter>
+
+class IcedoveImportData : public LibImportWizard::AbstractImporter
+{
+public:
+    explicit IcedoveImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
+    ~IcedoveImportData();
+
+    TypeSupportedOptions supportedOption() override;
+    bool foundMailer() const override;
+
+    bool importSettings() override;
+    bool importMails() override;
+    bool importFilters() override;
+    bool importAddressBook() override;
+    QString name() const override;
+private:
+    QString defaultProfile();
+
+    QString mDefaultProfile;
+};
+
+#endif /* IcedoveImportData_H */
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/icedove/icedoveimporter.json akonadi-import-wizard-17.08.3/src/plugins/icedove/icedoveimporter.json
--- akonadi-import-wizard-17.04.3/src/plugins/icedove/icedoveimporter.json	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/icedove/icedoveimporter.json	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,32 @@
+{
+    "KPlugin": {
+        "Id": "icedoveimporter",
+        "Name": "Icedove Importer",
+        "Name[ca@valencia]": "Importador de l'Icedove",
+        "Name[ca]": "Importador de l'Icedove",
+        "Name[cs]": "Importér Icedove",
+        "Name[de]": "Import-Modul für Icedove",
+        "Name[es]": "Importador Icedove",
+        "Name[fi]": "Icedove-tuonti",
+        "Name[fr]": "Import Icedove",
+        "Name[it]": "Importatore da Icedove",
+        "Name[nl]": "Icedove-importeur",
+        "Name[pl]": "Importer Icedove",
+        "Name[pt]": "Importador do Icedove",
+        "Name[sk]": "Importér Icedove",
+        "Name[sl]": "Uvoznik iz programa Icedove",
+        "Name[sr@ijekavian]": "Увозник из Ледоголубице",
+        "Name[sr@ijekavianlatin]": "Uvoznik iz Ledogolubice",
+        "Name[sr@latin]": "Uvoznik iz Ledogolubice",
+        "Name[sr]": "Увозник из Ледоголубице",
+        "Name[sv]": "Icedove-importverktyg",
+        "Name[tr]": "Icedove İçe Aktarıcı",
+        "Name[uk]": "Засіб імпортування з Icedove",
+        "Name[x-test]": "xxIcedove Importerxx",
+        "Name[zh_CN]": "Icedove 导入器",
+        "ServiceTypes": [
+            "ImportWizard/PluginMailImporter"
+        ],
+        "Version": "1.0"
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/seamonkey/CMakeLists.txt akonadi-import-wizard-17.08.3/src/plugins/seamonkey/CMakeLists.txt
--- akonadi-import-wizard-17.04.3/src/plugins/seamonkey/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/seamonkey/CMakeLists.txt	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,24 @@
+set(seamonkeyimporter_SRCS
+    seamonkeyimportdata.cpp
+    ../thunderbird/thunderbirdaddressbook.cpp
+    ../thunderbird/thunderbirdsettings.cpp
+    ../thunderbird/addressbook/MorkParser.cpp
+
+    )
+
+ecm_qt_declare_logging_category(seamonkeyimporter_SRCS HEADER thunderbirdplugin_debug.h
+    IDENTIFIER THUNDERBIRDPLUGIN_LOG CATEGORY_NAME org.kde.pim.importwizard.thunderbirdplugin)
+kcoreaddons_add_plugin(seamonkeyimporterplugin JSON seamonkeyimporter.json SOURCES
+    ${seamonkeyimporter_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(seamonkeyimporterplugin
+    KPim::ImportWizard
+    KF5::XmlGui
+    KF5::I18n
+    KF5::Contacts
+    KF5::MailImporterAkonadi
+    KF5::MailTransport
+    KF5::IdentityManagement
+    KF5::MailCommon
+    )
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/seamonkey/seamonkeyimportdata.cpp akonadi-import-wizard-17.08.3/src/plugins/seamonkey/seamonkeyimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/seamonkey/seamonkeyimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/seamonkey/seamonkeyimportdata.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,147 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "seamonkeyimportdata.h"
+
+#include "abstractdisplayinfo.h"
+#include "../thunderbird/thunderbirdsettings.h"
+#include "../thunderbird/thunderbirdaddressbook.h"
+
+#include "mailimporter/filterseamonkey.h"
+#include "mailimporter/filterinfo.h"
+#include "MailCommon/FilterImporterExporter"
+
+#include <KLocalizedString>
+#include <kpluginfactory.h>
+#include <KConfig>
+
+#include <QDir>
+
+SeaMonkeyImportData::SeaMonkeyImportData(QObject *parent, const QList<QVariant> &)
+    : LibImportWizard::AbstractImporter(parent)
+{
+    mPath = MailImporter::FilterSeaMonkey::defaultSettingsPath();
+}
+
+SeaMonkeyImportData::~SeaMonkeyImportData()
+{
+}
+
+QString SeaMonkeyImportData::defaultProfile()
+{
+    if (mDefaultProfile.isEmpty()) {
+        mDefaultProfile = MailImporter::FilterThunderbird::defaultProfile(mPath, mAbstractDisplayInfo->parentWidget());
+    }
+    return mDefaultProfile;
+}
+
+bool SeaMonkeyImportData::foundMailer() const
+{
+    QDir directory(mPath);
+    if (directory.exists()) {
+        return true;
+    }
+    return false;
+}
+
+bool SeaMonkeyImportData::importAddressBook()
+{
+    const QDir addressbookDir(mPath + defaultProfile());
+    ThunderBirdAddressBook account(addressbookDir);
+    account.setAbstractDisplayInfo(mAbstractDisplayInfo);
+    account.importAddressBook();
+    return true;
+}
+
+QString SeaMonkeyImportData::name() const
+{
+    return QStringLiteral("SeaMonkey");
+}
+
+bool SeaMonkeyImportData::importSettings()
+{
+    const QString accountFile = mPath + defaultProfile() + QLatin1String("/prefs.js");
+    if (QFileInfo::exists(accountFile)) {
+        ThunderbirdSettings account(accountFile);
+        account.setAbstractDisplayInfo(mAbstractDisplayInfo);
+        account.importSettings();
+    } else {
+        addImportSettingsInfo(i18n("SeaMonkey settings not found."));
+    }
+    return true;
+}
+
+bool SeaMonkeyImportData::importMails()
+{
+    //* This should be usually ~/.mozilla/seamonkey/xxxx.default/Mail/Local Folders/
+    MailImporter::FilterThunderbird thunderbird;
+    initializeFilter(thunderbird);
+    thunderbird.filterInfo()->setStatusMessage(i18n("Import in progress"));
+    const QString mailsPath = mPath + defaultProfile() + QLatin1String("/Mail/Local Folders/");
+    QDir directory(mailsPath);
+    if (directory.exists()) {
+        thunderbird.importMails(mailsPath);
+    } else {
+        thunderbird.import();
+    }
+    thunderbird.filterInfo()->setStatusMessage(i18n("Import finished"));
+    return true;
+}
+
+bool SeaMonkeyImportData::importFilters()
+{
+    const QString path(mPath + defaultProfile());
+    QDir dir(path);
+    bool filtersAdded = false;
+    const QStringList subDir = dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
+    if (subDir.isEmpty()) {
+        return true;
+    }
+
+    for (const QString &mailPath : subDir) {
+        const QString subMailPath(path + QLatin1Char('/') + mailPath);
+        QDir dirMail(subMailPath);
+        const QStringList subDirMail = dirMail.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
+        bool foundFilterFile = false;
+        for (const QString &file : subDirMail) {
+            const QString filterFile(subMailPath + QLatin1Char('/') + file + QLatin1String("/msgFilterRules.dat"));
+            if (QFileInfo::exists(filterFile)) {
+                foundFilterFile = true;
+                const bool added = addFilters(filterFile, MailCommon::FilterImporterExporter::SeaMonkeyFilter);
+                if (!filtersAdded && added) {
+                    filtersAdded = true;
+                }
+            }
+        }
+        if (!foundFilterFile) {
+            return true;
+        }
+    }
+    return filtersAdded;
+}
+
+LibImportWizard::AbstractImporter::TypeSupportedOptions SeaMonkeyImportData::supportedOption()
+{
+    TypeSupportedOptions options;
+    options |= LibImportWizard::AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::Filters;
+    options |= LibImportWizard::AbstractImporter::Settings;
+    options |= LibImportWizard::AbstractImporter::AddressBooks;
+    return options;
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/seamonkey/seamonkeyimportdata.h akonadi-import-wizard-17.08.3/src/plugins/seamonkey/seamonkeyimportdata.h
--- akonadi-import-wizard-17.04.3/src/plugins/seamonkey/seamonkeyimportdata.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/seamonkey/seamonkeyimportdata.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   Copyright (C) 2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#ifndef SeaMonkeyImportData_H
+#define SeaMonkeyImportData_H
+
+#include <ImportWizard/AbstractImporter>
+
+class SeaMonkeyImportData : public LibImportWizard::AbstractImporter
+{
+public:
+    explicit SeaMonkeyImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
+    ~SeaMonkeyImportData();
+
+    TypeSupportedOptions supportedOption() override;
+    bool foundMailer() const override;
+
+    bool importSettings() override;
+    bool importMails() override;
+    bool importFilters() override;
+    bool importAddressBook() override;
+    QString name() const override;
+private:
+    QString defaultProfile();
+
+    QString mDefaultProfile;
+};
+
+#endif /* SeaMonkeyImportData_H */
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/seamonkey/seamonkeyimporter.json akonadi-import-wizard-17.08.3/src/plugins/seamonkey/seamonkeyimporter.json
--- akonadi-import-wizard-17.04.3/src/plugins/seamonkey/seamonkeyimporter.json	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/seamonkey/seamonkeyimporter.json	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,31 @@
+{
+    "KPlugin": {
+        "Id": "seamonkeyimporter",
+        "Name": "SeaMonkey Importer",
+        "Name[ca@valencia]": "Importador del SeaMonkey",
+        "Name[ca]": "Importador del SeaMonkey",
+        "Name[cs]": "Importér SeaMonkey",
+        "Name[de]": "Import-Modul für SeaMonkey",
+        "Name[es]": "Importador SeaMonkey",
+        "Name[fr]": "Import SeaMonkey",
+        "Name[it]": "Importatore da SeaMonkey",
+        "Name[nl]": "SeaMonkey-importeur",
+        "Name[pl]": "Importer SeaMonkey",
+        "Name[pt]": "Importador do SeaMonkey",
+        "Name[sk]": "Importér SeaMonkey",
+        "Name[sl]": "Uvoznik iz programa SeaMonkey",
+        "Name[sr@ijekavian]": "Увозник из Симанкија",
+        "Name[sr@ijekavianlatin]": "Uvoznik iz SeaMonkeyja",
+        "Name[sr@latin]": "Uvoznik iz SeaMonkeyja",
+        "Name[sr]": "Увозник из Симанкија",
+        "Name[sv]": "SeaMonkey-importverktyg",
+        "Name[tr]": "SeaMonkey İçe Aktarıcı",
+        "Name[uk]": "Засіб імпортування з SeaMonkey",
+        "Name[x-test]": "xxSeaMonkey Importerxx",
+        "Name[zh_CN]": "SeaMonkey 导入器",
+        "ServiceTypes": [
+            "ImportWizard/PluginMailImporter"
+        ],
+        "Version": "1.0"
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/sylpheed/CMakeLists.txt akonadi-import-wizard-17.08.3/src/plugins/sylpheed/CMakeLists.txt
--- akonadi-import-wizard-17.04.3/src/plugins/sylpheed/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/sylpheed/CMakeLists.txt	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,23 @@
+set(sylpheedimporter_SRCS
+    sylpheedaddressbook.cpp
+    sylpheedimportdata.cpp
+    sylpheedsettings.cpp
+    sylpheedsettingsutils.cpp
+    )
+ecm_qt_declare_logging_category(sylpheedimporter_SRCS HEADER sylpheedplugin_debug.h
+    IDENTIFIER SYLPHEEDPLUGIN_LOG CATEGORY_NAME org.kde.pim.importwizard.sylpheedplugin)
+
+kcoreaddons_add_plugin(sylpheedimporterplugin JSON sylpheedimporter.json SOURCES
+    ${sylpheedimporter_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(sylpheedimporterplugin
+    KPim::ImportWizard
+    KF5::XmlGui
+    KF5::I18n
+    KF5::Contacts
+    KF5::MailImporterAkonadi
+    KF5::MailTransport
+    KF5::IdentityManagement
+    KF5::MailCommon
+    )
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedaddressbook.cpp akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedaddressbook.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,184 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "sylpheedaddressbook.h"
+#include <KContacts/Addressee>
+#include <kcontacts/contactgroup.h>
+
+#include "sylpheedplugin_debug.h"
+#include <KLocalizedString>
+
+#include <QDir>
+#include <QDomDocument>
+
+SylpheedAddressBook::SylpheedAddressBook(const QDir &dir)
+    : mDir(dir)
+{
+}
+
+SylpheedAddressBook::~SylpheedAddressBook()
+{
+}
+
+void SylpheedAddressBook::importAddressBook()
+{
+    const QStringList files = mDir.entryList(QStringList(QStringLiteral("addrbook-[0-9]*.xml")), QDir::Files, QDir::Name);
+    if (files.isEmpty()) {
+        addAddressBookImportInfo(i18n("No addressbook found"));
+    } else {
+        for (const QString &file : files) {
+            readAddressBook(mDir.path() + QLatin1Char('/') + file);
+        }
+    }
+    cleanUp();
+}
+
+void SylpheedAddressBook::readAddressBook(const QString &filename)
+{
+    QFile file(filename);
+    //qCDebug(SYLPHEEDPLUGIN_LOG)<<" import filename :"<<filename;
+    if (!file.open(QIODevice::ReadOnly)) {
+        qCDebug(SYLPHEEDPLUGIN_LOG) << " We can't open file" << filename;
+        return;
+    }
+    QString errorMsg;
+    int errorRow;
+    int errorCol;
+    QDomDocument doc;
+    if (!doc.setContent(&file, &errorMsg, &errorRow, &errorCol)) {
+        qCDebug(SYLPHEEDPLUGIN_LOG) << "Unable to load document.Parse error in line " << errorRow
+                                    << ", col " << errorCol << ": " << errorMsg;
+        return;
+    }
+    QDomElement domElement = doc.documentElement();
+
+    if (domElement.isNull()) {
+        qCDebug(SYLPHEEDPLUGIN_LOG) << "addressbook not found";
+        return;
+    }
+
+    QDomElement e = domElement.firstChildElement();
+    if (e.isNull()) {
+        addAddressBookImportError(i18n("No contact found in %1", filename));
+        return;
+    }
+
+    for (; !e.isNull(); e = e.nextSiblingElement()) {
+        //TODO ?? const QString name = e.attribute(QStringLiteral("name"));
+
+        const QString tag = e.tagName();
+        if (tag == QLatin1String("person")) {
+            KContacts::Addressee contact;
+            //uid="333304265" first-name="dd" last-name="ccc" nick-name="" cn="laurent"
+            QString uidPerson;
+            if (e.hasAttribute(QStringLiteral("uid"))) {
+                uidPerson = e.attribute(QStringLiteral("uid"));
+            }
+            if (e.hasAttribute(QStringLiteral("first-name"))) {
+                contact.setName(e.attribute(QStringLiteral("first-name")));
+            }
+            if (e.hasAttribute(QStringLiteral("last-name"))) {
+                contact.setFamilyName(e.attribute(QStringLiteral("last-name")));
+            }
+            if (e.hasAttribute(QStringLiteral("nick-name"))) {
+                contact.setNickName(e.attribute(QStringLiteral("nick-name")));
+            }
+            if (e.hasAttribute(QStringLiteral("cn"))) {
+                contact.setFormattedName(e.attribute(QStringLiteral("cn")));
+            }
+            QStringList uidAddress;
+            for (QDomElement addressElement = e.firstChildElement(); !addressElement.isNull(); addressElement = addressElement.nextSiblingElement()) {
+                const QString addressTag = addressElement.tagName();
+                if (addressTag == QLatin1String("address-list")) {
+                    QStringList emails;
+                    for (QDomElement addresslist = addressElement.firstChildElement(); !addresslist.isNull(); addresslist = addresslist.nextSiblingElement()) {
+                        const QString tagAddressList = addresslist.tagName();
+                        if (tagAddressList == QLatin1String("address")) {
+                            if (addresslist.hasAttribute(QStringLiteral("email"))) {
+                                emails << addresslist.attribute(QStringLiteral("email"));
+                            } else if (addresslist.hasAttribute(QStringLiteral("alias"))) {
+                                //TODO:
+                            } else if (addresslist.hasAttribute(QStringLiteral("uid"))) {
+                                uidAddress << addresslist.attribute(QStringLiteral("uid"));
+                            }
+                        } else {
+                            qCDebug(SYLPHEEDPLUGIN_LOG) << " tagAddressList unknown :" << tagAddressList;
+                        }
+                    }
+                    if (!emails.isEmpty()) {
+                        contact.setEmails(emails);
+                    }
+                } else if (addressTag == QLatin1String("attribute-list")) {
+                    for (QDomElement attributelist = addressElement.firstChildElement(); !attributelist.isNull(); attributelist = attributelist.nextSiblingElement()) {
+                        const QString tagAttributeList = attributelist.tagName();
+                        if (tagAttributeList == QLatin1String("attribute")) {
+                            if (attributelist.hasAttribute(QStringLiteral("name"))) {
+                                const QString name = attributelist.attribute(QStringLiteral("name"));
+                                const QString value = attributelist.text();
+                                contact.insertCustom(QStringLiteral("KADDRESSBOOK"), name, value);
+                            }
+                        } else {
+                            qCDebug(SYLPHEEDPLUGIN_LOG) << "tagAttributeList not implemented " << tagAttributeList;
+                        }
+                    }
+                } else {
+                    qCDebug(SYLPHEEDPLUGIN_LOG) << " addressTag unknown :" << addressTag;
+                }
+            }
+            if (!mAddressBookUid.contains(uidPerson)) {
+                mAddressBookUid.insert(uidPerson, uidAddress);
+            } else {
+                qCDebug(SYLPHEEDPLUGIN_LOG) << " problem uidPerson already stored" << uidPerson;
+            }
+            addImportContactNote(contact, QStringLiteral("Sylpheed"));
+            createContact(contact);
+        } else if (tag == QLatin1String("group")) {
+            QString name = e.attribute(QStringLiteral("name"));
+            KContacts::ContactGroup group(name);
+            //TODO: create Group
+            for (QDomElement groupElement = e.firstChildElement(); !groupElement.isNull(); groupElement = groupElement.nextSiblingElement()) {
+                const QString groupTag = groupElement.tagName();
+                if (groupTag == QLatin1String("member-list")) {
+                    for (QDomElement memberlist = groupElement.firstChildElement(); !memberlist.isNull(); memberlist = memberlist.nextSiblingElement()) {
+                        const QString tagMemberList = memberlist.tagName();
+                        if (tagMemberList == QLatin1String("member")) {
+                            QString pid;
+                            QString eid;
+                            if (memberlist.hasAttribute(QStringLiteral("pid"))) {
+                                pid = memberlist.attribute(QStringLiteral("pid"));
+                            }
+                            if (memberlist.hasAttribute(QStringLiteral("eid"))) {
+                                eid = memberlist.attribute(QStringLiteral("eid"));
+                            }
+                            if (!pid.isEmpty() && !eid.isEmpty()) {
+                                //TODO
+                            } else {
+                                qCDebug(SYLPHEEDPLUGIN_LOG) << " Problem with group" << name;
+                            }
+                            //TODO
+                        }
+                    }
+                }
+            }
+            createGroup(group);
+        } else {
+            qCDebug(SYLPHEEDPLUGIN_LOG) << " SylpheedAddressBook::readAddressBook  tag unknown :" << tag;
+        }
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedaddressbook.h akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedaddressbook.h
--- akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedaddressbook.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedaddressbook.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef SYLPHEEDADDRESSBOOK_H
+#define SYLPHEEDADDRESSBOOK_H
+
+#include <ImportWizard/AbstractAddressBook>
+#include <QHash>
+#include <QDir>
+class QString;
+
+class SylpheedAddressBook : public LibImportWizard::AbstractAddressBook
+{
+    Q_OBJECT
+public:
+    explicit SylpheedAddressBook(const QDir &dir);
+    ~SylpheedAddressBook();
+
+    void importAddressBook();
+private:
+    void readAddressBook(const QString &filename);
+    QHash<QString, QStringList > mAddressBookUid;
+    QDir mDir;
+};
+
+#endif /* SYLPHEEDADDRESSBOOK_H */
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedimportdata.cpp akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedimportdata.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,114 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "sylpheedimportdata.h"
+#include "mailimporter/filtersylpheed.h"
+#include "mailimporter/filterinfo.h"
+
+#include "MailCommon/FilterImporterExporter"
+
+#include "sylpheedsettings.h"
+#include "sylpheedaddressbook.h"
+
+#include <KLocalizedString>
+#include <kpluginfactory.h>
+#include <QDir>
+
+K_PLUGIN_FACTORY_WITH_JSON(SylpheedImporterFactory, "sylpheedimporter.json", registerPlugin<SylpheedImportData>();
+                           )
+
+SylpheedImportData::SylpheedImportData(QObject *parent, const QList<QVariant> &)
+    : LibImportWizard::AbstractImporter(parent)
+{
+    mPath = MailImporter::FilterSylpheed::defaultSettingsPath();
+}
+
+SylpheedImportData::~SylpheedImportData()
+{
+}
+
+bool SylpheedImportData::foundMailer() const
+{
+    QDir directory(mPath);
+    if (directory.exists()) {
+        return true;
+    }
+    return false;
+}
+
+QString SylpheedImportData::name() const
+{
+    return QStringLiteral("Sylpheed");
+}
+
+bool SylpheedImportData::importSettings()
+{
+    const QString accountFile = mPath + QLatin1String("/accountrc");
+    if (QFileInfo::exists(accountFile)) {
+        SylpheedSettings account;
+        account.setAbstractDisplayInfo(mAbstractDisplayInfo);
+        account.importSettings(accountFile, mPath);
+    } else {
+        addImportSettingsInfo(i18n("Sylpheed settings not found."));
+    }
+    return true;
+}
+
+bool SylpheedImportData::importMails()
+{
+    MailImporter::FilterSylpheed sylpheed;
+    initializeFilter(sylpheed);
+    sylpheed.filterInfo()->setStatusMessage(i18n("Import in progress"));
+    const QString mailsPath = sylpheed.localMailDirPath();
+    QDir directory(mailsPath);
+    if (directory.exists()) {
+        sylpheed.importMails(mailsPath);
+    } else {
+        sylpheed.import();
+    }
+    sylpheed.filterInfo()->setStatusMessage(i18n("Import finished"));
+    return true;
+}
+
+bool SylpheedImportData::importFilters()
+{
+    const QString filterPath = mPath + QLatin1String("/filter.xml");
+    return addFilters(filterPath, MailCommon::FilterImporterExporter::SylpheedFilter);
+}
+
+bool SylpheedImportData::importAddressBook()
+{
+    const QDir addressbookDir(mPath);
+    SylpheedAddressBook account(addressbookDir);
+    account.setAbstractDisplayInfo(mAbstractDisplayInfo);
+    account.importAddressBook();
+    return true;
+}
+
+LibImportWizard::AbstractImporter::TypeSupportedOptions SylpheedImportData::supportedOption()
+{
+    TypeSupportedOptions options;
+    options |= LibImportWizard::AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::Filters;
+    options |= LibImportWizard::AbstractImporter::Settings;
+    options |= LibImportWizard::AbstractImporter::AddressBooks;
+    return options;
+}
+
+#include "sylpheedimportdata.moc"
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedimportdata.h akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedimportdata.h
--- akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedimportdata.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedimportdata.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#ifndef SylpheedImportData_H
+#define SylpheedImportData_H
+
+#include <ImportWizard/AbstractImporter>
+
+class SylpheedImportData : public LibImportWizard::AbstractImporter
+{
+public:
+    explicit SylpheedImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
+    ~SylpheedImportData();
+
+    TypeSupportedOptions supportedOption() override;
+    bool foundMailer() const override;
+
+    bool importSettings() override;
+    bool importMails() override;
+    bool importFilters() override;
+    bool importAddressBook() override;
+    QString name() const override;
+};
+
+#endif /* SylpheedImportData_H */
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedimporter.json akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedimporter.json
--- akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedimporter.json	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedimporter.json	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,32 @@
+{
+    "KPlugin": {
+        "Id": "sylpheedimporter",
+        "Name": "Sylpheed Importer",
+        "Name[ca@valencia]": "Importador del Sylpheed",
+        "Name[ca]": "Importador del Sylpheed",
+        "Name[cs]": "Importér Sylpheed",
+        "Name[de]": "Import-Modul für Sylpheed",
+        "Name[es]": "Importador Sylpheed",
+        "Name[fi]": "Sylpheed-tuonti",
+        "Name[fr]": "Import Sylpheed",
+        "Name[it]": "Importatore da Sylpheed",
+        "Name[nl]": "Sylpheed-importeur",
+        "Name[pl]": "Importer Sylpheed",
+        "Name[pt]": "Importador do Sylpheed",
+        "Name[sk]": "Importér Sylpheed",
+        "Name[sl]": "Uvoznik iz programa Sylpheed",
+        "Name[sr@ijekavian]": "Увозник из Силфида",
+        "Name[sr@ijekavianlatin]": "Uvoznik iz Sylpheeda",
+        "Name[sr@latin]": "Uvoznik iz Sylpheeda",
+        "Name[sr]": "Увозник из Силфида",
+        "Name[sv]": "Sylpheed-importverktyg",
+        "Name[tr]": "Sylpheed İçe Aktarıcı",
+        "Name[uk]": "Засіб імпортування з Sylpheed",
+        "Name[x-test]": "xxSylpheed Importerxx",
+        "Name[zh_CN]": "Sylpheed 导入器",
+        "ServiceTypes": [
+            "ImportWizard/PluginMailImporter"
+        ],
+        "Version": "1.0"
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedsettings.cpp akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedsettings.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedsettings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedsettings.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,565 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "sylpheedsettings.h"
+#include "sylpheedsettingsutils.h"
+#include <mailtransport/transportmanager.h>
+#include "MailCommon/MailUtil"
+#include <QFileInfo>
+
+#include <KIdentityManagement/kidentitymanagement/identity.h>
+#include <KIdentityManagement/kidentitymanagement/signature.h>
+
+#include <KConfig>
+#include <KConfigGroup>
+#include "sylpheedplugin_debug.h"
+
+#include <QStringList>
+#include <QFile>
+#include <QRegularExpression>
+
+SylpheedSettings::SylpheedSettings()
+{
+}
+
+SylpheedSettings::~SylpheedSettings()
+{
+}
+
+void SylpheedSettings::importSettings(const QString &filename, const QString &path)
+{
+    bool checkMailOnStartup = true;
+    int intervalCheckMail = -1;
+    const QString sylpheedrc = path + QLatin1String("/sylpheedrc");
+    if (QFileInfo::exists(sylpheedrc)) {
+        KConfig configCommon(sylpheedrc);
+        if (configCommon.hasGroup("Common")) {
+            KConfigGroup common = configCommon.group("Common");
+            checkMailOnStartup = (common.readEntry("check_on_startup", 1) == 1);
+
+            if (common.readEntry(QStringLiteral("autochk_newmail"), 1) == 1) {
+                intervalCheckMail = common.readEntry(QStringLiteral("autochk_interval"), -1);
+            }
+            readGlobalSettings(common);
+        }
+    }
+    KConfig config(filename);
+    const QStringList accountList = config.groupList().filter(QRegularExpression(QStringLiteral("Account: \\d+")));
+    const QStringList::const_iterator end(accountList.constEnd());
+    for (QStringList::const_iterator it = accountList.constBegin(); it != end; ++it) {
+        KConfigGroup group = config.group(*it);
+        readAccount(group, checkMailOnStartup, intervalCheckMail);
+        readIdentity(group);
+    }
+    const QString customheaderrc = path + QLatin1String("/customheaderrc");
+    QFile customHeaderFile(customheaderrc);
+    if (customHeaderFile.exists()) {
+        if (!customHeaderFile.open(QIODevice::ReadOnly)) {
+            qCDebug(SYLPHEEDPLUGIN_LOG) << " We can't open file" << customheaderrc;
+        } else {
+            readCustomHeader(&customHeaderFile);
+        }
+    }
+}
+
+void SylpheedSettings::readCustomHeader(QFile *customHeaderFile)
+{
+    //In sylpheed we define custom header from account.
+    //In kmail it's global
+    QTextStream stream(customHeaderFile);
+    QMap<QString, QString> header;
+    while (!stream.atEnd()) {
+        const QString line = stream.readLine();
+        const QStringList lst = line.split(QLatin1Char(':'));
+        if (lst.count() == 3) {
+            QString str = lst.at(2);
+            str.remove(0, 1);
+            header.insert(lst.at(1), str);
+        }
+    }
+    if (!header.isEmpty()) {
+        const int oldValue = readKmailSettings(QStringLiteral("General"), QStringLiteral("mime-header-count"));
+        int newValue = header.count();
+        if (oldValue != -1) {
+            newValue += oldValue;
+        }
+        addKmailConfig(QStringLiteral("General"), QStringLiteral("mime-header-count"), newValue);
+        int currentHeader = (oldValue > 0) ? oldValue : 0;
+        for (QMapIterator<QString, QString> it(header); it.hasNext();) {
+            it.next();
+            addComposerHeaderGroup(QStringLiteral("Mime #%1").arg(currentHeader), (it).key(), (it).value());
+            ++currentHeader;
+        }
+    }
+}
+
+void SylpheedSettings::readGlobalSettings(const KConfigGroup &group)
+{
+    const bool showTrayIcon = (group.readEntry("show_trayicon", 0) == 1);
+    addKmailConfig(QStringLiteral("General"), QStringLiteral("SystemTrayEnabled"), showTrayIcon);
+
+    const bool cleanTrashOnExit = (group.readEntry("clean_trash_on_exit", 0) == 1);
+    addKmailConfig(QStringLiteral("General"), QStringLiteral("empty-trash-on-exit"), cleanTrashOnExit);
+
+    const bool alwaysMarkReadOnShowMsg = (group.readEntry("always_mark_read_on_show_msg", 0) == 1);
+    if (alwaysMarkReadOnShowMsg) {
+        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkAsRead"), true);
+        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkTime"), 0);
+    }
+
+    if (group.readEntry("enable_autosave", 0) == 1) {
+        const int autosaveInterval = group.readEntry("autosave_interval", 5);
+        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("autosave"), autosaveInterval);
+    }
+    const bool checkAttach = (group.readEntry("check_attach", 0) == 1);
+    addKmailConfig(QStringLiteral("Composer"), QStringLiteral("showForgottenAttachmentWarning"), checkAttach);
+
+    const QString attachStr = group.readEntry("check_attach_str");
+    if (!attachStr.isEmpty()) {
+        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("attachment-keywords"), attachStr);
+    }
+
+    const int lineWrap = group.readEntry("linewrap_length", 80);
+    addKmailConfig(QStringLiteral("Composer"), QStringLiteral("break-at"), lineWrap);
+    addKmailConfig(QStringLiteral("Composer"), QStringLiteral("word-wrap"), true);
+
+    if (group.readEntry(QStringLiteral("recycle_quote_colors"), 0) == 1) {
+        addKmailConfig(QStringLiteral("Reader"), QStringLiteral("RecycleQuoteColors"), true);
+    }
+
+    if (group.readEntry(QStringLiteral("auto_signature"), 0) == 0) {
+        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("signature"), QStringLiteral("manual"));
+    }
+
+    if (group.readEntry(QStringLiteral("auto_ext_editor"), -1) == 1) {
+        addKmailConfig(QStringLiteral("General"), QStringLiteral("use-external-editor"), true);
+
+        const QString externalEditor = group.readEntry(QStringLiteral("mime_open_command"));
+        if (!externalEditor.isEmpty()) {
+            addKmailConfig(QStringLiteral("General"), QStringLiteral("external-editor"), externalEditor);
+        }
+    }
+
+    readSettingsColor(group);
+    readTemplateFormat(group);
+    readTagColor(group);
+    readDateFormat(group);
+}
+
+void SylpheedSettings::readTemplateFormat(const KConfigGroup &group)
+{
+    const QString replyQuote = group.readEntry(QStringLiteral("reply_quote_mark"));
+    if (!replyQuote.isEmpty()) {
+        addKmailConfig(QStringLiteral("TemplateParser"), QStringLiteral("QuoteString"), replyQuote);
+    }
+    const QString forwardQuote = group.readEntry(QStringLiteral("forward_quote_mark"));
+    if (!forwardQuote.isEmpty()) {
+        //Not implemented in kmail
+    }
+    const QString replyQuoteFormat = group.readEntry(QStringLiteral("reply_quote_format"));
+    if (!replyQuoteFormat.isEmpty()) {
+        addKmailConfig(QStringLiteral("TemplateParser"), QStringLiteral("TemplateReply"), convertToKmailTemplate(replyQuoteFormat));
+    }
+    const QString forwardQuoteFormat = group.readEntry(QStringLiteral("forward_quote_format"));
+    if (!forwardQuoteFormat.isEmpty()) {
+        addKmailConfig(QStringLiteral("TemplateParser"), QStringLiteral("TemplateForward"), convertToKmailTemplate(forwardQuoteFormat));
+    }
+}
+
+void SylpheedSettings::readDateFormat(const KConfigGroup &group)
+{
+    const QString dateFormat = group.readEntry(QStringLiteral("date_format"));
+    if (!dateFormat.isEmpty()) {
+        addKmailConfig(QStringLiteral("General"), QStringLiteral("customDateFormat"), dateFormat);
+    }
+}
+
+void SylpheedSettings::readTagColor(const KConfigGroup &group)
+{
+    Q_UNUSED(group);
+    //TODO
+}
+
+void SylpheedSettings::readSettingsColor(const KConfigGroup &group)
+{
+    const bool enableColor = group.readEntry("enable_color", false);
+    if (enableColor) {
+        const int colorLevel1 = group.readEntry("quote_level1_color", -1);
+        if (colorLevel1 != -1) {
+            //[Reader]  QuotedText1
+        }
+        const int colorLevel2 = group.readEntry("quote_level2_color", -1);
+        if (colorLevel2 != -1) {
+            //[Reader]  QuotedText2
+        }
+        const int colorLevel3 = group.readEntry("quote_level3_color", -1);
+        if (colorLevel3 != -1) {
+            //[Reader]  QuotedText3
+        }
+    }
+}
+
+QString SylpheedSettings::convertToKmailTemplate(const QString &templateStr)
+{
+    QString newTemplate = templateStr;
+    newTemplate.replace(QStringLiteral("%date"), QStringLiteral("%DATE"));
+    newTemplate.replace(QStringLiteral("%d"), QStringLiteral("%DATE"));
+    newTemplate.replace(QStringLiteral("%from"), QStringLiteral("%OTONAME"));
+    newTemplate.replace(QStringLiteral("%f"), QStringLiteral("%OTONAME"));
+    newTemplate.replace(QStringLiteral("%to"), QStringLiteral("%TONAME"));
+    newTemplate.replace(QStringLiteral("%t"), QStringLiteral("%TONAME"));
+    newTemplate.replace(QStringLiteral("%cc"), QStringLiteral("%CCNAME"));
+    newTemplate.replace(QStringLiteral("%c"), QStringLiteral("%CCNAME"));
+
+    newTemplate.replace(QStringLiteral("%email"), QStringLiteral("%OFROMNAME"));
+    newTemplate.replace(QStringLiteral("%A"), QStringLiteral("%OFROMNAME"));
+
+    newTemplate.replace(QStringLiteral("%cursor"), QStringLiteral("%CURSOR"));
+    newTemplate.replace(QStringLiteral("%X"), QStringLiteral("%CURSOR"));
+
+    newTemplate.replace(QStringLiteral("%msg"), QStringLiteral("%TEXT"));
+    newTemplate.replace(QStringLiteral("%M"), QStringLiteral("%TEXT"));
+
+    newTemplate.replace(QStringLiteral("%quoted_msg"), QStringLiteral("%QUOTE"));
+    newTemplate.replace(QStringLiteral("%Q"), QStringLiteral("%QUOTE"));
+
+    newTemplate.replace(QStringLiteral("%subject"), QStringLiteral("%OFULLSUBJECT"));
+    newTemplate.replace(QStringLiteral("%s"), QStringLiteral("%OFULLSUBJECT"));
+
+    newTemplate.replace(QStringLiteral("%messageid"), QStringLiteral("%MSGID"));
+    newTemplate.replace(QStringLiteral("%i"), QStringLiteral("%MSGID"));
+
+    newTemplate.replace(QStringLiteral("%firstname"), QStringLiteral("%OFROMNAME"));
+    newTemplate.replace(QStringLiteral("%F"), QStringLiteral("%OFROMNAME"));
+
+    newTemplate.replace(QStringLiteral("%lastname"), QStringLiteral("%OFROMLNAME"));
+    newTemplate.replace(QStringLiteral("%L"), QStringLiteral("%OFROMLNAME"));
+
+    newTemplate.replace(QStringLiteral("%fullname"), QStringLiteral("%OFROMFNAME"));
+    newTemplate.replace(QStringLiteral("%N"), QStringLiteral("%OFROMFNAME"));
+    //TODO add more variable
+    return newTemplate;
+}
+
+void SylpheedSettings::readSignature(const KConfigGroup &accountConfig, KIdentityManagement::Identity *identity)
+{
+    KIdentityManagement::Signature signature;
+    const int signatureType = accountConfig.readEntry("signature_type", 0);
+    switch (signatureType) {
+    case 0: //File
+        signature.setType(KIdentityManagement::Signature::FromFile);
+        signature.setPath(accountConfig.readEntry("signature_path"), false);
+        break;
+    case 1: //Output
+        signature.setType(KIdentityManagement::Signature::FromCommand);
+        signature.setPath(accountConfig.readEntry("signature_path"), true);
+        break;
+    case 2: //Text
+        signature.setType(KIdentityManagement::Signature::Inlined);
+        signature.setText(accountConfig.readEntry("signature_text"));
+        break;
+    default:
+        qCDebug(SYLPHEEDPLUGIN_LOG) << " signature type unknown :" << signatureType;
+        break;
+    }
+    const int signatureEnabled = accountConfig.readEntry("auto_signature", -1);
+    switch (signatureEnabled) {
+    case -1:
+        break;
+    case 0:
+        signature.setEnabledSignature(false);
+        break;
+    case 1:
+        signature.setEnabledSignature(true);
+        break;
+    default:
+        qCDebug(SYLPHEEDPLUGIN_LOG) << " auto_signature undefined " << signatureEnabled;
+        break;
+    }
+
+    //TODO  const bool signatureBeforeQuote = ( accountConfig.readEntry( "signature_before_quote", 0 ) == 1 ); not implemented in kmail
+
+    identity->setSignature(signature);
+}
+
+void SylpheedSettings::readPop3Account(const KConfigGroup &accountConfig, bool checkMailOnStartup, int intervalCheckMail)
+{
+    QMap<QString, QVariant> settings;
+    const QString host = accountConfig.readEntry("receive_server");
+    settings.insert(QStringLiteral("Host"), host);
+
+    const QString name = accountConfig.readEntry(QStringLiteral("name"));
+    const QString inbox = MailCommon::Util::convertFolderPathToCollectionStr(accountConfig.readEntry(QStringLiteral("inbox")));
+    settings.insert(QStringLiteral("TargetCollection"), inbox);
+    int port = 0;
+    if (SylpheedSettingsUtils::readConfig(QStringLiteral("pop_port"), accountConfig, port, true)) {
+        settings.insert(QStringLiteral("Port"), port);
+    }
+    if (accountConfig.hasKey(QStringLiteral("ssl_pop"))) {
+        const int sslPop = accountConfig.readEntry(QStringLiteral("ssl_pop"), 0);
+        switch (sslPop) {
+        case 0:
+            //Nothing
+            break;
+        case 1:
+            settings.insert(QStringLiteral("UseSSL"), true);
+            break;
+        case 2:
+            settings.insert(QStringLiteral("UseTLS"), true);
+            break;
+        default:
+            qCDebug(SYLPHEEDPLUGIN_LOG) << " unknown ssl_pop value " << sslPop;
+            break;
+        }
+    }
+    if (accountConfig.hasKey(QStringLiteral("remove_mail"))) {
+        const bool removeMail = (accountConfig.readEntry(QStringLiteral("remove_mail"), 1) == 1);
+        settings.insert(QStringLiteral("LeaveOnServer"), removeMail);
+    }
+
+    if (accountConfig.hasKey(QStringLiteral("message_leave_time"))) {
+        settings.insert(QStringLiteral("LeaveOnServerDays"), accountConfig.readEntry(QStringLiteral("message_leave_time")));
+    }
+    const QString user = accountConfig.readEntry(QStringLiteral("user_id"));
+    settings.insert(QStringLiteral("Login"), user);
+
+    const QString password = accountConfig.readEntry(QStringLiteral("password"));
+    settings.insert(QStringLiteral("Password"), password);
+
+    //use_apop_auth
+    if (accountConfig.hasKey(QStringLiteral("use_apop_auth"))) {
+        const bool useApop = (accountConfig.readEntry(QStringLiteral("use_apop_auth"), 1) == 1);
+        if (useApop) {
+            settings.insert(QStringLiteral("AuthenticationMethod"), MailTransport::Transport::EnumAuthenticationType::APOP);
+        }
+    }
+    if (intervalCheckMail != -1) {
+        settings.insert(QStringLiteral("IntervalCheckEnabled"), true);
+        settings.insert(QStringLiteral("IntervalCheckInterval"), intervalCheckMail);
+    }
+
+    const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
+    addCheckMailOnStartup(agentIdentifyName, checkMailOnStartup);
+    const bool enableManualCheck = (accountConfig.readEntry(QStringLiteral("receive_at_get_all"), 0) == 1);
+    addToManualCheck(agentIdentifyName, enableManualCheck);
+}
+
+void SylpheedSettings::readImapAccount(const KConfigGroup &accountConfig, bool checkMailOnStartup, int intervalCheckMail)
+{
+    QMap<QString, QVariant> settings;
+    const QString host = accountConfig.readEntry("receive_server");
+    settings.insert(QStringLiteral("ImapServer"), host);
+
+    const QString name = accountConfig.readEntry(QStringLiteral("name"));
+    const int sslimap = accountConfig.readEntry(QStringLiteral("ssl_imap"), 0);
+    switch (sslimap) {
+    case 0:
+        //None
+        settings.insert(QStringLiteral("Safety"), QStringLiteral("NONE"));
+        break;
+    case 1:
+        //SSL
+        settings.insert(QStringLiteral("Safety"), QStringLiteral("SSL"));
+        break;
+    case 2:
+        //TLS
+        settings.insert(QStringLiteral("Safety"), QStringLiteral("STARTTLS"));
+        break;
+    default:
+        qCDebug(SYLPHEEDPLUGIN_LOG) << " sslimap unknown " << sslimap;
+        break;
+    }
+
+    int port = 0;
+    if (SylpheedSettingsUtils::readConfig(QStringLiteral("imap_port"), accountConfig, port, true)) {
+        settings.insert(QStringLiteral("ImapPort"), port);
+    }
+
+    QString trashFolder;
+    if (SylpheedSettingsUtils::readConfig(QStringLiteral("trash_folder"), accountConfig, trashFolder, false)) {
+        settings.insert(QStringLiteral("TrashCollection"), MailCommon::Util::convertFolderPathToCollectionId(trashFolder));
+    }
+
+    const int auth = accountConfig.readEntry(QStringLiteral("imap_auth_method"), 0);
+    switch (auth) {
+    case 0:
+        break;
+    case 1: //Login
+        settings.insert(QStringLiteral("Authentication"), MailTransport::Transport::EnumAuthenticationType::LOGIN);
+        break;
+    case 2: //Cram-md5
+        settings.insert(QStringLiteral("Authentication"), MailTransport::Transport::EnumAuthenticationType::CRAM_MD5);
+        break;
+    case 4: //Plain
+        settings.insert(QStringLiteral("Authentication"), MailTransport::Transport::EnumAuthenticationType::PLAIN);
+        break;
+    default:
+        qCDebug(SYLPHEEDPLUGIN_LOG) << " imap auth unknown " << auth;
+        break;
+    }
+
+    if (intervalCheckMail != -1) {
+        settings.insert(QStringLiteral("IntervalCheckEnabled"), true);
+        settings.insert(QStringLiteral("IntervalCheckTime"), intervalCheckMail);
+    }
+
+    const QString password = accountConfig.readEntry(QStringLiteral("password"));
+    settings.insert(QStringLiteral("Password"), password);
+
+    const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
+    addCheckMailOnStartup(agentIdentifyName, checkMailOnStartup);
+
+    const bool enableManualCheck = (accountConfig.readEntry(QStringLiteral("receive_at_get_all"), 0) == 1);
+    addToManualCheck(agentIdentifyName, enableManualCheck);
+}
+
+void SylpheedSettings::readAccount(const KConfigGroup &accountConfig, bool checkMailOnStartup, int intervalCheckMail)
+{
+    if (accountConfig.hasKey(QStringLiteral("protocol"))) {
+        const int protocol = accountConfig.readEntry(QStringLiteral("protocol"), 0);
+        switch (protocol) {
+        case 0:
+            readPop3Account(accountConfig, checkMailOnStartup, intervalCheckMail);
+            break;
+        case 3:
+            //imap
+            readImapAccount(accountConfig, checkMailOnStartup, intervalCheckMail);
+            break;
+        case 4:
+            qCDebug(SYLPHEEDPLUGIN_LOG) << " Add it when nntp resource will implemented";
+            //news
+            break;
+        case 5:
+            //local
+            break;
+        default:
+            qCDebug(SYLPHEEDPLUGIN_LOG) << " protocol not defined" << protocol;
+            break;
+        }
+    }
+}
+
+void SylpheedSettings::readIdentity(const KConfigGroup &accountConfig)
+{
+    QString name = accountConfig.readEntry(QStringLiteral("name"));
+    KIdentityManagement::Identity *identity = createIdentity(name);
+
+    identity->setFullName(name);
+    identity->setIdentityName(name);
+    const QString organization = accountConfig.readEntry(QStringLiteral("organization"), QString());
+    identity->setOrganization(organization);
+    const QString email = accountConfig.readEntry(QStringLiteral("address"));
+    identity->setPrimaryEmailAddress(email);
+
+    QString value;
+    if (SylpheedSettingsUtils::readConfig(QStringLiteral("auto_bcc"), accountConfig, value, true)) {
+        identity->setBcc(value);
+    }
+    if (SylpheedSettingsUtils::readConfig(QStringLiteral("auto_cc"), accountConfig, value, true)) {
+        identity->setCc(value);
+    }
+    if (SylpheedSettingsUtils::readConfig(QStringLiteral("auto_replyto"), accountConfig, value, true)) {
+        identity->setReplyToAddr(value);
+    }
+
+    if (SylpheedSettingsUtils::readConfig(QStringLiteral("daft_folder"), accountConfig, value, false)) {
+        identity->setDrafts(MailCommon::Util::convertFolderPathToCollectionStr(value));
+    }
+
+    if (SylpheedSettingsUtils::readConfig(QStringLiteral("sent_folder"), accountConfig, value, false)) {
+        identity->setFcc(MailCommon::Util::convertFolderPathToCollectionStr(value));
+    }
+
+    const QString transportId = readTransport(accountConfig);
+    if (!transportId.isEmpty()) {
+        identity->setTransport(transportId);
+    }
+    readSignature(accountConfig, identity);
+    storeIdentity(identity);
+}
+
+QString SylpheedSettings::readTransport(const KConfigGroup &accountConfig)
+{
+    const QString smtpserver = accountConfig.readEntry("smtp_server");
+
+    if (!smtpserver.isEmpty()) {
+        MailTransport::Transport *mt = createTransport();
+        mt->setIdentifier(QStringLiteral("SMTP"));
+        mt->setName(smtpserver);
+        mt->setHost(smtpserver);
+        int port = 0;
+        if (SylpheedSettingsUtils::readConfig(QStringLiteral("smtp_port"), accountConfig, port, true)) {
+            mt->setPort(port);
+        }
+        const QString user = accountConfig.readEntry(QStringLiteral("smtp_user_id"));
+
+        if (!user.isEmpty()) {
+            mt->setUserName(user);
+            mt->setRequiresAuthentication(true);
+        }
+        const QString password = accountConfig.readEntry(QStringLiteral("smtp_password"));
+        if (!password.isEmpty()) {
+            mt->setStorePassword(true);
+            mt->setPassword(password);
+        }
+        if (accountConfig.readEntry(QStringLiteral("use_smtp_auth"), 0) == 1) {
+            const int authMethod = accountConfig.readEntry(QStringLiteral("smtp_auth_method"), 0);
+            switch (authMethod) {
+            case 0: //Automatic:
+                mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN); //????
+                break;
+            case 1: //Login
+                mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::LOGIN);
+                break;
+            case 2: //Cram-MD5
+                mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::CRAM_MD5);
+                break;
+            case 8: //Plain
+                mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN);
+                break;
+            default:
+                qCDebug(SYLPHEEDPLUGIN_LOG) << " smtp authentication unknown :" << authMethod;
+                break;
+            }
+        }
+        const int sslSmtp = accountConfig.readEntry(QStringLiteral("ssl_smtp"), 0);
+        switch (sslSmtp) {
+        case 0:
+            mt->setEncryption(MailTransport::Transport::EnumEncryption::None);
+            break;
+        case 1:
+            mt->setEncryption(MailTransport::Transport::EnumEncryption::SSL);
+            break;
+        case 2:
+            mt->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
+            break;
+        default:
+            qCDebug(SYLPHEEDPLUGIN_LOG) << " smtp ssl config unknown :" << sslSmtp;
+            break;
+        }
+        QString domainName;
+        if (SylpheedSettingsUtils::readConfig(QStringLiteral("domain"), accountConfig, domainName, false)) {
+            mt->setLocalHostname(domainName);
+        }
+
+        storeTransport(mt, true);
+        return QString::number(mt->id());
+    }
+    return QString();
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedsettings.h akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedsettings.h
--- akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedsettings.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedsettings.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef SYLPHEEDSETTINGS_H
+#define SYLPHEEDSETTINGS_H
+
+#include <ImportWizard/AbstractSettings>
+#include <QString>
+
+class KConfigGroup;
+class QFile;
+
+class SylpheedSettings : public AbstractSettings
+{
+public:
+    SylpheedSettings();
+    ~SylpheedSettings();
+    virtual void importSettings(const QString &filename, const QString &path);
+
+protected:
+    void readCustomHeader(QFile *customHeaderFile);
+    virtual void readGlobalSettings(const KConfigGroup &group);
+    void readAccount(const KConfigGroup &accountConfig, bool checkMailOnStartup, int intervalCheckMail);
+    void readIdentity(const KConfigGroup &accountConfig);
+    QString readTransport(const KConfigGroup &accountConfig);
+    void readPop3Account(const KConfigGroup &accountConfig, bool checkMailOnStartup, int intervalCheckMail);
+    void readImapAccount(const KConfigGroup &accountConfig, bool checkMailOnStartup, int intervalCheckMail);
+    void readSignature(const KConfigGroup &accountConfig, KIdentityManagement::Identity *identity);
+
+    virtual void readSettingsColor(const KConfigGroup &group);
+    virtual void readTemplateFormat(const KConfigGroup &group);
+
+    virtual void readTagColor(const KConfigGroup &group);
+
+    virtual void readDateFormat(const KConfigGroup &group);
+    QString convertToKmailTemplate(const QString &templateStr);
+};
+
+#endif /* SYLPHEEDSETTINGS_H */
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedsettingsutils.cpp akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedsettingsutils.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedsettingsutils.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedsettingsutils.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,48 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "sylpheedsettingsutils.h"
+
+bool SylpheedSettingsUtils::readConfig(const QString &key, const KConfigGroup &accountConfig, int &value, bool remove_underscore)
+{
+    QString cleanedKey(key);
+    if (remove_underscore) {
+        cleanedKey.remove(QLatin1Char('_'));
+    }
+    const QString useKey = QLatin1String("set_") + cleanedKey;
+    if (accountConfig.hasKey(useKey) && (accountConfig.readEntry(useKey, 0) == 1)) {
+        value = accountConfig.readEntry(key, 0);
+        return true;
+    }
+    return false;
+}
+
+bool SylpheedSettingsUtils::readConfig(const QString &key, const KConfigGroup &accountConfig, QString &value, bool remove_underscore)
+{
+    QString cleanedKey(key);
+    if (remove_underscore) {
+        cleanedKey.remove(QLatin1Char('_'));
+    }
+    const QString useKey = QLatin1String("set_") + cleanedKey;
+    if (accountConfig.hasKey(useKey) && (accountConfig.readEntry(useKey, 0) == 1)) {
+        value = accountConfig.readEntry(key);
+        return true;
+    }
+    return false;
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedsettingsutils.h akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedsettingsutils.h
--- akonadi-import-wizard-17.04.3/src/plugins/sylpheed/sylpheedsettingsutils.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/sylpheed/sylpheedsettingsutils.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,31 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef SYLPHEEDSETTINGSUTILS_H
+#define SYLPHEEDSETTINGSUTILS_H
+
+#include <QString>
+#include <KConfigGroup>
+
+namespace SylpheedSettingsUtils {
+bool readConfig(const QString &key, const KConfigGroup &accountConfig, int &value, bool remove_underscore);
+bool readConfig(const QString &key, const KConfigGroup &accountConfig, QString &value, bool remove_underscore);
+}
+
+#endif // SYLPHEEDSETTINGSUTILS_H
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/thunderbird/addressbook/license.txt akonadi-import-wizard-17.08.3/src/plugins/thunderbird/addressbook/license.txt
--- akonadi-import-wizard-17.04.3/src/plugins/thunderbird/addressbook/license.txt	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/thunderbird/addressbook/license.txt	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,31 @@
+Software License Agreement (BSD License)
+
+Copyright (c) 2006, ScalingWeb.com
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of ScalingWeb.com nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of ScalingWeb.com.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/thunderbird/addressbook/MorkParser.cpp akonadi-import-wizard-17.08.3/src/plugins/thunderbird/addressbook/MorkParser.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/thunderbird/addressbook/MorkParser.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/thunderbird/addressbook/MorkParser.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,544 @@
+////////////////////////////////////////////////////////////////////
+///
+///   MorkParser.cpp - Mozilla Mork Format Parser/Reader implementation
+///
+///   Copyright (C) 2007 ScalingWeb.com
+///   All rights reserved.
+///
+///   Authors: Yuriy Soroka <ysoroka@scalingweb.com>
+///               Anton Fedoruk <afedoruk@scalingweb.com>
+///
+///
+///////////////////////////////////////////////////////////////////
+
+#include "MorkParser.h"
+#include <QFile>
+#include <QIODevice>
+//        =============================================================
+//        MorkParser::MorkParser
+#include "thunderbirdplugin_debug.h"
+
+MorkParser::MorkParser(int DefaultScope)
+{
+    initVars();
+    mDefaultScope = DefaultScope;
+}
+
+//        =============================================================
+//        MorkParser::open
+
+bool MorkParser::open(const QString &path)
+{
+    initVars();
+
+    QFile MorkFile(path);
+
+    // Open file
+    if (!MorkFile.exists()
+        || !MorkFile.open(QIODevice::ReadOnly)) {
+        mError = FailedToOpen;
+        return false;
+    }
+
+    // Check magic header
+    QByteArray MagicHeader = MorkFile.readLine();
+
+    if (!MagicHeader.contains(MorkMagicHeader)) {
+        mError = UnsupportedVersion;
+        return false;
+    }
+
+    mMorkData = MorkFile.readAll();
+    MorkFile.close();
+
+    // Parse mork
+    return parse();
+}
+
+//        =============================================================
+//        MorkParser::error
+
+MorkErrors MorkParser::error() const
+{
+    return mError;
+}
+
+//        =============================================================
+//        MorkParser::initVars
+
+void MorkParser::initVars()
+{
+    mError = NoError;
+    mMorkPos = 0;
+    nowParsing_ = NPValues;
+    mCurrentCells = nullptr;
+    mNextAddValueId = 0x7fffffff;
+}
+
+//        =============================================================
+//        MorkParser::parse
+
+bool MorkParser::parse()
+{
+    bool Result = true;
+    char cur = 0;
+
+    // Run over mork chars and parse each term
+    cur = nextChar();
+
+    while (Result && cur) {
+        if (!isWhiteSpace(cur)) {
+            // Figure out what a term
+            switch (cur) {
+            case '<':
+                // Dict
+                Result = parseDict();
+                break;
+            case '/':
+                // Comment
+                Result = parseComment();
+                break;
+            case '{':
+                Result = parseTable();
+                // Table
+                break;
+            case '[':
+                Result = parseRow(0, 0);
+                // Row
+                break;
+            case '@':
+                Result = parseGroup();
+                // Group
+                break;
+            default:
+                mError = DefectedFormat;
+                Result = false;
+                break;
+            }
+        }
+
+        // Get next char
+        cur = nextChar();
+    }
+
+    return Result;
+}
+
+//        =============================================================
+//        MorkParser::isWhiteSpace
+
+bool MorkParser::isWhiteSpace(char c) const
+{
+    switch (c) {
+    case ' ':
+    case '\t':
+    case '\r':
+    case '\n':
+    case '\f':
+        return true;
+    default:
+        return false;
+    }
+}
+
+//        =============================================================
+//        MorkParser::nextChar
+
+char MorkParser::nextChar()
+{
+    char cur = 0;
+
+    if (mMorkPos < mMorkData.length()) {
+        cur = mMorkData[ mMorkPos ];
+        mMorkPos++;
+    }
+
+    if (!cur) {
+        cur = 0;
+    }
+
+    return cur;
+}
+
+//        =============================================================
+//        MorkParser::parseDict
+
+bool MorkParser::parseDict()
+{
+    char cur = nextChar();
+    bool Result = true;
+    nowParsing_ = NPValues;
+
+    while (Result && cur != '>' && cur) {
+        if (!isWhiteSpace(cur)) {
+            switch (cur) {
+            case '<':
+                if (mMorkData.mid(mMorkPos - 1, strlen(MorkDictColumnMeta))
+                    == MorkDictColumnMeta) {
+                    nowParsing_ = NPColumns;
+                    mMorkPos += strlen(MorkDictColumnMeta) - 1;
+                }
+                break;
+            case '(':
+                Result = parseCell();
+                break;
+            case '/':
+                Result = parseComment();
+                break;
+            }
+        }
+
+        cur = nextChar();
+    }
+
+    return Result;
+}
+
+//        =============================================================
+//        MorkParser::parseComment
+
+bool MorkParser::parseComment()
+{
+    char cur = nextChar();
+    if ('/' != cur) {
+        return false;
+    }
+
+    while (cur != '\r' && cur != '\n' && cur) {
+        cur = nextChar();
+    }
+
+    return true;
+}
+
+//        =============================================================
+//        MorkParser::parseCell
+
+bool MorkParser::parseCell()
+{
+    bool Result = true;
+    bool bColumnOid = false;
+    bool bValueOid = false;
+    bool bColumn = true;
+    int Corners = 0;
+
+    // Column = Value
+    QString Column;
+    QString Text;
+
+    char cur = nextChar();
+
+    // Process cell start with column (bColumn == true)
+    while (Result && cur != ')' && cur) {
+        switch (cur) {
+        case '^':
+            // Oids
+            Corners++;
+            if (Corners == 1) {
+                bColumnOid = true;
+            } else if (Corners == 2) {
+                bColumn = false;
+                bValueOid = true;
+            } else {
+                Text += cur;
+            }
+
+            break;
+        case '=':
+            // From column to value
+            if (bColumn) {
+                bColumn = false;
+            } else {
+                Text += cur;
+            }
+            break;
+        case '\\':
+        {
+            // Get next two chars
+            char NextChar = nextChar();
+            if ('\r' != NextChar && '\n' != NextChar) {
+                Text += NextChar;
+            } else {
+                nextChar();
+            }
+            break;
+        }
+        case '$':
+        {
+            // Get next two chars
+            QString HexChar;
+            HexChar += nextChar();
+            HexChar += nextChar();
+            Text += (char)HexChar.toInt(nullptr, 16);
+            break;
+        }
+        default:
+            // Just a char
+            if (bColumn) {
+                Column += cur;
+            } else {
+                Text += cur;
+            }
+            break;
+        }
+
+        cur = nextChar();
+    }
+    Q_UNUSED(bColumnOid);
+    // Apply column and text
+    int ColumnId = Column.toInt(nullptr, 16);
+
+    if (NPRows != nowParsing_) {
+        // Dicts
+        if (!Text.isEmpty()) {
+            if (nowParsing_ == NPColumns) {
+                mColumns[ ColumnId ] = Text;
+                qCDebug(THUNDERBIRDPLUGIN_LOG)<<" column :"<<ColumnId<<" Text "<<Text;
+            } else {
+                mValues[ ColumnId ] = Text;
+                qCDebug(THUNDERBIRDPLUGIN_LOG)<<" ColumnId "<<ColumnId<<" Value : "<<Text;
+            }
+        }
+    } else {
+        if (!Text.isEmpty()) {
+            // Rows
+            int ValueId = Text.toInt(nullptr, 16);
+
+            if (bValueOid) {
+                (*mCurrentCells)[ ColumnId ] = ValueId;
+            } else {
+                mNextAddValueId--;
+                mValues[ mNextAddValueId ] = Text;
+                (*mCurrentCells)[ ColumnId ] = mNextAddValueId;
+            }
+        }
+    }
+    return Result;
+}
+
+//        =============================================================
+//        MorkParser::parseTable
+
+bool MorkParser::parseTable()
+{
+    bool Result = true;
+    QString TextId;
+    int Id = 0, Scope = 0;
+
+    char cur = nextChar();
+
+    // Get id
+    while (cur != '{' && cur != '[' && cur != '}' && cur) {
+        if (!isWhiteSpace(cur)) {
+            TextId += cur;
+        }
+
+        cur = nextChar();
+    }
+
+    parseScopeId(TextId, Id, Scope);
+
+    // Parse the table
+    while (Result && cur != '}' && cur) {
+        if (!isWhiteSpace(cur)) {
+            switch (cur) {
+            case '{':
+                Result = parseMeta('}');
+                break;
+            case '[':
+                Result = parseRow(Id, Scope);
+                break;
+            case '-':
+            case '+':
+                break;
+            default:
+            {
+                QString JustId;
+                while (!isWhiteSpace(cur) && cur) {
+                    JustId += cur;
+                    cur = nextChar();
+
+                    if (cur == '}') {
+                        return Result;
+                    }
+                }
+
+                int JustIdNum = 0, JustScopeNum = 0;
+                parseScopeId(JustId, JustIdNum, JustScopeNum);
+
+                setCurrentRow(Scope, Id, JustScopeNum, JustIdNum);
+                break;
+            }
+            }
+        }
+
+        cur = nextChar();
+    }
+
+    return Result;
+}
+
+//        =============================================================
+//        MorkParser::parseScopeId
+
+void MorkParser::parseScopeId(const QString &textId, int &Id, int &Scope) const
+{
+    int Pos = 0;
+
+    if ((Pos = textId.indexOf(QLatin1Char(':'))) >= 0) {
+        QString tId = textId.mid(0, Pos);
+        QString tSc = textId.mid(Pos + 1, textId.length() - Pos);
+
+        if (tSc.length() > 1 && tSc[ 0 ] == '^') {
+            // Delete '^'
+            tSc.remove(0, 1);
+        }
+
+        Id = tId.toInt(nullptr, 16);
+        Scope = tSc.toInt(nullptr, 16);
+    } else {
+        Id = textId.toInt(nullptr, 16);
+    }
+}
+
+//        =============================================================
+//        MorkParser::setCurrentRow
+
+void MorkParser::setCurrentRow(int TableScope, int TableId, int RowScope, int RowId)
+{
+    if (!RowScope) {
+        RowScope = mDefaultScope;
+    }
+
+    if (!TableScope) {
+        TableScope = mDefaultScope;
+    }
+
+    mCurrentCells = &(mMork[ abs(TableScope) ][ abs(TableId) ][ abs(RowScope) ][ abs(RowId) ]);
+}
+
+//        =============================================================
+//        MorkParser::parseRow
+
+bool MorkParser::parseRow(int TableId, int TableScope)
+{
+    bool Result = true;
+    QString TextId;
+    int Id = 0, Scope = 0;
+    nowParsing_ = NPRows;
+
+    char cur = nextChar();
+
+    // Get id
+    while (cur != '(' && cur != ']' && cur != '[' && cur) {
+        if (!isWhiteSpace(cur)) {
+            TextId += cur;
+        }
+
+        cur = nextChar();
+    }
+
+    parseScopeId(TextId, Id, Scope);
+    setCurrentRow(TableScope, TableId, Scope, Id);
+
+    // Parse the row
+    while (Result && cur != ']' && cur) {
+        if (!isWhiteSpace(cur)) {
+            switch (cur) {
+            case '(':
+                Result = parseCell();
+                break;
+            case '[':
+                Result = parseMeta(']');
+                break;
+            default:
+                Result = false;
+                break;
+            }
+        }
+
+        cur = nextChar();
+    }
+
+    return Result;
+}
+
+//        =============================================================
+//        MorkParser::parseGroup
+
+bool MorkParser::parseGroup()
+{
+    return parseMeta('@');
+}
+
+//        =============================================================
+//        MorkParser::parseMeta
+
+bool MorkParser::parseMeta(char c)
+{
+    char cur = nextChar();
+
+    while (cur != c && cur) {
+        cur = nextChar();
+    }
+
+    return true;
+}
+
+//        =============================================================
+//        MorkParser::getTables
+
+MorkTableMap *MorkParser::getTables(int TableScope)
+{
+    TableScopeMap::iterator iter;
+    iter = mMork.find(TableScope);
+
+    if (iter == mMork.end()) {
+        return nullptr;
+    }
+
+    return &iter.value();
+}
+
+//        =============================================================
+//        MorkParser::getRows
+
+MorkRowMap *MorkParser::getRows(int RowScope, RowScopeMap *table)
+{
+    RowScopeMap::iterator iter;
+    iter = table->find(RowScope);
+
+    if (iter == table->end()) {
+        return nullptr;
+    }
+
+    return &iter.value();
+}
+
+//        =============================================================
+//        MorkParser::getValue
+
+QString MorkParser::getValue(int oid)
+{
+    MorkDict::ConstIterator foundIter = mValues.constFind(oid);
+
+    if (foundIter == mValues.constEnd()) {
+        return QString();
+    }
+
+    return *foundIter;
+}
+
+//        =============================================================
+//        MorkParser::getColumn
+
+QString MorkParser::getColumn(int oid)
+{
+    MorkDict::ConstIterator foundIter = mColumns.constFind(oid);
+
+    if (foundIter == mColumns.constEnd()) {
+        return QString();
+    }
+
+    return *foundIter;
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/thunderbird/addressbook/MorkParser.h akonadi-import-wizard-17.08.3/src/plugins/thunderbird/addressbook/MorkParser.h
--- akonadi-import-wizard-17.04.3/src/plugins/thunderbird/addressbook/MorkParser.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/thunderbird/addressbook/MorkParser.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,139 @@
+////////////////////////////////////////////////////////////////////
+///
+///   MorkParser.h - Mozilla Mork Format Parser/Reader
+///
+///   Copyright (C) 2007 ScalingWeb.com
+///   All rights reserved.
+///
+///   Authors: Yuriy Soroka <ysoroka@scalingweb.com>
+///               Anton Fedoruk <afedoruk@scalingweb.com>
+///
+///
+///////////////////////////////////////////////////////////////////
+
+#ifndef __MorkParser_h__
+#define __MorkParser_h__
+
+#include <QMap>
+#include <QByteArray>
+#include <iostream>
+class QString;
+// Types
+
+typedef QMap< int, QString > MorkDict;
+typedef QMap< int, int > MorkCells;                                        // ColumnId : ValueId
+typedef QMap< int, MorkCells > MorkRowMap;                        // Row id
+typedef QMap< int, MorkRowMap > RowScopeMap;                // Row scope
+typedef QMap< int, RowScopeMap > MorkTableMap;                // Table id
+typedef QMap< int, MorkTableMap > TableScopeMap;        // Table Scope
+
+// Mork header of supported format version
+const char MorkMagicHeader[] = "// <!-- <mdb:mork:z v=\"1.4\"/> -->";
+
+const char MorkDictColumnMeta[] = "<(a=c)>";
+
+// Error codes
+enum MorkErrors {
+    NoError = 0,
+    FailedToOpen,
+    UnsupportedVersion,
+    DefectedFormat
+};
+
+// Mork term types
+enum MorkTerm {
+    NoneTerm = 0,
+    DictTerm,
+    GroupTerm,
+    TableTerm,
+    RowTerm,
+    CellTerm,
+    CommentTerm,
+    LiteralTerm
+};
+
+/// Class MorkParser
+
+class MorkParser
+{
+public:
+
+    explicit MorkParser(int defaultScope = 0x80);
+
+    ///
+    /// Open and parse mork file
+
+    bool open(const QString &path);
+
+    ///
+    /// Return error status
+
+    MorkErrors error() const;
+
+    ///
+    /// Returns all tables of specified scope
+
+    MorkTableMap *getTables(int tableScope);
+
+    ///
+    /// Rerturns all rows under specified scope
+
+    MorkRowMap *getRows(int rowScope, RowScopeMap *table);
+
+    ///
+    /// Return value of specified value oid
+
+    QString getValue(int oid);
+
+    ///
+    /// Return value of specified column oid
+
+    QString getColumn(int oid);
+
+protected: // Members
+
+    void initVars();
+
+    bool isWhiteSpace(char c) const;
+    char nextChar();
+
+    void parseScopeId(const QString &TextId, int &Id, int &Scope) const;
+    void setCurrentRow(int TableScope, int TableId, int RowScope, int RowId);
+
+    // Parse methods
+    bool parse();
+    bool parseDict();
+    bool parseComment();
+    bool parseCell();
+    bool parseTable();
+    bool parseMeta(char c);
+    bool parseRow(int TableId, int TableScope);
+    bool parseGroup();
+
+protected: // Data
+
+    // Columns in mork means value names
+    MorkDict mColumns;
+    MorkDict mValues;
+
+    // All mork file data
+    TableScopeMap mMork;
+    MorkCells *mCurrentCells;
+
+    // Error status of last operation
+    MorkErrors mError;
+
+    // All Mork data
+    QByteArray mMorkData;
+
+    int mMorkPos;
+    int mNextAddValueId;
+    int mDefaultScope;
+
+    // Indicates intity is being parsed
+    enum {
+        NPColumns, NPValues, NPRows
+    } nowParsing_;
+};
+
+#endif // __MorkParser_h__
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/thunderbird/CMakeLists.txt akonadi-import-wizard-17.08.3/src/plugins/thunderbird/CMakeLists.txt
--- akonadi-import-wizard-17.04.3/src/plugins/thunderbird/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/thunderbird/CMakeLists.txt	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,23 @@
+set(thunderbirdimporter_SRCS
+    thunderbirdaddressbook.cpp
+    thunderbirdimportdata.cpp
+    thunderbirdsettings.cpp
+    addressbook/MorkParser.cpp
+    )
+
+ecm_qt_declare_logging_category(thunderbirdimporter_SRCS HEADER thunderbirdplugin_debug.h
+    IDENTIFIER THUNDERBIRDPLUGIN_LOG CATEGORY_NAME org.kde.pim.importwizard.thunderbirdplugin)
+kcoreaddons_add_plugin(thunderbirdimporterplugin JSON thunderbirdimporter.json SOURCES
+    ${thunderbirdimporter_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(thunderbirdimporterplugin
+    KPim::ImportWizard
+    KF5::XmlGui
+    KF5::I18n
+    KF5::Contacts
+    KF5::MailImporterAkonadi
+    KF5::MailTransport
+    KF5::IdentityManagement
+    KF5::MailCommon
+    )
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdaddressbook.cpp akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdaddressbook.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,265 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "thunderbirdaddressbook.h"
+#include "addressbook/MorkParser.h"
+
+#include <KLocalizedString>
+#include <KContacts/Addressee>
+#include <QUrl>
+#include "thunderbirdplugin_debug.h"
+
+ThunderBirdAddressBook::ThunderBirdAddressBook(const QDir &dir)
+    : mDir(dir)
+{
+}
+
+ThunderBirdAddressBook::~ThunderBirdAddressBook()
+{
+}
+
+void ThunderBirdAddressBook::importAddressBook()
+{
+    const QString path = mDir.path();
+    readAddressBook(path + QLatin1String("/impab.mab"));
+    const QStringList filesimportab = mDir.entryList(QStringList(QStringLiteral("impab-[0-9]*.map")), QDir::Files, QDir::Name);
+    for (const QString &file : filesimportab) {
+        readAddressBook(path + QLatin1Char('/') + file);
+    }
+    readAddressBook(path + QLatin1String("/abook.mab"));
+
+    const QStringList files = mDir.entryList(QStringList(QStringLiteral("abook-[0-9]*.map")), QDir::Files, QDir::Name);
+    for (const QString &file : files) {
+        readAddressBook(path + QLatin1Char('/') + file);
+    }
+    readAddressBook(path + QLatin1String("/history.mab"));
+
+    cleanUp();
+}
+
+void ThunderBirdAddressBook::readAddressBook(const QString &filename)
+{
+    MorkParser mork;
+    if (!mork.open(filename)) {
+        if (mork.error() == FailedToOpen) {
+            addAddressBookImportError(i18n("Contacts file '%1' not found", filename));
+        }
+        qCDebug(THUNDERBIRDPLUGIN_LOG) << " error during read file " << filename << " Error type " << mork.error();
+        return;
+    }
+    MorkTableMap *tables = mork.getTables(0x80);
+    if (tables) {
+        MorkTableMap::iterator tableIterEnd(tables->end());
+        MorkRowMap *rows = nullptr;
+        for (MorkTableMap::iterator tableIter = tables->begin(); tableIter != tableIterEnd; ++tableIter) {
+            if (tableIter.key() != 0) {
+                rows = mork.getRows(0x80, &tableIter.value());
+                if (rows) {
+                    MorkRowMap::iterator endRow(rows->end());
+                    for (MorkRowMap::iterator rowIter = rows->begin(); rowIter != endRow; ++rowIter) {
+                        if (rowIter.key() != 0) {
+                            KContacts::Addressee contact;
+                            MorkCells cells = rowIter.value();
+                            MorkCells::iterator endCellIter = cells.end();
+                            KContacts::Address homeAddr = KContacts::Address(KContacts::Address::Home);
+                            KContacts::Address workAddr = KContacts::Address(KContacts::Address::Work);
+                            int birthday = -1;
+                            int birthmonth = -1;
+                            int birthyear = -1;
+
+                            for (MorkCells::iterator cellsIter = cells.begin(); cellsIter != endCellIter; ++cellsIter) {
+                                const QString value = mork.getValue(cellsIter.value());
+                                const QString column = mork.getColumn(cellsIter.key());
+                                qCDebug(THUNDERBIRDPLUGIN_LOG) << "column :" << column << " value :" << value;
+                                if (column == QLatin1String("LastModifiedDate")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("RecordKey")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("AddrCharSet")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("LastRecordKey")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("ns:addrbk:db:table:kind:pab")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("ListName")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("ListNickName")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("ListDescription")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("ListTotalAddresses")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("LowercaseListName")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("ns:addrbk:db:table:kind:deleted")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("PhotoType")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("PreferDisplayName")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("PhotoURI")) {
+                                    KContacts::Picture photo;
+                                    photo.setUrl(value);
+                                    contact.setLogo(photo);
+                                } else if (column == QLatin1String("PhotoName")) {
+                                    //TODO: verify it
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("DbRowID")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("ns:addrbk:db:row:scope:card:all")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("ns:addrbk:db:row:scope:list:all")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("ns:addrbk:db:row:scope:data:all")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("FirstName")) {
+                                    contact.setName(value);
+                                } else if (column == QLatin1String("LastName")) {
+                                    contact.setFamilyName(value);
+                                } else if (column == QLatin1String("PhoneticFirstName")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("PhoneticLastName")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("DisplayName")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("NickName")) {
+                                    contact.setNickName(value);
+                                } else if (column == QLatin1String("PrimaryEmail")) {
+                                    contact.setEmails(QStringList() << value);
+                                } else if (column == QLatin1String("LowercasePrimaryEmail")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("SecondEmail")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("PreferMailFormat")) {
+                                    contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("MailPreferedFormatting"), value);
+                                } else if (column == QLatin1String("PopularityIndex")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("AllowRemoteContent")) {
+                                    contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("MailAllowToRemoteContent"), value);
+                                } else if (column == QLatin1String("WorkPhone")) {
+                                    contact.insertPhoneNumber(KContacts::PhoneNumber(value, KContacts::PhoneNumber::Work));
+                                } else if (column == QLatin1String("HomePhone")) {
+                                    contact.insertPhoneNumber(KContacts::PhoneNumber(value, KContacts::PhoneNumber::Home));
+                                } else if (column == QLatin1String("FaxNumber")) {
+                                    contact.insertPhoneNumber(KContacts::PhoneNumber(value, KContacts::PhoneNumber::Fax));
+                                } else if (column == QLatin1String("PagerNumber")) {
+                                    contact.insertPhoneNumber(KContacts::PhoneNumber(value, KContacts::PhoneNumber::Pager));
+                                } else if (column == QLatin1String("CellularNumber")) {
+                                    contact.insertPhoneNumber(KContacts::PhoneNumber(value, KContacts::PhoneNumber::Cell));
+                                } else if (column == QLatin1String("WorkPhoneType")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("HomePhoneType")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("FaxNumberType")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("PagerNumberType")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("CellularNumberType")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("HomeAddress")) {
+                                    homeAddr.setStreet(value);
+                                } else if (column == QLatin1String("HomeAddress2")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("HomeCity")) {
+                                    homeAddr.setLocality(value);
+                                } else if (column == QLatin1String("HomeState")) {
+                                    homeAddr.setRegion(value);
+                                } else if (column == QLatin1String("HomeZipCode")) {
+                                    homeAddr.setPostalCode(value);
+                                } else if (column == QLatin1String("HomeCountry")) {
+                                    homeAddr.setCountry(value);
+                                } else if (column == QLatin1String("WorkAddress")) {
+                                    workAddr.setStreet(value);
+                                } else if (column == QLatin1String("WorkAddress2")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("WorkCity")) {
+                                    workAddr.setLocality(value);
+                                } else if (column == QLatin1String("WorkState")) {
+                                    workAddr.setRegion(value);
+                                } else if (column == QLatin1String("WorkZipCode")) {
+                                    workAddr.setPostalCode(value);
+                                } else if (column == QLatin1String("WorkCountry")) {
+                                    workAddr.setCountry(value);
+                                } else if (column == QLatin1String("JobTitle")) {
+                                    contact.setTitle(value);
+                                } else if (column == QLatin1String("Department")) {
+                                    contact.setDepartment(value);
+                                } else if (column == QLatin1String("Company")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("_AimScreenName")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("AnniversaryYear")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("AnniversaryMonth")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("AnniversaryDay")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("SpouseName")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("FamilyName")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("WebPage1")) {
+                                    KContacts::ResourceLocatorUrl url;
+                                    url.setUrl(QUrl(value));
+                                    contact.setUrl(url);
+                                } else if (column == QLatin1String("WebPage2")) {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " column " << column << " found but not imported. Need to look at how to import it";
+                                } else if (column == QLatin1String("BirthYear")) {
+                                    birthyear = value.toInt();
+                                } else if (column == QLatin1String("BirthMonth")) {
+                                    birthmonth = value.toInt();
+                                } else if (column == QLatin1String("BirthDay")) {
+                                    birthday = value.toInt();
+                                } else if (column == QLatin1String("Custom1")) {
+                                    contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("Custom1"), value);
+                                } else if (column == QLatin1String("Custom2")) {
+                                    contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("Custom2"), value);
+                                } else if (column == QLatin1String("Custom3")) {
+                                    contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("Custom3"), value);
+                                } else if (column == QLatin1String("Custom4")) {
+                                    contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("Custom4"), value);
+                                } else if (column == QLatin1String("Notes")) {
+                                    contact.setNote(value);
+                                } else {
+                                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " Columnn not implemented " << column;
+                                }
+                                //qCDebug(THUNDERBIRDPLUGIN_LOG)<<" value :"<<value<<" column"<<column;
+                            }
+
+                            if (!homeAddr.isEmpty()) {
+                                contact.insertAddress(homeAddr);
+                            }
+                            if (!workAddr.isEmpty()) {
+                                contact.insertAddress(workAddr);
+                            }
+
+                            const QDate birthDate(birthyear, birthmonth, birthday);
+                            if (birthDate.isValid()) {
+                                contact.setBirthday(birthDate);
+                            }
+                            addImportContactNote(contact, QStringLiteral("Thunderbird"));
+                            createContact(contact);
+                            qCDebug(THUNDERBIRDPLUGIN_LOG) << "-----------------------";
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdaddressbook.h akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdaddressbook.h
--- akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdaddressbook.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdaddressbook.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef THUNDERBIRDADDRESSBOOK_H
+#define THUNDERBIRDADDRESSBOOK_H
+
+#include <ImportWizard/AbstractAddressBook>
+#include <QDir>
+
+class ThunderBirdAddressBook : public LibImportWizard::AbstractAddressBook
+{
+    Q_OBJECT
+public:
+    explicit ThunderBirdAddressBook(const QDir &dir);
+    ~ThunderBirdAddressBook();
+
+    void importAddressBook();
+private:
+    void readAddressBook(const QString &filename);
+    QDir mDir;
+};
+
+#endif // THUNDERBIRDADDRESSBOOK_H
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdimportdata.cpp akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdimportdata.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,151 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "thunderbirdimportdata.h"
+
+#include "thunderbirdsettings.h"
+#include "thunderbirdaddressbook.h"
+#include "abstractdisplayinfo.h"
+
+#include "mailimporter/filterthunderbird.h"
+#include "mailimporter/filterinfo.h"
+#include "MailCommon/FilterImporterExporter"
+
+#include <KLocalizedString>
+#include <kpluginfactory.h>
+
+#include <QDir>
+
+K_PLUGIN_FACTORY_WITH_JSON(ThunderbirdImporterFactory, "thunderbirdimporter.json", registerPlugin<ThunderbirdImportData>();
+                           )
+
+ThunderbirdImportData::ThunderbirdImportData(QObject *parent, const QList<QVariant> &)
+    : LibImportWizard::AbstractImporter(parent)
+{
+    mPath = MailImporter::FilterThunderbird::defaultSettingsPath();
+}
+
+ThunderbirdImportData::~ThunderbirdImportData()
+{
+}
+
+QString ThunderbirdImportData::defaultProfile()
+{
+    if (mDefaultProfile.isEmpty()) {
+        mDefaultProfile = MailImporter::FilterThunderbird::defaultProfile(mPath, mAbstractDisplayInfo->parentWidget());
+    }
+    return mDefaultProfile;
+}
+
+bool ThunderbirdImportData::foundMailer() const
+{
+    QDir directory(mPath);
+    if (directory.exists()) {
+        return true;
+    }
+    return false;
+}
+
+bool ThunderbirdImportData::importAddressBook()
+{
+    const QDir addressbookDir(mPath + defaultProfile());
+    ThunderBirdAddressBook account(addressbookDir);
+    account.setAbstractDisplayInfo(mAbstractDisplayInfo);
+    account.importAddressBook();
+    return true;
+}
+
+QString ThunderbirdImportData::name() const
+{
+    return QStringLiteral("Thunderbird");
+}
+
+bool ThunderbirdImportData::importSettings()
+{
+    const QString accountFile = mPath + defaultProfile() + QLatin1String("/prefs.js");
+    if (QFileInfo::exists(accountFile)) {
+        ThunderbirdSettings account(accountFile);
+        account.setAbstractDisplayInfo(mAbstractDisplayInfo);
+        account.importSettings();
+    } else {
+        addImportSettingsInfo(i18n("Thunderbird settings not found."));
+    }
+    return true;
+}
+
+bool ThunderbirdImportData::importMails()
+{
+    //* This should be usually ~/.thunderbird/xxxx.default/Mail/Local Folders/
+    MailImporter::FilterThunderbird thunderbird;
+    initializeFilter(thunderbird);
+    thunderbird.filterInfo()->setStatusMessage(i18n("Import in progress"));
+    const QString mailsPath = mPath + defaultProfile() + QLatin1String("/Mail/Local Folders/");
+    QDir directory(mailsPath);
+    if (directory.exists()) {
+        thunderbird.importMails(mailsPath);
+    } else {
+        thunderbird.import();
+    }
+    thunderbird.filterInfo()->setStatusMessage(i18n("Import finished"));
+    return true;
+}
+
+bool ThunderbirdImportData::importFilters()
+{
+    const QString path(mPath + defaultProfile());
+    QDir dir(path);
+    bool filtersAdded = false;
+    const QStringList subDir = dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
+    if (subDir.isEmpty()) {
+        return true;
+    }
+
+    for (const QString &mailPath : subDir) {
+        const QString subMailPath(path + QLatin1Char('/') + mailPath);
+        QDir dirMail(subMailPath);
+        const QStringList subDirMail = dirMail.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
+        bool foundFilterFile = false;
+        for (const QString &file : subDirMail) {
+            const QString filterFile(subMailPath + QLatin1Char('/') + file + QLatin1String("/msgFilterRules.dat"));
+            if (QFileInfo::exists(filterFile)) {
+                foundFilterFile = true;
+                const bool added = addFilters(filterFile, MailCommon::FilterImporterExporter::ThunderBirdFilter);
+                if (!filtersAdded && added) {
+                    filtersAdded = true;
+                }
+            }
+        }
+        if (!foundFilterFile) {
+            return true;
+        }
+    }
+    return filtersAdded;
+}
+
+LibImportWizard::AbstractImporter::TypeSupportedOptions ThunderbirdImportData::supportedOption()
+{
+    TypeSupportedOptions options;
+    options |= LibImportWizard::AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::Filters;
+    options |= LibImportWizard::AbstractImporter::Settings;
+    options |= LibImportWizard::AbstractImporter::AddressBooks;
+    return options;
+}
+
+#include "thunderbirdimportdata.moc"
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdimportdata.h akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdimportdata.h
--- akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdimportdata.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdimportdata.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#ifndef THUNDERBIRDIMPORTDATA_H
+#define THUNDERBIRDIMPORTDATA_H
+
+#include <ImportWizard/AbstractImporter>
+
+class ThunderbirdImportData : public LibImportWizard::AbstractImporter
+{
+public:
+    explicit ThunderbirdImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
+    ~ThunderbirdImportData();
+
+    TypeSupportedOptions supportedOption() override;
+    bool foundMailer() const override;
+
+    bool importSettings() override;
+    bool importMails() override;
+    bool importFilters() override;
+    bool importAddressBook() override;
+    QString name() const override;
+private:
+    QString defaultProfile();
+
+    QString mDefaultProfile;
+};
+
+#endif /* THUNDERBIRDIMPORTDATA_H */
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdimporter.json akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdimporter.json
--- akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdimporter.json	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdimporter.json	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,32 @@
+{
+    "KPlugin": {
+        "Id": "thunderbirdimporter",
+        "Name": "Thunderbird Importer",
+        "Name[ca@valencia]": "Importador del Thunderbird",
+        "Name[ca]": "Importador del Thunderbird",
+        "Name[cs]": "Importér Thunderbird",
+        "Name[de]": "Import-Modul für Thunderbird",
+        "Name[es]": "Importador Thunderbird",
+        "Name[fi]": "Thunderbird-tuonti",
+        "Name[fr]": "Import Thunderbird",
+        "Name[it]": "Importatore da Thunderbird",
+        "Name[nl]": "Thunderbird-importeur",
+        "Name[pl]": "Importer Thunderbird",
+        "Name[pt]": "Importador do Thunderbird",
+        "Name[sk]": "Importér Thunderbird",
+        "Name[sl]": "Uvoznik iz programa Thunderbird",
+        "Name[sr@ijekavian]": "Увозник из Тандерберда",
+        "Name[sr@ijekavianlatin]": "Uvoznik iz Thunderbirda",
+        "Name[sr@latin]": "Uvoznik iz Thunderbirda",
+        "Name[sr]": "Увозник из Тандерберда",
+        "Name[sv]": "Thunderbird-importverktyg",
+        "Name[tr]": "Thunderbird İçe Aktarıcı",
+        "Name[uk]": "Засіб імпортування з Thunderbird",
+        "Name[x-test]": "xxThunderbird Importerxx",
+        "Name[zh_CN]": "Thunderbird 导入器",
+        "ServiceTypes": [
+            "ImportWizard/PluginMailImporter"
+        ],
+        "Version": "1.0"
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdsettings.cpp akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdsettings.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdsettings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdsettings.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,1058 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "thunderbirdsettings.h"
+#include <mailtransport/transportmanager.h>
+#include "MailCommon/MailUtil"
+#include <ImportWizard/ImportWizardUtil>
+
+
+#include <KIdentityManagement/kidentitymanagement/identity.h>
+#include <KIdentityManagement/kidentitymanagement/signature.h>
+
+#include <QUrl>
+#include <KContacts/VCardConverter>
+#include <QTextStream>
+#include <QStringList>
+#include <QFile>
+#include "thunderbirdplugin_debug.h"
+#include <QStandardPaths>
+#include <QFileInfo>
+#include <QDir>
+
+ThunderbirdSettings::ThunderbirdSettings(const QString &filename)
+    : mFileName(filename)
+{
+
+}
+
+ThunderbirdSettings::~ThunderbirdSettings()
+{
+}
+
+void ThunderbirdSettings::importSettings()
+{
+    QFile file(mFileName);
+    if (!file.open(QIODevice::ReadOnly)) {
+        qCDebug(THUNDERBIRDPLUGIN_LOG) << " We can't open file" << mFileName;
+        return;
+    }
+    QTextStream stream(&file);
+    while (!stream.atEnd()) {
+        const QString line = stream.readLine();
+        if (line.startsWith(QStringLiteral("user_pref"))) {
+            if (line.contains(QStringLiteral("mail.smtpserver")) ||
+                    line.contains(QStringLiteral("mail.server.")) ||
+                    line.contains(QStringLiteral("mail.identity.")) ||
+                    line.contains(QStringLiteral("mail.account.")) ||
+                    line.contains(QStringLiteral("mail.accountmanager.")) ||
+                    line.contains(QStringLiteral("mailnews.")) ||
+                    line.contains(QStringLiteral("mail.compose.")) ||
+                    line.contains(QStringLiteral("mail.spellcheck")) ||
+                    line.contains(QStringLiteral("mail.SpellCheckBeforeSend")) ||
+                    line.contains(QStringLiteral("spellchecker.dictionary")) ||
+                    line.contains(QStringLiteral("ldap_")) ||
+                    line.contains(QStringLiteral("mail.biff.")) ||
+                    line.contains(QStringLiteral("mailnews.tags.")) ||
+                    line.contains(QStringLiteral("extensions.AutoResizeImage.")) ||
+                    line.contains(QStringLiteral("mail.phishing.")) ||
+                    line.contains(QStringLiteral("mail.display_glyph")) ||
+                    line.contains(QStringLiteral("extensions.sieve.account."))) {
+                insertIntoMap(line);
+            }
+        } else {
+            if (!line.startsWith(QLatin1Char('#')) ||
+                    line.isEmpty() ||
+                    line.startsWith(QStringLiteral("/*")) ||
+                    line.startsWith(QStringLiteral(" */")) ||
+                    line.startsWith(QStringLiteral(" *"))) {
+                qCDebug(THUNDERBIRDPLUGIN_LOG) << " unstored line :" << line;
+            }
+
+        }
+    }
+    const QString mailAccountPreference = mHashConfig.value(QStringLiteral("mail.accountmanager.accounts")).toString();
+    if (mailAccountPreference.isEmpty()) {
+        return;
+    }
+    mAccountList = mailAccountPreference.split(QLatin1Char(','));
+    readTransport();
+    readAccount();
+    readGlobalSettings();
+    readLdapSettings();
+    readTagSettings();
+    readExtensionsSettings();
+}
+
+
+void ThunderbirdSettings::readExtensionsSettings()
+{
+    //AutoResizeImage
+    const QString filterPatternEnabledStr = QStringLiteral("extensions.AutoResizeImage.filterPatterns");
+    if (mHashConfig.contains(filterPatternEnabledStr)) {
+        const int filterPatternType = mHashConfig.value(filterPatternEnabledStr).toInt();
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("filter-source-type"), filterPatternType);
+    }
+    const QString filterPatternListStr = QStringLiteral("extensions.AutoResizeImage.filteringPatternsList");
+    if (mHashConfig.contains(filterPatternListStr)) {
+        const QString filterPatternList = mHashConfig.value(filterPatternListStr).toString();
+        //TODO decode it.
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("filter-source-pattern"), filterPatternList);
+    }
+
+    const QString enlargeImagesStr = QStringLiteral("extensions.AutoResizeImage.enlargeImages");
+    if (mHashConfig.contains(enlargeImagesStr)) {
+        const bool enlargeImages = mHashConfig.value(enlargeImagesStr).toBool();
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("enlarge-image-to-minimum"), enlargeImages);
+    }
+
+    const QString maxResolutionXStr = QStringLiteral("extensions.AutoResizeImage.maxResolutionX");
+    if (mHashConfig.contains(maxResolutionXStr)) {
+        const int val = mHashConfig.value(maxResolutionXStr).toInt();
+        int adaptedValue = adaptAutoResizeResolution(val, QStringLiteral("extensions.AutoResizeImage.maxResolutionXList"));
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("maximum-width"), adaptedValue);
+    }
+    const QString maxResolutionYStr = QStringLiteral("extensions.AutoResizeImage.maxResolutionY");
+    if (mHashConfig.contains(maxResolutionYStr)) {
+        const int val = mHashConfig.value(maxResolutionYStr).toInt();
+        int adaptedValue = adaptAutoResizeResolution(val, QStringLiteral("extensions.AutoResizeImage.maxResolutionYList"));
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("maximum-height"), adaptedValue);
+    }
+    const QString minResolutionXStr = QStringLiteral("extensions.AutoResizeImage.minResolutionX");
+    if (mHashConfig.contains(minResolutionXStr)) {
+        const int val = mHashConfig.value(minResolutionXStr).toInt();
+        int adaptedValue = adaptAutoResizeResolution(val, QStringLiteral("extensions.AutoResizeImage.minResolutionXList"));
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("minimum-width"), adaptedValue);
+    }
+    const QString minResolutionYStr = QStringLiteral("extensions.AutoResizeImage.minResolutionY");
+    if (mHashConfig.contains(minResolutionYStr)) {
+        const int val = mHashConfig.value(minResolutionYStr).toInt();
+        int adaptedValue = adaptAutoResizeResolution(val, QStringLiteral("extensions.AutoResizeImage.minResolutionYList"));
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("minimum-height"), adaptedValue);
+    }
+
+    //Default is true.
+    const QString reduceImageStr(QStringLiteral("extensions.AutoResizeImage.reduceImages"));
+    if (mHashConfig.contains(reduceImageStr)) {
+        const bool reduce = mHashConfig.value(reduceImageStr).toBool();
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("reduce-image-to-maximum"), reduce);
+    } else {
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("reduce-image-to-maximum"), false);
+    }
+
+    const QString filterMinimumStr(QStringLiteral("extensions.AutoResizeImage.filterMinimumSize"));
+    if (mHashConfig.contains(filterMinimumStr)) {
+        const bool filterMinimum = mHashConfig.value(filterMinimumStr).toBool();
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("skip-image-lower-size-enabled"), filterMinimum);
+    }
+    const QString skipMinimumSizeStr(QStringLiteral("extensions.AutoResizeImage.minimumSize"));
+    if (mHashConfig.contains(skipMinimumSizeStr)) {
+        const int skipMinimumSize = mHashConfig.value(skipMinimumSizeStr).toInt();
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("skip-image-lower-size"), skipMinimumSize);
+    }
+    const QString confirmBeforeResizingStr(QStringLiteral("extensions.AutoResizeImage.confirmResizing"));
+    if (mHashConfig.contains(confirmBeforeResizingStr)) {
+        const bool confirmBeforeResizing = mHashConfig.value(confirmBeforeResizingStr).toBool();
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("ask-before-resizing"), confirmBeforeResizing);
+    }
+    //extensions.AutoResizeImage.convertImages : not implemented in kmail
+
+    const QString conversionFormatStr(QStringLiteral("extensions.AutoResizeImage.conversionFormat"));
+    if (mHashConfig.contains(conversionFormatStr)) {
+        QString conversionFormat = mHashConfig.value(conversionFormatStr).toString();
+        if (conversionFormat == QLatin1String("png")) {
+            conversionFormat = QStringLiteral("PNG");
+        } else {
+            conversionFormat = QStringLiteral("JPG");
+        }
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("write-format"), conversionFormat);
+    }
+
+    const QString filterRecipientsStr(QStringLiteral("extensions.AutoResizeImage.filterRecipients"));
+    if (mHashConfig.contains(filterRecipientsStr)) {
+        const int filterRecipients = mHashConfig.value(filterRecipientsStr).toInt();
+        switch (filterRecipients) {
+        case 0:
+            addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("FilterRecipientType"), QStringLiteral("NoFilter"));
+            break;
+        case 1:
+            addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("FilterRecipientType"), QStringLiteral("ResizeEachEmailsContainsPattern"));
+            break;
+        case 2:
+            addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("FilterRecipientType"), QStringLiteral("ResizeOneEmailContainsPattern"));
+            break;
+        case 3:
+            addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("FilterRecipientType"), QStringLiteral("DontResizeEachEmailsContainsPattern"));
+            break;
+        case 4:
+            addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("FilterRecipientType"), QStringLiteral("DontResizeOneEmailContainsPattern"));
+            break;
+        default:
+            qCDebug(THUNDERBIRDPLUGIN_LOG) << " unknown FilterRecipientType: " << filterRecipients;
+            break;
+        }
+    }
+
+    const QString filteringRecipientsPatternsWhiteListStr(QStringLiteral("extensions.AutoResizeImage.filteringRecipientsPatternsWhiteList"));
+    if (mHashConfig.contains(filteringRecipientsPatternsWhiteListStr)) {
+        const QString filteringRecipientsPatternsWhiteList = mHashConfig.value(filteringRecipientsPatternsWhiteListStr).toString();
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("resize-emails-pattern"), filteringRecipientsPatternsWhiteList);
+    }
+
+    const QString filteringRecipientsPatternsBlackListStr(QStringLiteral("extensions.AutoResizeImage.filteringRecipientsPatternsBlackList"));
+    if (mHashConfig.contains(filteringRecipientsPatternsBlackListStr)) {
+        const QString filteringRecipientsPatternsBlackList = mHashConfig.value(filteringRecipientsPatternsBlackListStr).toString();
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("do-not-resize-emails-pattern"), filteringRecipientsPatternsBlackList);
+    }
+
+    const QString filteringRenamingPatternStr(QStringLiteral("extensions.AutoResizeImage.renamingPattern"));
+    if (mHashConfig.contains(filteringRenamingPatternStr)) {
+        QString filteringRenamingPattern = mHashConfig.value(filteringRenamingPatternStr).toString();
+        filteringRenamingPattern.replace(QStringLiteral("%3Fn"), QStringLiteral("%n"));
+        filteringRenamingPattern.replace(QStringLiteral("%3Ft"), QStringLiteral("%t"));
+        filteringRenamingPattern.replace(QStringLiteral("%3Fd"), QStringLiteral("%d"));
+        filteringRenamingPattern.replace(QStringLiteral("%3Fe"), QStringLiteral("%e"));
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("rename-resized-images-pattern"), filteringRenamingPattern);
+    }
+
+    const QString filteringRenamingImageStr(QStringLiteral("extensions.AutoResizeImage.renameResizedImages"));
+    if (mHashConfig.contains(filteringRenamingImageStr)) {
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("rename-resized-images"), true);
+    }
+
+    const QString filteringImageFormatsStr(QStringLiteral("extensions.AutoResizeImage.imageFormats"));
+    if (mHashConfig.contains(filteringImageFormatsStr)) {
+        const QString filteringImageFormats = mHashConfig.value(filteringImageFormatsStr).toString();
+        //convert it.
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("resize-image-with-formats-type"), filteringImageFormats);
+    }
+
+    const QString filteringImageFormatsEnabledStr(QStringLiteral("extensions.AutoResizeImage.filterFormats"));
+    if (mHashConfig.contains(filteringImageFormatsEnabledStr)) {
+        const bool filteringImageFormatsEnabled = mHashConfig.value(filteringImageFormatsEnabledStr).toBool();
+        addKmailConfig(QStringLiteral("AutoResizeImage"), QStringLiteral("resize-image-with-formats"), filteringImageFormatsEnabled);
+    }
+}
+
+int ThunderbirdSettings::adaptAutoResizeResolution(int index, const QString &configStrList)
+{
+    switch (index) {
+    case 0:
+        return 240;
+    case 1:
+        return 320;
+    case 2:
+        return 512;
+    case 3:
+        return 640;
+    case 4:
+        return 800;
+    case 5:
+        return 1024;
+    case 6:
+        return 1280;
+    case 7:
+        return 2048;
+    case 8:
+        return 1024;
+    case 9: { //custom case
+        if (mHashConfig.contains(configStrList)) {
+            const QString res =  mHashConfig.value(configStrList).toString();
+            const QStringList lst = res.split(QLatin1Char(';'));
+            int val = lst.last().toInt();
+            return val;
+        }
+#if QT_VERSION >= QT_VERSION_CHECK(5,8,0)
+        Q_FALLTHROUGH();
+#endif
+    }
+    default:
+        return -1;
+    }
+}
+
+void ThunderbirdSettings::readTagSettings()
+{
+    QVector<tagStruct> v;
+    v.reserve(mHashTag.size());
+    for (const tagStruct &tag : qAsConst(mHashTag)) {
+        v.push_back(tag);
+    }
+
+    ImportWizardUtil::addAkonadiTag(v);
+}
+
+void ThunderbirdSettings::readLdapSettings()
+{
+    //qCDebug(THUNDERBIRDPLUGIN_LOG)<<" mLdapAccountList:"<<mLdapAccountList;
+    for (const QString &ldapAccountName : qAsConst(mLdapAccountList)) {
+        ldapStruct ldap;
+        const QString ldapDescription = QStringLiteral("%1.description").arg(ldapAccountName);
+        if (mHashConfig.contains(ldapDescription)) {
+            ldap.description = mHashConfig.value(ldapDescription).toString();
+        }
+        const QString ldapAuthDn = QStringLiteral("%1.auth.dn").arg(ldapAccountName);
+        if (mHashConfig.contains(ldapAuthDn)) {
+            ldap.dn = mHashConfig.value(ldapAuthDn).toString();
+        }
+        const QString ldapAuthSaslMech = QStringLiteral("%1.auth.saslmech").arg(ldapAccountName);
+        if (mHashConfig.contains(ldapAuthSaslMech)) {
+            ldap.saslMech = mHashConfig.value(ldapAuthSaslMech).toString();
+        }
+        const QString ldapFilename = QStringLiteral("%1.filename").arg(ldapAccountName);
+        if (mHashConfig.contains(ldapFilename)) {
+            ldap.fileName = mHashConfig.value(ldapFilename).toString();
+        }
+        const QString ldapMaxHits = QStringLiteral("%1.maxHits").arg(ldapAccountName);
+        if (mHashConfig.contains(ldapMaxHits)) {
+            ldap.fileName = mHashConfig.value(ldapMaxHits).toInt();
+        }
+        const QString ldapUri = QStringLiteral("%1.uri").arg(ldapAccountName);
+        if (mHashConfig.contains(ldapUri)) {
+            ldap.ldapUrl = QUrl(mHashConfig.value(ldapUri).toString());
+            ldap.port = ldap.ldapUrl.port();
+
+            if (ldap.ldapUrl.scheme() == QLatin1String("ldaps")) {
+                ldap.useSSL = true;
+            } else if (ldap.ldapUrl.scheme() == QLatin1String("ldap")) {
+                ldap.useSSL = false;
+            } else {
+                qCDebug(THUNDERBIRDPLUGIN_LOG) << " Security not implemented :" << ldap.ldapUrl.scheme();
+            }
+        }
+        ImportWizardUtil::mergeLdap(ldap);
+    }
+}
+
+void ThunderbirdSettings::readGlobalSettings()
+{
+    const QString markMessageReadStr = QStringLiteral("mailnews.mark_message_read.delay");
+    if (mHashConfig.contains(markMessageReadStr)) {
+        const bool markMessageRead = mHashConfig.value(markMessageReadStr).toBool();
+        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkAsRead"), markMessageRead);
+    } else {
+        //Default value
+        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkAsRead"), true);
+    }
+    const QString markMessageReadIntervalStr = QStringLiteral("mailnews.mark_message_read.delay.interval");
+    if (mHashConfig.contains(markMessageReadIntervalStr)) {
+        bool found = false;
+        const int markMessageReadInterval = mHashConfig.value(markMessageReadIntervalStr).toInt(&found);
+        if (found) {
+            addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkTime"), markMessageReadInterval);
+        }
+    } else {
+        //Default 5 seconds
+        addKmailConfig(QStringLiteral("Behaviour"), QStringLiteral("DelayedMarkTime"), 5);
+    }
+
+    const QString mailComposeAttachmentReminderStr = QStringLiteral("mail.compose.attachment_reminder");
+    if (mHashConfig.contains(mailComposeAttachmentReminderStr)) {
+        const bool mailComposeAttachmentReminder = mHashConfig.value(mailComposeAttachmentReminderStr).toBool();
+        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("showForgottenAttachmentWarning"), mailComposeAttachmentReminder);
+    } else {
+        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("showForgottenAttachmentWarning"), true);
+    }
+
+    const QString mailComposeAttachmentReminderKeywordsStr = QStringLiteral("mail.compose.attachment_reminder_keywords");
+    if (mHashConfig.contains(mailComposeAttachmentReminderKeywordsStr)) {
+        const QString mailComposeAttachmentReminderKeywords = mHashConfig.value(mailComposeAttachmentReminderKeywordsStr).toString();
+        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("attachment-keywords"), mailComposeAttachmentReminderKeywords);
+    } //not default value keep kmail use one default value
+
+    const QString mailComposeAutosaveStr = QStringLiteral("mail.compose.autosave");
+    if (mHashConfig.contains(mailComposeAutosaveStr)) {
+        const bool mailComposeAutosave = mHashConfig.value(mailComposeAutosaveStr).toBool();
+        if (mailComposeAutosave) {
+            const QString mailComposeAutosaveintervalStr = QStringLiteral("mail.compose.autosaveinterval");
+            if (mHashConfig.contains(mailComposeAutosaveintervalStr)) {
+                bool found = false;
+                const int mailComposeAutosaveinterval = mHashConfig.value(mailComposeAutosaveintervalStr).toInt(&found);
+                if (found) {
+                    addKmailConfig(QStringLiteral("Composer"), QStringLiteral("autosave"), mailComposeAutosaveinterval);
+                } else {
+                    addKmailConfig(QStringLiteral("Composer"), QStringLiteral("autosave"), 5);
+                }
+            } else {
+                //Default value
+                addKmailConfig(QStringLiteral("Composer"), QStringLiteral("autosave"), 5);
+            }
+        } else {
+            //Don't autosave
+            addKmailConfig(QStringLiteral("Composer"), QStringLiteral("autosave"), 0);
+        }
+    }
+
+    const QString mailSpellCheckInlineStr = QStringLiteral("mail.spellcheck.inline");
+    if (mHashConfig.contains(mailSpellCheckInlineStr)) {
+        const bool mailSpellCheckInline = mHashConfig.value(mailSpellCheckInlineStr).toBool();
+        addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("backgroundCheckerEnabled"), mailSpellCheckInline);
+    } else {
+        addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("backgroundCheckerEnabled"), false);
+    }
+
+    const QString mailAlertShowSubjectStr = QStringLiteral("mail.biff.alert.show_subject");
+    if (mHashConfig.contains(mailAlertShowSubjectStr)) {
+        const bool mailAlertShowSubject = mHashConfig.value(mailAlertShowSubjectStr).toBool();
+        addNewMailNotifier(QStringLiteral("General"), QStringLiteral("showSubject"), mailAlertShowSubject);
+    } else {
+        //Default value in thunderbird
+        addNewMailNotifier(QStringLiteral("General"), QStringLiteral("showSubject"), true);
+    }
+
+    const QString mailAlertShowPreviewStr = QStringLiteral("mail.biff.alert.show_preview");
+    //TODO add show preview
+    if (mHashConfig.contains(mailAlertShowPreviewStr)) {
+        const bool mailAlertShowPreview = mHashConfig.value(mailAlertShowPreviewStr).toBool();
+        //addNewMailNotifier(QStringLiteral("General"),QStringLiteral("showSubject"), mailAlertShowPreview);
+    } else {
+        //Default value in thunderbird
+        //addNewMailNotifier(QStringLiteral("General"),QStringLiteral("showSubject"), true);
+    }
+
+    const QString mailAlertShowSenderStr = QStringLiteral("mail.biff.alert.show_sender");
+    if (mHashConfig.contains(mailAlertShowSenderStr)) {
+        const bool mailAlertShowSender = mHashConfig.value(mailAlertShowSenderStr).toBool();
+        addNewMailNotifier(QStringLiteral("General"), QStringLiteral("showFrom"), mailAlertShowSender);
+    } else {
+        //Default value in thunderbird
+        addNewMailNotifier(QStringLiteral("General"), QStringLiteral("showFrom"), true);
+    }
+
+    const QString mailSpellCheckBeforeSendStr = QStringLiteral("mail.SpellCheckBeforeSend");
+    if (mHashConfig.contains(mailSpellCheckBeforeSendStr)) {
+        const bool mailSpellCheckBeforeSend = mHashConfig.value(mailSpellCheckBeforeSendStr).toBool();
+        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("check-spelling-before-send"), mailSpellCheckBeforeSend);
+    } else {
+        addKmailConfig(QStringLiteral("Composer"), QStringLiteral("check-spelling-before-send"), false);
+    }
+
+    const QString mailSpellCheckLanguageStr = QStringLiteral("spellchecker.dictionary");
+    if (mHashConfig.contains(mailSpellCheckLanguageStr)) {
+        const QString mailSpellCheckLanguage = mHashConfig.value(mailSpellCheckLanguageStr).toString();
+        addKmailConfig(QStringLiteral("Spelling"), QStringLiteral("defaultLanguage"), mailSpellCheckLanguage);
+        //TODO create map to convert thunderbird name to aspell name
+    }
+
+    const QString mailPhishingDetectionStr = QStringLiteral("mail.phishing.detection.enabled");
+    if (mHashConfig.contains(mailPhishingDetectionStr)) {
+        const bool mailPhishingDetectionEnabled = mHashConfig.value(mailPhishingDetectionStr).toBool();
+        addKmailConfig(QStringLiteral("Reader"), QStringLiteral("ScamDetectionEnabled"), mailPhishingDetectionEnabled);
+    } else { //Default
+        addKmailConfig(QStringLiteral("Reader"), QStringLiteral("ScamDetectionEnabled"), true);
+    }
+
+    const QString mailDisplayGlyphStr = QStringLiteral("mail.display_glyph");
+    if (mHashConfig.contains(mailDisplayGlyphStr)) {
+        const bool mailDisplayGlyphEnabled = mHashConfig.value(mailDisplayGlyphStr).toBool();
+        addKmailConfig(QStringLiteral("Reader"), QStringLiteral("ShowEmoticons"), mailDisplayGlyphEnabled);
+    } else { //Default
+        addKmailConfig(QStringLiteral("Reader"), QStringLiteral("ShowEmoticons"), true);
+    }
+
+}
+
+void ThunderbirdSettings::importSieveSettings(QMap<QString, QVariant> &settings, const QString &userName, const QString &imapServerName)
+{
+    QString userNameSieveConverted = userName;
+    userNameSieveConverted.replace(QLatin1Char('@'), QStringLiteral("%40"));
+
+    const QString sieveKeyServerUserName = QStringLiteral("extensions.sieve.account.") + userNameSieveConverted + QLatin1Char('@') + imapServerName;
+    //user_pref("extensions.sieve.account.<username>@<server>.enabled", true);
+    if (mHashConfig.value(sieveKeyServerUserName + QStringLiteral(".enabled"), false).toBool()) {
+        settings.insert(QStringLiteral("SieveSupport"), true);
+        settings.insert(QStringLiteral("SievePort"), mHashConfig.value(sieveKeyServerUserName + QStringLiteral(".port"), 4190).toInt());
+        //TODO add more
+    }
+#if 0
+    <group name="siever">
+      <entry name="SieveSupport" type="Bool">
+        <label>Define if server supports sieve</label>
+        <default>false</default>
+      </entry>
+      <entry name="SieveReuseConfig" type="Bool">
+        <label>Define if we reuse host and login configuration</label>
+        <default>true</default>
+      </entry>
+      <entry name="SievePort" type="Int">
+        <label>Define sieve port</label>
+        <default>4190</default>
+      </entry>
+      <entry name="SieveAlternateUrl" type="String">
+        <label>Define alternate URL</label>
+      </entry>
+      <entry name="AlternateAuthentication" type="Int">
+        <label>Defines the authentication type to use for alternate server</label>
+        <default>1</default>
+      </entry>
+      <entry name="SieveVacationFilename" type="String">
+        <label>Define default sieve vacation filename</label>
+        <default>kmail-vacation.siv</default>
+      </entry>
+      <entry name="SieveCustomUsername" type="String">
+        <label>Define username used from custom server sieve url</label>
+        <default></default>
+      </entry>
+      <entry name="SieveCustomAuthentification" type="String">
+        <label>Defines the type of identification used by custom sieve server</label>
+        <default>ImapUserPassword</default>
+      </entry>
+    </group>
+
+#endif
+#if 0
+    if (mHashConfig.value(sieveKeyServerUserName + QStringLiteral(".enabled"), false).toBool()) {
+        //TODO
+        //user_pref("extensions.sieve.account.<username>@<server>.TLS", true);
+        //user_pref("extensions.sieve.account.<username>@<server>.TLS.forced", true);
+        //user_pref("extensions.sieve.account.<username>@<server>.activeAuthorization", 1);
+        //user_pref("extensions.sieve.account.<username>@<server>.activeHost", 1);
+        //user_pref("extensions.sieve.account.<username>@<server>.activeLogin", 1);
+        SieveEditorUtil::SieveServerConfig config;
+        //0 4190
+        //1 2000
+        //2 custom
+        //Default == 4190
+        //user_pref("extensions.sieve.account.<username>@<server>.port", 1255);
+        config.sieveSettings.port = mHashConfig.value(sieveKeyServerUserName + QStringLiteral(".port"), 4190).toInt();
+        //not necessary to import this one : user_pref("extensions.sieve.account.<username>@<server>.port.type", 1);
+
+        //user_pref("extensions.sieve.account.<username>@<server>.hostname", "sdfsfsqsdf");
+        const QString sieveHostName = mHashConfig.value(sieveKeyServerUserName + QStringLiteral(".hostname")).toString();
+        if (sieveHostName.isEmpty()) {
+            config.sieveSettings.serverName = imapServerName;
+        } else {
+            config.sieveSettings.serverName = sieveHostName;
+        }
+
+        const QString sieveUserName = mHashConfig.value(sieveKeyServerUserName + QStringLiteral(".login.username")).toString();
+        //user_pref("extensions.sieve.account.<username>@<server>.login.username", "newuser");
+        if (sieveUserName.isEmpty()) {
+            config.sieveSettings.userName = userName;
+        } else {
+            config.sieveSettings.userName = sieveUserName;
+        }
+
+        //not necessary to import this one : user_pref("extensions.sieve.account.<username>@<server>.proxy.type", 1);
+
+
+        ////FIXME qCDebug(SIEVEEDITOR_LOG) << "imap account " << accountName;
+        const QString name = mHashConfig.value(accountName + QStringLiteral(".name")).toString();
+        bool found;
+        const int sievePort = mHashConfig.value(accountName + QStringLiteral(".port")).toInt(&found);
+        if (found) {
+            config.sieveImapAccountSettings.setPort(sievePort);
+        }
+        encryption(config, accountName);
+        addAuth(config, accountName);
+        config.sieveImapAccountSettings.setUserName(userName);
+        config.sieveImapAccountSettings.setServerName(imapServerName);
+
+        if (config.isValid()) {
+            atLeastAnAccountFound = true;
+            Q_EMIT importSetting(name, config);
+        }
+    }
+
+#endif
+}
+
+void ThunderbirdSettings::addAuth(QMap<QString, QVariant> &settings, const QString &argument, const QString &accountName)
+{
+    bool found = false;
+    if (mHashConfig.contains(accountName + QStringLiteral(".authMethod"))) {
+        const int authMethod = mHashConfig.value(accountName + QStringLiteral(".authMethod")).toInt(&found);
+        if (found) {
+            switch (authMethod) {
+            case 0:
+                settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::PLAIN);   //????
+                break;
+            case 4: //Encrypted password ???
+                settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::LOGIN);   //????
+                qCDebug(THUNDERBIRDPLUGIN_LOG) << " authmethod == encrypt password";
+                break;
+            case 5: //GSSAPI
+                settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::GSSAPI);
+                break;
+            case 6: //NTLM
+                settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::NTLM);
+                break;
+            case 7: //TLS
+                qCDebug(THUNDERBIRDPLUGIN_LOG) << " authmethod method == TLS"; //????
+                break;
+            case 10: //OAuth2 verify it.
+                settings.insert(argument, MailTransport::Transport::EnumAuthenticationType::XOAUTH2);
+                qCDebug(THUNDERBIRDPLUGIN_LOG) << " authmethod method == OAuth2"; //????
+                break;
+            default:
+                qCDebug(THUNDERBIRDPLUGIN_LOG) << " ThunderbirdSettings::addAuth unknown :" << authMethod;
+                break;
+            }
+        }
+    }
+}
+
+void ThunderbirdSettings::readAccount()
+{
+    for (const QString &account : qAsConst(mAccountList)) {
+        const QString serverName = mHashConfig.value(QStringLiteral("mail.account.%1").arg(account) + QStringLiteral(".server")).toString();
+        const QString accountName = QStringLiteral("mail.server.%1").arg(serverName);
+        const QString host = mHashConfig.value(accountName + QStringLiteral(".hostname")).toString();
+        const QString userName = mHashConfig.value(accountName + QStringLiteral(".userName")).toString();
+        const QString name = mHashConfig.value(accountName + QStringLiteral(".name")).toString();
+
+        const QString type = mHashConfig.value(accountName + QStringLiteral(".type")).toString();
+        //TODO use it ?
+        //const QString directory = mHashConfig.value(accountName + QStringLiteral(".directory")).toString();
+
+        const QString loginAtStartupStr = accountName + QStringLiteral(".login_at_startup");
+        bool loginAtStartup = true; //Default for thunderbird;
+        if (mHashConfig.contains(loginAtStartupStr)) {
+            loginAtStartup = mHashConfig.value(loginAtStartupStr).toBool();
+        }
+        bool found = false;
+        if (type == QLatin1String("imap")) {
+            QMap<QString, QVariant> settings;
+            settings.insert(QStringLiteral("ImapServer"), host);
+            settings.insert(QStringLiteral("UserName"), userName);
+            const int port = mHashConfig.value(accountName + QStringLiteral(".port")).toInt(&found);
+            if (found) {
+                settings.insert(QStringLiteral("ImapPort"), port);
+            }
+            addAuth(settings, QStringLiteral("Authentication"), accountName);
+            const QString offline = accountName + QStringLiteral(".offline_download");
+            if (mHashConfig.contains(offline)) {
+                const bool offlineStatus = mHashConfig.value(offline).toBool();
+                if (offlineStatus) {
+                    settings.insert(QStringLiteral("DisconnectedModeEnabled"), offlineStatus);
+                }
+            } else {
+                //default value == true
+                settings.insert(QStringLiteral("DisconnectedModeEnabled"), true);
+            }
+
+            found = false;
+            const int socketType = mHashConfig.value(accountName + QStringLiteral(".socketType")).toInt(&found);
+            if (found) {
+                switch (socketType) {
+                case 0:
+                    //None
+                    settings.insert(QStringLiteral("Safety"), QStringLiteral("None"));
+                    break;
+                case 2:
+                    //STARTTLS
+                    settings.insert(QStringLiteral("Safety"), QStringLiteral("STARTTLS"));
+                    break;
+                case 3:
+                    //SSL/TLS
+                    settings.insert(QStringLiteral("Safety"), QStringLiteral("SSL"));
+                    break;
+                default:
+                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " socketType " << socketType;
+                    break;
+                }
+            }
+            const QString checkNewMailStr = accountName + QStringLiteral(".check_new_mail");
+            if (mHashConfig.contains(checkNewMailStr)) {
+                const bool checkNewMail = mHashConfig.value(checkNewMailStr).toBool();
+                settings.insert(QStringLiteral("IntervalCheckEnabled"), checkNewMail);
+            }
+
+            const QString checkTimeStr = accountName + QStringLiteral(".check_time");
+            if (mHashConfig.contains(checkTimeStr)) {
+                found = false;
+                const int checkTime = mHashConfig.value(checkTimeStr).toInt(&found);
+                if (found) {
+                    settings.insert(QStringLiteral("IntervalCheckTime"), checkTime);
+                }
+            } else {
+                //Default value from thunderbird
+                settings.insert(QStringLiteral("IntervalCheckTime"), 10);
+            }
+            const QString trashFolderStr = accountName + QStringLiteral(".trash_folder_name");
+            if (mHashConfig.contains(trashFolderStr)) {
+                settings.insert(QStringLiteral("TrashCollection"), MailCommon::Util::convertFolderPathToCollectionId(mHashConfig.value(trashFolderStr).toString()));
+            }
+            importSieveSettings(settings, userName, serverName);
+
+
+            const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, settings);
+            addCheckMailOnStartup(agentIdentifyName, loginAtStartup);
+            //Not find a method to disable it in thunderbird
+            addToManualCheck(agentIdentifyName, true);
+        } else if (type == QLatin1String("pop3")) {
+            QMap<QString, QVariant> settings;
+            settings.insert(QStringLiteral("Host"), host);
+            settings.insert(QStringLiteral("Login"), userName);
+
+            const bool leaveOnServer = mHashConfig.value(accountName + QStringLiteral(".leave_on_server")).toBool();
+            if (leaveOnServer) {
+                settings.insert(QStringLiteral("LeaveOnServer"), leaveOnServer);
+            }
+
+            found = false;
+            const int numberDayToLeave = mHashConfig.value(accountName + QStringLiteral(".num_days_to_leave_on_server")).toInt(&found);
+            if (found) {
+                settings.insert(QStringLiteral("LeaveOnServerDays"), numberDayToLeave);
+            }
+
+            found = false;
+            const int port = mHashConfig.value(accountName + QStringLiteral(".port")).toInt(&found);
+            if (found) {
+                settings.insert(QStringLiteral("Port"), port);
+            }
+
+            found = false;
+            const int socketType = mHashConfig.value(accountName + QStringLiteral(".socketType")).toInt(&found);
+            if (found) {
+                switch (socketType) {
+                case 0:
+                    //None
+                    //nothing
+                    break;
+                case 2:
+                    //STARTTLS
+                    settings.insert(QStringLiteral("UseTLS"), true);
+                    break;
+                case 3:
+                    //SSL/TLS
+                    settings.insert(QStringLiteral("UseSSL"), true);
+                    break;
+                default:
+                    qCDebug(THUNDERBIRDPLUGIN_LOG) << " socketType " << socketType;
+                    break;
+                }
+            }
+            addAuth(settings, QStringLiteral("AuthenticationMethod"), accountName);
+            const QString checkNewMailStr = accountName + QStringLiteral(".check_new_mail");
+            if (mHashConfig.contains(checkNewMailStr)) {
+                const bool checkNewMail = mHashConfig.value(checkNewMailStr).toBool();
+                settings.insert(QStringLiteral("IntervalCheckEnabled"), checkNewMail);
+            }
+            const QString checkTimeStr = accountName + QStringLiteral(".check_time");
+            if (mHashConfig.contains(checkTimeStr)) {
+                found = false;
+                const int checkTime = mHashConfig.value(checkTimeStr).toInt(&found);
+                if (found) {
+                    settings.insert(QStringLiteral("IntervalCheckInterval"), checkTime);
+                }
+            } else {
+                //Default value from thunderbird
+                settings.insert(QStringLiteral("IntervalCheckInterval"), 10);
+            }
+
+            const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_pop3_resource"), name, settings);
+            addCheckMailOnStartup(agentIdentifyName, loginAtStartup);
+            //Not find a method to disable it in thunderbird
+            addToManualCheck(agentIdentifyName, true);
+        } else if (type == QLatin1String("none")) {
+            //FIXME look at if we can implement it
+            qCDebug(THUNDERBIRDPLUGIN_LOG) << " account type none!";
+        } else if (type == QLatin1String("movemail")) {
+            qCDebug(THUNDERBIRDPLUGIN_LOG) << " movemail accound found and not implemented in importthunderbird";
+        } else if (type == QLatin1String("rss")) {
+            qCDebug(THUNDERBIRDPLUGIN_LOG) << " rss resource needs to be implemented";
+            continue;
+        } else if (type == QLatin1String("nntp")) {
+            qCDebug(THUNDERBIRDPLUGIN_LOG) << " nntp resource need to be implemented";
+            continue;
+        } else {
+            qCDebug(THUNDERBIRDPLUGIN_LOG) << " type unknown : " << type;
+            continue;
+        }
+
+        const QString identityConfig = QStringLiteral("mail.account.%1").arg(account) + QStringLiteral(".identities");
+        if (mHashConfig.contains(identityConfig)) {
+            const QStringList idList = mHashConfig.value(identityConfig).toString().split(QLatin1Char(','));
+            for (const QString &id : idList) {
+                readIdentity(id);
+            }
+        }
+    }
+}
+
+void ThunderbirdSettings::readTransport()
+{
+    const QString mailSmtpServer = mHashConfig.value(QStringLiteral("mail.smtpservers")).toString();
+    if (mailSmtpServer.isEmpty()) {
+        return;
+    }
+    const QStringList smtpList = mailSmtpServer.split(QLatin1Char(','));
+    QString defaultSmtp = mHashConfig.value(QStringLiteral("mail.smtp.defaultserver")).toString();
+    if (smtpList.count() == 1 && defaultSmtp.isEmpty()) {
+        //Be sure to define default smtp
+        defaultSmtp = smtpList.at(0);
+    }
+
+    for (const QString &smtp : smtpList) {
+        const QString smtpName = QStringLiteral("mail.smtpserver.%1").arg(smtp);
+        MailTransport::Transport *mt = createTransport();
+        mt->setIdentifier(QStringLiteral("SMTP"));
+        const QString name = mHashConfig.value(smtpName + QStringLiteral(".description")).toString();
+        mt->setName(name);
+        const QString hostName = mHashConfig.value(smtpName + QStringLiteral(".hostname")).toString();
+        mt->setHost(hostName);
+
+        const int port = mHashConfig.value(smtpName + QStringLiteral(".port")).toInt();
+        if (port > 0) {
+            mt->setPort(port);
+        }
+
+        const int authMethod = mHashConfig.value(smtpName + QStringLiteral(".authMethod")).toInt();
+        switch (authMethod) {
+        case 0:
+            break;
+        case 1: //No authentication
+            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::PLAIN); //????
+            break;
+        case 3: //Unencrypted password
+            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::CLEAR); //???
+            break;
+        case 4: //crypted password
+            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::LOGIN); //???
+            break;
+        case 5: //GSSAPI
+            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::GSSAPI);
+            break;
+        case 6: //NTLM
+            mt->setAuthenticationType(MailTransport::Transport::EnumAuthenticationType::NTLM);
+            break;
+        default:
+            qCDebug(THUNDERBIRDPLUGIN_LOG) << " authMethod unknown :" << authMethod;
+            break;
+        }
+
+        const int trySsl = mHashConfig.value(smtpName + QStringLiteral(".try_ssl")).toInt();
+        switch (trySsl) {
+        case 0:
+            mt->setEncryption(MailTransport::Transport::EnumEncryption::None);
+            break;
+        case 2:
+            mt->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
+            break;
+        case 3:
+            mt->setEncryption(MailTransport::Transport::EnumEncryption::SSL);
+            break;
+        default:
+            qCDebug(THUNDERBIRDPLUGIN_LOG) << " trySsl unknown :" << trySsl;
+            break;
+        }
+
+        const QString userName = mHashConfig.value(smtpName + QStringLiteral(".username")).toString();
+        if (!userName.isEmpty()) {
+            mt->setUserName(userName);
+            if (authMethod > 1) {
+                mt->setRequiresAuthentication(true);
+            }
+        }
+
+        storeTransport(mt, (smtp == defaultSmtp));
+        mHashSmtp.insert(smtp, QString::number(mt->id()));
+    }
+}
+
+QString convertThunderbirdPath(const QString &path)
+{
+    QString newPath;
+    QUrl url(path);
+    newPath = url.path();
+    newPath.remove(0, 1);
+    return MailCommon::Util::convertFolderPathToCollectionStr(newPath);
+}
+
+void ThunderbirdSettings::readIdentity(const QString &account)
+{
+    const QString identity = QStringLiteral("mail.identity.%1").arg(account);
+    QString fullName = mHashConfig.value(identity + QStringLiteral(".fullName")).toString();
+    KIdentityManagement::Identity *newIdentity = createIdentity(fullName);
+
+    const QString smtpServer = mHashConfig.value(identity + QStringLiteral(".smtpServer")).toString();
+    if (!smtpServer.isEmpty() && mHashSmtp.contains(smtpServer)) {
+        newIdentity->setTransport(mHashSmtp.value(smtpServer));
+    }
+
+    const QString userEmail = mHashConfig.value(identity + QStringLiteral(".useremail")).toString();
+    newIdentity->setPrimaryEmailAddress(userEmail);
+
+    newIdentity->setFullName(fullName);
+    newIdentity->setIdentityName(fullName);
+
+    const QString organization = mHashConfig.value(identity + QStringLiteral(".organization")).toString();
+    newIdentity->setOrganization(organization);
+
+    bool doBcc = mHashConfig.value(identity + QStringLiteral(".doBcc")).toBool();
+    if (doBcc) {
+        const QString bcc = mHashConfig.value(identity + QStringLiteral(".doBccList")).toString();
+        newIdentity->setBcc(bcc);
+    }
+
+    bool doCc = mHashConfig.value(identity + QStringLiteral(".doCc")).toBool();
+    if (doCc) {
+        const QString cc = mHashConfig.value(identity + QStringLiteral(".doCcList")).toString();
+        newIdentity->setCc(cc);
+    }
+
+    const QString replyTo = mHashConfig.value(identity + QStringLiteral(".reply_to")).toString();
+    newIdentity->setReplyToAddr(replyTo);
+
+    KIdentityManagement::Signature signature;
+    const bool signatureHtml = mHashConfig.value(identity + QStringLiteral(".htmlSigFormat")).toBool();
+    if (signatureHtml) {
+        signature.setInlinedHtml(true);
+    }
+
+    const bool attachSignature = mHashConfig.value(identity + QStringLiteral(".attach_signature")).toBool();
+    if (attachSignature) {
+        const QString fileSignature = mHashConfig.value(identity + QStringLiteral(".sig_file")).toString();
+        signature.setType(KIdentityManagement::Signature::FromFile);
+        signature.setPath(fileSignature, false);
+    } else {
+        const QString textSignature = mHashConfig.value(identity + QStringLiteral(".htmlSigText")).toString();
+        signature.setType(KIdentityManagement::Signature::Inlined);
+        signature.setText(textSignature);
+    }
+
+    if (mHashConfig.contains(identity + QStringLiteral(".drafts_folder_picker_mode"))) {
+        const int useSpecificDraftFolder = mHashConfig.value(identity + QStringLiteral(".drafts_folder_picker_mode")).toInt();
+        if (useSpecificDraftFolder == 1) {
+            const QString draftFolder = convertThunderbirdPath(mHashConfig.value(identity + QStringLiteral(".draft_folder")).toString());
+            newIdentity->setDrafts(draftFolder);
+        }
+    }
+
+    if (mHashConfig.contains(identity + QStringLiteral(".fcc"))) {
+        const bool fccEnabled = mHashConfig.value(identity + QStringLiteral(".fcc")).toBool();
+        newIdentity->setDisabledFcc(!fccEnabled);
+    }
+
+    //fcc_reply_follows_parent not implemented in kmail
+    //fcc_folder_picker_mode is just a flag for thunderbird. Not necessary during import.
+    //if ( mHashConfig.contains( identity + QStringLiteral( ".fcc_folder_picker_mode" ) ) )
+    {
+        if (mHashConfig.contains(identity + QStringLiteral(".fcc_folder"))) {
+            const QString fccFolder = convertThunderbirdPath(mHashConfig.value(identity + QStringLiteral(".fcc_folder")).toString());
+            newIdentity->setFcc(fccFolder);
+        }
+    }
+
+    //if ( mHashConfig.contains( identity + QStringLiteral( ".tmpl_folder_picker_mode" ) ) )
+    {
+        if (mHashConfig.contains(identity + QStringLiteral(".stationery_folder"))) {
+            const QString templateFolder = convertThunderbirdPath(mHashConfig.value(identity + QStringLiteral(".stationery_folder")).toString());
+            newIdentity->setTemplates(templateFolder);
+        }
+    }
+
+    const QString attachVcardStr(identity + QStringLiteral(".attach_vcard"));
+    if (mHashConfig.contains(attachVcardStr)) {
+        const bool attachVcard = mHashConfig.value(attachVcardStr).toBool();
+        newIdentity->setAttachVcard(attachVcard);
+    }
+    const QString attachVcardContentStr(identity + QStringLiteral(".escapedVCard"));
+    if (mHashConfig.contains(attachVcardContentStr)) {
+        const QString str = mHashConfig.value(attachVcardContentStr).toString();
+        QByteArray vcard = QByteArray::fromPercentEncoding(str.toLocal8Bit());
+        KContacts::VCardConverter converter;
+        KContacts::Addressee addr = converter.parseVCard(vcard);
+
+        const QString filename = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + QLatin1Char('/') + newIdentity->identityName() + QStringLiteral(".vcf");
+        QFileInfo fileInfo(filename);
+        QDir().mkpath(fileInfo.absolutePath());
+        QFile file(filename);
+        if (file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+            const QByteArray data = converter.exportVCard(addr, KContacts::VCardConverter::v3_0);
+            file.write(data);
+            file.flush();
+            file.close();
+            newIdentity->setVCardFile(filename);
+        }
+    }
+    const QString signMailStr(identity + QStringLiteral(".sign_mail"));
+    if (mHashConfig.contains(signMailStr)) {
+        const bool signMail = mHashConfig.value(signMailStr).toBool();
+        newIdentity->setPgpAutoSign(signMail);
+    }
+
+    const QString composeHtmlStr(identity + QStringLiteral(".compose_html"));
+    //TODO: implement it in kmail
+
+    newIdentity->setSignature(signature);
+
+    storeIdentity(newIdentity);
+}
+
+void ThunderbirdSettings::insertIntoMap(const QString &line)
+{
+    QString newLine = line;
+    newLine.remove(QStringLiteral("user_pref(\""));
+    newLine.remove(QStringLiteral(");"));
+    const int pos = newLine.indexOf(QLatin1Char(','));
+    QString key = newLine.left(pos);
+    key.remove(key.length() - 1, 1);
+    QString valueStr = newLine.right(newLine.length() - pos - 2);
+    if (valueStr.at(0) == QLatin1Char('"')) {
+        valueStr.remove(0, 1);
+        const int pos(valueStr.length() - 1);
+        if (valueStr.at(pos) == QLatin1Char('"')) {
+            valueStr.remove(pos, 1);
+        }
+        //Store as String
+        mHashConfig.insert(key, valueStr);
+    } else {
+        if (valueStr == QLatin1String("true")) {
+            mHashConfig.insert(key, true);
+        } else if (valueStr == QLatin1String("false")) {
+            mHashConfig.insert(key, false);
+        } else {
+            //Store as integer
+            const int value = valueStr.toInt();
+            mHashConfig.insert(key, value);
+        }
+    }
+    if (key.contains(QStringLiteral("ldap_")) && key.endsWith(QStringLiteral(".description"))) {
+        QString ldapAccountName = key;
+        mLdapAccountList.append(ldapAccountName.remove(QStringLiteral(".description")));
+    }
+    if (key.contains(QStringLiteral("mailnews.tags.")) &&
+            (key.endsWith(QStringLiteral(".color")) || key.endsWith(QStringLiteral(".tag")))) {
+        QString name = key;
+        name.remove(QStringLiteral("mailnews.tags."));
+        name.remove(QStringLiteral(".color"));
+        name.remove(QStringLiteral(".tag"));
+        tagStruct tag;
+        if (mHashTag.contains(name)) {
+            tag = mHashTag.value(name);
+            mHashTag.remove(name);
+        }
+        if (key.endsWith(QStringLiteral(".color"))) {
+            tag.color = QColor(mHashConfig.value(key).toString());
+        } else {
+            tag.name = mHashConfig.value(key).toString();
+        }
+        mHashTag.insert(name, tag);
+        qCDebug(THUNDERBIRDPLUGIN_LOG) << " tag :" << name << " tag.name" << tag.name << " color :" << tag.color;
+    }
+}
+
+void ThunderbirdSettings::addNewMailNotifier(const QString &group, const QString &key, bool value)
+{
+    KConfig config(QStringLiteral("akonadi_newmailnotifier_agentrc"));
+    KConfigGroup grp = config.group(group);
+    grp.writeEntry(key, value);
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdsettings.h akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdsettings.h
--- akonadi-import-wizard-17.04.3/src/plugins/thunderbird/thunderbirdsettings.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/thunderbird/thunderbirdsettings.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,60 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef THUNDERBIRDSETTINGS_H
+#define THUNDERBIRDSETTINGS_H
+
+#include <ImportWizard/AbstractSettings>
+#include <ImportWizard/ImportWizardUtil>
+#include <QHash>
+#include <QStringList>
+
+class ThunderbirdSettings : public AbstractSettings
+{
+public:
+    explicit ThunderbirdSettings(const QString &filename);
+    ~ThunderbirdSettings();
+    void importSettings();
+private:
+    void readAccount();
+    void readIdentity(const QString &account);
+    void readTransport();
+    void readGlobalSettings();
+    void readLdapSettings();
+    void readTagSettings();
+    void readExtensionsSettings();
+    int adaptAutoResizeResolution(int index, const QString &configStrList);
+
+    void insertIntoMap(const QString &line);
+
+    void addAuth(QMap<QString, QVariant> &settings, const QString &argument, const QString &accountName);
+    void importSieveSettings(QMap<QString, QVariant> &settings, const QString &userName, const QString &imapServerName);
+
+    void addNewMailNotifier(const QString &group, const QString &key, bool value);
+
+    QHash<QString, QVariant> mHashConfig;
+    QHash<QString, QString> mHashSmtp;
+    QStringList mAccountList;
+    QStringList mLdapAccountList;
+
+    QHash<QString, tagStruct> mHashTag;
+    QString mFileName;
+};
+
+#endif /* THUNDERBIRDSETTINGS_H */
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/trojita/CMakeLists.txt akonadi-import-wizard-17.08.3/src/plugins/trojita/CMakeLists.txt
--- akonadi-import-wizard-17.04.3/src/plugins/trojita/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/trojita/CMakeLists.txt	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,22 @@
+set(trojitaimporter_SRCS
+    trojitaaddressbook.cpp
+    trojitaimportdata.cpp
+    trojitasettings.cpp
+    )
+
+ecm_qt_declare_logging_category(trojitaimporter_SRCS HEADER trojitaplugin_debug.h
+    IDENTIFIER TROJITAPLUGIN_LOG CATEGORY_NAME org.kde.pim.importwizard.trojitaplugin)
+kcoreaddons_add_plugin(trojitaimporterplugin JSON trojitaimporter.json SOURCES
+    ${trojitaimporter_SRCS} INSTALL_NAMESPACE importwizard)
+
+
+target_link_libraries(trojitaimporterplugin
+    KPim::ImportWizard
+    KF5::XmlGui
+    KF5::I18n
+    KF5::Contacts
+    KF5::MailImporterAkonadi
+    KF5::MailTransport
+    KF5::MailCommon
+    KF5::IdentityManagement
+    )
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitaaddressbook.cpp akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitaaddressbook.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitaaddressbook.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitaaddressbook.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "trojitaaddressbook.h"
+#include <KContacts/Addressee>
+
+#include <QUrl>
+
+#include <QSettings>
+
+TrojitaAddressBook::TrojitaAddressBook(const QString &filename)
+{
+    settings = new QSettings(filename, QSettings::IniFormat, this);
+    settings->setIniCodec("UTF-8");
+}
+
+TrojitaAddressBook::~TrojitaAddressBook()
+{
+    delete settings;
+}
+
+void TrojitaAddressBook::readAddressBook()
+{
+    const QStringList contacts = settings->childGroups();
+    for (const QString &contact : contacts) {
+        KContacts::Addressee contactABC;
+        settings->beginGroup(contact);
+        contactABC.setEmails(QStringList() << settings->value(QStringLiteral("email")).toStringList());
+
+        KContacts::Address homeAddr = KContacts::Address(KContacts::Address::Home);
+        homeAddr.setLocality(settings->value(QStringLiteral("city")).toString());
+        homeAddr.setRegion(settings->value(QStringLiteral("state")).toString());
+        homeAddr.setPostalCode(settings->value(QStringLiteral("zip")).toString());
+        homeAddr.setCountry(settings->value(QStringLiteral("country")).toString());
+        homeAddr.setStreet(settings->value(QStringLiteral("address")).toString());
+        if (!homeAddr.isEmpty()) {
+            contactABC.insertAddress(homeAddr);
+        }
+
+        contactABC.insertPhoneNumber(KContacts::PhoneNumber(settings->value(QStringLiteral("phone")).toString(), KContacts::PhoneNumber::Home));
+        contactABC.insertPhoneNumber(KContacts::PhoneNumber(settings->value(QStringLiteral("workphone")).toString(), KContacts::PhoneNumber::Work));
+        contactABC.insertPhoneNumber(KContacts::PhoneNumber(settings->value(QStringLiteral("fax")).toString(), KContacts::PhoneNumber::Fax));
+        contactABC.insertPhoneNumber(KContacts::PhoneNumber(settings->value(QStringLiteral("mobile")).toString(), KContacts::PhoneNumber::Cell));
+        contactABC.setNickName(settings->value(QStringLiteral("nick")).toString());
+        KContacts::ResourceLocatorUrl url;
+        url.setUrl(QUrl(settings->value(QStringLiteral("url")).toString()));
+        contactABC.setUrl(url);
+
+        const QDate birthDate = QDate::fromString(settings->value(QStringLiteral("anniversary")).toString());
+        if (birthDate.isValid()) {
+            contactABC.setBirthday(birthDate);
+        }
+        //TODO
+        //ADD(Photo, "photo");
+        addImportContactNote(contactABC, QStringLiteral("Trojita"));
+        createContact(contactABC);
+        settings->endGroup();
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitaaddressbook.h akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitaaddressbook.h
--- akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitaaddressbook.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitaaddressbook.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef TrojitaAddressBook_H
+#define TrojitaAddressBook_H
+
+#include <ImportWizard/AbstractAddressBook>
+#include <QHash>
+class QSettings;
+
+class TrojitaAddressBook : public LibImportWizard::AbstractAddressBook
+{
+public:
+    explicit TrojitaAddressBook(const QString &filename);
+    ~TrojitaAddressBook();
+
+    void readAddressBook();
+
+private:
+    QSettings *settings;
+};
+
+#endif /* TrojitaAddressBook_H */
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitaimportdata.cpp akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitaimportdata.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitaimportdata.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitaimportdata.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,89 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "trojitaimportdata.h"
+#include "trojitasettings.h"
+#include "trojitaaddressbook.h"
+#include "mailimporter/filterinfo.h"
+#include "mailimporter/othermailerutil.h"
+
+#include <kpluginfactory.h>
+
+#include <QDir>
+
+K_PLUGIN_FACTORY_WITH_JSON(TrojitaImporterFactory, "trojitaimporter.json", registerPlugin<TrojitaImportData>();
+                           )
+
+TrojitaImportData::TrojitaImportData(QObject *parent, const QList<QVariant> &)
+    : LibImportWizard::AbstractImporter(parent)
+{
+    mPath = MailImporter::OtherMailerUtil::trojitaDefaultPath();
+}
+
+TrojitaImportData::~TrojitaImportData()
+{
+}
+
+bool TrojitaImportData::foundMailer() const
+{
+    QDir directory(mPath);
+    if (directory.exists()) {
+        return true;
+    }
+    return false;
+}
+
+QString TrojitaImportData::name() const
+{
+    return QStringLiteral("Trojita");
+}
+
+bool TrojitaImportData::importMails()
+{
+    return false;
+}
+
+bool TrojitaImportData::importSettings()
+{
+    const QString settingsPath = mPath + QLatin1String("trojita.conf");
+    TrojitaSettings settings(settingsPath);
+    settings.setAbstractDisplayInfo(mAbstractDisplayInfo);
+    settings.importSettings();
+    return true;
+}
+
+bool TrojitaImportData::importAddressBook()
+{
+    const QString addressbookPath = QDir::homePath() + QLatin1String("/.abook/addressbook");
+    TrojitaAddressBook addressBooks(addressbookPath);
+    addressBooks.setAbstractDisplayInfo(mAbstractDisplayInfo);
+    addressBooks.readAddressBook();
+    return true;
+}
+
+LibImportWizard::AbstractImporter::TypeSupportedOptions TrojitaImportData::supportedOption()
+{
+    TypeSupportedOptions options;
+    //options |=LibImportWizard::AbstractImporter::Mails;
+    options |= LibImportWizard::AbstractImporter::Settings;
+    options |= LibImportWizard::AbstractImporter::AddressBooks;
+    return options;
+}
+
+#include "trojitaimportdata.moc"
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitaimportdata.h akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitaimportdata.h
--- akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitaimportdata.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitaimportdata.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+#ifndef TrojitaImportData_H
+#define TrojitaImportData_H
+
+#include <ImportWizard/AbstractImporter>
+
+class TrojitaImportData : public LibImportWizard::AbstractImporter
+{
+public:
+    explicit TrojitaImportData(QObject *parent, const QList<QVariant> & = QList<QVariant>());
+    ~TrojitaImportData();
+
+    TypeSupportedOptions supportedOption() override;
+    bool foundMailer() const override;
+
+    bool importMails() override;
+    bool importSettings() override;
+    bool importAddressBook() override;
+
+    QString name() const override;
+};
+
+#endif /* TrojiraImportData_H */
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitaimporter.json akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitaimporter.json
--- akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitaimporter.json	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitaimporter.json	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,32 @@
+{
+    "KPlugin": {
+        "Id": "trojitaimporter",
+        "Name": "Trojita Importer",
+        "Name[ca@valencia]": "Importador del Trojita",
+        "Name[ca]": "Importador del Trojita",
+        "Name[cs]": "Importér Trojitá",
+        "Name[de]": "Import-Modul für Trojita",
+        "Name[es]": "Importador Trojita",
+        "Name[fi]": "Trojita-tuonti",
+        "Name[fr]": "Import Trojita",
+        "Name[it]": "Importatore da Trojita",
+        "Name[nl]": "Trojita-importeur",
+        "Name[pl]": "Importer Trojita",
+        "Name[pt]": "Importador do Trojita",
+        "Name[sk]": "Importér Trojita",
+        "Name[sl]": "Uvoznik iz programa Trojita",
+        "Name[sr@ijekavian]": "Увозник из Тројите",
+        "Name[sr@ijekavianlatin]": "Uvoznik iz Trojite",
+        "Name[sr@latin]": "Uvoznik iz Trojite",
+        "Name[sr]": "Увозник из Тројите",
+        "Name[sv]": "Trojita-importverktyg",
+        "Name[tr]": "Trojita İçe Aktarıcı",
+        "Name[uk]": "Засіб імпортування з Trojita",
+        "Name[x-test]": "xxTrojita Importerxx",
+        "Name[zh_CN]": "Trojita 导入器",
+        "ServiceTypes": [
+            "ImportWizard/PluginMailImporter"
+        ],
+        "Version": "1.0"
+    }
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitasettings.cpp akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitasettings.cpp
--- akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitasettings.cpp	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitasettings.cpp	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,180 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#include "trojitasettings.h"
+#include <ImportWizard/ImportWizardUtil>
+
+#include <mailtransport/transportmanager.h>
+
+#include <KIdentityManagement/kidentitymanagement/identity.h>
+#include <KIdentityManagement/kidentitymanagement/signature.h>
+
+#include "trojitaplugin_debug.h"
+
+#include <QSettings>
+
+TrojitaSettings::TrojitaSettings(const QString &filename)
+{
+    settings = new QSettings(filename, QSettings::IniFormat, this);
+}
+
+TrojitaSettings::~TrojitaSettings()
+{
+    delete settings;
+}
+
+void TrojitaSettings::importSettings()
+{
+    readImapAccount();
+    readTransport();
+    readIdentity();
+    readGlobalSettings();
+}
+
+void TrojitaSettings::readImapAccount()
+{
+    QMap<QString, QVariant> newSettings;
+    QString name;
+
+    name = settings->value(QStringLiteral("imap.host")).toString();
+    if (!name.isEmpty()) {
+        newSettings.insert(QStringLiteral("ImapServer"), name);
+    }
+
+    const int port = settings->value(QStringLiteral("imap.port"), -1).toInt();
+    if (port > -1) {
+        newSettings.insert(QStringLiteral("ImapPort"), port);
+    }
+
+    if (settings->contains(QStringLiteral("imap.starttls"))) {
+        const bool useTLS = settings->value(QStringLiteral("imap.starttls")).toBool();
+        if (useTLS) {
+            newSettings.insert(QStringLiteral("Safety"), QStringLiteral("STARTTLS"));
+        }
+    }
+
+    const QString userName = settings->value(QStringLiteral("imap.auth.user")).toString();
+    if (!userName.isEmpty()) {
+        newSettings.insert(QStringLiteral("Username"), userName);
+    }
+    const QString password = settings->value(QStringLiteral("imap.auth.pass")).toString();
+    if (!password.isEmpty()) {
+        newSettings.insert(QStringLiteral("Password"), password);
+    }
+
+#if 0
+    if (settings->contains(QStringLiteral("imap.process"))) {
+        //What's this ?
+    }
+
+    if (settings->contains(QStringLiteral("imap.offline"))) {
+        //const bool offlineStatus = settings->value(QStringLiteral("imap.offline")).toBool();
+        //It's not a deconnected mode as imap disconnected #317023
+        //Will implement soon.
+        //TODO use akonadi cache.
+    }
+    if (settings->contains(QStringLiteral("imap.enableId"))) {
+        //Not supported by Akonadi.
+    }
+
+    if (settings->contains(QStringLiteral("imap.ssl.pemCertificate"))) {
+        //Not supported by akonadi.
+    }
+
+    if (settings->contains(QStringLiteral("imap.capabilities.blacklist"))) {
+        //Not supported by akonadi-imap-resource.
+    }
+#endif
+    if (!name.isEmpty()) {
+        const QString agentIdentifyName = LibImportWizard::AbstractBase::createResource(QStringLiteral("akonadi_imap_resource"), name, newSettings);
+        //Check by default
+        addCheckMailOnStartup(agentIdentifyName, true);
+    }
+}
+
+void TrojitaSettings::readTransport()
+{
+    settings->beginGroup(QStringLiteral("General"));
+    const QString smtpMethod = settings->value(QStringLiteral("msa.method")).toString();
+    if (!smtpMethod.isEmpty()) {
+        MailTransport::Transport *mt = createTransport();
+        if (smtpMethod == QLatin1String("IMAP-SENDMAIL")) {
+            //see http://tools.ietf.org/html/draft-kundrat-imap-submit-01
+        } else if (smtpMethod == QLatin1String("SMTP") || smtpMethod == QLatin1String("SSMTP")) {
+            if (settings->contains(QStringLiteral("msa.smtp.host"))) {
+                mt->setHost(settings->value(QStringLiteral("msa.smtp.host")).toString());
+            }
+            if (settings->contains(QStringLiteral("msa.smtp.port"))) {
+                mt->setPort(settings->value(QStringLiteral("msa.smtp.port")).toInt());
+            }
+            if (settings->contains(QStringLiteral("msa.smtp.auth"))) {
+                if (settings->value(QStringLiteral("msa.smtp.auth")).toBool()) {
+                    if (settings->contains(QStringLiteral("msa.smtp.auth.user"))) {
+                        mt->setUserName(settings->value(QStringLiteral("msa.smtp.auth.user")).toString());
+                    }
+                    if (settings->contains(QStringLiteral("msa.smtp.auth.pass"))) {
+                        mt->setPassword(settings->value(QStringLiteral("msa.smtp.auth.pass")).toString());
+                    }
+                }
+            }
+
+            if (settings->contains(QStringLiteral("msa.smtp.starttls"))) {
+                if (settings->value(QStringLiteral("msa.smtp.starttls")).toBool()) {
+                    mt->setEncryption(MailTransport::Transport::EnumEncryption::TLS);
+                }
+            }
+            mt->setIdentifier(QStringLiteral("SMTP"));
+        } else {
+            qCWarning(TROJITAPLUGIN_LOG) << " smtpMethod unknown " << smtpMethod;
+        }
+        storeTransport(mt, true);   //only one smtp for the moment
+    }
+    settings->endGroup();
+}
+
+void TrojitaSettings::readIdentity()
+{
+    const int size = settings->beginReadArray(QStringLiteral("identities"));
+    for (int i = 0; i < size; ++i) {
+        settings->setArrayIndex(i);
+        QString realName = settings->value(QStringLiteral("realName")).toString();
+        KIdentityManagement::Identity *identity = createIdentity(realName);
+        identity->setFullName(realName);
+        identity->setIdentityName(realName);
+        const QString address = settings->value(QStringLiteral("address")).toString();
+        identity->setPrimaryEmailAddress(address);
+        const QString organisation = settings->value(QStringLiteral("organisation")).toString();
+        identity->setOrganization(organisation);
+        QString signatureStr = settings->value(QStringLiteral("signature")).toString();
+        if (!signatureStr.isEmpty()) {
+            KIdentityManagement::Signature signature;
+            signature.setType(KIdentityManagement::Signature::Inlined);
+            signature.setText(signatureStr);
+            identity->setSignature(signature);
+        }
+        qCDebug(TROJITAPLUGIN_LOG) << " realName :" << realName << " address : " << address << " organisation : " << organisation << " signature: " << signatureStr;
+        storeIdentity(identity);
+    }
+    settings->endArray();
+}
+
+void TrojitaSettings::readGlobalSettings()
+{
+    //TODO
+}
diff -Nru akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitasettings.h akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitasettings.h
--- akonadi-import-wizard-17.04.3/src/plugins/trojita/trojitasettings.h	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/plugins/trojita/trojitasettings.h	2017-10-29 07:12:25.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+   Copyright (C) 2012-2017 Montel Laurent <montel@kde.org>
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; see the file COPYING.  If not, write to
+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.
+*/
+
+#ifndef TrojitaSettings_H
+#define TrojitaSettings_H
+
+#include <ImportWizard/AbstractSettings>
+
+class QSettings;
+
+class TrojitaSettings : public AbstractSettings
+{
+public:
+    explicit TrojitaSettings(const QString &filename);
+    ~TrojitaSettings();
+    void importSettings();
+private:
+    void readImapAccount();
+    void readIdentity();
+    void readGlobalSettings();
+    void readTransport();
+    QSettings *settings;
+};
+
+#endif // ClawsMailSettings_H
diff -Nru akonadi-import-wizard-17.04.3/src/TODO akonadi-import-wizard-17.08.3/src/TODO
--- akonadi-import-wizard-17.04.3/src/TODO	2017-07-11 20:42:27.000000000 +0000
+++ akonadi-import-wizard-17.08.3/src/TODO	2017-10-29 07:12:25.000000000 +0000
@@ -1,19 +1,9 @@
 KF5:
 ----
-- Merge KMailCVT
-
 - Test on Windows/MacOsX
-
 - Search info about how is stored config on AppleMail/Outlook etc.
-
-- Look at more mailer.
-
-- Import data from *rss* when akregator2 will ported, same for KNode. (not sure that it will port)
-
 - Add support for Lightning for mozilla (calendar mozilla)
 
-- Import note from TomBoy ?
-
 NEED TO FIX:
 - Import addressbook from Thunderbird.
 - Fix import filters.