Hello community, here is the log from the commit of package ksmtp for openSUSE:Factory checked in at 2018-06-13 15:24:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksmtp (Old) and /work/SRC/openSUSE:Factory/.ksmtp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksmtp" Wed Jun 13 15:24:59 2018 rev:9 rq:615588 version:18.04.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ksmtp/ksmtp.changes 2018-05-16 11:32:27.160249754 +0200 +++ /work/SRC/openSUSE:Factory/.ksmtp.new/ksmtp.changes 2018-06-13 15:25:03.752209677 +0200 @@ -1,0 +2,10 @@ +Fri Jun 08 05:06:55 UTC 2018 - [email protected] + +- Update to 18.04.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.2.php +- Changes since 18.04.1: + * Fix TLS vs STARTTLS handling (kde#394770) + +------------------------------------------------------------------- Old: ---- ksmtp-18.04.1.tar.xz New: ---- ksmtp-18.04.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksmtp.spec ++++++ --- /var/tmp/diff_new_pack.Cd58eL/_old 2018-06-13 15:25:04.708174465 +0200 +++ /var/tmp/diff_new_pack.Cd58eL/_new 2018-06-13 15:25:04.712174317 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: ksmtp -Version: 18.04.1 +Version: 18.04.2 Release: 0 Summary: Job-based library to send email through an SMTP server License: LGPL-2.1-or-later ++++++ ksmtp-18.04.1.tar.xz -> ksmtp-18.04.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/CMakeLists.txt new/ksmtp-18.04.2/CMakeLists.txt --- old/ksmtp-18.04.1/CMakeLists.txt 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/CMakeLists.txt 2018-06-05 03:34:55.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.8.1") +set(PIM_VERSION "5.8.2") project(KSMTP VERSION ${PIM_VERSION}) @@ -24,7 +24,7 @@ set(KSMTP_LIB_VERSION ${PIM_VERSION}) set(QT5_REQUIRED_VERSION "5.8.0") -set(KMIME_LIB_VERSION "5.8.1") +set(KMIME_LIB_VERSION "5.8.2") ecm_setup_version(PROJECT VARIABLE_PREFIX KSMTP VERSION_HEADER ${KSMTP_BINARY_DIR}/ksmtp_version.h PACKAGE_VERSION_FILE ${KSMTP_BINARY_DIR}/KPimSMTPConfigVersion.cmake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/ar/libksmtp5.po new/ksmtp-18.04.2/po/ar/libksmtp5.po --- old/ksmtp-18.04.1/po/ar/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/ar/libksmtp5.po 2018-06-05 03:34:52.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2018-01-28 15:07+0300\n" "Last-Translator: Safa Alfulaij <[email protected]>\n" "Language-Team: Arabic <[email protected]>\n" @@ -33,19 +33,19 @@ msgid "Connection to server lost." msgstr "فُقد الاتّصال بالخادوم." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "لِج" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "تعذّر الاستثياق مع خادوم SMTP بسبب عدم العثور على طريقة استيثاق مطابقة." -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "فشل الولوج، تعذّر تمهيد مكتبة SASL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/ast/libksmtp5.po new/ksmtp-18.04.2/po/ast/libksmtp5.po --- old/ksmtp-18.04.1/po/ast/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/ast/libksmtp5.po 2018-06-05 03:34:52.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2015-03-26 20:02+0100\n" "Last-Translator: enolp <[email protected]>\n" "Language-Team: Asturian <[email protected]>\n" @@ -32,19 +32,19 @@ msgid "Connection to server lost." msgstr "" -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/bs/libksmtp5.po new/ksmtp-18.04.2/po/bs/libksmtp5.po --- old/ksmtp-18.04.1/po/bs/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/bs/libksmtp5.po 2018-06-05 03:34:52.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kde 49i410\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2015-02-16 11:55+0000\n" "Last-Translator: Samir Ribić <Unknown>\n" "Language-Team: Bosnian\n" @@ -35,12 +35,12 @@ msgid "Connection to server lost." msgstr "" -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Prijava" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -49,7 +49,7 @@ "Nije se mogla potvrditi autentičnost na SMTP server, jer je pronađen nijedan " "odgovarajući metod potvrde identiteta" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/ca/libksmtp5.po new/ksmtp-18.04.2/po/ca/libksmtp5.po --- old/ksmtp-18.04.1/po/ca/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/ca/libksmtp5.po 2018-06-05 03:34:53.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libksmtp5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-07-25 07:10+0100\n" "Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" @@ -36,12 +36,12 @@ msgid "Connection to server lost." msgstr "S'ha perdut la connexió amb el servidor." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Entrada" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -50,7 +50,7 @@ "No s'ha pogut realitzar l'autenticació en el servidor SMTP perquè no s'ha " "trobat cap mètode d'autenticació coincident." -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/ca@valencia/libksmtp5.po new/ksmtp-18.04.2/po/ca@valencia/libksmtp5.po --- old/ksmtp-18.04.1/po/ca@valencia/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/ca@valencia/libksmtp5.po 2018-06-05 03:34:53.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libksmtp5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-07-25 07:10+0100\n" "Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" @@ -36,12 +36,12 @@ msgid "Connection to server lost." msgstr "S'ha perdut la connexió amb el servidor." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Entrada" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -50,7 +50,7 @@ "No s'ha pogut realitzar l'autenticació en el servidor SMTP perquè no s'ha " "trobat cap mètode d'autenticació coincident." -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/cs/libksmtp5.po new/ksmtp-18.04.2/po/cs/libksmtp5.po --- old/ksmtp-18.04.1/po/cs/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/cs/libksmtp5.po 2018-06-05 03:34:53.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-05-18 10:31+0100\n" "Last-Translator: Vít Pelčák <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" @@ -32,19 +32,19 @@ msgid "Connection to server lost." msgstr "Spojení se serverem bylo ztraceno." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Přihlášení" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "Přihlášení selhalo, nelze inicializovat knihovnu SASL." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/de/libksmtp5.po new/ksmtp-18.04.2/po/de/libksmtp5.po --- old/ksmtp-18.04.1/po/de/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/de/libksmtp5.po 2018-06-05 03:34:53.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: libksmtp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-11-21 07:05+0100\n" "Last-Translator: Burkhard Lück <[email protected]>\n" "Language-Team: German <[email protected]>\n" @@ -30,12 +30,12 @@ msgid "Connection to server lost." msgstr "Die Verbindung zum Server ist abgebrochen." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Anmeldung" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -44,7 +44,7 @@ "Es kann nicht am SMTP-Server authentifiziert werden, da keine passende " "Authentifizierungsmethode gefunden wurde." -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/en_GB/libksmtp5.po new/ksmtp-18.04.2/po/en_GB/libksmtp5.po --- old/ksmtp-18.04.1/po/en_GB/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/en_GB/libksmtp5.po 2018-06-05 03:34:53.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-11-26 14:00+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" "Language-Team: British English <[email protected]>\n" @@ -32,12 +32,12 @@ msgid "Connection to server lost." msgstr "Connection to server lost." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Login" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -46,7 +46,7 @@ "Could not authenticate to the SMTP server because no matching authentication " "method has been found" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "Login failed, cannot initialise the SASL library" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/es/libksmtp5.po new/ksmtp-18.04.2/po/es/libksmtp5.po --- old/ksmtp-18.04.1/po/es/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/es/libksmtp5.po 2018-06-05 03:34:53.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-08-02 23:16+0100\n" "Last-Translator: Javier Vinal <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" @@ -35,12 +35,12 @@ msgid "Connection to server lost." msgstr "Perdida la conexión al servidor." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Inicio de sesión" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -49,7 +49,7 @@ "No se ha podido realizar la autenticación en el servidor SMTP porque no se " "ha encontrado ningún método de concordancia." -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/et/libksmtp5.po new/ksmtp-18.04.2/po/et/libksmtp5.po --- old/ksmtp-18.04.1/po/et/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/et/libksmtp5.po 2018-06-05 03:34:53.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2011-06-24 05:22+0300\n" "Last-Translator: Marek Laane <[email protected]>\n" "Language-Team: Estonian <[email protected]>\n" @@ -32,12 +32,12 @@ msgid "Connection to server lost." msgstr "" -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Sisselogimine" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -45,7 +45,7 @@ msgstr "" "Autentimine SMTP serveris nurjus, sest ei leitud sobivat atutentimisviisi" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/fi/libksmtp5.po new/ksmtp-18.04.2/po/fi/libksmtp5.po --- old/ksmtp-18.04.1/po/fi/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/fi/libksmtp5.po 2018-06-05 03:34:53.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-12-25 20:35+0200\n" "Last-Translator: Tommi Nieminen <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" @@ -34,12 +34,12 @@ msgstr "Palvelinyhteys on menetetty." # Tämä on ilmeisesti jonkin ”kirjautumistyön” nimi. -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Kirjaudu" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -48,7 +48,7 @@ "SMTP-palvelimeen ei voitu tunnistautua, koska sopivaa todennustapaa ei " "löytynyt" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "Kirjautuminen epäonnistui: SASL-kirjastoa ei voi alustaa" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/fr/libksmtp5.po new/ksmtp-18.04.2/po/fr/libksmtp5.po --- old/ksmtp-18.04.1/po/fr/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/fr/libksmtp5.po 2018-06-05 03:34:53.000000000 +0200 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # Joëlle Cornavin <[email protected]>, 2011. # xavier <[email protected]>, 2013. -# Simon Depiets <[email protected]>, 2017. +# Simon Depiets <[email protected]>, 2017, 2018. # msgid "" msgstr "" "Project-Id-Version: libksmtp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-07-26 17:08+0800\n" "Last-Translator: Simon Depiets <[email protected]>\n" "Language-Team: French <[email protected]>\n" @@ -38,12 +38,12 @@ msgid "Connection to server lost." msgstr "Interruption de la connexion au serveur." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Identifiant de connexion" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -52,7 +52,7 @@ "Impossible de s'authentifier au serveur « SMTP » car aucune méthode " "d'authentification correspondante n'a été trouvée" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "La connexion a échoué, impossible d'initialiser la bibliothèque SASL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/ga/libksmtp5.po new/ksmtp-18.04.2/po/ga/libksmtp5.po --- old/ksmtp-18.04.1/po/ga/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/ga/libksmtp5.po 2018-06-05 03:34:53.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksmtp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2011-12-28 12:28-0500\n" "Last-Translator: Kevin Scannell <[email protected]>\n" "Language-Team: Irish <[email protected]>\n" @@ -32,19 +32,19 @@ msgid "Connection to server lost." msgstr "" -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Logáil isteach" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/gl/libksmtp5.po new/ksmtp-18.04.2/po/gl/libksmtp5.po --- old/ksmtp-18.04.1/po/gl/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/gl/libksmtp5.po 2018-06-05 03:34:53.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2018-04-20 19:00+0100\n" "Last-Translator: Adrian Chaves <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" @@ -37,12 +37,12 @@ msgid "Connection to server lost." msgstr "Perdeuse a conexión co servidor." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Identificación" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -51,7 +51,7 @@ "Non se puido autenticar co servidor de SMTP porque non se atopou ningún " "método de autenticación correspondente." -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "O acceso fallou, non se pode inicializar a biblioteca SASL." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/hu/libksmtp5.po new/ksmtp-18.04.2/po/hu/libksmtp5.po --- old/ksmtp-18.04.1/po/hu/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/hu/libksmtp5.po 2018-06-05 03:34:53.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2013-10-27 08:23+0100\n" "Last-Translator: Balázs Úr <[email protected]>\n" "Language-Team: Hungarian <[email protected]>\n" @@ -32,12 +32,12 @@ msgid "Connection to server lost." msgstr "" -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Bejelentkezés" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -46,7 +46,7 @@ "Nem sikerült bejelentkezni az SMTP kiszolgálóra, mert nem található egyező " "hitelesítési módszer" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/it/libksmtp5.po new/ksmtp-18.04.2/po/it/libksmtp5.po --- old/ksmtp-18.04.1/po/it/libksmtp5.po 2018-05-08 02:24:59.000000000 +0200 +++ new/ksmtp-18.04.2/po/it/libksmtp5.po 2018-06-05 03:34:53.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksmtp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-07-29 16:30+0200\n" "Last-Translator: Vincenzo Reale <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" @@ -32,12 +32,12 @@ msgid "Connection to server lost." msgstr "Connessione al server interrotta." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Accesso" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -46,7 +46,7 @@ "Impossibile eseguire l'autenticazione al server SMTP poiché non è stato " "trovato il metodo di autenticazione corrispondente" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "Accesso non riuscito, impossibile inizializzare la libreria SASL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/ja/libksmtp5.po new/ksmtp-18.04.2/po/ja/libksmtp5.po --- old/ksmtp-18.04.1/po/ja/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/ja/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: libksmtp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2011-06-14 23:23-0700\n" "Last-Translator: Japanese KDE translation team <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" @@ -29,19 +29,19 @@ msgid "Connection to server lost." msgstr "" -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/km/libksmtp5.po new/ksmtp-18.04.2/po/km/libksmtp5.po --- old/ksmtp-18.04.1/po/km/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/km/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksmtp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2011-06-28 07:53+0700\n" "Last-Translator: Khoem Sokhem <[email protected]>\n" "Language-Team: Khmer <[email protected]>\n" @@ -33,12 +33,12 @@ msgid "Connection to server lost." msgstr "" -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "ចូល" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -46,7 +46,7 @@ msgstr "" "មិនអាចផ្ទៀងផ្ទាត់ម៉ាស៊ីនបម្រើ SMTP បានទេ ពីព្រោះរកមិនឃើញវិធីសាស្ត្រផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវដែលផ្គូផ្គង" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/ko/libksmtp5.po new/ksmtp-18.04.2/po/ko/libksmtp5.po --- old/ksmtp-18.04.1/po/ko/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/ko/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-12-03 22:52+0100\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" @@ -32,19 +32,19 @@ msgid "Connection to server lost." msgstr "서버와의 연결이 끊어졌습니다." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "로그인" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "일치하는 인증 방식을 찾을 수 없어서 SMTP 서버에 인증할 수 없음" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "로그인 실패, SASL 라이브러리를 초기화할 수 없음" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/lt/libksmtp5.po new/ksmtp-18.04.2/po/lt/libksmtp5.po --- old/ksmtp-18.04.1/po/lt/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/lt/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libksmtp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2011-10-04 23:13+0300\n" "Last-Translator: Liudas Ališauskas <[email protected]>\n" "Language-Team: Lithuanian <[email protected]>\n" @@ -35,12 +35,12 @@ msgid "Connection to server lost." msgstr "" -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Prisijungti" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -49,7 +49,7 @@ "Nepavyko nustatyti tapatybės SMTP serveryje, nes atitinkamas tapatybės " "nustatymo metodas nerastas" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/mr/libksmtp5.po new/ksmtp-18.04.2/po/mr/libksmtp5.po --- old/ksmtp-18.04.1/po/mr/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/mr/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2013-04-02 13:56+0530\n" "Last-Translator: Chetan Khona <[email protected]>\n" "Language-Team: Marathi <[email protected]>\n" @@ -32,19 +32,19 @@ msgid "Connection to server lost." msgstr "" -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "प्रवेश" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/nds/libksmtp5.po new/ksmtp-18.04.2/po/nds/libksmtp5.po --- old/ksmtp-18.04.1/po/nds/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/nds/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libksmtp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2011-06-15 06:14+0200\n" "Last-Translator: Manfred Wiese <[email protected]>\n" "Language-Team: Low Saxon <[email protected]>\n" @@ -33,19 +33,19 @@ msgid "Connection to server lost." msgstr "" -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Anmellen" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/nl/libksmtp5.po new/ksmtp-18.04.2/po/nl/libksmtp5.po --- old/ksmtp-18.04.1/po/nl/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/nl/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-07-25 19:02+0100\n" "Last-Translator: Freek de Kruijf <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" @@ -32,12 +32,12 @@ msgid "Connection to server lost." msgstr "Verbinding met server verbroken." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Aanmelden" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -46,7 +46,7 @@ "Kon geen toegang tot de SMTP-server krijgen omdat er geen overeenkomende " "authenticatiemethode is gevonden" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "Aanmelden is mislukt, kan de SASL bibliotheek niet initialiseren" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/nn/libksmtp5.po new/ksmtp-18.04.2/po/nn/libksmtp5.po --- old/ksmtp-18.04.1/po/nn/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/nn/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2016-11-28 19:47+0100\n" "Last-Translator: Karl Ove Hufthammer <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" @@ -31,19 +31,19 @@ msgid "Connection to server lost." msgstr "Tilkoplinga til tenaren vart avbroten." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Innlogging" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/pl/libksmtp5.po new/ksmtp-18.04.2/po/pl/libksmtp5.po --- old/ksmtp-18.04.1/po/pl/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/pl/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-10-22 05:54+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" @@ -33,12 +33,12 @@ msgid "Connection to server lost." msgstr "Utracono połączenie z serwerem." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Logowanie" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -47,7 +47,7 @@ "Nie można uwierzytelnić się na serwerze SMTP, bo nie można znaleźć pasującej " "metody uwierzytelnienia" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "Logowanie nie powiodło się, nie można zainicjować biblioteki SASL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/pt/libksmtp5.po new/ksmtp-18.04.2/po/pt/libksmtp5.po --- old/ksmtp-18.04.1/po/pt/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/pt/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: libksmtp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-05-05 11:09+0100\n" "Last-Translator: José Nuno Coelho Pires <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" @@ -27,12 +27,12 @@ msgid "Connection to server lost." msgstr "Perdeu-se a ligação ao servidor." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Utilizador" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -41,7 +41,7 @@ "Não foi possível autenticar-se no servidor de SMTP, dado não ter sido " "encontrado qualquer método de autenticação correspondente" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/pt_BR/libksmtp5.po new/ksmtp-18.04.2/po/pt_BR/libksmtp5.po --- old/ksmtp-18.04.1/po/pt_BR/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/pt_BR/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2011-12-18 22:51-0200\n" "Last-Translator: André Marcelo Alvarenga <[email protected]>\n" "Language-Team: Brazilian Portuguese <[email protected]>\n" @@ -33,12 +33,12 @@ msgid "Connection to server lost." msgstr "" -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Usuário" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -47,7 +47,7 @@ "Não foi possível autenticar-se no servidor de SMTP, pois não foi encontrado " "qualquer método de autenticação correspondente" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/ru/libksmtp5.po new/ksmtp-18.04.2/po/ru/libksmtp5.po --- old/ksmtp-18.04.1/po/ru/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/ru/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-11-01 15:10+0300\n" "Last-Translator: Alexander Potashev <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" @@ -33,19 +33,19 @@ msgid "Connection to server lost." msgstr "Соединение с сервером разорвано." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Вход в систему" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "Ошибка входа: не удалось инициализировать библиотеку SASL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/sk/libksmtp5.po new/ksmtp-18.04.2/po/sk/libksmtp5.po --- old/ksmtp-18.04.1/po/sk/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/sk/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: libksmtp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-08-02 21:43+0100\n" "Last-Translator: Roman Paholik <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" @@ -30,12 +30,12 @@ msgid "Connection to server lost." msgstr "Spojenie k serveru bolo stratené." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Prihlásenie" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -44,7 +44,7 @@ "Nemôžem overiť cez SMTP server pretože nebola nájdená vyhovujúca overovacia " "metóda" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "Prihlásenie zlyhalo, nemôžem inicializovať knižnicu SASL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/sl/libksmtp5.po new/ksmtp-18.04.2/po/sl/libksmtp5.po --- old/ksmtp-18.04.1/po/sl/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/sl/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-07-27 20:07+0100\n" "Last-Translator: Andrej Mernik <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" @@ -33,12 +33,12 @@ msgid "Connection to server lost." msgstr "Povezava s strežnikom je bila izgubljena." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Prijava" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -47,7 +47,7 @@ "Ni se bilo mogoče overiti strežniku SMTP, ker ni bilo najdenega nobenega " "načina za overitev" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "Prijava ni uspela, saj ni mogoče začeti knjižnice SASL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/sv/libksmtp5.po new/ksmtp-18.04.2/po/sv/libksmtp5.po --- old/ksmtp-18.04.1/po/sv/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/sv/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-07-25 08:23+0100\n" "Last-Translator: Stefan Asserhäll <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" @@ -32,12 +32,12 @@ msgid "Connection to server lost." msgstr "Anslutningen till servern förlorad." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Inloggning" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -46,7 +46,7 @@ "Kunde inte erhålla behörighet av SMTP-servern eftersom ingen matchande metod " "för behörighetskontroll hittades" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "Inloggning misslyckades, kan inte initiera SASL-biblioteket" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/tr/libksmtp5.po new/ksmtp-18.04.2/po/tr/libksmtp5.po --- old/ksmtp-18.04.1/po/tr/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/tr/libksmtp5.po 2018-06-05 03:34:54.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libksmtp5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-08-17 08:31+0000\n" "Last-Translator: Kaan <[email protected]>\n" "Language-Team: Turkish <[email protected]>\n" @@ -32,12 +32,12 @@ msgid "Connection to server lost." msgstr "Sunucuya yapılan bağlantı koptu." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Giriş" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -46,7 +46,7 @@ "SMTP sunucusunda kimlik doğrulama yapılamadı, çünkü eşleşen bir kimlik " "doğrulama yöntemi bulunamadı" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "Giriş başarısız, SASL kütüphanesi başlatılamıyor" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/ug/libksmtp5.po new/ksmtp-18.04.2/po/ug/libksmtp5.po --- old/ksmtp-18.04.1/po/ug/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/ug/libksmtp5.po 2018-06-05 03:34:55.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libksmtp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji <[email protected]>\n" "Language-Team: Uyghur <[email protected]>\n" @@ -32,19 +32,19 @@ msgid "Connection to server lost." msgstr "" -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "كىرىش" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/uk/libksmtp5.po new/ksmtp-18.04.2/po/uk/libksmtp5.po --- old/ksmtp-18.04.1/po/uk/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/uk/libksmtp5.po 2018-06-05 03:34:55.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libksmtp5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" "PO-Revision-Date: 2017-07-25 09:06+0200\n" "Last-Translator: Yuri Chornoivan <[email protected]>\n" "Language-Team: Ukrainian <[email protected]>\n" @@ -35,12 +35,12 @@ msgid "Connection to server lost." msgstr "З’єднання з сервером розірвано." -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" msgstr "Вхід" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " @@ -49,7 +49,7 @@ "Не вдалося пройти розпізнавання на сервері SMTP через те, що не було " "знайдено відповідного способу розпізнавання." -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "Не вдалося увійти через неможливість ініціалізувати бібліотеку SASL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/po/zh_CN/libksmtp5.po new/ksmtp-18.04.2/po/zh_CN/libksmtp5.po --- old/ksmtp-18.04.1/po/zh_CN/libksmtp5.po 2018-05-08 02:25:00.000000000 +0200 +++ new/ksmtp-18.04.2/po/zh_CN/libksmtp5.po 2018-06-05 03:34:55.000000000 +0200 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 03:24+0100\n" -"PO-Revision-Date: 2018-04-26 06:08-0400\n" +"POT-Creation-Date: 2018-06-04 06:35+0200\n" +"PO-Revision-Date: 2018-05-18 06:29-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -31,19 +31,19 @@ msgid "Connection to server lost." msgstr "与服务器的连接丢失。" -#: loginjob.cpp:95 +#: loginjob.cpp:93 #, kde-format msgid "Login" -msgstr "登录" +msgstr "登录时" -#: loginjob.cpp:215 +#: loginjob.cpp:221 #, kde-format msgid "" "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "无法认证 SMTP 服务器因为没有匹配的认证方式" -#: loginjob.cpp:302 +#: loginjob.cpp:308 #, kde-format msgid "Login failed, cannot initialize the SASL library" msgstr "登录失败，无法初始化 SASL 库" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/src/loginjob.cpp new/ksmtp-18.04.2/src/loginjob.cpp --- old/ksmtp-18.04.1/src/loginjob.cpp 2018-04-30 16:18:11.000000000 +0200 +++ new/ksmtp-18.04.2/src/loginjob.cpp 2018-06-03 18:57:13.000000000 +0200 @@ -72,8 +72,6 @@ LoginJob::AuthMode authModeFromCommand(const QByteArray &mech) const; QByteArray authCommand(LoginJob::AuthMode mode) const; - LoginJob::EncryptionMode sslVersionToEncryption(KTcpSocket::SslVersion version) const; - KTcpSocket::SslVersion encryptionToSslVersion(LoginJob::EncryptionMode mode) const; QString m_userName; QString m_password; @@ -126,6 +124,11 @@ void LoginJob::setEncryptionMode(EncryptionMode mode) { Q_D(LoginJob); + if (mode == SslV2 || mode == SslV3 || mode == TlsV1SslV3 || mode == AnySslVersion) { + mode = SSLorTLS; + } else if (mode == TlsV1) { + mode = STARTTLS; + } d->m_encryptionMode = mode; } @@ -141,16 +144,19 @@ const auto negotiatedEnc = d->sessionInternal()->negotiatedEncryption(); if (negotiatedEnc != KTcpSocket::UnknownSslVersion) { // Socket already encrypted, pretend we did not want any - if (d->m_encryptionMode == d->sslVersionToEncryption(negotiatedEnc)) { - d->m_encryptionMode = Unencrypted; - } + d->m_encryptionMode = Unencrypted; } - if (d->m_encryptionMode == SslV2 || d->m_encryptionMode == SslV3 - || d->m_encryptionMode == TlsV1SslV3 || d->m_encryptionMode == AnySslVersion) { - d->sessionInternal()->startSsl(d->encryptionToSslVersion(d->m_encryptionMode)); - } else if (d->m_encryptionMode == TlsV1 && session()->allowsTls()) { - sendCommand(QByteArrayLiteral("STARTTLS")); + if (d->m_encryptionMode == SSLorTLS) { + d->sessionInternal()->startSsl(KTcpSocket::SecureProtocols); + } else if (d->m_encryptionMode == STARTTLS) { + if (session()->allowsTls()) { + sendCommand(QByteArrayLiteral("STARTTLS")); + } else { + qCWarning(KSMTP_LOG) << "STARTTLS not supported by the server!"; + setError(KJob::UserDefinedError); + emitResult(); + } } else { if (!d->authenticate()) { emitResult(); @@ -167,7 +173,7 @@ // Server accepts TLS connection if (r.isCode(220)) { - d->sessionInternal()->startSsl(d->encryptionToSslVersion(d->m_encryptionMode)); + d->sessionInternal()->startSsl(KTcpSocket::SecureProtocols); return; } @@ -399,40 +405,3 @@ } return {}; } - -LoginJob::EncryptionMode LoginJobPrivate::sslVersionToEncryption(KTcpSocket::SslVersion version) const -{ - switch (version) { - case KTcpSocket::TlsV1: - return LoginJob::TlsV1; - case KTcpSocket::SslV2: - return LoginJob::SslV2; - case KTcpSocket::SslV3: - return LoginJob::SslV3; - case KTcpSocket::TlsV1SslV3: - return LoginJob::TlsV1SslV3; - case KTcpSocket::AnySslVersion: - return LoginJob::AnySslVersion; - default: - qCWarning(KSMTP_LOG) << "Unkown SSL version" << version; - return LoginJob::Unencrypted; - } -} - -KTcpSocket::SslVersion LoginJobPrivate::encryptionToSslVersion(LoginJob::EncryptionMode mode) const -{ - switch (mode) { - case LoginJob::SslV2: - return KTcpSocket::SslV2; - case LoginJob::SslV3: - return KTcpSocket::SslV3; - case LoginJob::TlsV1SslV3: - return KTcpSocket::TlsV1SslV3; - case LoginJob::TlsV1: - return KTcpSocket::TlsV1; - case LoginJob::AnySslVersion: - return KTcpSocket::AnySslVersion; - default: - return KTcpSocket::UnknownSslVersion; - } -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/src/loginjob.h new/ksmtp-18.04.2/src/loginjob.h --- old/ksmtp-18.04.1/src/loginjob.h 2018-04-30 16:18:11.000000000 +0200 +++ new/ksmtp-18.04.2/src/loginjob.h 2018-06-03 18:57:13.000000000 +0200 @@ -37,11 +37,13 @@ public: enum EncryptionMode { Unencrypted, - TlsV1, - SslV2, - SslV3, - TlsV1SslV3, - AnySslVersion + TlsV1, ///< @deprecated Use EncryptionModel::STARTTLS instead + SslV2, ///< @deprecated Use EncryptionModel::SSLorTLS instead + SslV3, ///< @deprecated Use EncryptionModel::SSLorTLS instead + TlsV1SslV3, ///< @deprecated Use EncryptionModel::SSLorTLS instead + AnySslVersion, ///< @deprecated Use EncryptionModel::SSLorTLS instead + SSLorTLS, ///< Use SSL/TLS encryption + STARTTLS ///< Use STARTTLS to upgrade an unencrypted connection to encrypted }; enum AuthMode { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/src/session.cpp new/ksmtp-18.04.2/src/session.cpp --- old/ksmtp-18.04.1/src/session.cpp 2018-04-30 16:18:11.000000000 +0200 +++ new/ksmtp-18.04.2/src/session.cpp 2018-06-03 18:57:13.000000000 +0200 @@ -329,10 +329,7 @@ bool useSsl = false; if (!m_queue.isEmpty()) { if (auto login = qobject_cast<LoginJob*>(m_queue.first())) { - useSsl = login->encryptionMode() == LoginJob::SslV2 - || login->encryptionMode() == LoginJob::SslV3 - || login->encryptionMode() == LoginJob::TlsV1SslV3 - || login->encryptionMode() == LoginJob::AnySslVersion; + useSsl = login->encryptionMode() == LoginJob::SSLorTLS; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-18.04.1/tests/logintest.cpp new/ksmtp-18.04.2/tests/logintest.cpp --- old/ksmtp-18.04.1/tests/logintest.cpp 2018-04-30 16:18:11.000000000 +0200 +++ new/ksmtp-18.04.2/tests/logintest.cpp 2018-06-03 18:57:13.000000000 +0200 @@ -38,15 +38,15 @@ } }; -void login(KSmtp::Session *session, const QString &user, const QString &pass, bool tls, bool ssl) +void login(KSmtp::Session *session, const QString &user, const QString &pass, bool ssltls, bool starttls) { auto login = new KSmtp::LoginJob(session); login->setUserName(user); login->setPassword(pass); - if (tls) { - login->setEncryptionMode(KSmtp::LoginJob::TlsV1); - } else if (ssl) { - login->setEncryptionMode(KSmtp::LoginJob::SslV3); + if (ssltls) { + login->setEncryptionMode(KSmtp::LoginJob::SSLorTLS); + } else if (starttls) { + login->setEncryptionMode(KSmtp::LoginJob::STARTTLS); } QObject::connect( login, &KJob::result, @@ -65,20 +65,20 @@ int main(int argc, char **argv) { QCoreApplication app(argc, argv); - + QCommandLineParser parser; QCommandLineOption hostOption(QStringLiteral("host"), QString(), QStringLiteral("hostname")); QCommandLineOption portOption(QStringLiteral("port"), QString(), QStringLiteral("port")); QCommandLineOption userOption(QStringLiteral("user"), QString(), QStringLiteral("username")); QCommandLineOption passOption(QStringLiteral("pass"), QString(), QStringLiteral("password")); - QCommandLineOption tlsOption(QStringLiteral("tls")); - QCommandLineOption sslOption(QStringLiteral("ssl")); + QCommandLineOption sslTlsOption(QStringLiteral("sslTls")); + QCommandLineOption startTlsOption(QStringLiteral("starttls")); parser.addOption(hostOption); parser.addOption(portOption); parser.addOption(userOption); parser.addOption(passOption); - parser.addOption(tlsOption); - parser.addOption(sslOption); + parser.addOption(sslTlsOption); + parser.addOption(startTlsOption); parser.addHelpOption(); parser.process(app); @@ -103,6 +103,9 @@ break; case KSmtp::Session::Ready: std::cout << "Session in Ready state" << std::endl; + std::cout << std::endl; + login(&session, parser.value(userOption), parser.value(passOption), + parser.isSet(sslTlsOption), parser.isSet(startTlsOption)); break; case KSmtp::Session::Quitting: //Internal (avoid compile warning) @@ -115,8 +118,6 @@ std::cout << mode.toStdString() << " "; } std::cout << std::endl; - login(&session, parser.value(userOption), parser.value(passOption), - parser.isSet(tlsOption), parser.isSet(sslOption)); } break; case KSmtp::Session::Authenticated: std::cout << "Session entered Authenticated state, we are done" << std::endl;
