Hello community, here is the log from the commit of package ksmtp for openSUSE:Factory checked in at 2018-04-25 09:52:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksmtp (Old) and /work/SRC/openSUSE:Factory/.ksmtp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ksmtp" Wed Apr 25 09:52:36 2018 rev:7 rq:599108 version:18.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ksmtp/ksmtp.changes 2018-03-20 21:40:25.780734962 +0100 +++ /work/SRC/openSUSE:Factory/.ksmtp.new/ksmtp.changes 2018-04-25 09:52:44.425795632 +0200 @@ -1,0 +2,33 @@ +Wed Apr 18 07:49:44 CEST 2018 - [email protected] + +- Update to 18.04.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.0.php +- Changes since 18.03.90: + * Increase SMTP session timeout to 1 minute + +------------------------------------------------------------------- +Fri Apr 06 07:09:58 CEST 2018 - [email protected] + +- Update to 18.03.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.03.90.php +- Changes since 17.12.3: + * Settings for SMTP network proxy option + * Fix warning + * Fixup new style invokeMethod() and fix email sending + * Revert "Revert "Use new connect api"" + * Revert "Use new connect api" + * Revert "Use new connect api" + * Use new connect api + * Use new connect api + * show error string instead error number + * do not cancel send job after 10s timeout (kde#387613) + * Requires same qt as other pim* + * Remove old option + * Cleanup. + * Use FindSasl2 from ECM if available. + +------------------------------------------------------------------- Old: ---- ksmtp-17.12.3.tar.xz New: ---- ksmtp-18.04.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksmtp.spec ++++++ --- /var/tmp/diff_new_pack.KYsNWt/_old 2018-04-25 09:52:45.217766586 +0200 +++ /var/tmp/diff_new_pack.KYsNWt/_new 2018-04-25 09:52:45.221766439 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: ksmtp -Version: 17.12.3 +Version: 18.04.0 Release: 0 Summary: Job-based library to send email through an SMTP server License: LGPL-2.1-or-later ++++++ ksmtp-17.12.3.tar.xz -> ksmtp-18.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/CMakeLists.txt new/ksmtp-18.04.0/CMakeLists.txt --- old/ksmtp-17.12.3/CMakeLists.txt 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/CMakeLists.txt 2018-04-13 02:17:26.000000000 +0200 @@ -1,14 +1,13 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.3") +set(PIM_VERSION "5.8.0") project(KSMTP VERSION ${PIM_VERSION}) -option(RUN_UNINSTALL "test run uninstalled apps (experimental)" FALSE) # ECM setup -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} ${KSMTP_SOURCE_DIR}/cmake) +set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) include(ECMGenerateHeaders) @@ -24,8 +23,8 @@ set(KSMTP_LIB_VERSION ${PIM_VERSION}) -set(QT5_REQUIRED_VERSION "5.7.3") -set(KMIME_LIB_VERSION "5.7.3") +set(QT5_REQUIRED_VERSION "5.8.0") +set(KMIME_LIB_VERSION "5.8.0") 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-17.12.3/autotests/fakeserver.cpp new/ksmtp-18.04.0/autotests/fakeserver.cpp --- old/ksmtp-17.12.3/autotests/fakeserver.cpp 2018-02-26 06:43:24.000000000 +0100 +++ new/ksmtp-18.04.0/autotests/fakeserver.cpp 2018-04-10 13:51:39.000000000 +0200 @@ -59,7 +59,13 @@ { start(); // this will block until the event queue starts +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(this, &FakeServer::started, Qt::BlockingQueuedConnection); +#else QMetaObject::invokeMethod(this, "started", Qt::BlockingQueuedConnection); +#endif + + } void FakeServer::dataAvailable() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/cmake/FindSasl2.cmake new/ksmtp-18.04.0/cmake/FindSasl2.cmake --- old/ksmtp-17.12.3/cmake/FindSasl2.cmake 2018-02-26 06:43:24.000000000 +0100 +++ new/ksmtp-18.04.0/cmake/FindSasl2.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,113 +0,0 @@ -#.rst: -# FindSasl2 -# --------- -# -# Try to find the SASL2 library. -# -# This will define the following variables: -# -# ``Sasl2_FOUND`` -# System has SASL2. -# -# ``Sasl2_VERSION`` -# The version of SASL2. -# -# ``Sasl2_INCLUDE_DIRS`` -# This should be passed to target_include_directories() if -# the target is not used for linking. -# -# ``Sasl2_LIBRARIES`` -# The SASL2 library. -# This can be passed to target_link_libraries() instead of -# the ``Sasl2::Sasl2`` target -# -# If ``Sasl2_FOUND`` is TRUE, the following imported target -# will be available: -# -# ``Sasl2::Sasl2`` -# The SASL2 library -# -# Since pre-5.0.0. -# -# Imported target since 5.1.41 -# -#============================================================================= -# Copyright 2006, 2007 Laurent Montel <[email protected]> -# -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#============================================================================= - -# NOTE: libsasl2.pc doesn't export the include dir. -find_package(PkgConfig QUIET) -pkg_check_modules(PC_Sasl2 libsasl2) - -find_path(Sasl2_INCLUDE_DIRS NAMES sasl/sasl.h) - -# libsasl2 add for windows, because the windows package of cyrus-sasl2 -# contains a libsasl2 also for msvc which is not standard conform -find_library(Sasl2_LIBRARIES - NAMES sasl2 libsasl2 - HINTS ${PC_Sasl2_LIBRARY_DIRS} -) - -set(Sasl2_VERSION ${PC_Sasl2_VERSION}) - -if(NOT Sasl2_VERSION) - if(EXISTS ${Sasl2_INCLUDE_DIRS}/sasl/sasl.h) - file(READ ${Sasl2_INCLUDE_DIRS}/sasl/sasl.h SASL2_H_CONTENT) - string(REGEX MATCH "#define SASL_VERSION_MAJOR[ ]+[0-9]+" SASL2_VERSION_MAJOR_MATCH ${SASL2_H_CONTENT}) - string(REGEX MATCH "#define SASL_VERSION_MINOR[ ]+[0-9]+" SASL2_VERSION_MINOR_MATCH ${SASL2_H_CONTENT}) - string(REGEX MATCH "#define SASL_VERSION_STEP[ ]+[0-9]+" SASL2_VERSION_STEP_MATCH ${SASL2_H_CONTENT}) - - string(REGEX REPLACE ".*_MAJOR[ ]+(.*)" "\\1" SASL2_VERSION_MAJOR ${SASL2_VERSION_MAJOR_MATCH}) - string(REGEX REPLACE ".*_MINOR[ ]+(.*)" "\\1" SASL2_VERSION_MINOR ${SASL2_VERSION_MINOR_MATCH}) - string(REGEX REPLACE ".*_STEP[ ]+(.*)" "\\1" SASL2_VERSION_STEP ${SASL2_VERSION_STEP_MATCH}) - - set(Sasl2_VERSION "${SASL2_VERSION_MAJOR}.${SASL2_VERSION_MINOR}.${SASL2_VERSION_STEP}") - endif() -endif() - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args(Sasl2 - FOUND_VAR Sasl2_FOUND - REQUIRED_VARS Sasl2_LIBRARIES Sasl2_INCLUDE_DIRS - VERSION_VAR Sasl2_VERSION -) -if(Sasl2_FOUND AND NOT TARGET Sasl2::Sasl2) - add_library(Sasl2::Sasl2 UNKNOWN IMPORTED) - set_target_properties(Sasl2::Sasl2 PROPERTIES - IMPORTED_LOCATION "${Sasl2_LIBRARIES}" - INTERFACE_INCLUDE_DIRECTORIES "${Sasl2_INCLUDE_DIRS}") -endif() - -mark_as_advanced(Sasl2_LIBRARIES Sasl2_INCLUDE_DIRS Sasl2_VERSION) - -include(FeatureSummary) -set_package_properties(Sasl2 PROPERTIES - URL "http://www.cyrussasl.org/"; - DESCRIPTION "The Cyrus-sasl library." -) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/ar/libksmtp5.po new/ksmtp-18.04.0/po/ar/libksmtp5.po --- old/ksmtp-17.12.3/po/ar/libksmtp5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/ksmtp-18.04.0/po/ar/libksmtp5.po 2018-04-13 02:17:26.000000000 +0200 @@ -0,0 +1,72 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Safa Alfulaij <[email protected]>, 2018. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"PO-Revision-Date: 2018-01-28 15:07+0300\n" +"Last-Translator: Safa Alfulaij <[email protected]>\n" +"Language-Team: Arabic <[email protected]>\n" +"Language: ar\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" +"X-Generator: Lokalize 2.0\n" + +#: job.cpp:68 +#, kde-format +msgid "Server time out" +msgstr "انتهت مهلة الخادوم" + +#: job.cpp:70 +#, kde-format +msgid "Server error" +msgstr "خطأ في الخادوم" + +#: job.cpp:79 +#, kde-format +msgid "Connection to server lost." +msgstr "فُقد الاتّصال بالخادوم." + +#: loginjob.cpp:95 +#, kde-format +msgid "Login" +msgstr "لِج" + +#: loginjob.cpp:215 +#, kde-format +msgid "" +"Could not authenticate to the SMTP server because no matching authentication " +"method has been found" +msgstr "تعذّر الاستثياق مع خادوم SMTP بسبب عدم العثور على طريقة استيثاق مطابقة." + +#: loginjob.cpp:302 +#, kde-format +msgid "Login failed, cannot initialize the SASL library" +msgstr "فشل الولوج، تعذّر تمهيد مكتبة SASL" + +#: sendjob.cpp:74 +#, kde-format +msgid "SendJob" +msgstr "إرسال مهمّة" + +#: sendjob.cpp:123 +#, kde-format +msgid "" +"Could not send the message because either the sender or recipient field is " +"missing or invalid" +msgstr "تعذّر إرسال الرّسالة بسبب نقص أو عدم صلاحيّة حقل المرسل أو المستلم" + +#: sendjob.cpp:131 +#, kde-format +msgid "" +"Could not send the message because it exceeds the maximum allowed size of %1 " +"bytes. (Message size: %2 bytes.)" +msgstr "" +"تعذّر إرسال الرّسالة لأنّها تتخطّى الحجم الأقصى المسموح وهو %1 بايت. (حجم " +"الرّسالة: %2 بايت.)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/ast/libksmtp5.po new/ksmtp-18.04.0/po/ast/libksmtp5.po --- old/ksmtp-17.12.3/po/ast/libksmtp5.po 2018-03-06 01:33:06.000000000 +0100 +++ new/ksmtp-18.04.0/po/ast/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2015-03-26 20:02+0100\n" "Last-Translator: enolp <[email protected]>\n" "Language-Team: Asturian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/bs/libksmtp5.po new/ksmtp-18.04.0/po/bs/libksmtp5.po --- old/ksmtp-17.12.3/po/bs/libksmtp5.po 2018-03-06 01:33:06.000000000 +0100 +++ new/ksmtp-18.04.0/po/bs/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2015-02-16 11:55+0000\n" "Last-Translator: Samir Ribić <Unknown>\n" "Language-Team: Bosnian\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/ca/libksmtp5.po new/ksmtp-18.04.0/po/ca/libksmtp5.po --- old/ksmtp-17.12.3/po/ca/libksmtp5.po 2018-03-06 01:33:06.000000000 +0100 +++ new/ksmtp-18.04.0/po/ca/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" @@ -78,3 +78,6 @@ msgstr "" "No s'ha pogut enviar el missatge perquè s'ha excedit la mida màxima permesa " "de %1 bytes. (Mida del missatge: %2 bytes)." + +#~ msgid "Job" +#~ msgstr "Tasca" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/ca@valencia/libksmtp5.po new/ksmtp-18.04.0/po/ca@valencia/libksmtp5.po --- old/ksmtp-17.12.3/po/ca@valencia/libksmtp5.po 2018-03-06 01:33:06.000000000 +0100 +++ new/ksmtp-18.04.0/po/ca@valencia/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" @@ -78,3 +78,6 @@ msgstr "" "No s'ha pogut enviar el missatge perquè s'ha excedit la mida màxima permesa " "de %1 bytes. (Mida del missatge: %2 bytes)." + +#~ msgid "Job" +#~ msgstr "Tasca" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/cs/libksmtp5.po new/ksmtp-18.04.0/po/cs/libksmtp5.po --- old/ksmtp-17.12.3/po/cs/libksmtp5.po 2018-03-06 01:33:06.000000000 +0100 +++ new/ksmtp-18.04.0/po/cs/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/de/libksmtp5.po new/ksmtp-18.04.0/po/de/libksmtp5.po --- old/ksmtp-17.12.3/po/de/libksmtp5.po 2018-03-06 01:33:06.000000000 +0100 +++ new/ksmtp-18.04.0/po/de/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/en_GB/libksmtp5.po new/ksmtp-18.04.0/po/en_GB/libksmtp5.po --- old/ksmtp-17.12.3/po/en_GB/libksmtp5.po 2018-03-06 01:33:06.000000000 +0100 +++ new/ksmtp-18.04.0/po/en_GB/libksmtp5.po 2018-04-13 02:17:26.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 05:43+0100\n" -"PO-Revision-Date: 2017-11-26 21:08+0000\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" "Language: en_GB\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/es/libksmtp5.po new/ksmtp-18.04.0/po/es/libksmtp5.po --- old/ksmtp-17.12.3/po/es/libksmtp5.po 2018-03-06 01:33:06.000000000 +0100 +++ new/ksmtp-18.04.0/po/es/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2017-08-02 23:16+0100\n" "Last-Translator: Javier Vinal <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/et/libksmtp5.po new/ksmtp-18.04.0/po/et/libksmtp5.po --- old/ksmtp-17.12.3/po/et/libksmtp5.po 2018-03-06 01:33:06.000000000 +0100 +++ new/ksmtp-18.04.0/po/et/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2011-06-24 05:22+0300\n" "Last-Translator: Marek Laane <[email protected]>\n" "Language-Team: Estonian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/fi/libksmtp5.po new/ksmtp-18.04.0/po/fi/libksmtp5.po --- old/ksmtp-17.12.3/po/fi/libksmtp5.po 2018-03-06 01:33:06.000000000 +0100 +++ new/ksmtp-18.04.0/po/fi/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2017-12-25 20:35+0200\n" "Last-Translator: Tommi Nieminen <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/fr/libksmtp5.po new/ksmtp-18.04.0/po/fr/libksmtp5.po --- old/ksmtp-17.12.3/po/fr/libksmtp5.po 2018-03-06 01:33:06.000000000 +0100 +++ new/ksmtp-18.04.0/po/fr/libksmtp5.po 2018-04-13 02:17:26.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libksmtp\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2017-07-26 17:08+0800\n" "Last-Translator: Simon Depiets <[email protected]>\n" "Language-Team: French <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/ga/libksmtp5.po new/ksmtp-18.04.0/po/ga/libksmtp5.po --- old/ksmtp-17.12.3/po/ga/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/ga/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2011-12-28 12:28-0500\n" "Last-Translator: Kevin Scannell <[email protected]>\n" "Language-Team: Irish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/gl/libksmtp5.po new/ksmtp-18.04.0/po/gl/libksmtp5.po --- old/ksmtp-17.12.3/po/gl/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/gl/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2017-11-03 17:48+0100\n" "Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" @@ -48,13 +48,13 @@ "Could not authenticate to the SMTP server because no matching authentication " "method has been found" msgstr "" -"Non foi posíbel autenticarse co servidor de SMTP porque non se atopou ningún " +"Non se puido autenticar co servidor de SMTP porque non se atopou ningún " "método de autenticación correspondente." #: loginjob.cpp:302 #, kde-format msgid "Login failed, cannot initialize the SASL library" -msgstr "O acceso fallou, non é posíbel inicializar a biblioteca SASL." +msgstr "O acceso fallou, non se pode inicializar a biblioteca SASL." #: sendjob.cpp:74 #, kde-format @@ -67,8 +67,8 @@ "Could not send the message because either the sender or recipient field is " "missing or invalid" msgstr "" -"Non foi posíbel enviar a mensaxe porque faltan ou son incorrectos os campos " -"do remitente ou do destinatario." +"Non se puido enviar a mensaxe porque faltan ou son incorrectos os campos do " +"remitente ou do destinatario." #: sendjob.cpp:131 #, kde-format @@ -76,8 +76,8 @@ "Could not send the message because it exceeds the maximum allowed size of %1 " "bytes. (Message size: %2 bytes.)" msgstr "" -"Non foi posíbel enviar a mensaxe porque supera o tamaño límite de %1 bytes. " -"O tamaño da mensaxe é de %2 bytes." +"Non se puido enviar a mensaxe porque supera o tamaño límite de %1 bytes. O " +"tamaño da mensaxe é de %2 bytes." #~ msgid "Job" #~ msgstr "Tarefa" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/hu/libksmtp5.po new/ksmtp-18.04.0/po/hu/libksmtp5.po --- old/ksmtp-17.12.3/po/hu/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/hu/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/it/libksmtp5.po new/ksmtp-18.04.0/po/it/libksmtp5.po --- old/ksmtp-17.12.3/po/it/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/it/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2017-07-29 16:30+0200\n" "Last-Translator: Vincenzo Reale <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/ja/libksmtp5.po new/ksmtp-18.04.0/po/ja/libksmtp5.po --- old/ksmtp-17.12.3/po/ja/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/ja/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/km/libksmtp5.po new/ksmtp-18.04.0/po/km/libksmtp5.po --- old/ksmtp-17.12.3/po/km/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/km/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2011-06-28 07:53+0700\n" "Last-Translator: Khoem Sokhem <[email protected]>\n" "Language-Team: Khmer <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/ko/libksmtp5.po new/ksmtp-18.04.0/po/ko/libksmtp5.po --- old/ksmtp-17.12.3/po/ko/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/ko/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2017-12-03 22:52+0100\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/lt/libksmtp5.po new/ksmtp-18.04.0/po/lt/libksmtp5.po --- old/ksmtp-17.12.3/po/lt/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/lt/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/mr/libksmtp5.po new/ksmtp-18.04.0/po/mr/libksmtp5.po --- old/ksmtp-17.12.3/po/mr/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/mr/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2013-04-02 13:56+0530\n" "Last-Translator: Chetan Khona <[email protected]>\n" "Language-Team: Marathi <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/nds/libksmtp5.po new/ksmtp-18.04.0/po/nds/libksmtp5.po --- old/ksmtp-17.12.3/po/nds/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/nds/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/nl/libksmtp5.po new/ksmtp-18.04.0/po/nl/libksmtp5.po --- old/ksmtp-17.12.3/po/nl/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/nl/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/nn/libksmtp5.po new/ksmtp-18.04.0/po/nn/libksmtp5.po --- old/ksmtp-17.12.3/po/nn/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/nn/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/pl/libksmtp5.po new/ksmtp-18.04.0/po/pl/libksmtp5.po --- old/ksmtp-17.12.3/po/pl/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/pl/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/pt/libksmtp5.po new/ksmtp-18.04.0/po/pt/libksmtp5.po --- old/ksmtp-17.12.3/po/pt/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/pt/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/pt_BR/libksmtp5.po new/ksmtp-18.04.0/po/pt_BR/libksmtp5.po --- old/ksmtp-17.12.3/po/pt_BR/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/pt_BR/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/ru/libksmtp5.po new/ksmtp-18.04.0/po/ru/libksmtp5.po --- old/ksmtp-17.12.3/po/ru/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/ru/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2017-11-01 15:10+0300\n" "Last-Translator: Alexander Potashev <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/sk/libksmtp5.po new/ksmtp-18.04.0/po/sk/libksmtp5.po --- old/ksmtp-17.12.3/po/sk/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/sk/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2017-08-02 21:43+0100\n" "Last-Translator: Roman Paholik <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/sl/libksmtp5.po new/ksmtp-18.04.0/po/sl/libksmtp5.po --- old/ksmtp-17.12.3/po/sl/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/sl/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2017-07-27 20:07+0100\n" "Last-Translator: Andrej Mernik <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/sr/libksmtp5.po new/ksmtp-18.04.0/po/sr/libksmtp5.po --- old/ksmtp-17.12.3/po/sr/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/sr/libksmtp5.po 2018-04-13 02:17:26.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: libksmtp5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-01-30 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2017-08-05 19:10+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/sv/libksmtp5.po new/ksmtp-18.04.0/po/sv/libksmtp5.po --- old/ksmtp-17.12.3/po/sv/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/sv/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/tr/libksmtp5.po new/ksmtp-18.04.0/po/tr/libksmtp5.po --- old/ksmtp-17.12.3/po/tr/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/tr/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2017-08-17 08:31+0000\n" "Last-Translator: Kaan <[email protected]>\n" "Language-Team: Turkish <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/ug/libksmtp5.po new/ksmtp-18.04.0/po/ug/libksmtp5.po --- old/ksmtp-17.12.3/po/ug/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/ug/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji <[email protected]>\n" "Language-Team: Uyghur <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/uk/libksmtp5.po new/ksmtp-18.04.0/po/uk/libksmtp5.po --- old/ksmtp-17.12.3/po/uk/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/uk/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" "PO-Revision-Date: 2017-07-25 09:06+0200\n" "Last-Translator: Yuri Chornoivan <[email protected]>\n" "Language-Team: Ukrainian <[email protected]>\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/po/zh_CN/libksmtp5.po new/ksmtp-18.04.0/po/zh_CN/libksmtp5.po --- old/ksmtp-17.12.3/po/zh_CN/libksmtp5.po 2018-03-06 01:33:07.000000000 +0100 +++ new/ksmtp-18.04.0/po/zh_CN/libksmtp5.po 2018-04-13 02:17:26.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 05:43+0100\n" -"PO-Revision-Date: 2018-02-28 02:28-0500\n" +"POT-Creation-Date: 2018-01-30 03:24+0100\n" +"PO-Revision-Date: 2018-04-05 09:39-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/src/loginjob.cpp new/ksmtp-18.04.0/src/loginjob.cpp --- old/ksmtp-17.12.3/src/loginjob.cpp 2018-02-26 06:43:24.000000000 +0100 +++ new/ksmtp-18.04.0/src/loginjob.cpp 2018-04-10 13:51:39.000000000 +0200 @@ -394,10 +394,10 @@ return QByteArrayLiteral("ANONYMOUS"); case LoginJob::XOAuth: return QByteArrayLiteral( "XOAUTH"); - default: case LoginJob::UnknownAuth: return ""; // Should not happen } + return {}; } LoginJob::EncryptionMode LoginJobPrivate::sslVersionToEncryption(KTcpSocket::SslVersion version) const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/src/session.cpp new/ksmtp-18.04.0/src/session.cpp --- old/ksmtp-17.12.3/src/session.cpp 2018-02-26 06:43:24.000000000 +0100 +++ new/ksmtp-18.04.0/src/session.cpp 2018-04-10 13:51:39.000000000 +0200 @@ -131,6 +131,11 @@ { } +void Session::setUseNetworkProxy(bool useProxy) +{ + d->m_thread->setUseNetworkProxy(useProxy); +} + void Session::setUiProxy(const SessionUiProxy::Ptr &uiProxy) { d->m_uiProxy = uiProxy; @@ -261,8 +266,12 @@ void SessionPrivate::sendData(const QByteArray &data) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(m_thread, [this, data] { m_thread->sendData(data); }, Qt::QueuedConnection); +#else QMetaObject::invokeMethod(m_thread, "sendData", Qt::QueuedConnection, Q_ARG(QByteArray, data)); +#endif } void SessionPrivate::responseReceived(const ServerResponse &r) @@ -352,8 +361,12 @@ void SessionPrivate::startSsl(KTcpSocket::SslVersion version) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(m_thread, [this, version] {m_thread->startSsl(version); }, Qt::QueuedConnection); +#else QMetaObject::invokeMethod(m_thread, "startSsl", Qt::QueuedConnection, Q_ARG(KTcpSocket::SslVersion, version)); +#endif } KTcpSocket::SslVersion SessionPrivate::negotiatedEncryption() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/src/session.h new/ksmtp-18.04.0/src/session.h --- old/ksmtp-17.12.3/src/session.h 2018-02-26 06:43:24.000000000 +0100 +++ new/ksmtp-18.04.0/src/session.h 2018-04-10 13:51:39.000000000 +0200 @@ -48,8 +48,9 @@ Q_ENUM(State) /** - Creates a new Smtp session to the specified host and port. - After creating the session, you should call either open() or openAndWait() to open the connection. + Creates a new SMTP session to the specified host and port. + After creating the session, call setUseProxy() if necessary + and then either open() or openAndWait() to open the connection. @sa open(), openAndWait() */ explicit Session(const QString &hostName, quint16 port, QObject *parent = nullptr); @@ -59,6 +60,13 @@ SessionUiProxy::Ptr uiProxy() const; /** + Sets whether the SMTP network connection should use the system proxy settings + + The default is to not use the proxy. + */ + void setUseNetworkProxy(bool useProxy); + + /** Returns the host name that has been provided in the Session's constructor @sa port() */ @@ -124,7 +132,7 @@ /** Requests the server to quit the connection. - This sends "QUIT" command to the server and will not close the connection until + This sends a "QUIT" command to the server and will not close the connection until it receives a response. That means you should not delete this object right after calling close, instead wait for stateChanged() to change to Disconnected, or use quitAndWait(). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/src/sessionthread.cpp new/ksmtp-18.04.0/src/sessionthread.cpp --- old/ksmtp-17.12.3/src/sessionthread.cpp 2018-02-26 06:43:24.000000000 +0100 +++ new/ksmtp-18.04.0/src/sessionthread.cpp 2018-04-10 13:51:39.000000000 +0200 @@ -27,6 +27,7 @@ #include <QUrl> #include <QFile> #include <QCoreApplication> +#include <QNetworkProxy> using namespace KSmtp; @@ -36,7 +37,8 @@ m_logFile(nullptr), m_parentSession(session), m_hostName(hostName), - m_port(port) + m_port(port), + m_useProxy(false) { moveToThread(this); @@ -132,6 +134,16 @@ if (m_socket->state() != KTcpSocket::ConnectedState && m_socket->state() != KTcpSocket::ConnectingState) { + if (!m_useProxy) { + qCDebug(KSMTP_LOG) << "using no proxy"; + + QNetworkProxy proxy; + proxy.setType(QNetworkProxy::NoProxy); + m_socket->setProxy(proxy); + } else { + qCDebug(KSMTP_LOG) << "using default system proxy"; + } + m_socket->connectToHost(hostName(), port()); } } @@ -163,6 +175,13 @@ delete m_socket; } + +void SessionThread::setUseNetworkProxy(bool useProxy) +{ + m_useProxy = useProxy; +} + + ServerResponse SessionThread::parseResponse(const QByteArray &resp) { QByteArray response(resp); @@ -229,8 +248,12 @@ void SessionThread::handleSslErrorResponse(bool ignoreError) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + QMetaObject::invokeMethod(this, [this, ignoreError] {doHandleSslErrorResponse(ignoreError); }, Qt::QueuedConnection); +#else QMetaObject::invokeMethod(this, "doHandleSslErrorResponse", Qt::QueuedConnection, Q_ARG(bool, ignoreError)); +#endif } void SessionThread::doHandleSslErrorResponse(bool ignoreError) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ksmtp-17.12.3/src/sessionthread_p.h new/ksmtp-18.04.0/src/sessionthread_p.h --- old/ksmtp-17.12.3/src/sessionthread_p.h 2018-02-26 06:43:24.000000000 +0100 +++ new/ksmtp-18.04.0/src/sessionthread_p.h 2018-04-10 13:51:39.000000000 +0200 @@ -44,6 +44,8 @@ QString hostName() const; quint16 port() const; + void setUseNetworkProxy(bool useProxy); + void handleSslErrorResponse(bool ignoreError); public Q_SLOTS: @@ -78,6 +80,7 @@ Session *m_parentSession = nullptr; QString m_hostName; quint16 m_port; + bool m_useProxy; }; }
