diff -Nru akonadi-mime-19.04.3/akonadi-mimeprivate_export.h.in akonadi-mime-19.12.3/akonadi-mimeprivate_export.h.in
--- akonadi-mime-19.04.3/akonadi-mimeprivate_export.h.in	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/akonadi-mimeprivate_export.h.in	2020-02-16 09:00:26.000000000 +0000
@@ -1,3 +1,3 @@
 
-#include "akonadi-kmime_export.h"
-#define AKONADI_KMIME_TEST_EXPORT @AKONADI_KMIME_TEST_EXPORT@
+#include "akonadi-mime_export.h"
+#define AKONADI_MIME_TEST_EXPORT @AKONADI_MIME_TEST_EXPORT@
diff -Nru akonadi-mime-19.04.3/autotests/benchmarker/maildir/maildirfetchallheaders.cpp akonadi-mime-19.12.3/autotests/benchmarker/maildir/maildirfetchallheaders.cpp
--- akonadi-mime-19.04.3/autotests/benchmarker/maildir/maildirfetchallheaders.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/autotests/benchmarker/maildir/maildirfetchallheaders.cpp	2020-02-16 09:00:26.000000000 +0000
@@ -51,7 +51,8 @@
         ifj->fetchScope().fetchPayloadPart(MessagePart::Envelope);
         ifj->exec();
         QString a;
-        foreach (const Item &item, ifj->items()) {
+        const auto items = ifj->items();
+        for (const Item &item : items) {
             a = item.payload<KMime::Message::Ptr>()->subject()->asUnicodeString();
         }
     }
diff -Nru akonadi-mime-19.04.3/autotests/benchmarker/maildir/maildirfetchunreadheaders.cpp akonadi-mime-19.12.3/autotests/benchmarker/maildir/maildirfetchunreadheaders.cpp
--- akonadi-mime-19.04.3/autotests/benchmarker/maildir/maildirfetchunreadheaders.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/autotests/benchmarker/maildir/maildirfetchunreadheaders.cpp	2020-02-16 09:00:26.000000000 +0000
@@ -51,7 +51,8 @@
         ifj->fetchScope().fetchPayloadPart(MessagePart::Envelope);
         ifj->exec();
         QString a;
-        foreach (const Item &item, ifj->items()) {
+        const auto items = ifj->items();
+        for (const Item &item : items) {
             // filter read messages
             if (!item.hasFlag("\\SEEN")) {
                 a = item.payload<KMime::Message::Ptr>()->subject()->asUnicodeString();
diff -Nru akonadi-mime-19.04.3/autotests/benchmarker/maildir/maildirremovereadmessages.cpp akonadi-mime-19.12.3/autotests/benchmarker/maildir/maildirremovereadmessages.cpp
--- akonadi-mime-19.04.3/autotests/benchmarker/maildir/maildirremovereadmessages.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/autotests/benchmarker/maildir/maildirremovereadmessages.cpp	2020-02-16 09:00:26.000000000 +0000
@@ -45,7 +45,8 @@
     for (const Collection &collection : list4) {
         ItemFetchJob *ifj = new ItemFetchJob(collection, this);
         ifj->exec();
-        foreach (const Item &item, ifj->items()) {
+        const auto items = ifj->items();
+        for (const Item &item : items) {
             // delete read messages
             if (item.hasFlag("\\SEEN")) {
                 ItemDeleteJob *idj = new ItemDeleteJob(item, this);
diff -Nru akonadi-mime-19.04.3/autotests/benchmarker/maketest.h akonadi-mime-19.12.3/autotests/benchmarker/maketest.h
--- akonadi-mime-19.04.3/autotests/benchmarker/maketest.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/autotests/benchmarker/maketest.h	2020-02-16 09:00:26.000000000 +0000
@@ -24,7 +24,7 @@
 #include <agentmanager.h>
 #include <job.h>
 
-#include <QTime>
+#include <QElapsedTimer>
 
 class MakeTest : public QObject
 {
@@ -40,7 +40,7 @@
 protected:
     Akonadi::AgentInstance currentInstance;
     QString currentAccount;
-    QTime timer;
+    QElapsedTimer timer;
     bool done;
     void removeCollections();
     void removeResource();
diff -Nru akonadi-mime-19.04.3/autotests/CMakeLists.txt akonadi-mime-19.12.3/autotests/CMakeLists.txt
--- akonadi-mime-19.04.3/autotests/CMakeLists.txt	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/autotests/CMakeLists.txt	2020-02-16 09:00:26.000000000 +0000
@@ -11,46 +11,19 @@
     ${CMAKE_BINARY_DIR}/serializers
 )
 
+# for racetest
+set(requester_exe_string "QLatin1String( \\\"${CMAKE_CURRENT_BINARY_DIR}/requester\\\" )" )
+add_definitions( -DREQUESTER_EXE="${requester_exe_string}" )
+
+#macro(add_akonadi_isolated_test _source)
+#  kconfig_add_kcfg_files( _srcList ../src/specialmailcollectionssettings.kcfgc )
+
+### TODO: add the necessary API in SpecialCollections
+#add_akonadi_isolated_test(SOURCE localfolderstest.cpp LINK_LIBRARIES "KF5::ConfigGui;KF5::AkonadiMime;KF5::I18n")
+#add_akonadi_isolated_test(SOURCE localfoldersrequestjobtest.cpp LINK_LIBRARIES "KF5::ConfigGui;KF5::AkonadiMime;KF5::I18n")
 
-macro(add_akonadi_isolated_test _source)
-  get_filename_component(_targetName ${_source} NAME_WE)
-  set(_srcList ${_source} )
-  kconfig_add_kcfg_files( _srcList ../src/specialmailcollectionssettings.kcfgc )
-
-  add_executable(${_targetName} ${_srcList})
-  target_link_libraries(${_targetName}
-    Qt5::Test
-    KF5::Mime
-    KF5::AkonadiMime
-    Qt5::Widgets
-  )
-
-  # based on kde4_add_unit_test
-  if (WIN32)
-    get_target_property( _loc ${_targetName} LOCATION )
-    set(_executable ${_loc}.bat)
-  else()
-    set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_targetName})
-  endif()
-  if (UNIX)
-    set(_executable ${_executable}.shell)
-  endif()
-
-  find_program(_testrunner akonaditest)
-
-  if (KDEPIMLIBS_RUN_ISOLATED_TESTS)
-    add_test( akonadikmime-${_targetName} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/unittestenv/config.xml ${_executable} )
-  endif()
-endmacro()
-
-
-if (KDEPIMLIBS_RUN_KDEPIMRUNTIME_ISOLATED_TESTS)
-  add_akonadi_isolated_test( localfolderstest.cpp )
-  add_akonadi_isolated_test( localfoldersrequestjobtest.cpp )
-  add_akonadi_isolated_test( racetest.cpp )
-  add_akonadi_isolated_test(collectionjobtest.cpp)
-
-endif()
+# TODO: debug and fix this test
+#add_akonadi_isolated_test(racetest.cpp)
 
 add_subdirectory(benchmarker)
 
diff -Nru akonadi-mime-19.04.3/autotests/collectionjobtest.cpp akonadi-mime-19.12.3/autotests/collectionjobtest.cpp
--- akonadi-mime-19.04.3/autotests/collectionjobtest.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/autotests/collectionjobtest.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,901 +0,0 @@
-/*
-    Copyright (c) 2006 Volker Krause <vkrause@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "collectionjobtest.h"
-
-#include <sys/types.h>
-
-#include <qtest_akonadi.h>
-#include "test_utils.h"
-#include "testattribute.h"
-
-#include "agentmanager.h"
-#include "agentinstance.h"
-#include "attributefactory.h"
-#include "cachepolicy.h"
-#include "collection.h"
-#include "collectioncreatejob.h"
-#include "collectiondeletejob.h"
-#include "collectionfetchjob.h"
-#include "collectionmodifyjob.h"
-#include "collectionselectjob_p.h"
-#include "collectionstatistics.h"
-#include "collectionstatisticsjob.h"
-#include "collectionpathresolver.h"
-#include "collectionutils.h"
-#include "control.h"
-#include "item.h"
-#include "kmime/messageparts.h"
-#include "resourceselectjob_p.h"
-#include "collectionfetchscope.h"
-
-using namespace Akonadi;
-
-QTEST_AKONADIMAIN(CollectionJobTest)
-
-void CollectionJobTest::initTestCase()
-{
-    qRegisterMetaType<Akonadi::Collection::List>();
-    AttributeFactory::registerAttribute<TestAttribute>();
-    AkonadiTest::checkTestIsIsolated();
-    Control::start();
-    AkonadiTest::setAllResourcesOffline();
-}
-
-static Collection findCol(const Collection::List &list, const QString &name)
-{
-    foreach (const Collection &col, list) {
-        if (col.name() == name) {
-            return col;
-        }
-    }
-    return Collection();
-}
-
-// list compare which ignores the order
-template<class T> static void compareLists(const QList<T> &l1, const QList<T> &l2)
-{
-    QCOMPARE(l1.count(), l2.count());
-    foreach (const T entry, l1) {
-        QVERIFY(l2.contains(entry));
-    }
-}
-
-template<typename T> static T *extractAttribute(QList<Attribute *> attrs)
-{
-    T dummy;
-    foreach (Attribute *attr, attrs) {
-        if (attr->type() == dummy.type()) {
-            return dynamic_cast<T *>(attr);
-        }
-    }
-    return 0;
-}
-
-static Collection::Id res1ColId = 6; // -1;
-static Collection::Id res2ColId = 7; //-1;
-static Collection::Id res3ColId = -1;
-static Collection::Id searchColId = -1;
-
-void CollectionJobTest::testTopLevelList()
-{
-    // non-recursive top-level list
-    CollectionFetchJob *job = new CollectionFetchJob(Collection::root(), CollectionFetchJob::FirstLevel);
-    AKVERIFYEXEC(job);
-    Collection::List list = job->collections();
-
-    // check if everything is there and has the correct types and attributes
-    QCOMPARE(list.count(), 4);
-    Collection col;
-
-    col = findCol(list, "res1");
-    QVERIFY(col.isValid());
-    res1ColId = col.id(); // for the next test
-    QVERIFY(res1ColId > 0);
-    QVERIFY(CollectionUtils::isResource(col));
-    QCOMPARE(col.parentCollection(), Collection::root());
-    QCOMPARE(col.resource(), QStringLiteral("akonadi_knut_resource_0"));
-
-    QVERIFY(findCol(list, "res2").isValid());
-    res2ColId = findCol(list, "res2").id();
-    QVERIFY(res2ColId > 0);
-    QVERIFY(findCol(list, "res3").isValid());
-    res3ColId = findCol(list, "res3").id();
-    QVERIFY(res3ColId > 0);
-
-    col = findCol(list, "Search");
-    searchColId = col.id();
-    QVERIFY(col.isValid());
-    QVERIFY(CollectionUtils::isVirtualParent(col));
-    QCOMPARE(col.resource(), QStringLiteral("akonadi_search_resource"));
-}
-
-void CollectionJobTest::testFolderList()
-{
-    // recursive list of physical folders
-    CollectionFetchJob *job = new CollectionFetchJob(Collection(res1ColId), CollectionFetchJob::Recursive);
-    QSignalSpy spy(job, SIGNAL(collectionsReceived(Akonadi::Collection::List)));
-    QVERIFY(spy.isValid());
-    AKVERIFYEXEC(job);
-    Collection::List list = job->collections();
-
-    int count = 0;
-    for (int i = 0; i < spy.count(); ++i) {
-        Collection::List l = spy[i][0].value<Akonadi::Collection::List>();
-        for (int j = 0; j < l.count(); ++j) {
-            QVERIFY(list.count() > count + j);
-            QCOMPARE(list[count + j].id(), l[j].id());
-        }
-        count += l.count();
-    }
-    QCOMPARE(count, list.count());
-
-    // check if everything is there
-    QCOMPARE(list.count(), 4);
-    Collection col;
-    QStringList contentTypes;
-
-    col = findCol(list, "foo");
-    QVERIFY(col.isValid());
-    QCOMPARE(col.parentCollection().id(), res1ColId);
-    QVERIFY(CollectionUtils::isFolder(col));
-    contentTypes << "message/rfc822" << "text/calendar" << "text/directory"
-                 << "application/octet-stream" << "inode/directory";
-    compareLists(col.contentMimeTypes(), contentTypes);
-
-    QVERIFY(findCol(list, "bar").isValid());
-    QCOMPARE(findCol(list, "bar").parentCollection(), col);
-    QVERIFY(findCol(list, "bla").isValid());
-}
-
-class ResultSignalTester : public QObject
-{
-    Q_OBJECT
-public:
-    QStringList receivedSignals;
-public Q_SLOTS:
-    void onCollectionsReceived(const Akonadi::Collection::List &)
-    {
-        receivedSignals << QLatin1String("collectionsReceived");
-    }
-
-    void onCollectionRetrievalDone(KJob *)
-    {
-        receivedSignals << QLatin1String("result");
-    }
-};
-
-void CollectionJobTest::testSignalOrder()
-{
-    Akonadi::Collection::List toFetch;
-    toFetch << Collection(res1ColId);
-    toFetch << Collection(res2ColId);
-    CollectionFetchJob *job = new CollectionFetchJob(toFetch, CollectionFetchJob::Recursive);
-    ResultSignalTester spy;
-    connect(job, &CollectionFetchJob::collectionsReceived, &spy, &ResultSignalTester::onCollectionsReceived);
-    connect(job, &CollectionFetchJob::result, &spy, &ResultSignalTester::onCollectionRetrievalDone);
-    AKVERIFYEXEC(job);
-
-    QCOMPARE(spy.receivedSignals.size(), 2);
-    QCOMPARE(spy.receivedSignals.at(0), QLatin1String("collectionsReceived"));
-    QCOMPARE(spy.receivedSignals.at(1), QLatin1String("result"));
-}
-
-void CollectionJobTest::testNonRecursiveFolderList()
-{
-    CollectionFetchJob *job = new CollectionFetchJob(Collection(res1ColId), CollectionFetchJob::Base);
-    AKVERIFYEXEC(job);
-    Collection::List list = job->collections();
-
-    QCOMPARE(list.count(), 1);
-    QVERIFY(findCol(list, "res1").isValid());
-}
-
-void CollectionJobTest::testEmptyFolderList()
-{
-    CollectionFetchJob *job = new CollectionFetchJob(Collection(res3ColId), CollectionFetchJob::FirstLevel);
-    AKVERIFYEXEC(job);
-    Collection::List list = job->collections();
-
-    QCOMPARE(list.count(), 0);
-}
-
-void CollectionJobTest::testSearchFolderList()
-{
-    CollectionFetchJob *job = new CollectionFetchJob(Collection(searchColId), CollectionFetchJob::FirstLevel);
-    AKVERIFYEXEC(job);
-    Collection::List list = job->collections();
-
-    QCOMPARE(list.count(), 0);
-}
-
-void CollectionJobTest::testResourceFolderList()
-{
-    // non-existing resource
-    CollectionFetchJob *job = new CollectionFetchJob(Collection::root(), CollectionFetchJob::FirstLevel);
-    job->fetchScope().setResource("i_dont_exist");
-    QVERIFY(!job->exec());
-
-    // recursive listing of all collections of an existing resource
-    job = new CollectionFetchJob(Collection::root(), CollectionFetchJob::Recursive);
-    job->fetchScope().setResource("akonadi_knut_resource_0");
-    AKVERIFYEXEC(job);
-
-    Collection::List list = job->collections();
-    QCOMPARE(list.count(), 5);
-    QVERIFY(findCol(list, "res1").isValid());
-    QVERIFY(findCol(list, "foo").isValid());
-    QVERIFY(findCol(list, "bar").isValid());
-    QVERIFY(findCol(list, "bla").isValid());
-    int fooId = findCol(list, "foo").id();
-
-    // limited listing of a resource
-    job = new CollectionFetchJob(Collection(fooId), CollectionFetchJob::Recursive);
-    job->fetchScope().setResource("akonadi_knut_resource_0");
-    AKVERIFYEXEC(job);
-
-    list = job->collections();
-    QCOMPARE(list.count(), 3);
-    QVERIFY(findCol(list, "bar").isValid());
-    QVERIFY(findCol(list, "bla").isValid());
-}
-
-void CollectionJobTest::testMimeTypeFilter()
-{
-    CollectionFetchJob *job = new CollectionFetchJob(Collection::root(), CollectionFetchJob::Recursive);
-    job->fetchScope().setContentMimeTypes(QStringList() << "message/rfc822");
-    AKVERIFYEXEC(job);
-
-    Collection::List list = job->collections();
-    QCOMPARE(list.count(), 2);
-    QVERIFY(findCol(list, "res1").isValid());
-    QVERIFY(findCol(list, "foo").isValid());
-    int fooId = findCol(list, "foo").id();
-
-    // limited listing of a resource
-    job = new CollectionFetchJob(Collection(fooId), CollectionFetchJob::Recursive);
-    job->fetchScope().setContentMimeTypes(QStringList() << "message/rfc822");
-    AKVERIFYEXEC(job);
-
-    list = job->collections();
-    QCOMPARE(list.count(), 0);
-
-    // non-existing mimetype
-    job = new CollectionFetchJob(Collection::root(), CollectionFetchJob::Recursive, this);
-    job->fetchScope().setContentMimeTypes(QStringList() << "something/non-existing");
-    AKVERIFYEXEC(job);
-    QCOMPARE(job->collections().size(), 0);
-}
-
-void CollectionJobTest::testCreateDeleteFolder_data()
-{
-    QTest::addColumn<Collection>("collection");
-    QTest::addColumn<bool>("creatable");
-
-    Collection col;
-    QTest::newRow("empty") << col << false;
-    col.setName("new folder");
-    col.parentCollection().setId(res3ColId);
-    QTest::newRow("simple") << col << true;
-
-    col.parentCollection().setId(res3ColId);
-    col.setName("foo");
-    QTest::newRow("existing in different resource") << col << true;
-
-    col.setName("mail folder");
-    QStringList mimeTypes;
-    mimeTypes << "inode/directory" << "message/rfc822";
-    col.setContentMimeTypes(mimeTypes);
-    col.setRemoteId("remote id");
-    CachePolicy policy;
-    policy.setInheritFromParent(false);
-    policy.setIntervalCheckTime(60);
-    policy.setLocalParts(QStringList(MessagePart::Envelope));
-    policy.setSyncOnDemand(true);
-    policy.setCacheTimeout(120);
-    col.setCachePolicy(policy);
-    QTest::newRow("complex") << col << true;
-
-    col = Collection();
-    col.setName("New Folder");
-    col.parentCollection().setId(searchColId);
-    QTest::newRow("search folder") << col << false;
-
-    col.parentCollection().setId(res2ColId);
-    col.setName("foo2");
-    QTest::newRow("already existing") << col << false;
-
-    col.parentCollection().setId(res2ColId);   // Sibling of collection 'foo2'
-    col.setName("foo2 ");
-    QTest::newRow("name of an sibling with an additional ending space") << col << true;
-
-    col.setName("Bla");
-    col.parentCollection().setId(2);
-    QTest::newRow("already existing with different case") << col << true;
-
-    CollectionPathResolver *resolver = new CollectionPathResolver("res2/foo2", this);
-    AKVERIFYEXEC(resolver);
-    col.parentCollection().setId(resolver->collection());
-    col.setName("new folder");
-    QTest::newRow("parent noinferior") << col << false;
-
-    col.parentCollection().setId(INT_MAX);
-    QTest::newRow("missing parent") << col << false;
-
-    col = Collection();
-    col.setName("rid parent");
-    col.parentCollection().setRemoteId("8");
-    QTest::newRow("rid parent") << col << false;   // missing resource context
-}
-
-void CollectionJobTest::testCreateDeleteFolder()
-{
-    QFETCH(Collection, collection);
-    QFETCH(bool, creatable);
-
-    CollectionCreateJob *createJob = new CollectionCreateJob(collection, this);
-    QCOMPARE(createJob->exec(), creatable);
-    if (!creatable) {
-        return;
-    }
-
-    Collection createdCol = createJob->collection();
-    QVERIFY(createdCol.isValid());
-    QCOMPARE(createdCol.name(), collection.name());
-    QCOMPARE(createdCol.parentCollection(), collection.parentCollection());
-    QCOMPARE(createdCol.remoteId(), collection.remoteId());
-    QCOMPARE(createdCol.cachePolicy(), collection.cachePolicy());
-
-    CollectionFetchJob *listJob = new CollectionFetchJob(collection.parentCollection(), CollectionFetchJob::FirstLevel, this);
-    AKVERIFYEXEC(listJob);
-    Collection listedCol = findCol(listJob->collections(), collection.name());
-    QCOMPARE(listedCol, createdCol);
-    QCOMPARE(listedCol.remoteId(), collection.remoteId());
-    QCOMPARE(listedCol.cachePolicy(), collection.cachePolicy());
-
-    // fetch parent to compare inherited collection properties
-    Collection parentCol = Collection::root();
-    if (collection.parentCollection().isValid()) {
-        CollectionFetchJob *listJob = new CollectionFetchJob(collection.parentCollection(), CollectionFetchJob::Base, this);
-        AKVERIFYEXEC(listJob);
-        QCOMPARE(listJob->collections().count(), 1);
-        parentCol = listJob->collections().first();
-    }
-
-    if (collection.contentMimeTypes().isEmpty()) {
-        compareLists(listedCol.contentMimeTypes(), parentCol.contentMimeTypes());
-    } else {
-        compareLists(listedCol.contentMimeTypes(), collection.contentMimeTypes());
-    }
-
-    if (collection.resource().isEmpty()) {
-        QCOMPARE(listedCol.resource(), parentCol.resource());
-    } else {
-        QCOMPARE(listedCol.resource(), collection.resource());
-    }
-
-    CollectionDeleteJob *delJob = new CollectionDeleteJob(createdCol, this);
-    AKVERIFYEXEC(delJob);
-
-    listJob = new CollectionFetchJob(collection.parentCollection(), CollectionFetchJob::FirstLevel, this);
-    AKVERIFYEXEC(listJob);
-    QVERIFY(!findCol(listJob->collections(), collection.name()).isValid());
-}
-
-void CollectionJobTest::testIllegalDeleteFolder()
-{
-    // non-existing folder
-    CollectionDeleteJob *del = new CollectionDeleteJob(Collection(INT_MAX), this);
-    QVERIFY(!del->exec());
-
-    // root
-    del = new CollectionDeleteJob(Collection::root(), this);
-    QVERIFY(!del->exec());
-}
-
-void CollectionJobTest::testStatistics()
-{
-    // empty folder
-    CollectionStatisticsJob *statistics
-        = new CollectionStatisticsJob(Collection(res1ColId), this);
-    AKVERIFYEXEC(statistics);
-
-    CollectionStatistics s = statistics->statistics();
-    QCOMPARE(s.count(), 0ll);
-    QCOMPARE(s.unreadCount(), 0ll);
-
-    // folder with attributes and content
-    CollectionPathResolver *resolver = new CollectionPathResolver("res1/foo", this);
-    AKVERIFYEXEC(resolver);
-    statistics = new CollectionStatisticsJob(Collection(resolver->collection()), this);
-    AKVERIFYEXEC(statistics);
-
-    s = statistics->statistics();
-    QCOMPARE(s.count(), 15ll);
-    QCOMPARE(s.unreadCount(), 14ll);
-}
-
-void CollectionJobTest::testModify_data()
-{
-    QTest::addColumn<qint64>("uid");
-    QTest::addColumn<QString>("rid");
-
-    QTest::newRow("uid") << collectionIdFromPath("res1/foo") << QString();
-    QTest::newRow("rid") << -1ll << QString("10");
-}
-
-#define RESET_COLLECTION_ID \
-    col.setId(uid); \
-    if (!rid.isEmpty()) col.setRemoteId(rid)
-
-void CollectionJobTest::testModify()
-{
-    QFETCH(qint64, uid);
-    QFETCH(QString, rid);
-
-    if (!rid.isEmpty()) {
-        ResourceSelectJob *rjob = new ResourceSelectJob("akonadi_knut_resource_0");
-        AKVERIFYEXEC(rjob);
-    }
-
-    QStringList reference;
-    reference << "text/calendar" << "text/directory" << "message/rfc822" << "application/octet-stream" << "inode/directory";
-
-    Collection col;
-    RESET_COLLECTION_ID;
-
-    // test noop modify
-    CollectionModifyJob *mod = new CollectionModifyJob(col, this);
-    AKVERIFYEXEC(mod);
-
-    CollectionFetchJob *ljob = new CollectionFetchJob(col, CollectionFetchJob::Base, this);
-    AKVERIFYEXEC(ljob);
-    QCOMPARE(ljob->collections().count(), 1);
-    col = ljob->collections().first();
-    compareLists(col.contentMimeTypes(), reference);
-
-    // test clearing content types
-    RESET_COLLECTION_ID;
-    col.setContentMimeTypes(QStringList());
-    mod = new CollectionModifyJob(col, this);
-    AKVERIFYEXEC(mod);
-
-    ljob = new CollectionFetchJob(col, CollectionFetchJob::Base, this);
-    AKVERIFYEXEC(ljob);
-    QCOMPARE(ljob->collections().count(), 1);
-    col = ljob->collections().first();
-    QVERIFY(col.contentMimeTypes().isEmpty());
-
-    // test setting contnet types
-    RESET_COLLECTION_ID;
-    col.setContentMimeTypes(reference);
-    mod = new CollectionModifyJob(col, this);
-    AKVERIFYEXEC(mod);
-
-    ljob = new CollectionFetchJob(col, CollectionFetchJob::Base, this);
-    AKVERIFYEXEC(ljob);
-    QCOMPARE(ljob->collections().count(), 1);
-    col = ljob->collections().first();
-    compareLists(col.contentMimeTypes(), reference);
-
-    // add attribute
-    RESET_COLLECTION_ID;
-    col.attribute<TestAttribute>(Collection::AddIfMissing)->data = "new";
-    mod = new CollectionModifyJob(col, this);
-    AKVERIFYEXEC(mod);
-
-    ljob = new CollectionFetchJob(col, CollectionFetchJob::Base, this);
-    AKVERIFYEXEC(ljob);
-    QVERIFY(ljob->collections().first().hasAttribute<TestAttribute>());
-    QCOMPARE(ljob->collections().first().attribute<TestAttribute>()->data, QByteArray("new"));
-
-    // modify existing attribute
-    RESET_COLLECTION_ID;
-    col.attribute<TestAttribute>()->data = "modified";
-    mod = new CollectionModifyJob(col, this);
-    AKVERIFYEXEC(mod);
-
-    ljob = new CollectionFetchJob(col, CollectionFetchJob::Base, this);
-    AKVERIFYEXEC(ljob);
-    QVERIFY(ljob->collections().first().hasAttribute<TestAttribute>());
-    QCOMPARE(ljob->collections().first().attribute<TestAttribute>()->data, QByteArray("modified"));
-
-    // renaming
-    RESET_COLLECTION_ID;
-    col.setName("foo (renamed)");
-    mod = new CollectionModifyJob(col, this);
-    AKVERIFYEXEC(mod);
-
-    ljob = new CollectionFetchJob(col, CollectionFetchJob::Base, this);
-    AKVERIFYEXEC(ljob);
-    QCOMPARE(ljob->collections().count(), 1);
-    col = ljob->collections().first();
-    QCOMPARE(col.name(), QString("foo (renamed)"));
-
-    RESET_COLLECTION_ID;
-    col.setName("foo");
-    mod = new CollectionModifyJob(col, this);
-    AKVERIFYEXEC(mod);
-}
-
-#undef RESET_COLLECTION_ID
-
-void CollectionJobTest::testIllegalModify()
-{
-    // non-existing collection
-    Collection col(INT_MAX);
-    col.parentCollection().setId(res1ColId);
-    CollectionModifyJob *mod = new CollectionModifyJob(col, this);
-    QVERIFY(!mod->exec());
-
-    // rename to already existing name
-    col = Collection(res1ColId);
-    col.setName("res2");
-    mod = new CollectionModifyJob(col, this);
-    QVERIFY(!mod->exec());
-}
-
-void CollectionJobTest::testUtf8CollectionName_data()
-{
-    QTest::addColumn<QString>("folderName");
-
-    QTest::newRow("Umlaut") << QString::fromUtf8("ä");
-    QTest::newRow("Garbage") << QString::fromUtf8("đ→³}đþøæſð");
-    QTest::newRow("Utf8") << QString::fromUtf8("日本語");
-}
-
-void CollectionJobTest::testUtf8CollectionName()
-{
-    QFETCH(QString, folderName);
-
-    // create collection
-    Collection col;
-    col.parentCollection().setId(res3ColId);
-    col.setName(folderName);
-    CollectionCreateJob *create = new CollectionCreateJob(col, this);
-    AKVERIFYEXEC(create);
-    col = create->collection();
-    QVERIFY(col.isValid());
-    QCOMPARE(col.name(), folderName);
-
-    // list parent
-    CollectionFetchJob *list = new CollectionFetchJob(Collection(res3ColId), CollectionFetchJob::Recursive, this);
-    AKVERIFYEXEC(list);
-    QCOMPARE(list->collections().count(), 1);
-    QCOMPARE(list->collections().first(), col);
-    QCOMPARE(list->collections().first().name(), col.name());
-
-    // modify collection
-    col.setContentMimeTypes(QStringList("message/rfc822'"));
-    CollectionModifyJob *modify = new CollectionModifyJob(col, this);
-    AKVERIFYEXEC(modify);
-
-    // collection statistics
-    CollectionStatisticsJob *statistics = new CollectionStatisticsJob(col, this);
-    AKVERIFYEXEC(statistics);
-    CollectionStatistics s = statistics->statistics();
-    QCOMPARE(s.count(), 0ll);
-    QCOMPARE(s.unreadCount(), 0ll);
-
-    // delete collection
-    CollectionDeleteJob *del = new CollectionDeleteJob(col, this);
-    AKVERIFYEXEC(del);
-}
-
-void CollectionJobTest::testMultiList()
-{
-    Collection::List req;
-    req << Collection(res1ColId) << Collection(res2ColId);
-    CollectionFetchJob *job = new CollectionFetchJob(req, this);
-    AKVERIFYEXEC(job);
-
-    Collection::List res;
-    res = job->collections();
-    compareLists(res, req);
-}
-
-void CollectionJobTest::testRecursiveMultiList()
-{
-    Akonadi::Collection::List toFetch;
-    toFetch << Collection(res1ColId);
-    toFetch << Collection(res2ColId);
-    CollectionFetchJob *job = new CollectionFetchJob(toFetch, CollectionFetchJob::Recursive);
-    QSignalSpy spy(job, SIGNAL(collectionsReceived(Akonadi::Collection::List)));
-    QVERIFY(spy.isValid());
-    AKVERIFYEXEC(job);
-
-    Collection::List list = job->collections();
-
-    int count = 0;
-    for (int i = 0; i < spy.count(); ++i) {
-        Collection::List l = spy[i][0].value<Akonadi::Collection::List>();
-        for (int j = 0; j < l.count(); ++j) {
-            QVERIFY(list.count() > count + j);
-            QCOMPARE(list[count + j].id(), l[j].id());
-        }
-        count += l.count();
-    }
-    QCOMPARE(count, list.count());
-
-    // check if everything is there
-    QCOMPARE(list.count(), 4 + 2);
-    QVERIFY(findCol(list, "foo").isValid());
-    QVERIFY(findCol(list, "bar").isValid());
-    QVERIFY(findCol(list, "bla").isValid());     //There are two bla folders, but we only check for one.
-    QVERIFY(findCol(list, "foo2").isValid());
-    QVERIFY(findCol(list, "space folder").isValid());
-}
-
-void CollectionJobTest::testNonOverlappingRootList()
-{
-    Akonadi::Collection::List toFetch;
-    toFetch << Collection(res1ColId);
-    toFetch << Collection(res2ColId);
-    CollectionFetchJob *job = new CollectionFetchJob(toFetch, CollectionFetchJob::NonOverlappingRoots);
-    QSignalSpy spy(job, SIGNAL(collectionsReceived(Akonadi::Collection::List)));
-    QVERIFY(spy.isValid());
-    AKVERIFYEXEC(job);
-
-    Collection::List list = job->collections();
-
-    int count = 0;
-    for (int i = 0; i < spy.count(); ++i) {
-        Collection::List l = spy[i][0].value<Akonadi::Collection::List>();
-        for (int j = 0; j < l.count(); ++j) {
-            QVERIFY(list.count() > count + j);
-            QCOMPARE(list[count + j].id(), l[j].id());
-        }
-        count += l.count();
-    }
-    QCOMPARE(count, list.count());
-
-    // check if everything is there
-    QCOMPARE(list.count(), 2);
-    QVERIFY(findCol(list, "res1").isValid());
-    QVERIFY(findCol(list, "res2").isValid());
-}
-
-void CollectionJobTest::testRidFetch()
-{
-    Collection col;
-    col.setRemoteId("10");
-
-    CollectionFetchJob *job = new CollectionFetchJob(col, CollectionFetchJob::Base, this);
-    job->fetchScope().setResource("akonadi_knut_resource_0");
-    AKVERIFYEXEC(job);
-    QCOMPARE(job->collections().count(), 1);
-    col = job->collections().first();
-    QVERIFY(col.isValid());
-    QCOMPARE(col.remoteId(), QString::fromLatin1("10"));
-}
-
-void CollectionJobTest::testRidCreateDelete_data()
-{
-    QTest::addColumn<QString>("remoteId");
-    QTest::newRow("ASCII") << QString::fromUtf8("MY REMOTE ID");
-    QTest::newRow("LATIN1") << QString::fromUtf8("MY REMÖTE ID");
-    QTest::newRow("UTF8") << QString::fromUtf8("MY REMOTE 検索表");
-}
-
-void CollectionJobTest::testRidCreateDelete()
-{
-    QFETCH(QString, remoteId);
-    Collection collection;
-    collection.setName("rid create");
-    collection.parentCollection().setRemoteId("8");
-    collection.setRemoteId(remoteId);
-
-    ResourceSelectJob *resSel = new ResourceSelectJob("akonadi_knut_resource_2");
-    AKVERIFYEXEC(resSel);
-
-    CollectionCreateJob *createJob = new CollectionCreateJob(collection, this);
-    AKVERIFYEXEC(createJob);
-
-    Collection createdCol = createJob->collection();
-    QVERIFY(createdCol.isValid());
-    QCOMPARE(createdCol.name(), collection.name());
-
-    CollectionFetchJob *listJob = new CollectionFetchJob(Collection(res3ColId), CollectionFetchJob::FirstLevel, this);
-    AKVERIFYEXEC(listJob);
-    Collection listedCol = findCol(listJob->collections(), collection.name());
-    QCOMPARE(listedCol, createdCol);
-    QCOMPARE(listedCol.name(), collection.name());
-
-    QVERIFY(!collection.isValid());
-    CollectionDeleteJob *delJob = new CollectionDeleteJob(collection, this);
-    AKVERIFYEXEC(delJob);
-
-    listJob = new CollectionFetchJob(Collection(res3ColId), CollectionFetchJob::FirstLevel, this);
-    AKVERIFYEXEC(listJob);
-    QVERIFY(!findCol(listJob->collections(), collection.name()).isValid());
-}
-
-void CollectionJobTest::testAncestorRetrieval()
-{
-    Collection col;
-    col.setRemoteId("10");
-
-    CollectionFetchJob *job = new CollectionFetchJob(col, CollectionFetchJob::Base, this);
-    job->fetchScope().setResource("akonadi_knut_resource_0");
-    job->fetchScope().setAncestorRetrieval(CollectionFetchScope::All);
-    AKVERIFYEXEC(job);
-    QCOMPARE(job->collections().count(), 1);
-    col = job->collections().first();
-    QVERIFY(col.isValid());
-    QVERIFY(col.parentCollection().isValid());
-    QCOMPARE(col.parentCollection().remoteId(), QString("6"));
-    QCOMPARE(col.parentCollection().parentCollection(), Collection::root());
-
-    ResourceSelectJob *select = new ResourceSelectJob("akonadi_knut_resource_0", this);
-    AKVERIFYEXEC(select);
-    Collection col2(col);
-    col2.setId(-1);   // make it invalid but keep the ancestor chain
-    job = new CollectionFetchJob(col2, CollectionFetchJob::Base, this);
-    AKVERIFYEXEC(job);
-    QCOMPARE(job->collections().count(), 1);
-    col2 = job->collections().first();
-    QVERIFY(col2.isValid());
-    QCOMPARE(col, col2);
-}
-
-void CollectionJobTest::testListPreference()
-{
-    Akonadi::Collection baseCol;
-    {
-        baseCol.setParentCollection(Akonadi::Collection(res1ColId));
-        baseCol.setName("base");
-        Akonadi::CollectionCreateJob *create = new Akonadi::CollectionCreateJob(baseCol);
-        AKVERIFYEXEC(create);
-        baseCol = create->collection();
-    }
-    {
-        Akonadi::Collection col;
-        col.setParentCollection(baseCol);
-        col.setEnabled(true);
-        col.setName("enabled");
-        Akonadi::CollectionCreateJob *create = new Akonadi::CollectionCreateJob(col);
-        AKVERIFYEXEC(create);
-
-        CollectionFetchJob *job = new CollectionFetchJob(create->collection(), CollectionFetchJob::Base);
-        AKVERIFYEXEC(job);
-        Akonadi::Collection result = job->collections().first();
-        QCOMPARE(result.enabled(), true);
-        QCOMPARE(result.localListPreference(Collection::ListDisplay), Collection::ListDefault);
-        QCOMPARE(result.localListPreference(Collection::ListSync), Collection::ListDefault);
-        QCOMPARE(result.localListPreference(Collection::ListIndex), Collection::ListDefault);
-    }
-    {
-        Akonadi::Collection col;
-        col.setParentCollection(baseCol);
-        col.setName("disabledPref");
-        col.setEnabled(true);
-        col.setLocalListPreference(Collection::ListDisplay, Collection::ListDisabled);
-        col.setLocalListPreference(Collection::ListSync, Collection::ListDisabled);
-        col.setLocalListPreference(Collection::ListIndex, Collection::ListDisabled);
-        Akonadi::CollectionCreateJob *create = new Akonadi::CollectionCreateJob(col);
-        AKVERIFYEXEC(create);
-        CollectionFetchJob *job = new CollectionFetchJob(create->collection(), CollectionFetchJob::Base);
-        AKVERIFYEXEC(job);
-        Akonadi::Collection result = job->collections().first();
-        QCOMPARE(result.enabled(), true);
-        QCOMPARE(result.localListPreference(Collection::ListDisplay), Collection::ListDisabled);
-        QCOMPARE(result.localListPreference(Collection::ListSync), Collection::ListDisabled);
-        QCOMPARE(result.localListPreference(Collection::ListIndex), Collection::ListDisabled);
-    }
-    {
-        Akonadi::Collection col;
-        col.setParentCollection(baseCol);
-        col.setName("enabledPref");
-        col.setEnabled(false);
-        col.setLocalListPreference(Collection::ListDisplay, Collection::ListEnabled);
-        col.setLocalListPreference(Collection::ListSync, Collection::ListEnabled);
-        col.setLocalListPreference(Collection::ListIndex, Collection::ListEnabled);
-        Akonadi::CollectionCreateJob *create = new Akonadi::CollectionCreateJob(col);
-        AKVERIFYEXEC(create);
-        CollectionFetchJob *job = new CollectionFetchJob(create->collection(), CollectionFetchJob::Base);
-        AKVERIFYEXEC(job);
-        Akonadi::Collection result = job->collections().first();
-        QCOMPARE(result.enabled(), false);
-        QCOMPARE(result.localListPreference(Collection::ListDisplay), Collection::ListEnabled);
-        QCOMPARE(result.localListPreference(Collection::ListSync), Collection::ListEnabled);
-        QCOMPARE(result.localListPreference(Collection::ListIndex), Collection::ListEnabled);
-    }
-
-    //Check list filter
-    {
-        CollectionFetchJob *job = new CollectionFetchJob(baseCol, CollectionFetchJob::FirstLevel);
-        job->fetchScope().setListFilter(CollectionFetchScope::Display);
-        AKVERIFYEXEC(job);
-        QCOMPARE(job->collections().size(), 2);
-    }
-    {
-        CollectionFetchJob *job = new CollectionFetchJob(baseCol, CollectionFetchJob::FirstLevel);
-        job->fetchScope().setListFilter(CollectionFetchScope::Sync);
-        AKVERIFYEXEC(job);
-        QCOMPARE(job->collections().size(), 2);
-    }
-    {
-        CollectionFetchJob *job = new CollectionFetchJob(baseCol, CollectionFetchJob::FirstLevel);
-        job->fetchScope().setListFilter(CollectionFetchScope::Index);
-        AKVERIFYEXEC(job);
-        QCOMPARE(job->collections().size(), 2);
-    }
-    {
-        CollectionFetchJob *job = new CollectionFetchJob(baseCol, CollectionFetchJob::FirstLevel);
-        job->fetchScope().setListFilter(CollectionFetchScope::Enabled);
-        AKVERIFYEXEC(job);
-        QCOMPARE(job->collections().size(), 2);
-    }
-
-    //Cleanup
-    CollectionDeleteJob *deleteJob = new CollectionDeleteJob(baseCol);
-    AKVERIFYEXEC(deleteJob);
-}
-
-void CollectionJobTest::testReference()
-{
-    Akonadi::Collection baseCol;
-    {
-        baseCol.setParentCollection(Akonadi::Collection(res1ColId));
-        baseCol.setName("base");
-        Akonadi::CollectionCreateJob *create = new Akonadi::CollectionCreateJob(baseCol);
-        AKVERIFYEXEC(create);
-        baseCol = create->collection();
-    }
-
-    {
-        Akonadi::Collection col;
-        col.setParentCollection(baseCol);
-        col.setName("referenced");
-        col.setEnabled(false);
-        {
-            Akonadi::CollectionCreateJob *create = new Akonadi::CollectionCreateJob(col);
-            AKVERIFYEXEC(create);
-            CollectionFetchJob *job = new CollectionFetchJob(create->collection(), CollectionFetchJob::Base);
-            AKVERIFYEXEC(job);
-            col = job->collections().first();
-        }
-        {
-            col.setReferenced(true);
-            Akonadi::CollectionModifyJob *modify = new Akonadi::CollectionModifyJob(col);
-            AKVERIFYEXEC(modify);
-            CollectionFetchJob *job = new CollectionFetchJob(col, CollectionFetchJob::Base);
-            AKVERIFYEXEC(job);
-            Akonadi::Collection result = job->collections().first();
-            QCOMPARE(result.enabled(), false);
-            QCOMPARE(result.referenced(), true);
-        }
-        {
-            col.setReferenced(false);
-            Akonadi::CollectionModifyJob *modify = new Akonadi::CollectionModifyJob(col);
-            AKVERIFYEXEC(modify);
-            CollectionFetchJob *job = new CollectionFetchJob(col, CollectionFetchJob::Base);
-            AKVERIFYEXEC(job);
-            Akonadi::Collection result = job->collections().first();
-            QCOMPARE(result.enabled(), false);
-            QCOMPARE(result.referenced(), false);
-        }
-    }
-
-    //Cleanup
-    CollectionDeleteJob *deleteJob = new CollectionDeleteJob(baseCol);
-    AKVERIFYEXEC(deleteJob);
-}
-
-#include "collectionjobtest.moc"
diff -Nru akonadi-mime-19.04.3/autotests/localfoldersrequestjobtest.cpp akonadi-mime-19.12.3/autotests/localfoldersrequestjobtest.cpp
--- akonadi-mime-19.04.3/autotests/localfoldersrequestjobtest.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/autotests/localfoldersrequestjobtest.cpp	2020-02-16 09:00:26.000000000 +0000
@@ -19,7 +19,7 @@
 
 #include "localfoldersrequestjobtest.h"
 
-#include "../../collectionpathresolver_p.h"
+#include "collectionpathresolver.h"
 
 #include <QSignalSpy>
 
@@ -33,13 +33,12 @@
 #include <collectionmodifyjob.h>
 #include <control.h>
 #include <qtest_akonadi.h>
-#include "../../specialcollectionattribute_p.h"
-#include "../../specialcollections_p.h"
+#include "specialcollectionattribute.h"
+#include "specialcollections.h"
 #include <specialmailcollections.h>
 #include <specialmailcollectionsrequestjob.h>
 #include <QStandardPaths>
-#include "../specialmailcollectionstesting_p.h"
-#include "../../specialcollectionshelperjobs_p.h"
+#include "../src/specialmailcollectionstesting_p.h"
 
 using namespace Akonadi;
 
@@ -67,13 +66,13 @@
     SpecialMailCollectionsTesting *smct = SpecialMailCollectionsTesting::_t_self();
     Q_ASSERT(smc);
     Q_ASSERT(smct);
-    QSignalSpy spy(smc, SIGNAL(collectionsChanged(Akonadi::AgentInstance)));
-    QSignalSpy defSpy(smc, SIGNAL(defaultCollectionsChanged()));
+    QSignalSpy spy(smc, &SpecialMailCollections::collectionsChanged);
+    QSignalSpy defSpy(smc, &SpecialMailCollections::defaultCollectionsChanged);
     QVERIFY(spy.isValid());
     QVERIFY(defSpy.isValid());
 
     // Initially the defaut maildir does not exist.
-    QVERIFY(!QFile::exists(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + '/' + "local-mail"));
+    QVERIFY(!QFile::exists(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/local-mail")));
 
     // Request some default folders.
     {
@@ -91,7 +90,7 @@
     }
 
     // The maildir should exist now.
-    QVERIFY(QFile::exists(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + '/' + QLatin1String("local-mail")));
+    QVERIFY(QFile::exists(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/local-mail")));
 }
 
 void LocalFoldersRequestJobTest::testRequestWithDefaultResourceAlreadyExisting()
@@ -100,13 +99,13 @@
     SpecialMailCollectionsTesting *smct = SpecialMailCollectionsTesting::_t_self();
     Q_ASSERT(smc);
     Q_ASSERT(smct);
-    QSignalSpy spy(smc, SIGNAL(collectionsChanged(Akonadi::AgentInstance)));
-    QSignalSpy defSpy(smc, SIGNAL(defaultCollectionsChanged()));
+    QSignalSpy spy(smc, &SpecialMailCollections::collectionsChanged);
+    QSignalSpy defSpy(smc, &SpecialMailCollections::defaultCollectionsChanged);
     QVERIFY(spy.isValid());
     QVERIFY(defSpy.isValid());
 
     // Prerequisites (from testRequestWithNoDefaultResourceExisting()).
-    QVERIFY(QFile::exists(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + '/' + QLatin1String("local-mail")));
+    QVERIFY(QFile::exists(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/local-mail")));
     QVERIFY(!smc->hasDefaultCollection(SpecialMailCollections::Inbox));
     QVERIFY(smc->hasDefaultCollection(SpecialMailCollections::Outbox));
     const Collection oldOutbox = smc->defaultCollection(SpecialMailCollections::Outbox);
@@ -137,15 +136,15 @@
     SpecialMailCollectionsTesting *smct = SpecialMailCollectionsTesting::_t_self();
     Q_ASSERT(smc);
     Q_ASSERT(smct);
-    QSignalSpy spy(smc, SIGNAL(collectionsChanged(Akonadi::AgentInstance)));
-    QSignalSpy defSpy(smc, SIGNAL(defaultCollectionsChanged()));
+    QSignalSpy spy(smc, &SpecialMailCollections::collectionsChanged);
+    QSignalSpy defSpy(smc, &SpecialMailCollections::defaultCollectionsChanged);
     QVERIFY(spy.isValid());
     QVERIFY(defSpy.isValid());
 
     // Get our knut collection.
     Collection res1;
     {
-        CollectionPathResolver *resolver = new CollectionPathResolver("res1", this);
+        CollectionPathResolver *resolver = new CollectionPathResolver(QStringLiteral("res1"), this);
         QVERIFY(resolver->exec());
         res1 = Collection(resolver->collection());
         CollectionFetchJob *fjob = new CollectionFetchJob(res1, CollectionFetchJob::Base, this);
@@ -169,7 +168,7 @@
     }
 
     // Prerequisites (from the above two functions).
-    QVERIFY(QFile::exists(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + '/' + QLatin1String("local-mail")));
+    QVERIFY(QFile::exists(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/local-mail")));
     QVERIFY(!smc->hasDefaultCollection(SpecialMailCollections::SentMail));
     QVERIFY(smc->hasDefaultCollection(SpecialMailCollections::Outbox));
     const Collection oldOutbox = smc->defaultCollection(SpecialMailCollections::Outbox);
@@ -196,4 +195,4 @@
     QCOMPARE(smc->collection(SpecialMailCollections::Outbox, AgentManager::self()->instance(res1.resource())), knutOutbox);
 }
 
-QTEST_AKONADIMAIN(LocalFoldersRequestJobTest, NoGUI)
+QTEST_AKONADIMAIN(LocalFoldersRequestJobTest)
diff -Nru akonadi-mime-19.04.3/autotests/localfolderstest.cpp akonadi-mime-19.12.3/autotests/localfolderstest.cpp
--- akonadi-mime-19.04.3/autotests/localfolderstest.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/autotests/localfolderstest.cpp	2020-02-16 09:00:26.000000000 +0000
@@ -19,9 +19,9 @@
 
 #include "localfolderstest.h"
 
-#include "../../collectionpathresolver_p.h"
-#include "../../dbusconnectionpool.h"
-#include "../specialmailcollectionssettings.h"
+#include "collectionpathresolver.h"
+#include "kdbusconnectionpool.h"
+#include "specialmailcollectionssettings.h"
 
 #include <QDBusConnectionInterface>
 #include <QFile>
@@ -34,14 +34,14 @@
 #include <collectionfetchjob.h>
 #include <collectionmodifyjob.h>
 #include <control.h>
+#include <KLocalizedString>
 #include <servermanager.h>
 #include <qtest_akonadi.h>
-#include "../../specialcollectionattribute_p.h"
-#include "../../specialcollections_p.h"
+#include "specialcollectionattribute.h"
+#include "specialcollections.h"
 #include <specialmailcollections.h>
 #include <QStandardPaths>
-#include "../specialmailcollectionstesting_p.h"
-#include "../../specialcollectionshelperjobs_p.h"
+#include "../src/specialmailcollectionstesting_p.h"
 
 using namespace Akonadi;
 
@@ -72,7 +72,7 @@
     QVERIFY(Control::start());
     QTest::qWait(1000);
 
-    CollectionPathResolver *resolver = new CollectionPathResolver("res1", this);
+    CollectionPathResolver *resolver = new CollectionPathResolver(QStringLiteral("res1"), this);
     QVERIFY(resolver->exec());
     res1 = Collection(resolver->collection());
 
@@ -91,13 +91,13 @@
     }
 
     // Initially not locked.
-    QVERIFY(!DBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName));
+    QVERIFY(!KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName));
 
     // Get the lock.
     {
         GetLockJob *ljob = new GetLockJob(this);
         AKVERIFYEXEC(ljob);
-        QVERIFY(DBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName));
+        QVERIFY(KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName));
     }
 
     // Getting the lock again should fail.
@@ -107,9 +107,9 @@
     }
 
     // Release the lock.
-    QVERIFY(DBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName));
+    QVERIFY(KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName));
     releaseLock();
-    QVERIFY(!DBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName));
+    QVERIFY(!KDBusConnectionPool::threadConnection().interface()->isServiceRegistered(dbusName));
 }
 
 void LocalFoldersTest::testInitialState()
@@ -174,8 +174,8 @@
     SpecialMailCollectionsTesting *smct = SpecialMailCollectionsTesting::_t_self();
     Q_ASSERT(smc);
     Q_ASSERT(smct);
-    QSignalSpy spy(smc, SIGNAL(collectionsChanged(Akonadi::AgentInstance)));
-    QSignalSpy defSpy(smc, SIGNAL(defaultCollectionsChanged()));
+    QSignalSpy spy(smc, &SpecialMailCollections::collectionsChanged);
+    QSignalSpy defSpy(smc, &SpecialMailCollections::defaultCollectionsChanged);
     QVERIFY(spy.isValid());
     QVERIFY(defSpy.isValid());
 
@@ -232,8 +232,8 @@
     SpecialMailCollectionsTesting *smct = SpecialMailCollectionsTesting::_t_self();
     Q_ASSERT(smc);
     Q_ASSERT(smct);
-    QSignalSpy spy(smc, SIGNAL(collectionsChanged(Akonadi::AgentInstance)));
-    QSignalSpy defSpy(smc, SIGNAL(defaultCollectionsChanged()));
+    QSignalSpy spy(smc, &SpecialMailCollections::collectionsChanged);
+    QSignalSpy defSpy(smc, &SpecialMailCollections::defaultCollectionsChanged);
     QVERIFY(spy.isValid());
     QVERIFY(defSpy.isValid());
 
@@ -290,8 +290,8 @@
     SpecialMailCollectionsTesting *smct = SpecialMailCollectionsTesting::_t_self();
     Q_ASSERT(smc);
     Q_ASSERT(smct);
-    QSignalSpy spy(smc, SIGNAL(collectionsChanged(Akonadi::AgentInstance)));
-    QSignalSpy defSpy(smc, SIGNAL(defaultCollectionsChanged()));
+    QSignalSpy spy(smc, &SpecialMailCollections::collectionsChanged);
+    QSignalSpy defSpy(smc, &SpecialMailCollections::defaultCollectionsChanged);
     QVERIFY(spy.isValid());
     QVERIFY(defSpy.isValid());
 
@@ -344,8 +344,8 @@
     SpecialMailCollectionsTesting *smct = SpecialMailCollectionsTesting::_t_self();
     Q_ASSERT(smc);
     Q_ASSERT(smct);
-    QSignalSpy spy(smc, SIGNAL(collectionsChanged(Akonadi::AgentInstance)));
-    QSignalSpy defSpy(smc, SIGNAL(defaultCollectionsChanged()));
+    QSignalSpy spy(smc, &SpecialMailCollections::collectionsChanged);
+    QSignalSpy defSpy(smc, &SpecialMailCollections::defaultCollectionsChanged);
     QVERIFY(spy.isValid());
     QVERIFY(defSpy.isValid());
 
@@ -500,7 +500,7 @@
     scmt->_t_setDefaultResourceId(QLatin1String("akonadi_maildir_resource"));
 
     // Initially the defaut maildir does not exist.
-    QVERIFY(!QFile::exists(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + '/' + QLatin1String("local-mail")));
+    QVERIFY(!QFile::exists(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/local-mail")));
 
     // Run the job.
     Collection maildirRoot;
@@ -511,7 +511,7 @@
 
         QVariantMap options;
         options.insert(QLatin1String("Name"), i18nc("local mail folder", "Local Folders"));
-        options.insert(QLatin1String("Path"), QString(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + '/' + QLatin1String("local-mail")));
+        options.insert(QLatin1String("Path"), QString(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/local-mail")));
         resjob->setDefaultResourceOptions(options);
         resjob->setTypes(mDisplayNameMap.keys());
         resjob->setNameForTypeMap(mDisplayNameMap);
@@ -527,7 +527,7 @@
     }
 
     // The maildir should exist now.
-    QVERIFY(QFile::exists(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + '/' + QLatin1String("local-mail")));
+    QVERIFY(QFile::exists(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/local-mail")));
 
     // Create a LocalFolder in the default resource.
     Collection outbox;
@@ -551,7 +551,7 @@
 
         QVariantMap options;
         options.insert(QLatin1String("Name"), i18nc("local mail folder", "Local Folders"));
-        options.insert(QLatin1String("Path"), QString(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + '/' + QLatin1String("local-mail")));
+        options.insert(QLatin1String("Path"), QString(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/local-mail")));
         resjob->setDefaultResourceOptions(options);
         resjob->setTypes(mDisplayNameMap.keys());
         resjob->setNameForTypeMap(mDisplayNameMap);
@@ -569,7 +569,7 @@
 void LocalFoldersTest::testRecoverDefaultResource()
 {
     // The maildirs should exist (created in testDefaultResourceJob).
-    const QString xdgPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + '/';
+    const QString xdgPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/');
     const QString rootPath = xdgPath + QLatin1String("local-mail");
     const QString outboxPath = xdgPath + QString::fromLatin1(".%1.directory/%2") \
                                .arg(QLatin1String("local-mail"))
@@ -592,7 +592,7 @@
 
         QVariantMap options;
         options.insert(QLatin1String("Name"), i18nc("local mail folder", "Local Folders"));
-        options.insert(QLatin1String("Path"), QString(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + '/' + QLatin1String("local-mail")));
+        options.insert(QLatin1String("Path"), QString(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/local-mail")));
         resjob->setDefaultResourceOptions(options);
         resjob->setTypes(mDisplayNameMap.keys());
         resjob->setNameForTypeMap(mDisplayNameMap);
@@ -605,7 +605,7 @@
 
         // Reorder the folders.
         if (folders.first().parentCollection() != Collection::root()) {
-            folders.swap(0, 1);
+            folders.move(1, 0);
         }
 
         // The first folder should be the Root.
@@ -626,4 +626,4 @@
     }
 }
 
-QTEST_AKONADIMAIN(LocalFoldersTest, NoGUI)
+QTEST_AKONADIMAIN(LocalFoldersTest)
diff -Nru akonadi-mime-19.04.3/autotests/racetest.cpp akonadi-mime-19.12.3/autotests/racetest.cpp
--- akonadi-mime-19.04.3/autotests/racetest.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/autotests/racetest.cpp	2020-02-16 09:00:26.000000000 +0000
@@ -78,15 +78,16 @@
     types.append(AgentManager::self()->type(QLatin1String("akonadi_maildir_resource")));
     types.append(AgentManager::self()->type(QLatin1String("akonadi_maildispatcher_agent")));
     AgentInstance::List instances = AgentManager::self()->instances();
-    foreach (const AgentInstance &instance, instances) {
+    for (const AgentInstance &instance : qAsConst(instances)) {
         if (types.contains(instance.type())) {
             qDebug() << "Removing instance of type" << instance.type().identifier();
             AgentManager::self()->removeInstance(instance);
-            QTest::kWaitForSignal(AgentManager::self(), SIGNAL(instanceRemoved(Akonadi::AgentInstance)));
+            QSignalSpy removedSpy(AgentManager::self(), SIGNAL(instanceRemoved(Akonadi::AgentInstance)));
+            QVERIFY(removedSpy.wait());
         }
     }
     instances = AgentManager::self()->instances();
-    foreach (const AgentInstance &instance, instances) {
+    for (const AgentInstance &instance : qAsConst(instances)) {
         QVERIFY(!types.contains(instance.type()));
     }
 
@@ -96,7 +97,7 @@
         qDebug() << "Starting process" << i + 1 << "of" << count;
         KProcess *proc = new KProcess;
         procs.append(proc);
-        proc->setProgram(REQUESTER_EXE);
+        proc->setProgram(QStringLiteral(REQUESTER_EXE));
         errorSpy[i] = new QSignalSpy(proc, SIGNAL(error(QProcess::ProcessError)));
         finishedSpy[i] = new QSignalSpy(proc, SIGNAL(finished(int,QProcess::ExitStatus)));
         proc->start();
@@ -170,4 +171,4 @@
     }
 }
 
-QTEST_AKONADIMAIN(RaceTest, NoGUI)
+QTEST_AKONADIMAIN(RaceTest)
diff -Nru akonadi-mime-19.04.3/CMakeLists.txt akonadi-mime-19.12.3/CMakeLists.txt
--- akonadi-mime-19.04.3/CMakeLists.txt	2019-07-09 00:19:39.000000000 +0000
+++ akonadi-mime-19.12.3/CMakeLists.txt	2020-03-03 00:33:07.000000000 +0000
@@ -1,28 +1,30 @@
 cmake_minimum_required(VERSION 3.5)
 
-set(PIM_VERSION "5.11.3")
+set(PIM_VERSION "5.13.3")
 project(Akonadi-Mime VERSION ${PIM_VERSION})
 
 # 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})
-set(QT_REQUIRED_VERSION "5.10.0")
+set(QT_REQUIRED_VERSION "5.11.0")
+
+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(AKONADI_MIME_VERSION ${PIM_VERSION})
-set(AKONADI_VERSION "5.11.3")
-set(KF5_MIME_VERSION "5.11.3")
+set(AKONADI_VERSION "5.13.3")
+set(KF5_MIME_VERSION "5.13.3")
 
 ecm_setup_version(PROJECT VARIABLE_PREFIX AKONADIMIME
     VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi-mime_version.h"
@@ -55,12 +57,19 @@
 
 ########### Targets ###########
 
-# 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()
+
+add_definitions(-DQT_NO_FOREACH)
+
+if(BUILD_TESTING)
+    set(AKONADI_MIME_TEST_EXPORT AKONADI_MIME_EXPORT)
 endif()
+configure_file(akonadi-mimeprivate_export.h.in "${CMAKE_CURRENT_BINARY_DIR}/akonadi-mimeprivate_export.h")
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+option(NO_REGENERATE_MIME "Don't regenerate mime file (only for developper)" FALSE )
 
 add_subdirectory(src)
 add_subdirectory(serializers)
@@ -93,7 +102,7 @@
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
     )
 
-install(FILES akonadi-mime.categories DESTINATION ${KDE_INSTALL_CONFDIR})
+install(FILES akonadi-mime.categories  DESTINATION  ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
 
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 ki18n_install(po)
diff -Nru akonadi-mime-19.04.3/debian/changelog akonadi-mime-19.12.3/debian/changelog
--- akonadi-mime-19.04.3/debian/changelog	2020-03-23 18:15:19.000000000 +0000
+++ akonadi-mime-19.12.3/debian/changelog	2020-04-11 12:56:19.000000000 +0000
@@ -1,3 +1,10 @@
+akonadi-mime (4:19.12.3-0ubuntu1) focal; urgency=medium
+
+  * Move qdebug categories file to new location.
+  * New upstream release (19.12.3)
+
+ -- Rik Mills <rikmills@kde.org>  Sat, 11 Apr 2020 13:56:19 +0100
+
 akonadi-mime (4:19.04.3-0ubuntu2) focal; urgency=medium
 
   * No-change rebuild for libgcc-s1 package name change.
diff -Nru akonadi-mime-19.04.3/debian/control akonadi-mime-19.12.3/debian/control
--- akonadi-mime-19.04.3/debian/control	2019-07-23 17:53:12.000000000 +0000
+++ akonadi-mime-19.12.3/debian/control	2020-04-11 12:56:19.000000000 +0000
@@ -8,15 +8,15 @@
            George Kiagiadakis <kiagiadakis.george@gmail.com>,
            Eshat Cakar <info@eshat.de>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org>,
-           Maximiliano Curia <maxy@debian.org>
+           Maximiliano Curia <maxy@debian.org>,
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
                extra-cmake-modules (>= 5.31.0~),
-               libkf5akonadi-dev (>= 4:19.04.3~),
+               libkf5akonadi-dev (>= 4:19.12.3~),
                libkf5dbusaddons-dev (>= 5.31.0~),
                libkf5itemmodels-dev (>= 5.31.0~),
                libkf5kio-dev (>= 5.31.0~),
-               libkf5mime-dev (>= 19.04.3~),
+               libkf5mime-dev (>= 19.12.3~),
                libxslt1-dev,
                pkg-config,
                pkg-kde-tools (>= 0.12),
@@ -27,35 +27,6 @@
 Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/akonadi-mime
 Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/akonadi-mime
 
-Package: libkf5akonadimime5
-Architecture: any
-Multi-Arch: same
-Depends: libkf5akonadimime-data (= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: kdepim-runtime (<< 4:18.03.70~),
-Replaces: kdepim-runtime (<< 4:18.03.70~)
-Description: Akonadi MIME handling library
- This library provides MIME handling helpers using the
- Akonadi PIM data server.
- .
- This package is part of the KDE Development Platform PIM libraries module.
-
-Package: libkf5akonadimime-dev
-Section: libdevel
-Architecture: any
-Depends: libkf5akonadi-dev (>= 4:19.04.3~),
-         libkf5akonadimime5 (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends},
-Description: Akonadi MIME handling library
- This library provides MIME handling helpers using the
- Akonadi PIM data server.
- .
- This package is part of the KDE Development Platform PIM libraries module.
- .
- This package contains the development files.
-
 Package: libkf5akonadimime-data
 Architecture: all
 Multi-Arch: foreign
@@ -66,13 +37,42 @@
         libkf5akonadimime5 (<< 4:16.04.3~),
         libkf5akonadisocialutils5 (<< 4:16.04.3~),
         libkf5akonadixml5 (<< 4:16.04.3~),
-        ${kde-l10n:all}
+        ${kde-l10n:all},
 Replaces: kdepim-runtime (<< 4:18.03.70~),
           kdepimlibs-data (<< 4:16.08~),
           libakonadi-kf5 (<< 4:16.04.3~),
           libkf5akonadimime5 (<< 4:16.04.3~),
           libkf5akonadisocialutils5 (<< 4:16.04.3~),
           libkf5akonadixml5 (<< 4:16.04.3~),
-          ${kde-l10n:all}
+          ${kde-l10n:all},
 Description: akonadi-mime - data files
  This package contains data files for the akonadi-mime libraries.
+
+Package: libkf5akonadimime-dev
+Section: libdevel
+Architecture: any
+Depends: libkf5akonadi-dev (>= 4:19.12.3~),
+         libkf5akonadimime5 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Description: Akonadi MIME handling library
+ This library provides MIME handling helpers using the
+ Akonadi PIM data server.
+ .
+ This package is part of the KDE Development Platform PIM libraries module.
+ .
+ This package contains the development files.
+
+Package: libkf5akonadimime5
+Architecture: any
+Multi-Arch: same
+Depends: libkf5akonadimime-data (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+Breaks: kdepim-runtime (<< 4:18.03.70~)
+Replaces: kdepim-runtime (<< 4:18.03.70~)
+Description: Akonadi MIME handling library
+ This library provides MIME handling helpers using the
+ Akonadi PIM data server.
+ .
+ This package is part of the KDE Development Platform PIM libraries module.
diff -Nru akonadi-mime-19.04.3/debian/libkf5akonadimime-data.install akonadi-mime-19.12.3/debian/libkf5akonadimime-data.install
--- akonadi-mime-19.04.3/debian/libkf5akonadimime-data.install	2019-07-23 17:53:12.000000000 +0000
+++ akonadi-mime-19.12.3/debian/libkf5akonadimime-data.install	2020-04-11 12:56:19.000000000 +0000
@@ -1,5 +1,5 @@
-etc/xdg/akonadi-mime.categories
 usr/share/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
 usr/share/config.kcfg/specialmailcollections.kcfg
 usr/share/locale/
 usr/share/mime/packages/x-vnd.kde.contactgroup.xml
+usr/share/qlogging-categories5/akonadi-mime.categories
diff -Nru akonadi-mime-19.04.3/debian/libkf5akonadimime-data.maintscript akonadi-mime-19.12.3/debian/libkf5akonadimime-data.maintscript
--- akonadi-mime-19.04.3/debian/libkf5akonadimime-data.maintscript	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-mime-19.12.3/debian/libkf5akonadimime-data.maintscript	2020-04-11 12:56:19.000000000 +0000
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/akonadi-mime.categories
diff -Nru akonadi-mime-19.04.3/po/ar/libakonadi-kmime5.po akonadi-mime-19.12.3/po/ar/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ar/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-19.12.3/po/ar/libakonadi-kmime5.po	2020-03-03 00:33:05.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2014-09-12 17:16+0300\n"
 "Last-Translator: Safa Alfulaij <safa1996alfulaij@gmail.com>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -28,7 +28,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "أتريد حقًّا إفراغ مجلدات المهملات لكلّ الحسابات؟"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, fuzzy, kde-format
 #| msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgid ""
@@ -36,7 +36,7 @@
 "subfolders?"
 msgstr "أتريد حقًّا إفراغ مجلدات المهملات لكلّ الحسابات؟"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, fuzzy, kde-format
 #| msgid "Mark All as Read"
 msgid "Mark All Recursively"
diff -Nru akonadi-mime-19.04.3/po/bs/libakonadi-kmime5.po akonadi-mime-19.12.3/po/bs/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/bs/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-19.12.3/po/bs/libakonadi-kmime5.po	2020-03-03 00:33:05.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2013-10-18 20:27+0000\n"
 "Last-Translator: Samir Ribić <Unknown>\n"
 "Language-Team: Bosnian <bs@li.org>\n"
@@ -31,7 +31,7 @@
 msgstr ""
 "Da li ste sigurni da želite isprazniti direktorije sa smećem za sve račune?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, fuzzy, kde-format
 #| msgid "Do you really want to delete this folder and all its sub-folders?"
 #| msgid_plural ""
@@ -42,7 +42,7 @@
 msgstr ""
 "Želite li zaista da obrišete %1 direktorij i sve njihove poddirektorije?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, fuzzy, kde-format
 #| msgid "Mark All as Read"
 msgid "Mark All Recursively"
diff -Nru akonadi-mime-19.04.3/po/ca/libakonadi-kmime5.po akonadi-mime-19.12.3/po/ca/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ca/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-19.12.3/po/ca/libakonadi-kmime5.po	2020-03-03 00:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime5\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2017-12-30 17:37+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -31,7 +31,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Realment voleu buidar les papereres de tots els comptes?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -40,7 +40,7 @@
 "Realment voleu marcar tots els missatges en aquesta carpeta i totes les "
 "seves subcarpetes?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Marca'ls tots recursivament"
@@ -629,107 +629,3 @@
 #, kde-format
 msgid "Permanently delete all messages from the trash folder."
 msgstr "Suprimeix permanentment tots els missatges de la carpeta paperera."
-
-#~ msgid "&Mark Mail as Important"
-#~ msgstr "&Marca el correu com a important"
-
-#~ msgid "&Mark Mail as Action Item"
-#~ msgstr "&Marca el correu com un element d'acció"
-
-#~ msgid "An app that requests LocalFolders"
-#~ msgstr "Una aplicació que demana les carpetes locals"
-
-#~ msgid "Headfetcher"
-#~ msgstr "Obtén les capçaleres"
-
-#~ msgid "header fetching application"
-#~ msgstr "Aplicació que obté les capçaleres"
-
-#~ msgid "Run test on multipart data (default is singlepart)."
-#~ msgstr ""
-#~ "Executa una prova en les dades que consisteixen de múltiples parts (per "
-#~ "omissió és una sola part)."
-
-#~ msgid "IMAP server"
-#~ msgstr "Servidor IMAP"
-
-#~ msgid "Defines the port the IMAP service is running on"
-#~ msgstr "Defineix el port on s'està executant el servei IMAP"
-
-#~ msgid "Username"
-#~ msgstr "Nom d'usuari"
-
-#~ msgid "Defines the encryption type to use"
-#~ msgstr "Defineix el tipus d'encriptatge a usar"
-
-#~ msgid "Defines the authentication type to use"
-#~ msgstr "Defineix el tipus d'autenticació a usar"
-
-#~ msgid "Defines if the server side subscription is enabled"
-#~ msgstr "Defineix si la subscripció de la banda del servidor està habilitada"
-
-#~ msgid "Defines if all the IMAP data should be cached locally all the time"
-#~ msgstr ""
-#~ "Defineix si totes les dades IMAP s'han de desar en la memòria cau local "
-#~ "tot el temps"
-
-#~ msgid "Defines if interval checking is enabled."
-#~ msgstr "Defineix si l'interval de comprovació està habilitat."
-
-#~ msgid "Check interval in minutes"
-#~ msgstr "Interval de comprovació en minuts"
-
-#~ msgid ""
-#~ "Defines if the annotations, ACLs and quota information of mailboxes "
-#~ "should\n"
-#~ "             also be retrieved when the mailboxes get listed."
-#~ msgstr ""
-#~ "Defineix si les anotacions, les ACL i la informació de la quota de les "
-#~ "bústies de correu\n"
-#~ "             també s'han de recuperar en llistar les bústies de correu."
-
-#~ msgid ""
-#~ "Defines if the expunge command is issued automatically, otherwise it "
-#~ "should be\n"
-#~ "             triggered manually through the D-Bus interface."
-#~ msgstr ""
-#~ "Defineix si s'executa automàticament l'ordre d'expurgat, en cas contrari\n"
-#~ "             s'haurà d'activar manualment a través de la interfície D-Bus."
-
-#~ msgid "Define which folder is used for trash"
-#~ msgstr "Defineix quina carpeta s'usa de paperera"
-
-#~ msgid "Define if account uses the default identity"
-#~ msgstr "Defineix si el compte usa la identitat per omissió"
-
-#~ msgid "Identity account"
-#~ msgstr "Identitat del compte"
-
-#~ msgid "RID path to the mailbox to watch for changes"
-#~ msgstr "Camí RID a la bústia de correu per observar els canvis"
-
-#~ msgid "Define if server supports sieve"
-#~ msgstr "Defineix si el servidor accepta «sieve»"
-
-#~ msgid "Define if we reuse host and login configuration"
-#~ msgstr ""
-#~ "Defineix si s'ha de reutilitzar la configuració de màquina i usuari "
-#~ "d'accés"
-
-#~ msgid "Define sieve port"
-#~ msgstr "Defineix el port per «sieve»"
-
-#~ msgid "Define alternate URL"
-#~ msgstr "Defineix un URL alternatiu"
-
-#~ msgid "Define default sieve vacation filename"
-#~ msgstr "Defineix el nom de fitxer de festius per omissió de «sieve»"
-
-#~ msgid "Id of the resource containing the default special collections."
-#~ msgstr "ID del recurs que conté les col·leccions especials per defecte."
-
-#~ msgid ""
-#~ "Id of the maildir resource containing the default special collections."
-#~ msgstr ""
-#~ "ID del recurs directori de correu (maildir) que conté les col·leccions "
-#~ "especials per defecte."
diff -Nru akonadi-mime-19.04.3/po/ca@valencia/libakonadi-kmime5.po akonadi-mime-19.12.3/po/ca@valencia/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ca@valencia/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-19.12.3/po/ca@valencia/libakonadi-kmime5.po	2020-03-03 00:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime5\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2017-12-30 17:37+0100\n"
 "Last-Translator: Josep Ma. Ferrer <txemaq@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -31,7 +31,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Realment voleu buidar les papereres de tots els comptes?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -40,7 +40,7 @@
 "Realment voleu marcar tots els missatges en aquesta carpeta i totes les "
 "seues subcarpetes?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Marca'ls tots recursivament"
@@ -629,107 +629,3 @@
 #, kde-format
 msgid "Permanently delete all messages from the trash folder."
 msgstr "Suprimeix permanentment tots els missatges de la carpeta paperera."
-
-#~ msgid "&Mark Mail as Important"
-#~ msgstr "&Marca el correu com a important"
-
-#~ msgid "&Mark Mail as Action Item"
-#~ msgstr "&Marca el correu com un element d'acció"
-
-#~ msgid "An app that requests LocalFolders"
-#~ msgstr "Una aplicació que demana les carpetes locals"
-
-#~ msgid "Headfetcher"
-#~ msgstr "Obtén les capçaleres"
-
-#~ msgid "header fetching application"
-#~ msgstr "Aplicació que obté les capçaleres"
-
-#~ msgid "Run test on multipart data (default is singlepart)."
-#~ msgstr ""
-#~ "Executa una prova en les dades que consisteixen de múltiples parts (per "
-#~ "omissió és una sola part)."
-
-#~ msgid "IMAP server"
-#~ msgstr "Servidor IMAP"
-
-#~ msgid "Defines the port the IMAP service is running on"
-#~ msgstr "Defineix el port on s'està executant el servei IMAP"
-
-#~ msgid "Username"
-#~ msgstr "Nom d'usuari"
-
-#~ msgid "Defines the encryption type to use"
-#~ msgstr "Defineix el tipus d'encriptatge a usar"
-
-#~ msgid "Defines the authentication type to use"
-#~ msgstr "Defineix el tipus d'autenticació a usar"
-
-#~ msgid "Defines if the server side subscription is enabled"
-#~ msgstr "Defineix si la subscripció de la banda del servidor està habilitada"
-
-#~ msgid "Defines if all the IMAP data should be cached locally all the time"
-#~ msgstr ""
-#~ "Defineix si totes les dades IMAP s'han de desar en la memòria cau local "
-#~ "tot el temps"
-
-#~ msgid "Defines if interval checking is enabled."
-#~ msgstr "Defineix si l'interval de comprovació està habilitat."
-
-#~ msgid "Check interval in minutes"
-#~ msgstr "Interval de comprovació en minuts"
-
-#~ msgid ""
-#~ "Defines if the annotations, ACLs and quota information of mailboxes "
-#~ "should\n"
-#~ "             also be retrieved when the mailboxes get listed."
-#~ msgstr ""
-#~ "Defineix si les anotacions, les ACL i la informació de la quota de les "
-#~ "bústies de correu\n"
-#~ "             també s'han de recuperar en llistar les bústies de correu."
-
-#~ msgid ""
-#~ "Defines if the expunge command is issued automatically, otherwise it "
-#~ "should be\n"
-#~ "             triggered manually through the D-Bus interface."
-#~ msgstr ""
-#~ "Defineix si s'executa automàticament l'ordre d'expurgat, en cas contrari\n"
-#~ "             s'haurà d'activar manualment a través de la interfície D-Bus."
-
-#~ msgid "Define which folder is used for trash"
-#~ msgstr "Defineix quina carpeta s'usa de paperera"
-
-#~ msgid "Define if account uses the default identity"
-#~ msgstr "Defineix si el compte usa la identitat per omissió"
-
-#~ msgid "Identity account"
-#~ msgstr "Identitat del compte"
-
-#~ msgid "RID path to the mailbox to watch for changes"
-#~ msgstr "Camí RID a la bústia de correu per observar els canvis"
-
-#~ msgid "Define if server supports sieve"
-#~ msgstr "Defineix si el servidor accepta «sieve»"
-
-#~ msgid "Define if we reuse host and login configuration"
-#~ msgstr ""
-#~ "Defineix si s'ha de reutilitzar la configuració de màquina i usuari "
-#~ "d'accés"
-
-#~ msgid "Define sieve port"
-#~ msgstr "Defineix el port per «sieve»"
-
-#~ msgid "Define alternate URL"
-#~ msgstr "Defineix un URL alternatiu"
-
-#~ msgid "Define default sieve vacation filename"
-#~ msgstr "Defineix el nom de fitxer de festius per omissió de «sieve»"
-
-#~ msgid "Id of the resource containing the default special collections."
-#~ msgstr "ID del recurs que conté les col·leccions especials per defecte."
-
-#~ msgid ""
-#~ "Id of the maildir resource containing the default special collections."
-#~ msgstr ""
-#~ "ID del recurs directori de correu (maildir) que conté les col·leccions "
-#~ "especials per defecte."
diff -Nru akonadi-mime-19.04.3/po/cs/libakonadi-kmime5.po akonadi-mime-19.12.3/po/cs/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/cs/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-19.12.3/po/cs/libakonadi-kmime5.po	2020-03-03 00:33:05.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-04-04 12:40+0100\n"
 "Last-Translator: Vít Pelčák <vit@pelcak.org>\n"
 "Language-Team: Czech <kde-i18n-doc@kde.org>\n"
@@ -29,7 +29,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Opravdu si přejete vyprázdnit složky koše všech účtů?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -38,7 +38,7 @@
 "Opravdu si přejete označit všechny zprávy v této složce a ve všech jejích "
 "podsložkách?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Označit vše rekurzivně"
diff -Nru akonadi-mime-19.04.3/po/da/libakonadi-kmime5.po akonadi-mime-19.12.3/po/da/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/da/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-19.12.3/po/da/libakonadi-kmime5.po	2020-03-03 00:33:05.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2015-12-08 18:57+0100\n"
 "Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
 "Language-Team: Danish <kde-i18n-doc@kde.org>\n"
@@ -27,7 +27,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Vil du virkelig tømme papirkurvsmapperne for alle konti?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, fuzzy, kde-format
 #| msgid "Do you really want to delete this folder and all its sub-folders?"
 #| msgid_plural ""
@@ -37,7 +37,7 @@
 "subfolders?"
 msgstr "Vil du virkelig slette denne mappe og alle dens undermapper?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, fuzzy, kde-format
 #| msgid "Mark All as Read"
 msgid "Mark All Recursively"
diff -Nru akonadi-mime-19.04.3/po/de/libakonadi-kmime5.po akonadi-mime-19.12.3/po/de/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/de/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-19.12.3/po/de/libakonadi-kmime5.po	2020-03-03 00:33:05.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-11-01 18:04+0100\n"
 "Last-Translator: Burkhard Lück <lueck@hube-lueck.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -27,7 +27,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Sind Sie sicher, dass Sie den Papierkorb aller Konten leeren möchten?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -36,7 +36,7 @@
 "Möchten Sie alle Nachrichten in diesem Ordner und allen seinen Unterordnern "
 "wirklich markieren?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Alle rekursiv markieren"
diff -Nru akonadi-mime-19.04.3/po/el/libakonadi-kmime5.po akonadi-mime-19.12.3/po/el/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/el/libakonadi-kmime5.po	2019-07-09 00:19:37.000000000 +0000
+++ akonadi-mime-19.12.3/po/el/libakonadi-kmime5.po	2020-03-03 00:33:05.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2014-04-26 11:32+0300\n"
 "Last-Translator: Dimitris Kardarakos <dimkard@gmail.com>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -30,7 +30,7 @@
 "Επιθυμείτε πραγματικά να αδειάσετε το φάκελο των απορριμμάτων για όλους τους "
 "λογαριασμούς;"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, fuzzy, kde-format
 #| msgid "Do you really want to delete this folder and all its sub-folders?"
 #| msgid_plural ""
@@ -40,7 +40,7 @@
 "subfolders?"
 msgstr "Επιθυμείτε πραγματικά τη διαγραφή του φακέλου και των υποφακέλων του;"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, fuzzy, kde-format
 #| msgid "Mark All as Read"
 msgid "Mark All Recursively"
diff -Nru akonadi-mime-19.04.3/po/en_GB/libakonadi-kmime5.po akonadi-mime-19.12.3/po/en_GB/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/en_GB/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/en_GB/libakonadi-kmime5.po	2020-03-03 00:33:05.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2017-12-29 15:41+0000\n"
 "Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
 "Language-Team: British English <kde-i18n-doc@kde.org>\n"
@@ -27,7 +27,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Are you sure you want to empty the wastebin folders of all accounts?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -36,7 +36,7 @@
 "Are you sure you want to mark all messages in this folder and all its "
 "subfolders?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Mark All Recursively"
diff -Nru akonadi-mime-19.04.3/po/es/libakonadi-kmime5.po akonadi-mime-19.12.3/po/es/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/es/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/es/libakonadi-kmime5.po	2020-03-03 00:33:05.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-04-05 22:57+0100\n"
 "Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
 "Language-Team: Spanish <l10n-kde-es@kde.org>\n"
@@ -28,7 +28,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "¿Seguro qué desea vaciar las papeleras de todas las cuentas?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -37,7 +37,7 @@
 "¿Esta usted seguro de qué quiere marcar todos los mensajes en esta carpeta y "
 "todas sus subcarpetas?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Marcar todos recursivamente"
diff -Nru akonadi-mime-19.04.3/po/et/libakonadi-kmime5.po akonadi-mime-19.12.3/po/et/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/et/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/et/libakonadi-kmime5.po	2020-03-03 00:33:05.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-07-26 20:42+0300\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <kde-et@linux.ee>\n"
@@ -27,7 +27,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Kas tõesti tühjendada kõigi kontode prügikastid?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -35,7 +35,7 @@
 msgstr ""
 "Kas tõesti märkida kõik selle kausta ja kõigi selle alamkaustade kirjad?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Märgi kõik rekursiivselt"
diff -Nru akonadi-mime-19.04.3/po/fi/libakonadi-kmime5.po akonadi-mime-19.12.3/po/fi/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/fi/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/fi/libakonadi-kmime5.po	2020-03-03 00:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-11-19 15:18+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
@@ -31,7 +31,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Haluatko varmasti tyhjentää kaikkien tilien roskakorit?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -40,7 +40,7 @@
 "Haluatko varmasti merkitä kaikki tämän kansion ja kaikkien sen alikansioiden "
 "viestit?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Merkitse kaikki alikansioistakin"
diff -Nru akonadi-mime-19.04.3/po/fr/libakonadi-kmime5.po akonadi-mime-19.12.3/po/fr/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/fr/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/fr/libakonadi-kmime5.po	2020-03-03 00:33:05.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2017-06-14 09:07+0100\n"
 "Last-Translator: Vincent Pinon <vpinon@kde.org>\n"
 "Language-Team: French <kde-francophone@kde.org>\n"
@@ -35,7 +35,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Voulez-vous vraiment vider les corbeilles de tous les comptes ?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -44,7 +44,7 @@
 "Voulez-vous vraiment marquer tous les messages dans ce dossier et tous ses "
 "sous-dossiers ?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Tout marquer récursivement"
diff -Nru akonadi-mime-19.04.3/po/ga/libakonadi-kmime5.po akonadi-mime-19.12.3/po/ga/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ga/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/ga/libakonadi-kmime5.po	2020-03-03 00:33:05.000000000 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2011-12-28 12:28-0500\n"
 "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -27,7 +27,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, fuzzy, kde-format
 #| msgid "Do you really want to delete this folder and all its sub-folders?"
 #| msgid_plural ""
@@ -39,7 +39,7 @@
 "An bhfuil tú cinnte gur mian leat an fillteán seo a scriosadh in éineacht le "
 "gach fofhillteán atá ann?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, fuzzy, kde-format
 #| msgid "Mark All as Read"
 msgid "Mark All Recursively"
diff -Nru akonadi-mime-19.04.3/po/gl/libakonadi-kmime5.po akonadi-mime-19.12.3/po/gl/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/gl/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/gl/libakonadi-kmime5.po	2020-03-03 00:33:05.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2017-11-03 17:49+0100\n"
 "Last-Translator: Adrián Chaves (Gallaecio) <adrian@chaves.io>\n"
 "Language-Team: Galician <kde-i18n-doc@kde.org>\n"
@@ -18,10 +18,6 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 2.0\n"
-"X-Environment: kde\n"
-"X-Accelerator-Marker: &\n"
-"X-Text-Markup: kde4\n"
 
 #: emptytrashcommand.cpp:60
 #, kde-format
@@ -33,7 +29,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Seguro que quere baleirar os cartafoles do lixo de todas as contas?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -42,7 +38,7 @@
 "Seguro que quere marcar todas as mensaxes deste cartafol e de todos os seus "
 "subcartafoles?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Marcar todo recursivamente"
diff -Nru akonadi-mime-19.04.3/po/hu/libakonadi-kmime5.po akonadi-mime-19.12.3/po/hu/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/hu/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/hu/libakonadi-kmime5.po	2020-03-03 00:33:06.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2014-09-04 15:05+0200\n"
 "Last-Translator: Kristóf Kiszel <ulysses@kubuntu.org>\n"
 "Language-Team: Hungarian <kde-l10n-hu@kde.org>\n"
@@ -28,7 +28,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Biztos, hogy ki akarja üríteni az összes fiók kukáját?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, fuzzy, kde-format
 #| msgid "Do you really want to delete this folder and all its sub-folders?"
 #| msgid_plural ""
@@ -38,7 +38,7 @@
 "subfolders?"
 msgstr "Biztos, hogy törölni akarja ezt a mappát és az almappáját?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, fuzzy, kde-format
 #| msgid "Mark All as Read"
 msgid "Mark All Recursively"
diff -Nru akonadi-mime-19.04.3/po/ia/libakonadi-kmime5.po akonadi-mime-19.12.3/po/ia/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ia/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/ia/libakonadi-kmime5.po	2020-03-03 00:33:06.000000000 +0000
@@ -1,21 +1,21 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
 #
-# g.sora <g.sora@tiscali.it>, 2011, 2012, 2013.
+# g.sora <g.sora@tiscali.it>, 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:42+0200\n"
-"PO-Revision-Date: 2013-06-10 14:18+0200\n"
-"Last-Translator: G.Sora <g.sora@tiscali.it>\n"
-"Language-Team: Interlingua <kde-l10n-ia@kde.org>\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
+"PO-Revision-Date: 2020-01-20 22:26+0100\n"
+"Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
+"Language-Team: Interlingua <kde-i18n-doc@kde.org>\n"
 "Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 
 #: emptytrashcommand.cpp:60
 #, kde-format
@@ -27,7 +27,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Tu es secur que tu vole vacuar le dossier de corbe de omne contos?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, fuzzy, kde-format
 #| msgid "Do you really want to delete this folder and all its sub-folders?"
 #| msgid_plural ""
@@ -37,11 +37,10 @@
 "subfolders?"
 msgstr "Tu vermente vole deler iste dossier e tote su sub-dossieres?"
 
-#: markascommand.cpp:142
-#, fuzzy, kde-format
-#| msgid "Mark All as Read"
+#: markascommand.cpp:143
+#, kde-format
 msgid "Mark All Recursively"
-msgstr "Marca toto como legite"
+msgstr "Marca toto recursivemente"
 
 #: messagemodel.cpp:93
 #, kde-format
@@ -253,10 +252,9 @@
 msgstr "Talia le seligite dossieres ex le conto."
 
 #: standardmailactionmanager.cpp:199
-#, fuzzy, kde-format
-#| msgid "Folder Properties..."
+#, kde-format
 msgid "Folder Properties"
-msgstr "Proprietates de dossier..."
+msgstr "Proprietates de dossier"
 
 #: standardmailactionmanager.cpp:201 standardmailactionmanager.cpp:203
 #, kde-format
diff -Nru akonadi-mime-19.04.3/po/it/libakonadi-kmime5.po akonadi-mime-19.12.3/po/it/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/it/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/it/libakonadi-kmime5.po	2020-03-03 00:33:06.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-11-24 23:07+0100\n"
 "Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
 "Language-Team: Italian <kde-i18n-it@kde.org>\n"
@@ -28,7 +28,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Sei sicuro di voler svuotare i cestini di tutti gli account?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -37,7 +37,7 @@
 "Vuoi davvero segnare tutti i messaggi in questa cartella e tutte le sue "
 "sottocartelle?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Segna tutti ricorsivamente"
diff -Nru akonadi-mime-19.04.3/po/ja/libakonadi-kmime5.po akonadi-mime-19.12.3/po/ja/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ja/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/ja/libakonadi-kmime5.po	2020-03-03 00:33:06.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2010-08-12 22:33-0700\n"
 "Last-Translator: Japanese KDE translation team <kde-jp@kde.org>\n"
 "Language-Team: Japanese <kde-jp@kde.org>\n"
@@ -24,14 +24,14 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
 "subfolders?"
 msgstr ""
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr ""
diff -Nru akonadi-mime-19.04.3/po/kk/libakonadi-kmime5.po akonadi-mime-19.12.3/po/kk/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/kk/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/kk/libakonadi-kmime5.po	2020-03-03 00:33:06.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2013-07-11 04:17+0600\n"
 "Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
 "Language-Team: Kazakh <kde-i18n-doc@kde.org>\n"
@@ -27,7 +27,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Барлық тіркелгілердегі Өшірілгендер шелектерін тазаламақсыз ба?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, fuzzy, kde-format
 #| msgid "Do you really want to delete this folder and all its sub-folders?"
 #| msgid_plural ""
@@ -37,7 +37,7 @@
 "subfolders?"
 msgstr "Шынымен %1 қапшықты, олардын ішіндегісімен бірге, өшірмексіз бе?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, fuzzy, kde-format
 #| msgid "Mark All as Read"
 msgid "Mark All Recursively"
diff -Nru akonadi-mime-19.04.3/po/km/libakonadi-kmime5.po akonadi-mime-19.12.3/po/km/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/km/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/km/libakonadi-kmime5.po	2020-03-03 00:33:06.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2012-07-11 10:23+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer\n"
@@ -29,7 +29,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "តើ​អ្នក​ពិតជា​ចង់​សម្អាត​ថត​ធុង​សំរាម​នៃ​គណនី​ទាំងអស់​ឬ ?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, fuzzy, kde-format
 #| msgid "Do you really want to delete this folder and all its sub-folders?"
 #| msgid_plural ""
@@ -39,7 +39,7 @@
 "subfolders?"
 msgstr "តើ​អ្នក​ពិតជា​ចង់​លុប​ថត %1 និង​ថត​រង​ទាំងអស់​របស់​វា​ឬ ?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, fuzzy, kde-format
 #| msgid "Mark All as Read"
 msgid "Mark All Recursively"
diff -Nru akonadi-mime-19.04.3/po/ko/libakonadi-kmime5.po akonadi-mime-19.12.3/po/ko/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ko/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/ko/libakonadi-kmime5.po	2020-03-03 00:33:06.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-12-11 23:22+0100\n"
 "Last-Translator: Shinjo Park <kde@peremen.name>\n"
 "Language-Team: Korean <kde-kr@kde.org>\n"
@@ -27,14 +27,14 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "모든 계정의 휴지통 폴더를 비우시겠습니까?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
 "subfolders?"
 msgstr "이 폴더와 모든 하위 폴더의 메시지를 표시하시겠습니까?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "재귀적으로 모두 표시"
diff -Nru akonadi-mime-19.04.3/po/lt/libakonadi-kmime5.po akonadi-mime-19.12.3/po/lt/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/lt/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/lt/libakonadi-kmime5.po	2020-03-03 00:33:06.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2015-12-29 23:01+0200\n"
 "Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba@gmail.com>\n"
 "Language-Team: lt <kde-i18n-lt@kde.org>\n"
@@ -32,7 +32,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Ar tikrai norite ištuštinti šiukšlines visų paskyrų?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, fuzzy, kde-format
 #| msgid "Do you really want to delete this folder and all its sub-folders?"
 #| msgid_plural ""
@@ -42,7 +42,7 @@
 "subfolders?"
 msgstr "Ar tikrai norite šalinti šį aplanką ir visus jo poaplankius?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, fuzzy, kde-format
 #| msgid "Mark All as Read"
 msgid "Mark All Recursively"
diff -Nru akonadi-mime-19.04.3/po/mr/libakonadi-kmime5.po akonadi-mime-19.12.3/po/mr/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/mr/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/mr/libakonadi-kmime5.po	2020-03-03 00:33:06.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2013-04-12 14:48+0530\n"
 "Last-Translator: Chetan Khona <chetan@kompkin.com>\n"
 "Language-Team: Marathi <kde-i18n-doc@kde.org>\n"
@@ -27,14 +27,14 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
 "subfolders?"
 msgstr ""
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr ""
diff -Nru akonadi-mime-19.04.3/po/nb/libakonadi-kmime5.po akonadi-mime-19.12.3/po/nb/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/nb/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/nb/libakonadi-kmime5.po	2020-03-03 00:33:06.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2014-09-23 21:53+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -29,14 +29,14 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Er du sikker på at du vil tømme papirkurvmappene for alle kontoene?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
 "subfolders?"
 msgstr ""
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr ""
diff -Nru akonadi-mime-19.04.3/po/nds/libakonadi-kmime5.po akonadi-mime-19.12.3/po/nds/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/nds/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/nds/libakonadi-kmime5.po	2020-03-03 00:33:06.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2014-08-14 00:08+0200\n"
 "Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
 "Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
@@ -30,7 +30,7 @@
 msgstr ""
 "Büst Du seker, wat Du de Affalltünnen vun all Kontos leddig maken wullt?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, fuzzy, kde-format
 #| msgid "Do you really want to delete this folder and all its sub-folders?"
 #| msgid_plural ""
@@ -40,7 +40,7 @@
 "subfolders?"
 msgstr "Wullt Du dissen Orner un all sien Ünnerornern redig wegdoon?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, fuzzy, kde-format
 #| msgid "Mark All as Read"
 msgid "Mark All Recursively"
diff -Nru akonadi-mime-19.04.3/po/nl/libakonadi-kmime5.po akonadi-mime-19.12.3/po/nl/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/nl/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/nl/libakonadi-kmime5.po	2020-03-03 00:33:06.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-11-20 14:23+0100\n"
 "Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
 "Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
@@ -27,14 +27,14 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Wilt u de prullenbak van alle accounts legen?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
 "subfolders?"
 msgstr "Wilt u alle berichten in deze map en al haar submappen markeren?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Alles recursief markeren"
diff -Nru akonadi-mime-19.04.3/po/pl/libakonadi-kmime5.po akonadi-mime-19.12.3/po/pl/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/pl/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/pl/libakonadi-kmime5.po	2020-03-03 00:33:06.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-04-02 07:03+0100\n"
 "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -28,7 +28,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Czy na pewno chcesz opróżnić katalogi koszy dla wszystkich kont?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -36,7 +36,7 @@
 msgstr ""
 "Czy na pewno oznaczyć wszystkie wiadomości w tym katalogu jego podkataloach?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Oznacz wszystkie rekursywnie"
diff -Nru akonadi-mime-19.04.3/po/pt/libakonadi-kmime5.po akonadi-mime-19.12.3/po/pt/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/pt/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/pt/libakonadi-kmime5.po	2020-03-03 00:33:06.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-04-01 12:09+0100\n"
 "Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
 "Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
@@ -24,7 +24,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Tem a certeza que quer esvaziar as pasta de lixo de todas as contas?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -33,7 +33,7 @@
 "Tem a certeza que deseja marcar todas as mensagens nesta pasta e todas as "
 "suas sub-pastas?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Marcar Tudo Recursivamente"
diff -Nru akonadi-mime-19.04.3/po/pt_BR/libakonadi-kmime5.po akonadi-mime-19.12.3/po/pt_BR/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/pt_BR/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/pt_BR/libakonadi-kmime5.po	2020-03-03 00:33:06.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime5\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-04-02 14:26-0300\n"
 "Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
 "Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
@@ -31,7 +31,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Deseja realmente esvaziar as pastas de lixo de todas as contas?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -39,7 +39,7 @@
 msgstr ""
 "Deseja realmente marcar todas as mensagens desta pasta e suas subpastas?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Marcar todas recursivamente"
diff -Nru akonadi-mime-19.04.3/po/ro/libakonadi-kmime5.po akonadi-mime-19.12.3/po/ro/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ro/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/ro/libakonadi-kmime5.po	2020-03-03 00:33:06.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2013-01-12 09:29+0200\n"
 "Last-Translator: Sergiu Bivol <sergiu@ase.md>\n"
 "Language-Team: Romanian <kde-i18n-ro@kde.org>\n"
@@ -28,7 +28,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Sigur doriți să goliți dosarele cu gunoi pentru toate conturile?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, fuzzy, kde-format
 #| msgid "Do you really want to delete this folder and all its sub-folders?"
 #| msgid_plural ""
@@ -38,7 +38,7 @@
 "subfolders?"
 msgstr "Sigur doriți să ștergeți acest dosar și toate subdosarele sale?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, fuzzy, kde-format
 #| msgid "Mark All as Read"
 msgid "Mark All Recursively"
diff -Nru akonadi-mime-19.04.3/po/ru/libakonadi-kmime5.po akonadi-mime-19.12.3/po/ru/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ru/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/ru/libakonadi-kmime5.po	2020-03-03 00:33:06.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2018-08-14 09:44+0300\n"
 "Last-Translator: Александр Яворский <yavorsky.a@t-rosta.com>\n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -33,14 +33,14 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Очистить корзины всех почтовых ящиков?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
 "subfolders?"
 msgstr "Отметить все письма в этой папке и всех её вложенных папках?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Отметить все рекурсивно"
diff -Nru akonadi-mime-19.04.3/po/sk/libakonadi-kmime5.po akonadi-mime-19.12.3/po/sk/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/sk/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/sk/libakonadi-kmime5.po	2020-03-03 00:33:06.000000000 +0000
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime5\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-04-02 21:22+0100\n"
 "Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
 "Language-Team: Slovak <kde-sk@linux.sk>\n"
@@ -25,7 +25,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Naozaj chcete vyprázdniť priečinky koša zo všetkých účtov?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -34,7 +34,7 @@
 "Naozaj chcete označiť všetky správy v tomto priečinku a všetkých jeho "
 "podpriečinkoch?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Označiť všetko rekurzívne"
diff -Nru akonadi-mime-19.04.3/po/sl/libakonadi-kmime5.po akonadi-mime-19.12.3/po/sl/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/sl/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/sl/libakonadi-kmime5.po	2020-03-03 00:33:06.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-11-20 12:12+0100\n"
 "Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -30,7 +30,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Ali res želite izprazniti mape s smetmi za vse račune?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -39,7 +39,7 @@
 "Ali ste prepričani, da želite označiti vsa sporočila v tej mapi in vseh "
 "njenih podmapah?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Označi vsa rekurzivno"
diff -Nru akonadi-mime-19.04.3/po/sr/libakonadi-kmime5.po akonadi-mime-19.12.3/po/sr/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/sr/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/sr/libakonadi-kmime5.po	2020-03-03 00:33:07.000000000 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime5\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-08-16 09:11+0200\n"
+"POT-Creation-Date: 2019-04-11 03:40+0200\n"
 "PO-Revision-Date: 2016-04-11 00:10+0200\n"
 "Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
 "Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
@@ -30,7 +30,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Желите ли заиста да испразните фасцикле за смеће на свим налозима?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -39,7 +39,7 @@
 "Желите ли заиста да означите све поруке у овој фасцикли и свим потфасциклама?"
 
 # >> @title:window
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Рекурзивно означавање свега"
diff -Nru akonadi-mime-19.04.3/po/sv/libakonadi-kmime5.po akonadi-mime-19.12.3/po/sv/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/sv/libakonadi-kmime5.po	2019-07-09 00:19:38.000000000 +0000
+++ akonadi-mime-19.12.3/po/sv/libakonadi-kmime5.po	2020-03-03 00:33:07.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:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-04-01 15:52+0100\n"
 "Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
 "Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
@@ -28,7 +28,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Vill du verkligen tömma papperskorgarna för alla konton?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -36,7 +36,7 @@
 msgstr ""
 "Är du säker på att du vill markera alla brev i korgen och dess underkorgar?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Markera alla rekursivt"
diff -Nru akonadi-mime-19.04.3/po/tr/libakonadi-kmime5.po akonadi-mime-19.12.3/po/tr/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/tr/libakonadi-kmime5.po	2019-07-09 00:19:39.000000000 +0000
+++ akonadi-mime-19.12.3/po/tr/libakonadi-kmime5.po	2020-03-03 00:33:07.000000000 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: kdepimlibs-kde4\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2017-06-05 11:43+0000\n"
 "Last-Translator: Kaan <kaanozdincer@gmail.com>\n"
 "Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
@@ -32,7 +32,7 @@
 msgstr ""
 "Tüm hesaplardaki çöp dizinlerini boşaltmak istediğinizden emin misiniz?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -41,7 +41,7 @@
 "Bu klasör ve tüm alt klasörlerde tüm iletileri işaretlemek istediğinizden "
 "emin misiniz?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Tümü Yinelemeli İşaretle"
diff -Nru akonadi-mime-19.04.3/po/ug/libakonadi-kmime5.po akonadi-mime-19.12.3/po/ug/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/ug/libakonadi-kmime5.po	2019-07-09 00:19:39.000000000 +0000
+++ akonadi-mime-19.12.3/po/ug/libakonadi-kmime5.po	2020-03-03 00:33:07.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2013-09-08 07:05+0900\n"
 "Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
 "Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
@@ -27,7 +27,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr ""
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, fuzzy, kde-format
 #| msgid "Do you really want to delete this folder and all its sub-folders?"
 #| msgid_plural ""
@@ -37,7 +37,7 @@
 "subfolders?"
 msgstr "قىسقۇچ %1 ۋە ئۇنىڭ ئىچىدىكى بارلىق تارماق قىسقۇچلارنى ئۆچۈرەمسىز؟"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr ""
diff -Nru akonadi-mime-19.04.3/po/uk/libakonadi-kmime5.po akonadi-mime-19.12.3/po/uk/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/uk/libakonadi-kmime5.po	2019-07-09 00:19:39.000000000 +0000
+++ akonadi-mime-19.12.3/po/uk/libakonadi-kmime5.po	2020-03-03 00:33:07.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: libakonadi-kmime5\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2016-04-01 17:27+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -30,7 +30,7 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "Ви дійсно хочете спорожнити смітники всіх облікових записів?"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
@@ -38,7 +38,7 @@
 msgstr ""
 "Ви справді бажаєте позначити усі повідомлення у цій теці і всіх її підтеках?"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "Позначити усі рекурсивно"
diff -Nru akonadi-mime-19.04.3/po/zh_CN/libakonadi-kmime5.po akonadi-mime-19.12.3/po/zh_CN/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/zh_CN/libakonadi-kmime5.po	2019-07-09 00:19:39.000000000 +0000
+++ akonadi-mime-19.12.3/po/zh_CN/libakonadi-kmime5.po	2020-03-03 00:33:07.000000000 +0000
@@ -6,16 +6,15 @@
 msgstr ""
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
-"PO-Revision-Date: 2019-06-02 13:15\n"
-"Last-Translator: Guo Yunhe (guoyunhe)\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
+"PO-Revision-Date: 2020-01-20 21:56\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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/libakonadi-kmime5.pot\n"
@@ -30,14 +29,14 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "您确定要清空全部账户的废件夹吗？"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
 "subfolders?"
 msgstr "您确定要将文件夹及其子文件夹中的所有信件标记为已读吗？"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "递归标记全部"
diff -Nru akonadi-mime-19.04.3/po/zh_TW/libakonadi-kmime5.po akonadi-mime-19.12.3/po/zh_TW/libakonadi-kmime5.po
--- akonadi-mime-19.04.3/po/zh_TW/libakonadi-kmime5.po	2019-07-09 00:19:39.000000000 +0000
+++ akonadi-mime-19.12.3/po/zh_TW/libakonadi-kmime5.po	2020-03-03 00:33:07.000000000 +0000
@@ -7,10 +7,10 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n"
-"POT-Creation-Date: 2019-05-20 07:42+0200\n"
+"POT-Creation-Date: 2019-05-20 03:14+0200\n"
 "PO-Revision-Date: 2019-03-22 00:54+0800\n"
 "Last-Translator: pan93412 <pan93412@gmail.com>\n"
-"Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
+"Language-Team: Chinese <zh-l10n@lists.linux.org.tw>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -28,14 +28,14 @@
 msgid "Are you sure you want to empty the trash folders of all accounts?"
 msgstr "你確定要將所有帳號的垃圾桶清空嗎？"
 
-#: markascommand.cpp:141
+#: markascommand.cpp:142
 #, kde-format
 msgid ""
 "Are you sure you want to mark all messages in this folder and all its "
 "subfolders?"
 msgstr "確定標記此資料夾以及其子資料夾中的所有信件？"
 
-#: markascommand.cpp:142
+#: markascommand.cpp:143
 #, kde-format
 msgid "Mark All Recursively"
 msgstr "遞迴標記已讀"
diff -Nru akonadi-mime-19.04.3/src/addressattribute.h akonadi-mime-19.12.3/src/addressattribute.h
--- akonadi-mime-19.04.3/src/addressattribute.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/src/addressattribute.h	2020-02-16 09:00:26.000000000 +0000
@@ -27,10 +27,6 @@
 
 #include <attribute.h>
 
-namespace MailTransport {
-class Transport;
-}
-
 namespace Akonadi {
 /**
   Attribute storing the From, To, Cc, Bcc addresses of a message.
diff -Nru akonadi-mime-19.04.3/src/CMakeLists.txt akonadi-mime-19.12.3/src/CMakeLists.txt
--- akonadi-mime-19.04.3/src/CMakeLists.txt	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/src/CMakeLists.txt	2020-02-16 09:00:26.000000000 +0000
@@ -49,12 +49,9 @@
 add_resource_iface(imapresource.kcfg
     org.kde.Akonadi.Imap.Settings ImapSettings)
 
-#REACTIVATE
-#if (KDE4_BUILD_TESTS)
-#    set(akonadimime_SRCS
-#        ${akonadimime_SRCS}
-#        specialmailcollectionstesting.cpp
-#    )
+# TODO: add the necessary API in SpecialCollections
+#if (BUILD_TESTING)
+#    list(APPEND akonadimime_SRCS specialmailcollectionstesting.cpp)
 #endif()
 
 kconfig_add_kcfg_files(akonadimime_SRCS
@@ -147,5 +144,7 @@
 
 ## install the MIME type spec file for KDEPIM specific MIME types
 install(FILES x-vnd.kde.contactgroup.xml DESTINATION ${KDE_INSTALL_MIMEDIR})
-update_xdg_mimetypes(${KDE_INSTALL_MIMEDIR})
+if (NOT NO_REGENERATE_MIME)
+  update_xdg_mimetypes(${KDE_INSTALL_MIMEDIR})
+endif()  
 
diff -Nru akonadi-mime-19.04.3/src/emptytrashcommand.cpp akonadi-mime-19.12.3/src/emptytrashcommand.cpp
--- akonadi-mime-19.04.3/src/emptytrashcommand.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/src/emptytrashcommand.cpp	2020-02-16 09:00:26.000000000 +0000
@@ -144,10 +144,11 @@
 Akonadi::AgentInstance::List EmptyTrashCommand::agentInstances()
 {
     Akonadi::AgentInstance::List relevantInstances;
-    foreach (const Akonadi::AgentInstance &instance, Akonadi::AgentManager::self()->instances()) {
+    const auto instances = Akonadi::AgentManager::self()->instances();
+    for (const Akonadi::AgentInstance &instance : instances) {
         if (instance.type().mimeTypes().contains(KMime::Message::mimeType())
-            && instance.type().capabilities().contains(QStringLiteral("Resource"))
-            && !instance.type().capabilities().contains(QStringLiteral("Virtual"))) {
+            && instance.type().capabilities().contains(QLatin1String("Resource"))
+            && !instance.type().capabilities().contains(QLatin1String("Virtual"))) {
             relevantInstances << instance;
         }
     }
diff -Nru akonadi-mime-19.04.3/src/markascommand.cpp akonadi-mime-19.12.3/src/markascommand.cpp
--- akonadi-mime-19.04.3/src/markascommand.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/src/markascommand.cpp	2020-02-16 09:00:26.000000000 +0000
@@ -108,7 +108,8 @@
 
     Akonadi::ItemFetchJob *fjob = static_cast<Akonadi::ItemFetchJob *>(job);
     d->mMessages.clear();
-    foreach (const Akonadi::Item &item, fjob->items()) {
+    const auto items = fjob->items();
+    for (const Akonadi::Item &item : items) {
         Akonadi::MessageStatus status;
         status.setStatusFromFlags(item.flags());
         if (d->mInvertMark) {
@@ -170,7 +171,7 @@
     }
 
     Akonadi::Item::List itemsToModify;
-    foreach (const Akonadi::Item &it, d->mMessages) {
+    for (const Akonadi::Item &it : qAsConst(d->mMessages)) {
         Akonadi::Item item(it);
 
         // be careful to only change the flags we want to change, not to overwrite them
diff -Nru akonadi-mime-19.04.3/src/messagemodel.cpp akonadi-mime-19.12.3/src/messagemodel.cpp
--- akonadi-mime-19.04.3/src/messagemodel.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/src/messagemodel.cpp	2020-02-16 09:00:26.000000000 +0000
@@ -56,7 +56,7 @@
 {
     Q_UNUSED(parent);
     if (collection().isValid()
-        && !collection().contentMimeTypes().contains(QStringLiteral("message/rfc822"))
+        && !collection().contentMimeTypes().contains(QLatin1String("message/rfc822"))
         && collection().contentMimeTypes() != QStringList(QStringLiteral("inode/directory"))) {
         return 1;
     }
@@ -67,7 +67,7 @@
 int MessageModel::columnCount(const QModelIndex &parent) const
 {
     if (collection().isValid()
-        && !collection().contentMimeTypes().contains(QStringLiteral("message/rfc822"))
+        && !collection().contentMimeTypes().contains(QLatin1String("message/rfc822"))
         && collection().contentMimeTypes() != QStringList(QStringLiteral("inode/directory"))) {
         return 1;
     }
@@ -88,7 +88,7 @@
         return QVariant();
     }
 
-    if (!collection().contentMimeTypes().contains(QStringLiteral("message/rfc822"))) {
+    if (!collection().contentMimeTypes().contains(QLatin1String("message/rfc822"))) {
         if (role == Qt::DisplayRole) {
             return i18nc("@label", "This model can only handle email folders. The current collection holds mimetypes: %1",
                          collection().contentMimeTypes().join(QLatin1Char(',')));
@@ -143,7 +143,7 @@
 QVariant MessageModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
     if (collection().isValid()
-        && !collection().contentMimeTypes().contains(QStringLiteral("message/rfc822"))
+        && !collection().contentMimeTypes().contains(QLatin1String("message/rfc822"))
         && collection().contentMimeTypes() != QStringList(QStringLiteral("inode/directory"))) {
         return QVariant();
     }
diff -Nru akonadi-mime-19.04.3/src/specialmailcollectionstesting.cpp akonadi-mime-19.12.3/src/specialmailcollectionstesting.cpp
--- akonadi-mime-19.04.3/src/specialmailcollectionstesting.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/src/specialmailcollectionstesting.cpp	2020-02-16 09:00:26.000000000 +0000
@@ -29,11 +29,8 @@
 
 SpecialMailCollectionsTesting *SpecialMailCollectionsTesting::_t_self()
 {
-    static SpecialMailCollectionsTesting *instance = 0;
-    if (!instance) {
-        instance = new SpecialMailCollectionsTesting;
-    }
-    return instance;
+    static SpecialMailCollectionsTesting instance;
+    return &instance;
 }
 
 void SpecialMailCollectionsTesting::_t_setDefaultResourceId(const QString &resourceId)
diff -Nru akonadi-mime-19.04.3/src/specialmailcollectionstesting_p.h akonadi-mime-19.12.3/src/specialmailcollectionstesting_p.h
--- akonadi-mime-19.04.3/src/specialmailcollectionstesting_p.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/src/specialmailcollectionstesting_p.h	2020-02-16 09:00:26.000000000 +0000
@@ -20,7 +20,7 @@
 #ifndef AKONADI_SPECIALMAILCOLLECTIONSTESTING_P_H
 #define AKONADI_SPECIALMAILCOLLECTIONSTESTING_P_H
 
-#include "akonadi-kmimeprivate_export.h"
+#include "akonadi-mimeprivate_export.h"
 #include "specialmailcollections.h"
 
 namespace Akonadi {
@@ -29,7 +29,7 @@
   Class that exposes SpecialMailCollections' private methods for use in unit tests.
   HACK Is there a better way to do this?
 */
-class AKONADI_KMIME_TEST_EXPORT SpecialMailCollectionsTesting
+class AKONADI_MIME_TEST_EXPORT SpecialMailCollectionsTesting
 {
 public:
     static SpecialMailCollectionsTesting *_t_self();
diff -Nru akonadi-mime-19.04.3/src/standardmailactionmanager.cpp akonadi-mime-19.12.3/src/standardmailactionmanager.cpp
--- akonadi-mime-19.04.3/src/standardmailactionmanager.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/src/standardmailactionmanager.cpp	2020-02-16 09:00:26.000000000 +0000
@@ -477,7 +477,7 @@
             }
         } else {
             if (data.startsWith('!')) {
-                data = data.mid(1);
+                data.remove(0, 1);
             }
         }
         action->setData(data);
@@ -499,7 +499,7 @@
         bool invert = false;
         if (typeStr.startsWith('!')) {
             invert = true;
-            typeStr = typeStr.mid(1);
+            typeStr.remove(0, 1);
         }
 
         Akonadi::MessageStatus targetStatus;
@@ -543,12 +543,12 @@
         bool invert = false;
         if (typeStr.startsWith('!')) {
             invert = true;
-            typeStr = typeStr.mid(1);
+            typeStr.remove(0, 1);
         }
         bool recursive = false;
         if (typeStr.startsWith(':')) {
             recursive = true;
-            typeStr = typeStr.mid(1);
+            typeStr.remove(0, 1);
         }
 
         StandardMailActionManager::Type type = MarkAllMailAsRead;
diff -Nru akonadi-mime-19.04.3/tests/CMakeLists.txt akonadi-mime-19.12.3/tests/CMakeLists.txt
--- akonadi-mime-19.04.3/tests/CMakeLists.txt	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/tests/CMakeLists.txt	2020-02-16 09:00:26.000000000 +0000
@@ -6,12 +6,6 @@
 add_executable( requester "${requester_srcs}" )
 target_link_libraries( requester KF5::AkonadiMime KF5::I18n Qt5::Widgets )
 
-if (KDEPIMLIBS_RUN_KDEPIMRUNTIME_ISOLATED_TESTS)
-  # for racetest
-  set(requester_exe_string "QLatin1String( \\\"${CMAKE_CURRENT_BINARY_DIR}/requester\\\" )" )
-  add_definitions( -DREQUESTER_EXE="${requester_exe_string}" )
-endif()
-
 # convenience macro to add akonadi demo application
 macro(add_akonadimime_demo _source)
   set(_test ${_source})
diff -Nru akonadi-mime-19.04.3/tests/headfetcher.cpp akonadi-mime-19.12.3/tests/headfetcher.cpp
--- akonadi-mime-19.04.3/tests/headfetcher.cpp	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/tests/headfetcher.cpp	2020-02-16 09:00:26.000000000 +0000
@@ -55,7 +55,8 @@
         }
         ifj->exec();
         qDebug() << "  Listing" << ifj->items().count() << "item headers.";
-        foreach (const Item &item, ifj->items()) {
+        const auto items = ifj->items();
+        for (const Item &item : items) {
             qDebug() << item.payload<KMime::Message::Ptr>()->subject()->asUnicodeString();
         }
     }
diff -Nru akonadi-mime-19.04.3/tests/headfetcher.h akonadi-mime-19.12.3/tests/headfetcher.h
--- akonadi-mime-19.04.3/tests/headfetcher.h	2019-06-24 05:02:32.000000000 +0000
+++ akonadi-mime-19.12.3/tests/headfetcher.h	2020-02-16 09:00:26.000000000 +0000
@@ -21,7 +21,7 @@
 #define HEADFETCHER_H
 
 #include <QObject>
-#include <QTime>
+#include <QElapsedTimer>
 
 class HeadFetcher : public QObject
 {
@@ -31,7 +31,7 @@
 private Q_SLOTS:
     void stop();
 private:
-    QTime timer;
+    QElapsedTimer timer;
 };
 
 #endif