diff -Nru pim-data-exporter-17.12.3/CMakeLists.txt pim-data-exporter-18.04.3/CMakeLists.txt --- pim-data-exporter-17.12.3/CMakeLists.txt 2018-03-06 00:30:27.000000000 +0000 +++ pim-data-exporter-18.04.3/CMakeLists.txt 2018-07-10 00:14:58.000000000 +0000 @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.1) -set(KDEPIM_VERSION_NUMBER "5.7.3") +set(KDEPIM_VERSION_NUMBER "5.8.3") project(pim-data-exporter VERSION ${KDEPIM_VERSION_NUMBER}) -set(KF5_VERSION "5.39.0") +set(KF5_VERSION "5.44.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -26,7 +26,7 @@ include(ECMQtDeclareLoggingCategory) include(ECMCoverageOption) # Do NOT add quote -set(KDEPIM_DEV_VERSION ) +set(KDEPIM_DEV_VERSION) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) @@ -39,17 +39,17 @@ set(KDEPIM_LIB_SOVERSION "5") set(QT_REQUIRED_VERSION "5.8.0") -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Xml Test) +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test) -set(AKONADI_VERSION "5.7.3") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.7.3") -set(KCONTACTS_LIB_VERSION "5.7.3") -set(KMAILTRANSPORT_LIB_VERSION "5.7.3") -set(KMIME_LIB_VERSION "5.7.3") -set(KPIMTEXTEDIT_LIB_VERSION "5.7.3") -set(LIBKDEPIM_LIB_VERSION_LIB "5.7.3") -set(MAILCOMMON_LIB_VERSION_LIB "5.7.3") -set(PIMCOMMON_LIB_VERSION_LIB "5.7.3") +set(AKONADI_VERSION "5.8.3") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.8.3") +set(KCONTACTS_LIB_VERSION "5.8.3") +set(KMAILTRANSPORT_LIB_VERSION "5.8.3") +set(KMIME_LIB_VERSION "5.8.3") +set(KPIMTEXTEDIT_LIB_VERSION "5.8.3") +set(LIBKDEPIM_LIB_VERSION_LIB "5.8.3") +set(MAILCOMMON_LIB_VERSION_LIB "5.8.3") +set(PIMCOMMON_LIB_VERSION_LIB "5.8.3") # Find KF5 package find_package(KF5Archive ${KF5_VERSION} REQUIRED) diff -Nru pim-data-exporter-17.12.3/console/autotests/loginfiletest.cpp pim-data-exporter-18.04.3/console/autotests/loginfiletest.cpp --- pim-data-exporter-17.12.3/console/autotests/loginfiletest.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/console/autotests/loginfiletest.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/console/autotests/loginfiletest.h pim-data-exporter-18.04.3/console/autotests/loginfiletest.h --- pim-data-exporter-17.12.3/console/autotests/loginfiletest.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/console/autotests/loginfiletest.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/console/importexportprogressindicatorconsole.cpp pim-data-exporter-18.04.3/console/importexportprogressindicatorconsole.cpp --- pim-data-exporter-17.12.3/console/importexportprogressindicatorconsole.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/console/importexportprogressindicatorconsole.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/console/importexportprogressindicatorconsole.h pim-data-exporter-18.04.3/console/importexportprogressindicatorconsole.h --- pim-data-exporter-17.12.3/console/importexportprogressindicatorconsole.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/console/importexportprogressindicatorconsole.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -27,7 +27,7 @@ Q_OBJECT public: explicit ImportExportProgressIndicatorConsole(QObject *parent = nullptr); - ~ImportExportProgressIndicatorConsole(); + ~ImportExportProgressIndicatorConsole() override; private: void setProgressDialogLabel(const QString &text) override; diff -Nru pim-data-exporter-17.12.3/console/loginfile.cpp pim-data-exporter-18.04.3/console/loginfile.cpp --- pim-data-exporter-17.12.3/console/loginfile.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/console/loginfile.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/console/loginfile.h pim-data-exporter-18.04.3/console/loginfile.h --- pim-data-exporter-17.12.3/console/loginfile.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/console/loginfile.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/console/loginfo.cpp pim-data-exporter-18.04.3/console/loginfo.cpp --- pim-data-exporter-17.12.3/console/loginfo.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/console/loginfo.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/console/loginfo.h pim-data-exporter-18.04.3/console/loginfo.h --- pim-data-exporter-17.12.3/console/loginfo.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/console/loginfo.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/console/main.cpp pim-data-exporter-18.04.3/console/main.cpp --- pim-data-exporter-17.12.3/console/main.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/console/main.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -36,7 +36,7 @@ QCommandLineParser parser; KAboutData aboutData(QStringLiteral("pimsettingexporterconsole"), i18n("PIM Setting Exporter Console"), QStringLiteral(PIMSETTINGEXPORTER_VERSION), i18n("PIM Setting Exporter Console"), KAboutLicense::GPL_V2, - i18n("Copyright © 2015-2017 pimsettingexporter authors")); + i18n("Copyright © 2015-2018 pimsettingexporter authors")); aboutData.addAuthor(i18n("Laurent Montel"), i18n("Maintainer"), QStringLiteral("montel@kde.org")); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("logfile"), i18n("File to log information to."), QStringLiteral("file"))); parser.addOption(QCommandLineOption(QStringList() << QStringLiteral("template"), i18n("Template file to define what data, settings to import or export."), QStringLiteral("file"))); diff -Nru pim-data-exporter-17.12.3/console/pimsettingexporterconsole.cpp pim-data-exporter-18.04.3/console/pimsettingexporterconsole.cpp --- pim-data-exporter-17.12.3/console/pimsettingexporterconsole.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/console/pimsettingexporterconsole.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/console/pimsettingexporterconsole.h pim-data-exporter-18.04.3/console/pimsettingexporterconsole.h --- pim-data-exporter-17.12.3/console/pimsettingexporterconsole.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/console/pimsettingexporterconsole.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/abstractimportexportjob.cpp pim-data-exporter-18.04.3/core/abstractimportexportjob.cpp --- pim-data-exporter-17.12.3/core/abstractimportexportjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/abstractimportexportjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/abstractimportexportjob.h pim-data-exporter-18.04.3/core/abstractimportexportjob.h --- pim-data-exporter-17.12.3/core/abstractimportexportjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/abstractimportexportjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/addressbook/exportaddressbookjob.cpp pim-data-exporter-18.04.3/core/addressbook/exportaddressbookjob.cpp --- pim-data-exporter-17.12.3/core/addressbook/exportaddressbookjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/addressbook/exportaddressbookjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -90,10 +90,10 @@ if (mIndexIdentifier < list.count()) { Akonadi::AgentInstance agent = list.at(mIndexIdentifier); const QString identifier = agent.identifier(); - if (identifier.contains(QStringLiteral("akonadi_vcarddir_resource_")) || identifier.contains(QStringLiteral("akonadi_contacts_resource_"))) { + if (identifier.contains(QLatin1String("akonadi_vcarddir_resource_")) || identifier.contains(QLatin1String("akonadi_contacts_resource_"))) { const QString archivePath = Utils::addressbookPath() + identifier + QDir::separator(); - QString url = Utils::resourcePath(agent, QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/share/contacts/")); + QString url = Utils::resourcePath(agent, QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/contacts/")); if (!mAgentPaths.contains(url)) { mAgentPaths << url; if (!url.isEmpty()) { @@ -114,7 +114,7 @@ } else { QTimer::singleShot(0, this, &ExportAddressbookJob::slotAddressbookJobTerminated); } - } else if (identifier.contains(QStringLiteral("akonadi_vcard_resource_"))) { + } else if (identifier.contains(QLatin1String("akonadi_vcard_resource_"))) { backupResourceFile(agent, Utils::addressbookPath()); QTimer::singleShot(0, this, &ExportAddressbookJob::slotAddressbookJobTerminated); } else { diff -Nru pim-data-exporter-17.12.3/core/addressbook/exportaddressbookjob.h pim-data-exporter-18.04.3/core/addressbook/exportaddressbookjob.h --- pim-data-exporter-17.12.3/core/addressbook/exportaddressbookjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/addressbook/exportaddressbookjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -29,7 +29,7 @@ Q_OBJECT public: explicit ExportAddressbookJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ExportAddressbookJob(); + ~ExportAddressbookJob() override; void start() override; diff -Nru pim-data-exporter-17.12.3/core/addressbook/importaddressbookjob.cpp pim-data-exporter-18.04.3/core/addressbook/importaddressbookjob.cpp --- pim-data-exporter-17.12.3/core/addressbook/importaddressbookjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/addressbook/importaddressbookjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -93,8 +93,8 @@ for (int i = 0; i < numberOfResourceFile; ++i) { resourceFiles value = mListResourceFile.at(i); QMap settings; - if (value.akonadiConfigFile.contains(QStringLiteral("akonadi_vcarddir_resource_")) - || value.akonadiConfigFile.contains(QStringLiteral("akonadi_contacts_resource_"))) { + if (value.akonadiConfigFile.contains(QLatin1String("akonadi_vcarddir_resource_")) + || value.akonadiConfigFile.contains(QLatin1String("akonadi_contacts_resource_"))) { const KArchiveEntry *fileResouceEntry = mArchiveDirectory->entry(value.akonadiConfigFile); if (fileResouceEntry && fileResouceEntry->isFile()) { const KArchiveFile *file = static_cast(fileResouceEntry); @@ -106,14 +106,14 @@ KSharedConfig::Ptr resourceConfig = KSharedConfig::openConfig(copyToDirName + QLatin1Char('/') + resourceName); //TODO fix default path - const QString newUrl = Utils::adaptResourcePath(resourceConfig, QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/share/contacts")); + const QString newUrl = Utils::adaptResourcePath(resourceConfig, QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1String("/contacts")); QFileInfo newUrlInfo(newUrl); const QString dataFile = value.akonadiResources; const KArchiveEntry *dataResouceEntry = mArchiveDirectory->entry(dataFile); if (dataResouceEntry->isFile()) { const KArchiveFile *file = static_cast(dataResouceEntry); //TODO adapt directory name too - extractZipFile(file, copyToDirName, newUrlInfo.path(), value.akonadiConfigFile.contains(QStringLiteral("akonadi_contacts_resource_"))); + extractZipFile(file, copyToDirName, newUrlInfo.path(), value.akonadiConfigFile.contains(QLatin1String("akonadi_contacts_resource_"))); } settings.insert(QStringLiteral("Path"), newUrl); @@ -128,9 +128,9 @@ } } QString instanceType; - if (value.akonadiConfigFile.contains(QStringLiteral("akonadi_vcarddir_resource_"))) { + if (value.akonadiConfigFile.contains(QLatin1String("akonadi_vcarddir_resource_"))) { instanceType = QStringLiteral("akonadi_vcarddir_resource"); - } else if (value.akonadiConfigFile.contains(QStringLiteral("akonadi_contacts_resource_"))) { + } else if (value.akonadiConfigFile.contains(QLatin1String("akonadi_contacts_resource_"))) { instanceType = QStringLiteral("akonadi_contacts_resource"); } else { qCDebug(PIMSETTINGEXPORTERCORE_LOG) << " not supported" << value.akonadiConfigFile; @@ -168,9 +168,9 @@ bool ImportAddressbookJob::isAConfigFile(const QString &name) const { - return name.endsWith(QLatin1String("rc")) && (name.contains(QStringLiteral("akonadi_vcarddir_resource_")) - || name.contains(QStringLiteral("akonadi_vcard_resource_")) - || name.contains(QStringLiteral("akonadi_contacts_resource_"))); + return name.endsWith(QLatin1String("rc")) && (name.contains(QLatin1String("akonadi_vcarddir_resource_")) + || name.contains(QLatin1String("akonadi_vcard_resource_")) + || name.contains(QLatin1String("akonadi_contacts_resource_"))); } void ImportAddressbookJob::restoreConfig() diff -Nru pim-data-exporter-17.12.3/core/addressbook/importaddressbookjob.h pim-data-exporter-18.04.3/core/addressbook/importaddressbookjob.h --- pim-data-exporter-17.12.3/core/addressbook/importaddressbookjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/addressbook/importaddressbookjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -30,11 +30,11 @@ Q_OBJECT public: explicit ImportAddressbookJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ImportAddressbookJob(); + ~ImportAddressbookJob() override; void start() override; -protected Q_SLOTS: +protected: void slotNextStep() override; private: diff -Nru pim-data-exporter-17.12.3/core/akregator/exportakregatorjob.cpp pim-data-exporter-18.04.3/core/akregator/exportakregatorjob.cpp --- pim-data-exporter-17.12.3/core/akregator/exportakregatorjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/akregator/exportakregatorjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/akregator/exportakregatorjob.h pim-data-exporter-18.04.3/core/akregator/exportakregatorjob.h --- pim-data-exporter-17.12.3/core/akregator/exportakregatorjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/akregator/exportakregatorjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -29,7 +29,7 @@ Q_OBJECT public: explicit ExportAkregatorJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ExportAkregatorJob(); + ~ExportAkregatorJob() override; void start() override; diff -Nru pim-data-exporter-17.12.3/core/akregator/importakregatorjob.cpp pim-data-exporter-18.04.3/core/akregator/importakregatorjob.cpp --- pim-data-exporter-17.12.3/core/akregator/importakregatorjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/akregator/importakregatorjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/akregator/importakregatorjob.h pim-data-exporter-18.04.3/core/akregator/importakregatorjob.h --- pim-data-exporter-17.12.3/core/akregator/importakregatorjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/akregator/importakregatorjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -29,11 +29,11 @@ Q_OBJECT public: explicit ImportAkregatorJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ImportAkregatorJob(); + ~ImportAkregatorJob() override; void start() override; -private Q_SLOTS: +private: void slotNextStep() override; private: diff -Nru pim-data-exporter-17.12.3/core/alarm/exportalarmjob.cpp pim-data-exporter-18.04.3/core/alarm/exportalarmjob.cpp --- pim-data-exporter-17.12.3/core/alarm/exportalarmjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/alarm/exportalarmjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -91,7 +91,7 @@ if (mIndexIdentifier < list.count()) { Akonadi::AgentInstance agent = list.at(mIndexIdentifier); const QString identifier = agent.identifier(); - if (identifier.contains(QStringLiteral("akonadi_kalarm_dir_resource_"))) { + if (identifier.contains(QLatin1String("akonadi_kalarm_dir_resource_"))) { const QString archivePath = Utils::alarmPath() + identifier + QDir::separator(); QString url = Utils::resourcePath(agent); @@ -115,7 +115,7 @@ } else { QTimer::singleShot(0, this, &ExportAlarmJob::slotAlarmJobTerminated); } - } else if (identifier.contains(QStringLiteral("akonadi_kalarm_resource_"))) { + } else if (identifier.contains(QLatin1String("akonadi_kalarm_resource_"))) { backupResourceFile(agent, Utils::alarmPath()); QTimer::singleShot(0, this, &ExportAlarmJob::slotAlarmJobTerminated); } else { diff -Nru pim-data-exporter-17.12.3/core/alarm/exportalarmjob.h pim-data-exporter-18.04.3/core/alarm/exportalarmjob.h --- pim-data-exporter-17.12.3/core/alarm/exportalarmjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/alarm/exportalarmjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -29,7 +29,7 @@ Q_OBJECT public: explicit ExportAlarmJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ExportAlarmJob(); + ~ExportAlarmJob() override; void start() override; diff -Nru pim-data-exporter-17.12.3/core/alarm/importalarmjob.cpp pim-data-exporter-18.04.3/core/alarm/importalarmjob.cpp --- pim-data-exporter-17.12.3/core/alarm/importalarmjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/alarm/importalarmjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -94,8 +94,8 @@ for (int i = 0; i < numberOfResourceFile; ++i) { resourceFiles value = mListResourceFile.at(i); QMap settings; - if (value.akonadiConfigFile.contains(QStringLiteral("akonadi_kalarm_dir_resource_")) - || value.akonadiConfigFile.contains(QStringLiteral("akonadi_kalarm_resource_"))) { + if (value.akonadiConfigFile.contains(QLatin1String("akonadi_kalarm_dir_resource_")) + || value.akonadiConfigFile.contains(QLatin1String("akonadi_kalarm_resource_"))) { const KArchiveEntry *fileResouceEntry = mArchiveDirectory->entry(value.akonadiConfigFile); if (fileResouceEntry && fileResouceEntry->isFile()) { const KArchiveFile *file = static_cast(fileResouceEntry); @@ -112,7 +112,7 @@ QFileInfo newUrlInfo(newUrl); const QString dataFile = value.akonadiResources; const KArchiveEntry *dataResouceEntry = mArchiveDirectory->entry(dataFile); - bool isDirResource = value.akonadiConfigFile.contains(QStringLiteral("akonadi_kalarm_dir_resource_")); + bool isDirResource = value.akonadiConfigFile.contains(QLatin1String("akonadi_kalarm_dir_resource_")); if (dataResouceEntry->isFile()) { const KArchiveFile *file = static_cast(dataResouceEntry); //TODO adapt directory name too @@ -145,8 +145,8 @@ bool ImportAlarmJob::isAConfigFile(const QString &name) const { - return name.endsWith(QLatin1String("rc")) && (name.contains(QStringLiteral("akonadi_kalarm_resource_")) - || name.contains(QStringLiteral("akonadi_kalarm_dir_resource_"))); + return name.endsWith(QLatin1String("rc")) && (name.contains(QLatin1String("akonadi_kalarm_resource_")) + || name.contains(QLatin1String("akonadi_kalarm_dir_resource_"))); } void ImportAlarmJob::restoreConfig() diff -Nru pim-data-exporter-17.12.3/core/alarm/importalarmjob.h pim-data-exporter-18.04.3/core/alarm/importalarmjob.h --- pim-data-exporter-17.12.3/core/alarm/importalarmjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/alarm/importalarmjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -29,11 +29,11 @@ Q_OBJECT public: explicit ImportAlarmJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ImportAlarmJob(); + ~ImportAlarmJob() override; void start() override; -protected Q_SLOTS: +protected: void slotNextStep() override; private: diff -Nru pim-data-exporter-17.12.3/core/archivestorage.cpp pim-data-exporter-18.04.3/core/archivestorage.cpp --- pim-data-exporter-17.12.3/core/archivestorage.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/archivestorage.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/archivestorage.h pim-data-exporter-18.04.3/core/archivestorage.h --- pim-data-exporter-17.12.3/core/archivestorage.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/archivestorage.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/blogilo/exportblogilojob.cpp pim-data-exporter-18.04.3/core/blogilo/exportblogilojob.cpp --- pim-data-exporter-17.12.3/core/blogilo/exportblogilojob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/blogilo/exportblogilojob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/blogilo/exportblogilojob.h pim-data-exporter-18.04.3/core/blogilo/exportblogilojob.h --- pim-data-exporter-17.12.3/core/blogilo/exportblogilojob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/blogilo/exportblogilojob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -29,7 +29,7 @@ Q_OBJECT public: explicit ExportBlogiloJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ExportBlogiloJob(); + ~ExportBlogiloJob() override; void start() override; diff -Nru pim-data-exporter-17.12.3/core/blogilo/importblogilojob.cpp pim-data-exporter-18.04.3/core/blogilo/importblogilojob.cpp --- pim-data-exporter-17.12.3/core/blogilo/importblogilojob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/blogilo/importblogilojob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/blogilo/importblogilojob.h pim-data-exporter-18.04.3/core/blogilo/importblogilojob.h --- pim-data-exporter-17.12.3/core/blogilo/importblogilojob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/blogilo/importblogilojob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -29,11 +29,11 @@ Q_OBJECT public: explicit ImportBlogiloJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ImportBlogiloJob(); + ~ImportBlogiloJob() override; void start() override; -private Q_SLOTS: +private: void slotNextStep() override; private: diff -Nru pim-data-exporter-17.12.3/core/calendar/exportcalendarjob.cpp pim-data-exporter-18.04.3/core/calendar/exportcalendarjob.cpp --- pim-data-exporter-17.12.3/core/calendar/exportcalendarjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/calendar/exportcalendarjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -92,7 +92,7 @@ if (mIndexIdentifier < list.count()) { Akonadi::AgentInstance agent = list.at(mIndexIdentifier); const QString identifier = agent.identifier(); - if (identifier.contains(QStringLiteral("akonadi_icaldir_resource_"))) { + if (identifier.contains(QLatin1String("akonadi_icaldir_resource_"))) { const QString archivePath = Utils::calendarPath() + identifier + QDir::separator(); QString url = Utils::resourcePath(agent); @@ -116,7 +116,7 @@ } else { QTimer::singleShot(0, this, &ExportCalendarJob::slotCalendarJobTerminated); } - } else if (identifier.contains(QStringLiteral("akonadi_ical_resource_"))) { + } else if (identifier.contains(QLatin1String("akonadi_ical_resource_"))) { backupResourceFile(agent, Utils::calendarPath()); QTimer::singleShot(0, this, &ExportCalendarJob::slotCalendarJobTerminated); } else { diff -Nru pim-data-exporter-17.12.3/core/calendar/exportcalendarjob.h pim-data-exporter-18.04.3/core/calendar/exportcalendarjob.h --- pim-data-exporter-17.12.3/core/calendar/exportcalendarjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/calendar/exportcalendarjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -29,7 +29,7 @@ Q_OBJECT public: explicit ExportCalendarJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ExportCalendarJob(); + ~ExportCalendarJob() override; void start() override; diff -Nru pim-data-exporter-17.12.3/core/calendar/importcalendarjob.cpp pim-data-exporter-18.04.3/core/calendar/importcalendarjob.cpp --- pim-data-exporter-17.12.3/core/calendar/importcalendarjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/calendar/importcalendarjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -98,8 +98,8 @@ for (int i = 0; i < numberOfResourceFile; ++i) { resourceFiles value = mListResourceFile.at(i); QMap settings; - if (value.akonadiConfigFile.contains(QStringLiteral("akonadi_icaldir_resource_")) - || value.akonadiConfigFile.contains(QStringLiteral("akonadi_ical_resource_"))) { + if (value.akonadiConfigFile.contains(QLatin1String("akonadi_icaldir_resource_")) + || value.akonadiConfigFile.contains(QLatin1String("akonadi_ical_resource_"))) { const KArchiveEntry *fileResouceEntry = mArchiveDirectory->entry(value.akonadiConfigFile); if (fileResouceEntry && fileResouceEntry->isFile()) { const KArchiveFile *file = static_cast(fileResouceEntry); @@ -119,11 +119,11 @@ const QString dataFile = value.akonadiResources; const KArchiveEntry *dataResouceEntry = mArchiveDirectory->entry(dataFile); - bool isDirResource = value.akonadiConfigFile.contains(QStringLiteral("akonadi_icaldir_resource_")); + bool isDirResource = value.akonadiConfigFile.contains(QLatin1String("akonadi_icaldir_resource_")); if (dataResouceEntry->isFile()) { const KArchiveFile *file = static_cast(dataResouceEntry); //TODO adapt directory name too - extractZipFile(file, copyToDirName, newUrlInfo.path(), value.akonadiConfigFile.contains(QStringLiteral("akonadi_icaldir_resource_"))); + extractZipFile(file, copyToDirName, newUrlInfo.path(), value.akonadiConfigFile.contains(QLatin1String("akonadi_icaldir_resource_"))); } settings.insert(QStringLiteral("Path"), newUrl); @@ -168,8 +168,8 @@ bool ImportCalendarJob::isAConfigFile(const QString &name) const { - return name.endsWith(QLatin1String("rc")) && (name.contains(QStringLiteral("akonadi_ical_resource_")) - || name.contains(QStringLiteral("akonadi_icaldir_resource_"))); + return name.endsWith(QLatin1String("rc")) && (name.contains(QLatin1String("akonadi_ical_resource_")) + || name.contains(QLatin1String("akonadi_icaldir_resource_"))); } void ImportCalendarJob::restoreConfig() diff -Nru pim-data-exporter-17.12.3/core/calendar/importcalendarjob.h pim-data-exporter-18.04.3/core/calendar/importcalendarjob.h --- pim-data-exporter-17.12.3/core/calendar/importcalendarjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/calendar/importcalendarjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -30,11 +30,11 @@ Q_OBJECT public: explicit ImportCalendarJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ImportCalendarJob(); + ~ImportCalendarJob() override; void start() override; -protected Q_SLOTS: +protected: void slotNextStep() override; private: diff -Nru pim-data-exporter-17.12.3/core/exportresourcearchivejob.cpp pim-data-exporter-18.04.3/core/exportresourcearchivejob.cpp --- pim-data-exporter-17.12.3/core/exportresourcearchivejob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/exportresourcearchivejob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/exportresourcearchivejob.h pim-data-exporter-18.04.3/core/exportresourcearchivejob.h --- pim-data-exporter-17.12.3/core/exportresourcearchivejob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/exportresourcearchivejob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/importexportprogressindicatorbase.cpp pim-data-exporter-18.04.3/core/importexportprogressindicatorbase.cpp --- pim-data-exporter-17.12.3/core/importexportprogressindicatorbase.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/importexportprogressindicatorbase.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/importexportprogressindicatorbase.h pim-data-exporter-18.04.3/core/importexportprogressindicatorbase.h --- pim-data-exporter-17.12.3/core/importexportprogressindicatorbase.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/importexportprogressindicatorbase.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/mail/exportmailjob.cpp pim-data-exporter-18.04.3/core/mail/exportmailjob.cpp --- pim-data-exporter-17.12.3/core/mail/exportmailjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/mail/exportmailjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -146,12 +146,12 @@ const Akonadi::AgentInstance agent = list.at(mIndexIdentifier); const QStringList capabilities(agent.type().capabilities()); if (agent.type().mimeTypes().contains(KMime::Message::mimeType())) { - if (capabilities.contains(QStringLiteral("Resource")) - && !capabilities.contains(QStringLiteral("Virtual")) - && !capabilities.contains(QStringLiteral("MailTransport"))) { + if (capabilities.contains(QLatin1String("Resource")) + && !capabilities.contains(QLatin1String("Virtual")) + && !capabilities.contains(QLatin1String("MailTransport"))) { const QString identifier = agent.identifier(); - if (identifier.contains(QStringLiteral("akonadi_maildir_resource_")) - || identifier.contains(QStringLiteral("akonadi_mixedmaildir_resource_"))) { + if (identifier.contains(QLatin1String("akonadi_maildir_resource_")) + || identifier.contains(QLatin1String("akonadi_mixedmaildir_resource_"))) { const QString archivePath = Utils::mailsPath() + identifier + QDir::separator(); const QString url = Utils::resourcePath(agent); @@ -176,7 +176,7 @@ } else { QTimer::singleShot(0, this, &ExportMailJob::slotMailsJobTerminated); } - } else if (identifier.contains(QStringLiteral("akonadi_mbox_resource_"))) { + } else if (identifier.contains(QLatin1String("akonadi_mbox_resource_"))) { backupResourceFile(agent, Utils::addressbookPath()); QTimer::singleShot(0, this, &ExportMailJob::slotMailsJobTerminated); } else { @@ -241,13 +241,13 @@ for (const Akonadi::AgentInstance &agent : list) { const QStringList capabilities(agent.type().capabilities()); if (agent.type().mimeTypes().contains(KMime::Message::mimeType())) { - if (capabilities.contains(QStringLiteral("Resource")) - && !capabilities.contains(QStringLiteral("Virtual")) - && !capabilities.contains(QStringLiteral("MailTransport"))) { + if (capabilities.contains(QLatin1String("Resource")) + && !capabilities.contains(QLatin1String("Virtual")) + && !capabilities.contains(QLatin1String("MailTransport"))) { const QString identifier = agent.identifier(); //Store just pop3/imap/kolab/gmail account. Store other config when we copy data. - if (identifier.contains(QStringLiteral("pop3")) || identifier.contains(QStringLiteral("imap")) - || identifier.contains(QStringLiteral("_kolab_")) || identifier.contains(QStringLiteral("_gmail_"))) { + if (identifier.contains(QLatin1String("pop3")) || identifier.contains(QLatin1String("imap")) + || identifier.contains(QLatin1String("_kolab_")) || identifier.contains(QLatin1String("_gmail_"))) { const QString errorStr = Utils::storeResources(archive(), identifier, Utils::resourcesPath()); if (!errorStr.isEmpty()) { Q_EMIT error(errorStr); diff -Nru pim-data-exporter-17.12.3/core/mail/exportmailjob.h pim-data-exporter-18.04.3/core/mail/exportmailjob.h --- pim-data-exporter-17.12.3/core/mail/exportmailjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/mail/exportmailjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -31,7 +31,7 @@ Q_OBJECT public: explicit ExportMailJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ExportMailJob(); + ~ExportMailJob() override; void start() override; diff -Nru pim-data-exporter-17.12.3/core/mail/importmailjob.cpp pim-data-exporter-18.04.3/core/mail/importmailjob.cpp --- pim-data-exporter-17.12.3/core/mail/importmailjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/mail/importmailjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -138,9 +138,9 @@ resourceFiles files; for (const QString &name : lst) { if (name.endsWith(QLatin1String("rc")) - && (name.contains(QStringLiteral("akonadi_mbox_resource_")) - || name.contains(QStringLiteral("akonadi_mixedmaildir_resource_")) - || name.contains(QStringLiteral("akonadi_maildir_resource_")))) { + && (name.contains(QLatin1String("akonadi_mbox_resource_")) + || name.contains(QLatin1String("akonadi_mixedmaildir_resource_")) + || name.contains(QLatin1String("akonadi_maildir_resource_")))) { files.akonadiConfigFile = archPath + name; } else if (name.startsWith(Utils::prefixAkonadiConfigFile())) { files.akonadiAgentConfigFile = archPath + name; @@ -273,7 +273,7 @@ const QString resourceFileName = destDirectory + QLatin1Char('/') + filename; KSharedConfig::Ptr resourceConfig = KSharedConfig::openConfig(resourceFileName); QMap settings; - if (filename.contains(QStringLiteral("pop3"))) { + if (filename.contains(QLatin1String("pop3"))) { KConfigGroup general = resourceConfig->group(QStringLiteral("General")); if (general.hasKey(QStringLiteral("login"))) { settings.insert(QStringLiteral("Login"), general.readEntry("login")); @@ -349,7 +349,7 @@ mHashResources.insert(filename, newResource); infoAboutNewResource(newResource); } - } else if (filename.contains(QStringLiteral("imap")) || filename.contains(QStringLiteral("kolab_")) || filename.contains(QStringLiteral("gmail_"))) { + } else if (filename.contains(QLatin1String("imap")) || filename.contains(QLatin1String("kolab_")) || filename.contains(QLatin1String("gmail_"))) { KConfigGroup network = resourceConfig->group(QStringLiteral("network")); if (network.hasKey(QStringLiteral("Authentication"))) { settings.insert(QStringLiteral("Authentication"), network.readEntry("Authentication", 1)); @@ -440,9 +440,9 @@ } QString newResource; - if (filename.contains(QStringLiteral("kolab_"))) { + if (filename.contains(QLatin1String("kolab_"))) { newResource = mCreateResource->createResource(QStringLiteral("akonadi_kolab_resource"), filename, settings); - } else if (filename.contains(QStringLiteral("gmail_"))) { + } else if (filename.contains(QLatin1String("gmail_"))) { newResource = mCreateResource->createResource(QStringLiteral("akonadi_gmail_resource"), filename, settings); } else { newResource = mCreateResource->createResource(QStringLiteral("akonadi_imap_resource"), filename, settings); @@ -501,7 +501,7 @@ } QMap settings; - if (resourceName.contains(QStringLiteral("akonadi_mbox_resource_"))) { + if (resourceName.contains(QLatin1String("akonadi_mbox_resource_"))) { const QString dataFile = value.akonadiResources; const KArchiveEntry *dataResouceEntry = mArchiveDirectory->entry(dataFile); if (dataResouceEntry->isFile()) { @@ -544,8 +544,8 @@ mHashResources.insert(filename, newResource); infoAboutNewResource(newResource); } - } else if (resourceName.contains(QStringLiteral("akonadi_maildir_resource_")) - || resourceName.contains(QStringLiteral("akonadi_mixedmaildir_resource_"))) { + } else if (resourceName.contains(QLatin1String("akonadi_maildir_resource_")) + || resourceName.contains(QLatin1String("akonadi_mixedmaildir_resource_"))) { settings.insert(QStringLiteral("Path"), newUrl); KConfigGroup general = resourceConfig->group(QStringLiteral("General")); if (general.hasKey(QStringLiteral("TopLevelIsContainer"))) { @@ -558,7 +558,7 @@ settings.insert(QStringLiteral("MonitorFilesystem"), general.readEntry(QStringLiteral("MonitorFilesystem"), true)); } - const QString newResource = mCreateResource->createResource(resourceName.contains(QStringLiteral("akonadi_mixedmaildir_resource_")) + const QString newResource = mCreateResource->createResource(resourceName.contains(QLatin1String("akonadi_mixedmaildir_resource_")) ? QStringLiteral("akonadi_mixedmaildir_resource") : QStringLiteral("akonadi_maildir_resource"), filename, settings); @@ -915,10 +915,10 @@ const KArchiveEntry *vcardEntry = mArchiveDirectory->entry(Utils::identitiesPath() + QString::number(oldUid) + QDir::separator() + file.fileName()); if (vcardEntry && vcardEntry->isFile()) { const KArchiveFile *vcardFile = static_cast(vcardEntry); - QString vcardFilePath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + QStringLiteral("kmail2/%1").arg(fileInfo.fileName()); + QString vcardFilePath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/kmail2/%1").arg(fileInfo.fileName()); int i = 1; while (QFileInfo::exists(vcardFileName)) { - vcardFilePath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + QStringLiteral("kmail2/%1_%2").arg(i).arg( + vcardFilePath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/kmail2/%1_%2").arg(i).arg( fileInfo.fileName()); ++i; } diff -Nru pim-data-exporter-17.12.3/core/mail/importmailjob.h pim-data-exporter-18.04.3/core/mail/importmailjob.h --- pim-data-exporter-17.12.3/core/mail/importmailjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/mail/importmailjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -34,11 +34,11 @@ Q_OBJECT public: explicit ImportMailJob(QObject *widget, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ImportMailJob(); + ~ImportMailJob() override; void start() override; -protected Q_SLOTS: +protected: void slotNextStep() override; private: diff -Nru pim-data-exporter-17.12.3/core/notes/exportnotesjob.cpp pim-data-exporter-18.04.3/core/notes/exportnotesjob.cpp --- pim-data-exporter-17.12.3/core/notes/exportnotesjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/notes/exportnotesjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -104,7 +104,7 @@ if (mIndexIdentifier < list.count()) { Akonadi::AgentInstance agent = list.at(mIndexIdentifier); const QString identifier = agent.identifier(); - if (identifier.contains(QStringLiteral("akonadi_akonotes_resource_"))) { + if (identifier.contains(QLatin1String("akonadi_akonotes_resource_"))) { const QString archivePath = Utils::notePath() + identifier + QDir::separator(); QString url = Utils::resourcePath(agent); diff -Nru pim-data-exporter-17.12.3/core/notes/exportnotesjob.h pim-data-exporter-18.04.3/core/notes/exportnotesjob.h --- pim-data-exporter-17.12.3/core/notes/exportnotesjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/notes/exportnotesjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -28,7 +28,7 @@ Q_OBJECT public: explicit ExportNotesJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ExportNotesJob(); + ~ExportNotesJob() override; void start() override; diff -Nru pim-data-exporter-17.12.3/core/notes/importnotesjob.cpp pim-data-exporter-18.04.3/core/notes/importnotesjob.cpp --- pim-data-exporter-17.12.3/core/notes/importnotesjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/notes/importnotesjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -146,7 +146,7 @@ for (int i = 0; i < numberOfResourceFile; ++i) { resourceFiles value = mListResourceFile.at(i); QMap settings; - if (value.akonadiConfigFile.contains(QStringLiteral("akonadi_akonotes_resource_"))) { + if (value.akonadiConfigFile.contains(QLatin1String("akonadi_akonotes_resource_"))) { const KArchiveEntry *fileResouceEntry = mArchiveDirectory->entry(value.akonadiConfigFile); if (fileResouceEntry && fileResouceEntry->isFile()) { const KArchiveFile *file = static_cast(fileResouceEntry); diff -Nru pim-data-exporter-17.12.3/core/notes/importnotesjob.h pim-data-exporter-18.04.3/core/notes/importnotesjob.h --- pim-data-exporter-17.12.3/core/notes/importnotesjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/notes/importnotesjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -28,11 +28,11 @@ Q_OBJECT public: explicit ImportNotesJob(QObject *parent, Utils::StoredTypes typeSelected, ArchiveStorage *archiveStorage, int numberOfStep); - ~ImportNotesJob(); + ~ImportNotesJob() override; void start() override; -private Q_SLOTS: +private: void slotNextStep() override; private: void importKNoteGlobalSettings(const KArchiveFile *kmailsnippet, const QString &kmail2rc, const QString &filename, const QString &prefix); diff -Nru pim-data-exporter-17.12.3/core/pimsettingbackupthread.cpp pim-data-exporter-18.04.3/core/pimsettingbackupthread.cpp --- pim-data-exporter-17.12.3/core/pimsettingbackupthread.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/pimsettingbackupthread.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/pimsettingbackupthread.h pim-data-exporter-18.04.3/core/pimsettingbackupthread.h --- pim-data-exporter-17.12.3/core/pimsettingbackupthread.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/pimsettingbackupthread.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -27,7 +27,7 @@ Q_OBJECT public: explicit PimSettingBackupThread(KZip *zip, const QString &url, const QString &archivePath, const QString &archivename, QObject *parent = nullptr); - ~PimSettingBackupThread(); + ~PimSettingBackupThread() override; Q_SIGNALS: void error(const QString &str); diff -Nru pim-data-exporter-17.12.3/core/pimsettingexporterkernel.cpp pim-data-exporter-18.04.3/core/pimsettingexporterkernel.cpp --- pim-data-exporter-17.12.3/core/pimsettingexporterkernel.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/pimsettingexporterkernel.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/pimsettingexporterkernel.h pim-data-exporter-18.04.3/core/pimsettingexporterkernel.h --- pim-data-exporter-17.12.3/core/pimsettingexporterkernel.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/pimsettingexporterkernel.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/pimsettingimportdatainfofile.cpp pim-data-exporter-18.04.3/core/pimsettingimportdatainfofile.cpp --- pim-data-exporter-17.12.3/core/pimsettingimportdatainfofile.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/pimsettingimportdatainfofile.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Montel Laurent + Copyright (C) 2016-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/pimsettingimportdatainfofile.h pim-data-exporter-18.04.3/core/pimsettingimportdatainfofile.h --- pim-data-exporter-17.12.3/core/pimsettingimportdatainfofile.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/pimsettingimportdatainfofile.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2017 Montel Laurent + Copyright (C) 2016-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/pimsettingsbackuprestore.cpp pim-data-exporter-18.04.3/core/pimsettingsbackuprestore.cpp --- pim-data-exporter-17.12.3/core/pimsettingsbackuprestore.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/pimsettingsbackuprestore.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2017 Montel Laurent + Copyright (C) 2014-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/pimsettingsbackuprestore.h pim-data-exporter-18.04.3/core/pimsettingsbackuprestore.h --- pim-data-exporter-17.12.3/core/pimsettingsbackuprestore.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/pimsettingsbackuprestore.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2017 Montel Laurent + Copyright (C) 2014-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/synchronizeresourcejob.cpp pim-data-exporter-18.04.3/core/synchronizeresourcejob.cpp --- pim-data-exporter-17.12.3/core/synchronizeresourcejob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/synchronizeresourcejob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/synchronizeresourcejob.h pim-data-exporter-18.04.3/core/synchronizeresourcejob.h --- pim-data-exporter-17.12.3/core/synchronizeresourcejob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/synchronizeresourcejob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/utils.cpp pim-data-exporter-18.04.3/core/utils.cpp --- pim-data-exporter-17.12.3/core/utils.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/utils.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/utils.h pim-data-exporter-18.04.3/core/utils.h --- pim-data-exporter-17.12.3/core/utils.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/utils.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/xml/templateselection.cpp pim-data-exporter-18.04.3/core/xml/templateselection.cpp --- pim-data-exporter-17.12.3/core/xml/templateselection.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/xml/templateselection.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2017 Montel Laurent + Copyright (C) 2014-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/core/xml/templateselection.h pim-data-exporter-18.04.3/core/xml/templateselection.h --- pim-data-exporter-17.12.3/core/xml/templateselection.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/core/xml/templateselection.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2017 Montel Laurent + Copyright (C) 2014-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/debian/changelog pim-data-exporter-18.04.3/debian/changelog --- pim-data-exporter-17.12.3/debian/changelog 2018-03-16 13:34:18.000000000 +0000 +++ pim-data-exporter-18.04.3/debian/changelog 2018-08-21 17:55:12.000000000 +0000 @@ -1,3 +1,12 @@ +pim-data-exporter (4:18.04.3-0ubuntu1) cosmic; urgency=medium + + * New upstream release (18.03.80) + * New upstream release (18.04.0) + * New upstream release (18.04.1) + * New upstream release (18.04.3) + + -- Rik Mills Tue, 21 Aug 2018 18:55:12 +0100 + pim-data-exporter (4:17.12.3-0ubuntu1) bionic; urgency=medium * New upstream release (17.12.3) diff -Nru pim-data-exporter-17.12.3/debian/control pim-data-exporter-18.04.3/debian/control --- pim-data-exporter-17.12.3/debian/control 2018-03-16 13:34:18.000000000 +0000 +++ pim-data-exporter-18.04.3/debian/control 2018-08-21 17:55:12.000000000 +0000 @@ -17,20 +17,20 @@ libboost-dev (>= 1.40.0-2), libboost-graph-dev (>= 1.40.0-2), libgpgme11-dev, - libkf5akonadi-dev (>= 4:17.12.3~), - libkf5akonadicontact-dev (>= 4:17.12.3~), - libkf5akonadimime-dev (>= 4:17.12.3~), - libkf5akonadiserver-dev (>= 4:17.12.3~), - libkf5alarmcalendar-dev (>= 4:17.12.3~), + libkf5akonadi-dev (>= 4:18.04.3~), + libkf5akonadicontact-dev (>= 4:18.04.3~), + libkf5akonadimime-dev (>= 4:18.04.3~), + libkf5akonadiserver-dev (>= 4:18.04.3~), + libkf5alarmcalendar-dev (>= 4:18.04.3~), libkf5archive-dev (>= 5.31.0~), libkf5auth-dev (>= 5.31.0~), - libkf5calendarcore-dev (>= 4:17.12.3~), - libkf5calendarsupport-dev (>= 4:17.12.3~), + libkf5calendarcore-dev (>= 4:18.04.3~), + libkf5calendarsupport-dev (>= 4:18.04.3~), libkf5codecs-dev (>= 5.31.0~), libkf5completion-dev (>= 5.31.0~), libkf5config-dev (>= 5.31.0~), - libkf5contacteditor-dev (>= 4:17.12.3~), - libkf5contacts-dev (>= 4:17.12.3~), + libkf5contacteditor-dev (>= 4:18.04.3~), + libkf5contacts-dev (>= 4:18.04.3~), libkf5coreaddons-dev (>= 5.31.0~), libkf5crash-dev (>= 5.31.0~), libkf5dbusaddons-dev (>= 5.31.0~), @@ -39,27 +39,27 @@ libkf5globalaccel-dev (>= 5.31.0~), libkf5i18n-dev (>= 5.31.0~), libkf5iconthemes-dev (>= 5.31.0~), - libkf5imap-dev (>= 17.12.3~), + libkf5imap-dev (>= 18.04.3~), libkf5itemviews-dev (>= 5.31.0~), libkf5kcmutils-dev (>= 5.31.0~), libkf5kdelibs4support-dev (>= 5.31.0~), libkf5khtml-dev (>= 5.31.0~), - libkf5libkdepim-dev (>= 4:17.12.3~), - libkf5mailcommon-dev (>= 4:17.12.3~), - libkf5mailtransport-dev (>= 17.12.3~), - libkf5messagecomposer-dev (>= 4:17.12.3~), - libkf5mimetreeparser-dev (>= 4:17.12.3~), + libkf5libkdepim-dev (>= 4:18.04.3~), + libkf5mailcommon-dev (>= 4:18.04.3~), + libkf5mailtransport-dev (>= 18.04.3~), + libkf5messagecomposer-dev (>= 4:18.04.3~), + libkf5mimetreeparser-dev (>= 4:18.04.3~), libkf5newstuff-dev (>= 5.31.0~), libkf5notifyconfig-dev (>= 5.31.0~), - libkf5pimtextedit-dev (>= 17.12.3~), + libkf5pimtextedit-dev (>= 18.04.3~), libkf5prison-dev (>= 5.31.0~), libkf5service-dev (>= 5.31.0~), libkf5sonnet-dev (>= 5.31.0~), - libkf5templateparser-dev (>= 4:17.12.3~), + libkf5templateparser-dev (>= 4:18.04.3~), libkf5texteditor-dev (>= 5.31.0~), libkf5textwidgets-dev (>= 5.31.0~), libkf5wallet-dev (>= 5.31.0~), - libkf5webengineviewer-dev (>= 4:17.12.3~), + libkf5webengineviewer-dev (>= 4:18.04.3~), libkf5webkit-dev (>= 5.31.0~), libkf5widgetsaddons-dev (>= 5.31.0~), libkf5windowsystem-dev (>= 5.31.0~), @@ -80,7 +80,7 @@ qtwebengine5-dev (>= 5.6.1~), shared-mime-info, xsltproc, - zlib1g-dev + zlib1g-dev, Standards-Version: 3.9.8 Homepage: http://pim.kde.org/ Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/pim-data-exporter diff -Nru pim-data-exporter-17.12.3/gui/autotests/pimsettingexporterconfiguredialogtest.cpp pim-data-exporter-18.04.3/gui/autotests/pimsettingexporterconfiguredialogtest.cpp --- pim-data-exporter-17.12.3/gui/autotests/pimsettingexporterconfiguredialogtest.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/autotests/pimsettingexporterconfiguredialogtest.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/autotests/pimsettingexporterconfiguredialogtest.h pim-data-exporter-18.04.3/gui/autotests/pimsettingexporterconfiguredialogtest.h --- pim-data-exporter-17.12.3/gui/autotests/pimsettingexporterconfiguredialogtest.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/autotests/pimsettingexporterconfiguredialogtest.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/autotests/pimsettingexporterconfigurewidgettest.cpp pim-data-exporter-18.04.3/gui/autotests/pimsettingexporterconfigurewidgettest.cpp --- pim-data-exporter-17.12.3/gui/autotests/pimsettingexporterconfigurewidgettest.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/autotests/pimsettingexporterconfigurewidgettest.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/autotests/pimsettingexporterconfigurewidgettest.h pim-data-exporter-18.04.3/gui/autotests/pimsettingexporterconfigurewidgettest.h --- pim-data-exporter-17.12.3/gui/autotests/pimsettingexporterconfigurewidgettest.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/autotests/pimsettingexporterconfigurewidgettest.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/autotests/selectiontypedialogtest.cpp pim-data-exporter-18.04.3/gui/autotests/selectiontypedialogtest.cpp --- pim-data-exporter-17.12.3/gui/autotests/selectiontypedialogtest.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/autotests/selectiontypedialogtest.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017 Montel Laurent + Copyright (C) 2017-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/autotests/selectiontypedialogtest.h pim-data-exporter-18.04.3/gui/autotests/selectiontypedialogtest.h --- pim-data-exporter-17.12.3/gui/autotests/selectiontypedialogtest.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/autotests/selectiontypedialogtest.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017 Montel Laurent + Copyright (C) 2017-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/autotests/selectiontypetreewidgettest.cpp pim-data-exporter-18.04.3/gui/autotests/selectiontypetreewidgettest.cpp --- pim-data-exporter-17.12.3/gui/autotests/selectiontypetreewidgettest.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/autotests/selectiontypetreewidgettest.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017 Montel Laurent + Copyright (C) 2017-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/autotests/selectiontypetreewidgettest.h pim-data-exporter-18.04.3/gui/autotests/selectiontypetreewidgettest.h --- pim-data-exporter-17.12.3/gui/autotests/selectiontypetreewidgettest.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/autotests/selectiontypetreewidgettest.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2017 Montel Laurent + Copyright (C) 2017-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/autotests/synchronizeresourcedialogtest.cpp pim-data-exporter-18.04.3/gui/autotests/synchronizeresourcedialogtest.cpp --- pim-data-exporter-17.12.3/gui/autotests/synchronizeresourcedialogtest.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/autotests/synchronizeresourcedialogtest.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/autotests/synchronizeresourcedialogtest.h pim-data-exporter-18.04.3/gui/autotests/synchronizeresourcedialogtest.h --- pim-data-exporter-17.12.3/gui/autotests/synchronizeresourcedialogtest.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/autotests/synchronizeresourcedialogtest.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/dialog/backupfilestructureinfodialog.cpp pim-data-exporter-18.04.3/gui/dialog/backupfilestructureinfodialog.cpp --- pim-data-exporter-17.12.3/gui/dialog/backupfilestructureinfodialog.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/dialog/backupfilestructureinfodialog.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/dialog/backupfilestructureinfodialog.h pim-data-exporter-18.04.3/gui/dialog/backupfilestructureinfodialog.h --- pim-data-exporter-17.12.3/gui/dialog/backupfilestructureinfodialog.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/dialog/backupfilestructureinfodialog.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/dialog/pimsettingexporterconfiguredialog.cpp pim-data-exporter-18.04.3/gui/dialog/pimsettingexporterconfiguredialog.cpp --- pim-data-exporter-17.12.3/gui/dialog/pimsettingexporterconfiguredialog.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/dialog/pimsettingexporterconfiguredialog.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/dialog/pimsettingexporterconfiguredialog.h pim-data-exporter-18.04.3/gui/dialog/pimsettingexporterconfiguredialog.h --- pim-data-exporter-17.12.3/gui/dialog/pimsettingexporterconfiguredialog.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/dialog/pimsettingexporterconfiguredialog.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/dialog/selectiontypedialog.cpp pim-data-exporter-18.04.3/gui/dialog/selectiontypedialog.cpp --- pim-data-exporter-17.12.3/gui/dialog/selectiontypedialog.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/dialog/selectiontypedialog.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -107,7 +107,7 @@ return mSelectionTreeWidget->storedType(); } -QString SelectionTypeDialog::exportedFileInfo() +QString SelectionTypeDialog::exportedFileInfo() const { return mSelectionTreeWidget->exportedFileInfo(); } diff -Nru pim-data-exporter-17.12.3/gui/dialog/selectiontypedialog.h pim-data-exporter-18.04.3/gui/dialog/selectiontypedialog.h --- pim-data-exporter-17.12.3/gui/dialog/selectiontypedialog.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/dialog/selectiontypedialog.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -35,15 +35,14 @@ void loadTemplate(const QString &fileName); - QString exportedFileInfo(); + QString exportedFileInfo() const; void removeNotSelectedItems(); -private Q_SLOTS: +private: void slotSelectAll(); void slotUnselectAll(); void slotSaveAsTemplate(); void slotLoadTemplate(); -private: void readConfig(); void writeConfig(); void loadDefaultTemplate(); diff -Nru pim-data-exporter-17.12.3/gui/dialog/showarchivestructuredialog.cpp pim-data-exporter-18.04.3/gui/dialog/showarchivestructuredialog.cpp --- pim-data-exporter-17.12.3/gui/dialog/showarchivestructuredialog.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/dialog/showarchivestructuredialog.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/dialog/showarchivestructuredialog.h pim-data-exporter-18.04.3/gui/dialog/showarchivestructuredialog.h --- pim-data-exporter-17.12.3/gui/dialog/showarchivestructuredialog.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/dialog/showarchivestructuredialog.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/dialog/synchronizeresourcedialog.cpp pim-data-exporter-18.04.3/gui/dialog/synchronizeresourcedialog.cpp --- pim-data-exporter-17.12.3/gui/dialog/synchronizeresourcedialog.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/dialog/synchronizeresourcedialog.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/dialog/synchronizeresourcedialog.h pim-data-exporter-18.04.3/gui/dialog/synchronizeresourcedialog.h --- pim-data-exporter-17.12.3/gui/dialog/synchronizeresourcedialog.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/dialog/synchronizeresourcedialog.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/importexportprogressindicatorgui.cpp pim-data-exporter-18.04.3/gui/importexportprogressindicatorgui.cpp --- pim-data-exporter-17.12.3/gui/importexportprogressindicatorgui.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/importexportprogressindicatorgui.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/importexportprogressindicatorgui.h pim-data-exporter-18.04.3/gui/importexportprogressindicatorgui.h --- pim-data-exporter-17.12.3/gui/importexportprogressindicatorgui.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/importexportprogressindicatorgui.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -27,7 +27,7 @@ Q_OBJECT public: explicit ImportExportProgressIndicatorGui(QWidget *parentWidget, QObject *parent = nullptr); - ~ImportExportProgressIndicatorGui(); + ~ImportExportProgressIndicatorGui() override; void increaseProgressDialog() override; void createProgressDialog(const QString &title) override; diff -Nru pim-data-exporter-17.12.3/gui/job/fullsynchronizeresourcesjob.cpp pim-data-exporter-18.04.3/gui/job/fullsynchronizeresourcesjob.cpp --- pim-data-exporter-17.12.3/gui/job/fullsynchronizeresourcesjob.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/job/fullsynchronizeresourcesjob.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/job/fullsynchronizeresourcesjob.h pim-data-exporter-18.04.3/gui/job/fullsynchronizeresourcesjob.h --- pim-data-exporter-17.12.3/gui/job/fullsynchronizeresourcesjob.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/job/fullsynchronizeresourcesjob.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/main.cpp pim-data-exporter-18.04.3/gui/main.cpp --- pim-data-exporter-17.12.3/gui/main.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/main.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/pimsettingcommandlineoption.cpp pim-data-exporter-18.04.3/gui/pimsettingcommandlineoption.cpp --- pim-data-exporter-17.12.3/gui/pimsettingcommandlineoption.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/pimsettingcommandlineoption.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -51,7 +51,7 @@ { KAboutData aboutData(QStringLiteral("pimsettingexporter"), i18n("PIM Setting Exporter"), QStringLiteral(PIMSETTINGEXPORTER_VERSION), i18n("PIM Setting Exporter"), KAboutLicense::GPL_V2, - i18n("Copyright © 2012-2017 pimsettingexporter authors")); + i18n("Copyright © 2012-2018 pimsettingexporter authors")); aboutData.addAuthor(i18n("Laurent Montel"), i18n("Maintainer"), QStringLiteral("montel@kde.org")); mParser.addVersionOption(); mParser.addHelpOption(); diff -Nru pim-data-exporter-17.12.3/gui/pimsettingcommandlineoption.h pim-data-exporter-18.04.3/gui/pimsettingcommandlineoption.h --- pim-data-exporter-17.12.3/gui/pimsettingcommandlineoption.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/pimsettingcommandlineoption.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/pimsettingexporterwindow.cpp pim-data-exporter-18.04.3/gui/pimsettingexporterwindow.cpp --- pim-data-exporter-17.12.3/gui/pimsettingexporterwindow.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/pimsettingexporterwindow.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/pimsettingexporterwindow.h pim-data-exporter-18.04.3/gui/pimsettingexporterwindow.h --- pim-data-exporter-17.12.3/gui/pimsettingexporterwindow.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/pimsettingexporterwindow.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -35,7 +35,7 @@ ~PimSettingExporterWindow(); void handleCommandLine(const QCommandLineParser &parser); -private Q_SLOTS: +private: void slotBackupData(); void slotRestoreData(); void slotAddInfo(const QString &info); diff -Nru pim-data-exporter-17.12.3/gui/pimsettingsbackuprestoreui.cpp pim-data-exporter-18.04.3/gui/pimsettingsbackuprestoreui.cpp --- pim-data-exporter-17.12.3/gui/pimsettingsbackuprestoreui.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/pimsettingsbackuprestoreui.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/pimsettingsbackuprestoreui.h pim-data-exporter-18.04.3/gui/pimsettingsbackuprestoreui.h --- pim-data-exporter-17.12.3/gui/pimsettingsbackuprestoreui.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/pimsettingsbackuprestoreui.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -27,7 +27,7 @@ Q_OBJECT public: explicit PimSettingsBackupRestoreUI(QWidget *parentWidget, QObject *parent = nullptr); - ~PimSettingsBackupRestoreUI(); + ~PimSettingsBackupRestoreUI() override; protected: bool continueToRestore() override; diff -Nru pim-data-exporter-17.12.3/gui/tests/selectiontreewidget_gui.cpp pim-data-exporter-18.04.3/gui/tests/selectiontreewidget_gui.cpp --- pim-data-exporter-17.12.3/gui/tests/selectiontreewidget_gui.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/tests/selectiontreewidget_gui.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/tests/showarchivestructuredialog_gui.cpp pim-data-exporter-18.04.3/gui/tests/showarchivestructuredialog_gui.cpp --- pim-data-exporter-17.12.3/gui/tests/showarchivestructuredialog_gui.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/tests/showarchivestructuredialog_gui.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/trayicon/pimsettingstrayicon.cpp pim-data-exporter-18.04.3/gui/trayicon/pimsettingstrayicon.cpp --- pim-data-exporter-17.12.3/gui/trayicon/pimsettingstrayicon.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/trayicon/pimsettingstrayicon.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/trayicon/pimsettingstrayicon.h pim-data-exporter-18.04.3/gui/trayicon/pimsettingstrayicon.h --- pim-data-exporter-17.12.3/gui/trayicon/pimsettingstrayicon.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/trayicon/pimsettingstrayicon.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/widgets/logwidget.cpp pim-data-exporter-18.04.3/gui/widgets/logwidget.cpp --- pim-data-exporter-17.12.3/gui/widgets/logwidget.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/widgets/logwidget.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/widgets/logwidget.h pim-data-exporter-18.04.3/gui/widgets/logwidget.h --- pim-data-exporter-17.12.3/gui/widgets/logwidget.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/widgets/logwidget.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2017 Montel Laurent + Copyright (C) 2012-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/widgets/pimsettingexporterconfigurewidget.cpp pim-data-exporter-18.04.3/gui/widgets/pimsettingexporterconfigurewidget.cpp --- pim-data-exporter-17.12.3/gui/widgets/pimsettingexporterconfigurewidget.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/widgets/pimsettingexporterconfigurewidget.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/widgets/pimsettingexporterconfigurewidget.h pim-data-exporter-18.04.3/gui/widgets/pimsettingexporterconfigurewidget.h --- pim-data-exporter-17.12.3/gui/widgets/pimsettingexporterconfigurewidget.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/widgets/pimsettingexporterconfigurewidget.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2015-2017 Montel Laurent + Copyright (C) 2015-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/widgets/selectiontypetreewidget.cpp pim-data-exporter-18.04.3/gui/widgets/selectiontypetreewidget.cpp --- pim-data-exporter-17.12.3/gui/widgets/selectiontypetreewidget.cpp 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/widgets/selectiontypetreewidget.cpp 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff -Nru pim-data-exporter-17.12.3/gui/widgets/selectiontypetreewidget.h pim-data-exporter-18.04.3/gui/widgets/selectiontypetreewidget.h --- pim-data-exporter-17.12.3/gui/widgets/selectiontypetreewidget.h 2018-02-26 05:42:24.000000000 +0000 +++ pim-data-exporter-18.04.3/gui/widgets/selectiontypetreewidget.h 2018-06-29 05:03:44.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2017 Montel Laurent + Copyright (C) 2013-2018 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public @@ -46,10 +46,10 @@ QString exportedFileInfo(); void removeNotSelectedItems(); -private Q_SLOTS: - void slotItemChanged(QTreeWidgetItem *, int); private: + void slotItemChanged(QTreeWidgetItem *, int); + enum ActionType { action = Qt::UserRole + 1 }; diff -Nru pim-data-exporter-17.12.3/po/ar/pimsettingexporter.po pim-data-exporter-18.04.3/po/ar/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/ar/pimsettingexporter.po 1970-01-01 00:00:00.000000000 +0000 +++ pim-data-exporter-18.04.3/po/ar/pimsettingexporter.po 2018-07-10 00:14:57.000000000 +0000 @@ -0,0 +1,1033 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Safa Alfulaij , 2018. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-01-28 20:11+0300\n" +"Last-Translator: Safa Alfulaij \n" +"Language-Team: Arabic \n" +"Language: ar\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" +"X-Generator: Lokalize 2.0\n" + +#, kde-format +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "صفا الفليج" + +#, kde-format +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "safa1996alfulaij@gmail.com" + +#: console/main.cpp:37 console/main.cpp:38 +#, kde-format +msgid "PIM Setting Exporter Console" +msgstr "معراض مصدّر إعدادات PIM" + +#: console/main.cpp:39 +#, kde-format +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "الحقوق محفوظة © ٢٠١٥-٢٠١٨ لمؤلّفي «مصدّر إعدادات PIM»" + +#: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 +#, kde-format +msgid "Laurent Montel" +msgstr "Laurent Montel" + +#: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 +#, kde-format +msgid "Maintainer" +msgstr "المصين" + +#: console/main.cpp:41 +#, kde-format +msgid "File to log information to." +msgstr "الملفّ لتسجيل المعلومات فيه." + +#: console/main.cpp:42 +#, kde-format +msgid "Template file to define what data, settings to import or export." +msgstr "الملفّ القالب لتعريف ما البيانات والإعدادات التي ستُستورد أو تُصدّر." + +#: console/main.cpp:43 +#, kde-format +msgid "Import the given file." +msgstr "استورد الملفّ المعطى." + +#: console/main.cpp:44 +#, kde-format +msgid "Export the given file." +msgstr "صدّر الملفّ المعطى." + +#: core/abstractimportexportjob.cpp:72 +#, kde-format +msgid "Task Canceled" +msgstr "أُلغيت المهمّة" + +#: core/abstractimportexportjob.cpp:131 +#, kde-format +msgid "\"%1\" backup done." +msgstr "اكتمل نسخ ”%1“ احتياطيًّا." + +#: core/abstractimportexportjob.cpp:133 +#, kde-format +msgid "\"%1\" cannot be exported." +msgstr "تعذّر تصدير ”%1“." + +#: core/abstractimportexportjob.cpp:136 +#, kde-format +msgid "\"%1\" does not exist." +msgstr "‏”%1“ غير موجود." + +#: core/abstractimportexportjob.cpp:301 +#, kde-format +msgid "\"%1\" was copied." +msgstr "نُسخ ”%1“." + +#: core/abstractimportexportjob.cpp:330 +#, kde-format +msgid "File \"%1\" cannot be copied to \"%2\"." +msgstr "تعذّر نسخ الملفّ ”%1“ إلى ”%2“." + +#: core/abstractimportexportjob.cpp:330 +#, kde-format +msgid "Copy file" +msgstr "نسخ الملفّ" + +#: core/abstractimportexportjob.cpp:332 +#, kde-format +msgid "\"%1\" was restored." +msgstr "استُعيد ”%1“." + +#: core/abstractimportexportjob.cpp:351 core/abstractimportexportjob.cpp:359 +#: core/exportresourcearchivejob.cpp:92 core/pimsettingbackupthread.cpp:68 +#, kde-format +msgid "\"%1\" was backed up." +msgstr "نُسخ ”%1“ احتياطيًّا." + +#: core/abstractimportexportjob.cpp:361 core/abstractimportexportjob.cpp:365 +#: core/exportresourcearchivejob.cpp:94 core/pimsettingbackupthread.cpp:70 +#, kde-format +msgid "\"%1\" file cannot be added to backup file." +msgstr "تعذّرت إضافة الملفّ ”%1“ إلى ملفّ النّسخة الاحتياطيّة." + +#: core/abstractimportexportjob.cpp:430 +#: core/addressbook/importaddressbookjob.cpp:148 +#: core/mail/importmailjob.cpp:462 +#, kde-format +msgid "Resources restored." +msgstr "استُعيدت الموارد." + +#: core/abstractimportexportjob.cpp:432 +#, kde-format +msgid "No resources files found." +msgstr "لم يُعثر على ملفّات موارد." + +#: core/abstractimportexportjob.cpp:475 +#, kde-format +msgid "Unable to copy file %1" +msgstr "تعذّر نسخ الملفّ %1" + +#: core/abstractimportexportjob.cpp:515 +#, kde-format +msgid "Resource '%1' created." +msgstr "أُنشئ المورد ’%1‘." + +#: core/abstractimportexportjob.cpp:530 +#, kde-format +msgid "Failed to synchronize %1." +msgstr "فشلت مزامنة %1." + +#: core/abstractimportexportjob.cpp:535 +#, kde-format +msgid "Resource %1 synchronized." +msgstr "زامنتُ المورد %1." + +#: core/abstractimportexportjob.cpp:541 +#, kde-format +msgid "All resources synchronized." +msgstr "زامنتُ كلّ الموارد." + +# هذه إشارة +#: core/abstractimportexportjob.cpp:552 +#, kde-format +msgid "Start synchronizing..." +msgstr "يبدأ المزامنة..." + +#: core/abstractimportexportjob.cpp:589 +#, kde-format +msgid "Directory \"%1\" added to backup file." +msgstr "أُضيف الدّليل ”%1“ إلى ملفّ النّسخة الاحتياطيّة." + +#: core/abstractimportexportjob.cpp:591 +#, kde-format +msgid "Directory \"%1\" cannot be added to backup file." +msgstr "تعذّرت إضافة ”%1“ إلى ملفّ النّسخة الاحتياطيّة." + +# هذه إشارة +#: core/addressbook/exportaddressbookjob.cpp:45 +#, kde-format +msgid "Start export KAddressBook settings..." +msgstr "يبدأ تصدير إعدادات «دفتر عناوينك»..." + +# اسم النافذة +#: core/addressbook/exportaddressbookjob.cpp:46 +#, kde-format +msgid "Export KAddressBook settings" +msgstr "تصدير إعدادات «دفتر عناوينك»" + +#: core/addressbook/exportaddressbookjob.cpp:58 +#: core/alarm/exportalarmjob.cpp:59 core/calendar/exportcalendarjob.cpp:60 +#: core/mail/exportmailjob.cpp:237 core/notes/exportnotesjob.cpp:70 +#, kde-format +msgid "Backing up resources..." +msgstr "ينسخ الموارد احتياطيًّا..." + +#: core/addressbook/exportaddressbookjob.cpp:124 +#: core/alarm/exportalarmjob.cpp:125 core/calendar/exportcalendarjob.cpp:126 +#: core/mail/exportmailjob.cpp:262 core/notes/exportnotesjob.cpp:135 +#, kde-format +msgid "Resources backup done." +msgstr "اكتمل نسخ الموارد احتياطيًّا." + +#: core/addressbook/exportaddressbookjob.cpp:131 +#: core/akregator/exportakregatorjob.cpp:55 core/alarm/exportalarmjob.cpp:132 +#: core/blogilo/exportblogilojob.cpp:54 core/calendar/exportcalendarjob.cpp:133 +#: core/mail/exportmailjob.cpp:267 core/notes/exportnotesjob.cpp:142 +#, kde-format +msgid "Backing up config..." +msgstr "ينسخ الضّبط احتياطيًّا..." + +#: core/addressbook/exportaddressbookjob.cpp:172 +#: core/akregator/exportakregatorjob.cpp:62 core/alarm/exportalarmjob.cpp:158 +#: core/blogilo/exportblogilojob.cpp:60 core/calendar/exportcalendarjob.cpp:172 +#: core/mail/exportmailjob.cpp:532 core/notes/exportnotesjob.cpp:175 +#, kde-format +msgid "Config backup done." +msgstr "اكتمل نسخ الضّبط احتياطيًّا." + +#: core/addressbook/importaddressbookjob.cpp:54 +#, kde-format +msgid "Starting to import KAddressBook settings..." +msgstr "يبدأ استيراد إعدادات «دفتر عناوينك»..." + +# اسم النافذة +#: core/addressbook/importaddressbookjob.cpp:56 +#, kde-format +msgid "Import KAddressBook settings" +msgstr "استيراد إعدادات «دفتر عناوينك»" + +# هذه إشارة +#: core/addressbook/importaddressbookjob.cpp:79 +#: core/addressbook/importaddressbookjob.cpp:80 +#: core/alarm/importalarmjob.cpp:83 core/alarm/importalarmjob.cpp:84 +#: core/calendar/importcalendarjob.cpp:86 +#: core/calendar/importcalendarjob.cpp:87 core/mail/importmailjob.cpp:258 +#: core/mail/importmailjob.cpp:259 core/notes/importnotesjob.cpp:138 +#: core/notes/importnotesjob.cpp:139 +#, kde-format +msgid "Restore resources..." +msgstr "يستعيد الموارد..." + +#: core/addressbook/importaddressbookjob.cpp:179 +#: core/akregator/importakregatorjob.cpp:73 core/alarm/importalarmjob.cpp:155 +#: core/blogilo/importblogilojob.cpp:72 core/calendar/importcalendarjob.cpp:178 +#: core/notes/importnotesjob.cpp:86 +#, kde-format +msgid "Restore configs..." +msgstr "يستعيد الضّبط..." + +#: core/addressbook/importaddressbookjob.cpp:194 +#: core/akregator/importakregatorjob.cpp:79 core/alarm/importalarmjob.cpp:170 +#: core/blogilo/importblogilojob.cpp:76 core/calendar/importcalendarjob.cpp:274 +#: core/mail/importmailjob.cpp:843 core/notes/importnotesjob.cpp:113 +#, kde-format +msgid "Config restored." +msgstr "استُعيد الضّبط." + +# هذه إشارة +#: core/akregator/exportakregatorjob.cpp:41 +#, kde-format +msgid "Start export Akregator settings..." +msgstr "يبدأ تصدير إعدادات «أكريغاتور»..." + +# اسم النافذة +#: core/akregator/exportakregatorjob.cpp:42 +#, kde-format +msgid "Export Akregator settings" +msgstr "تصدير إعدادات «أكريغاتور»" + +#: core/akregator/exportakregatorjob.cpp:70 +#: core/blogilo/exportblogilojob.cpp:67 +#, kde-format +msgid "Backing up data..." +msgstr "ينسخ البيانات احتياطيًّا..." + +#: core/akregator/exportakregatorjob.cpp:77 core/notes/exportnotesjob.cpp:63 +#, kde-format +msgid "\"%1\" directory cannot be added to backup file." +msgstr "تعذّرت إضافة الدّليل ”%1“ إلى ملفّ النّسخة الاحتياطيّة." + +#: core/akregator/exportakregatorjob.cpp:80 +#: core/blogilo/exportblogilojob.cpp:76 +#, kde-format +msgid "Data backup done." +msgstr "اكتمل نسخ البيانات احتياطيًّا." + +#: core/akregator/importakregatorjob.cpp:44 +#, kde-format +msgid "Starting to import Akregator settings..." +msgstr "يبدأ استيراد إعدادات «أكريغاتور»..." + +# اسم النافذة +#: core/akregator/importakregatorjob.cpp:47 +#, kde-format +msgid "Import Akregator settings" +msgstr "استيراد إعدادات «أكريغاتور»" + +# هذه إشارة +#: core/akregator/importakregatorjob.cpp:86 +#: core/blogilo/importblogilojob.cpp:83 core/notes/importnotesjob.cpp:120 +#, kde-format +msgid "Restore data..." +msgstr "يستعيد البيانات..." + +#: core/akregator/importakregatorjob.cpp:92 +#: core/blogilo/importblogilojob.cpp:89 core/notes/importnotesjob.cpp:133 +#, kde-format +msgid "Data restored." +msgstr "استُعيدت البيانات." + +# هذه إشارة +#: core/alarm/exportalarmjob.cpp:46 +#, kde-format +msgid "Start export KAlarm settings..." +msgstr "يبدأ تصدير إعدادات «منبهّك»..." + +# اسم النافذة +#: core/alarm/exportalarmjob.cpp:47 +#, kde-format +msgid "Export KAlarm settings" +msgstr "تصدير إعدادات «منبهّك»" + +#: core/alarm/importalarmjob.cpp:55 +#, kde-format +msgid "Starting to import KAlarm settings..." +msgstr "يبدأ استيراد إعدادات «منبّهك»..." + +# اسم النافذة +#: core/alarm/importalarmjob.cpp:56 +#, kde-format +msgid "Import KAlarm settings" +msgstr "استيراد إعدادات «منبّهك»" + +#: core/archivestorage.cpp:57 +#, kde-format +msgid "Archive cannot be opened in write mode." +msgstr "تعذّر فتح الأرشيف بوضع الكتابة." + +#: core/archivestorage.cpp:59 core/utils.cpp:289 +#: gui/dialog/showarchivestructuredialog.cpp:86 +#, kde-format +msgid "Archive cannot be opened in read mode." +msgstr "تعذّر فتح الأرشيف بوضع القراءة." + +# هذه إشارة +#: core/blogilo/exportblogilojob.cpp:41 +#, kde-format +msgid "Start export Blogilo settings..." +msgstr "يبدأ تصدير إعدادات «بلوغيلو»..." + +# اسم النافذة +#: core/blogilo/exportblogilojob.cpp:42 +#, kde-format +msgid "Export Blogilo settings" +msgstr "تصدير إعدادات «بلوغيلو»" + +#: core/blogilo/importblogilojob.cpp:44 +#, kde-format +msgid "Starting to import Blogilo settings..." +msgstr "يبدأ استيراد إعدادات «بلوغيلو»..." + +# اسم النافذة +#: core/blogilo/importblogilojob.cpp:45 +#, kde-format +msgid "Import Blogilo settings" +msgstr "استيراد إعدادات «بلوغيلو»" + +# هذه إشارة +#: core/calendar/exportcalendarjob.cpp:47 +#, kde-format +msgid "Start export KOrganizer settings..." +msgstr "يبدأ تصدير إعدادات «منظّمك»..." + +# اسم النافذة +#: core/calendar/exportcalendarjob.cpp:48 +#, kde-format +msgid "Export KOrganizer settings" +msgstr "تصدير إعدادات «منظّمك»" + +#: core/calendar/importcalendarjob.cpp:58 +#, kde-format +msgid "Starting to import KOrganizer settings..." +msgstr "يبدأ استيراد إعدادات «منظّمك»..." + +# اسم النافذة +#: core/calendar/importcalendarjob.cpp:60 +#, kde-format +msgid "Import KOrganizer settings" +msgstr "استيراد إعدادات «منظّمك»" + +# هذه إشارة +#: core/mail/exportmailjob.cpp:64 +#, kde-format +msgid "Start export KMail settings..." +msgstr "يبدأ تصدير إعدادات «بريدك»..." + +# اسم النافذة +#: core/mail/exportmailjob.cpp:65 +#, kde-format +msgid "Export KMail settings" +msgstr "تصدير إعدادات «بريدك»" + +#: core/mail/exportmailjob.cpp:124 +#, kde-format +msgid "Backing up Mails..." +msgstr "ينسخ البريد احتياطيًّا..." + +#: core/mail/exportmailjob.cpp:198 +#, kde-format +msgid "Backing up transports..." +msgstr "ينسخ النّقولات احتياطيًّا..." + +#: core/mail/exportmailjob.cpp:203 core/mail/exportmailjob.cpp:215 +#, kde-format +msgid "Transports backup done." +msgstr "اكتمل نسخ النّقولات احتياطيًّا." + +#: core/mail/exportmailjob.cpp:217 +#, kde-format +msgid "Transport file cannot be added to backup file." +msgstr "تعذّرت إضافة ملفّ النّقولات إلى ملفّ النّسخة الاحتياطيّة." + +#: core/mail/exportmailjob.cpp:278 +#, kde-format +msgid "Filters backup done." +msgstr "اكتمل نسخ المرشّحات احتياطيًّا." + +#: core/mail/exportmailjob.cpp:280 +#, kde-format +msgid "Filters cannot be exported." +msgstr "تعذّر تصدير المرشّحات." + +#: core/mail/exportmailjob.cpp:537 +#, kde-format +msgid "Backing up identity..." +msgstr "ينسخ الهويّة احتياطيًّا..." + +#: core/mail/exportmailjob.cpp:572 +#, kde-format +msgid "vCard file \"%1\" cannot be saved." +msgstr "تعذّر حفظ ملفّ vCard ‏”%1“." + +#: core/mail/exportmailjob.cpp:585 +#, kde-format +msgid "Identity backup done." +msgstr "اكتمل نسخ الهويّة احتياطيًّا." + +#: core/mail/exportmailjob.cpp:587 +#, kde-format +msgid "Identity file cannot be added to backup file." +msgstr "تعذّرت إضافة ملفّ الهويّة إلى ملفّ النّسخة الاحتياطيّة." + +#: core/mail/importmailjob.cpp:73 +#, kde-format +msgid "Starting to import KMail settings..." +msgstr "يبدأ استيراد إعدادات «بريدك»..." + +# اسم النافذة +#: core/mail/importmailjob.cpp:74 +#, kde-format +msgid "Import KMail settings" +msgstr "استيراد إعدادات «بريدك»" + +#: core/mail/importmailjob.cpp:163 core/mail/importmailjob.cpp:169 +#, kde-format +msgid "Restore transports..." +msgstr "يستعيد النّقولات..." + +#: core/mail/importmailjob.cpp:167 +#, kde-format +msgid "mailtransports file could not be found in the archive." +msgstr "تعذّر العثور على ملفّ mailtransports في الأرشيف." + +#: core/mail/importmailjob.cpp:247 +#, kde-format +msgid "Transports restored." +msgstr "استُعيدت النّقولات." + +#: core/mail/importmailjob.cpp:249 +#, kde-format +msgid "Failed to restore transports file." +msgstr "فشلت استعادة ملفّ النّقولات." + +# هذه إشارة +#: core/mail/importmailjob.cpp:469 core/mail/importmailjob.cpp:471 +#, kde-format +msgid "Restore mails..." +msgstr "يستعيد البريد..." + +#: core/mail/importmailjob.cpp:584 +#, kde-format +msgid "Mails restored." +msgstr "استُعيد البريد." + +# هذه إشارة +#: core/mail/importmailjob.cpp:591 +#, kde-format +msgid "Restore config..." +msgstr "يستعيد الضّبط..." + +#: core/mail/importmailjob.cpp:594 +#, kde-format +msgid "filters file could not be found in the archive." +msgstr "تعذّر العثور على ملفّ filters في الأرشيف." + +#: core/mail/importmailjob.cpp:875 core/mail/importmailjob.cpp:880 +#, kde-format +msgid "Restoring identities..." +msgstr "يستعيد الهويّات..." + +#: core/mail/importmailjob.cpp:878 +#, kde-format +msgid "emailidentities file could not be found in the archive." +msgstr "تعذّر العثور على ملفّ emailidentities في الأرشيف." + +#: core/mail/importmailjob.cpp:947 +#, kde-format +msgid "Identities restored." +msgstr "استُعيدت الهويّات." + +#: core/mail/importmailjob.cpp:949 +#, kde-format +msgid "Failed to restore identity file." +msgstr "فشلت استعادة ملفّ الهويّة." + +# هذه إشارة +#: core/notes/exportnotesjob.cpp:45 +#, kde-format +msgid "Start export KNotes settings..." +msgstr "يبدأ تصدير إعدادات «ملاحظاتك»..." + +# اسم النافذة +#: core/notes/exportnotesjob.cpp:46 +#, kde-format +msgid "Export KNotes settings" +msgstr "تصدير إعدادات «ملاحظاتك»" + +#: core/notes/importnotesjob.cpp:75 +#, kde-format +msgid "Starting to import KNotes settings..." +msgstr "يبدأ استيراد إعدادات «ملاحظاتك»..." + +# اسم النافذة +#: core/notes/importnotesjob.cpp:78 +#, kde-format +msgid "Import KNotes settings" +msgstr "استيراد إعدادات «ملاحظاتك»" + +#: core/pimsettingbackupthread.cpp:51 +#, kde-format +msgid "Impossible to open archive file." +msgstr "تعذّر فتح ملفّ الأرشيف." + +#: core/pimsettingbackupthread.cpp:58 +#, kde-format +msgid "Impossible to backup \"%1\"." +msgstr "تعذّر نسخ ”%1“ احتياطيًّا." + +#: core/pimsettingsbackuprestore.cpp:96 core/pimsettingsbackuprestore.cpp:281 +#, kde-format +msgid "No data selected." +msgstr "لم تُحدّد بيانات." + +#: core/pimsettingsbackuprestore.cpp:102 core/pimsettingsbackuprestore.cpp:287 +#, kde-format +msgid "Unable to open file \"%1\"." +msgstr "تعذّر فتح الملفّ ”%1“." + +#: core/pimsettingsbackuprestore.cpp:111 +#, kde-format +msgid "Starting to backup data in '%1'" +msgstr "يبدأ نسخ البيانات في ’%1‘ احتياطيًّا" + +#: core/pimsettingsbackuprestore.cpp:205 +#, kde-format +msgid "Backup in '%1' done." +msgstr "اكتمل النّسخ الاحتياطيّ في ’%1‘." + +#: core/pimsettingsbackuprestore.cpp:306 +#, kde-format +msgid "Starting to restore data from '%1'" +msgstr "يبدأ استعادة البيانات من ’%1‘" + +#: core/pimsettingsbackuprestore.cpp:314 +#, kde-format +msgid "Restoring data from '%1' done." +msgstr "اكتملت استعادة البيانات من ’%1‘." + +#: core/utils.cpp:262 core/utils.cpp:270 +#, kde-format +msgid "Resource file \"%1\" cannot be added to backup file." +msgstr "تعذّرت إضافة ملفّ الموارد ”%1“ إلى ملفّ النّسخة الاحتياطيّة." + +#: core/utils.cpp:337 +#, kde-format +msgid "KMail" +msgstr "بريدك" + +#: core/utils.cpp:339 +#, kde-format +msgid "KAddressBook" +msgstr "دفتر عناوينك" + +#: core/utils.cpp:341 +#, kde-format +msgid "KAlarm" +msgstr "منبّهك" + +#: core/utils.cpp:343 +#, kde-format +msgid "KOrganizer" +msgstr "منظّمك" + +#: core/utils.cpp:345 +#, kde-format +msgid "KNotes" +msgstr "ملاحظاتك" + +#: core/utils.cpp:347 +#, kde-format +msgid "Akregator" +msgstr "أكريغاتور" + +#: core/utils.cpp:349 +#, kde-format +msgid "Blogilo" +msgstr "بلوغيلو" + +#: core/utils.cpp:363 +#, kde-format +msgid "Identity" +msgstr "الهويّة" + +#: core/utils.cpp:365 +#, kde-format +msgid "Mails" +msgstr "رسائل البريد" + +#: core/utils.cpp:367 +#, kde-format +msgid "Mail Transport" +msgstr "نقولات البريد" + +#: core/utils.cpp:369 +#, kde-format +msgid "Resources" +msgstr "الموارد" + +#: core/utils.cpp:371 +#, kde-format +msgid "Config" +msgstr "الضّبط" + +#: core/utils.cpp:373 +#, kde-format +msgid "Data" +msgstr "البيانات" + +#: gui/dialog/backupfilestructureinfodialog.cpp:41 +#, kde-format +msgid "Archive File Structure" +msgstr "بنية ملفّ الأرشيف" + +#: gui/dialog/backupfilestructureinfodialog.cpp:43 +#, kde-format +msgid "Backup Archive Structure:" +msgstr "بنية أرشيف النّسخ الاحتياطيّ:" + +#: gui/dialog/backupfilestructureinfodialog.cpp:70 +#, kde-format +msgid "backup-structure.txt file was not found." +msgstr "لم يُعثر على ملفّ backup-structure.txt." + +#: gui/dialog/pimsettingexporterconfiguredialog.cpp:30 +#, kde-format +msgid "Configure PimSettingExporter" +msgstr "اضبط ”مصدّر إعدادات PIM»" + +#: gui/dialog/selectiontypedialog.cpp:35 +#, kde-format +msgid "Select Type" +msgstr "اختر النّوع" + +#: gui/dialog/selectiontypedialog.cpp:53 +#, kde-format +msgid "Use this template by default" +msgstr "استخدم هذا القالب مبدئيًّا" + +#: gui/dialog/selectiontypedialog.cpp:58 +#: gui/dialog/synchronizeresourcedialog.cpp:53 +#, kde-format +msgid "Select All" +msgstr "حدّد الكلّ" + +#: gui/dialog/selectiontypedialog.cpp:63 +#: gui/dialog/synchronizeresourcedialog.cpp:58 +#, kde-format +msgid "Unselect All" +msgstr "أزِل تحديد الكلّ" + +#: gui/dialog/selectiontypedialog.cpp:68 +#, kde-format +msgid "Save as Template..." +msgstr "احفظ كقالب..." + +#: gui/dialog/selectiontypedialog.cpp:73 +#, kde-format +msgid "Load Template..." +msgstr "حمّل قالبًا..." + +#: gui/dialog/showarchivestructuredialog.cpp:42 +#, kde-format +msgid "Show Archive Content on file \"%1\"" +msgstr "اعرض محتويات الأرشيف في الملفّ ”%1“" + +#: gui/dialog/showarchivestructuredialog.cpp:51 +#, kde-format +msgid "Search..." +msgstr "ابحث عن..." + +#: gui/dialog/showarchivestructuredialog.cpp:60 +#, kde-format +msgid "Save As Text..." +msgstr "احفظ كنصّ..." + +#: gui/dialog/showarchivestructuredialog.cpp:77 +#, kde-format +msgctxt "qfiledialog filter files text" +msgid "Text Files" +msgstr "الملفّات النّصّيّة" + +#: gui/dialog/showarchivestructuredialog.cpp:78 +#, kde-format +msgctxt "@title:window" +msgid "Export Log File" +msgstr "تصدير ملفّ السّجلّ" + +#: gui/dialog/showarchivestructuredialog.cpp:86 +#, kde-format +msgid "Cannot open archive" +msgstr "تعذّر فتح ملفّ الأرشيف" + +#: gui/dialog/showarchivestructuredialog.cpp:91 +#, kde-format +msgid "Info" +msgstr "معلومات" + +#: gui/dialog/showarchivestructuredialog.cpp:93 +#, kde-format +msgid "This is not kdepim archive." +msgstr "هذا ليس أرشيف kdepim." + +#: gui/dialog/showarchivestructuredialog.cpp:93 +#, kde-format +msgid "Show information" +msgstr "عرض المعلومات" + +#: gui/dialog/synchronizeresourcedialog.cpp:35 +#, kde-format +msgid "Synchronize Resources" +msgstr "مزامنة الموارد" + +#: gui/dialog/synchronizeresourcedialog.cpp:38 +#, kde-format +msgid "" +"Some resources were added but data were not sync. Select resources that you " +"want to sync:" +msgstr "" +"أُضيفت بعض الموارد ولكنّ البيانات لم تُزامن. حدّد الموارد التي تريد مزامنتها:" + +#: gui/importexportprogressindicatorgui.cpp:48 +#: gui/job/fullsynchronizeresourcesjob.cpp:54 +#, kde-format +msgid "Cancel" +msgstr "ألغِ" + +#: gui/importexportprogressindicatorgui.cpp:78 +#, kde-format +msgid "\"%1\" already exists. Do you want to overwrite it or merge it?" +msgstr "‏”%1“ موجود بالفعل. أتريد الكتابة فوقه أو دمجه؟" + +#: gui/importexportprogressindicatorgui.cpp:78 +#: gui/importexportprogressindicatorgui.cpp:87 +#: gui/importexportprogressindicatorgui.cpp:95 +#, kde-format +msgid "Restore" +msgstr "استعد" + +#: gui/importexportprogressindicatorgui.cpp:79 +#, kde-format +msgid "Merge" +msgstr "ادمج" + +#: gui/importexportprogressindicatorgui.cpp:87 +#, kde-format +msgid "\"%1\" already exists. Do you want to overwrite it?" +msgstr "‏”%1“ موجود بالفعل. أتريد الكتابة فوقه؟" + +#: gui/importexportprogressindicatorgui.cpp:95 +#, kde-format +msgid "Directory \"%1\" already exists. Do you want to overwrite it?" +msgstr "الدّليل ”%1“ موجود بالفعل. أتريد الكتابة فوقه؟" + +#: gui/job/fullsynchronizeresourcesjob.cpp:56 +#, kde-format +msgid "Synchronize resources" +msgstr "مزامنة الموارد" + +#: gui/job/fullsynchronizeresourcesjob.cpp:57 +#, kde-format +msgid "Synchronize resources... It can take some time." +msgstr "يزامن الموارد... قد يأخذ هذا بعض الوقت." + +#: gui/pimsettingcommandlineoption.cpp:52 +#: gui/pimsettingcommandlineoption.cpp:53 +#, kde-format +msgid "PIM Setting Exporter" +msgstr "مصدّر إعدادات PIM" + +#: gui/pimsettingcommandlineoption.cpp:54 +#, kde-format +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "الحقوق محفوظة © ٢٠١٢-٢٠١٨ لمؤلّفي «مصدّر إعدادات PIM»" + +#: gui/pimsettingcommandlineoption.cpp:58 +#, kde-format +msgid "Template file uses to define what data, settings to import or export" +msgstr "يُستخدم الملفّ القالب لتعريف ما البيانات والإعدادات التي ستُستورد أو تُصدّر" + +#: gui/pimsettingcommandlineoption.cpp:59 +#, kde-format +msgid "Import the given file" +msgstr "استورد الملفّ المعطى" + +#: gui/pimsettingcommandlineoption.cpp:60 +#, kde-format +msgid "Export the given file" +msgstr "صدّر الملفّ المعطى" + +#: gui/pimsettingcommandlineoption.cpp:61 +#, kde-format +msgid "File or url. The user will be asked whether to import or export." +msgstr "الملفّ أو المسار. سيُسأل المستخدم أيّهما يجب استيراده أو تصديره." + +#. i18n: ectx: Menu (file) +#: gui/pimsettingexporter.rc:4 +#, kde-format +msgid "&File" +msgstr "&ملفّ" + +#. i18n: ectx: Menu (tools) +#: gui/pimsettingexporter.rc:17 +#, kde-format +msgid "&Tools" +msgstr "أ&دوات" + +#: gui/pimsettingexporterwindow.cpp:131 +#, kde-format +msgid "Full sync starts..." +msgstr "المزامنة الكاملة تبدأ..." + +#: gui/pimsettingexporterwindow.cpp:153 +#, kde-format +msgid "Full sync finished." +msgstr "انتهت المزامنة الكاملة." + +#: gui/pimsettingexporterwindow.cpp:161 +#, kde-format +msgid "Full sync for \"%1\" done." +msgstr "اكتملت مزامنة ”%1“ بالكامل." + +#: gui/pimsettingexporterwindow.cpp:166 +#, kde-format +msgid "Full sync for \"%1\" failed." +msgstr "فشلت مزامنة ”%1“ بالكامل." + +#: gui/pimsettingexporterwindow.cpp:173 +#, kde-format +msgid "" +"For restoring data, you must use \"pimsettingexporter\". Be careful as it " +"can overwrite your existing settings and data." +msgstr "" +"عليك استخدام ”مصدّر إعدادات PIM/‏pimsettingexporter“ لاستعادة البيانات. احترس " +"فيمكنها الكتابة فوق الإعدادات والبيانات الحاليّة." + +#: gui/pimsettingexporterwindow.cpp:175 gui/pimsettingexporterwindow.cpp:284 +#: gui/pimsettingexporterwindow.cpp:361 +#, kde-format +msgid "Backup" +msgstr "انسخ احتياطيًّا" + +#: gui/pimsettingexporterwindow.cpp:202 +#, kde-format +msgid "Export Data..." +msgstr "صدّر البيانات..." + +#: gui/pimsettingexporterwindow.cpp:206 +#, kde-format +msgid "Import Data..." +msgstr "استورد بيانات..." + +#: gui/pimsettingexporterwindow.cpp:210 +#, kde-format +msgid "Save log..." +msgstr "احفظ السّجلّ..." + +#: gui/pimsettingexporterwindow.cpp:213 +#, kde-format +msgid "Show Archive Structure Information..." +msgstr "اعرض معلومات بنية الأرشيف..." + +#: gui/pimsettingexporterwindow.cpp:216 +#, kde-format +msgid "Show Archive Information..." +msgstr "اعرض معلومات الأرشيف..." + +#: gui/pimsettingexporterwindow.cpp:219 +#, kde-format +msgid "Show Information on current Archive..." +msgstr "اعرض معلومات الأرشيف الحاليّ..." + +#: gui/pimsettingexporterwindow.cpp:258 +#, kde-format +msgid "Select Archive" +msgstr "اختر أرشيفًا" + +#: gui/pimsettingexporterwindow.cpp:258 +#, kde-format +msgid "Zip file" +msgstr "ملفّ Zip" + +#: gui/pimsettingexporterwindow.cpp:271 +#, kde-format +msgid "Log is empty." +msgstr "السّجلّ فارغ." + +#: gui/pimsettingexporterwindow.cpp:271 +#, kde-format +msgid "Save log" +msgstr "احفظ السّجلّ" + +#: gui/pimsettingexporterwindow.cpp:275 +#, kde-format +msgid "HTML Files (*.html)" +msgstr "ملفّات HTML (*.html)" + +#: gui/pimsettingexporterwindow.cpp:283 +#, kde-format +msgid "Please quit all kdepim applications before backing up your data." +msgstr "رجاءً أنهِ كلّ تطبيقات «كدي PIM» قبل نسخ البيانات احتياطيًّا." + +#: gui/pimsettingexporterwindow.cpp:304 +#, kde-format +msgid "Create backup" +msgstr "أنشئ نسخة احتياطيّة" + +#: gui/pimsettingexporterwindow.cpp:306 +#, kde-format +msgid "Zip file (*.zip)" +msgstr "ملفّ Zip (*.zip)" + +#: gui/pimsettingexporterwindow.cpp:316 +#, kde-format +msgid "Backup in progress..." +msgstr "يجري النّسخ احتياطيًّا..." + +#: gui/pimsettingexporterwindow.cpp:359 +#, kde-format +msgid "" +"Before restoring data you must close all kdepim applications. Do you want to " +"continue?" +msgstr "عليك إغلاق كلّ تطبيقات «كدي PIM» قبل استعادة البيانات. أتريد المتابعة؟" + +#: gui/pimsettingexporterwindow.cpp:372 +#, kde-format +msgid "Restore backup" +msgstr "استعد النّسخة الاحتياطيّة" + +#: gui/pimsettingexporterwindow.cpp:375 +#, kde-format +msgid "Zip File" +msgstr "ملفّ Zip" + +#: gui/pimsettingexporterwindow.cpp:407 +#, kde-format +msgid "Restore in progress..." +msgstr "تجري الاستعادة..." + +#: gui/pimsettingsbackuprestoreui.cpp:40 +#, kde-format +msgid "" +"The archive was created by a newer version of this program. It might contain " +"additional data which will be skipped during import. Do you want to import " +"it?" +msgstr "" +"أنشأت إصدارة أحدث من هذا البرنامج الأرشيفَ. قد يحتوي بيانات إضافيّة ستُتخطّى " +"أثناء الاستيراد. أتريد استيراده؟" + +#: gui/pimsettingsbackuprestoreui.cpp:41 +#, kde-format +msgid "Not correct version" +msgstr "ليست الإصدارة الصّحيحة" + +#: gui/trayicon/pimsettingstrayicon.cpp:26 +#, kde-format +msgid "PimSettingExporter" +msgstr "مصدّر إعدادات PIM" + +#: gui/widgets/pimsettingexporterconfigurewidget.cpp:33 +#, kde-format +msgid "Import" +msgstr "الاستيراد" + +# هي overright في الكود! +#: gui/widgets/pimsettingexporterconfigurewidget.cpp:40 +#, kde-format +msgid "Always Override File" +msgstr "اكتب فوق الملفّ دائمًا" + +# هي overright في الكود! +#: gui/widgets/pimsettingexporterconfigurewidget.cpp:44 +#, kde-format +msgid "Always Override Directory" +msgstr "اكتب فوق الدّليل دائمًا" + +#: gui/widgets/pimsettingexporterconfigurewidget.cpp:48 +#, kde-format +msgid "Always Merge Config File" +msgstr "ادمج ملفّ الضّبط دائمًا" + +#: gui/widgets/selectiontypetreewidget.cpp:375 +#, kde-format +msgid "Template Files (*.xml)" +msgstr "ملفّات القوالب (*.xml)" diff -Nru pim-data-exporter-17.12.3/po/ast/pimsettingexporter.po pim-data-exporter-18.04.3/po/ast/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/ast/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/ast/pimsettingexporter.po 2018-07-10 00:14:57.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2016-12-21 16:31+0100\n" "Last-Translator: enolp \n" "Language-Team: Asturian \n" @@ -34,7 +34,7 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -790,7 +790,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/bs/pimsettingexporter.po pim-data-exporter-18.04.3/po/bs/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/bs/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/bs/pimsettingexporter.po 2018-07-10 00:14:57.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kde 49i410\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2014-01-31 19:25+0100\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian\n" @@ -39,7 +39,7 @@ #: console/main.cpp:39 #, fuzzy, kde-format #| msgid "Copyright © 2012-2013 pimsettingexporter authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "Autorska prava © 2012-2013 pimsettingexporter autori" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -843,7 +843,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, fuzzy, kde-format #| msgid "Copyright © 2012-2013 pimsettingexporter authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "Autorska prava © 2012-2013 pimsettingexporter autori" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/ca/pimsettingexporter.po pim-data-exporter-18.04.3/po/ca/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/ca/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/ca/pimsettingexporter.po 2018-07-10 00:14:57.000000000 +0000 @@ -1,16 +1,16 @@ # Translation of pimsettingexporter.po to Catalan -# Copyright (C) 2012-2017 This_file_is_part_of_KDE +# Copyright (C) 2012-2018 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Josep Ma. Ferrer , 2012, 2014, 2015, 2016, 2017. +# Josep Ma. Ferrer , 2012, 2014, 2015, 2016, 2017, 2018. # Antoni Bella Pérez , 2013, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: pimsettingexporter\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-12-30 18:16+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-05-17 21:39+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -38,8 +38,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "Copyright © 2012-2017, els autors del pimsettingexporter" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "Copyright © 2012-2018, els autors del pimsettingexporter" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -638,7 +638,7 @@ #: core/utils.cpp:373 #, kde-format msgid "Data" -msgstr "Dada" +msgstr "Dades" #: gui/dialog/backupfilestructureinfodialog.cpp:41 #, kde-format @@ -804,8 +804,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "Copyright © 2012-2017, els autors del pimsettingexporter" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "Copyright © 2012-2018, els autors del pimsettingexporter" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format @@ -1022,3 +1022,109 @@ #, kde-format msgid "Template Files (*.xml)" msgstr "Fitxers de plantilla (*.xml)" + +#~ msgid "Backup infos." +#~ msgstr "Informació de la còpia de seguretat." + +#~ msgid "" +#~ "Before backing up data, it is recommended to quit all kdepim applications." +#~ msgstr "" +#~ "Abans de fer una còpia de seguretat de les dades, es recomana sortir de " +#~ "totes les aplicacions kdepim." + +#~ msgid "Akonadi database file could not be found in the archive." +#~ msgstr "" +#~ "No s'ha pogut trobar el fitxer de base de dades de l'Akonadi a l'arxiu." + +#~ msgid "Restore Akonadi Database..." +#~ msgstr "Restaura la base de dades de l'Akonadi..." + +#~ msgid "Database driver \"%1\" not supported." +#~ msgstr "El controlador «%1» de la base de dades no està admès." + +#~ msgid "Could not find \"%1\" necessary to restore database." +#~ msgstr "" +#~ "No s'ha pogut trobar «%1» que és necessari per a restaurar la base de " +#~ "dades." + +#~ msgid "Failed to restore Akonadi Database." +#~ msgstr "Ha fallat en restaurar la base de dades de l'Akonadi." + +#~ msgid "Akonadi Database restored." +#~ msgstr "S'ha restaurat la base de dades de l'Akonadi." + +#~ msgid "Akonadi Database" +#~ msgstr "Base de dades de l'Akonadi" + +#~ msgid "Overwrite" +#~ msgstr "Sobreescriu" + +#~ msgid "Copyright © 2012-2015 pimsettingexporter authors" +#~ msgstr "Copyright © 2012-2015, els autors del pimsettingexporter" + +#~ msgid "Back Up Data..." +#~ msgstr "Còpia de seguretat de les dades..." + +#~ msgid "Copyright © 2015 pimsettingexporter authors" +#~ msgstr "Copyright © 2015, els autors del pimsettingexporter" + +#~ msgid "mysqldump not found. Export data aborted" +#~ msgstr "No s'ha trobat mysqldump. L'exportació de dades està interrompuda" + +#~ msgid "Backing up Akonadi Database..." +#~ msgstr "" +#~ "S'està fent la còpia de seguretat de la base de dades de l'Akonadi..." + +#~ msgid "Could not find \"%1\" necessary to dump database." +#~ msgstr "" +#~ "No s'ha pogut trobar «%1» que és necessari per fer el bolcat de la base " +#~ "de dades." + +#~ msgid "Akonadi Database \"%1\" cannot be added to backup file." +#~ msgstr "" +#~ "No s'ha pogut afegir la base de dades «%1» de l'Akonadi al fitxer de " +#~ "còpia de seguretat." + +#~ msgid "Akonadi Database backup done." +#~ msgstr "" +#~ "S'ha efectuat la còpia de seguretat de la base de dades de l'Akonadi." + +#~ msgid "Theme directory \"%1\" cannot be added to backup file." +#~ msgstr "" +#~ "El directori del tema «%1» no s'ha pogut afegir al fitxer de còpia de " +#~ "seguretat." + +#~ msgid "Resource was not configured correctly, not archiving it." +#~ msgstr "El recurs no s'ha configurat correctament, no serà arxivat." + +#~ msgid "Zip program not found. Install it before to launch this application." +#~ msgstr "" +#~ "No s'ha trobat el programa «zip». Cal instal·lar-lo abans d'executar " +#~ "aquesta aplicació." + +#~ msgid "Zip program not found." +#~ msgstr "No s'ha trobat el programa «zip»." + +#~ msgid "Mails backup done." +#~ msgstr "S'ha efectuat la còpia de seguretat dels correus." + +#~ msgid "Copyright © 2012-2014 pimsettingexporter authors" +#~ msgstr "Copyright © 2012-2014, els autors del pimsettingexporter" + +#~ msgid "Start export KJots settings..." +#~ msgstr "Inicia l'exportació de la configuració del KJots..." + +#~ msgid "Start import KJots settings..." +#~ msgstr "Inicia la importació de la configuració del KJots..." + +#~ msgid "KJots" +#~ msgstr "KJots" + +#~ msgid "Start export KNode settings..." +#~ msgstr "Inicia l'exportació de la configuració del KNode..." + +#~ msgid "Start import KNode settings..." +#~ msgstr "Inicia la importació de la configuració del KNode..." + +#~ msgid "KNode" +#~ msgstr "KNode" diff -Nru pim-data-exporter-17.12.3/po/ca@valencia/pimsettingexporter.po pim-data-exporter-18.04.3/po/ca@valencia/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/ca@valencia/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/ca@valencia/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -1,16 +1,16 @@ # Translation of pimsettingexporter.po to Catalan (Valencian) -# Copyright (C) 2012-2017 This_file_is_part_of_KDE +# Copyright (C) 2012-2018 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Josep Ma. Ferrer , 2012, 2014, 2015, 2016, 2017. +# Josep Ma. Ferrer , 2012, 2014, 2015, 2016, 2017, 2018. # Antoni Bella Pérez , 2013, 2014, 2015, 2016, 2017. msgid "" msgstr "" "Project-Id-Version: pimsettingexporter\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-12-30 18:16+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-05-17 21:39+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" "Language: ca@valencia\n" @@ -38,8 +38,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "Copyright © 2012-2017, els autors del pimsettingexporter" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "Copyright © 2012-2018, els autors del pimsettingexporter" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -54,7 +54,7 @@ #: console/main.cpp:41 #, kde-format msgid "File to log information to." -msgstr "Fitxer per gravar informació." +msgstr "Fitxer per enregistrar informació." #: console/main.cpp:42 #, kde-format @@ -638,7 +638,7 @@ #: core/utils.cpp:373 #, kde-format msgid "Data" -msgstr "Dada" +msgstr "Dades" #: gui/dialog/backupfilestructureinfodialog.cpp:41 #, kde-format @@ -668,7 +668,7 @@ #: gui/dialog/selectiontypedialog.cpp:53 #, kde-format msgid "Use this template by default" -msgstr "Usa esta plantilla per omissió" +msgstr "Usa aquesta plantilla per omissió" #: gui/dialog/selectiontypedialog.cpp:58 #: gui/dialog/synchronizeresourcedialog.cpp:53 @@ -700,7 +700,7 @@ #: gui/dialog/showarchivestructuredialog.cpp:51 #, kde-format msgid "Search..." -msgstr "Busca..." +msgstr "Cerca..." #: gui/dialog/showarchivestructuredialog.cpp:60 #, kde-format @@ -732,7 +732,7 @@ #: gui/dialog/showarchivestructuredialog.cpp:93 #, kde-format msgid "This is not kdepim archive." -msgstr "Este no és un arxiu del kdepim." +msgstr "Aquest no és un arxiu del kdepim." #: gui/dialog/showarchivestructuredialog.cpp:93 #, kde-format @@ -804,8 +804,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "Copyright © 2012-2017, els autors del pimsettingexporter" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "Copyright © 2012-2018, els autors del pimsettingexporter" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format @@ -984,7 +984,7 @@ "additional data which will be skipped during import. Do you want to import " "it?" msgstr "" -"L'arxiu ha estat creat per una versió més recent d'este programa. Potser " +"L'arxiu ha estat creat per una versió més recent d'aquest programa. Potser " "conté dades addicionals que seran omeses durant la importació. Voleu " "importar-lo?" diff -Nru pim-data-exporter-17.12.3/po/cs/pimsettingexporter.po pim-data-exporter-18.04.3/po/cs/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/cs/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/cs/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Vit Pelcak , 2012, 2013, 2014, 2015, 2016, 2017. +# Vit Pelcak , 2012, 2013, 2014, 2015, 2016, 2017, 2018. # Tomáš Chvátal , 2012. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-11-14 17:22+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-06-15 16:02+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" "Language: cs\n" @@ -35,8 +35,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "Copyright © 2015-2017 autoři pimsettingexporter" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "Copyright © 2015-2018 autoři pimsettingexporter" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -793,8 +793,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "Copyright © 2012-2017 autoři pimsettingexporter" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "Copyright © 2012-2018 autoři pimsettingexporter" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/da/pimsettingexporter.po pim-data-exporter-18.04.3/po/da/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/da/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/da/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2017-03-22 17:25+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" @@ -35,7 +35,7 @@ #: console/main.cpp:39 #, fuzzy, kde-format #| msgid "Copyright © 2015-2016 pimsettingexporter authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "Ophavsret © 2015-2016 pimsettingexporter-udviklerne" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -797,7 +797,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, fuzzy, kde-format #| msgid "Copyright © 2012-2016 pimsettingexporter authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "Ophavsret © 2012-2016 pimsettingexporter-udviklerne" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/de/pimsettingexporter.po pim-data-exporter-18.04.3/po/de/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/de/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/de/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -1,11 +1,11 @@ # Frederik Schwarzer , 2012, 2013, 2016. -# Burkhard Lück , 2012, 2013, 2014, 2015, 2017. +# Burkhard Lück , 2012, 2013, 2014, 2015, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: backupmail\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-11-21 13:42+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-03-05 10:21+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" "Language: de\n" @@ -32,8 +32,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "Copyright © 2012-2017 pimsettingexporter-Autoren" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "Copyright © 2012-2018 pimsettingexporter-Autoren" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -794,8 +794,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "Copyright © 2012-2017 pimsettingexporter-Autoren" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "Copyright © 2012-2018 pimsettingexporter-Autoren" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/el/pimsettingexporter.po pim-data-exporter-18.04.3/po/el/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/el/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/el/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: backupmail\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2013-01-14 23:29+0200\n" "Last-Translator: Stelios \n" "Language-Team: Greek \n" @@ -36,7 +36,7 @@ #: console/main.cpp:39 #, fuzzy, kde-format #| msgid "Copyright © 2012-2013 pimsettingexporter authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "Copyright © 2012-2013 οι συγγραφείς του pimsettingexporter" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -825,7 +825,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, fuzzy, kde-format #| msgid "Copyright © 2012-2013 pimsettingexporter authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "Copyright © 2012-2013 οι συγγραφείς του pimsettingexporter" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/en_GB/pimsettingexporter.po pim-data-exporter-18.04.3/po/en_GB/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/en_GB/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/en_GB/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -1,15 +1,15 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Steve Allewell , 2014, 2015, 2016, 2017. +# Steve Allewell , 2014, 2015, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-12-31 20:23+0000\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-02-18 15:35+0000\n" "Last-Translator: Steve Allewell \n" -"Language-Team: British English \n" +"Language-Team: British English \n" "Language: en_GB\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,8 +34,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "Copyright © 2015-2018 pimsettingexporter authors" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -792,8 +792,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "Copyright © 2012-2018 pimsettingexporter authors" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/es/pimsettingexporter.po pim-data-exporter-18.04.3/po/es/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/es/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/es/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Javier Vinal , 2014, 2015, 2016, 2017. +# Javier Vinal , 2014, 2015, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-09-03 22:13+0100\n" -"Last-Translator: Javier Vinal \n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-01-05 23:38+0100\n" +"Last-Translator: Javier Vinal \n" "Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" @@ -34,8 +34,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "Derechos de autor © 2015-2017, los autores de pimsettingexporter" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "Derechos de autor © 2015-2018, los autores de pimsettingexporter" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -795,8 +795,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "Derechos de autor © 2012-2017, los autores de pimsettingexporter" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "Derechos de autor © 2012-2018, los autores de pimsettingexporter" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/et/pimsettingexporter.po pim-data-exporter-18.04.3/po/et/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/et/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/et/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2016-07-27 20:58+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" @@ -35,7 +35,7 @@ #: console/main.cpp:39 #, fuzzy, kde-format #| msgid "Copyright © 2015-2016 pimsettingexporter authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "Autoriõigus © 2015-2016: pimsettingexporteri autorid" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -797,7 +797,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, fuzzy, kde-format #| msgid "Copyright © 2012-2016 pimsettingexporter authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "Autoriõigus © 2012-2016: pimsettingexporteri autorid" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/fi/pimsettingexporter.po pim-data-exporter-18.04.3/po/fi/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/fi/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/fi/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: backupmail\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-09-08 10:52+0200\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-01-22 17:21+0200\n" "Last-Translator: Tommi Nieminen \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -35,8 +35,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "Tekijänoikeudet © 2015–2017 pimsettingexporterin tekijät" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "Tekijänoikeudet © 2015–2018 pimsettingexporterin tekijät" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -798,8 +798,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "Tekijänoikeudet © 2012–2017 pimsettingexporterin tekijät" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "Tekijänoikeudet © 2012–2018 pimsettingexporterin tekijät" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/fr/pimsettingexporter.po pim-data-exporter-18.04.3/po/fr/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/fr/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/fr/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -4,14 +4,15 @@ # Joëlle Cornavin , 2012, 2013. # Vincent Pinon , 2013, 2014, 2015, 2016, 2017, 2018. # Vincent PINON , 2013, 2014. +# Simon Depiets , 2018. # msgid "" msgstr "" "Project-Id-Version: pimsettingexporter\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-09-08 17:56+0100\n" -"Last-Translator: Vincent Pinon \n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-06-14 10:53+0800\n" +"Last-Translator: Simon Depiets \n" "Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -40,8 +41,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "Copyright © 2015-2017 Les auteurs de pimsettingexporter" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "Copyright © 2015-2018 Les auteurs de pimsettingexporter" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -427,7 +428,7 @@ #: core/mail/exportmailjob.cpp:572 #, kde-format msgid "vCard file \"%1\" cannot be saved." -msgstr "Il est impossible d'enregistrer le fichier vCard « %1 »." +msgstr "Impossible d'enregistrer le fichier vCard « %1 »." #: core/mail/exportmailjob.cpp:585 #, kde-format @@ -809,8 +810,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "Copyright © 2012-2017 Les auteurs de pimsettingexporter" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "Copyright © 2012-2018 Les auteurs de pimsettingexporter" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/ga/pimsettingexporter.po pim-data-exporter-18.04.3/po/ga/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/ga/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/ga/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: backupmail\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2012-05-14 16:25-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -34,7 +34,7 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -805,7 +805,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/gl/pimsettingexporter.po pim-data-exporter-18.04.3/po/gl/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/gl/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/gl/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2018-01-19 19:26+0100\n" -"Last-Translator: Adrián Chaves (Gallaecio) \n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-04-28 23:01+0100\n" +"Last-Translator: Adrian Chaves \n" "Language-Team: Galician \n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -39,10 +39,9 @@ msgstr "Consola do exportador da configuración PIM" #: console/main.cpp:39 -#, fuzzy, kde-format -#| msgid "Copyright © 2015-2016 pimsettingexporter authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "© 2015-2015 Autores de pimsettingexporter" +#, kde-format +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "© 2015-2018 Autores de pimsettingexporter" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -141,10 +140,9 @@ msgstr "Non foi posíbel atopar ficheiros de recursos." #: core/abstractimportexportjob.cpp:475 -#, fuzzy, kde-format -#| msgid "Unable to copy file" +#, kde-format msgid "Unable to copy file %1" -msgstr "Non foi posíbel copiar o ficheiro." +msgstr "Non se pode copiar o ficheiro %1." #: core/abstractimportexportjob.cpp:515 #, kde-format @@ -462,7 +460,7 @@ #: core/mail/importmailjob.cpp:167 #, kde-format msgid "mailtransports file could not be found in the archive." -msgstr "Non foi posíbel atopar o ficheiro mailtransports no arquivo." +msgstr "Non se puido atopar o ficheiro mailtransports no arquivo." #: core/mail/importmailjob.cpp:247 #, kde-format @@ -492,7 +490,7 @@ #: core/mail/importmailjob.cpp:594 #, kde-format msgid "filters file could not be found in the archive." -msgstr "Non foi posíbel atopar o ficheiro de filtros no arquivo." +msgstr "Non se puido atopar o ficheiro de filtros no arquivo." #: core/mail/importmailjob.cpp:875 core/mail/importmailjob.cpp:880 #, kde-format @@ -502,7 +500,7 @@ #: core/mail/importmailjob.cpp:878 #, kde-format msgid "emailidentities file could not be found in the archive." -msgstr "Non foi posíbel atopar o ficheiro emailidentities no arquivo." +msgstr "Non se puido atopar o ficheiro emailidentities no arquivo." #: core/mail/importmailjob.cpp:947 #, kde-format @@ -706,7 +704,7 @@ #: gui/dialog/showarchivestructuredialog.cpp:51 #, kde-format msgid "Search..." -msgstr "" +msgstr "Buscar…" #: gui/dialog/showarchivestructuredialog.cpp:60 #, kde-format @@ -728,7 +726,7 @@ #: gui/dialog/showarchivestructuredialog.cpp:86 #, kde-format msgid "Cannot open archive" -msgstr "Non é posíbel abrir o arquivo" +msgstr "Non se pode abrir o arquivo" #: gui/dialog/showarchivestructuredialog.cpp:91 #, kde-format @@ -809,10 +807,9 @@ msgstr "Exportador da configuración PIM" #: gui/pimsettingcommandlineoption.cpp:54 -#, fuzzy, kde-format -#| msgid "Copyright © 2012-2016 pimsettingexporter authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "© 2012-2016 Autores de pimsettingexporter" +#, kde-format +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "© 2012-2018 Autores de pimsettingexporter" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format @@ -870,16 +867,13 @@ msgstr "A sincronización completa de «%1» fallou." #: gui/pimsettingexporterwindow.cpp:173 -#, fuzzy, kde-format -#| msgid "" -#| "For restoring data, you must use \"pimsettingexporter\". Be careful it " -#| "can overwrite existing settings, data." +#, kde-format msgid "" "For restoring data, you must use \"pimsettingexporter\". Be careful as it " "can overwrite your existing settings and data." msgstr "" -"Para restaurar os datos hai que empregar «pimsettingexporter». Teña coidado, " -"porque pode substituír a configuración ou os datos existentes." +"Para restaurar os datos hai que empregar «pimsettingexporter». Teña coidado " +"xa que pode substituír a súa configuración e datos existentes." #: gui/pimsettingexporterwindow.cpp:175 gui/pimsettingexporterwindow.cpp:284 #: gui/pimsettingexporterwindow.cpp:361 @@ -923,10 +917,9 @@ msgstr "Escoller o arquivo" #: gui/pimsettingexporterwindow.cpp:258 -#, fuzzy, kde-format -#| msgid "Copy file" +#, kde-format msgid "Zip file" -msgstr "Copiara o ficheiro" +msgstr "Ficheiro Zip" #: gui/pimsettingexporterwindow.cpp:271 #, kde-format @@ -947,6 +940,8 @@ #, kde-format msgid "Please quit all kdepim applications before backing up your data." msgstr "" +"Peche todos os aplicativos de kdepim antes de facer unha copia de seguranza " +"dos seus datos." #: gui/pimsettingexporterwindow.cpp:304 #, kde-format @@ -959,22 +954,18 @@ msgstr "Ficheiro Zip (*.zip)" #: gui/pimsettingexporterwindow.cpp:316 -#, fuzzy, kde-format -#| msgid "Backing up resources..." +#, kde-format msgid "Backup in progress..." -msgstr "Estase a facer a copia de seguranza dos recursos…" +msgstr "Copia de seguranza en progreso…" #: gui/pimsettingexporterwindow.cpp:359 -#, fuzzy, kde-format -#| msgid "" -#| "Before to restore data, close all kdepim applications. Do you want to " -#| "continue?" +#, kde-format msgid "" "Before restoring data you must close all kdepim applications. Do you want to " "continue?" msgstr "" -"Antes de restaurar os datos, peche todos os aplicativos do kdepim. Quere " -"continuar?" +"Antes de restaurar os datos debe pechar todos os aplicativos do kdepim. " +"Quere continuar?" #: gui/pimsettingexporterwindow.cpp:372 #, kde-format @@ -982,16 +973,14 @@ msgstr "Restaurar unha copia de seguranza" #: gui/pimsettingexporterwindow.cpp:375 -#, fuzzy, kde-format -#| msgid "Zip File (*.zip)" +#, kde-format msgid "Zip File" -msgstr "Arquivo ZIP (*.zip)" +msgstr "Ficheiro Zip" #: gui/pimsettingexporterwindow.cpp:407 -#, fuzzy, kde-format -#| msgid "Restore resources..." +#, kde-format msgid "Restore in progress..." -msgstr "Restaurar os recursos…" +msgstr "Restauración en progreso…" #: gui/pimsettingsbackuprestoreui.cpp:40 #, kde-format @@ -1000,9 +989,8 @@ "additional data which will be skipped during import. Do you want to import " "it?" msgstr "" -"O arquivo foi creado por unha versión máis nova deste programa. Podería " -"conter datos adicionais que han ser omitidos durante a importación. Quere " -"importalo?" +"O arquivo creouno unha versión máis nova deste programa. Podería conter " +"datos adicionais que han omitirse durante a importación. Quere importalo?" #: gui/pimsettingsbackuprestoreui.cpp:41 #, kde-format @@ -1025,10 +1013,9 @@ msgstr "Substituír sempre o ficheiro" #: gui/widgets/pimsettingexporterconfigurewidget.cpp:44 -#, fuzzy, kde-format -#| msgid "Always Override File" +#, kde-format msgid "Always Override Directory" -msgstr "Substituír sempre o ficheiro" +msgstr "Substituír sempre o directorio" #: gui/widgets/pimsettingexporterconfigurewidget.cpp:48 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/hu/pimsettingexporter.po pim-data-exporter-18.04.3/po/hu/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/hu/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/hu/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2014-09-04 12:30+0200\n" "Last-Translator: Kristóf Kiszel \n" "Language-Team: Hungarian \n" @@ -37,7 +37,7 @@ #: console/main.cpp:39 #, fuzzy, kde-format #| msgid "Copyright © 2012-2014 pimsettingexporter authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "Copyright © A pimsettingexporter szerzői, 2012-2014." #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -839,7 +839,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, fuzzy, kde-format #| msgid "Copyright © 2012-2014 pimsettingexporter authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "Copyright © A pimsettingexporter szerzői, 2012-2014." #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/ia/pimsettingexporter.po pim-data-exporter-18.04.3/po/ia/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/ia/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/ia/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2013-12-06 15:01+0100\n" "Last-Translator: G.Sora \n" "Language-Team: Interlingua \n" @@ -36,7 +36,7 @@ #: console/main.cpp:39 #, fuzzy, kde-format #| msgid "Copyright © 2012-2013 pimsettingexporter authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "Copyright © 2012-2013, le autores de pimsettingexporter" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -839,7 +839,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, fuzzy, kde-format #| msgid "Copyright © 2012-2013 pimsettingexporter authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "Copyright © 2012-2013, le autores de pimsettingexporter" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/it/pimsettingexporter.po pim-data-exporter-18.04.3/po/it/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/it/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/it/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: pimsettingexporter\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-08-28 21:59+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-01-03 21:01+0100\n" "Last-Translator: Luigi Toscano \n" "Language-Team: Italian \n" "Language: it\n" @@ -34,8 +34,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "Copyright © 2015-2017 gli autori di pimsettingexporter" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "Copyright © 2015-2018 gli autori di pimsettingexporter" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -794,8 +794,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "Copyright © 2012-2017 gli autori di pimsettingexporter" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "Copyright © 2012-2018 gli autori di pimsettingexporter" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/ja/pimsettingexporter.po pim-data-exporter-18.04.3/po/ja/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/ja/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/ja/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: backupmail\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2012-04-22 21:56-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" @@ -31,7 +31,7 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -787,7 +787,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/kk/pimsettingexporter.po pim-data-exporter-18.04.3/po/kk/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/kk/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/kk/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2013-11-08 01:45+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" @@ -36,7 +36,7 @@ #: console/main.cpp:39 #, fuzzy, kde-format #| msgid "Copyright © 2012-2013 pimsettingexporter authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "Copyright © 2012-2013 pimsettingexporter авторлары" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -842,7 +842,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, fuzzy, kde-format #| msgid "Copyright © 2012-2013 pimsettingexporter authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "Copyright © 2012-2013 pimsettingexporter авторлары" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/km/pimsettingexporter.po pim-data-exporter-18.04.3/po/km/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/km/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/km/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: backupmail\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2012-12-31 14:00+0700\n" "Last-Translator: sutha \n" "Language-Team: Khmer \n" @@ -38,7 +38,7 @@ #: console/main.cpp:39 #, fuzzy, kde-format #| msgid "Copyright © 2012 pimsettingexporter authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "រក្សាសិទ្ធិ​ឆ្នាំ ២០១២ ដោយ​អ្នក​និពន្ធ pimsettingexporter" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -821,7 +821,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, fuzzy, kde-format #| msgid "Copyright © 2012 pimsettingexporter authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "រក្សាសិទ្ធិ​ឆ្នាំ ២០១២ ដោយ​អ្នក​និពន្ធ pimsettingexporter" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/ko/pimsettingexporter.po pim-data-exporter-18.04.3/po/ko/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/ko/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/ko/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2015-07-30 16:20+0200\n" "Last-Translator: Shinjo Park \n" "Language-Team: Korean \n" @@ -35,7 +35,7 @@ #: console/main.cpp:39 #, fuzzy, kde-format #| msgid "Copyright © 2012-2015 pimsettingexporter authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "Copyright © 2012-2015 pimsettingexporter authors" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -829,7 +829,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, fuzzy, kde-format #| msgid "Copyright © 2012-2015 pimsettingexporter authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "Copyright © 2012-2015 pimsettingexporter authors" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/lt/pimsettingexporter.po pim-data-exporter-18.04.3/po/lt/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/lt/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/lt/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: l 10n\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2014-11-10 19:38+0200\n" "Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian \n" @@ -38,7 +38,7 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -820,7 +820,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/lv/pimsettingexporter.po pim-data-exporter-18.04.3/po/lv/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/lv/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/lv/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2012-07-01 17:02+0300\n" "Last-Translator: Einars Sprugis \n" "Language-Team: Latvian \n" @@ -36,7 +36,7 @@ #: console/main.cpp:39 #, fuzzy, kde-format #| msgid "Copyright © 2012 backupmail authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "Autortiesības © 2012 backupmail autori" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -824,7 +824,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, fuzzy, kde-format #| msgid "Copyright © 2012 backupmail authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "Autortiesības © 2012 backupmail autori" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/mr/pimsettingexporter.po pim-data-exporter-18.04.3/po/mr/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/mr/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/mr/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2013-03-11 16:06+0530\n" "Last-Translator: Chetan Khona \n" "Language-Team: Marathi \n" @@ -35,7 +35,7 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -797,7 +797,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/nb/pimsettingexporter.po pim-data-exporter-18.04.3/po/nb/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/nb/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/nb/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2014-09-19 22:46+0200\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" @@ -36,7 +36,7 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -792,7 +792,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/nds/pimsettingexporter.po pim-data-exporter-18.04.3/po/nds/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/nds/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/nds/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2014-09-18 22:40+0200\n" "Last-Translator: Sönke Dibbern \n" "Language-Team: Low Saxon \n" @@ -36,7 +36,7 @@ #: console/main.cpp:39 #, fuzzy, kde-format #| msgid "Copyright © 2012-2014 pimsettingexporter authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "" "Copyright © 2012-2014 de Schrieverslüüd vun't PIM-Instellen-Exportprogramm" @@ -841,7 +841,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, fuzzy, kde-format #| msgid "Copyright © 2012-2014 pimsettingexporter authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "" "Copyright © 2012-2014 de Schrieverslüüd vun't PIM-Instellen-Exportprogramm" diff -Nru pim-data-exporter-17.12.3/po/nl/pimsettingexporter.po pim-data-exporter-18.04.3/po/nl/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/nl/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/nl/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Freek de Kruijf , 2012, 2013, 2014, 2015, 2016, 2017. +# Freek de Kruijf , 2012, 2013, 2014, 2015, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-08-24 22:17+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-01-02 22:11+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -34,8 +34,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "Copyright © 2012-2017 Auteurs van pimsettingexporter" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "Copyright © 2012-2018 Auteurs van pimsettingexporter" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -801,8 +801,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "Copyright © 2012-2017 Auteurs van pimsettingexporter" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "Copyright © 2012-2018 Auteurs van pimsettingexporter" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/pl/pimsettingexporter.po pim-data-exporter-18.04.3/po/pl/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/pl/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/pl/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Łukasz Wojniłowicz , 2012, 2013, 2014, 2015, 2016, 2017. +# Łukasz Wojniłowicz , 2012, 2013, 2014, 2015, 2016, 2017, 2018. # Marta Rybczyńska , 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-10-22 06:22+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-01-28 06:14+0100\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -36,8 +36,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "Prawa autorskie © 2015-2017 Autorzy Eksportowania ustawień ZIO" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "Prawa autorskie © 2015-2018 Autorzy Eksportowania ustawień ZIO" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -796,8 +796,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "Prawa autorskie © 2012-2017 Autorzy Eksportowania ustawień ZIO" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "Prawa autorskie © 2015-2018 Autorzy Eksportowania ustawień ZIO" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/pt/pimsettingexporter.po pim-data-exporter-18.04.3/po/pt/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/pt/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/pt/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: pimsettingexporter\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-08-25 15:47+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-01-02 11:18+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" "Language: pt\n" @@ -32,8 +32,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "Copyright © 2015-2017 dos autores do 'pimsettingexporter'" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "Copyright © 2015-2018 dos autores do 'pimsettingexporter'" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -795,8 +795,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "Copyright © 2012-2017 dos autores do 'pimsettingexporter'" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "Copyright © 2012-2018 dos autores do 'pimsettingexporter'" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/pt_BR/pimsettingexporter.po pim-data-exporter-18.04.3/po/pt_BR/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/pt_BR/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/pt_BR/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: pimsettingexporter\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2016-04-09 11:29-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" @@ -38,7 +38,7 @@ #: console/main.cpp:39 #, fuzzy, kde-format #| msgid "Copyright © 2015-2016 pimsettingexporter authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "Copyright © 2015-2016 dos autores do pimsettingexporter" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -805,7 +805,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, fuzzy, kde-format #| msgid "Copyright © 2012-2016 pimsettingexporter authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "Copyright © 2012-2016 dos autores do pimsettingexporter" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/ro/pimsettingexporter.po pim-data-exporter-18.04.3/po/ro/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/ro/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/ro/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2013-02-16 10:30+0200\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" @@ -36,7 +36,7 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -819,7 +819,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/ru/pimsettingexporter.po pim-data-exporter-18.04.3/po/ru/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/ru/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/ru/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2017-10-09 12:45+0300\n" "Last-Translator: Alexander Potashev \n" "Language-Team: Russian \n" @@ -38,8 +38,9 @@ msgstr "Консоль экспорта данных PIM" #: console/main.cpp:39 -#, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" +#, fuzzy, kde-format +#| msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "" "© Разработчики программы экспорта личных данных (pimsettingexporter), " "2012-2017" @@ -802,8 +803,9 @@ msgstr "Экспорт данных PIM" #: gui/pimsettingcommandlineoption.cpp:54 -#, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" +#, fuzzy, kde-format +#| msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "" "© Разработчики программы экспорта личных данных (pimsettingexporter), " "2012-2017" diff -Nru pim-data-exporter-17.12.3/po/sk/pimsettingexporter.po pim-data-exporter-18.04.3/po/sk/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/sk/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/sk/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: pimsettingexporter\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2017-04-26 21:19+0100\n" "Last-Translator: Roman Paholik \n" "Language-Team: Slovak \n" @@ -31,8 +31,9 @@ msgstr "Konzola exportovača nastavení PIM" #: console/main.cpp:39 -#, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" +#, fuzzy, kde-format +#| msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "Copyright © 2015-2017 autori pimsettingexporter" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -792,8 +793,9 @@ msgstr "Exportovač nastavenia PIM" #: gui/pimsettingcommandlineoption.cpp:54 -#, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" +#, fuzzy, kde-format +#| msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "Copyright © 2015-2017 autori pimsettingexporter" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/sl/pimsettingexporter.po pim-data-exporter-18.04.3/po/sl/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/sl/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/sl/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2018-01-20 11:00+0100\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" @@ -37,8 +37,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "Avtorske pravice © 2015-2017 avtorji pimsettingexporter-ja" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "Avtorske pravice © 2015-2018 avtorji pimsettingexporter-ja" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -797,8 +797,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "Avtorske pravice © 2012-2017 avtorji pimsettingexporter-ja" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "Avtorske pravice © 2012-2018 avtorji pimsettingexporter-ja" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/sr/pimsettingexporter.po pim-data-exporter-18.04.3/po/sr/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/sr/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/sr/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: pimsettingexporter\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-09-28 18:00+0200\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-01-06 09:21+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" "Language: sr\n" @@ -35,8 +35,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "© 2015–2017, аутори Извозника ПИМ поставки" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "© 2015–2018, аутори Извозника ПИМ поставки" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -826,8 +826,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "© 2012–2017, аутори Извозника ПИМ поставки" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "© 2012–2018, аутори Извозника ПИМ поставки" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/sv/docs/pimsettingexporter/index.docbook pim-data-exporter-18.04.3/po/sv/docs/pimsettingexporter/index.docbook --- pim-data-exporter-17.12.3/po/sv/docs/pimsettingexporter/index.docbook 2018-03-06 00:30:27.000000000 +0000 +++ pim-data-exporter-18.04.3/po/sv/docs/pimsettingexporter/index.docbook 1970-01-01 00:00:00.000000000 +0000 @@ -1,220 +0,0 @@ - - - Export av inställningar för personlig informationshantering"> - - - IMAP"> -]> - -
- - -Handbok &i18n-pimsettingexporter; - - - Laurent Montel &Laurent.Montel.mail; -Scarlett Clark
&Scarlett.Clark.mail;
-
- Stefan Asserhäll
stefan.asserhall@bredband.net
Översättare
-
- - -2013 -&Laurent.Montel; - - -&FDLNotice; - -2016-07-27 -5.3.40 (Program 16.08) - -
- - - -Inledning - -&i18n-pimsettingexporter; gör det möjligt att exportera och importera inställningar för personlig informationshantering och lokal e-post. Det går att säkerhetskopiera och återställa inställningar från följande program: -&kmail; -&knotes; -&akregator; -&kaddressbook; -&kalarm; -&korganizer; -&blogilo; - - - - -Använda &i18n-pimsettingexporter; -Säkerhetskopiering är en väsentlig aktivitet för alla användare. &i18n-pimsettingexporter; är ett utmärkt verktyg för att säkerhetskopiera eller flytta alla inställningar och e-post till en ny installation. Du kan också använda &i18n-pimsettingexporter; för att importera tidigare säkerhetskopior. -Du kan använda VerktygExportera data från &kmail;... visa brevfönstret eller så kan &i18n-pimsettingexporter; köras som ett fristående program genom att köra &i18n-pimsettingexporter; via programstart. - -Välj Arkiv Säkerhetskopiera data... för att utföra en säkerhetskopiering. Det ber dig att stänga alla kdepim-program. Försäkra dig om att du stänger alla fönster, dataförlust kan inträffa om du inte gör det. När de väl har stängts, klicka på Ja för att fortsätta, eller Nej för att avbryta. -Du blir tillfrågat om att skapa ett namn på säkerhetskopian, som matas in i textrutan Fil, t.ex. mina-brevinställningar. Den normala filtypen som den sparas med är .zip. -Nästa sida låter dig välja vad du vill säkerhetskopiera, normalt är allting valt. Val av brev i &kmail; säkerhetskopierar bara brev i Lokala korgar. Det säkerhetskopierar &imap;-inställningar och laddar ner brev vid återställning. Om du har brev på en &imap;-server som du vill säkerhetskopiera, måste du använda Modulen för korgarkivering för att arkivera dessa brev i en lokal korg. - - -Valdialogrutan - - - - - - Valdialogrutan - - - Valdialogrutan - - - -Den sista sidan visar loggen av säkerhetskopieringsprocessen. Du kan stänga fönstret när du väl har granskat loggen och verifierat att säkerhetskopieringen lyckades. -För att återställa säkerhetskopian, välj ArkivÅterställ data... inne i &i18n-pimsettingexporter;. -Genom att använda VerktygVisa arkivinformation kan du välja ett säkerhetskopieringsarkiv och titta på innehållet. - - - - - -Tack till och licens -&i18n-pimsettingexporter; -Program copyright 2013 &Laurent.Montel; &Laurent.Montel.mail; -Dokumentation Copyright © 2013 &Laurent.Montel; &Laurent.Montel.mail; &Scarlett.Clark; &Scarlett.Clark.mail; - -Översättning Stefan Asserhäll stefan.asserhall@bredband.net -&underFDL; &underGPL; - -&documentation.index; -
- - diff -Nru pim-data-exporter-17.12.3/po/sv/pimsettingexporter.po pim-data-exporter-18.04.3/po/sv/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/sv/pimsettingexporter.po 2018-03-06 00:30:26.000000000 +0000 +++ pim-data-exporter-18.04.3/po/sv/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Stefan Asserhäll , 2012, 2013, 2014, 2015, 2016, 2017. +# Stefan Asserhäll , 2012, 2013, 2014, 2015, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-08-24 16:47+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-01-02 19:07+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -35,9 +35,9 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "" -"Copyright © 2015-2017 Upphovsmännen till Export av inställningar för " +"Copyright © 2015-2018 Upphovsmännen till Export av inställningar för " "personlig informationshantering" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -797,9 +797,9 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "" -"Copyright © 2015-2017 Upphovsmännen till Export av inställningar för " +"Copyright © 2015-2018 Upphovsmännen till Export av inställningar för " "personlig informationshantering" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/tr/pimsettingexporter.po pim-data-exporter-18.04.3/po/tr/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/tr/pimsettingexporter.po 2018-03-06 00:30:27.000000000 +0000 +++ pim-data-exporter-18.04.3/po/tr/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2017-10-03 14:40+0000\n" "Last-Translator: Kaan \n" "Language-Team: Turkish \n" @@ -35,8 +35,9 @@ msgstr "PIM Ayar Dışa Aktarım Konsolu" #: console/main.cpp:39 -#, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" +#, fuzzy, kde-format +#| msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "Telif Hakkı © 2012-2017 pimsettingexporter yazarları" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -796,8 +797,9 @@ msgstr "PIM Ayar Aktarıcı" #: gui/pimsettingcommandlineoption.cpp:54 -#, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" +#, fuzzy, kde-format +#| msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "Telif Hakkı © 2012-2017 pimsettingexporter yazarları" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/ug/pimsettingexporter.po pim-data-exporter-18.04.3/po/ug/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/ug/pimsettingexporter.po 2018-03-06 00:30:27.000000000 +0000 +++ pim-data-exporter-18.04.3/po/ug/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: pimsettingexporter\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2013-09-08 07:05+0900\n" "Last-Translator: Gheyret Kenji \n" "Language-Team: Uyghur \n" @@ -34,7 +34,7 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -796,7 +796,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "" #: gui/pimsettingcommandlineoption.cpp:58 diff -Nru pim-data-exporter-17.12.3/po/uk/pimsettingexporter.po pim-data-exporter-18.04.3/po/uk/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/uk/pimsettingexporter.po 2018-03-06 00:30:27.000000000 +0000 +++ pim-data-exporter-18.04.3/po/uk/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -1,15 +1,15 @@ # Translation of pimsettingexporter.po to Ukrainian -# Copyright (C) 2012-2017 This_file_is_part_of_KDE +# Copyright (C) 2012-2018 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2.1 or # version 3 or later versions approved by the membership of KDE e.V. # -# Yuri Chornoivan , 2012, 2013, 2014, 2015, 2016, 2017. +# Yuri Chornoivan , 2012, 2013, 2014, 2015, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: pimsettingexporter\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2017-08-24 09:00+0200\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-01-02 09:30+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -37,8 +37,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "© Розробники pimsettingexporter, 2015–2017" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "© Розробники pimsettingexporter, 2015–2018" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -797,8 +797,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "© Розробники pimsettingexporter, 2012–2017" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "© Розробники pimsettingexporter, 2012–2018" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/zh_CN/pimsettingexporter.po pim-data-exporter-18.04.3/po/zh_CN/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/zh_CN/pimsettingexporter.po 2018-03-06 00:30:27.000000000 +0000 +++ pim-data-exporter-18.04.3/po/zh_CN/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" -"PO-Revision-Date: 2018-02-28 02:27-0500\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" +"PO-Revision-Date: 2018-07-03 17:39\n" "Last-Translator: guoyunhebrave \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -37,8 +37,8 @@ #: console/main.cpp:39 #, kde-format -msgid "Copyright © 2015-2017 pimsettingexporter authors" -msgstr "版权 © 2015-2017 pimsettingexporter 作者" +msgid "Copyright © 2015-2018 pimsettingexporter authors" +msgstr "版权 © 2015-2018 pimsettingexporter 作者" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 #, kde-format @@ -793,8 +793,8 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, kde-format -msgid "Copyright © 2012-2017 pimsettingexporter authors" -msgstr "版权 © 2012-2017 pimsettingexporter 作者" +msgid "Copyright © 2012-2018 pimsettingexporter authors" +msgstr "版权 © 2012-2018 pimsettingexporter 作者" #: gui/pimsettingcommandlineoption.cpp:58 #, kde-format diff -Nru pim-data-exporter-17.12.3/po/zh_TW/pimsettingexporter.po pim-data-exporter-18.04.3/po/zh_TW/pimsettingexporter.po --- pim-data-exporter-17.12.3/po/zh_TW/pimsettingexporter.po 2018-03-06 00:30:27.000000000 +0000 +++ pim-data-exporter-18.04.3/po/zh_TW/pimsettingexporter.po 2018-07-10 00:14:58.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2017-10-31 03:12+0100\n" +"POT-Creation-Date: 2018-01-02 03:16+0100\n" "PO-Revision-Date: 2015-06-17 09:27+0800\n" "Last-Translator: Franklin\n" "Language-Team: Chinese Traditional \n" @@ -35,7 +35,7 @@ #: console/main.cpp:39 #, fuzzy, kde-format #| msgid "Copyright © 2012-2015 pimsettingexporter authors" -msgid "Copyright © 2015-2017 pimsettingexporter authors" +msgid "Copyright © 2015-2018 pimsettingexporter authors" msgstr "Copyright © 2012-2015 pimsettingexporter 作者群" #: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:55 @@ -834,7 +834,7 @@ #: gui/pimsettingcommandlineoption.cpp:54 #, fuzzy, kde-format #| msgid "Copyright © 2012-2015 pimsettingexporter authors" -msgid "Copyright © 2012-2017 pimsettingexporter authors" +msgid "Copyright © 2012-2018 pimsettingexporter authors" msgstr "Copyright © 2012-2015 pimsettingexporter 作者群" #: gui/pimsettingcommandlineoption.cpp:58