diff -Nru kmail-account-wizard-17.12.3/CMakeLists.txt kmail-account-wizard-18.04.3/CMakeLists.txt
--- kmail-account-wizard-17.12.3/CMakeLists.txt	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/CMakeLists.txt	2018-07-10 00:14:44.000000000 +0000
@@ -1,11 +1,11 @@
-set(KDEPIM_VERSION_NUMBER "5.7.3")
+set(KDEPIM_VERSION_NUMBER "5.8.3")
 cmake_minimum_required(VERSION 3.1)
 project(kmail-account-wizard VERSION ${KDEPIM_VERSION_NUMBER})
 
 
 set(LIBRARY_NAMELINK LIBRARY NAMELINK_SKIP)
 
-set(KF5_VERSION "5.39.0")
+set(KF5_VERSION "5.44.0")
 
 find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
@@ -28,7 +28,7 @@
 include(ECMQtDeclareLoggingCategory)
 include(ECMCoverageOption)
 # Do NOT add quote
-set(KDEPIM_DEV_VERSION )
+set(KDEPIM_DEV_VERSION)
 
 # add an extra space
 if(DEFINED KDEPIM_DEV_VERSION)
@@ -37,22 +37,22 @@
 
 set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
 
-set(AKONADI_MIMELIB_VERSION "5.7.3")
-set(IDENTITYMANAGEMENT_LIB_VERSION "5.7.3")
-set(KLDAP_LIB_VERSION "5.7.3")
-set(KMAILTRANSPORT_LIB_VERSION "5.7.3")
-set(AKONADI_VERSION "5.7.3")
-set(KIMAP_LIB_VERSION "5.7.3")
-set(AKONADI_MIMELIB_VERSION "5.7.3")
+set(AKONADI_MIMELIB_VERSION "5.8.3")
+set(IDENTITYMANAGEMENT_LIB_VERSION "5.8.3")
+set(KLDAP_LIB_VERSION "5.8.3")
+set(KMAILTRANSPORT_LIB_VERSION "5.8.3")
+set(AKONADI_VERSION "5.8.3")
+set(KIMAP_LIB_VERSION "5.8.3")
+set(AKONADI_MIMELIB_VERSION "5.8.3")
 
 set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
 set(KDEPIM_LIB_SOVERSION "5")
 
 set(QT_REQUIRED_VERSION "5.8.0")
 find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Xml DBus Test)
-set(PIMCOMMON_LIB_VERSION_LIB "5.7.3")
-set(LIBKDEPIM_LIB_VERSION_LIB "5.7.3")
-set(LIBKLEO_LIB_VERSION_LIB "5.7.3")
+set(PIMCOMMON_LIB_VERSION_LIB "5.8.3")
+set(LIBKDEPIM_LIB_VERSION_LIB "5.8.3")
+set(LIBKLEO_LIB_VERSION_LIB "5.8.3")
 
 # Find KF5 package
 find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)
@@ -88,7 +88,7 @@
 find_package(KF5Kross ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5NewStuff ${KF5_VERSION} CONFIG REQUIRED)
 
-set( SharedMimeInfo_MINIMUM_VERSION "1.0" )
+set( SharedMimeInfo_MINIMUM_VERSION "1.3" )
 find_package(SharedMimeInfo ${SharedMimeInfo_MINIMUM_VERSION} REQUIRED)
 
 add_definitions(-DQT_NO_CAST_FROM_ASCII)
diff -Nru kmail-account-wizard-17.12.3/debian/changelog kmail-account-wizard-18.04.3/debian/changelog
--- kmail-account-wizard-17.12.3/debian/changelog	2018-03-16 13:28:30.000000000 +0000
+++ kmail-account-wizard-18.04.3/debian/changelog	2018-08-21 17:54:01.000000000 +0000
@@ -1,3 +1,12 @@
+kmail-account-wizard (4:18.04.3-0ubuntu1) cosmic; urgency=medium
+
+  * New upstream release (18.03.80)
+  * New upstream release (18.04.0)
+  * New upstream release (18.04.1)
+  * New upstream release (18.04.3)
+
+ -- Rik Mills <rikmills@kubuntu.org>  Tue, 21 Aug 2018 18:54:01 +0100
+
 kmail-account-wizard (4:17.12.3-0ubuntu1) bionic; urgency=medium
 
   * New upstream release (17.12.3)
diff -Nru kmail-account-wizard-17.12.3/debian/control kmail-account-wizard-18.04.3/debian/control
--- kmail-account-wizard-17.12.3/debian/control	2018-03-16 13:28:30.000000000 +0000
+++ kmail-account-wizard-18.04.3/debian/control	2018-08-21 17:54:01.000000000 +0000
@@ -16,16 +16,16 @@
                libassuan-dev,
                libboost-dev (>= 1.40.0-2),
                libboost-graph-dev (>= 1.40.0-2),
-               libkf5akonadi-dev (>= 4:17.12.3~),
-               libkf5akonadicontact-dev (>= 4:17.12.3~),
-               libkf5akonadiserver-dev (>= 4:17.12.3~),
+               libkf5akonadi-dev (>= 4:18.04.3~),
+               libkf5akonadicontact-dev (>= 4:18.04.3~),
+               libkf5akonadiserver-dev (>= 4:18.04.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~),
-               libkf5contacteditor-dev (>= 4:17.12.3~),
-               libkf5contacts-dev (>= 4:17.12.3~),
+               libkf5contacteditor-dev (>= 4:18.04.3~),
+               libkf5contacts-dev (>= 4:18.04.3~),
                libkf5coreaddons-dev (>= 5.31.0~),
                libkf5crash-dev (>= 5.31.0~),
                libkf5dbusaddons-dev (>= 5.31.0~),
@@ -34,26 +34,26 @@
                libkf5globalaccel-dev (>= 5.31.0~),
                libkf5i18n-dev (>= 5.31.0~),
                libkf5iconthemes-dev (>= 5.31.0~),
-               libkf5identitymanagement-dev (>= 17.12.3~),
+               libkf5identitymanagement-dev (>= 18.04.3~),
                libkf5itemviews-dev (>= 5.31.0~),
                libkf5kcmutils-dev (>= 5.31.0~),
                libkf5kdelibs4support-dev (>= 5.31.0~),
-               libkf5kdepimdbusinterfaces-dev (>= 4:17.12.3~),
+               libkf5kdepimdbusinterfaces-dev (>= 4:18.04.3~),
                libkf5khtml-dev (>= 5.31.0~),
-               libkf5ldap-dev (>= 17.12.3~),
-               libkf5libkdepim-dev (>= 4:17.12.3~),
-               libkf5libkleo-dev (>= 4:17.12.3~),
-               libkf5mailcommon-dev (>= 4:17.12.3~),
-               libkf5mailtransport-dev (>= 17.12.3~),
-               libkf5messagecomposer-dev (>= 4:17.12.3~),
-               libkf5messageviewer-dev (>= 4:17.12.3~),
-               libkf5mimetreeparser-dev (>= 4:17.12.3~),
+               libkf5ldap-dev (>= 18.04.3~),
+               libkf5libkdepim-dev (>= 4:18.04.3~),
+               libkf5libkleo-dev (>= 4:18.04.3~),
+               libkf5mailcommon-dev (>= 4:18.04.3~),
+               libkf5mailtransport-dev (>= 18.04.3~),
+               libkf5messagecomposer-dev (>= 4:18.04.3~),
+               libkf5messageviewer-dev (>= 4:18.04.3~),
+               libkf5mimetreeparser-dev (>= 4:18.04.3~),
                libkf5newstuff-dev (>= 5.31.0~),
                libkf5notifyconfig-dev (>= 5.31.0~),
-               libkf5pimcommon-dev (>= 4:17.12.3~),
+               libkf5pimcommon-dev (>= 4:18.04.3~),
                libkf5service-dev (>= 5.31.0~),
                libkf5sonnet-dev (>= 5.31.0~),
-               libkf5templateparser-dev (>= 4:17.12.3~),
+               libkf5templateparser-dev (>= 4:18.04.3~),
                libkf5texteditor-dev (>= 5.31.0~),
                libkf5textwidgets-dev (>= 5.31.0~),
                libkf5wallet-dev (>= 5.31.0~),
@@ -76,7 +76,7 @@
                qttools5-dev (>= 5.6.1~),
                shared-mime-info,
                xsltproc,
-               zlib1g-dev
+               zlib1g-dev,
 Standards-Version: 3.9.8
 Homepage: http://pim.kde.org/
 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kmail-account-wizard
diff -Nru kmail-account-wizard-17.12.3/po/ar/accountwizard.po kmail-account-wizard-18.04.3/po/ar/accountwizard.po
--- kmail-account-wizard-17.12.3/po/ar/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/ar/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2018-01-26 00:17+0300\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-01-30 18:19+0300\n"
 "Last-Translator: Safa Alfulaij <safa1996alfulaij@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
 "Language: ar\n"
@@ -48,7 +48,7 @@
 msgid "No given name for the configuration."
 msgstr "لم يُعط اسم للضّبط."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "اسم الضّبط ’%1‘ مجهول"
@@ -123,32 +123,32 @@
 msgid "Importing key..."
 msgstr "يستورد المفتاح..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "زوّد البيانات الشخصيّة"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "أمّن تواصلك"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "اختر نوع الحساب"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "اختر المزوّد"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "يحمّل المُساعد"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "يضبط الحساب"
@@ -341,8 +341,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr ""
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "© ٢٠٠٩-٢٠١٨ لمطوّري «أكونادي»"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/ast/accountwizard.po kmail-account-wizard-18.04.3/po/ast/accountwizard.po
--- kmail-account-wizard-17.12.3/po/ast/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/ast/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\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"
@@ -47,7 +47,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr ""
@@ -122,32 +122,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr ""
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr ""
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr ""
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr ""
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr ""
@@ -340,7 +340,7 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr ""
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/bs/accountwizard.po kmail-account-wizard-18.04.3/po/bs/accountwizard.po
--- kmail-account-wizard-17.12.3/po/bs/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/bs/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: accountwizard.po\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2013-11-03 21:01+0000\n"
 "Last-Translator: Adna Rakić <adna.rakic@gmail.com>\n"
 "Language-Team: bs <bs@kde.org>\n"
@@ -50,7 +50,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, fuzzy, kde-format
 #| msgid "Autodetecting settings failed"
 msgid "Unknown configuration name '%1'"
@@ -129,32 +129,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Unesite lične podatke"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Izaberi tip naloga"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Izaberi poslužitelja"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Učitavanje pomoćnika"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Postavljanje naloga"
@@ -349,7 +349,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "© 2009, programeri Akonadija"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/ca/accountwizard.po kmail-account-wizard-18.04.3/po/ca/accountwizard.po
--- kmail-account-wizard-17.12.3/po/ca/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/ca/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2018-01-05 22:51+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-01-13 15:46+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca\n"
@@ -52,7 +52,7 @@
 msgid "No given name for the configuration."
 msgstr "No s'ha indicat un nom per a la configuració."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "El nom per a la configuració «%1» és desconegut"
@@ -127,32 +127,32 @@
 msgid "Importing key..."
 msgstr "S'està important la clau..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Proporcioneu les dades personals"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Assegura la vostra comunicació"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Seleccioneu el tipus de compte"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Seleccioneu el proveïdor"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "S'està carregant l'assistent"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "S'està arranjant el compte"
@@ -351,8 +351,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "(c) 2009-2017, els desenvolupadors de l'Akonadi"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "(c) 2009-2018, els desenvolupadors de l'Akonadi"
 
 #: main.cpp:51
 #, kde-format
@@ -733,3 +733,45 @@
 #, kde-format
 msgid "Check for more on Internet"
 msgstr "Cerca'n més a Internet"
+
+#~ msgid ""
+#~ "Your communication should always be private. To communicate privately, "
+#~ "you need a public/private pair of keys."
+#~ msgstr ""
+#~ "La vostra comunicació sempre ha de ser privada. Per a fer-ho de forma "
+#~ "privada, necessitareu un parell de claus pública/privada."
+
+#~ msgid ""
+#~ "The public key will be uploaded to a key server from where other users "
+#~ "can download it to verify authenticity of emails you sent them."
+#~ msgstr ""
+#~ "La clau pública serà pujada a un servidor de claus des d'on els altres "
+#~ "usuaris podran descarregar-la per a verificar l'autenticitat dels "
+#~ "missatges de correu electrònic que els envieu."
+
+#~ msgid "Publish key automatically"
+#~ msgstr "Publica automàticament la clau"
+
+#~ msgid "Security:"
+#~ msgstr "Seguretat:"
+
+#~ msgid "Always sign and encrypt outgoing emails"
+#~ msgstr "Signa i encripta sempre els correus electrònics sortints"
+
+#~ msgid "Always sign outgoing emails"
+#~ msgstr "Signa sempre els correus electrònics sortints"
+
+#~ msgid "Always encrypt outgoing emails"
+#~ msgstr "Encripta sempre els correus electrònics sortints"
+
+#~ msgid "Don't sign or encrypt outgoing emails"
+#~ msgstr "No signar o encriptar els correus electrònics sortints"
+
+#~ msgid "Key Generation Error"
+#~ msgstr "Error en generar la clau"
+
+#~ msgid "Generating new key pair..."
+#~ msgstr "S'està generant una parella de claus nova..."
+
+#~ msgid "Create Account"
+#~ msgstr "Crea un compte"
diff -Nru kmail-account-wizard-17.12.3/po/ca@valencia/accountwizard.po kmail-account-wizard-18.04.3/po/ca@valencia/accountwizard.po
--- kmail-account-wizard-17.12.3/po/ca@valencia/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/ca@valencia/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2018-01-05 22:51+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-01-13 15:46+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
 "Language: ca@valencia\n"
@@ -52,7 +52,7 @@
 msgid "No given name for the configuration."
 msgstr "No s'ha indicat un nom per a la configuració."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "El nom per a la configuració «%1» és desconegut"
@@ -127,32 +127,32 @@
 msgid "Importing key..."
 msgstr "S'està important la clau..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Proporcioneu les dades personals"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Assegura la vostra comunicació"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Seleccioneu el tipus de compte"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Seleccioneu el proveïdor"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "S'està carregant l'assistent"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "S'està arranjant el compte"
@@ -181,17 +181,17 @@
 #: ispdb/ispdb.cpp:374
 #, kde-format
 msgid "Lookup configuration: Email provider"
-msgstr "Busca de la configuració: Proveïdor de correu electrònic"
+msgstr "Cerca de la configuració: Proveïdor de correu electrònic"
 
 #: ispdb/ispdb.cpp:377
 #, kde-format
 msgid "Lookup configuration: Trying common server name"
-msgstr "Busca de la configuració: Es prova el nom comú del servidor"
+msgstr "Cerca de la configuració: Es prova el nom comú del servidor"
 
 #: ispdb/ispdb.cpp:380
 #, kde-format
 msgid "Lookup configuration: Mozilla database"
-msgstr "Busca de la configuració: Base de dades de Mozilla"
+msgstr "Cerca de la configuració: Base de dades de Mozilla"
 
 #: ispdb/main.cpp:81
 #, kde-format
@@ -221,7 +221,7 @@
 #: ispdb/main.cpp:93
 #, kde-format
 msgid "Tries to fetch the settings for that email address"
-msgstr "Intenta obtindre els ajustaments per esta adreça de correu"
+msgstr "Intenta obtindre els ajustaments per aquesta adreça de correu"
 
 #: key.cpp:86
 #, kde-format
@@ -351,8 +351,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "(c) 2009-2017, els desenvolupadors de l'Akonadi"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "(c) 2009-2018, els desenvolupadors de l'Akonadi"
 
 #: main.cpp:51
 #, kde-format
@@ -377,7 +377,7 @@
 #: main.cpp:60
 #, kde-format
 msgid "unpack fullpath on startup and launch that assistant"
-msgstr "descomprimeix el camí complet en iniciar i llança este assistent"
+msgstr "descomprimeix el camí complet en iniciar i llança aquest assistent"
 
 #: personaldatapage.cpp:83
 #, kde-format
@@ -457,9 +457,9 @@
 "to sent the credentials to server. We advise you to check the settings of "
 "the account and adjust it manually if needed."
 msgstr ""
-"Pareix que hi ha un problema en arribar a este servidor o en seleccionar una "
-"forma segura d'enviar les credencials al servidor. Recomanem que comproveu "
-"l'arranjament del compte i l'ajusteu manualment si és necessari."
+"Sembla que hi ha un problema en arribar a aquest servidor o en seleccionar "
+"una forma segura d'enviar les credencials al servidor. Recomanem que "
+"comproveu l'arranjament del compte i l'ajusteu manualment si és necessari."
 
 #: servertest.cpp:65
 #, kde-format
@@ -565,7 +565,7 @@
 #: ui/cryptopage.ui:65
 #, kde-format
 msgid "Select key for this account:"
-msgstr "Selecciona la clau per a este compte:"
+msgstr "Selecciona la clau per a aquest compte:"
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
 #: ui/cryptopage.ui:99
@@ -632,7 +632,7 @@
 "the steps of this wizard carefully."
 msgstr ""
 "Amb uns pocs senzills passos es crea l'arranjament adequat per vós. Seguiu "
-"els passos d'este assistent amb cura."
+"els passos d'aquest assistent amb cura."
 
 #. i18n: ectx: property (text), widget (QLabel, nameLabel)
 #: ui/personaldatapage.ui:29
@@ -656,7 +656,7 @@
 #: ui/personaldatapage.ui:122
 #, kde-format
 msgid "Find pro&vider settings on the Internet"
-msgstr "Busca l'arranjament del pro&veïdor a Internet"
+msgstr "Cerca l'arranjament del pro&veïdor a Internet"
 
 #. i18n: ectx: property (text), widget (QLabel, checkOnlineExplanation)
 #: ui/personaldatapage.ui:143
@@ -666,9 +666,9 @@
 "domain name part of the e-mail address will be sent over the Internet at "
 "this point. If this option is unchecked, the account can be set up manually."
 msgstr ""
-"Comprova en línia l'arranjament del meu proveïdor. En este punt només "
+"Comprova en línia l'arranjament del meu proveïdor. En aquest punt només "
 "s'enviarà a Internet la part del nom del domini de la vostra adreça de "
-"correu. Si desmarqueu esta opció, podeu arranjar el compte manualment."
+"correu. Si desmarqueu aquesta opció, podeu arranjar el compte manualment."
 
 #. i18n: ectx: property (text), widget (QRadioButton, imapAccount)
 #: ui/personaldatapage.ui:181
@@ -732,4 +732,46 @@
 #: ui/typepage.ui:67
 #, kde-format
 msgid "Check for more on Internet"
-msgstr "Busca'n més a Internet"
+msgstr "Cerca'n més a Internet"
+
+#~ msgid ""
+#~ "Your communication should always be private. To communicate privately, "
+#~ "you need a public/private pair of keys."
+#~ msgstr ""
+#~ "La vostra comunicació sempre ha de ser privada. Per a fer-ho de forma "
+#~ "privada, necessitareu un parell de claus pública/privada."
+
+#~ msgid ""
+#~ "The public key will be uploaded to a key server from where other users "
+#~ "can download it to verify authenticity of emails you sent them."
+#~ msgstr ""
+#~ "La clau pública serà pujada a un servidor de claus des d'on els altres "
+#~ "usuaris podran descarregar-la per a verificar l'autenticitat dels "
+#~ "missatges de correu electrònic que els envieu."
+
+#~ msgid "Publish key automatically"
+#~ msgstr "Publica automàticament la clau"
+
+#~ msgid "Security:"
+#~ msgstr "Seguretat:"
+
+#~ msgid "Always sign and encrypt outgoing emails"
+#~ msgstr "Signa i encripta sempre els correus electrònics sortints"
+
+#~ msgid "Always sign outgoing emails"
+#~ msgstr "Signa sempre els correus electrònics sortints"
+
+#~ msgid "Always encrypt outgoing emails"
+#~ msgstr "Encripta sempre els correus electrònics sortints"
+
+#~ msgid "Don't sign or encrypt outgoing emails"
+#~ msgstr "No signar o encriptar els correus electrònics sortints"
+
+#~ msgid "Key Generation Error"
+#~ msgstr "Error en generar la clau"
+
+#~ msgid "Generating new key pair..."
+#~ msgstr "S'està generant una parella de claus nova..."
+
+#~ msgid "Create Account"
+#~ msgstr "Crea un compte"
diff -Nru kmail-account-wizard-17.12.3/po/cs/accountwizard.po kmail-account-wizard-18.04.3/po/cs/accountwizard.po
--- kmail-account-wizard-17.12.3/po/cs/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/cs/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -1,6 +1,6 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Vít Pelčák <vit@pelcak.org>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017.
+# Vít Pelčák <vit@pelcak.org>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
 # Lukáš Tinkl <ltinkl@redhat.com>, 2010.
 # Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012, 2013.
 #
@@ -8,9 +8,9 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-02-23 12:26+0100\n"
-"Last-Translator: Vít Pelčák <vit@pelcak.org>\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-06-15 15:05+0100\n"
+"Last-Translator: Vit Pelcak <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
@@ -49,7 +49,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Neznámý název nového nastavení '%1'"
@@ -124,32 +124,32 @@
 msgid "Importing key..."
 msgstr "Probíhá import klíče..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Poskytněte osobní data"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Vybrat typ účtu"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Zvolte poskytovatele"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Načítá se asistent"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Nastavuji účet"
@@ -342,8 +342,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "(c) 2009-2017 vývojáři Akonadi"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "(c) 2009-2018 vývojáři Akonadi"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/da/accountwizard.po kmail-account-wizard-18.04.3/po/da/accountwizard.po
--- kmail-account-wizard-17.12.3/po/da/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/da/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2017-03-22 17:42+0100\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
@@ -47,7 +47,7 @@
 msgid "No given name for the configuration."
 msgstr "Intet navn angivet til konfigurationen."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Ukendt konfigurationsnavn \"%1\""
@@ -124,32 +124,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Oplys personlige data"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Vælg kontotype"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Vælg udbyder"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Indlæser assistent"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Opsætning af konto"
@@ -344,7 +344,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009-2016 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009-2016 Akonadi-udviklerne"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/de/accountwizard.po kmail-account-wizard-18.04.3/po/de/accountwizard.po
--- kmail-account-wizard-17.12.3/po/de/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/de/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -1,14 +1,14 @@
 # Panagiotis Papadopoulos <pano_90@gmx.net>, 2010.
-# Frederik Schwarzer <schwarzer@kde.org>, 2010, 2016.
+# Frederik Schwarzer <schwarzer@kde.org>, 2010, 2016, 2018.
 # Thomas Reitelbach <tr@erdfunkstelle.de>, 2010.
 # Burkhard Lück <lueck@hube-lueck.de>, 2012, 2013, 2015, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-11-26 20:03+0100\n"
-"Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-02-11 21:53+0100\n"
+"Last-Translator: Frederik Schwarzer <schwarzer@kde.org>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@
 msgid "No given name for the configuration."
 msgstr "Es wurde kein Name für die Einrichtung angegeben."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Unbekannter Einrichtungsname „%1“"
@@ -122,32 +122,32 @@
 msgid "Importing key..."
 msgstr "Schlüssel wird importiert ..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Persönliche Daten angeben"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Sichern Sie Ihre Kommunikation ab"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Art des Postfachs auswählen"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Anbieter auswählen"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Assistent wird geladen"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Postfach wird eingerichtet"
@@ -353,8 +353,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "© 2009-2017 die Akonadi-Entwickler"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "Copyright © 2009-2018 die Akonadi-Entwickler"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/el/accountwizard.po kmail-account-wizard-18.04.3/po/el/accountwizard.po
--- kmail-account-wizard-17.12.3/po/el/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/el/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2014-04-25 11:09+0300\n"
 "Last-Translator: Dimitris Kardarakos <dimkard@gmail.com>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -49,7 +49,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, fuzzy, kde-format
 #| msgid "Autodetecting settings failed"
 msgid "Unknown configuration name '%1'"
@@ -128,32 +128,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Παροχή προσωπικών δεδομένων"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Επιλογή τύπου λογαριασμού"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Επιλογή παρόχου"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Φόρτωση βοηθού"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Προετοιμασία λογαριασμού"
@@ -349,7 +349,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009 οι προγραμματιστές Akonadi"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/en_GB/accountwizard.po kmail-account-wizard-18.04.3/po/en_GB/accountwizard.po
--- kmail-account-wizard-17.12.3/po/en_GB/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/en_GB/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -2,13 +2,13 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Andrew Coles <andrew_coles@yahoo.co.uk>, 2010, 2015.
-# Steve Allewell <steve.allewell@gmail.com>, 2016, 2017.
+# Steve Allewell <steve.allewell@gmail.com>, 2016, 2017, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-12-29 14:59+0000\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-02-18 15:35+0000\n"
 "Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
 "Language-Team: British English <kde-i18n-doc@kde.org>\n"
 "Language: en_GB\n"
@@ -48,7 +48,7 @@
 msgid "No given name for the configuration."
 msgstr "No given name for the configuration."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Unknown configuration name '%1'"
@@ -123,32 +123,32 @@
 msgid "Importing key..."
 msgstr "Importing key..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Provide personal data"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Secure your Communication"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Select Account Type"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Select Provider"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Loading Assistant"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Setting up Account"
@@ -341,8 +341,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "(c) 2009-2018 the Akonadi developers"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/eo/accountwizard.po kmail-account-wizard-18.04.3/po/eo/accountwizard.po
--- kmail-account-wizard-17.12.3/po/eo/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/eo/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2010-06-20 20:01+0200\n"
 "Last-Translator: Axel Rousseau <axel@esperanto-jeunes.org>\n"
 "Language-Team: esperanto <kde-i18n-eo@kde.org>\n"
@@ -46,7 +46,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr ""
@@ -121,32 +121,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr ""
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr ""
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr ""
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr ""
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr ""
@@ -339,7 +339,7 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr ""
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/es/accountwizard.po kmail-account-wizard-18.04.3/po/es/accountwizard.po
--- kmail-account-wizard-17.12.3/po/es/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/es/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -2,16 +2,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Javier, 2010.
-# Javier Vinal <fjvinal@gmail.com>, 2010, 2011, 2012, 2013, 2015, 2016, 2017.
+# Javier Vinal <fjvinal@gmail.com>, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018.
 # Javier Viñal <francisco-javie.vinal@seg-social.es>, 2013.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-10-25 12:28+0100\n"
-"Last-Translator: Javier Vinal <fjvinal²gmail.com>\n"
-"Language-Team: Spanish <l10n-kde-es@kde.org>\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-01-28 22:57+0100\n"
+"Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
+"Language-Team: Spanish <l10n-kde.es@kde.org>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,7 +49,7 @@
 msgid "No given name for the configuration."
 msgstr "No se ha proporcionado nombre para la configuración."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Nombre de configuración desconocido «%1»"
@@ -124,32 +124,32 @@
 msgid "Importing key..."
 msgstr "Importando clave..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Proporcionar datos personales"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Asegure su comunicación"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Seleccione tipo de cuenta"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Seleccionar proveedor"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Carga del asistente"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Configuración de cuenta"
@@ -348,8 +348,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "© 2009-2017 los desarrolladores de Akonadi"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "© 2009-2018, los desarrolladores de Akonadi"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/et/accountwizard.po kmail-account-wizard-18.04.3/po/et/accountwizard.po
--- kmail-account-wizard-17.12.3/po/et/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/et/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2016-12-09 20:19+0200\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <kde-i18n-doc@kde.org>\n"
@@ -47,7 +47,7 @@
 msgid "No given name for the configuration."
 msgstr "Seadistusele pole nime määratud."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Tundmatu seadistuse nimi \"%1\""
@@ -122,32 +122,32 @@
 msgid "Importing key..."
 msgstr "Võtme import ..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Isiklikud andmed"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Suhtlemise turvamine"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Konto tüübi valimine"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Teenusepakkuja valimine"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Abilise laadimine"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Konto loomine"
@@ -341,7 +341,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009-2016 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009-2016: Akonadi arendajad"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/fi/accountwizard.po kmail-account-wizard-18.04.3/po/fi/accountwizard.po
--- kmail-account-wizard-17.12.3/po/fi/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/fi/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-12-25 19:22+0200\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-01-22 17:05+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
 "Language: fi\n"
@@ -52,7 +52,7 @@
 msgid "No given name for the configuration."
 msgstr "Määritykselle ei ole annettu nimeä."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Tuntematon määrityksen nimi ”%1”"
@@ -127,32 +127,32 @@
 msgid "Importing key..."
 msgstr "Tuodaan avainta…"
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Anna henkilökohtaiset tiedot"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Salaa viestintäsi"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Valitse tilin tyyppi"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Valitse tarjoaja"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Ladataan avustajaa"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Asetetaan tiliä"
@@ -347,8 +347,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "© 2009–17 Akonadin kehittäjät"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "© 2009–18 Akonadin kehittäjät"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/fr/accountwizard.po kmail-account-wizard-18.04.3/po/fr/accountwizard.po
--- kmail-account-wizard-17.12.3/po/fr/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/fr/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -5,14 +5,15 @@
 # Sébastien Renard <renard@kde.org>, 2012, 2013, 2015.
 # xavier <xavier.besnard@neuf.fr>, 2013.
 # Vincent Pinon <vpinon@kde.org>, 2017, 2018.
+# Simon Depiets <sdepiets@gmail.com>, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-06-14 17:23+0100\n"
-"Last-Translator: Vincent Pinon <vpinon@kde.org>\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-07-09 11:31+0800\n"
+"Last-Translator: Simon Depiets <sdepiets@gmail.com>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +55,7 @@
 msgid "No given name for the configuration."
 msgstr "Aucun nom fourni pour la configuration."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Nom de configuration inconnu « %1 »"
@@ -131,32 +132,32 @@
 msgid "Importing key..."
 msgstr "Import de la clé…"
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Fournir des données personnelles"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Sécuriser votre communication"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Sélectionner le type de compte"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Sélectionner un fournisseur"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Chargement de l'assistant"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Configuration d'un compte"
@@ -360,8 +361,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "(c) 2009-2017 les développeurs de Akonadi"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "(c) 2009-2018 les développeurs de Akonadi"
 
 #: main.cpp:51
 #, kde-format
@@ -467,8 +468,8 @@
 "the account and adjust it manually if needed."
 msgstr ""
 "Il semble y avoir un problème pour atteindre ce serveur ou pour choisir un "
-"moyen sûr d'envoyer les justificatifs d'identité au serveur. Il vous est "
-"conseillé de vérifier la configuration du compte et de l'ajuster "
+"moyen sûr d'envoyer les identifiants de connexion au serveur. Nous vous "
+"recommandons de vérifier la configuration du compte et de l'ajuster "
 "manuellement si nécessaire."
 
 #: servertest.cpp:65
diff -Nru kmail-account-wizard-17.12.3/po/ga/accountwizard.po kmail-account-wizard-18.04.3/po/ga/accountwizard.po
--- kmail-account-wizard-17.12.3/po/ga/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/ga/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2010-03-18 00:57-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -47,7 +47,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr ""
@@ -122,32 +122,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr ""
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr ""
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr ""
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr ""
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr ""
@@ -341,7 +341,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "© 2009 Forbróirí Akonadi"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/gl/accountwizard.po kmail-account-wizard-18.04.3/po/gl/accountwizard.po
--- kmail-account-wizard-17.12.3/po/gl/accountwizard.po	2018-03-06 00:29:52.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/gl/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -4,14 +4,14 @@
 # Xosé <xosecalvo@gmail.com>, 2010, 2013.
 # Adrian Chaves Fernandez <adriyetichaves@gmail.com>, 2013, 2015, 2016, 2017.
 # Marce Villarino <mvillarino@kde-espana.org>, 2013, 2014.
-# Adrián Chaves (Gallaecio) <adrian@chaves.io>, 2017.
+# Adrián Chaves (Gallaecio) <adrian@chaves.io>, 2017, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-11-03 17:50+0100\n"
-"Last-Translator: Adrián Chaves (Gallaecio) <adrian@chaves.io>\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-05-24 22:58+0100\n"
+"Last-Translator: Adrian Chaves <adrian@chaves.io>\n"
 "Language-Team: Galician <kde-i18n-doc@kde.org>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
@@ -53,110 +53,107 @@
 msgid "No given name for the configuration."
 msgstr "Non se indicou ningún nome para a configuración."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Descoñécese o nome de configuración «%1»."
 
 #: cryptopage.cpp:99 cryptopage.cpp:122 cryptopage.cpp:228
-#, fuzzy, kde-format
-#| msgid "Account Assistant"
+#, kde-format
 msgid "Account Wizard"
-msgstr "Asistente de Contas"
+msgstr "Asistente de contas"
 
 #: cryptopage.cpp:100 cryptopage.cpp:123
 #, kde-format
 msgid "Error while generating new key pair for your account %1: %2"
-msgstr ""
+msgstr "Erro ao xerar unha nova parella de chaves para a súa conta %1: %2"
 
 #: cryptopage.cpp:288
 #, kde-format
 msgid "Could not detect valid key type"
-msgstr ""
+msgstr "Non se puido detectar un tipo de chave válido"
 
 #: cryptopage.cpp:289 cryptopage.cpp:298 cryptopage.cpp:315 cryptopage.cpp:324
 #, kde-format
 msgid "Import error"
-msgstr ""
+msgstr "Erro de importación"
 
 #: cryptopage.cpp:297
 #, kde-format
 msgid "Cannot read data from the certificate file: %1"
-msgstr ""
+msgstr "Non se poden ler os datos do ficheiro de certificado: %1"
 
 #: cryptopage.cpp:314
-#, fuzzy, kde-format
-#| msgid "Failed to load script: '%1'."
+#, kde-format
 msgid "Failed to import key: %1"
-msgstr "Fallou a carga do script: «%1»."
+msgstr "Non se puido importar a chave: %1"
 
 #: cryptopage.cpp:323
-#, fuzzy, kde-format
-#| msgid "Failed to load script: '%1'."
+#, kde-format
 msgid "Failed to import key."
-msgstr "Fallou a carga do script: «%1»."
+msgstr "Non se puido importar a chave."
 
 #: cryptopage.cpp:352
 #, kde-format
 msgid "No key"
-msgstr ""
+msgstr "Sen chave"
 
 #: cryptopage.cpp:354
 #, kde-format
 msgid "Generate a new key pair"
-msgstr ""
+msgstr "Xerar unha nova parella de chaves"
 
 #: cryptopage.cpp:356
 #, kde-format
 msgid "Import a key"
-msgstr ""
+msgstr "Importar unha chave"
 
 #: cryptopage.cpp:468
 #, kde-format
 msgid "Certificates"
-msgstr ""
+msgstr "Certificados"
 
 #: cryptopage.cpp:469
 #, kde-format
 msgid "Any files"
-msgstr ""
+msgstr "Calquera ficheiro"
 
 #: cryptopage.cpp:471
 #, kde-format
 msgid "Select Certificate File"
-msgstr ""
+msgstr "Seleccione o ficheiro de certificado"
 
 #: cryptopage.cpp:479
 #, kde-format
 msgid "Importing key..."
-msgstr ""
+msgstr "Importando a chave…"
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Forneza os seus datos persoais"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
-msgstr ""
+msgstr "Protexa as súas comunicacións"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Seleccione o tipo de conta"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Seleccione o fornecedor"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Estase a cargar o asistente"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Estase a configurar a conta"
@@ -190,7 +187,7 @@
 #: ispdb/ispdb.cpp:377
 #, kde-format
 msgid "Lookup configuration: Trying common server name"
-msgstr "Configuración da consulta: A intentar o nome común do servidor"
+msgstr "Configuración da consulta: Intentando o nome común do servidor"
 
 #: ispdb/ispdb.cpp:380
 #, kde-format
@@ -230,63 +227,67 @@
 #: key.cpp:86
 #, kde-format
 msgid "Skipping key publishing"
-msgstr ""
+msgstr "Saltando a publicación de chaves"
 
 #: key.cpp:100 key.cpp:225
 #, kde-format
 msgid "Publishing OpenPGP key..."
-msgstr ""
+msgstr "Publicando a chave OpenPGP…"
 
 #: key.cpp:115 key.cpp:143 key.cpp:215
 #, kde-format
 msgid "Key publishing was canceled."
-msgstr ""
+msgstr "Cancelouse a publicación de chaves."
 
 #: key.cpp:121
 #, kde-format
 msgid "Key publishing failed: not online, or GnuPG too old."
 msgstr ""
+"A publicación de chaves fallou: non está conectado a internet, ou a súa "
+"versión de GnuPG é demasiado vella."
 
 #: key.cpp:124
 #, kde-format
 msgid "Your email provider does not support key publishing."
-msgstr ""
+msgstr "O seu fornecedor de correo electrónico non permite publicar chaves."
 
 #: key.cpp:148
 #, kde-format
 msgid "An error occurred while creating key publishing request."
-msgstr ""
+msgstr "Produciuse un erro ao crear a solicitude de publicación de chave."
 
 #: key.cpp:172
 #, kde-format
 msgid "Key publishing error: mail transport is not configured"
 msgstr ""
+"Erro de publicación de chave: o transporte de correo non está configurado"
 
 #: key.cpp:185
 #, kde-format
 msgid "Key publishing error: failed to create request email"
 msgstr ""
+"Erro de publicación de chave: non se puido crear a mensaxe de correo "
+"electrónico da solicitude"
 
 #: key.cpp:217
 #, kde-format
 msgid "Failed to send key publishing request: %1"
-msgstr ""
+msgstr "Non se puido enviar a solicitude de publicación da chave: %1"
 
 #: key.cpp:219
 #, kde-format
 msgid "Key publishing request sent."
-msgstr ""
+msgstr "Enviouse a solicitude de publicación da chave."
 
 #: key.cpp:257
-#, fuzzy, kde-format
-#| msgid "Failed to load script: '%1'."
+#, kde-format
 msgid "Failed to publish the key."
-msgstr "Fallou a carga do script: «%1»."
+msgstr "Non se puido publicar a chave."
 
 #: key.cpp:263
 #, kde-format
 msgid "Key has been published on %1"
-msgstr ""
+msgstr "A chave publicouse en %1"
 
 #: ldap.cpp:55
 #, kde-format
@@ -332,7 +333,7 @@
 #: loadpage.cpp:53
 #, kde-format
 msgid "Unable to load assistant: File '%1' does not exist."
-msgstr "Foi imposíbel cargar o asistente: O ficheiro «%1» non existe."
+msgstr "Non se pode cargar o asistente: O ficheiro «%1» non existe."
 
 #: loadpage.cpp:56
 #, kde-format
@@ -350,10 +351,9 @@
 msgstr "Asistente de Contas"
 
 #: main.cpp:49
-#, fuzzy, kde-format
-#| msgid "(c) 2009-2016 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "© 2009-2016 Desenvolvedores de Akonadi"
+#, kde-format
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "© 2009-2018 Desenvolvedores de Akonadi"
 
 #: main.cpp:51
 #, kde-format
@@ -428,17 +428,17 @@
 #: resource.cpp:125
 #, kde-format
 msgid "Unable to configure resource instance."
-msgstr "Foi imposíbel configurar a instancia do recurso."
+msgstr "Non se pode configurar a instancia do recurso."
 
 #: resource.cpp:140
 #, kde-format
 msgid "Could not convert value of setting '%1' to required type %2."
-msgstr "Non foi posíbel converter o valor da opción «%1» no tipo requirido %2."
+msgstr "Non se puido converter o valor da opción «%1» no tipo requirido %2."
 
 #: resource.cpp:146
 #, kde-format
 msgid "Could not set setting '%1': %2"
-msgstr "Non foi posíbel configurar a opción «%1»: %2"
+msgstr "Non se puido configurar a opción «%1»: %2"
 
 #: resource.cpp:156
 #, kde-format
@@ -524,7 +524,7 @@
 #, kde-format
 msgid "Could not load config dialog for UID '%1'"
 msgstr ""
-"Non foi posíbel cargar un diálogo de configuración para o identificador «%1»."
+"Non se puido cargar un diálogo de configuración para o identificador «%1»."
 
 #. i18n: ectx: property (text), widget (QLabel, label)
 #: ui/cryptopage.ui:26
@@ -535,6 +535,9 @@
 "encrypted using the public key while only you can decrypt them with your "
 "private key."
 msgstr ""
+"Protéxase da vixilancia cifrando as súas mensaxes con GnuPG. Xerando ou "
+"seleccionando unha parella de chave pública e privada pode cifrar mensaxes "
+"usando a chave pública e só vostede poderá descifralas coa súa chave privada."
 
 #. i18n: ectx: property (toolTip), widget (QCheckBox, enableCryptoCheckBox)
 #: ui/cryptopage.ui:52
@@ -546,30 +549,35 @@
 "that it can be verified that your messages have not been tampered with.</p></"
 "body></html>"
 msgstr ""
+"<html><head/><body><p>Ao enviar mensaxes KMail busca automaticamente chaves "
+"de cifraxe dos seus destinatarios e protexe as mensaxes para os "
+"destinatarios para os que as atopa.</p><p>Tamén asina as súas mensaxes "
+"criptograficamente para permitir verificar que a súa mensaxe non se alterou."
+"</p></body></html>"
 
 #. i18n: ectx: property (text), widget (QCheckBox, enableCryptoCheckBox)
 #: ui/cryptopage.ui:55
 #, kde-format
 msgid "Secure outgoing emails, if possible"
-msgstr ""
+msgstr "Protexer as mensaxes saíntes cando se poida"
 
 #. i18n: ectx: property (text), widget (QLabel, label_2)
 #: ui/cryptopage.ui:65
 #, kde-format
 msgid "Select key for this account:"
-msgstr ""
+msgstr "Seleccionar a chave para esta conta:"
 
 #. i18n: ectx: property (title), widget (QGroupBox, groupBox)
 #: ui/cryptopage.ui:99
 #, kde-format
 msgid "Checking key publishing support ..."
-msgstr ""
+msgstr "Comprobando a compatibilidade coa publicación de chaves…"
 
 #. i18n: ectx: property (title), widget (QGroupBox, wksCheckBox)
 #: ui/cryptopage.ui:122
 #, kde-format
 msgid "Register &this key with your email provider"
-msgstr ""
+msgstr "Rexistrar es&ta chave co seu fornecedor de correo electrónico"
 
 #. i18n: ectx: property (text), widget (QLabel, wksDescription)
 #: ui/cryptopage.ui:132
@@ -580,12 +588,17 @@
 "This means that your public key can be queried from your email provider and "
 "others can then use it to secure their email communication with you."
 msgstr ""
+"O seu fornecedor de servido de correo electrónico fornece un servido para "
+"expor a súa chave pública, de texto que outros poidan atopala.\n"
+"Isto significa que a súa chave pública pode consultarse desde o seu "
+"fornecedor de correo electrónico e que outros poden entón usala para "
+"protexer o correo que lle envíen a vostede."
 
 #. i18n: ectx: property (title), widget (QGroupBox, pksCheckBox)
 #: ui/cryptopage.ui:152
 #, kde-format
 msgid "Publish &this key on public key server"
-msgstr ""
+msgstr "Publicar es&ta chave nun servidor de chaves público"
 
 #. i18n: ectx: property (text), widget (QLabel, pksDescription)
 #: ui/cryptopage.ui:162
@@ -598,6 +611,14 @@
 "should be aware that your email address will be publicly listed and they key "
 "cannot be removed from there, only revoked."
 msgstr ""
+"O seu fornecedor de servizo de correo electrónico non permite publicar "
+"chaves. Debería publicar a súa chave para que outros usuarios poidan obtela "
+"e usala para protexer as súas comunicacións de correo electrónico con "
+"vostede.\n"
+"De maneira alternativa, pode publicar a súa chave nun servidor público de "
+"chaves, pero debería ter en conta que o seu enderezo de correo electrónico "
+"estará listado publicamente e que a chave non pode retirarse dese servidor, "
+"unicamente pode revogarse."
 
 #. i18n: ectx: property (text), widget (QLabel, statusLabel)
 #: ui/loadpage.ui:30
@@ -635,10 +656,9 @@
 
 #. i18n: ectx: property (title), widget (QGroupBox, checkOnlineGroupBox)
 #: ui/personaldatapage.ui:122
-#, fuzzy, kde-format
-#| msgid "Find provider settings on the Internet"
+#, kde-format
 msgid "Find pro&vider settings on the Internet"
-msgstr "Atopar a configuración do fornecedor na Internet"
+msgstr "Atopar a configuración do fornecedor en &internet"
 
 #. i18n: ectx: property (text), widget (QLabel, checkOnlineExplanation)
 #: ui/personaldatapage.ui:143
@@ -661,10 +681,9 @@
 
 #. i18n: ectx: property (text), widget (QRadioButton, pop3Account)
 #: ui/personaldatapage.ui:194
-#, fuzzy, kde-format
-#| msgid "POP3 account"
+#, kde-format
 msgid "POP&3 account"
-msgstr "Conta de POP3"
+msgstr "Conta de POP&3"
 
 #. i18n: ectx: property (text), widget (QLabel, label)
 #: ui/personaldatapage.ui:208
@@ -686,10 +705,9 @@
 
 #. i18n: ectx: property (text), widget (QPushButton, createAccountPb)
 #: ui/personaldatapage.ui:276
-#, fuzzy, kde-format
-#| msgid "IMAP account"
+#, kde-format
 msgid "Add Account"
-msgstr "Conta de IMAP"
+msgstr "Engadir unha conta"
 
 #. i18n: ectx: property (text), widget (QLabel, label)
 #: ui/providerpage.ui:17
diff -Nru kmail-account-wizard-17.12.3/po/he/accountwizard.po kmail-account-wizard-18.04.3/po/he/accountwizard.po
--- kmail-account-wizard-17.12.3/po/he/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/he/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2017-05-17 01:16-0400\n"
 "Last-Translator: Elkana Bardugo <ttv200@gmail.com>\n"
 "Language-Team: Hebrew\n"
@@ -44,7 +44,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr ""
@@ -119,32 +119,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr ""
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr ""
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr ""
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr ""
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr ""
@@ -337,7 +337,7 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr ""
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/hu/accountwizard.po kmail-account-wizard-18.04.3/po/hu/accountwizard.po
--- kmail-account-wizard-17.12.3/po/hu/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/hu/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2014-01-20 22:02+0100\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <kde-l10n-hu@kde.org>\n"
@@ -48,7 +48,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, fuzzy, kde-format
 #| msgid "Autodetecting settings failed"
 msgid "Unknown configuration name '%1'"
@@ -127,32 +127,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Személyes adatok megadása"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Azonosítótípus választása"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Szolgáltatóválasztás"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Varázsló betöltése"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Azonosító beállítása"
@@ -347,7 +347,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "© Az Akonadi fejlesztői, 2009."
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/ia/accountwizard.po kmail-account-wizard-18.04.3/po/ia/accountwizard.po
--- kmail-account-wizard-17.12.3/po/ia/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/ia/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2013-12-06 14:44+0100\n"
 "Last-Translator: G.Sora <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua <kde-l10n-ia@kde.org>\n"
@@ -47,7 +47,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, fuzzy, kde-format
 #| msgid "Autodetecting settings failed"
 msgid "Unknown configuration name '%1'"
@@ -126,32 +126,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Provider datos personal"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Seliger typo de conto"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Seliger Fornitor (Provider)"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Assistente de cargar"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Il configura Conto"
@@ -346,7 +346,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009 le disveloppatores de Akonadi"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/it/accountwizard.po kmail-account-wizard-18.04.3/po/it/accountwizard.po
--- kmail-account-wizard-17.12.3/po/it/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/it/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-05-07 20:40+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-01-16 19:11+0100\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
 "Language: it\n"
@@ -48,7 +48,7 @@
 msgid "No given name for the configuration."
 msgstr "Nome non fornito per la configurazione."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Nome configurazione «%1» sconosciuto"
@@ -125,32 +125,32 @@
 msgid "Importing key..."
 msgstr "Importazione della chiave..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Fornisci i dati personali"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Rendi sicure la tue comunicazioni"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Seleziona il tipo dell'account"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Seleziona il provider"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Caricamento dell'assistente"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Impostazione dell'account"
@@ -354,8 +354,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "© 2009-2017 gli sviluppatori di Akonadi"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "© 2009-2018 gli sviluppatori di Akonadi"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/ja/accountwizard.po kmail-account-wizard-18.04.3/po/ja/accountwizard.po
--- kmail-account-wizard-17.12.3/po/ja/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/ja/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2010-10-22 23:45-0700\n"
 "Last-Translator: Fumiaki Okushi <okushi@kde.gr.jp>\n"
 "Language-Team: Japanese <kde-jp@kde.org>\n"
@@ -45,7 +45,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, fuzzy, kde-format
 #| msgid "Autodetecting settings failed"
 msgid "Unknown configuration name '%1'"
@@ -124,32 +124,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "個人情報を入力"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "アカウントタイプを選択"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "プロバイダを選択"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "ウィザードを読み込み中"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "アカウントの設定"
@@ -346,7 +346,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009 Akonadi 開発チーム"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/kk/accountwizard.po kmail-account-wizard-18.04.3/po/kk/accountwizard.po
--- kmail-account-wizard-17.12.3/po/kk/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/kk/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2013-09-22 04:25+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh <kde-i18n-doc@kde.org>\n"
@@ -47,7 +47,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, fuzzy, kde-format
 #| msgid "Autodetecting settings failed"
 msgid "Unknown configuration name '%1'"
@@ -126,32 +126,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Дербес деректері"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Тіркелгінің түрін таңдау"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Провайдерін таңдау"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Көмекшіні жүктеу"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Тіркелгіні баптау"
@@ -347,7 +347,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009 Akonadi құрастырушылары"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/km/accountwizard.po kmail-account-wizard-18.04.3/po/km/accountwizard.po
--- kmail-account-wizard-17.12.3/po/km/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/km/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2012-07-09 11:22+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -49,7 +49,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, fuzzy, kde-format
 #| msgid "Autodetecting settings failed"
 msgid "Unknown configuration name '%1'"
@@ -128,32 +128,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "ផ្ដល់​ទិន្នន័យ​ផ្ទាល់ខ្លួន"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "ជ្រើស​ប្រភេទ​គណនី"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "ជ្រើស​ក្រុមហ៊ុន​ផ្ដល់"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "ផ្ទុក​អ្នក​ជំនួយការ"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "រៀបចំ​គណនី"
@@ -349,7 +349,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "រក្សាសិទ្ធិ ២០០៩ ដោយ​អ្នក​អភិវឌ្ឍន៍ Akonadi"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/ko/accountwizard.po kmail-account-wizard-18.04.3/po/ko/accountwizard.po
--- kmail-account-wizard-17.12.3/po/ko/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/ko/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2017-12-03 18:13+0100\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean <kde@peremen.name>\n"
@@ -47,7 +47,7 @@
 msgid "No given name for the configuration."
 msgstr "설정의 이름을 지정하지 않았습니다."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "알 수 없는 설정 이름 '%1'"
@@ -122,32 +122,32 @@
 msgid "Importing key..."
 msgstr "키 가져오는 중..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "개인 정보 입력"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "내 대화 암호화"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "계정 종류 선택"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "공급자 선택"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "마법사 불러오는 중"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "계정 설정"
@@ -339,8 +339,9 @@
 msgstr "계정 마법사"
 
 #: main.cpp:49
-#, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
+#, fuzzy, kde-format
+#| msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009-2017 the Akonadi developers"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/lt/accountwizard.po kmail-account-wizard-18.04.3/po/lt/accountwizard.po
--- kmail-account-wizard-17.12.3/po/lt/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/lt/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\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"
@@ -51,7 +51,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, fuzzy, kde-format
 #| msgid "Autodetecting settings failed"
 msgid "Unknown configuration name '%1'"
@@ -130,32 +130,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Teikia asmeninius duomenis"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Parinkti paskyros tipą"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Parinkti tiekėją"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Įkeliamas pagelbiklis"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Paskyros nustatymai"
@@ -351,7 +351,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009 Akonadi kūrėjai"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/lv/accountwizard.po kmail-account-wizard-18.04.3/po/lv/accountwizard.po
--- kmail-account-wizard-17.12.3/po/lv/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/lv/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2011-07-13 01:26+0300\n"
 "Last-Translator: Einars Sprugis <einars8@gmail.com>\n"
 "Language-Team: Latvian <locale@laka.lv>\n"
@@ -48,7 +48,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, fuzzy, kde-format
 #| msgid "Autodetecting settings failed"
 msgid "Unknown configuration name '%1'"
@@ -127,32 +127,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Ievadiet personīgos datus"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Izvēlieties konta tipu"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Izvēlieties nodrošinātāju"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Ielādē palīgu"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Iestata kontu"
@@ -348,7 +348,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009 Akonadi izstrādātāji"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/mr/accountwizard.po kmail-account-wizard-18.04.3/po/mr/accountwizard.po
--- kmail-account-wizard-17.12.3/po/mr/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/mr/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2013-03-15 11:14+0530\n"
 "Last-Translator: Chetan Khona <chetan@kompkin.com>\n"
 "Language-Team: Marathi <kde-i18n-doc@kde.org>\n"
@@ -47,7 +47,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr ""
@@ -124,32 +124,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr ""
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "खाते प्रकार निवडा"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "पुरविठाकर्ता निवडा"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "सहायक दाखल करत आहे"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "खाते संयोजीत करत आहे"
@@ -344,7 +344,7 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr ""
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/nb/accountwizard.po kmail-account-wizard-18.04.3/po/nb/accountwizard.po
--- kmail-account-wizard-17.12.3/po/nb/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/nb/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2014-01-12 10:27+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -49,7 +49,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr ""
@@ -124,32 +124,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Oppgi personlige data"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Velg kontotype"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Velg leverandør"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Laster veiviser"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Setter opp konto"
@@ -342,7 +342,7 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr ""
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/nds/accountwizard.po kmail-account-wizard-18.04.3/po/nds/accountwizard.po
--- kmail-account-wizard-17.12.3/po/nds/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/nds/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2014-03-31 23:39+0200\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -49,7 +49,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, fuzzy, kde-format
 #| msgid "Autodetecting settings failed"
 msgid "Unknown configuration name '%1'"
@@ -128,32 +128,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Persöönliche Daten angeven"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Kontotyp utsöken"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Anbeder utsöken"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Hölper warrt laadt."
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Konto warrt inricht"
@@ -348,7 +348,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "© 2009: De Akonadi-Schrievers"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/nl/accountwizard.po kmail-account-wizard-18.04.3/po/nl/accountwizard.po
--- kmail-account-wizard-17.12.3/po/nl/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/nl/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -2,14 +2,14 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Freek de Kruijf <freekdekruijf@kde.nl>, 2010, 2012, 2013, 2015, 2016, 2017.
+# Freek de Kruijf <freekdekruijf@kde.nl>, 2010, 2012, 2013, 2015, 2016, 2017, 2018.
 # Hannie Lafeber-Dumoleyn <lafeber-dumoleyn2@zonnet.nl>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-04-24 11:40+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-01-13 18:13+0100\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
 "Language: nl\n"
@@ -49,7 +49,7 @@
 msgid "No given name for the configuration."
 msgstr "Geen gegeven naam voor de configuratie."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Onbekende naam van configuratie '%1'"
@@ -125,32 +125,32 @@
 msgid "Importing key..."
 msgstr "Sleutel importeren..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Persoonlijke gegevens opgeven"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Beveilig uw communicatie"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Accounttype selecteren"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Provider selecteren"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Assistent laden"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Account instellen"
@@ -345,8 +345,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "(c) 2009-2017 de Akonadi ontwikkelaars"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "(c) 2009-2018 de ontwikkelaars van Akonadi"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/nn/accountwizard.po kmail-account-wizard-18.04.3/po/nn/accountwizard.po
--- kmail-account-wizard-17.12.3/po/nn/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/nn/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2010-04-20 21:46+0200\n"
 "Last-Translator: Eirik U. Birkeland <eirbir@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -50,7 +50,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr ""
@@ -125,32 +125,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr ""
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Vel kontotype"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Vel leverandør"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Lastar vegvisar"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Set opp konto"
@@ -343,7 +343,7 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr ""
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/pa/accountwizard.po kmail-account-wizard-18.04.3/po/pa/accountwizard.po
--- kmail-account-wizard-17.12.3/po/pa/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/pa/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2011-01-04 07:50+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: Punjabi/Panjabi <kde-i18n-doc@kde.org>\n"
@@ -47,7 +47,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr ""
@@ -123,32 +123,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr ""
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "ਅਕਾਊਂਟ ਕਿਸਮ ਚੁਣੋ"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "ਪਰੋਵਾਇਡਰ ਚੁਣੋ"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "ਸਹਾਇਕ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "ਅਕਾਊਂਟ ਸੈਟਅੱਪ"
@@ -342,7 +342,7 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr ""
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/pl/accountwizard.po kmail-account-wizard-18.04.3/po/pl/accountwizard.po
--- kmail-account-wizard-17.12.3/po/pl/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/pl/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -3,13 +3,13 @@
 #
 # Michał Lachowski <michal@lachowski.info>, 2010.
 # Marta Rybczyńska <kde-i18n@rybczynska.net>, 2010, 2013.
-# Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>, 2012, 2014, 2015, 2016, 2017.
+# Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>, 2012, 2014, 2015, 2016, 2017, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-11-25 07:00+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-01-28 06:07+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
 "Language: pl\n"
@@ -50,7 +50,7 @@
 msgid "No given name for the configuration."
 msgstr "Nie nadano nazwy ustawieniom."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Nieznana nazwa ustawień '%1'"
@@ -125,32 +125,32 @@
 msgid "Importing key..."
 msgstr "Importowanie klucza..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Podaj dane osobowe"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Zabezpiecz swoją komunikację"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Wybierz rodzaj konta"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Wybierz dostawcę"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Wczytywanie pomocy"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Ustawianie konta"
@@ -346,8 +346,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "(c) 2009-2017 programiści Akonadi"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "(c) 2009-2018 programiści Akonadi"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/pt/accountwizard.po kmail-account-wizard-18.04.3/po/pt/accountwizard.po
--- kmail-account-wizard-17.12.3/po/pt/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/pt/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-04-24 10:26+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-01-13 19:29+0000\n"
 "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
 "Language: pt\n"
@@ -44,7 +44,7 @@
 msgid "No given name for the configuration."
 msgstr "Não foi indicado nenhum nome para a configuração."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "O nome da configuração '%1' é desconhecido"
@@ -119,32 +119,32 @@
 msgid "Importing key..."
 msgstr "A importar a chave..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Fornecer os dados pessoais"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Tornar a Sua Comunicação Segura"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Seleccionar o Tipo de Conta"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Seleccionar o Fornecedor"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "A Carregar o Assistente"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "A Configurar a Conta"
@@ -342,8 +342,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "(c) 2009-2017 os programadores do Akonadi"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "(c) 2009-2018 os programadores do Akonadi"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/pt_BR/accountwizard.po kmail-account-wizard-18.04.3/po/pt_BR/accountwizard.po
--- kmail-account-wizard-17.12.3/po/pt_BR/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/pt_BR/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2016-02-14 14:44-0300\n"
 "Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -49,7 +49,7 @@
 msgid "No given name for the configuration."
 msgstr "Não foi indicado nenhum nome para a configuração."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Nome da configuração '%1' desconhecido"
@@ -127,32 +127,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Forneça os dados pessoais"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Selecione o tipo de conta"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Selecionar provedor"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Carregando o assistente"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Configurando a conta"
@@ -348,7 +348,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009-2016 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009-2016 dos desenvolvedores do Akonadi"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/ro/accountwizard.po kmail-account-wizard-18.04.3/po/ro/accountwizard.po
--- kmail-account-wizard-17.12.3/po/ro/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/ro/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2013-02-04 18:08+0200\n"
 "Last-Translator: Sergiu Bivol <sergiu.bivol@jurnaltv.md>\n"
 "Language-Team: Romanian <kde-i18n-ro@kde.org>\n"
@@ -48,7 +48,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, fuzzy, kde-format
 #| msgid "Autodetecting settings failed"
 msgid "Unknown configuration name '%1'"
@@ -125,32 +125,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Furnizați date personale"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Alegeți tipul de cont"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Alegeți furnizorul"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Se încarcă asistentul"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Se configurează contul"
@@ -345,7 +345,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009 Dezvoltatorii Akonadi"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/ru/accountwizard.po kmail-account-wizard-18.04.3/po/ru/accountwizard.po
--- kmail-account-wizard-17.12.3/po/ru/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/ru/accountwizard.po	2018-07-10 00:14:43.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2017-10-11 14:35+0300\n"
 "Last-Translator: Alexander Potashev <aspotashev@gmail.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -54,7 +54,7 @@
 msgid "No given name for the configuration."
 msgstr "Не указано название конфигурации."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Неизвестное название конфигурации «%1»."
@@ -129,32 +129,32 @@
 msgid "Importing key..."
 msgstr "Импорт ключа..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Ввод личных данных"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Защита переписки"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Выберите тип учётной записи"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Выбор поставщика"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Загрузка мастера"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Создание учётной записи"
@@ -354,8 +354,9 @@
 msgstr "Мастер создания учётных записей"
 
 #: main.cpp:49
-#, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
+#, fuzzy, kde-format
+#| msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "© Разработчики Akonadi, 2009–2017"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/sk/accountwizard.po kmail-account-wizard-18.04.3/po/sk/accountwizard.po
--- kmail-account-wizard-17.12.3/po/sk/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/sk/accountwizard.po	2018-07-10 00:14:44.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2017-04-26 21:19+0100\n"
 "Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
 "Language-Team: Slovak <kde-sk@linux.sk>\n"
@@ -46,7 +46,7 @@
 msgid "No given name for the configuration."
 msgstr "Nie je zadané meno pre nastavenie-"
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Neznámy konfiguračný názov '%1'"
@@ -121,32 +121,32 @@
 msgid "Importing key..."
 msgstr "Importujem kľúč..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Poskytnúť osobné údaje"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Zabezpečiť vašu komunikáciu"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Vybrať typ účtu"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Vybrať poskytovateľa"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Nahrávanie asistenta"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Pripravujem účet"
@@ -338,8 +338,9 @@
 msgstr "Asistent účtov"
 
 #: main.cpp:49
-#, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
+#, fuzzy, kde-format
+#| msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009-2017 Vývojári Akonadi"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/sl/accountwizard.po kmail-account-wizard-18.04.3/po/sl/accountwizard.po
--- kmail-account-wizard-17.12.3/po/sl/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/sl/accountwizard.po	2018-07-10 00:14:44.000000000 +0000
@@ -3,13 +3,13 @@
 #
 # Andrej Vernekar <andrej.vernekar@moj.net>, 2010.
 # Jure Repinc <jlp@holodeck1.com>, 2012.
-# Andrej Mernik <andrejm@ubuntu.si>, 2014, 2015, 2016, 2017.
+# Andrej Mernik <andrejm@ubuntu.si>, 2014, 2015, 2016, 2017, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-07-16 11:42+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-01-16 17:17+0100\n"
 "Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
 "Language: sl\n"
@@ -50,7 +50,7 @@
 msgid "No given name for the configuration."
 msgstr "Za nastavitve ni podanega imena."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Neznano ime nastavitev »%1«"
@@ -125,32 +125,32 @@
 msgid "Importing key..."
 msgstr "Uvažanje ključa ..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Posredujte osebne podatke"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Zaščitite vaše sporazumevanje"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Izberite vrsto računa"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Izberite ponudnika"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Nalaganje pomočnika"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Nastavljanje računa"
@@ -344,8 +344,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "(c) 2009-2017 razvijalci Akonadija"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "(c) 2009-2018 razvijalci Akonadija"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/sr/accountwizard.po kmail-account-wizard-18.04.3/po/sr/accountwizard.po
--- kmail-account-wizard-17.12.3/po/sr/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/sr/accountwizard.po	2018-07-10 00:14:44.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2017-05-07 21:01+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -49,7 +49,7 @@
 msgid "No given name for the configuration."
 msgstr "Није дато име поставе."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Непознато име поставе „%1“"
@@ -129,36 +129,36 @@
 msgstr "Увозим кључ..."
 
 # >> @title:window
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Унос личних података"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Обезбедите своју комуникацију"
 
 # >> @title:window
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Избор типа налога"
 
 # >> @title:window
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Избор провајдера"
 
 # >> @title:window
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Учитавање помоћника"
 
 # >> @title:window
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Постављање налога"
@@ -352,8 +352,9 @@
 msgstr "Асистент налога"
 
 #: main.cpp:49
-#, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
+#, fuzzy, kde-format
+#| msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "© 2009–2017, програмери Аконадија"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/sv/accountwizard.po kmail-account-wizard-18.04.3/po/sv/accountwizard.po
--- kmail-account-wizard-17.12.3/po/sv/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/sv/accountwizard.po	2018-07-10 00:14:44.000000000 +0000
@@ -1,13 +1,13 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Stefan Asserhäll <stefan.asserhall@bredband.net>, 2010, 2012, 2013, 2015, 2016, 2017.
+# Stefan Asserhäll <stefan.asserhall@bredband.net>, 2010, 2012, 2013, 2015, 2016, 2017, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-04-25 18:49+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-01-14 19:40+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
 "Language: sv\n"
@@ -47,7 +47,7 @@
 msgid "No given name for the configuration."
 msgstr "Inget namn angivet för inställningen."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Okänt inställningsnamn '%1'"
@@ -122,32 +122,32 @@
 msgid "Importing key..."
 msgstr "Importerar nyckel..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Tillhandahåll personlig information"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Säkra din kommunikation"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Välj kontotyp"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Välj leverantör"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Läser in guide"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Ställer in konto"
@@ -341,8 +341,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "© 2009-2017 Akonadis utvecklare"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "© 2009-2018 Akonadis utvecklare"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/tr/accountwizard.po kmail-account-wizard-18.04.3/po/tr/accountwizard.po
--- kmail-account-wizard-17.12.3/po/tr/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/tr/accountwizard.po	2018-07-10 00:14:44.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: kdepim-runtime-kde4\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2017-06-08 09:16+0000\n"
 "Last-Translator: Kaan <kaanozdincer@gmail.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
@@ -52,7 +52,7 @@
 msgid "No given name for the configuration."
 msgstr "Yapılandırma için isim girilmedi."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Bilinmeyen yapılandırma adı '%1'"
@@ -127,32 +127,32 @@
 msgid "Importing key..."
 msgstr "Anahtar içe aktarılıyor..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Kişisel verileri girin"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Bağlantınızı Güvende Tutun"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Hesap Türünü Seç"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Sağlayıcı Seç"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Yardımcı Yükleniyor"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Hesap Ayarlanıyor"
@@ -344,8 +344,9 @@
 msgstr "Hesap Yardımcısı"
 
 #: main.cpp:49
-#, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
+#, fuzzy, kde-format
+#| msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009-2017 Akonadi geliştiricileri"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/ug/accountwizard.po kmail-account-wizard-18.04.3/po/ug/accountwizard.po
--- kmail-account-wizard-17.12.3/po/ug/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/ug/accountwizard.po	2018-07-10 00:14:44.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2013-09-08 07:05+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
@@ -47,7 +47,7 @@
 msgid "No given name for the configuration."
 msgstr ""
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, fuzzy, kde-format
 #| msgid "Autodetecting settings failed"
 msgid "Unknown configuration name '%1'"
@@ -126,32 +126,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "خۇسۇسىي سانلىق-مەلۇماتلارنى كىرگۈزۈش"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "ھېسابات تىپىنى تاللاش"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "تەمىنلىگۈچىنى تاللاش"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "ياردەمچىنى ئوقۇۋاتىدۇ"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "ھېسابات تەڭشەش"
@@ -347,7 +347,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009 the Akonadi developers"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/po/uk/accountwizard.po kmail-account-wizard-18.04.3/po/uk/accountwizard.po
--- kmail-account-wizard-17.12.3/po/uk/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/uk/accountwizard.po	2018-07-10 00:14:44.000000000 +0000
@@ -1,22 +1,22 @@
 # Translation of accountwizard.po to Ukrainian
-# Copyright (C) 2010-2017 This_file_is_part_of_KDE
+# Copyright (C) 2010-2018 This_file_is_part_of_KDE
 # 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.
 #
-# Yuri Chornoivan <yurchor@ukr.net>, 2010, 2012, 2013, 2015, 2016, 2017.
+# Yuri Chornoivan <yurchor@ukr.net>, 2010, 2012, 2013, 2015, 2016, 2017, 2018.
 msgid ""
 msgstr ""
 "Project-Id-Version: accountwizard\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2017-04-24 09:14+0300\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-01-13 09:42+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
 "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
@@ -50,7 +50,7 @@
 msgid "No given name for the configuration."
 msgstr "Не вказано назви налаштувань."
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "Невідома назва налаштувань «%1»"
@@ -127,32 +127,32 @@
 msgid "Importing key..."
 msgstr "Імпортуємо ключ…"
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "Надайте особисті дані"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "Захистіть ваш обмін даними"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "Виберіть тип облікового запису"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "Вибір надавача послуг"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "Помічник завантаження"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "Налаштування облікового запису"
@@ -357,8 +357,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "© Розробники Akonadi, 2009–2017"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "© Розробники Akonadi, 2009–2018"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/zh_CN/accountwizard.po kmail-account-wizard-18.04.3/po/zh_CN/accountwizard.po
--- kmail-account-wizard-17.12.3/po/zh_CN/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/zh_CN/accountwizard.po	2018-07-10 00:14:44.000000000 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
-"PO-Revision-Date: 2018-02-28 02:27-0500\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
+"PO-Revision-Date: 2018-07-03 17:39\n"
 "Last-Translator: guoyunhebrave <guoyunhebrave@gmail.com>\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
@@ -51,7 +51,7 @@
 msgid "No given name for the configuration."
 msgstr "未命名此配置。"
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, kde-format
 msgid "Unknown configuration name '%1'"
 msgstr "位置的配置名称“%1”"
@@ -126,32 +126,32 @@
 msgid "Importing key..."
 msgstr "正在导入密钥..."
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "提供个人数据"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr "强化您的通讯安全"
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "选择账户类型"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "选择供应商"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "正在装入助手"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "设置账户"
@@ -344,8 +344,8 @@
 
 #: main.cpp:49
 #, kde-format
-msgid "(c) 2009-2017 the Akonadi developers"
-msgstr "(c) 2009-2017 Akonadi 开发者"
+msgid "(c) 2009-2018 the Akonadi developers"
+msgstr "(c) 2009-2018 Akonadi 开发者"
 
 #: main.cpp:51
 #, kde-format
diff -Nru kmail-account-wizard-17.12.3/po/zh_CN/accountwizard_tine20.po kmail-account-wizard-18.04.3/po/zh_CN/accountwizard_tine20.po
--- kmail-account-wizard-17.12.3/po/zh_CN/accountwizard_tine20.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/zh_CN/accountwizard_tine20.po	2018-07-10 00:14:44.000000000 +0000
@@ -7,7 +7,7 @@
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2017-10-18 06:45+0200\n"
-"PO-Revision-Date: 2018-02-28 02:27-0500\n"
+"PO-Revision-Date: 2018-07-03 17:39\n"
 "Last-Translator: guoyunhebrave <guoyunhebrave@gmail.com>\n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
diff -Nru kmail-account-wizard-17.12.3/po/zh_TW/accountwizard.po kmail-account-wizard-18.04.3/po/zh_TW/accountwizard.po
--- kmail-account-wizard-17.12.3/po/zh_TW/accountwizard.po	2018-03-06 00:29:53.000000000 +0000
+++ kmail-account-wizard-18.04.3/po/zh_TW/accountwizard.po	2018-07-10 00:14:44.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-11-05 03:12+0100\n"
+"POT-Creation-Date: 2018-03-18 03:24+0100\n"
 "PO-Revision-Date: 2015-06-14 13:14+0800\n"
 "Last-Translator: Franklin\n"
 "Language-Team: Chinese <kde-i18n-doc@kde.org>\n"
@@ -50,7 +50,7 @@
 msgid "No given name for the configuration."
 msgstr "設定檔未命名"
 
-#: configfile.cpp:111
+#: configfile.cpp:112
 #, fuzzy, kde-format
 #| msgid "Unknown configurationname '%1'"
 msgid "Unknown configuration name '%1'"
@@ -129,32 +129,32 @@
 msgid "Importing key..."
 msgstr ""
 
-#: dialog.cpp:59
+#: dialog.cpp:61
 #, kde-format
 msgid "Provide personal data"
 msgstr "提供個人資料"
 
-#: dialog.cpp:67
+#: dialog.cpp:69
 #, kde-format
 msgid "Secure your Communication"
 msgstr ""
 
-#: dialog.cpp:77
+#: dialog.cpp:79
 #, kde-format
 msgid "Select Account Type"
 msgstr "選擇帳號型態"
 
-#: dialog.cpp:85
+#: dialog.cpp:87
 #, kde-format
 msgid "Select Provider"
 msgstr "選擇提供者"
 
-#: dialog.cpp:91
+#: dialog.cpp:93
 #, kde-format
 msgid "Loading Assistant"
 msgstr "載入小助手中"
 
-#: dialog.cpp:99
+#: dialog.cpp:101
 #, kde-format
 msgid "Setting up Account"
 msgstr "設定帳號中"
@@ -349,7 +349,7 @@
 #: main.cpp:49
 #, fuzzy, kde-format
 #| msgid "(c) 2009-2015 the Akonadi developers"
-msgid "(c) 2009-2017 the Akonadi developers"
+msgid "(c) 2009-2018 the Akonadi developers"
 msgstr "(c) 2009-2015 Akonadi 開發團隊"
 
 #: main.cpp:51
diff -Nru kmail-account-wizard-17.12.3/src/configfile.cpp kmail-account-wizard-18.04.3/src/configfile.cpp
--- kmail-account-wizard-17.12.3/src/configfile.cpp	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/configfile.cpp	2018-06-29 05:03:37.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2010-2017 Laurent Montel <montel@kde.org>
+    Copyright (c) 2010-2018 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
@@ -102,9 +102,10 @@
     }
 
     if (m_editName == QLatin1String("freebusy")) {
-        KCMultiDialog *dialog = new KCMultiDialog();
+        QPointer<KCMultiDialog> dialog = new KCMultiDialog();
         dialog->addModule(QStringLiteral("korganizer_configfreebusy.desktop"));
-        dialog->show();
+        dialog->exec();
+        delete dialog;
         return;
     }
 
diff -Nru kmail-account-wizard-17.12.3/src/configfile.h kmail-account-wizard-18.04.3/src/configfile.h
--- kmail-account-wizard-17.12.3/src/configfile.h	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/configfile.h	2018-06-29 05:03:37.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-    Copyright (c) 2010-2017 Laurent Montel <montel@kde.org>
+    Copyright (c) 2010-2018 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
@@ -36,7 +36,7 @@
     Q_OBJECT
 public:
     explicit ConfigFile(const QString &configName, QObject *parent = nullptr);
-    ~ConfigFile();
+    ~ConfigFile() override;
     void create() override;
     void destroy() override;
     void edit();
diff -Nru kmail-account-wizard-17.12.3/src/dialog.cpp kmail-account-wizard-18.04.3/src/dialog.cpp
--- kmail-account-wizard-17.12.3/src/dialog.cpp	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/dialog.cpp	2018-06-29 05:03:37.000000000 +0000
@@ -32,6 +32,8 @@
 #include "setuppage.h"
 #include "cryptopage.h"
 
+#include <QAction>
+
 #include <KMime/Message>
 
 #include <klocalizedstring.h>
@@ -103,6 +105,7 @@
 
     Page *page = qobject_cast<Page *>(currentPage()->widget());
     page->enterPageNext();
+    //TODO ? necessary ???
     Q_EMIT page->pageEnteredNext();
     connect(button(QDialogButtonBox::Cancel), &QPushButton::clicked, this, &Dialog::accept);
     KHelpMenu *helpMenu = new KHelpMenu(this, KAboutData::applicationData(), true);
diff -Nru kmail-account-wizard-17.12.3/src/identity.cpp kmail-account-wizard-18.04.3/src/identity.cpp
--- kmail-account-wizard-17.12.3/src/identity.cpp	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/identity.cpp	2018-06-29 05:03:37.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2010-2017 Laurent Montel <montel@kde.org>
+    Copyright (C) 2010-2018 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
diff -Nru kmail-account-wizard-17.12.3/src/identity.h kmail-account-wizard-18.04.3/src/identity.h
--- kmail-account-wizard-17.12.3/src/identity.h	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/identity.h	2018-06-29 05:03:37.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2010-2017 Laurent Montel <montel@kde.org>
+    Copyright (C) 2010-2018 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
@@ -35,7 +35,7 @@
     Q_OBJECT
 public:
     explicit Identity(QObject *parent = nullptr);
-    ~Identity();
+    ~Identity() override;
     void create() override;
     void destroy() override;
 
diff -Nru kmail-account-wizard-17.12.3/src/ispdb/ispdb.cpp kmail-account-wizard-18.04.3/src/ispdb/ispdb.cpp
--- kmail-account-wizard-17.12.3/src/ispdb/ispdb.cpp	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/ispdb/ispdb.cpp	2018-06-29 05:03:37.000000000 +0000
@@ -295,7 +295,7 @@
                 QTextStream stream(&i.signature);
                 f.save(stream, 0);
                 i.signature = i.signature.trimmed();
-                if (i.signature.startsWith(QStringLiteral("<signature>"))) {
+                if (i.signature.startsWith(QLatin1String("<signature>"))) {
                     i.signature = i.signature.mid(11, i.signature.length() - 23);
                     i.signature = i.signature.trimmed();
                 }
@@ -310,9 +310,9 @@
 QString Ispdb::replacePlaceholders(const QString &in)
 {
     QString out(in);
-    out.replace(QStringLiteral("%EMAILLOCALPART%"), mAddr.localPart);
-    out.replace(QStringLiteral("%EMAILADDRESS%"), mAddr.asString());
-    out.replace(QStringLiteral("%EMAILDOMAIN%"), mAddr.domain);
+    out.replace(QLatin1String("%EMAILLOCALPART%"), mAddr.localPart);
+    out.replace(QLatin1String("%EMAILADDRESS%"), mAddr.asString());
+    out.replace(QLatin1String("%EMAILDOMAIN%"), mAddr.domain);
     return out;
 }
 
diff -Nru kmail-account-wizard-17.12.3/src/ispdb/ispdb.h kmail-account-wizard-18.04.3/src/ispdb/ispdb.h
--- kmail-account-wizard-17.12.3/src/ispdb/ispdb.h	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/ispdb/ispdb.h	2018-06-29 05:03:37.000000000 +0000
@@ -176,17 +176,14 @@
     QVector< Server > mSmtpServers;
     QVector< identity > mIdentities;
 
-    int mDefaultIdentity;
+    int mDefaultIdentity = -1;
     Ispdb::searchServerType mServerType;
-    bool mStart;
+    bool mStart = true;
 };
 
 struct Server {
     Server()
     {
-        port = -1;
-        authentication = Ispdb::Plain;
-        socketType = Ispdb::None;
     }
 
     bool isValid() const
@@ -194,11 +191,11 @@
         return port != -1;
     }
 
-    Ispdb::authType authentication;
-    Ispdb::socketType socketType;
+    Ispdb::authType authentication = Ispdb::Plain;
+    Ispdb::socketType socketType = Ispdb::None;
     QString hostname;
     QString username;
-    int port;
+    int port = -1;
 };
 
 struct identity {
diff -Nru kmail-account-wizard-17.12.3/src/key.h kmail-account-wizard-18.04.3/src/key.h
--- kmail-account-wizard-17.12.3/src/key.h	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/key.h	2018-06-29 05:03:37.000000000 +0000
@@ -46,7 +46,7 @@
     };
 
     explicit Key(QObject *parent = nullptr);
-    ~Key();
+    ~Key() override;
 
     void create() override;
     void destroy() override;
diff -Nru kmail-account-wizard-17.12.3/src/ldap.cpp kmail-account-wizard-18.04.3/src/ldap.cpp
--- kmail-account-wizard-17.12.3/src/ldap.cpp	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/ldap.cpp	2018-06-29 05:03:37.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2010-2017 Laurent Montel <montel@kde.org>
+    Copyright (C) 2010-2018 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
@@ -83,8 +83,8 @@
 
     basedn.replace(QLatin1Char('.'), QStringLiteral(",dc="));
 
-    if (!basedn.startsWith(QStringLiteral("dc="))) {
-        basedn.prepend(QStringLiteral("dc="));
+    if (!basedn.startsWith(QLatin1String("dc="))) {
+        basedn.prepend(QLatin1String("dc="));
     }
 
     // Set the changes
diff -Nru kmail-account-wizard-17.12.3/src/ldap.h kmail-account-wizard-18.04.3/src/ldap.h
--- kmail-account-wizard-17.12.3/src/ldap.h	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/ldap.h	2018-06-29 05:03:37.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2010-2017 Laurent Montel <montel@kde.org>
+    Copyright (C) 2010-2018 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
@@ -35,7 +35,7 @@
     Q_OBJECT
 public:
     explicit Ldap(QObject *parent = nullptr);
-    ~Ldap();
+    ~Ldap() override;
     void create() override;
     void destroy() override;
     void edit();
diff -Nru kmail-account-wizard-17.12.3/src/main.cpp kmail-account-wizard-18.04.3/src/main.cpp
--- kmail-account-wizard-17.12.3/src/main.cpp	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/main.cpp	2018-06-29 05:03:37.000000000 +0000
@@ -46,7 +46,7 @@
                          QStringLiteral("0.2"),
                          i18n("Helps setting up PIM accounts"),
                          KAboutLicense::LGPL,
-                         i18n("(c) 2009-2017 the Akonadi developers"),
+                         i18n("(c) 2009-2018 the Akonadi developers"),
                          QStringLiteral("https://community.kde.org/KDE_PIM/Akonadi"));
     aboutData.addAuthor(i18n("Volker Krause"), i18n("Author"), QStringLiteral("vkrause@kde.org"));
     aboutData.addAuthor(i18n("Laurent Montel"), QString(), QStringLiteral("montel@kde.org"));
diff -Nru kmail-account-wizard-17.12.3/src/personaldatapage.cpp kmail-account-wizard-18.04.3/src/personaldatapage.cpp
--- kmail-account-wizard-17.12.3/src/personaldatapage.cpp	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/personaldatapage.cpp	2018-06-29 05:03:37.000000000 +0000
@@ -1,7 +1,7 @@
 /*
     Copyright (c) 2009 Volker Krause <vkrause@kde.org>
     Copyright (c) 2010 Tom Albers <toma@kde.org>
-    Copyright (C) 2012-2017 Laurent Montel <montel@kde.org>
+    Copyright (C) 2012-2018 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
diff -Nru kmail-account-wizard-17.12.3/src/personaldatapage.h kmail-account-wizard-18.04.3/src/personaldatapage.h
--- kmail-account-wizard-17.12.3/src/personaldatapage.h	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/personaldatapage.h	2018-06-29 05:03:37.000000000 +0000
@@ -1,7 +1,7 @@
 /*
     Copyright (c) 2009 Volker Krause <vkrause@kde.org>
     Copyright (c) 2010 Tom Albers <toma@kde.org>
-    Copyright (C) 2012-2017 Laurent Montel <montel@kde.org>
+    Copyright (C) 2012-2018 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
diff -Nru kmail-account-wizard-17.12.3/src/providerpage.cpp kmail-account-wizard-18.04.3/src/providerpage.cpp
--- kmail-account-wizard-17.12.3/src/providerpage.cpp	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/providerpage.cpp	2018-06-29 05:03:37.000000000 +0000
@@ -23,13 +23,13 @@
 
 #include "accountwizard_debug.h"
 #include <QSortFilterProxyModel>
-#include <kns3/downloadmanager.h>
+#include <KNSCore/DownloadManager>
 #include <KLocalizedString>
 
 ProviderPage::ProviderPage(KAssistantDialog *parent)
     : Page(parent)
     , m_model(new QStandardItemModel(this))
-    , m_downloadManager(new KNS3::DownloadManager(this))
+    , m_downloadManager(new KNSCore::DownloadManager(this))
     , m_newPageWanted(false)
     , m_newPageReady(false)
 {
@@ -46,9 +46,9 @@
 
     // we can start the search, whenever the user reaches this page, chances
     // are we have the full list.
-    connect(m_downloadManager, &KNS3::DownloadManager::searchResult, this, &ProviderPage::fillModel);
-    connect(m_downloadManager, &KNS3::DownloadManager::entryStatusChanged, this, &ProviderPage::providerStatusChanged);
-    m_downloadManager->setSearchOrder(KNS3::DownloadManager::Alphabetical);
+    connect(m_downloadManager, &KNSCore::DownloadManager::searchResult, this, &ProviderPage::fillModel);
+    connect(m_downloadManager, &KNSCore::DownloadManager::entryStatusChanged, this, &ProviderPage::providerStatusChanged);
+    m_downloadManager->setSearchOrder(KNSCore::DownloadManager::Alphabetical);
 
     connect(ui.listView->selectionModel(), &QItemSelectionModel::selectionChanged, this, &ProviderPage::selectionChanged);
 }
@@ -58,7 +58,7 @@
     m_downloadManager->search(0, 100000);
 }
 
-void ProviderPage::fillModel(const KNS3::Entry::List &list)
+void ProviderPage::fillModel(const KNSCore::EntryInternal::List &list)
 {
     if (m_fetchItem) {
         m_model->removeRows(m_model->indexFromItem(m_fetchItem).row(), 1);
@@ -69,13 +69,13 @@
     // we can not use a QHash or whatever, as that needs that constructor...
     m_providerEntries = list;
 
-    for (const KNS3::Entry &e : list) {
+    for (const KNSCore::EntryInternal &e : list) {
         qCDebug(ACCOUNTWIZARD_LOG) << "Found Entry: " << e.name();
 
         QStandardItem *item = new QStandardItem(e.name());
         item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
         item->setData(e.name(), Qt::ToolTipRole);
-        item->setData(e.id(), Qt::UserRole);
+        item->setData(e.uniqueId(), Qt::UserRole);
         item->setData(e.providerId(), Qt::UserRole + 1);
         m_model->appendRow(item);
     }
@@ -106,10 +106,10 @@
     qCDebug(ACCOUNTWIZARD_LOG) << "Item selected:" << item->text();
 
     // download and execute it...
-    foreach (const KNS3::Entry &e, m_providerEntries) {
-        if (e.id() == item->data(Qt::UserRole)
+    foreach (const KNSCore::EntryInternal &e, m_providerEntries) {
+        if (e.uniqueId() == item->data(Qt::UserRole)
             && e.providerId() == item->data(Qt::UserRole + 1)) {
-            m_wantedProvider.entryId = e.id();
+            m_wantedProvider.entryId = e.uniqueId();
             m_wantedProvider.entryProviderId = e.providerId();
 
             if (e.status() == KNS3::Entry::Installed) {
@@ -125,10 +125,10 @@
     }
 }
 
-void ProviderPage::providerStatusChanged(const KNS3::Entry &e)
+void ProviderPage::providerStatusChanged(const KNSCore::EntryInternal &e)
 {
     qCDebug(ACCOUNTWIZARD_LOG) << e.name();
-    if (e.id() == m_wantedProvider.entryId
+    if (e.uniqueId() == m_wantedProvider.entryId
         && e.providerId() == m_wantedProvider.entryProviderId
         && e.status() == KNS3::Entry::Installed) {
         findDesktopAndSetAssistant(e.installedFiles());
@@ -139,7 +139,7 @@
 {
     for (const QString &file : list) {
         qCDebug(ACCOUNTWIZARD_LOG) << file;
-        if (file.endsWith(QStringLiteral(".desktop"))) {
+        if (file.endsWith(QLatin1String(".desktop"))) {
             qCDebug(ACCOUNTWIZARD_LOG) << "Yay, a desktop file!" << file;
             Global::setAssistant(file);
             m_newPageReady = true;
diff -Nru kmail-account-wizard-17.12.3/src/providerpage.h kmail-account-wizard-18.04.3/src/providerpage.h
--- kmail-account-wizard-17.12.3/src/providerpage.h	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/providerpage.h	2018-06-29 05:03:37.000000000 +0000
@@ -25,14 +25,13 @@
 #include <QStandardItemModel>
 
 #include "ui_providerpage.h"
-#include <kns3/entry.h>
-
+#include <KNSCore/DownloadManager>
 struct Provider {
     QString entryId;
     QString entryProviderId;
 };
 
-namespace KNS3 {
+namespace KNSCore {
 class DownloadManager;
 }
 
@@ -55,17 +54,17 @@
     void startFetchingData();
 
 private:
-    void fillModel(const KNS3::Entry::List &);
+    void fillModel(const KNSCore::EntryInternal::List &);
     void selectionChanged();
-    void providerStatusChanged(const KNS3::Entry &);
+    void providerStatusChanged(const KNSCore::EntryInternal &);
 
     void findDesktopAndSetAssistant(const QStringList &list);
 
     Ui::ProviderPage ui;
     QStandardItemModel *m_model = nullptr;
     QStandardItem *m_fetchItem = nullptr;
-    KNS3::DownloadManager *m_downloadManager = nullptr;
-    KNS3::Entry::List m_providerEntries;
+    KNSCore::DownloadManager *m_downloadManager = nullptr;
+    KNSCore::EntryInternal::List m_providerEntries;
     Provider m_wantedProvider;
     bool m_newPageWanted;
     bool m_newPageReady;
diff -Nru kmail-account-wizard-17.12.3/src/resource.cpp kmail-account-wizard-18.04.3/src/resource.cpp
--- kmail-account-wizard-17.12.3/src/resource.cpp	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/resource.cpp	2018-06-29 05:03:37.000000000 +0000
@@ -89,7 +89,7 @@
 
     // check if unique instance already exists
     qCDebug(ACCOUNTWIZARD_LOG) << type.capabilities();
-    if (type.capabilities().contains(QStringLiteral("Unique"))) {
+    if (type.capabilities().contains(QLatin1String("Unique"))) {
         const Akonadi::AgentInstance::List lstAgent = AgentManager::self()->instances();
         for (const AgentInstance &instance : lstAgent) {
             qCDebug(ACCOUNTWIZARD_LOG) << instance.type().identifier() << (instance.type() == type);
diff -Nru kmail-account-wizard-17.12.3/src/setupautoconfigkolabfreebusy.h kmail-account-wizard-18.04.3/src/setupautoconfigkolabfreebusy.h
--- kmail-account-wizard-17.12.3/src/setupautoconfigkolabfreebusy.h	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/setupautoconfigkolabfreebusy.h	2018-06-29 05:03:37.000000000 +0000
@@ -30,7 +30,7 @@
 public:
     /** Constructor */
     explicit SetupAutoconfigKolabFreebusy(QObject *parent = nullptr);
-    ~SetupAutoconfigKolabFreebusy();
+    ~SetupAutoconfigKolabFreebusy() override;
 
     void create() override;
     void destroy() override;
diff -Nru kmail-account-wizard-17.12.3/src/setupautoconfigkolabldap.h kmail-account-wizard-18.04.3/src/setupautoconfigkolabldap.h
--- kmail-account-wizard-17.12.3/src/setupautoconfigkolabldap.h	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/setupautoconfigkolabldap.h	2018-06-29 05:03:37.000000000 +0000
@@ -30,7 +30,7 @@
 public:
     /** Constructor */
     explicit SetupAutoconfigKolabLdap(QObject *parent = nullptr);
-    ~SetupAutoconfigKolabLdap();
+    ~SetupAutoconfigKolabLdap() override;
 
     void create() override;
     void destroy() override;
diff -Nru kmail-account-wizard-17.12.3/src/setupispdb.h kmail-account-wizard-18.04.3/src/setupispdb.h
--- kmail-account-wizard-17.12.3/src/setupispdb.h	2018-02-26 05:42:17.000000000 +0000
+++ kmail-account-wizard-18.04.3/src/setupispdb.h	2018-06-29 05:03:37.000000000 +0000
@@ -32,7 +32,7 @@
     /** Constructor */
     explicit SetupIspdb(QObject *parent = nullptr);
     SetupIspdb(QObject *parent, Ispdb *ispdb);
-    ~SetupIspdb();
+    ~SetupIspdb() override;
 
     void create() override;
     void destroy() override;