Hello community, here is the log from the commit of package kdepim-runtime for openSUSE:Factory checked in at 2017-05-22 10:40:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim-runtime" Mon May 22 10:40:12 2017 rev:23 rq:495933 version:17.04.1 Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim-runtime/kdepim-runtime.changes 2017-05-08 18:50:00.806334340 +0200 +++ /work/SRC/openSUSE:Factory/.kdepim-runtime.new/kdepim-runtime.changes 2017-05-22 10:40:13.570302206 +0200 @@ -1,0 +2,26 @@ +Wed May 17 20:36:12 CEST 2017 - [email protected] + +- Update to 17.04.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.04.1.php +- Changes since 17.04.0: + * Fix build with CMake 3.8. + * [IMAP] Fix migration to new Gmail authentication + * [IMAP] Disable the Gmail special cases when compiled without XOAUTH + * hide doc help item. + * [IMAP] Fix missing connect() when restarting IDLE job + * [IMAP] Fix IDLE support with GSSAPI authentication (kde#311456) +- Drop upstreamed patches: + * disable-gmail-when-compiled-without-xoauth.patch + * fix-idle-support-with-gssapi.patch + * fix-migration-to-new-gmail-authentication.patch + * fix-missing-connect-when-restarting-idle.patch + +------------------------------------------------------------------- +Tue May 9 09:02:31 UTC 2017 - [email protected] + +- Unconditionally obsolete kdepim4-runtime on all distributions, we + don't support kdepim4 any more + +------------------------------------------------------------------- Old: ---- disable-gmail-when-compiled-without-xoauth.patch fix-idle-support-with-gssapi.patch fix-migration-to-new-gmail-authentication.patch fix-missing-connect-when-restarting-idle.patch kdepim-runtime-17.04.0.tar.xz New: ---- kdepim-runtime-17.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-runtime.spec ++++++ --- /var/tmp/diff_new_pack.eYmtCH/_old 2017-05-22 10:40:15.202072129 +0200 +++ /var/tmp/diff_new_pack.eYmtCH/_new 2017-05-22 10:40:15.206071565 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: kdepim-runtime -Version: 17.04.0 +Version: 17.04.1 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) @@ -29,14 +29,6 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: kdepim-runtime-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch0: fix-migration-to-new-gmail-authentication.patch -# PATCH-FIX-UPSTREAM -Patch1: disable-gmail-when-compiled-without-xoauth.patch -# PATCH-FIX-UPSTREAM -Patch2: fix-missing-connect-when-restarting-idle.patch -# PATCH-FIX-UPSTREAM -Patch3: fix-idle-support-with-gssapi.patch BuildRequires: akonadi-calendar-devel >= %{_kapp_version} BuildRequires: akonadi-contact-devel >= %{_kapp_version} BuildRequires: akonadi-mime-devel >= %{_kapp_version} @@ -86,11 +78,7 @@ Obsoletes: kio-pimlibs < %{version} # It can only build on the same platforms as Qt Webengine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64 -%if 0%{?suse_version} > 1320 Obsoletes: kdepim4-runtime < %{version} -%else -Conflicts: kdepim4-runtime -%endif Recommends: %{name}-lang BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -103,10 +91,6 @@ %prep %setup -q -n kdepim-runtime-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build %cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} ++++++ kdepim-runtime-17.04.0.tar.xz -> kdepim-runtime-17.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/CMakeLists.txt new/kdepim-runtime-17.04.1/CMakeLists.txt --- old/kdepim-runtime-17.04.0/CMakeLists.txt 2017-04-14 02:24:17.000000000 +0200 +++ new/kdepim-runtime-17.04.1/CMakeLists.txt 2017-05-09 02:29:01.000000000 +0200 @@ -39,7 +39,7 @@ set(KDEPIM_RUNTIME_DEV_VERSION "") endif() -set(KDEPIM_RUNTIME_VERSION_NUMBER "5.5.0") +set(KDEPIM_RUNTIME_VERSION_NUMBER "5.5.1") set(KDEPIM_RUNTIME_VERSION "${KDEPIM_RUNTIME_VERSION_NUMBER}${KDEPIM_RUNTIME_DEV_VERSION}") configure_file(kdepim-runtime-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdepim-runtime-version.h @ONLY) @@ -63,25 +63,25 @@ set(KDEPIMRUNTIME_LIB_VERSION "${KDEPIM_RUNTIME_VERSION_NUMBER}") set(KDEPIMRUNTIME_LIB_SOVERSION "5") -set(AKONADI_VERSION "5.4.90") +set(AKONADI_VERSION "5.5.1") -set(KCONTACTS_LIB_VERSION "5.4.90") -set(KCALENDARCORE_LIB_VERSION "5.4.90") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.4.90") -set(KMAILTRANSPORT_LIB_VERSION "5.4.90") -set(CALENDARUTILS_LIB_VERSION "5.4.90") -set(KDAV_LIB_VERSION "5.4.90") -set(KIMAP_LIB_VERSION "5.4.90") -set(KMBOX_LIB_VERSION "5.4.90") -set(AKONADICALENDAR_LIB_VERSION "5.4.90") -set(KONTACTINTERFACE_LIB_VERSION "5.4.90") -set(AKONADIKALARM_LIB_VERSION "5.4.90") -set(KMIME_LIB_VERSION "5.4.90") -set(XMLRPCCLIENT_LIB_VERSION "5.4.90") -set(KCONTACTS_LIB_VERSION "5.4.90") -set(AKONADIMIME_LIB_VERSION "5.4.90") -set(AKONADICONTACT_LIB_VERSION "5.4.90") -set(AKONADINOTE_LIB_VERSION "5.4.90") +set(KCONTACTS_LIB_VERSION "5.5.1") +set(KCALENDARCORE_LIB_VERSION "5.5.1") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.5.1") +set(KMAILTRANSPORT_LIB_VERSION "5.5.1") +set(CALENDARUTILS_LIB_VERSION "5.5.1") +set(KDAV_LIB_VERSION "5.5.1") +set(KIMAP_LIB_VERSION "5.5.1") +set(KMBOX_LIB_VERSION "5.5.1") +set(AKONADICALENDAR_LIB_VERSION "5.5.1") +set(KONTACTINTERFACE_LIB_VERSION "5.5.1") +set(AKONADIKALARM_LIB_VERSION "5.5.1") +set(KMIME_LIB_VERSION "5.5.1") +set(XMLRPCCLIENT_LIB_VERSION "5.5.1") +set(KCONTACTS_LIB_VERSION "5.5.1") +set(AKONADIMIME_LIB_VERSION "5.5.1") +set(AKONADICONTACT_LIB_VERSION "5.5.1") +set(AKONADINOTE_LIB_VERSION "5.5.1") set( SHARED_MIME_INFO_MINIMUM_VERSION "0.40" ) @@ -140,7 +140,7 @@ ) # Extra package -find_package(KPimGAPI "5.4.90" CONFIG) +find_package(KPimGAPI "5.5.1" CONFIG) add_subdirectory(resources) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/agents/newmailnotifier/newmailnotifiersettingsdialog.cpp new/kdepim-runtime-17.04.1/agents/newmailnotifier/newmailnotifiersettingsdialog.cpp --- old/kdepim-runtime-17.04.0/agents/newmailnotifier/newmailnotifiersettingsdialog.cpp 2017-04-10 08:26:49.000000000 +0200 +++ new/kdepim-runtime-17.04.1/agents/newmailnotifier/newmailnotifiersettingsdialog.cpp 2017-05-06 05:19:42.000000000 +0200 @@ -166,6 +166,7 @@ i18nc("EMAIL OF TRANSLATORS", "Your emails")); KHelpMenu *helpMenu = new KHelpMenu(this, aboutData, true); + helpMenu->action(KHelpMenu::menuHelpContents)->setVisible(false); //Initialize menu QMenu *menu = helpMenu->menu(); helpMenu->action(KHelpMenu::menuAboutApp)->setIcon(QIcon::fromTheme(QStringLiteral("kmail"))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/plugins/autotests/CMakeLists.txt new/kdepim-runtime-17.04.1/plugins/autotests/CMakeLists.txt --- old/kdepim-runtime-17.04.0/plugins/autotests/CMakeLists.txt 2017-04-10 08:26:49.000000000 +0200 +++ new/kdepim-runtime-17.04.1/plugins/autotests/CMakeLists.txt 2017-05-06 05:19:42.000000000 +0200 @@ -11,7 +11,7 @@ ) # convenience macro to add akonadi qtestlib unit-tests -macro(add_akonadiplugin_test _source _libs _additionalSources) +macro(add_akonadiplugin_test _source _libs _additionalSources _target_included_directories) set(_test ${_source}) set(srcs ${_test} ${_additionalSources}) @@ -19,14 +19,16 @@ add_executable( ${_name} ${srcs} ) add_test( ${_name} ${_name} ) ecm_mark_as_test(akonadiplugin-${_name}) - - target_link_libraries(${_name} KF5::AkonadiCore KF5::AkonadiMime + if(NOT ${_target_included_directories} STREQUAL "") + target_include_directories(${_name} PRIVATE "$<BUILD_INTERFACE:$<TARGET_PROPERTY:${_target_included_directories},INCLUDE_DIRECTORIES>>") + endif() + target_link_libraries(${_name} KF5::AkonadiCore KF5::AkonadiMime Qt5::Test KF5::AkonadiPrivate KF5::I18n KF5::AkonadiPrivate ${_libs}) endmacro() # qtestlib unit tests -add_akonadiplugin_test(mailserializertest.cpp "KF5::Mime" "../akonadi_serializer_mail_debug.cpp") -add_akonadiplugin_test(mailserializerplugintest.cpp "KF5::Mime" "") -add_akonadiplugin_test(kcalcoreserializertest.cpp "KF5::CalendarCore" "") -add_akonadiplugin_test(addresseeserializertest.cpp "KF5::Contacts;KF5::AkonadiContact" "../akonadi_serializer_addressee.cpp") +add_akonadiplugin_test(mailserializertest.cpp "KF5::Mime" "../akonadi_serializer_mail_debug.cpp" "akonadi_serializer_mail") +add_akonadiplugin_test(mailserializerplugintest.cpp "KF5::Mime" "" "" ) +add_akonadiplugin_test(kcalcoreserializertest.cpp "KF5::CalendarCore" "" "" ) +add_akonadiplugin_test(addresseeserializertest.cpp "KF5::Contacts;KF5::AkonadiContact" "../akonadi_serializer_addressee.cpp" "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/ar/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/ar/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/ar/akonadi_imap_resource.po 2017-04-14 02:24:08.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/ar/akonadi_imap_resource.po 2017-05-09 02:28:52.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2016-11-17 18:53+0300\n" "Last-Translator: Safa Alfulaij <[email protected]>\n" "Language-Team: Arabic <[email protected]>\n" @@ -694,7 +694,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/ast/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/ast/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/ast/akonadi_imap_resource.po 2017-04-14 02:24:08.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/ast/akonadi_imap_resource.po 2017-05-09 02:28:53.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-02-04 18:32+0100\n" "Last-Translator: enolp <[email protected]>\n" "Language-Team: Asturian <[email protected]>\n" @@ -690,7 +690,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/bg/kio_pop3.po new/kdepim-runtime-17.04.1/po/bg/kio_pop3.po --- old/kdepim-runtime-17.04.0/po/bg/kio_pop3.po 2017-04-14 02:24:08.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/bg/kio_pop3.po 2017-05-09 02:28:53.000000000 +0200 @@ -2,7 +2,7 @@ # Bulgarian translation of KDE. # This file is licensed under the GPL. # -# $Id: kio_pop3.po 1475095 2016-11-19 20:01:24Z scripty $ +# $Id: kio_pop3.po 1488173 2017-04-27 20:38:03Z ltoscano $ # # Zlatko Popov <[email protected]>, 2006, 2007. # Yasen Pramatarov <[email protected]>, 2010. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/bs/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/bs/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/bs/akonadi_imap_resource.po 2017-04-14 02:24:08.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/bs/akonadi_imap_resource.po 2017-05-09 02:28:53.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdepim-runtime\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2015-02-04 15:19+0000\n" "Last-Translator: Samir Ribić <Unknown>\n" "Language-Team: Bosnian <[email protected]>\n" @@ -740,7 +740,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Nije moguće koristiti ovaj server.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Pretplata na serverskoj strani" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/ca/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/ca/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/ca/akonadi_imap_resource.po 2017-04-14 02:24:08.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/ca/akonadi_imap_resource.po 2017-05-09 02:28:53.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-09 08:52+0100\n" "Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" @@ -765,7 +765,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>No és possible usar aquest servidor.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Subscripció de la banda del servidor" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/ca@valencia/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/ca@valencia/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/ca@valencia/akonadi_imap_resource.po 2017-04-14 02:24:08.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/ca@valencia/akonadi_imap_resource.po 2017-05-09 02:28:54.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-09 08:52+0100\n" "Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" @@ -765,7 +765,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>No és possible usar este servidor.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Subscripció de la banda del servidor" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/cs/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/cs/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/cs/akonadi_imap_resource.po 2017-04-14 02:24:08.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/cs/akonadi_imap_resource.po 2017-05-09 02:28:54.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-02-21 12:37+0100\n" "Last-Translator: Vít Pelčák <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" @@ -720,7 +720,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Není možné použít tento server.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Přihlášení k odběru na serveru" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/da/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/da/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/da/akonadi_imap_resource.po 2017-04-14 02:24:09.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/da/akonadi_imap_resource.po 2017-05-09 02:28:54.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-03-04 15:03+0100\n" "Last-Translator: Martin Schlander <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" @@ -736,7 +736,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Det er ikke muligt at bruge denne server.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Abonnement på serversiden" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/de/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/de/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/de/akonadi_imap_resource.po 2017-04-14 02:24:09.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/de/akonadi_imap_resource.po 2017-05-09 02:28:54.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-03-26 14:41+0100\n" "Last-Translator: Burkhard Lück <[email protected]>\n" "Language-Team: German <[email protected]>\n" @@ -785,7 +785,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Es ist nicht möglich, diesen Server zu verwenden.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Serverseitiges Abonnement" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/el/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/el/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/el/akonadi_imap_resource.po 2017-04-14 02:24:09.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/el/akonadi_imap_resource.po 2017-05-09 02:28:54.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2016-05-24 16:35+0200\n" "Last-Translator: Petros Vidalis <[email protected]>\n" "Language-Team: Greek <[email protected]>\n" @@ -772,7 +772,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Δεν είναι δυνατή η χρήση αυτού του εξυπηρετητή.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Εγγραφή στον εξυπηρετητή" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/en_GB/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/en_GB/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/en_GB/akonadi_imap_resource.po 2017-04-14 02:24:09.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/en_GB/akonadi_imap_resource.po 2017-05-09 02:28:55.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-15 11:59+0000\n" "Last-Translator: Steve Allewell <[email protected]>\n" "Language-Team: English <[email protected]>\n" @@ -735,7 +735,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>It is not possible to use this server.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Serverside Subscription" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/eo/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/eo/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/eo/akonadi_imap_resource.po 2017-04-14 02:24:09.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/eo/akonadi_imap_resource.po 2017-05-09 02:28:55.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2009-11-15 12:06+0100\n" "Last-Translator: Axel Rousseau <[email protected]>\n" "Language-Team: esperanto <[email protected]>\n" @@ -694,7 +694,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, fuzzy, kde-format #| msgid "Subscription..." msgid "Serverside Subscription" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/es/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/es/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/es/akonadi_imap_resource.po 2017-04-14 02:24:10.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/es/akonadi_imap_resource.po 2017-05-09 02:28:55.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-21 23:09+0100\n" "Last-Translator: Javier Vinal <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" @@ -765,7 +765,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>No es posible usar este servidor.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Suscripción en el servidor" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/et/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/et/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/et/akonadi_imap_resource.po 2017-04-14 02:24:10.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/et/akonadi_imap_resource.po 2017-05-09 02:28:55.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2016-12-09 02:25+0200\n" "Last-Translator: Marek Laane <[email protected]>\n" "Language-Team: Estonian <[email protected]>\n" @@ -734,7 +734,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Seda serverit ei ole võimalik kasutada.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Serveripoolne tellimine" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/fi/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/fi/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/fi/akonadi_imap_resource.po 2017-04-14 02:24:10.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/fi/akonadi_imap_resource.po 2017-05-09 02:28:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2016-11-27 22:10+0200\n" "Last-Translator: Lasse Liehu <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" @@ -751,7 +751,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Tätä palvelinta ei ole mahdollista käyttää.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Palvelinpuolen tilaus" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/fr/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/fr/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/fr/akonadi_imap_resource.po 2017-04-14 02:24:10.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/fr/akonadi_imap_resource.po 2017-05-09 02:28:56.000000000 +0200 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2014-06-11 10:34+0200\n" "Last-Translator: Geoffray Levasseur <geoffray.levasseurbrandin@numericable." "fr>\n" @@ -788,7 +788,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Il n'est pas possible d'utiliser ce serveur.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Abonnement côté serveur" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/ga/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/ga/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/ga/akonadi_imap_resource.po 2017-04-14 02:24:11.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/ga/akonadi_imap_resource.po 2017-05-09 02:28:56.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2009-12-24 06:59-0500\n" "Last-Translator: Kevin Scannell <[email protected]>\n" "Language-Team: Irish <[email protected]>\n" @@ -718,7 +718,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Níorbh fhéidir an freastalaí seo a úsáid.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/gl/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/gl/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/gl/akonadi_imap_resource.po 2017-04-14 02:24:11.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/gl/akonadi_imap_resource.po 2017-05-09 02:28:56.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-14 18:07+0100\n" "Last-Translator: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail." "com>\n" @@ -772,7 +772,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Non é posíbel empregar este servidor.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Subscrición do lado do servidor" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/hu/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/hu/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/hu/akonadi_imap_resource.po 2017-04-14 02:24:11.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/hu/akonadi_imap_resource.po 2017-05-09 02:28:56.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2014-09-04 16:12+0200\n" "Last-Translator: Kristóf Kiszel <[email protected]>\n" "Language-Team: Hungarian <[email protected]>\n" @@ -763,7 +763,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Nem lehet használni ezt a kiszolgálót.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Kiszolgáló oldali feliratkozás" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/ia/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/ia/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/ia/akonadi_imap_resource.po 2017-04-14 02:24:11.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/ia/akonadi_imap_resource.po 2017-05-09 02:28:56.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2015-06-12 10:22+0200\n" "Last-Translator: Giovanni Sora <[email protected]>\n" "Language-Team: Interlingua <[email protected]>\n" @@ -753,7 +753,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Il non es possibile usar iste servitor.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Subscriptiones de latere servitor (Serverside)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/it/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/it/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/it/akonadi_imap_resource.po 2017-04-14 02:24:12.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/it/akonadi_imap_resource.po 2017-05-09 02:28:57.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-14 13:50+0100\n" "Last-Translator: Luigi Toscano <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" @@ -761,7 +761,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Non è possibile usare questo server.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Sottoscrizioni lato server" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/it/docs/kioslave5/pop3/index.docbook new/kdepim-runtime-17.04.1/po/it/docs/kioslave5/pop3/index.docbook --- old/kdepim-runtime-17.04.0/po/it/docs/kioslave5/pop3/index.docbook 2017-04-14 02:24:17.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/it/docs/kioslave5/pop3/index.docbook 1970-01-01 01:00:00.000000000 +0100 @@ -1,39 +0,0 @@ -<?xml version="1.0" ?> -<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" -"dtd/kdedbx45.dtd" [ -<!ENTITY % addindex "IGNORE"> -<!ENTITY % Italian "INCLUDE" -> <!-- change language only here --> -]> - -<article lang="&language;" id="pop3"> -<title ->pop3 / pop3s</title> -<articleinfo> -<authorgroup> -<author ->&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author> -<othercredit role="translator" -><firstname ->Luciano</firstname -> <surname ->Montanaro</surname -> <affiliation -><address -><email ->[email protected]</email -></address -></affiliation -> <contrib ->Traduzione del documento</contrib -></othercredit -> -</authorgroup> -</articleinfo> -<para ->Il Protocollo dell'ufficio Postale (Post Office Protocol, o POP3) permette alla stazione di lavoro dell'utente di accedere ai messaggi di un server di posta. </para> - -<para ->POP3S è il protocollo POP3 cifrato con SSL. </para> - -</article> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/ja/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/ja/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/ja/akonadi_imap_resource.po 2017-04-14 02:24:12.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/ja/akonadi_imap_resource.po 2017-05-09 02:28:57.000000000 +0200 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2010-10-22 23:55-0700\n" "Last-Translator: Fumiaki Okushi <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" @@ -768,7 +768,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt>このサーバを使うことは不可能です。</qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, fuzzy, kde-format #| msgid "Serverside Subscription..." msgid "Serverside Subscription" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/kk/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/kk/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/kk/akonadi_imap_resource.po 2017-04-14 02:24:12.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/kk/akonadi_imap_resource.po 2017-05-09 02:28:57.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2013-11-18 04:31+0600\n" "Last-Translator: Sairan Kikkarin <[email protected]>\n" "Language-Team: Kazakh <[email protected]>\n" @@ -741,7 +741,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Бұл серверді пайдалануы мүмкін емес.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Сервер жақ жазылуы" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/km/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/km/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/km/akonadi_imap_resource.po 2017-04-14 02:24:12.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/km/akonadi_imap_resource.po 2017-05-09 02:28:57.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2012-06-11 16:03+0700\n" "Last-Translator: sutha <[email protected]>\n" "Language-Team: Khmer <support@khmeros>\n" @@ -739,7 +739,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>វាមិនអាចប្រើម៉ាស៊ីនបម្រើនេះបានទេ ។</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, fuzzy, kde-format #| msgid "Serverside Subscription..." msgid "Serverside Subscription" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/ko/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/ko/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/ko/akonadi_imap_resource.po 2017-04-14 02:24:12.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/ko/akonadi_imap_resource.po 2017-05-09 02:28:57.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-22 20:37+0100\n" "Last-Translator: Shinjo Park <[email protected]>\n" "Language-Team: Korean <[email protected]>\n" @@ -730,7 +730,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>이 서버를 사용할 수 없습니다.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "서버 측 구독" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/lt/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/lt/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/lt/akonadi_imap_resource.po 2017-04-14 02:24:12.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/lt/akonadi_imap_resource.po 2017-05-09 02:28:57.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2015-12-29 20:05+0200\n" "Last-Translator: Mindaugas Baranauskas <[email protected]>\n" "Language-Team: lt <[email protected]>\n" @@ -745,7 +745,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Neįmanoma naudoti šį serverį.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Serverio pusės prenumerata" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/lv/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/lv/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/lv/akonadi_imap_resource.po 2017-04-14 02:24:12.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/lv/akonadi_imap_resource.po 2017-05-09 02:28:57.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2012-07-07 22:46+0300\n" "Last-Translator: Einars Sprugis <[email protected]>\n" "Language-Team: Latvian <[email protected]>\n" @@ -753,7 +753,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Nav iespējams izmantot šo serveri.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, fuzzy, kde-format #| msgid "Serverside Subscription..." msgid "Serverside Subscription" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/mr/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/mr/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/mr/akonadi_imap_resource.po 2017-04-14 02:24:13.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/mr/akonadi_imap_resource.po 2017-05-09 02:28:57.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2013-03-13 11:09+0530\n" "Last-Translator: Chetan Khona <[email protected]>\n" "Language-Team: Marathi <[email protected]>\n" @@ -690,7 +690,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/nb/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/nb/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/nb/akonadi_imap_resource.po 2017-04-14 02:24:13.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/nb/akonadi_imap_resource.po 2017-05-09 02:28:58.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-01-24 09:39+0100\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2014-09-19 22:53+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -583,7 +583,7 @@ "Kan ikke bruke IMAP-tjener %1, noen obligatoriske muligheter mangler: %2. Be " "din systemadministrator om å oppgradere tjeneren." -#: sessionpool.cpp:538 +#: sessionpool.cpp:542 #, kde-format msgid "Disconnected during login." msgstr "" @@ -731,7 +731,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Det er ikke mulig å bruke denne tjeneren.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Abonnement på tjenersiden" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/nb/akonadi_maildir_resource.po new/kdepim-runtime-17.04.1/po/nb/akonadi_maildir_resource.po --- old/kdepim-runtime-17.04.0/po/nb/akonadi_maildir_resource.po 2017-04-14 02:24:13.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/nb/akonadi_maildir_resource.po 2017-05-09 02:28:58.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-01-24 09:39+0100\n" +"POT-Creation-Date: 2017-04-11 11:04+0200\n" "PO-Revision-Date: 2014-03-16 17:58+0100\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -54,12 +54,12 @@ msgid "The selected path does not exist." msgstr "Den valgte stien finnes ikke." -#: libmaildir/maildir.cpp:256 libmaildir/maildir.cpp:261 +#: libmaildir/maildir.cpp:254 libmaildir/maildir.cpp:259 #, kde-format msgid "Error opening %1; this folder is missing." msgstr "Klarte ikke å åpne %1: denne mappa finnes ikke." -#: libmaildir/maildir.cpp:266 +#: libmaildir/maildir.cpp:264 #, kde-format msgid "" "Error opening %1; either this is not a valid maildir folder, or you do not " @@ -68,30 +68,30 @@ "Klarte ikke å åpne %1: enten er dette ikke en gyldig maildir-mappe, eller du " "har ikke tilstrekkelige tilgangsrettigheter." -#: libmaildir/maildir.cpp:493 libmaildir/maildir.cpp:514 -#: libmaildir/maildir.cpp:532 libmaildir/maildir.cpp:552 -#: libmaildir/maildir.cpp:571 libmaildir/maildir.cpp:595 -#: libmaildir/maildir.cpp:670 libmaildir/maildir.cpp:820 +#: libmaildir/maildir.cpp:491 libmaildir/maildir.cpp:512 +#: libmaildir/maildir.cpp:530 libmaildir/maildir.cpp:550 +#: libmaildir/maildir.cpp:569 libmaildir/maildir.cpp:593 +#: libmaildir/maildir.cpp:668 libmaildir/maildir.cpp:818 #, kde-format msgid "Cannot locate mail file %1." msgstr "Kan ikke finne e-postfila %1." -#: libmaildir/maildir.cpp:499 libmaildir/maildir.cpp:520 +#: libmaildir/maildir.cpp:497 libmaildir/maildir.cpp:518 #, kde-format msgid "Cannot open mail file %1." msgstr "Kan ikke åpne e-postfila %1" -#: libmaildir/maildir.cpp:603 libmaildir/maildir.cpp:630 +#: libmaildir/maildir.cpp:601 libmaildir/maildir.cpp:628 #, kde-format msgid "Cannot write to mail file %1." msgstr "Kan ikke skrive til e-postfila %1." -#: libmaildir/maildir.cpp:644 +#: libmaildir/maildir.cpp:642 #, kde-format msgid "Failed to create mail file %1. The error was: %2" msgstr "Klarte ikke opprette e-postfila %1. Feilen var: %2" -#: libmaildir/maildir.cpp:738 +#: libmaildir/maildir.cpp:736 #, kde-format msgid "Failed to update the file name %1 to %2 on the disk. The error was: %3." msgstr "Klarte ikke oppdatere filnavnet %1 til %2 på disken. Feilen var: %3." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/nb/akonadi_newmailnotifier_agent.po new/kdepim-runtime-17.04.1/po/nb/akonadi_newmailnotifier_agent.po --- old/kdepim-runtime-17.04.0/po/nb/akonadi_newmailnotifier_agent.po 2017-04-14 02:24:13.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/nb/akonadi_newmailnotifier_agent.po 2017-05-09 02:28:58.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-01-23 03:51+0100\n" +"POT-Creation-Date: 2017-03-17 02:45+0100\n" "PO-Revision-Date: 2014-09-19 22:55+0200\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -40,22 +40,22 @@ msgid "A message was received from %f" msgstr "" -#: newmailnotifierselectcollectionwidget.cpp:106 +#: newmailnotifierselectcollectionwidget.cpp:105 #, kde-format msgid "Select which folders to monitor for new message notifications:" msgstr "Velg hvilke mapper som skal overvåkes for å varsle om nye meldinger:" -#: newmailnotifierselectcollectionwidget.cpp:134 +#: newmailnotifierselectcollectionwidget.cpp:133 #, kde-format msgid "Search..." msgstr "Søk …" -#: newmailnotifierselectcollectionwidget.cpp:151 +#: newmailnotifierselectcollectionwidget.cpp:150 #, kde-format msgid "&Select All" msgstr "&Velg alle" -#: newmailnotifierselectcollectionwidget.cpp:155 +#: newmailnotifierselectcollectionwidget.cpp:154 #, kde-format msgid "&Unselect All" msgstr "Frav&elg alle" @@ -151,8 +151,8 @@ #: newmailnotifiersettingsdialog.cpp:159 #, kde-format -msgid "Notifies about new mail." -msgstr "Varsler om ny e-post." +msgid "Notify about new mails." +msgstr "" #: newmailnotifiersettingsdialog.cpp:161 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/nds/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/nds/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/nds/akonadi_imap_resource.po 2017-04-14 02:24:13.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/nds/akonadi_imap_resource.po 2017-05-09 02:28:58.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2014-07-13 18:25+0200\n" "Last-Translator: Sönke Dibbern <[email protected]>\n" "Language-Team: Low Saxon <[email protected]>\n" @@ -759,7 +759,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Disse Server lett sik nich bruken.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Bestellen op Server-Siet" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/nl/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/nl/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/nl/akonadi_imap_resource.po 2017-04-14 02:24:13.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/nl/akonadi_imap_resource.po 2017-05-09 02:28:58.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-09 14:04+0100\n" "Last-Translator: Freek de Kruijf <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" @@ -761,7 +761,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Het is niet mogelijk deze server te gebruiken.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Inschrijven aan de kant van de server" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/nn/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/nn/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/nn/akonadi_imap_resource.po 2017-04-14 02:24:14.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/nn/akonadi_imap_resource.po 2017-05-09 02:28:58.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-01-24 09:39+0100\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2010-04-20 21:54+0200\n" "Last-Translator: Eirik U. Birkeland <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" @@ -568,7 +568,7 @@ "IMAP-tenaren %1 kan ikkje brukast, då han manglar støtte for nokre viktige " "funksjonar: %2. Du bør be systemansvarleg om å oppgradera tenaren." -#: sessionpool.cpp:538 +#: sessionpool.cpp:542 #, kde-format msgid "Disconnected during login." msgstr "" @@ -711,7 +711,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Denne tenaren kan ikkje brukast.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/nn/akonadi_maildir_resource.po new/kdepim-runtime-17.04.1/po/nn/akonadi_maildir_resource.po --- old/kdepim-runtime-17.04.0/po/nn/akonadi_maildir_resource.po 2017-04-14 02:24:14.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/nn/akonadi_maildir_resource.po 2017-05-09 02:28:58.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: akonadi_maildir_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-01-24 09:39+0100\n" +"POT-Creation-Date: 2017-04-11 11:04+0200\n" "PO-Revision-Date: 2010-04-20 22:09+0200\n" "Last-Translator: Eirik U. Birkeland <[email protected]>\n" "Language-Team: Norwegian Nynorsk <[email protected]>\n" @@ -56,12 +56,12 @@ msgid "The selected path does not exist." msgstr "Den valde adressa finst ikkje." -#: libmaildir/maildir.cpp:256 libmaildir/maildir.cpp:261 +#: libmaildir/maildir.cpp:254 libmaildir/maildir.cpp:259 #, kde-format msgid "Error opening %1; this folder is missing." msgstr "Feil ved opning av %1. Mappa manglar." -#: libmaildir/maildir.cpp:266 +#: libmaildir/maildir.cpp:264 #, kde-format msgid "" "Error opening %1; either this is not a valid maildir folder, or you do not " @@ -70,30 +70,30 @@ "Feil ved opning av %1. Mappa kan vera ei ugyldig maildir-mappe, eller så har " "du ikkje tilstrekkelege tilgangsløyve." -#: libmaildir/maildir.cpp:493 libmaildir/maildir.cpp:514 -#: libmaildir/maildir.cpp:532 libmaildir/maildir.cpp:552 -#: libmaildir/maildir.cpp:571 libmaildir/maildir.cpp:595 -#: libmaildir/maildir.cpp:670 libmaildir/maildir.cpp:820 +#: libmaildir/maildir.cpp:491 libmaildir/maildir.cpp:512 +#: libmaildir/maildir.cpp:530 libmaildir/maildir.cpp:550 +#: libmaildir/maildir.cpp:569 libmaildir/maildir.cpp:593 +#: libmaildir/maildir.cpp:668 libmaildir/maildir.cpp:818 #, kde-format msgid "Cannot locate mail file %1." msgstr "" -#: libmaildir/maildir.cpp:499 libmaildir/maildir.cpp:520 +#: libmaildir/maildir.cpp:497 libmaildir/maildir.cpp:518 #, kde-format msgid "Cannot open mail file %1." msgstr "" -#: libmaildir/maildir.cpp:603 libmaildir/maildir.cpp:630 +#: libmaildir/maildir.cpp:601 libmaildir/maildir.cpp:628 #, kde-format msgid "Cannot write to mail file %1." msgstr "" -#: libmaildir/maildir.cpp:644 +#: libmaildir/maildir.cpp:642 #, kde-format msgid "Failed to create mail file %1. The error was: %2" msgstr "" -#: libmaildir/maildir.cpp:738 +#: libmaildir/maildir.cpp:736 #, kde-format msgid "Failed to update the file name %1 to %2 on the disk. The error was: %3." msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/pa/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/pa/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/pa/akonadi_imap_resource.po 2017-04-14 02:24:14.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/pa/akonadi_imap_resource.po 2017-05-09 02:28:58.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2010-01-16 08:40+0530\n" "Last-Translator: A S Alam <[email protected]>\n" "Language-Team: ਪੰਜਾਬੀ <[email protected]>\n" @@ -699,7 +699,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, fuzzy, kde-format #| msgid "Enable Subscriptions?" msgid "Serverside Subscription" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/pl/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/pl/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/pl/akonadi_imap_resource.po 2017-04-14 02:24:14.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/pl/akonadi_imap_resource.po 2017-05-09 02:28:58.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-29 07:46+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" @@ -751,7 +751,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Użycie tego serwera jest niemożliwe.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Subskrypcja po stronie serwera..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/pl/kio_pop3.po new/kdepim-runtime-17.04.1/po/pl/kio_pop3.po --- old/kdepim-runtime-17.04.0/po/pl/kio_pop3.po 2017-04-14 02:24:14.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/pl/kio_pop3.po 2017-05-09 02:28:58.000000000 +0200 @@ -1,5 +1,5 @@ # translation of kio_pop3.po to -# Version: $Revision: 1475158 $ +# Version: $Revision: 1488173 $ # Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # # Michał Rudolf <[email protected]>, 2002. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/pt/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/pt/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/pt/akonadi_imap_resource.po 2017-04-14 02:24:14.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/pt/akonadi_imap_resource.po 2017-05-09 02:28:58.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-09 09:49+0000\n" "Last-Translator: José Nuno Coelho Pires <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" @@ -756,7 +756,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Não é possível usar este servidor.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Subscrição no Servidor" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/pt_BR/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/pt_BR/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/pt_BR/akonadi_imap_resource.po 2017-04-14 02:24:14.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/pt_BR/akonadi_imap_resource.po 2017-05-09 02:28:58.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2016-09-12 10:59-0300\n" "Last-Translator: Luiz Fernando Ranghetti <[email protected]>\n" "Language-Team: Portuguese <[email protected]>\n" @@ -751,7 +751,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Não é possível usar este servidor.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Inscrição no servidor" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/ro/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/ro/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/ro/akonadi_imap_resource.po 2017-04-14 02:24:15.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/ro/akonadi_imap_resource.po 2017-05-09 02:28:58.000000000 +0200 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2011-10-14 04:24+0300\n" "Last-Translator: Sergiu Bivol <[email protected]>\n" "Language-Team: Romanian <[email protected]>\n" @@ -738,7 +738,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Utilizarea acestui server este imposibilă.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, fuzzy, kde-format #| msgid "Serverside Subscription..." msgid "Serverside Subscription" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/ru/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/ru/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/ru/akonadi_imap_resource.po 2017-04-14 02:24:15.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/ru/akonadi_imap_resource.po 2017-05-09 02:28:59.000000000 +0200 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2016-10-02 01:43+0300\n" "Last-Translator: Alexander Potashev <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" @@ -752,7 +752,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Невозможно использовать этот сервер.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Подписка на сервере" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/sk/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/sk/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/sk/akonadi_imap_resource.po 2017-04-14 02:24:15.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/sk/akonadi_imap_resource.po 2017-05-09 02:28:59.000000000 +0200 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-02-04 11:28+0100\n" "Last-Translator: Roman Paholik <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" @@ -731,7 +731,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Nie je možné použiť tento server.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Podpísanie na strane servera" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/sk/akonadi_newmailnotifier_agent.po new/kdepim-runtime-17.04.1/po/sk/akonadi_newmailnotifier_agent.po --- old/kdepim-runtime-17.04.0/po/sk/akonadi_newmailnotifier_agent.po 2017-04-14 02:24:15.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/sk/akonadi_newmailnotifier_agent.po 2017-05-09 02:28:59.000000000 +0200 @@ -6,7 +6,7 @@ "Project-Id-Version: akonadi_newmailnotifier_agent\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-03-17 02:45+0100\n" -"PO-Revision-Date: 2017-01-29 11:34+0100\n" +"PO-Revision-Date: 2017-04-16 20:07+0100\n" "Last-Translator: Roman Paholik <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" "Language: sk\n" @@ -148,8 +148,7 @@ msgstr "Agent upozornenia na novú poštu" #: newmailnotifiersettingsdialog.cpp:159 -#, fuzzy, kde-format -#| msgid "Notifies about new mail." +#, kde-format msgid "Notify about new mails." msgstr "Upozorní na novú poštu." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/sl/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/sl/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/sl/akonadi_imap_resource.po 2017-04-14 02:24:15.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/sl/akonadi_imap_resource.po 2017-05-09 02:28:59.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-02-15 17:59+0100\n" "Last-Translator: Andrej Mernik <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" @@ -752,7 +752,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Tega strežnika ni mogoče uporabiti.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Naročnina na strani strežnika" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/sl/kio_pop3.po new/kdepim-runtime-17.04.1/po/sl/kio_pop3.po --- old/kdepim-runtime-17.04.0/po/sl/kio_pop3.po 2017-04-14 02:24:15.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/sl/kio_pop3.po 2017-05-09 02:28:59.000000000 +0200 @@ -2,7 +2,7 @@ # Translation of kio_pop3.po to Slovenian # SLOVENIAN TRANSLATION OF K DESKTOP ENVIRONMENT. # Copyright (C) 2001, 2003, 2004, 2007 Free Software Foundation, Inc. -# $Id: kio_pop3.po 1475166 2016-11-19 20:25:06Z scripty $ +# $Id: kio_pop3.po 1488173 2017-04-27 20:38:03Z ltoscano $ # $Source$ # # Andrej Vernekar <[email protected]>, 2001, 2007, 2011. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/sr/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/sr/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/sr/akonadi_imap_resource.po 2017-04-14 02:24:15.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/sr/akonadi_imap_resource.po 2017-05-09 02:28:59.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-01-24 09:39+0100\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-14 19:23+0100\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -583,7 +583,7 @@ "Не могу да користим ИМАП сервер %1 јер нема неке неопходне способности: %2. " "Замолите систем-администратора да надогради сервер." -#: sessionpool.cpp:538 +#: sessionpool.cpp:542 #, kde-format msgid "Disconnected during login." msgstr "Прекинута веза током пријављивања." @@ -747,7 +747,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Овај сервер не може да се користи.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Претплата на страни сервера" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/sr/akonadi_maildir_resource.po new/kdepim-runtime-17.04.1/po/sr/akonadi_maildir_resource.po --- old/kdepim-runtime-17.04.0/po/sr/akonadi_maildir_resource.po 2017-04-14 02:24:15.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/sr/akonadi_maildir_resource.po 2017-05-09 02:28:59.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: akonadi_maildir_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-01-24 09:39+0100\n" +"POT-Creation-Date: 2017-04-11 11:04+0200\n" "PO-Revision-Date: 2015-09-05 11:38+0200\n" "Last-Translator: Chusslove Illich <[email protected]>\n" "Language-Team: Serbian <[email protected]>\n" @@ -54,12 +54,12 @@ msgid "The selected path does not exist." msgstr "Изабрана путања не постоји." -#: libmaildir/maildir.cpp:256 libmaildir/maildir.cpp:261 +#: libmaildir/maildir.cpp:254 libmaildir/maildir.cpp:259 #, kde-format msgid "Error opening %1; this folder is missing." msgstr "Грешка при отварању %1 — нема фасцикле." -#: libmaildir/maildir.cpp:266 +#: libmaildir/maildir.cpp:264 #, kde-format msgid "" "Error opening %1; either this is not a valid maildir folder, or you do not " @@ -68,30 +68,30 @@ "Грешка при отварању %1 — или није добра мејлдир фасцикла, или немате довољне " "дозволе приступа." -#: libmaildir/maildir.cpp:493 libmaildir/maildir.cpp:514 -#: libmaildir/maildir.cpp:532 libmaildir/maildir.cpp:552 -#: libmaildir/maildir.cpp:571 libmaildir/maildir.cpp:595 -#: libmaildir/maildir.cpp:670 libmaildir/maildir.cpp:820 +#: libmaildir/maildir.cpp:491 libmaildir/maildir.cpp:512 +#: libmaildir/maildir.cpp:530 libmaildir/maildir.cpp:550 +#: libmaildir/maildir.cpp:569 libmaildir/maildir.cpp:593 +#: libmaildir/maildir.cpp:668 libmaildir/maildir.cpp:818 #, kde-format msgid "Cannot locate mail file %1." msgstr "Не могу да нађем поштански фајл %1." -#: libmaildir/maildir.cpp:499 libmaildir/maildir.cpp:520 +#: libmaildir/maildir.cpp:497 libmaildir/maildir.cpp:518 #, kde-format msgid "Cannot open mail file %1." msgstr "Не могу да отворим поштански фајл %1." -#: libmaildir/maildir.cpp:603 libmaildir/maildir.cpp:630 +#: libmaildir/maildir.cpp:601 libmaildir/maildir.cpp:628 #, kde-format msgid "Cannot write to mail file %1." msgstr "Не могу да пишем у поштански фајл %1." -#: libmaildir/maildir.cpp:644 +#: libmaildir/maildir.cpp:642 #, kde-format msgid "Failed to create mail file %1. The error was: %2" msgstr "Не могу да направим поштански фајл %1. Грешка је: %2" -#: libmaildir/maildir.cpp:738 +#: libmaildir/maildir.cpp:736 #, kde-format msgid "Failed to update the file name %1 to %2 on the disk. The error was: %3." msgstr "Не могу да ажурирам име фајла %1 на %2 на диску. Грешка је: %3." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/sv/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/sv/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/sv/akonadi_imap_resource.po 2017-04-14 02:24:15.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/sv/akonadi_imap_resource.po 2017-05-09 02:28:59.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-09 18:31+0100\n" "Last-Translator: Stefan Asserhäll <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" @@ -742,7 +742,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Det är inte möjligt att använda den här servern.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Prenumeration på serversidan" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/tr/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/tr/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/tr/akonadi_imap_resource.po 2017-04-14 02:24:15.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/tr/akonadi_imap_resource.po 2017-05-09 02:29:00.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2015-09-08 14:26+0000\n" "Last-Translator: Necdet <[email protected]>\n" "Language-Team: Turkish <[email protected]>\n" @@ -743,7 +743,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Bu sunucunun kullanılması olanaksız.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Sunucuya Abonelik" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/ug/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/ug/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/ug/akonadi_imap_resource.po 2017-04-14 02:24:16.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/ug/akonadi_imap_resource.po 2017-05-09 02:29:00.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji <[email protected]>\n" "Language-Team: Uyghur Computer Science Association <[email protected]>\n" @@ -696,7 +696,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/uk/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/uk/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/uk/akonadi_imap_resource.po 2017-04-14 02:24:16.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/uk/akonadi_imap_resource.po 2017-05-09 02:29:00.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-09 13:19+0200\n" "Last-Translator: Yuri Chornoivan <[email protected]>\n" "Language-Team: Ukrainian <[email protected]>\n" @@ -766,7 +766,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>Використання цього сервера неможливе.</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "Підписка на сервері" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/zh_CN/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/zh_CN/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/zh_CN/akonadi_imap_resource.po 2017-04-14 02:24:16.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/zh_CN/akonadi_imap_resource.po 2017-05-09 02:29:00.000000000 +0200 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-01-10 23:28+0200\n" "Last-Translator: Guo Yunhe <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" @@ -722,7 +722,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>无法使用此服务器。</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "服务器端订阅" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/po/zh_TW/akonadi_imap_resource.po new/kdepim-runtime-17.04.1/po/zh_TW/akonadi_imap_resource.po --- old/kdepim-runtime-17.04.0/po/zh_TW/akonadi_imap_resource.po 2017-04-14 02:24:16.000000000 +0200 +++ new/kdepim-runtime-17.04.1/po/zh_TW/akonadi_imap_resource.po 2017-05-09 02:29:00.000000000 +0200 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: akonadi_imap_resource\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-04-09 04:38+0200\n" +"POT-Creation-Date: 2017-04-23 04:34+0200\n" "PO-Revision-Date: 2017-03-25 17:47+0800\n" "Last-Translator: Jeff Huang <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" @@ -718,7 +718,7 @@ msgid "<qt><b>It is not possible to use this server.</b></qt>" msgstr "<qt><b>無法使用此伺服器。</b></qt>" -#: setupserver.cpp:657 +#: setupserver.cpp:660 #, kde-format msgid "Serverside Subscription" msgstr "伺服器端訂閱" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/resources/imap/imapidlemanager.cpp new/kdepim-runtime-17.04.1/resources/imap/imapidlemanager.cpp --- old/kdepim-runtime-17.04.0/resources/imap/imapidlemanager.cpp 2017-04-10 08:26:49.000000000 +0200 +++ new/kdepim-runtime-17.04.1/resources/imap/imapidlemanager.cpp 2017-05-06 05:19:42.000000000 +0200 @@ -97,6 +97,11 @@ connect(m_pool, &SessionPool::connectionLost, this, &ImapIdleManager::onConnectionLost); connect(m_pool, &SessionPool::disconnectDone, this, &ImapIdleManager::onPoolDisconnect); + startIdle(); +} + +void ImapIdleManager::startIdle() +{ KIMAP::SelectJob *select = new KIMAP::SelectJob(m_session); select->setMailBox(m_state->mailBoxForCollection(m_state->collection())); connect(select, &KIMAP::SelectJob::result, this, &ImapIdleManager::onSelectDone); @@ -142,10 +147,7 @@ m_idle = nullptr; if (m_session) { qCDebug(IMAPRESOURCE_LOG) << "Restarting the IDLE session!"; - m_idle = new KIMAP::IdleJob(m_session); - connect(m_idle.data(), &KIMAP::IdleJob::mailBoxStats, this, &ImapIdleManager::onStatsReceived); - connect(m_idle.data(), &KIMAP::IdleJob::result, this, &ImapIdleManager::onIdleStopped); - m_idle->start(); + startIdle(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/resources/imap/imapidlemanager.h new/kdepim-runtime-17.04.1/resources/imap/imapidlemanager.h --- old/kdepim-runtime-17.04.0/resources/imap/imapidlemanager.h 2017-04-10 08:26:49.000000000 +0200 +++ new/kdepim-runtime-17.04.1/resources/imap/imapidlemanager.h 2017-05-06 05:19:42.000000000 +0200 @@ -69,6 +69,8 @@ void reconnect(); private: + void startIdle(); + qint64 m_sessionRequestId; SessionPool *m_pool; KIMAP::Session *m_session; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/resources/imap/imapresourcebase.cpp new/kdepim-runtime-17.04.1/resources/imap/imapresourcebase.cpp --- old/kdepim-runtime-17.04.0/resources/imap/imapresourcebase.cpp 2017-04-10 08:26:49.000000000 +0200 +++ new/kdepim-runtime-17.04.1/resources/imap/imapresourcebase.cpp 2017-05-06 05:19:42.000000000 +0200 @@ -587,7 +587,9 @@ } //Without password we don't even have to try - if (settings()->password().isEmpty()) { + if (m_pool->account()->authenticationMode() != KIMAP::LoginJob::GSSAPI && + settings()->password().isEmpty()) + { return; } @@ -630,6 +632,8 @@ if (!fetch->collections().isEmpty()) { delete m_idle; m_idle = new ImapIdleManager(createResourceState(TaskArguments(fetch->collections().at(0))), m_pool, this); + } else { + qCWarning(IMAPRESOURCE_LOG) << "Failed to retrieve IDLE collection: no such collection"; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/resources/imap/settings.cpp new/kdepim-runtime-17.04.1/resources/imap/settings.cpp --- old/kdepim-runtime-17.04.0/resources/imap/settings.cpp 2017-04-10 08:26:49.000000000 +0200 +++ new/kdepim-runtime-17.04.1/resources/imap/settings.cpp 2017-05-06 05:19:42.000000000 +0200 @@ -23,6 +23,7 @@ #include "imapaccount.h" #include "utils.h" +#include "config.h" #include <kwallet.h> using KWallet::Wallet; @@ -78,6 +79,17 @@ { load(); +#ifdef WITH_GMAIL_XOAUTH2 + // Make sure that Gmail configuration is correctly migrated even if the user + // did not open the configuration dialog + if (Utils::isGmail(imapServer())) { + setImapPort(993); + setSafety(QStringLiteral("SSL")); + setAuthentication(MailTransport::Transport::EnumAuthenticationType::XOAUTH2); + save(); + } +#endif + new SettingsAdaptor(this); QDBusConnection::sessionBus().registerObject(QStringLiteral("/Settings"), this, QDBusConnection::ExportAdaptors | QDBusConnection::ExportScriptableContents); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-runtime-17.04.0/resources/imap/setupserver.cpp new/kdepim-runtime-17.04.1/resources/imap/setupserver.cpp --- old/kdepim-runtime-17.04.0/resources/imap/setupserver.cpp 2017-04-10 08:26:49.000000000 +0200 +++ new/kdepim-runtime-17.04.1/resources/imap/setupserver.cpp 2017-05-06 05:19:42.000000000 +0200 @@ -569,10 +569,12 @@ m_serverTest = nullptr; slotSafetyChanged(); +#ifdef WITH_GMAIL_XOAUTH2 // do not use imapConnectionPossible, as the data is not yet saved. const bool isGmail = Utils::isGmail(m_ui->imapServer->text()); m_ui->testButton->setEnabled(!isGmail /* TODO && Global::connectionPossible() || m_ui->imapServer->text() == "localhost"*/); +#endif } void SetupServer::slotEnableWidgets() @@ -594,6 +596,7 @@ void SetupServer::slotSafetyChanged() { +#ifdef WITH_GMAIL_XOAUTH2 if (m_serverTest == nullptr) { const bool isGmail = Utils::isGmail(m_ui->imapServer->text()); qCDebug(IMAPRESOURCE_LOG) << "serverTest null"; @@ -604,7 +607,7 @@ m_ui->authenticationCombo->setEnabled(!isGmail); return; } - +#endif QVector<int> protocols; switch (m_ui->safeImapGroup->checkedId()) { @@ -704,13 +707,16 @@ addAuthenticationItem(combo, MailTransport::Transport::EnumAuthenticationType::NTLM); addAuthenticationItem(combo, MailTransport::Transport::EnumAuthenticationType::GSSAPI); addAuthenticationItem(combo, MailTransport::Transport::EnumAuthenticationType::ANONYMOUS); +#ifdef WITH_GMAIL_XOAUTH2 if (Utils::isGmail(m_ui->imapServer->text())) { addAuthenticationItem(combo, MailTransport::Transport::EnumAuthenticationType::XOAUTH2); } +#endif } void SetupServer::slotServerChanged() { +#ifdef WITH_GMAIL_XOAUTH2 const bool isGmail = Utils::isGmail(m_ui->imapServer->text()); const bool wasGmail = !m_ui->password->isEnabled(); @@ -733,4 +739,5 @@ setCurrentAuthMode(m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::XOAUTH2); } m_ui->authenticationCombo->setEnabled(!isGmail); +#endif }
