diff -Nru kimap-19.04.3/autotests/kimaptest/sslserver.cpp kimap-19.12.3/autotests/kimaptest/sslserver.cpp --- kimap-19.04.3/autotests/kimaptest/sslserver.cpp 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/autotests/kimaptest/sslserver.cpp 2020-02-16 08:58:48.000000000 +0000 @@ -18,7 +18,7 @@ #include "sslserver.h" #include - +#include #include static QByteArray staticCert() @@ -84,7 +84,11 @@ socket->setPrivateKey(ssl_key); socket->setLocalCertificate(ssl_cert); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) socket->addCaCertificates(QList() << ssl_cert); +#else + socket->sslConfiguration().addCaCertificates(QList() << ssl_cert); +#endif socket->setPeerVerifyMode(QSslSocket::VerifyNone); socket->ignoreSslErrors(); connect(socket, SIGNAL(sslErrors(QList)), this, SLOT(sslErrors(QList))); diff -Nru kimap-19.04.3/CMakeLists.txt kimap-19.12.3/CMakeLists.txt --- kimap-19.04.3/CMakeLists.txt 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/CMakeLists.txt 2020-03-03 00:31:56.000000000 +0000 @@ -1,30 +1,33 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.11.3") +set(PIM_VERSION "5.13.3") project(KIMAP VERSION ${PIM_VERSION}) +set(CMAKE_CXX_STANDARD 14) + # ECM setup -set(KF5_MIN_VERSION "5.56.0") +set(KF5_MIN_VERSION "5.63.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + include(GenerateExportHeader) include(ECMGenerateHeaders) include(ECMGeneratePriFile) include(ECMSetupVersion) include(FeatureSummary) -include(KDEInstallDirs) -include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) -set(QT_REQUIRED_VERSION "5.10.0") +set(QT_REQUIRED_VERSION "5.11.0") set(KIMAP_LIB_VERSION ${PIM_VERSION}) -set(KMIME_LIBS_VERSION "5.11.3") +set(KMIME_LIBS_VERSION "5.13.3") ecm_setup_version(PROJECT VARIABLE_PREFIX KIMAP VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kimap_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5IMAPConfigVersion.cmake" @@ -44,13 +47,12 @@ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5IMAP") add_definitions(-DTRANSLATION_DOMAIN=\"libkimap5\") -# workaround for https://bugreports.qt.io/browse/QTBUG-74665 (bug in qt5.13 reevaluate it) -if (${Qt5Widgets_VERSION} STRGREATER "5.13") - MESSAGE(STATUS "Qt version: ${Qt5Widgets_VERSION} DISABLE compile without deprecated methods. bug QTBUG-74665") -else() - add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) +if (EXISTS "${CMAKE_SOURCE_DIR}/.git") + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00) + add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054000) endif() + configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5IMAPConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5IMAPConfig.cmake" @@ -81,8 +83,8 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -install( FILES kimap.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) -install( FILES kimap.renamecategories DESTINATION ${KDE_INSTALL_CONFDIR} ) +install(FILES kimap.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) +install(FILES kimap.renamecategories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ki18n_install(po) diff -Nru kimap-19.04.3/debian/changelog kimap-19.12.3/debian/changelog --- kimap-19.04.3/debian/changelog 2020-03-23 06:17:13.000000000 +0000 +++ kimap-19.12.3/debian/changelog 2020-04-11 12:58:05.000000000 +0000 @@ -1,3 +1,11 @@ +kimap (19.12.3-0ubuntu1) focal; urgency=medium + + * Move qdebug categories file to new location. + * New upstream release (19.12.3) + * Update symbols from build logs. + + -- Rik Mills Sat, 11 Apr 2020 13:58:05 +0100 + kimap (19.04.3-0ubuntu2) focal; urgency=medium * No-change rebuild for libgcc-s1 package name change. diff -Nru kimap-19.04.3/debian/control kimap-19.12.3/debian/control --- kimap-19.04.3/debian/control 2019-07-23 17:54:55.000000000 +0000 +++ kimap-19.12.3/debian/control 2020-04-11 12:58:05.000000000 +0000 @@ -11,7 +11,7 @@ libkf5i18n-dev (>= 5.31.0~), libkf5kdelibs4support-dev (>= 5.31.0~), libkf5kio-dev (>= 5.31.0~), - libkf5mime-dev (>= 19.04.3~), + libkf5mime-dev (>= 19.12.3~), libsasl2-dev, pkg-kde-tools (>> 0.15.15), qtbase5-dev (>= 5.6.1~), @@ -20,6 +20,17 @@ Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kimap Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kimap +Package: libkf5imap-data +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends} +Breaks: ${kde-l10n:all} +Replaces: ${kde-10n:all} +Description: library for handling IMAP data + This library provides an API for handling data received from IMAP services. + IMAP (Internet Message Access Protocol) is one of the two most prevalent + Internet standard protocols for e-mail retrieval. + Package: libkf5imap-dev Section: libdevel Architecture: any @@ -28,7 +39,7 @@ libkf5coreaddons-dev (>= 5.31.0~), libkf5imap5 (= ${binary:Version}), libkf5kio-dev (>= 5.31.0~), - libkf5mime-dev (>= 19.04.3~), + libkf5mime-dev (>= 19.12.3~), libsasl2-dev, ${misc:Depends}, Description: library for handling IMAP data - development files @@ -43,18 +54,7 @@ Multi-Arch: same Depends: libkf5imap-data (= ${source:Version}), ${misc:Depends}, - ${shlibs:Depends} -Description: library for handling IMAP data - This library provides an API for handling data received from IMAP services. - IMAP (Internet Message Access Protocol) is one of the two most prevalent - Internet standard protocols for e-mail retrieval. - -Package: libkf5imap-data -Architecture: all -Multi-Arch: foreign -Depends: ${misc:Depends} -Breaks: ${kde-l10n:all} -Replaces: ${kde-10n:all} + ${shlibs:Depends}, Description: library for handling IMAP data This library provides an API for handling data received from IMAP services. IMAP (Internet Message Access Protocol) is one of the two most prevalent diff -Nru kimap-19.04.3/debian/libkf5imap5.symbols kimap-19.12.3/debian/libkf5imap5.symbols --- kimap-19.04.3/debian/libkf5imap5.symbols 2019-07-23 17:54:55.000000000 +0000 +++ kimap-19.12.3/debian/libkf5imap5.symbols 2020-04-11 12:58:05.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 17.07.80+git20170722 amd64 +# SymbolsHelper-Confirmed: 19.12.3 amd64 arm64 armhf ppc64el riscv64 s390x libKF5IMAP.so.5 libkf5imap5 #MINVER# (optional)_ZN10QByteArray7reserveEi@Base 17.07.80+git20170722 _ZN5KIMAP10AclJobBase10setMailBoxERK7QString@Base 15.07.90 @@ -145,7 +145,7 @@ _ZN5KIMAP14SessionPrivate11qt_metacallEN11QMetaObject4CallEiPPv@Base 15.07.90 _ZN5KIMAP14SessionPrivate11qt_metacastEPKc@Base 15.07.90 _ZN5KIMAP14SessionPrivate11sendCommandERK10QByteArrayS3_@Base 15.07.90 - _ZN5KIMAP14SessionPrivate11socketErrorEN10KTcpSocket5ErrorE@Base 15.07.90 + _ZN5KIMAP14SessionPrivate11socketErrorEN15QAbstractSocket11SocketErrorE@Base 19.12.3 _ZN5KIMAP14SessionPrivate12jobDestroyedEP7QObject@Base 15.07.90 _ZN5KIMAP14SessionPrivate13clearJobQueueEv@Base 15.07.90 _ZN5KIMAP14SessionPrivate14handleSslErrorERK15KSslErrorUiData@Base 15.07.90 @@ -160,12 +160,12 @@ _ZN5KIMAP14SessionPrivate18restartSocketTimerEv@Base 15.07.90 _ZN5KIMAP14SessionPrivate18socketDisconnectedEv@Base 15.07.90 _ZN5KIMAP14SessionPrivate27encryptionNegotiationResultEb@Base 15.07.90 - _ZN5KIMAP14SessionPrivate29onEncryptionNegotiationResultEbN10KTcpSocket10SslVersionE@Base 15.07.90 + _ZN5KIMAP14SessionPrivate29onEncryptionNegotiationResultEbN4QSsl11SslProtocolE@Base 19.12.3 _ZN5KIMAP14SessionPrivate6addJobEPNS_3JobE@Base 15.07.90 _ZN5KIMAP14SessionPrivate7jobDoneEP4KJob@Base 15.07.90 _ZN5KIMAP14SessionPrivate8sendDataERK10QByteArray@Base 15.07.90 _ZN5KIMAP14SessionPrivate8setStateENS_7Session5StateE@Base 15.07.90 - _ZN5KIMAP14SessionPrivate8startSslEN10KTcpSocket10SslVersionE@Base 16.12.0 + _ZN5KIMAP14SessionPrivate8startSslEN4QSsl11SslProtocolE@Base 19.12.3 _ZN5KIMAP14SessionPrivate9startNextEv@Base 15.07.90 _ZN5KIMAP14SessionPrivateC1EPNS_7SessionE@Base 15.07.90 _ZN5KIMAP14SessionPrivateC2EPNS_7SessionE@Base 15.07.90 @@ -394,6 +394,7 @@ _ZN5KIMAP7Session14connectionLostEv@Base 15.07.90 _ZN5KIMAP7Session16connectionFailedEv@Base 15.07.90 _ZN5KIMAP7Session16staticMetaObjectE@Base 15.07.90 + _ZN5KIMAP7Session18setUseNetworkProxyEb@Base 19.12.3 _ZN5KIMAP7Session19jobQueueSizeChangedEi@Base 15.07.90 _ZN5KIMAP7Session5closeEv@Base 15.07.90 _ZN5KIMAP7SessionC1ERK7QStringtP7QObject@Base 15.07.90 diff -Nru kimap-19.04.3/debian/libkf5imap-data.install kimap-19.12.3/debian/libkf5imap-data.install --- kimap-19.04.3/debian/libkf5imap-data.install 2019-07-23 17:54:55.000000000 +0000 +++ kimap-19.12.3/debian/libkf5imap-data.install 2020-04-11 12:58:05.000000000 +0000 @@ -1,3 +1,3 @@ -etc/xdg/kimap.categories -etc/xdg/kimap.renamecategories usr/share/locale/*/LC_MESSAGES/libkimap5.mo +usr/share/qlogging-categories5/kimap.categories +usr/share/qlogging-categories5/kimap.renamecategories diff -Nru kimap-19.04.3/debian/libkf5imap-data.maintscript kimap-19.12.3/debian/libkf5imap-data.maintscript --- kimap-19.04.3/debian/libkf5imap-data.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ kimap-19.12.3/debian/libkf5imap-data.maintscript 2020-04-11 12:58:05.000000000 +0000 @@ -0,0 +1,2 @@ +rm_conffile /etc/xdg/kimap.categories +rm_conffile /etc/xdg/kimap.renamecategories diff -Nru kimap-19.04.3/metainfo.yaml kimap-19.12.3/metainfo.yaml --- kimap-19.04.3/metainfo.yaml 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/metainfo.yaml 2020-02-16 08:58:48.000000000 +0000 @@ -11,7 +11,7 @@ libraries: - qmake: KImap cmake: "KF5::Imap" - cmakename: KF5Imap +cmakename: KF5Imap public_lib: true group: kdepim diff -Nru kimap-19.04.3/po/bs/libkimap5.po kimap-19.12.3/po/bs/libkimap5.po --- kimap-19.04.3/po/bs/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/bs/libkimap5.po 2020-03-03 00:31:53.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdepimlibs\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2012-10-05 17:12+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Bosnian \n" @@ -113,17 +113,17 @@ msgid "Job" msgstr "Posao" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Spajanje na server se izgubilo." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1nije uspio, neispravan odgovor od servera." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 nije uspjela, serverj je odgovorio: %2" @@ -138,55 +138,55 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Prijava" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP sesijai u krivom stanju za provjeru autentičnosti" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Sposobnost" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Prijava nije uspjela, običan prijava je onemogućena od strane poslužitelja." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Prijava nije uspjela, režim provjere autentičnosti %1 nije podržan od " "strane poslužitelja." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Prijava nije uspjela, klijent ne može inicijalizirati SASL biblioteku." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Prijava nije uspjela, TLS pregovaranje nije uspjelo." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "" diff -Nru kimap-19.04.3/po/ca/libkimap5.po kimap-19.12.3/po/ca/libkimap5.po --- kimap-19.04.3/po/ca/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/ca/libkimap5.po 2020-03-03 00:31:53.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libkimap5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-06-05 09:47+0100\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" @@ -113,17 +113,17 @@ msgid "Job" msgstr "Tasca" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "S'ha perdut la connexió amb el servidor." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 ha fallat, resposta amb format incorrecte des del servidor." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 ha fallat, el servidor ha contestat: %2" @@ -138,58 +138,58 @@ msgid "ListRights" msgstr "LlistaDrets" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Entrada" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "Sessió IMAP en estat erroni per autenticació" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Funcionalitats" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "IniciaTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "STARTTLS no està acceptat pel servidor, proveu usant SSL/TLS." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "L'inici de la sessió ha fallat, el servidor té desactivada l'entrada " "senzilla." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "L'inici de la sessió ha fallat, el servidor té desactivat el mode " "d'autenticació %1." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "L'inici de la sessió ha fallat, el client no ha pogut inicialitzar la " "biblioteca SASL." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "L'inici de la sessió ha fallat, la negociació TLS ha fallat." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "El protocol inicial de SSL ha fallat." @@ -276,9 +276,3 @@ #, kde-format msgid "Unsubscribe" msgstr "Cancel·la la subscripció" - -#~ msgid "SetAnnotation" -#~ msgstr "EstableixAnotació" - -#~ msgid "Mock" -#~ msgstr "Simula" diff -Nru kimap-19.04.3/po/ca@valencia/libkimap5.po kimap-19.12.3/po/ca@valencia/libkimap5.po --- kimap-19.04.3/po/ca@valencia/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/ca@valencia/libkimap5.po 2020-03-03 00:31:53.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libkimap5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-06-05 09:47+0100\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" @@ -113,17 +113,17 @@ msgid "Job" msgstr "Tasca" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "S'ha perdut la connexió amb el servidor." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 ha fallat, resposta amb format incorrecte des del servidor." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 ha fallat, el servidor ha contestat: %2" @@ -138,58 +138,58 @@ msgid "ListRights" msgstr "LlistaDrets" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Entrada" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "Sessió IMAP en estat erroni per autenticació" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Funcionalitats" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "IniciaTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "STARTTLS no està acceptat pel servidor, proveu usant SSL/TLS." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "L'inici de la sessió ha fallat, el servidor té desactivada l'entrada " "senzilla." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "L'inici de la sessió ha fallat, el servidor té desactivat el mode " "d'autenticació %1." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "L'inici de la sessió ha fallat, el client no ha pogut inicialitzar la " "biblioteca SASL." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "L'inici de la sessió ha fallat, la negociació TLS ha fallat." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "El protocol inicial de SSL ha fallat." @@ -276,9 +276,3 @@ #, kde-format msgid "Unsubscribe" msgstr "Cancel·la la subscripció" - -#~ msgid "SetAnnotation" -#~ msgstr "EstableixAnotació" - -#~ msgid "Mock" -#~ msgstr "Simula" diff -Nru kimap-19.04.3/po/cs/libkimap5.po kimap-19.12.3/po/cs/libkimap5.po --- kimap-19.04.3/po/cs/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/cs/libkimap5.po 2020-03-03 00:31:54.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2016-03-23 15:45+0100\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" @@ -109,17 +109,17 @@ msgid "Job" msgstr "Úloha" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Spojení se serverem bylo ztraceno." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "Metoda '%1' selhala, chybná odpověď ze serveru." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "Metoda '%1' selhala, server odpověděl: %2" @@ -134,52 +134,52 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Přihlášení" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "Sezení IMAP v neplatném stavu ověření" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Možnost" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "Server nepodporuje STARTTLS. Zkuste použít SSL/TLS." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Přihlášení selhalo, přihlášení prostým textem je na serveru zakázáno." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "Přihlášení selhalo, ověřovací režim %1 není serverem podporován." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Přihlášení selhalo, klient nemůže inicializovat SASL knihovnu." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Přihlášení selhalo, komunikace v TLS selhala." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "" diff -Nru kimap-19.04.3/po/da/libkimap5.po kimap-19.12.3/po/da/libkimap5.po --- kimap-19.04.3/po/da/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/da/libkimap5.po 2020-03-03 00:31:54.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2017-03-22 17:29+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" @@ -108,17 +108,17 @@ msgid "Job" msgstr "Job" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Mistede forbindelse til serveren." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 mislykkedes, ukorrekt svar fra serveren." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 mislykkedes, serveren svarede: %2" @@ -133,54 +133,54 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Login" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP-session i forkert tilstand til autentificering" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Kapabilitet" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Login mislykkedes, almindeligt login er deaktiveret af serveren." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Login mislykkedes, godkendelsestilstanden %1 er ikke understøttet af " "serveren." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Login mislykkedes, klienten kan ikke initialisers SASL-biblioteket." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Login mislykkedes, TLS-forhandling mislykkedes." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL-håndtryk mislykkedes." diff -Nru kimap-19.04.3/po/de/libkimap5.po kimap-19.12.3/po/de/libkimap5.po --- kimap-19.04.3/po/de/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/de/libkimap5.po 2020-03-03 00:31:54.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-06-07 07:55+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" @@ -108,17 +108,17 @@ msgid "Job" msgstr "Job" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Die Verbindung zum Server ist abgebrochen." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 fehlgeschlagen, fehlerhafte Antwort vom Server erhalten." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 fehlgeschlagen, die Serverantwort lautet: %2" @@ -133,60 +133,60 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Anmeldung" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "" "Die IMAP-Sitzung befindet sich in einem unzulässigen Status für die " "Authentifizierung." -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Fähigkeiten" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" "STARTTLS wird vom Server nicht unterstützt, benutzen Sie stattdessen SSL/TLS." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Anmeldung fehlgeschlagen, PLAIN-Anmeldung wird von diesem Server abgelehnt." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Anmeldung fehlgeschlagen, die Authentifizierungsmethode %1 wird vom Server " "nicht unterstützt." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "Anmeldung fehlgeschlagen, die SASL-Bibliothek kann nicht initialisiert " "werden." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Anmeldung fehlgeschlagen, TLS-Aushandlung fehlgeschlagen." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL-Protokollaushandlung ist fehlgeschlagen." diff -Nru kimap-19.04.3/po/el/libkimap5.po kimap-19.12.3/po/el/libkimap5.po --- kimap-19.04.3/po/el/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/el/libkimap5.po 2020-03-03 00:31:54.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2014-11-14 19:02+0200\n" "Last-Translator: Dimitris Kardarakos \n" "Language-Team: Greek \n" @@ -113,17 +113,17 @@ msgid "Job" msgstr "Εργασία" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Η σύνδεση με τον εξυπηρετητή έχει χαθεί." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "Αποτυχία %1, μη έγκυρη απάντηση από τον εξυπηρετητή." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "Αποτυχία %1, απάντηση εξυπηρετητή: %2" @@ -138,57 +138,57 @@ msgid "ListRights" msgstr "Λίστα δικαιωμάτων" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Σύνδεση" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP συνεδρία σε λάθος κατάσταση για την ταυτοποίηση" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Δυνατότητα" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "ΈναρξηTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Αποτυχία σύνδεσης, η σύνδεση απλού κειμένου είναι απενεργοποιημένη από τον " "εξυπηρετητή." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Αποτυχία σύνδεσης, η μέθοδος ταυτοποίησης %1 δεν υποστηρίζεται από τον " "εξυπηρετητή." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "Αποτυχία σύνδεσης, ο πελάτης δεν μπορεί να αρχικοποιήσει τη βιβλιοθήκη SASL." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Αποτυχία σύνδεσης, αποτυχία διαπραγμάτευσης TLS." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "Αποτυχία χειραψίας SSL." diff -Nru kimap-19.04.3/po/en_GB/libkimap5.po kimap-19.12.3/po/en_GB/libkimap5.po --- kimap-19.04.3/po/en_GB/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/en_GB/libkimap5.po 2020-03-03 00:31:54.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-06-30 13:33+0000\n" "Last-Translator: Steve Allewell \n" "Language-Team: British English \n" @@ -108,17 +108,17 @@ msgid "Job" msgstr "Job" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Connection to server lost." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 failed, malformed reply from the server." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 failed, server replied: %2" @@ -133,52 +133,52 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Login" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP session in the wrong state for authentication" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Capability" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "STARTTLS is not supported by the server, try using SSL/TLS instead." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Login failed, plain login is disabled by the server." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "Login failed, authentication mode %1 is not supported by the server." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Login failed, client cannot initialise the SASL library." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Login failed, TLS negotiation failed." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL handshake failed." diff -Nru kimap-19.04.3/po/eo/libkimap5.po kimap-19.12.3/po/eo/libkimap5.po --- kimap-19.04.3/po/eo/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/eo/libkimap5.po 2020-03-03 00:31:54.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2009-11-15 12:06+0100\n" "Last-Translator: Axel Rousseau \n" "Language-Team: esperanto \n" @@ -107,17 +107,17 @@ msgid "Job" msgstr "Tasko" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "" -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "" -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "" @@ -132,52 +132,52 @@ msgid "ListRights" msgstr "" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, fuzzy, kde-format msgid "Login" msgstr "Aliĝu" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "" -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "" diff -Nru kimap-19.04.3/po/es/libkimap5.po kimap-19.12.3/po/es/libkimap5.po --- kimap-19.04.3/po/es/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/es/libkimap5.po 2020-03-03 00:31:54.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-06-14 23:12+0100\n" "Last-Translator: Javier Vinal \n" "Language-Team: Spanish \n" @@ -113,17 +113,17 @@ msgid "Job" msgstr "Trabajo" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Perdida la conexión con el servidor." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 falló, respuesta inválida desde el servidor." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 falló, el servidor respondió: %2" @@ -138,59 +138,59 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Iniciar-sesión" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "La sesión IMAP no está en estado correcto para autenticarse" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Capacidad" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" "STARTTLS no está implementado en el servidor, intente usar SSL/TLS en su " "lugar." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Falló el inicio de sesión, el inicio de sesión sencillo está desactivado en " "este servidor." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Falló el inicio de sesión, el modo de autenticación %1 no está soportado por " "el servidor." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "Falló el inicio de sesión, el cliente no pudo inicializar la biblioteca SASL." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "El inicio de sesión ha fallado, la negociación TLS ha fallado." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "El diálogo SSL ha fallado." diff -Nru kimap-19.04.3/po/et/libkimap5.po kimap-19.12.3/po/et/libkimap5.po --- kimap-19.04.3/po/et/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/et/libkimap5.po 2020-03-03 00:31:54.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2016-12-09 21:40+0200\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" @@ -109,17 +109,17 @@ msgid "Job" msgstr "Töö" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Ühendus serveriga kadus." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 nurjus, serverist saadi vigane vastus." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 nurjus, server vastas: %2" @@ -134,52 +134,52 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Sisselogimine" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP seanss on autentimiseks vales olekus" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Omadus" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Sisselogimine nurjus, server keelab lihttekstiga sisselogimise." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "Sisselogimine nurjus, server ei toeta autentimisrežiim %1." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Sisselogimine nurjus, klient ei suutnud initsialiseerida SASL teeki." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Sisselogimine nurjus, TLS läbirääkimised nurjusid." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL-käepigistus nurjus." diff -Nru kimap-19.04.3/po/fi/libkimap5.po kimap-19.12.3/po/fi/libkimap5.po --- kimap-19.04.3/po/fi/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/fi/libkimap5.po 2020-03-03 00:31:54.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-08-15 13:59+0200\n" "Last-Translator: Tommi Nieminen \n" "Language-Team: Finnish \n" @@ -130,17 +130,17 @@ msgid "Job" msgstr "Työ" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Yhteys palvelimeen menetetty." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 epäonnistui, virheellinen vastaus palvelimelta." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 epäonnistui, palvelimen vastaus: %2" @@ -158,56 +158,56 @@ msgstr "ListRights" # Tämä on jätetty suomentamatta, koska on IMAP-komennon nimi. Parempi alkuteksti saadaan toivottavasti pian. -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Login" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP-istunto väärässä tilassa tunnistautumista varten" # Tämä on jätetty suomentamatta, koska on IMAP-komennon nimi. Parempi alkuteksti saadaan toivottavasti pian. -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Capability" # Tämä on jätetty suomentamatta, koska on IMAP-komennon nimi. Parempi alkuteksti saadaan toivottavasti pian. -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "Palvelin ei tue STARTTLS:ää, yritä käyttää sen sijaan SSL/TLS:ää." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Kirjautuminen epäonnistui: palvelin on poistanut käytöstä " "raakatekstikirjautumisen." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "Kirjautuminen epäonnistui: palvelin ei tue tunnistautumistapaa %1." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Kirjautuminen epäonnistui: ohjelma ei saa SASL-kirjastoa alustetuksi." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Kirjautuminen epäonnistui: TLS-neuvottelu epäonnistui." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL-kättely epäonnistui." diff -Nru kimap-19.04.3/po/fr/libkimap5.po kimap-19.12.3/po/fr/libkimap5.po --- kimap-19.04.3/po/fr/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/fr/libkimap5.po 2020-03-03 00:31:54.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-06-08 16:32+0800\n" "Last-Translator: Simon Depiets \n" "Language-Team: French \n" @@ -117,17 +117,17 @@ msgid "Job" msgstr "Tâche" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Interruption de la connexion au serveur." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "Échec de %1. Réponse incorrecte du serveur." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "Échec de %1. Le serveur a répondu : %2" @@ -142,61 +142,61 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Connexion" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "" "La session « IMAP » est dans un état incorrect pour une authentification" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Capacité" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" "STARTTLS n'est pas pris en charge par le serveur, veuillez essayer avec SSL/" "TLS." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "La connexion a échoué. La connexion non chiffrée est désactivée par le " "serveur." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "La connexion a échoué. Le mode d'authentification « %1 » n'est pas pris en " "charge par le serveur." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "La connexion a échoué. Le client ne peut initialiser la bibliothèque " "« SASL »." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "La connexion a échoué. La négociation « TLS » a échoué." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "Échec de la transaction SSL." diff -Nru kimap-19.04.3/po/ga/libkimap5.po kimap-19.12.3/po/ga/libkimap5.po --- kimap-19.04.3/po/ga/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/ga/libkimap5.po 2020-03-03 00:31:54.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2009-12-24 06:59-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -110,17 +110,17 @@ msgid "Job" msgstr "Jab" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Cailleadh an ceangal leis an bhfreastalaí." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "Theip ar %1, fuarthas freagra míchumtha ón bhfreastalaí." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "Theip ar %1, freagra ón bhfreastalaí: %2" @@ -135,57 +135,57 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Logáil isteach" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "Tá seisiún IMAP sa staid mhícheart le haghaidh fíordheimhnithe" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Ábaltacht" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Theip ar logáil isteach, dhíchumasaigh an freastalaí gnáthlogáil isteach." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Theip ar logáil isteach, ní thacaíonn an freastalaí le mód fíordheimhnithe " "%1." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "Theip ar logáil isteach, ní féidir leis an gcliant an leabharlann SASL a " "thúsú." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Theip ar logáil isteach, theip ar idirbheartaíocht TLS." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "" diff -Nru kimap-19.04.3/po/gl/libkimap5.po kimap-19.12.3/po/gl/libkimap5.po --- kimap-19.04.3/po/gl/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/gl/libkimap5.po 2020-03-03 00:31:54.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-10-21 18:37+0100\n" "Last-Translator: Adrián Chaves (Gallaecio) \n" "Language-Team: Galician \n" @@ -19,11 +19,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Environment: kde\n" -"X-Accelerator-Marker: &\n" -"X-Text-Markup: kde4\n" #: acljobbase.cpp:69 #, kde-format @@ -116,17 +112,17 @@ msgid "Job" msgstr "Tarefa" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Perdeuse a conexión co servidor." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "Fallou %1; recibiuse unha resposta incorrecta do servidor." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "Fallou %1; o servidor respondeu: %2" @@ -141,52 +137,52 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Identificación" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "A sesión de IMAP está no estado equivocado para a autenticación" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Capacidade" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "O servidor non é compatíbel con STARTTLS, probe a usar SSL/TLS." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Fallou o acceso; o acceso simple está desactivado no servidor." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "Fallou o acceso; o servidor non admite o modo de autenticación %1." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Fallou o acceso; o cliente non pode inicializar a biblioteca SASL." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Fallou o acceso; fallou a negociación TLS." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "Fallou a negociación de SSL." diff -Nru kimap-19.04.3/po/hu/libkimap5.po kimap-19.12.3/po/hu/libkimap5.po --- kimap-19.04.3/po/hu/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/hu/libkimap5.po 2020-03-03 00:31:54.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: KDE 4.3\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2014-09-04 15:46+0200\n" "Last-Translator: Kristóf Kiszel \n" "Language-Team: Hungarian \n" @@ -112,17 +112,17 @@ msgid "Job" msgstr "Feladat" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Megszakadt a kapcsolat a kiszolgálóval." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 nem sikerült, hibás válasz érkezett a kiszolgálótól." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 nem sikerült, a kiszolgáló válasza: %2" @@ -137,59 +137,59 @@ msgid "ListRights" msgstr "Jogosultságlista" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Bejelentkezés" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "Az IMAP munkamenet rossz állapotban van a hitelesítéshez" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Képesség" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "TlsIndítás" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "A bejelentkezés nem sikerült, a kiszolgáló nem engedélyez egyszerű szöveges " "bejelentkezést." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "A bejelentkezés nem sikerült, a kiszolgáló nem támogatja ezt a " "felhasználóazonosítási módot: %1." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "A bejelentkezés nem sikerült, a kliens nem tudta inicializálni az SASL-" "programkönyvtárat." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "" "A bejelentkezés nem sikerült, a TLS kommunikációt nem sikerült beállítani." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "Az SSH kézfogás nem sikerült." diff -Nru kimap-19.04.3/po/ia/libkimap5.po kimap-19.12.3/po/ia/libkimap5.po --- kimap-19.04.3/po/ia/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/ia/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -1,20 +1,20 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# g.sora , 2011, 2012, 2013. +# g.sora , 2011, 2012, 2013, 2020. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" -"PO-Revision-Date: 2013-12-16 13:14+0100\n" -"Last-Translator: G.Sora \n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" +"PO-Revision-Date: 2020-02-07 23:35+0100\n" +"Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua \n" "Language: ia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 2.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: acljobbase.cpp:69 @@ -93,11 +93,9 @@ msgstr "Obtene Radice de quota" #: idjob.cpp:43 -#, fuzzy, kde-format -#| msgctxt "name of the idle job" -#| msgid "Idle" +#, kde-format msgid "Id" -msgstr "Inactive" +msgstr "Id" #: idlejob.cpp:77 #, kde-format @@ -110,17 +108,17 @@ msgid "Job" msgstr "Carga" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Connexion a servitor perdite." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 falleva, responsa de mal formato ex le servitor." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 falleva, servitor respondeva: %2" @@ -135,57 +133,59 @@ msgid "ListRights" msgstr "Lista Derectos" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Accesso de identification" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "Session de IMAP in le stato errate pro authentication" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Capacitate" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "Initia Tls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" +"STARTTLS non es supportate per le servitor, essaya usante SSL/TLS plus " +"tosto." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Il falleva accesso de authentication, accesso plan es dishabilitate per le " "servitor." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Autorisation fallite, modo de authentication %1 non es supportate per le " "servitor." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "Authentication falleva, il cliente non pote initialisar le libreria SASL." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Authentication falleva, il falleva negotiation TLS." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "Il falleva le handshake de SSL." @@ -203,7 +203,7 @@ #: movejob.cpp:54 #, kde-format msgid "Move" -msgstr "" +msgstr "Move" #: myrightsjob.cpp:44 #, kde-format @@ -256,7 +256,7 @@ #, kde-format msgctxt "name of the status job" msgid "Status" -msgstr "" +msgstr "Stato" #: storejob.cpp:77 #, kde-format diff -Nru kimap-19.04.3/po/it/libkimap5.po kimap-19.12.3/po/it/libkimap5.po --- kimap-19.04.3/po/it/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/it/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-06-24 15:38+0100\n" "Last-Translator: Luigi Toscano \n" "Language-Team: Italian \n" @@ -110,17 +110,17 @@ msgid "Job" msgstr "Job" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Connessione al server perduta." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 non riuscito, risposta dal server mal definita." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 non riuscito, il server ha risposto: %2" @@ -135,54 +135,54 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Login" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "Sessione IMAP in uno stato di autenticazione non valido" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Capability" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "STARTTLS non è supportato dal server, prova in alternativa SSL/TLS." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Accesso non riuscito, l'accesso semplice è disabilitato dal server." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Accesso non riuscito, la modalità di autenticazione %1 non è supportata dal " "server." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Accesso non riuscito, impossibile inizializzare la libreria SASL." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Accesso non riuscito, negoziazione TLS non riuscita." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "Negoziazione SSL non riuscita." diff -Nru kimap-19.04.3/po/ja/libkimap5.po kimap-19.12.3/po/ja/libkimap5.po --- kimap-19.04.3/po/ja/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/ja/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2010-09-25 20:01-0700\n" "Last-Translator: Fumiaki Okushi \n" "Language-Team: Japanese \n" @@ -107,17 +107,17 @@ msgid "Job" msgstr "ジョブ" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "サーバへの接続が失われました。" -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 に失敗、サーバから不正な応答がありました。" -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 に失敗、サーバの返信: %2" @@ -132,52 +132,52 @@ msgid "ListRights" msgstr "" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "ログイン" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "能力" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "" -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "" diff -Nru kimap-19.04.3/po/kk/libkimap5.po kimap-19.12.3/po/kk/libkimap5.po --- kimap-19.04.3/po/kk/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/kk/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2011-02-18 06:48+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" @@ -110,17 +110,17 @@ msgid "Job" msgstr "Тапсырма" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Серверімен байланыс үзілген." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 жаңылысы, серверінен жарамсыз жауап келді." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 жаңылысы, серверінің жауабы: %2" @@ -135,55 +135,55 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Кіру" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP сеансы аутентификацияны өткізуге лайық күйде емес" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Мүмкіндіктері" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Кіру жаңылысы, бұл сервер й (шифрланбаған) паролімен кіруді қабылдамайды" -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "Кіру жаңылысы, сервері %1 аутентификация режімін танымайды." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "Кіру жаңылысы, клиент-бағдарламасы SASL жиын файлын.бастау күйіне келтіре " "алмады." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Кіру жаңылысы, TLS - келісу қатесі." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "" diff -Nru kimap-19.04.3/po/km/libkimap5.po kimap-19.12.3/po/km/libkimap5.po --- kimap-19.04.3/po/km/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/km/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2010-06-24 15:47+0700\n" "Last-Translator: Khoem Sokhem \n" "Language-Team: Khmer \n" @@ -112,17 +112,17 @@ msgid "Job" msgstr "ការងារ" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "បាត់​ការ​តភ្ជាប់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ ។" -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 បានបរាជ័យ កា​រឆ្លើយតប​មិន​ត្រឹមត្រូវ​ពី​ម៉ាស៊ីន​បម្រើ ។" -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 បានបរាជ័យ ម៉ាស៊ីនបម្រើ​បាន​ឆ្លើយតប ៖ %2" @@ -137,52 +137,52 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "ចូល" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "សម័យ​ IMAP ក្នុង​​ភាព​មិន​ត្រឹមត្រូវ​​សម្រាប់​ការផ្ទៀងផ្ទាត់​ភាពត្រឹមត្រូវ​" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "សមត្ថភាព" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "បានបរាជ័យ​ក្នុងកា​រចូល ចូល​ធម្ម​ត្រូវ​បានបិទ​ដោយ​ម៉ាស៊ីន​បម្រើ ។" -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "បានបរាជ័យ​ក្នុងកា​រចូល របៀប​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ %1 មិន​ត្រូវ​បានគាំទ្រ​ដោយ​ម៉ាស៊ីន​បម្រើ​ទេ ។" -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "បាន​បរាជ័យ​ក្នុងកា​រចូល ម៉ាស៊ីន​ភ្ញៀវ​មិនអាច​ចាប់ផ្ដើម​បណ្ណាល័យ SASL បានទេ ។" -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "បា​ន​បរាជ័យ​ក្នុងការ​ចូល បានបរាជ័យ​ក្នុងកា​រចរចារ​របស់ TLS ។" -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "" diff -Nru kimap-19.04.3/po/ko/libkimap5.po kimap-19.12.3/po/ko/libkimap5.po --- kimap-19.04.3/po/ko/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/ko/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-08-15 12:30+0100\n" "Last-Translator: Shinjo Park \n" "Language-Team: Korean \n" @@ -108,17 +108,17 @@ msgid "Job" msgstr "작업" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "서버와의 연결이 끊어졌습니다." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 실패. 서버에서 잘못된 응답이 돌아왔습니다." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 실패. 서버 응답: %2" @@ -133,52 +133,52 @@ msgid "ListRights" msgstr "권한 목록" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "로그인" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP 세션이 잘못된 인증 상태에 있음" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "기능" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "서버에서 STARTTLS를 사용할 수 없습니다. SSL/TLS를 사용하십시오." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "로그인 실패. 서버에서 로그인을 지원하지 않습니다." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "로그인 실패. 서버에서 인증 모드 %1을(를) 지원하지 않습니다." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "로그인 실패. 클라이언트가 SASL 라이브러리를 초기화할 수 없습니다." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "로그인 실패. TLS 협상이 실패했습니다." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL 악수가 실패했습니다." diff -Nru kimap-19.04.3/po/lt/libkimap5.po kimap-19.12.3/po/lt/libkimap5.po --- kimap-19.04.3/po/lt/libkimap5.po 2019-07-09 00:18:46.000000000 +0000 +++ kimap-19.12.3/po/lt/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2015-08-30 15:56+0200\n" "Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian \n" @@ -112,17 +112,17 @@ msgid "Job" msgstr "Darbas" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Ryšys su serveriu prarastas." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 nepavyko, klaidingai suformuotas atsakymas iš serverio." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 nepavyko, serverio atsakymas: %2" @@ -137,55 +137,55 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Prisijungti" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP sesija netinkamoje būsenoje kad autentifikuotis" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Galimybė" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Prisijungimas nepavyko, prisijungimas atviru tekstu išjungtas serveryje." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Prisijungimas nepavyko, autentikacijos metodas %1 nepalaikomas serverio." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "Prisijungimas nepavyko, klientui nepavyksta inicializuoti SASL bibliotekos." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Prisijungti nepavyko. TLS derybos nepavyko." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL derybos nepavyko." diff -Nru kimap-19.04.3/po/lv/libkimap5.po kimap-19.12.3/po/lv/libkimap5.po --- kimap-19.04.3/po/lv/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/lv/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2010-01-01 17:01+0200\n" "Last-Translator: Viesturs Zarins \n" "Language-Team: Latvian \n" @@ -112,17 +112,17 @@ msgid "Job" msgstr "Darbs" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Zudis savienojums ar serveri." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "Nevieksmīgs %1, nekorekta atbilde no servera." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "Nevieksmīgs %1, serveris atbildēja:%2" @@ -137,53 +137,53 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Pieteikties" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Iespēja" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Neizdevās pieteikties, serveris neatbalsta atklāta teksta pieteikšanos." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "Neizdevās pieteikties, serveris neatbalsta autentificēšanas režīmu %1." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Neizdevās pieteikties, klients nevarēja inicializēt SASL bibliotēku." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Neizdevās pieteikties, neveiksmīga TLS vienošanās." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "" diff -Nru kimap-19.04.3/po/mr/libkimap5.po kimap-19.12.3/po/mr/libkimap5.po --- kimap-19.04.3/po/mr/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/mr/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2013-03-13 15:14+0530\n" "Last-Translator: Chetan Khona \n" "Language-Team: Marathi \n" @@ -110,17 +110,17 @@ msgid "Job" msgstr "कार्य" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "" -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "" -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "" @@ -135,52 +135,52 @@ msgid "ListRights" msgstr "" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "प्रवेश" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "" -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "" diff -Nru kimap-19.04.3/po/nb/libkimap5.po kimap-19.12.3/po/nb/libkimap5.po --- kimap-19.04.3/po/nb/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/nb/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2014-09-23 22:05+0200\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" @@ -110,17 +110,17 @@ msgid "Job" msgstr "Jobb" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Tilkobling til tjeneren er tapt." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 mislyktes, feil i svar fra tjeneren." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 mislyktes, tjeneren svarte: %2" @@ -135,52 +135,52 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Logg inn" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP-økta er i feil tilstand for autentisering" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Mulighet" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Innlogging mislyktes, tjeneren tillater ikke enkel innlogging." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "Innlogging mislyktes, tjeneren støtter ikke autentiseringsmåte %1." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Innlogging mislyktes, klienten kan ikke klargjøre SASL-biblioteket." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Innlogging mislyktes, TLS-forhandling lyktes ikke." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL-håndtryk mislyktes." diff -Nru kimap-19.04.3/po/nds/libkimap5.po kimap-19.12.3/po/nds/libkimap5.po --- kimap-19.04.3/po/nds/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/nds/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2014-08-14 00:19+0200\n" "Last-Translator: Sönke Dibbern \n" "Language-Team: Low Saxon \n" @@ -112,17 +112,17 @@ msgid "Job" msgstr "Opgaav" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Verbinnen na Server afbraken." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 fehlslaan. Leeg Serverantwoort kregen." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 fehlslaan. De Server anter: %2" @@ -137,54 +137,54 @@ msgid "ListRights" msgstr "Verlöven oplisten" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Anmellen" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP-Törn in leeg Status för Identiteetprööv" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Könen" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "TIs starten" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Anmellen fehlslaan. Nich verslötelt Anmellen is op den Server utmaakt." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Anmellen fehlslaan. De Server ünnerstütt de Metood \"%1\" för de " "Identiteetprööv nich." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Anmellen fehlslaan. De SASL-Bibliotheek lett sik nich torechtmaken." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Anmellen fehlslaan. Uthanneln vun TLS fehlslaan." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL-Uthanneln is fehlslaan." diff -Nru kimap-19.04.3/po/nl/libkimap5.po kimap-19.12.3/po/nl/libkimap5.po --- kimap-19.04.3/po/nl/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/nl/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-06-07 17:54+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" @@ -109,17 +109,17 @@ msgid "Job" msgstr "Job" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Verbinding met server verbroken." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 is mislukt, misvormd antwoord van de server." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 is mislukt, antwoord van server: %2" @@ -134,57 +134,57 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Aanmelden" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP-sessie in de verkeerde status voor authenticatie" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Mogelijkheid" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" "STARTTLS wordt niet ondersteund door de server, probeer in plaats daarvan " "SSL/TLS." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Aanmelden is mislukt, plat aanmelden is uitgeschakeld door de server." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Aanmelden is mislukt, authenticatiemodus %1 wordt niet ondersteund door de " "server." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "Aanmelden is mislukt, client kan de SASL-bibliotheek niet initialiseren." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Aanmelden is mislukt, TLS-onderhandeling is mislukt." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL-handdruk is mislukt." diff -Nru kimap-19.04.3/po/nn/libkimap5.po kimap-19.12.3/po/nn/libkimap5.po --- kimap-19.04.3/po/nn/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/nn/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2010-04-20 22:06+0200\n" "Last-Translator: Eirik U. Birkeland \n" "Language-Team: Norwegian Nynorsk \n" @@ -111,17 +111,17 @@ msgid "Job" msgstr "Jobb" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Tilkoplinga til tenaren vart avbroten." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 var mislukka. Svaret frå tenaren var ugyldig." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 var mislukka. Svaret frå tenaren var: %2" @@ -136,54 +136,54 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Innlogging" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Funksjon" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Innlogginga var mislukka. Vanleg innlogging er slått av på tenaren." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Innlogginga var mislukka. Innloggingsmetoden %1 er ikkje støtta av tenaren." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "Innlogginga var mislukka. Klienten klarar ikkje starta SASL-biblioteket." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Innlogginga og TLS-forhandlinga var mislukka." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "" diff -Nru kimap-19.04.3/po/pa/libkimap5.po kimap-19.12.3/po/pa/libkimap5.po --- kimap-19.04.3/po/pa/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/pa/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2010-01-16 08:29+0530\n" "Last-Translator: A S Alam \n" "Language-Team: ਪੰਜਾਬੀ \n" @@ -110,17 +110,17 @@ msgid "Job" msgstr "ਜਾਬ" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "" -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "" -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "" @@ -135,52 +135,52 @@ msgid "ListRights" msgstr "" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "ਲਾਗਇਨ" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "ਸਮੱਰਥਾ" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "ਲਾਗਇਨ ਫੇਲ੍ਹ, TLS ਜਾਂਚ ਫੇਲ੍ਹ ਹੋਈ।" -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "" diff -Nru kimap-19.04.3/po/pl/libkimap5.po kimap-19.12.3/po/pl/libkimap5.po --- kimap-19.04.3/po/pl/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/pl/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" -"PO-Revision-Date: 2019-01-13 10:04+0100\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" +"PO-Revision-Date: 2019-11-11 08:39+0100\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 19.03.70\n" +"X-Generator: Lokalize 19.07.70\n" #: acljobbase.cpp:69 #, kde-format @@ -109,17 +109,17 @@ msgid "Job" msgstr "Zadanie" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Utracono połączenie z serwerem." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 nie powiodło się, błędna odpowiedź serwera." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 nie powiodło się, odpowiedź serwera: %2" @@ -134,57 +134,57 @@ msgid "ListRights" msgstr "PrawaListy" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Logowanie" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "Sesja IMAP w złym stanie uwierzytelniania" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Możliwość" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" "STARTTLS nie jest obsługiwany przez serwer, zamiast tego spróbuj użyć SSL/" "TLS." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Logowanie nie powiodło się, zwykłe logowanie jest wyłączone na serwerze." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Logowanie nie powiodło się, tryb uwierzytelnienia %1 nie jest obsługiwany " "przez serwer." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Logowanie nie powiodło się, nie można zainicjować biblioteki SASL." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Logowanie nie powiodło się, nie udała się negocjacja TLS." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "Nieudany uścisk dłoni SSL." @@ -228,7 +228,7 @@ #, kde-format msgctxt "Name of the search job" msgid "Search" -msgstr "Znajdź" +msgstr "Szukaj" #: selectjob.cpp:59 #, kde-format diff -Nru kimap-19.04.3/po/pt/libkimap5.po kimap-19.12.3/po/pt/libkimap5.po --- kimap-19.04.3/po/pt/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/pt/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-06-04 11:20+0100\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" @@ -113,17 +113,17 @@ msgid "Job" msgstr "Tarefa" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Perdeu-se a ligação ao servidor." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "O %1 foi mal-sucedido; a resposta do servidor é inválida." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "O %1 foi mal-sucedido; a resposta do servidor foi: %2" @@ -138,60 +138,60 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Utilizador" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "Sessão de IMAP num estado inválido para autenticação" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Capacidade" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" "O STARTTLS não é suportado pelo servidor; tente usar o SSL/TLS em " "alternativa." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "A autenticação foi mal-sucedida; a autenticação em texto livre está " "desactivada." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "A autenticação foi mal-sucedida; o modo de autenticação %1 não é suportado " "pelo servidor." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "A autenticação foi mal-sucedida; o cliente não consegue inicializar a " "biblioteca SASL." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "A autenticação foi mal-sucedida; a negociação de TLS foi mal-sucedida." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "O protocolo inicial de SSL foi mal-sucedido." diff -Nru kimap-19.04.3/po/pt_BR/libkimap5.po kimap-19.12.3/po/pt_BR/libkimap5.po --- kimap-19.04.3/po/pt_BR/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/pt_BR/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libkimap5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-08-04 23:28-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" @@ -110,17 +110,17 @@ msgid "Job" msgstr "Trabalho" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "A conexão com o servidor foi perdida." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 falhou, resposta mal formada do servidor." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 falhou, o servidor respondeu: %2" @@ -135,57 +135,57 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Início de sessão" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "Sessão de IMAP num estado inválido para autenticação" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Recurso" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" "O STARTTLS não é suportado pelo servidor, tente usar o SSL/TLS como " "alternativa." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Falha no login. A autenticação em texto sem formatação será desabilitada " "pelo servidor." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Falha no login. O modo de autenticação %1 não é suportado pelo servidor." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Falha no login, o cliente não consegue inicializar a biblioteca SASL." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Falha no login. A negociação TLS falhou." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "A negociação de SSL falhou." diff -Nru kimap-19.04.3/po/ro/libkimap5.po kimap-19.12.3/po/ro/libkimap5.po --- kimap-19.04.3/po/ro/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/ro/libkimap5.po 2020-03-03 00:31:55.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2010-11-28 17:14+0200\n" "Last-Translator: Cristian Oneț \n" "Language-Team: Romanian \n" @@ -111,17 +111,17 @@ msgid "Job" msgstr "Sarcină" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Conexiunea la server a fost pierdută." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "" -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "" @@ -136,55 +136,55 @@ msgid "ListRights" msgstr "" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Autentificare" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Capacități" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Autentificare eșuată. Autentificarea în clar este dezactivată de către " "server." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Autorizare eșuată, metoda de autentificare %1 nu este suportată de server." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "" -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "" diff -Nru kimap-19.04.3/po/ru/libkimap5.po kimap-19.12.3/po/ru/libkimap5.po --- kimap-19.04.3/po/ru/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/ru/libkimap5.po 2020-03-03 00:31:56.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-08-14 10:00+0300\n" "Last-Translator: Александр Яворский \n" "Language-Team: Russian \n" @@ -145,19 +145,19 @@ msgid "Job" msgstr "задание" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Соединение с сервером разорвано." # %1 = JobPrivate::m_name, в винительном падеже --aspotashev -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "Не удалось выполнить %1, неправильный формат ответа сервера." # %1 = JobPrivate::m_name, в винительном падеже --aspotashev -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "Не удалось выполнить %1, ответ сервера: %2" @@ -178,58 +178,58 @@ # [JobPrivate::m_name] # http://tools.ietf.org/html/rfc3501#section-6.2.3 -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "аутентификацию пользователя" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "Сессия IMAP в состоянии, не подходящем для аутентификации" # [JobPrivate::m_name] # http://tools.ietf.org/html/rfc3501#section-6.1.1 -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "определение возможностей сервера" # [JobPrivate::m_name] # http://tools.ietf.org/html/rfc2595#section-3.1 -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "переход в режим шифрования TLS/SSL" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" "Протокол установления защищённого соединения STARTTLS не поддерживается " "сервером, попробуйте использовать протокол SSL/TLS." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Вход не удался (простая аутентификация запрещена на сервере)." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "Вход не удался (сервер не поддерживает режим «%1»)." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Вход не удался (клиент не смог инициализировать библиотеку SASL)." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Вход не удался (ошибка согласования TLS)." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "Произошла ошибка во время обмена приветствиями SSL." diff -Nru kimap-19.04.3/po/sk/libkimap5.po kimap-19.12.3/po/sk/libkimap5.po --- kimap-19.04.3/po/sk/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/sk/libkimap5.po 2020-03-03 00:31:56.000000000 +0000 @@ -1,18 +1,19 @@ # translation of libkimap5.po to Slovak # Roman Paholík , 2014, 2016. +# Matej Mrenica , 2019. msgid "" msgstr "" "Project-Id-Version: libkimap5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" -"PO-Revision-Date: 2016-11-04 21:34+0100\n" -"Last-Translator: Roman Paholik \n" -"Language-Team: Slovak \n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" +"PO-Revision-Date: 2019-08-04 11:21+0200\n" +"Last-Translator: Matej Mrenica \n" +"Language-Team: Slovak \n" "Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.07.90\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: acljobbase.cpp:69 @@ -106,17 +107,17 @@ msgid "Job" msgstr "Úloha" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Spojenie k serveru bolo stratené." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 zlyhalo, neplatná odpoveď zo servera." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 zlyhalo, server odpovedal: %2" @@ -131,52 +132,53 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Prihlásenie" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP sedenie v zlom stave na overenie" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Schopnosti" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" +"STARTTLS nie je podporovaný serverom, skúste namiesto toho použiť SSL/TLS." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Pihlásenie zlyhalo, čisté prihlásenie je zakázané na serveri." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "Prihlásenie zlyhalo, režim overenia %1 nepodporovaný serverom." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Prihlásenie zlyhalo, klient nemôže inicializovať knižnicu SASL." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Prihlásenie zlyhalo, TLS skúška zlyhala." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL handshake zlyhalo." diff -Nru kimap-19.04.3/po/sl/libkimap5.po kimap-19.12.3/po/sl/libkimap5.po --- kimap-19.04.3/po/sl/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/sl/libkimap5.po 2020-03-03 00:31:56.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2016-10-31 20:46+0100\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" @@ -109,17 +109,17 @@ msgid "Job" msgstr "Posel" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Povezava s strežnikom je bila izgubljena." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 ni uspel, odgovor strežnika je napačno oblikovan." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 ni uspel, strežnik je odgovoril: %2" @@ -134,52 +134,52 @@ msgid "ListRights" msgstr "SeznamDovoljenj" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Prijava" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "Seja IMAP je v napačnem stanju za overitev" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Zmožnost" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Prijava ni uspela, strežnik je onemogočil običajno prijavo." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "Prijava ni uspela, strežnik ne podpira načina za overitev %1." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Prijava ni uspela, odjemalec ne more začeti knjižnice SASL." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Prijava ni uspela, pogajanja TLS so bila neuspešna." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "Rokovanje SSL je spodletelo." diff -Nru kimap-19.04.3/po/sv/libkimap5.po kimap-19.12.3/po/sv/libkimap5.po --- kimap-19.04.3/po/sv/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/sv/libkimap5.po 2020-03-03 00:31:56.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-06-17 07:36+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" @@ -109,17 +109,17 @@ msgid "Job" msgstr "Jobb" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Anslutningen till servern gick förlorad." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 misslyckades. Felformaterat svar från servern." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 misslyckades. Servern svarade: %2" @@ -134,54 +134,54 @@ msgid "ListRights" msgstr "Listrättigheter" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Logga in" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP-session har felaktigt tillstånd för behörighetskontroll" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Kapabilitet" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "Starta TLS" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "STARTTLS stöds inte av servern. Försök använda SSL/TLS istället." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "Inloggning misslyckades. Enkel inloggning är inaktiverad av servern." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Inloggning misslyckades. Behörighetskontroll med läget %1 stöds inte av " "servern." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "Inloggning misslyckades. Klienten kan inte initiera SASL-biblioteket." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "Inloggning misslyckades. TLS-förhandling misslyckades." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL-handskakning misslyckades." diff -Nru kimap-19.04.3/po/tr/libkimap5.po kimap-19.12.3/po/tr/libkimap5.po --- kimap-19.04.3/po/tr/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/tr/libkimap5.po 2020-03-03 00:31:56.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2017-06-05 11:58+0000\n" "Last-Translator: Kaan \n" "Language-Team: Turkish \n" @@ -111,17 +111,17 @@ msgid "Job" msgstr "Görev" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "Sunucuya yapılan bağlantı koptu." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 başarısız oldu, sunucudan bozuk yanıt alındı." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 başarısız oldu, sunucunun yanıtı: %2" @@ -136,55 +136,55 @@ msgid "ListRights" msgstr "Hakları Listele" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Giriş" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP oturumu kimlik denetimi için yanlış durumda" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Yetenek" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "TLS'yi Başlat" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Düz giriş sunucu tarafından devre dışı bırakıldığı için giriş yapılamadı." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "%1 kimlik doğrulama yöntemi sunucu tarafından desteklenmediğinden giriş " "başarısız oldu." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "İstemci SASL kitaplığını başlatamadığından giriş yapılamadı." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "TLS anlaşması başarısız olduğundan giriş yapılamadı." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL el sıkışması başarısız." diff -Nru kimap-19.04.3/po/ug/libkimap5.po kimap-19.12.3/po/ug/libkimap5.po --- kimap-19.04.3/po/ug/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/ug/libkimap5.po 2020-03-03 00:31:56.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur Computer Science Association \n" @@ -110,17 +110,17 @@ msgid "Job" msgstr "ۋەزىپە" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "" -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "" -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "" @@ -135,52 +135,52 @@ msgid "ListRights" msgstr "" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "كىرىش" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "" -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "" diff -Nru kimap-19.04.3/po/uk/libkimap5.po kimap-19.12.3/po/uk/libkimap5.po --- kimap-19.04.3/po/uk/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/uk/libkimap5.po 2020-03-03 00:31:56.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libkimap5\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2018-06-05 08:29+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -111,19 +111,19 @@ msgid "Job" msgstr "Завдання" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "З’єднання з сервером розірвано." -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "" "Спроба виконання дії %1 завершилася невдало, некоректно сформована відповідь " "сервера." -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "Спроба виконання дії %1 завершилася невдало, відповідь сервера: %2" @@ -138,61 +138,61 @@ msgid "ListRights" msgstr "ListRights" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "Увійти" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "Сеанс IMAP перебуває у стані, непридатному для розпізнавання" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "Можливість" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "" "Не сервері не передбачено підтримки STARTTLS, спробуйте скористатися SSL/TLS." -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "" "Спроба реєстрації завершилася невдало, нешифровані паролі не приймаються " "сервером." -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "" "Спроба реєстрації завершилася невдало, режим розпізнавання %1 не " "підтримується цим сервером." -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "" "Спроба реєстрації завершилася невдало, клієнтові не вдалося ініціалізувати " "бібліотеку SASL." -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "" "Спроба реєстрації завершилася невдало, не вдалося встановити режим " "шифрування TLS." -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "Помилка під час спроби встановлення з’єднання SSL." diff -Nru kimap-19.04.3/po/zh_CN/libkimap5.po kimap-19.12.3/po/zh_CN/libkimap5.po --- kimap-19.04.3/po/zh_CN/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/zh_CN/libkimap5.po 2020-03-03 00:31:56.000000000 +0000 @@ -7,16 +7,15 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" -"PO-Revision-Date: 2019-06-02 13:16\n" -"Last-Translator: Guo Yunhe (guoyunhe)\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" +"PO-Revision-Date: 2020-01-20 21:56\n" +"Last-Translator: FULL NAME \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" "X-Crowdin-File: /kf5-stable/messages/pim/libkimap5.pot\n" @@ -112,17 +111,17 @@ msgid "Job" msgstr "任务" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "与服务器的连接丢失。" -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 失败，服务器的响应数据格式不正常。" -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 失败，服务器响应：%2" @@ -137,52 +136,52 @@ msgid "ListRights" msgstr "列出权限" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "登录" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP 会话在进行身份验证时状态出错" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "特性" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "开启 TLS" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "服务器不支持 STARTTLS，请尝试使用 SSL/TLS 代替。" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "登录失败，服务器已禁用纯文本登录。" -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "登录失败，服务器不支持 %1 验证模式。" -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." msgstr "登录失败，客户端无法初始化 SASL 类库。" -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "登录失败，TLS 协商失败。" -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL 握手失败。" diff -Nru kimap-19.04.3/po/zh_TW/libkimap5.po kimap-19.12.3/po/zh_TW/libkimap5.po --- kimap-19.04.3/po/zh_TW/libkimap5.po 2019-07-09 00:18:47.000000000 +0000 +++ kimap-19.12.3/po/zh_TW/libkimap5.po 2020-03-03 00:31:56.000000000 +0000 @@ -7,10 +7,10 @@ msgstr "" "Project-Id-Version: libkimap\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" -"POT-Creation-Date: 2019-05-20 07:43+0200\n" +"POT-Creation-Date: 2019-10-07 03:06+0200\n" "PO-Revision-Date: 2019-03-22 00:40+0800\n" "Last-Translator: pan93412 \n" -"Language-Team: Chinese \n" +"Language-Team: Chinese \n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -110,17 +110,17 @@ msgid "Job" msgstr "工作" -#: job.cpp:65 loginjob.cpp:582 +#: job.cpp:65 loginjob.cpp:583 #, kde-format msgid "Connection to server lost." msgstr "到伺服器的連線遺失" -#: job.cpp:77 loginjob.cpp:418 setmetadatajob.cpp:136 +#: job.cpp:77 loginjob.cpp:419 setmetadatajob.cpp:136 #, kde-format msgid "%1 failed, malformed reply from the server." msgstr "%1 失敗，伺服器的回應不正確。" -#: job.cpp:80 loginjob.cpp:297 setmetadatajob.cpp:117 setmetadatajob.cpp:139 +#: job.cpp:80 loginjob.cpp:298 setmetadatajob.cpp:117 setmetadatajob.cpp:139 #, kde-format msgid "%1 failed, server replied: %2" msgstr "%1 失敗，伺服器回應：%2" @@ -135,52 +135,52 @@ msgid "ListRights" msgstr "清單權限" -#: loginjob.cpp:145 loginjob.cpp:247 +#: loginjob.cpp:146 loginjob.cpp:248 #, kde-format msgid "Login" msgstr "登入" -#: loginjob.cpp:201 +#: loginjob.cpp:202 #, kde-format msgid "IMAP session in the wrong state for authentication" msgstr "IMAP 工作階段在認證時的狀態錯誤" -#: loginjob.cpp:249 +#: loginjob.cpp:250 #, kde-format msgid "Capability" msgstr "相容性" -#: loginjob.cpp:251 +#: loginjob.cpp:252 #, kde-format msgid "StartTls" msgstr "StartTls" -#: loginjob.cpp:360 +#: loginjob.cpp:361 #, kde-format msgid "STARTTLS is not supported by the server, try using SSL/TLS instead." msgstr "伺服器不支援 STARTTLS，嘗試使用 SSL/TLS 取代。" -#: loginjob.cpp:374 +#: loginjob.cpp:375 #, kde-format msgid "Login failed, plain login is disabled by the server." msgstr "登入失敗，plain login 已由伺服器關閉" -#: loginjob.cpp:396 +#: loginjob.cpp:397 #, kde-format msgid "Login failed, authentication mode %1 is not supported by the server." msgstr "登入失敗，伺服器未支援認證模式 %1。" -#: loginjob.cpp:428 +#: loginjob.cpp:429 #, kde-format msgid "Login failed, client cannot initialize the SASL library." -msgstr "登入失敗，客戶端無法初始化 SASL 函式庫。" +msgstr "登入失敗，用戶端無法初始化 SASL 函式庫。" -#: loginjob.cpp:525 +#: loginjob.cpp:526 #, kde-format msgid "Login failed, TLS negotiation failed." msgstr "登入失敗，TLS 溝通失敗。" -#: loginjob.cpp:578 +#: loginjob.cpp:579 #, kde-format msgid "SSL handshake failed." msgstr "SSL 交換連線資訊失敗。" diff -Nru kimap-19.04.3/README.md kimap-19.12.3/README.md --- kimap-19.04.3/README.md 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/README.md 2020-02-16 08:58:48.000000000 +0000 @@ -5,7 +5,7 @@ otherwise provides quite a low-level interface to the protocol. This library does not implement an IMAP client; it merely makes it easier to do so. -Users should be familiar with [RFC 3501](http://www.apps.ietf.org/rfc/rfc3501.html "IMAP 4rev1") -as well as [other related RFCs](http://www.iana.org/assignments/imap4-capabilities) +Users should be familiar with [RFC 3501](https://tools.ietf.org/html/rfc3501 "IMAP 4rev1") +as well as [other related RFCs](https://www.iana.org/assignments/imap4-capabilities) although the library hides some of the nastier details like the encoding and quoting of strings. diff -Nru kimap-19.04.3/src/acl.h kimap-19.12.3/src/acl.h --- kimap-19.04.3/src/acl.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/acl.h 2020-02-16 08:58:48.000000000 +0000 @@ -77,7 +77,7 @@ Expunge = 0x001000, /** Write shared annotations * - * See RFC + * See RFC * 5257. Only supported by servers that implement the ANNOTATE extension. */ WriteShared = 0x002000, diff -Nru kimap-19.04.3/src/acljobbase.h kimap-19.12.3/src/acljobbase.h --- kimap-19.04.3/src/acljobbase.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/acljobbase.h 2020-02-16 08:58:48.000000000 +0000 @@ -36,7 +36,7 @@ * Base class for jobs that operate on mailbox ACLs * * Provides support for the IMAP ACL extension, as defined by - * RFC 4314. + * RFC 4314. * * This class cannot be used directly, you must subclass it and reimplement * at least the doStart() method. diff -Nru kimap-19.04.3/src/appendjob.h kimap-19.12.3/src/appendjob.h --- kimap-19.04.3/src/appendjob.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/appendjob.h 2020-02-16 08:58:48.000000000 +0000 @@ -81,7 +81,7 @@ * Set the internal date that should be applied to the appended message. * * This is the date/time the IMAP server should set internally for the appended message. - * See http://tools.ietf.org/html/rfc3501#section-6.3.11 + * See https://tools.ietf.org/html/rfc3501#section-6.3.11 * * If this is not set, the server will use the current date/time. * diff -Nru kimap-19.04.3/src/deleteacljob.h kimap-19.12.3/src/deleteacljob.h --- kimap-19.04.3/src/deleteacljob.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/deleteacljob.h 2020-02-16 08:58:48.000000000 +0000 @@ -43,7 +43,7 @@ * * This job requires that the server supports the ACL * capability, defined in - * RFC 4314. + * RFC 4314. */ class KIMAP_EXPORT DeleteAclJob : public AclJobBase { diff -Nru kimap-19.04.3/src/getacljob.h kimap-19.12.3/src/getacljob.h --- kimap-19.04.3/src/getacljob.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/getacljob.h 2020-02-16 08:58:48.000000000 +0000 @@ -43,7 +43,7 @@ * * This job requires that the server supports the ACL * capability, defined in - * RFC 4314. + * RFC 4314. * * The meaning of identifiers depends on the server implementation, * with the following restrictions: diff -Nru kimap-19.04.3/src/getmetadatajob.cpp kimap-19.12.3/src/getmetadatajob.cpp --- kimap-19.04.3/src/getmetadatajob.cpp 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/getmetadatajob.cpp 2020-02-16 08:58:48.000000000 +0000 @@ -92,7 +92,7 @@ if (d->attributes.size() > 1) { parameters[parameters.length() - 1 ] = ')'; } else { - parameters.truncate(parameters.length() - 1); + parameters.chop(1); } } else { @@ -119,7 +119,7 @@ } parameters[parameters.length() - 1 ] = ')'; } else { - parameters.truncate(parameters.length() - 1); + parameters.chop(1); } } diff -Nru kimap-19.04.3/src/getmetadatajob.h kimap-19.12.3/src/getmetadatajob.h --- kimap-19.04.3/src/getmetadatajob.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/getmetadatajob.h 2020-02-16 08:58:48.000000000 +0000 @@ -36,10 +36,10 @@ * * Provides support for the IMAP METADATA extension; both the * final RFC version - * (RFC 5464) + * (RFC 5464) * and the older, incompatible draft version (known as ANNOTATEMORE) * (draft-daboo-imap-annotatemore-07). See setServerCompatibility(). * * This job can only be run when the session is in the diff -Nru kimap-19.04.3/src/getquotajob.h kimap-19.12.3/src/getquotajob.h --- kimap-19.04.3/src/getquotajob.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/getquotajob.h 2020-02-16 08:58:48.000000000 +0000 @@ -46,7 +46,7 @@ * * This job requires that the server supports the QUOTA * capability, defined in - * RFC 2087. + * RFC 2087. */ class KIMAP_EXPORT GetQuotaJob : public QuotaJobBase { diff -Nru kimap-19.04.3/src/getquotarootjob.h kimap-19.12.3/src/getquotarootjob.h --- kimap-19.04.3/src/getquotarootjob.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/getquotarootjob.h 2020-02-16 08:58:48.000000000 +0000 @@ -46,7 +46,7 @@ * * This job requires that the server supports the QUOTA * capability, defined in - * RFC 2087. + * RFC 2087. */ class KIMAP_EXPORT GetQuotaRootJob : public QuotaJobBase { diff -Nru kimap-19.04.3/src/idlejob.h kimap-19.12.3/src/idlejob.h --- kimap-19.04.3/src/idlejob.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/idlejob.h 2020-02-16 08:58:48.000000000 +0000 @@ -57,7 +57,7 @@ * * This job requires that the server supports the IDLE * capability, defined in - * RFC 2177. + * RFC 2177. */ class KIMAP_EXPORT IdleJob : public Job { diff -Nru kimap-19.04.3/src/job_p.h kimap-19.12.3/src/job_p.h --- kimap-19.04.3/src/job_p.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/job_p.h 2020-02-16 08:58:48.000000000 +0000 @@ -21,7 +21,7 @@ #define KIMAP_JOB_P_H #include "session.h" -#include +#include namespace KIMAP { @@ -31,7 +31,7 @@ class JobPrivate { public: - JobPrivate(Session *session, const QString &name) : m_session(session), m_socketError(KTcpSocket::UnknownError) + JobPrivate(Session *session, const QString &name) : m_session(session) { m_name = name; } @@ -47,7 +47,7 @@ return m_session->d; } - void setSocketError(KTcpSocket::Error error) + void setSocketError(QAbstractSocket::SocketError error) { m_socketError = error; } @@ -55,7 +55,7 @@ QList tags; Session *m_session = nullptr; QString m_name; - KTcpSocket::Error m_socketError; + QAbstractSocket::SocketError m_socketError = QAbstractSocket::UnknownSocketError; }; } diff -Nru kimap-19.04.3/src/listrightsjob.h kimap-19.12.3/src/listrightsjob.h --- kimap-19.04.3/src/listrightsjob.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/listrightsjob.h 2020-02-16 08:58:48.000000000 +0000 @@ -44,7 +44,7 @@ * * This job requires that the server supports the ACL * capability, defined in - * RFC 4314. + * RFC 4314. */ class KIMAP_EXPORT ListRightsJob : public AclJobBase { diff -Nru kimap-19.04.3/src/loginjob.cpp kimap-19.12.3/src/loginjob.cpp --- kimap-19.04.3/src/loginjob.cpp 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/loginjob.cpp 2020-02-16 08:58:48.000000000 +0000 @@ -21,8 +21,9 @@ #include "loginjob.h" #include +#include + #include "kimap_debug.h" -#include #include "job_p.h" #include "response_p.h" @@ -207,14 +208,14 @@ EncryptionMode encryptionMode = d->encryptionMode; const auto negotiatedEncryption = d->sessionInternal()->negotiatedEncryption(); - if (negotiatedEncryption != KTcpSocket::UnknownSslVersion) { + if (negotiatedEncryption != QSsl::UnknownProtocol) { // If the socket is already encrypted, pretend we did not want any // encryption encryptionMode = Unencrypted; } if (encryptionMode == SSLorTLS) { - d->sessionInternal()->startSsl(KTcpSocket::SecureProtocols); + d->sessionInternal()->startSsl(QSsl::SecureProtocols); } else if (encryptionMode == STARTTLS) { // Check if STARTTLS is supported d->authState = LoginJobPrivate::PreStartTlsCapability; @@ -363,7 +364,7 @@ break; case LoginJobPrivate::StartTls: - d->sessionInternal()->startSsl(KTcpSocket::SecureProtocols); + d->sessionInternal()->startSsl(QSsl::SecureProtocols); break; case LoginJobPrivate::Capability: @@ -573,7 +574,7 @@ //the TLS handshake failed and the socket was reconnected in normal mode if (d->authState != LoginJobPrivate::StartTls) { qCWarning(KIMAP_LOG) << "Connection to server lost " << d->m_socketError; - if (d->m_socketError == KTcpSocket::SslHandshakeFailedError) { + if (d->m_socketError == QAbstractSocket::SslHandshakeFailedError) { setError(KJob::UserDefinedError); setErrorText(i18n("SSL handshake failed.")); emitResult(); diff -Nru kimap-19.04.3/src/metadatajobbase.h kimap-19.12.3/src/metadatajobbase.h --- kimap-19.04.3/src/metadatajobbase.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/metadatajobbase.h 2020-02-16 08:58:48.000000000 +0000 @@ -36,10 +36,10 @@ * * Provides support for the IMAP METADATA extension; both the * final RFC version - * (RFC 5464) + * (RFC 5464) * and the older, incompatible draft version (known as ANNOTATEMORE) * (draft-daboo-imap-annotatemore-07). * * This class cannot be used directly, you must subclass it and reimplement diff -Nru kimap-19.04.3/src/myrightsjob.h kimap-19.12.3/src/myrightsjob.h --- kimap-19.04.3/src/myrightsjob.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/myrightsjob.h 2020-02-16 08:58:48.000000000 +0000 @@ -52,7 +52,7 @@ * * This job requires that the server supports the ACL * capability, defined in - * RFC 4314. + * RFC 4314. */ class KIMAP_EXPORT MyRightsJob : public AclJobBase { diff -Nru kimap-19.04.3/src/quotajobbase.h kimap-19.12.3/src/quotajobbase.h --- kimap-19.04.3/src/quotajobbase.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/quotajobbase.h 2020-02-16 08:58:48.000000000 +0000 @@ -35,7 +35,7 @@ * Base class for jobs that operate on mailbox quotas * * Provides support for the IMAP QUOTA extension, as defined by - * RFC 2087. + * RFC 2087. * * This class cannot be used directly, you must subclass it and reimplement * at least the doStart() method. diff -Nru kimap-19.04.3/src/rfccodecs.cpp kimap-19.12.3/src/rfccodecs.cpp --- kimap-19.04.3/src/rfccodecs.cpp 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/rfccodecs.cpp 2020-02-16 08:58:48.000000000 +0000 @@ -162,7 +162,7 @@ int len = src.length(); QByteArray result; result.reserve(2 * len); - for (unsigned int i = 0; i < len; i++) { + for (int i = 0; i < len; i++) { if (src[i] == '"' || src[i] == '\\') { result += '\\'; } diff -Nru kimap-19.04.3/src/session.cpp kimap-19.12.3/src/session.cpp --- kimap-19.04.3/src/session.cpp 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/session.cpp 2020-02-16 08:58:48.000000000 +0000 @@ -37,9 +37,9 @@ #include "sessionthread_p.h" #include "rfccodecs.h" -Q_DECLARE_METATYPE(KTcpSocket::SslVersion) +Q_DECLARE_METATYPE(QSsl::SslProtocol) Q_DECLARE_METATYPE(QSslSocket::SslMode) -static const int _kimap_sslVersionId = qRegisterMetaType(); +static const int _kimap_sslVersionId = qRegisterMetaType(); using namespace KIMAP; @@ -98,6 +98,11 @@ return d->thread->port(); } +void Session::setUseNetworkProxy(bool useProxy) +{ + d->thread->setUseNetworkProxy(useProxy); +} + Session::State Session::state() const { return d->state; @@ -143,7 +148,7 @@ jobRunning(false), currentJob(nullptr), tagCount(0), - sslVersion(KTcpSocket::UnknownSslVersion), + sslVersion(QSsl::UnknownProtocol), socketTimerInterval(30000) // By default timeouts on 30s { } @@ -402,7 +407,7 @@ restartSocketTimer(); } -void SessionPrivate::socketError(KTcpSocket::Error error) +void SessionPrivate::socketError(QAbstractSocket::SocketError error) { if (socketTimer.isActive()) { stopSocketTimer(); @@ -438,9 +443,9 @@ emit q->jobQueueSizeChanged(0); } -void SessionPrivate::startSsl(KTcpSocket::SslVersion version) +void SessionPrivate::startSsl(QSsl::SslProtocol protocol) { - thread->startSsl(version); + thread->startSsl(protocol); } QString Session::selectedMailBox() const @@ -448,17 +453,17 @@ return QString::fromUtf8(d->currentMailBox); } -void SessionPrivate::onEncryptionNegotiationResult(bool isEncrypted, KTcpSocket::SslVersion version) +void SessionPrivate::onEncryptionNegotiationResult(bool isEncrypted, QSsl::SslProtocol protocol) { if (isEncrypted) { - sslVersion = version; + sslVersion = protocol; } else { - sslVersion = KTcpSocket::UnknownSslVersion; + sslVersion = QSsl::UnknownProtocol; } emit encryptionNegotiationResult(isEncrypted); } -KTcpSocket::SslVersion SessionPrivate::negotiatedEncryption() const +QSsl::SslProtocol SessionPrivate::negotiatedEncryption() const { return sslVersion; } diff -Nru kimap-19.04.3/src/session.h kimap-19.12.3/src/session.h --- kimap-19.04.3/src/session.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/session.h 2020-02-16 08:58:48.000000000 +0000 @@ -91,6 +91,18 @@ */ Q_REQUIRED_RESULT QString selectedMailBox() const; + /** + * Sets whether the IMAP network connection should use the system proxy settings. + * + * @param useProxy @c true if the proxy is to be used + * The default is to not use the proxy. + * @since 5.11.41 + * + * @note If the session is currently connected to the IMAP server, calling this + * function will disconnect and reconnect to it with the changed proxy setting. + */ + void setUseNetworkProxy(bool useProxy); + Q_REQUIRED_RESULT int jobQueueSize() const; void close(); diff -Nru kimap-19.04.3/src/session_p.h kimap-19.12.3/src/session_p.h --- kimap-19.04.3/src/session_p.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/session_p.h 2020-02-16 08:58:48.000000000 +0000 @@ -23,12 +23,11 @@ #include "session.h" #include "sessionuiproxy.h" -#include - #include #include #include #include +#include class KJob; @@ -52,10 +51,10 @@ void addJob(Job *job); QByteArray sendCommand(const QByteArray &command, const QByteArray &args = QByteArray()); - void startSsl(KTcpSocket::SslVersion version); + void startSsl(QSsl::SslProtocol protocol); void sendData(const QByteArray &data); - KTcpSocket::SslVersion negotiatedEncryption() const; + QSsl::SslProtocol negotiatedEncryption() const; void setSocketTimeout(int ms); int socketTimeout() const; @@ -64,7 +63,7 @@ void encryptionNegotiationResult(bool); private Q_SLOTS: - void onEncryptionNegotiationResult(bool isEncrypted, KTcpSocket::SslVersion sslVersion); + void onEncryptionNegotiationResult(bool isEncrypted, QSsl::SslProtocol sslVersion); void onSocketTimeout(); void doStartNext(); @@ -74,7 +73,7 @@ void socketConnected(); void socketDisconnected(); - void socketError(KTcpSocket::Error); + void socketError(QAbstractSocket::SocketError error); void socketActivity(); void handleSslError(const KSslErrorUiData &errorData); @@ -112,7 +111,7 @@ QByteArray upcomingMailBox; quint16 tagCount; - KTcpSocket::SslVersion sslVersion; + QSsl::SslProtocol sslVersion; int socketTimerInterval = 0; QTimer socketTimer; diff -Nru kimap-19.04.3/src/sessionthread.cpp kimap-19.12.3/src/sessionthread.cpp --- kimap-19.04.3/src/sessionthread.cpp 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/sessionthread.cpp 2020-02-16 08:58:48.000000000 +0000 @@ -19,9 +19,12 @@ #include "sessionthread_p.h" +#include + #include #include - +#include +#include #include "kimap_debug.h" #include "imapstreamparser.h" @@ -29,15 +32,17 @@ using namespace KIMAP; -Q_DECLARE_METATYPE(KTcpSocket::Error) Q_DECLARE_METATYPE(KSslErrorUiData) -static const int _kimap_socketErrorTypeId = qRegisterMetaType(); + +namespace { +static const int _kimap_abstractSocketError = qRegisterMetaType(); static const int _kimap_sslErrorUiData = qRegisterMetaType(); +} SessionThread::SessionThread(const QString &hostName, quint16 port) : QObject(), m_hostName(hostName), m_port(port), - m_socket(nullptr), m_stream(nullptr), m_mutex(), - m_encryptedMode(false) + m_encryptedMode(false), + m_useProxy(false) { // Just like the Qt docs now recommend, for event-driven threads: // don't derive from QThread, create one directly and move the object to it. @@ -59,6 +64,12 @@ delete thread(); } +// Called in primary thread, passes setting to secondary thread +void SessionThread::setUseNetworkProxy(bool useProxy) +{ + QMetaObject::invokeMethod(this, [this, useProxy]() { setUseProxyInternal(useProxy); }, Qt::QueuedConnection); +} + // Called in primary thread void SessionThread::sendData(const QByteArray &payload) { @@ -160,8 +171,19 @@ if (m_socket == nullptr) { // threadQuit already called return; } - if (m_socket->state() != SessionSocket::ConnectedState && - m_socket->state() != SessionSocket::ConnectingState) { + if (m_socket->state() != QSslSocket::ConnectedState && + m_socket->state() != QSslSocket::ConnectingState) { + + QNetworkProxy proxy; + if (!m_useProxy) { + qCDebug(KIMAP_LOG) << "Connecting to IMAP server with no proxy"; + proxy.setType(QNetworkProxy::NoProxy); + } else { + qCDebug(KIMAP_LOG) << "Connecting to IMAP server using default system proxy"; + proxy.setType(QNetworkProxy::DefaultProxy); + } + m_socket->setProxy(proxy); + if (m_encryptedMode) { qCDebug(KIMAP_LOG) << "connectToHostEncrypted" << m_hostName << m_port; m_socket->connectToHostEncrypted(m_hostName, m_port); @@ -176,25 +198,23 @@ void SessionThread::threadInit() { Q_ASSERT(QThread::currentThread() == thread()); - m_socket = new SessionSocket; - m_stream = new ImapStreamParser(m_socket); - connect(m_socket, &QIODevice::readyRead, + m_socket = std::make_unique(); + m_stream = std::make_unique(m_socket.get()); + connect(m_socket.get(), &QIODevice::readyRead, this, &SessionThread::readMessage, Qt::QueuedConnection); // Delay the call to slotSocketDisconnected so that it finishes disconnecting before we call reconnect() - connect(m_socket, &KTcpSocket::disconnected, + connect(m_socket.get(), &QSslSocket::disconnected, this, &SessionThread::slotSocketDisconnected, Qt::QueuedConnection); - connect(m_socket, &KTcpSocket::connected, + connect(m_socket.get(), &QSslSocket::connected, this, &SessionThread::socketConnected); - connect(m_socket, SIGNAL(error(KTcpSocket::Error)), - this, SLOT(slotSocketError(KTcpSocket::Error))); - connect(m_socket, &QIODevice::bytesWritten, + connect(m_socket.get(), QOverload::of(&QAbstractSocket::error), + this, &SessionThread::slotSocketError); + connect(m_socket.get(), &QIODevice::bytesWritten, this, &SessionThread::socketActivity); - if (m_socket->metaObject()->indexOfSignal("encryptedBytesWritten(qint64)") > -1) { - connect(m_socket, &KTcpSocket::encryptedBytesWritten, // needs kdelibs > 4.8 - this, &SessionThread::socketActivity); - } - connect(m_socket, &QIODevice::readyRead, + connect(m_socket.get(), &QSslSocket::encryptedBytesWritten, + this, &SessionThread::socketActivity); + connect(m_socket.get(), &QIODevice::readyRead, this, &SessionThread::socketActivity); QMetaObject::invokeMethod(this, &SessionThread::reconnect, Qt::QueuedConnection); } @@ -203,30 +223,40 @@ void SessionThread::threadQuit() { Q_ASSERT(QThread::currentThread() == thread()); - delete m_stream; - m_stream = nullptr; - delete m_socket; - m_socket = nullptr; + m_stream.reset(); + m_socket.reset(); thread()->quit(); } +// Called in secondary thread +void SessionThread::setUseProxyInternal(bool useProxy) +{ + m_useProxy = useProxy; + if (m_socket != nullptr) { + if (m_socket->state() != QSslSocket::UnconnectedState) { + m_socket->disconnectFromHost(); + QMetaObject::invokeMethod(this, &SessionThread::reconnect, Qt::QueuedConnection); + } + } +} + // Called in primary thread -void SessionThread::startSsl(KTcpSocket::SslVersion version) +void SessionThread::startSsl(QSsl::SslProtocol protocol) { - QMetaObject::invokeMethod(this, [this, version]() { doStartSsl(version); }); + QMetaObject::invokeMethod(this, [this, protocol]() { doStartSsl(protocol); }); } // Called in secondary thread (via invokeMethod) -void SessionThread::doStartSsl(KTcpSocket::SslVersion version) +void SessionThread::doStartSsl(QSsl::SslProtocol protocol) { Q_ASSERT(QThread::currentThread() == thread()); if (!m_socket) { return; } - m_socket->setAdvertisedSslVersion(version); - m_socket->ignoreSslErrors(); - connect(m_socket, &KTcpSocket::encrypted, this, &SessionThread::sslConnected); + m_socket->setProtocol(protocol); + m_socket->ignoreSslErrors(); // Don't worry, errors are handled manually below + connect(m_socket.get(), &QSslSocket::encrypted, this, &SessionThread::sslConnected); m_socket->startClientEncryption(); } @@ -238,13 +268,12 @@ } // Called in secondary thread -void SessionThread::slotSocketError(KTcpSocket::Error error) +void SessionThread::slotSocketError(QAbstractSocket::SocketError error) { Q_ASSERT(QThread::currentThread() == thread()); if (!m_socket) { return; } - Q_UNUSED(error); // can be used for debugging emit socketError(error); } @@ -255,22 +284,21 @@ if (!m_socket) { return; } - KSslCipher cipher = m_socket->sessionCipher(); + QSslCipher cipher = m_socket->sessionCipher(); - if (!m_socket->sslErrors().isEmpty() || - m_socket->encryptionMode() != KTcpSocket::SslClientMode || - cipher.isNull() || cipher.usedBits() == 0) { + if (!m_socket->sslErrors().isEmpty() || !m_socket->isEncrypted() + || cipher.isNull() || cipher.usedBits() == 0) { qCDebug(KIMAP_LOG) << "Initial SSL handshake failed. cipher.isNull() is" << cipher.isNull() << ", cipher.usedBits() is" << cipher.usedBits() << ", the socket says:" << m_socket->errorString() << "and the list of SSL errors contains" << m_socket->sslErrors().count() << "items."; - KSslErrorUiData errorData(m_socket); + KSslErrorUiData errorData(m_socket.get()); emit sslError(errorData); } else { - qCDebug(KIMAP_LOG) << "TLS negotiation done."; + qCDebug(KIMAP_LOG) << "TLS negotiation done, the negotiated protocol is" << cipher.protocolString(); m_encryptedMode = true; - emit encryptionNegotiationResult(true, m_socket->negotiatedSslVersion()); + emit encryptionNegotiationResult(true, m_socket->sessionProtocol()); } } @@ -288,14 +316,14 @@ } if (response) { m_encryptedMode = true; - emit encryptionNegotiationResult(true, m_socket->negotiatedSslVersion()); + emit encryptionNegotiationResult(true, m_socket->sessionProtocol()); } else { m_encryptedMode = false; //reconnect in unencrypted mode, so new commands can be issued m_socket->disconnectFromHost(); m_socket->waitForDisconnected(); m_socket->connectToHost(m_hostName, m_port); - emit encryptionNegotiationResult(false, KTcpSocket::UnknownSslVersion); + emit encryptionNegotiationResult(false, QSsl::UnknownProtocol); } } diff -Nru kimap-19.04.3/src/sessionthread_p.h kimap-19.12.3/src/sessionthread_p.h --- kimap-19.04.3/src/sessionthread_p.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/sessionthread_p.h 2020-02-16 08:58:48.000000000 +0000 @@ -23,9 +23,11 @@ #include #include -#include +#include -typedef KTcpSocket SessionSocket; +#include + +class KSslErrorUiData; namespace KIMAP { @@ -50,20 +52,22 @@ return m_port; } + void setUseNetworkProxy(bool useProxy); + void sendData(const QByteArray &payload); public Q_SLOTS: void closeSocket(); - void startSsl(KTcpSocket::SslVersion version); + void startSsl(QSsl::SslProtocol protocol); void sslErrorHandlerResponse(bool result); Q_SIGNALS: void socketConnected(); void socketDisconnected(); void socketActivity(); - void socketError(KTcpSocket::Error); + void socketError(QAbstractSocket::SocketError); void responseReceived(const KIMAP::Response &response); - void encryptionNegotiationResult(bool, KTcpSocket::SslVersion); + void encryptionNegotiationResult(bool, QSsl::SslProtocol); void sslError(const KSslErrorUiData &); private Q_SLOTS: @@ -74,17 +78,18 @@ void writeDataQueue(); void sslConnected(); void doCloseSocket(); - void slotSocketError(KTcpSocket::Error); + void slotSocketError(QAbstractSocket::SocketError); void slotSocketDisconnected(); - void doStartSsl(KTcpSocket::SslVersion); + void doStartSsl(QSsl::SslProtocol); void doSslErrorHandlerResponse(bool result); + void setUseProxyInternal(bool useProxy); private: QString m_hostName; quint16 m_port; - SessionSocket *m_socket = nullptr; - ImapStreamParser *m_stream = nullptr; + std::unique_ptr m_socket; + std::unique_ptr m_stream; QQueue m_dataQueue; @@ -92,6 +97,7 @@ QMutex m_mutex; bool m_encryptedMode = false; + bool m_useProxy = false; }; } diff -Nru kimap-19.04.3/src/setacljob.h kimap-19.12.3/src/setacljob.h --- kimap-19.04.3/src/setacljob.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/setacljob.h 2020-02-16 08:58:48.000000000 +0000 @@ -39,7 +39,7 @@ * * This job requires that the server supports the ACL * capability, defined in - * RFC 4314. + * RFC 4314. */ class KIMAP_EXPORT SetAclJob : public AclJobBase { diff -Nru kimap-19.04.3/src/setmetadatajob.h kimap-19.12.3/src/setmetadatajob.h --- kimap-19.04.3/src/setmetadatajob.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/setmetadatajob.h 2020-02-16 08:58:48.000000000 +0000 @@ -36,10 +36,10 @@ * * Provides support for the IMAP METADATA extension; both the * final RFC version - * (RFC 5464) + * (RFC 5464) * and the older, incompatible draft version (known as ANNOTATEMORE) * (draft-daboo-imap-annotatemore-07). See setServerCompatibility(). * * Note that in Annotatemore mode, this job can only operate on diff -Nru kimap-19.04.3/src/setquotajob.h kimap-19.12.3/src/setquotajob.h --- kimap-19.04.3/src/setquotajob.h 2019-07-07 16:47:08.000000000 +0000 +++ kimap-19.12.3/src/setquotajob.h 2020-02-16 08:58:48.000000000 +0000 @@ -46,7 +46,7 @@ * * This job requires that the server supports the QUOTA * capability, defined in - * RFC 2087. + * RFC 2087. */ class KIMAP_EXPORT SetQuotaJob : public QuotaJobBase {