commit pim-data-exporter for openSUSE:Factory

Fri, 04 Feb 2022 12:52:00 -0800 

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package pim-data-exporter for 
openSUSE:Factory checked in at 2022-02-04 21:48:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pim-data-exporter (Old)
 and      /work/SRC/openSUSE:Factory/.pim-data-exporter.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "pim-data-exporter"

Fri Feb  4 21:48:49 2022 rev:66 rq:951168 version:21.12.2

Changes:
--------
--- /work/SRC/openSUSE:Factory/pim-data-exporter/pim-data-exporter.changes      
2022-01-11 21:23:40.153144500 +0100
+++ 
/work/SRC/openSUSE:Factory/.pim-data-exporter.new.1898/pim-data-exporter.changes
    2022-02-04 21:51:46.507408437 +0100
@@ -1,0 +2,10 @@
+Tue Feb  1 13:04:01 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr>
+
+- Update to 21.12.2
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/21.12.2/
+- Changes since 21.12.1:
+  * Fix build with GCC 12 (more standard attributes in middle of 
decl-specifiers)
+
+-------------------------------------------------------------------

Old:
----
  pim-data-exporter-21.12.1.tar.xz
  pim-data-exporter-21.12.1.tar.xz.sig

New:
----
  pim-data-exporter-21.12.2.tar.xz
  pim-data-exporter-21.12.2.tar.xz.sig

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pim-data-exporter.spec ++++++
--- /var/tmp/diff_new_pack.TLVVqI/_old  2022-02-04 21:51:47.055404660 +0100
+++ /var/tmp/diff_new_pack.TLVVqI/_new  2022-02-04 21:51:47.059404633 +0100
@@ -20,7 +20,7 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print 
$1"."$2}')}
 %bcond_without released
 Name:           pim-data-exporter
-Version:        21.12.1
+Version:        21.12.2
 Release:        0
 Summary:        Data exporter for KDE PIM applications
 License:        GPL-2.0-or-later AND LGPL-2.1-or-later


++++++ pim-data-exporter-21.12.1.tar.xz -> pim-data-exporter-21.12.2.tar.xz 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pim-data-exporter-21.12.1/CMakeLists.txt 
new/pim-data-exporter-21.12.2/CMakeLists.txt
--- old/pim-data-exporter-21.12.1/CMakeLists.txt        2022-01-03 
22:59:11.000000000 +0100
+++ new/pim-data-exporter-21.12.2/CMakeLists.txt        2022-01-29 
00:30:08.000000000 +0100
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
-set(PIM_VERSION "5.19.1")
+set(PIM_VERSION "5.19.2")
 project(pim-data-exporter VERSION ${PIM_VERSION})
-set(RELEASE_SERVICE_VERSION "21.12.1")
+set(RELEASE_SERVICE_VERSION "21.12.2")
 set(KF5_MIN_VERSION "5.87.0")
 
 find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
@@ -46,15 +46,15 @@
     find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test)
 endif()
 
-set(AKONADI_VERSION "5.19.1")
-set(IDENTITYMANAGEMENT_LIB_VERSION "5.19.1")
-set(KMAILTRANSPORT_LIB_VERSION "5.19.1")
-set(KMIME_LIB_VERSION "5.19.1")
-set(KPIMTEXTEDIT_LIB_VERSION "5.19.1")
-
-set(MAILCOMMON_LIB_VERSION "5.19.1")
-set(PIMCOMMON_LIB_VERSION "5.19.1")
-set(AKONADINOTES_LIB_VERSION "5.19.1")
+set(AKONADI_VERSION "5.19.2")
+set(IDENTITYMANAGEMENT_LIB_VERSION "5.19.2")
+set(KMAILTRANSPORT_LIB_VERSION "5.19.2")
+set(KMIME_LIB_VERSION "5.19.2")
+set(KPIMTEXTEDIT_LIB_VERSION "5.19.2")
+
+set(MAILCOMMON_LIB_VERSION "5.19.2")
+set(PIMCOMMON_LIB_VERSION "5.19.2")
+set(AKONADINOTES_LIB_VERSION "5.19.2")
 
 # Find KF5 package
 find_package(KF5Archive ${KF5_MIN_VERSION} REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/core/abstractimportexportjob.h 
new/pim-data-exporter-21.12.2/core/abstractimportexportjob.h
--- old/pim-data-exporter-21.12.1/core/abstractimportexportjob.h        
2022-01-03 22:59:11.000000000 +0100
+++ new/pim-data-exporter-21.12.2/core/abstractimportexportjob.h        
2022-01-29 00:30:08.000000000 +0100
@@ -101,12 +101,10 @@
 
     void convertCollectionListStrToAkonadiId(const KSharedConfig::Ptr &config, 
const QString &groupName, const QString &key, bool addCollectionPrefix);
     void convertRealPathToCollectionList(KConfigGroup &group, const QString 
&currentKey, bool addCollectionPrefix = true);
-    virtual Q_REQUIRED_RESULT Akonadi::Collection::Id 
convertFolderPathToCollectionId(const QString &path) = 0;
+    Q_REQUIRED_RESULT virtual Akonadi::Collection::Id 
convertFolderPathToCollectionId(const QString &path) = 0;
     virtual QString adaptNewResourceUrl(bool overwriteResources, const 
KSharedConfig::Ptr &resourceConfig, const QString &storePath) = 0;
-    virtual Q_REQUIRED_RESULT QString createResource(const QString &resources,
-                                                     const QString &name,
-                                                     const QMap<QString, 
QVariant> &settings,
-                                                     bool synchronizeTree = 
false) = 0;
+    Q_REQUIRED_RESULT virtual QString
+    createResource(const QString &resources, const QString &name, const 
QMap<QString, QVariant> &settings, bool synchronizeTree = false) = 0;
 
     QHash<QString, Akonadi::Collection::Id> mHashConvertPathCollectionId;
     QVector<ResourceFiles> mListResourceFile;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/core/addressbook/exportaddressbookjobinterface.h 
new/pim-data-exporter-21.12.2/core/addressbook/exportaddressbookjobinterface.h
--- 
old/pim-data-exporter-21.12.1/core/addressbook/exportaddressbookjobinterface.h  
    2022-01-03 22:59:11.000000000 +0100
+++ 
new/pim-data-exporter-21.12.2/core/addressbook/exportaddressbookjobinterface.h  
    2022-01-29 00:30:08.000000000 +0100
@@ -26,8 +26,8 @@
     virtual void convertCollectionListToRealPath(KConfigGroup &group, const 
QString &currentKey) = 0;
     void slotCheckBackupConfig();
     virtual void exportResourceToArchive(const QString &archivePath, const 
QString &url, const QString &identifier) = 0;
-    virtual Q_REQUIRED_RESULT QVector<Utils::AkonadiInstanceInfo> 
listOfResource() = 0;
-    virtual Q_REQUIRED_RESULT QString resourcePath(const QString 
&agentIdentifier, const QString &defaultPath) const = 0;
+    Q_REQUIRED_RESULT virtual QVector<Utils::AkonadiInstanceInfo> 
listOfResource() = 0;
+    Q_REQUIRED_RESULT virtual QString resourcePath(const QString 
&agentIdentifier, const QString &defaultPath) const = 0;
     virtual void backupAddressBookResourceFile(const QString &agentIdentifier, 
const QString &defaultPath) = 0;
 
 private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/core/addressbook/importaddressbookjobinterface.h 
new/pim-data-exporter-21.12.2/core/addressbook/importaddressbookjobinterface.h
--- 
old/pim-data-exporter-21.12.1/core/addressbook/importaddressbookjobinterface.h  
    2022-01-03 22:59:11.000000000 +0100
+++ 
new/pim-data-exporter-21.12.2/core/addressbook/importaddressbookjobinterface.h  
    2022-01-29 00:30:08.000000000 +0100
@@ -23,8 +23,8 @@
 protected:
     void slotNextStep() override;
     virtual void synchronizeResource(const QStringList &lst) = 0;
-    virtual Q_REQUIRED_RESULT QString adaptResourcePath(const KSharedConfigPtr 
&resourceConfig, const QString &storedData) = 0;
-    virtual Q_REQUIRED_RESULT QString configLocation() const;
+    Q_REQUIRED_RESULT virtual QString adaptResourcePath(const KSharedConfigPtr 
&resourceConfig, const QString &storedData) = 0;
+    Q_REQUIRED_RESULT virtual QString configLocation() const;
     void restoreResources();
 
 private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/core/alarm/exportalarmjobinterface.h 
new/pim-data-exporter-21.12.2/core/alarm/exportalarmjobinterface.h
--- old/pim-data-exporter-21.12.1/core/alarm/exportalarmjobinterface.h  
2022-01-03 22:59:11.000000000 +0100
+++ new/pim-data-exporter-21.12.2/core/alarm/exportalarmjobinterface.h  
2022-01-29 00:30:08.000000000 +0100
@@ -24,8 +24,8 @@
 protected:
     void slotCheckBackupConfig();
     virtual void exportResourceToArchive(const QString &archivePath, const 
QString &url, const QString &identifier) = 0;
-    virtual Q_REQUIRED_RESULT QVector<Utils::AkonadiInstanceInfo> 
listOfResource() = 0;
-    virtual Q_REQUIRED_RESULT QString resourcePath(const QString &identifier) 
const = 0;
+    Q_REQUIRED_RESULT virtual QVector<Utils::AkonadiInstanceInfo> 
listOfResource() = 0;
+    Q_REQUIRED_RESULT virtual QString resourcePath(const QString &identifier) 
const = 0;
     virtual void backupAlarmResourceFile(const QString &agentIdentifier, const 
QString &defaultPath) = 0;
     virtual void convertCollectionIdsToRealPath(KConfigGroup 
&selectFolderNoteGroup, const QString &selectFolderNoteGroupStr) = 0;
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/core/alarm/importalarmjobinterface.h 
new/pim-data-exporter-21.12.2/core/alarm/importalarmjobinterface.h
--- old/pim-data-exporter-21.12.1/core/alarm/importalarmjobinterface.h  
2022-01-03 22:59:11.000000000 +0100
+++ new/pim-data-exporter-21.12.2/core/alarm/importalarmjobinterface.h  
2022-01-29 00:30:08.000000000 +0100
@@ -22,10 +22,10 @@
 protected:
     void slotNextStep() override;
     virtual void synchronizeResource(const QStringList &lst) = 0;
-    virtual Q_REQUIRED_RESULT QString adaptResourcePath(const KSharedConfigPtr 
&resourceConfig, const QString &storedData) = 0;
+    Q_REQUIRED_RESULT virtual QString adaptResourcePath(const KSharedConfigPtr 
&resourceConfig, const QString &storedData) = 0;
 
     void restoreResources();
-    virtual Q_REQUIRED_RESULT QString configLocation() const;
+    Q_REQUIRED_RESULT virtual QString configLocation() const;
 
 private:
     Q_REQUIRED_RESULT bool isAConfigFile(const QString &name) const override;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/core/backupresourcefilejobbase.h 
new/pim-data-exporter-21.12.2/core/backupresourcefilejobbase.h
--- old/pim-data-exporter-21.12.1/core/backupresourcefilejobbase.h      
2022-01-03 22:59:11.000000000 +0100
+++ new/pim-data-exporter-21.12.2/core/backupresourcefilejobbase.h      
2022-01-29 00:30:08.000000000 +0100
@@ -30,7 +30,7 @@
     Q_REQUIRED_RESULT QString defaultPath() const;
     void setDefaultPath(const QString &defaultPath);
 
-    virtual Q_REQUIRED_RESULT QString resourcePath(const QString &identifier) 
const = 0;
+    Q_REQUIRED_RESULT virtual QString resourcePath(const QString &identifier) 
const = 0;
 Q_SIGNALS:
     void error(const QString &);
     void info(const QString &);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/core/calendar/exportcalendarjobinterface.h 
new/pim-data-exporter-21.12.2/core/calendar/exportcalendarjobinterface.h
--- old/pim-data-exporter-21.12.1/core/calendar/exportcalendarjobinterface.h    
2022-01-03 22:59:11.000000000 +0100
+++ new/pim-data-exporter-21.12.2/core/calendar/exportcalendarjobinterface.h    
2022-01-29 00:30:08.000000000 +0100
@@ -23,11 +23,11 @@
 
 protected:
     void slotCheckBackupConfig();
-    virtual Q_REQUIRED_RESULT QString convertToFullCollectionPath(const 
qlonglong collectionValue) = 0;
+    Q_REQUIRED_RESULT virtual QString convertToFullCollectionPath(const 
qlonglong collectionValue) = 0;
     virtual void convertCollectionListToRealPath(KConfigGroup &group, const 
QString &currentKey) = 0;
     virtual void exportResourceToArchive(const QString &archivePath, const 
QString &url, const QString &identifier) = 0;
-    virtual Q_REQUIRED_RESULT QVector<Utils::AkonadiInstanceInfo> 
listOfResource() = 0;
-    virtual Q_REQUIRED_RESULT QString resourcePath(const QString &identifier) 
const = 0;
+    Q_REQUIRED_RESULT virtual QVector<Utils::AkonadiInstanceInfo> 
listOfResource() = 0;
+    Q_REQUIRED_RESULT virtual QString resourcePath(const QString &identifier) 
const = 0;
     virtual void backupCalendarResourceFile(const QString &agentIdentifier, 
const QString &defaultPath) = 0;
 
 private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/core/calendar/importcalendarjobinterface.h 
new/pim-data-exporter-21.12.2/core/calendar/importcalendarjobinterface.h
--- old/pim-data-exporter-21.12.1/core/calendar/importcalendarjobinterface.h    
2022-01-03 22:59:11.000000000 +0100
+++ new/pim-data-exporter-21.12.2/core/calendar/importcalendarjobinterface.h    
2022-01-29 00:30:08.000000000 +0100
@@ -23,9 +23,9 @@
 protected:
     void slotNextStep() override;
     virtual void synchronizeResource(const QStringList &lst) = 0;
-    virtual Q_REQUIRED_RESULT QString adaptResourcePath(const KSharedConfigPtr 
&resourceConfig, const QString &storedData) = 0;
+    Q_REQUIRED_RESULT virtual QString adaptResourcePath(const KSharedConfigPtr 
&resourceConfig, const QString &storedData) = 0;
 
-    virtual Q_REQUIRED_RESULT QString configLocation() const;
+    Q_REQUIRED_RESULT virtual QString configLocation() const;
 
 private:
     Q_REQUIRED_RESULT bool isAConfigFile(const QString &name) const override;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/core/mail/exportmailjobinterface.h 
new/pim-data-exporter-21.12.2/core/mail/exportmailjobinterface.h
--- old/pim-data-exporter-21.12.1/core/mail/exportmailjobinterface.h    
2022-01-03 22:59:11.000000000 +0100
+++ new/pim-data-exporter-21.12.2/core/mail/exportmailjobinterface.h    
2022-01-29 00:30:08.000000000 +0100
@@ -36,15 +36,15 @@
     virtual void convertCollectionListToRealPath(KConfigGroup &group, const 
QString &currentKey) = 0;
     void backupResources();
     virtual QVector<MailCommon::MailFilter *> filters() = 0;
-    virtual Q_REQUIRED_RESULT QString convertToFullCollectionPath(const 
qlonglong collectionValue) = 0;
+    Q_REQUIRED_RESULT virtual QString convertToFullCollectionPath(const 
qlonglong collectionValue) = 0;
     void slotCheckBackupResources();
     virtual void exportResourceToArchive(const QString &archivePath, const 
QString &url, const QString &identifier) = 0;
-    virtual Q_REQUIRED_RESULT QVector<Utils::AkonadiInstanceInfo> 
listOfResource() = 0;
-    virtual Q_REQUIRED_RESULT QString storeResources(KZip *archive, const 
QString &identifier, const QString &path) = 0;
-    virtual Q_REQUIRED_RESULT QString resourcePath(const QString &identifier) 
const = 0;
+    Q_REQUIRED_RESULT virtual QVector<Utils::AkonadiInstanceInfo> 
listOfResource() = 0;
+    Q_REQUIRED_RESULT virtual QString storeResources(KZip *archive, const 
QString &identifier, const QString &path) = 0;
+    Q_REQUIRED_RESULT virtual QString resourcePath(const QString &identifier) 
const = 0;
     virtual void backupMailResourceFile(const QString &agentIdentifier, const 
QString &defaultPath) = 0;
     virtual void exportFilters() = 0;
-    virtual Q_REQUIRED_RESULT QVector<uint> listIdentityUoid() const = 0;
+    Q_REQUIRED_RESULT virtual QVector<uint> listIdentityUoid() const = 0;
 
 private:
     void slotCheckBackupIdentity();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/core/mail/importmailjobinterface.h 
new/pim-data-exporter-21.12.2/core/mail/importmailjobinterface.h
--- old/pim-data-exporter-21.12.1/core/mail/importmailjobinterface.h    
2022-01-03 22:59:11.000000000 +0100
+++ new/pim-data-exporter-21.12.2/core/mail/importmailjobinterface.h    
2022-01-29 00:30:08.000000000 +0100
@@ -46,8 +46,8 @@
     virtual void 
registerSpecialCollection(Akonadi::SpecialMailCollections::Type type, qint64 
colId) = 0;
     virtual void synchronizeResource(const QStringList &lst) = 0;
     virtual void importFilters(const QString &filename) = 0;
-    virtual Q_REQUIRED_RESULT QString configLocation() const = 0;
-    virtual Q_REQUIRED_RESULT QString adaptResourcePath(const KSharedConfigPtr 
&resourceConfig, const QString &storedData) = 0;
+    Q_REQUIRED_RESULT virtual QString configLocation() const = 0;
+    Q_REQUIRED_RESULT virtual QString adaptResourcePath(const KSharedConfigPtr 
&resourceConfig, const QString &storedData) = 0;
     virtual void addNewIdentity(const QString &name, KConfigGroup &group, int 
defaultIdentities, int oldUid) = 0;
     virtual void importCustomMailTransport(const QString &identifierValue, 
const KConfigGroup &group, int defaultTransport, int transportId) = 0;
     virtual void importSmtpMailTransport(const SmtpMailTransport 
&smtpMailTransport, int defaultTransport, int transportId) = 0;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/core/notes/exportnotesjobinterface.h 
new/pim-data-exporter-21.12.2/core/notes/exportnotesjobinterface.h
--- old/pim-data-exporter-21.12.1/core/notes/exportnotesjobinterface.h  
2022-01-03 22:59:11.000000000 +0100
+++ new/pim-data-exporter-21.12.2/core/notes/exportnotesjobinterface.h  
2022-01-29 00:30:08.000000000 +0100
@@ -25,9 +25,9 @@
 protected:
     virtual void convertCollectionIdsToRealPath(KConfigGroup 
&selectFolderNoteGroup, const QString &selectFolderNoteGroupStr) = 0;
     virtual void exportResourceToArchive(const QString &archivePath, const 
QString &url, const QString &identifier) = 0;
-    virtual Q_REQUIRED_RESULT QVector<Utils::AkonadiInstanceInfo> 
listOfResource() = 0;
+    Q_REQUIRED_RESULT virtual QVector<Utils::AkonadiInstanceInfo> 
listOfResource() = 0;
     void slotNoteJobTerminated();
-    virtual Q_REQUIRED_RESULT QString resourcePath(const QString &identifier) 
const = 0;
+    Q_REQUIRED_RESULT virtual QString resourcePath(const QString &identifier) 
const = 0;
     Q_REQUIRED_RESULT QString resourceArchiveName() const;
 
 private:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/core/notes/importnotesjobinterface.h 
new/pim-data-exporter-21.12.2/core/notes/importnotesjobinterface.h
--- old/pim-data-exporter-21.12.1/core/notes/importnotesjobinterface.h  
2022-01-03 22:59:11.000000000 +0100
+++ new/pim-data-exporter-21.12.2/core/notes/importnotesjobinterface.h  
2022-01-29 00:30:08.000000000 +0100
@@ -20,9 +20,9 @@
     void start() override;
 
 protected:
-    virtual Q_REQUIRED_RESULT QString configLocation() const;
+    Q_REQUIRED_RESULT virtual QString configLocation() const;
     virtual void synchronizeResource(const QStringList &lst) = 0;
-    virtual Q_REQUIRED_RESULT QString adaptResourcePath(const KSharedConfigPtr 
&resourceConfig, const QString &storedData) = 0;
+    Q_REQUIRED_RESULT virtual QString adaptResourcePath(const KSharedConfigPtr 
&resourceConfig, const QString &storedData) = 0;
     void slotNextStep() override;
     Q_REQUIRED_RESULT QString installConfigLocation() const;
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/core/resourceconverterbase.h 
new/pim-data-exporter-21.12.2/core/resourceconverterbase.h
--- old/pim-data-exporter-21.12.1/core/resourceconverterbase.h  2022-01-03 
22:59:11.000000000 +0100
+++ new/pim-data-exporter-21.12.2/core/resourceconverterbase.h  2022-01-29 
00:30:08.000000000 +0100
@@ -23,11 +23,11 @@
     Q_REQUIRED_RESULT QString resourcePath(const QString &agentIdentifier, 
const QString &defaultPath = QString());
     Q_REQUIRED_RESULT QString adaptResourcePath(const KSharedConfigPtr 
&resourceConfig, const QString &storedData);
     Q_REQUIRED_RESULT QString resourcePath(const KSharedConfigPtr 
&resourceConfig, const QString &defaultPath = QString());
-    virtual Q_REQUIRED_RESULT QString changeResourcePath(QString url) const;
+    Q_REQUIRED_RESULT virtual QString changeResourcePath(QString url) const;
 
-    virtual Q_REQUIRED_RESULT QString convertToFullCollectionPath(const 
qlonglong collectionValue) = 0;
-    virtual Q_REQUIRED_RESULT Akonadi::Collection::Id 
convertFolderPathToCollectionId(const QString &path) = 0;
+    Q_REQUIRED_RESULT virtual QString convertToFullCollectionPath(const 
qlonglong collectionValue) = 0;
+    Q_REQUIRED_RESULT virtual Akonadi::Collection::Id 
convertFolderPathToCollectionId(const QString &path) = 0;
     Q_REQUIRED_RESULT QString storeResources(KZip *archive, const QString 
&identifier, const QString &path);
-    virtual Q_REQUIRED_RESULT QString installDefaultDirectory() = 0;
+    Q_REQUIRED_RESULT virtual QString installDefaultDirectory() = 0;
     virtual QString adaptNewResourceUrl(bool overwriteResources, const 
KSharedConfig::Ptr &resourceConfig, const QString &storePath) = 0;
 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/org.kde.pimdataexporter.appdata.xml 
new/pim-data-exporter-21.12.2/org.kde.pimdataexporter.appdata.xml
--- old/pim-data-exporter-21.12.1/org.kde.pimdataexporter.appdata.xml   
2022-01-03 22:59:11.000000000 +0100
+++ new/pim-data-exporter-21.12.2/org.kde.pimdataexporter.appdata.xml   
2022-01-29 00:30:08.000000000 +0100
@@ -137,9 +137,9 @@
     </screenshot>
   </screenshots>
   <releases>
+    <release version="5.19.2" date="2022-02-03"/>
     <release version="5.19.1" date="2022-01-06"/>
     <release version="5.19.0" date="2021-12-09"/>
     <release version="5.18.3" date="2021-11-04"/>
-    <release version="5.18.2" date="2021-10-07"/>
   </releases>
 </component>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pim-data-exporter-21.12.1/po/ca/pimdataexporter.po 
new/pim-data-exporter-21.12.2/po/ca/pimdataexporter.po
--- old/pim-data-exporter-21.12.1/po/ca/pimdataexporter.po      2022-01-04 
01:24:21.000000000 +0100
+++ new/pim-data-exporter-21.12.2/po/ca/pimdataexporter.po      2022-02-01 
01:15:21.000000000 +0100
@@ -1086,85 +1086,3 @@
 #, kde-format
 msgid "Template Files (*.xml)"
 msgstr "Fitxers de plantilla (*.xml)"
-
-#~ msgid "&New"
-#~ msgstr "&Nou"
-
-#~ msgid "&Edit"
-#~ msgstr "&Edita"
-
-#~ msgid "&View"
-#~ msgstr "&Vista"
-
-#~ msgid "&Action"
-#~ msgstr "&Acci??"
-
-#~ msgid "&Settings"
-#~ msgstr "A&rranjament"
-
-#~ msgid "&Help"
-#~ msgstr "A&juda"
-
-#~ msgid "&Export"
-#~ msgstr "&Exporta"
-
-#~ msgid "&Collection"
-#~ msgstr "&Col??lecci??"
-
-#~ msgid "&Item"
-#~ msgstr "E&lement"
-
-#~ msgid "&Cache"
-#~ msgstr "&Cau"
-
-#~ msgid "&Server"
-#~ msgstr "&Servidor"
-
-#~ msgid "&Certificates"
-#~ msgstr "&Certificats"
-
-#~ msgid "&Window"
-#~ msgstr "&Finestra"
-
-#~ msgctxt "@title:menu New message, folder or new window."
-#~ msgid "New"
-#~ msgstr "Nou"
-
-#~ msgid "&Go"
-#~ msgstr "&Ves"
-
-#~ msgid "F&older"
-#~ msgstr "Car&peta"
-
-#~ msgid "Apply Filters on Folder"
-#~ msgstr "Aplica els filtres a la carpeta"
-
-#~ msgid "Apply Filters on Folder and all its Subfolders"
-#~ msgstr "Aplica els filtres a la carpeta i a totes les seves subcarpetes"
-
-#~ msgid "&Message"
-#~ msgstr "&Missatge"
-
-#~ msgid "Reply Special"
-#~ msgstr "Resposta especial"
-
-#~ msgid "&Forward"
-#~ msgstr "&Reenvia"
-
-#~ msgid "A&pply Filter"
-#~ msgstr "A&plica el filtre"
-
-#~ msgid "&Options"
-#~ msgstr "&Opcions"
-
-#~ msgid "&Attach"
-#~ msgstr "&Adjunta"
-
-#~ msgid "HTML Toolbar"
-#~ msgstr "Barra d'eines HTML"
-
-#~ msgid "Text Direction Toolbar"
-#~ msgstr "Barra d'eines per a la direcci?? del text"
-
-#~ msgid "Navigator"
-#~ msgstr "Navegador"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pim-data-exporter-21.12.1/po/cs/pimdataexporter.po 
new/pim-data-exporter-21.12.2/po/cs/pimdataexporter.po
--- old/pim-data-exporter-21.12.1/po/cs/pimdataexporter.po      2022-01-04 
01:24:21.000000000 +0100
+++ new/pim-data-exporter-21.12.2/po/cs/pimdataexporter.po      2022-02-01 
01:15:21.000000000 +0100
@@ -1,6 +1,6 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the PACKAGE package.
-# Vit Pelcak <v...@pelcak.org>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 
2019, 2020, 2021.
+# Vit Pelcak <v...@pelcak.org>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 
2019, 2020, 2021, 2022.
 # Tom???? Chv??tal <tomas.chva...@gmail.com>, 2012.
 #
 msgid ""
@@ -16,7 +16,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Lokalize 20.12.3\n"
+"X-Generator: Lokalize 21.12.0\n"
 
 #, kde-format
 msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pim-data-exporter-21.12.1/po/fr/pimdataexporter.po 
new/pim-data-exporter-21.12.2/po/fr/pimdataexporter.po
--- old/pim-data-exporter-21.12.1/po/fr/pimdataexporter.po      2022-01-04 
01:24:21.000000000 +0100
+++ new/pim-data-exporter-21.12.2/po/fr/pimdataexporter.po      2022-02-01 
01:15:21.000000000 +0100
@@ -1,5 +1,5 @@
 # Simon Depiets <sdepi...@gmail.com>, 2019, 2020.
-# Xavier Besnard <xavier.besn...@neuf.fr>, 2020, 2021.
+# Xavier Besnard <xavier.besn...@neuf.fr>, 2020, 2021, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: pim-data-exporter\n"
@@ -13,7 +13,7 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Lokalize 21.08.1\n"
+"X-Generator: Lokalize 21.12.1\n"
 "X-Environment: kde\n"
 "X-Accelerator-Marker: &\n"
 "X-Text-Markup: kde4\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/pim-data-exporter-21.12.1/po/it/pimdataexporter.po 
new/pim-data-exporter-21.12.2/po/it/pimdataexporter.po
--- old/pim-data-exporter-21.12.1/po/it/pimdataexporter.po      2022-01-04 
01:24:21.000000000 +0100
+++ new/pim-data-exporter-21.12.2/po/it/pimdataexporter.po      2022-02-01 
01:15:21.000000000 +0100
@@ -1,6 +1,6 @@
 # Copyright (C) YEAR This_file_is_part_of_KDE
 # This file is distributed under the same license as the pim-data-exporter 
package.
-# Luigi Toscano <luigi.tosc...@tiscali.it>, 2012, 2013, 2014, 2015, 2016, 
2017, 2018, 2019, 2020, 2021.
+# Luigi Toscano <luigi.tosc...@tiscali.it>, 2012, 2013, 2014, 2015, 2016, 
2017, 2018, 2019, 2020, 2021, 2022.
 #
 msgid ""
 msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/po/ru/docs/pimsettingexporter/index.docbook 
new/pim-data-exporter-21.12.2/po/ru/docs/pimsettingexporter/index.docbook
--- old/pim-data-exporter-21.12.1/po/ru/docs/pimsettingexporter/index.docbook   
1970-01-01 01:00:00.000000000 +0100
+++ new/pim-data-exporter-21.12.2/po/ru/docs/pimsettingexporter/index.docbook   
2022-02-01 01:15:21.000000000 +0100
@@ -0,0 +1,233 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+  <!-- Define an entity for your application if it is not part of KDE
+       CVS -->
+  <!ENTITY i18n-pimdataexporter "<application
+>???????????????? ???????????????? ???????????? PIM</application
+> ">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % Russian "INCLUDE"
+> 
+  <!ENTITY imap "<acronym
+>IMAP</acronym
+>">
+]>
+
+<article id="pimdataexporter" lang="&language;">
+
+<articleinfo id="pimdataexporterinfo">
+<title
+>?????????????????????? ???????????????????????? ???????????????? 
???????????????? ???????????? PIM</title>
+
+<authorgroup>
+<author
+><personname
+> <firstname
+>Laurent</firstname
+> <surname
+>Montel</surname
+> </personname
+> &Laurent.Montel.mail; </author>
+<author
+><firstname
+>Scarlett</firstname
+> <surname
+>Clark</surname
+> <affiliation
+><address
+>&Scarlett.Clark.mail; </address
+></affiliation>
+</author>
+<othercredit role="translator"
+><firstname
+>??????????</firstname
+><surname
+>????????????????</surname
+><affiliation
+><address
+><email
+>translation-t...@basealt.ru</email
+></address
+></affiliation
+><contrib
+>?????????????? ???? ?????????????? ????????</contrib
+></othercredit
+><othercredit role="translator"
+><firstname
+>??????????</firstname
+><surname
+>??????????????????????</surname
+><affiliation
+><address
+><email
+>translation-t...@basealt.ru</email
+></address
+></affiliation
+><contrib
+>???????????????????????????? ???????????????? ???? ?????????????? 
????????</contrib
+></othercredit
+> 
+</authorgroup>
+
+<copyright>
+<year
+>2013</year>
+<holder
+>&Laurent.Montel;</holder>
+</copyright>
+
+<legalnotice
+>&FDLNotice;</legalnotice>
+
+<date
+>2016-07-27</date>
+<releaseinfo
+>5.3.40 (???????????????????? KDE 16.08)</releaseinfo>
+
+</articleinfo>
+
+
+<sect1 id="introduction">
+<title
+>????????????????</title>
+
+<para
+>&i18n-pimdataexporter; ?????????????????? ???????????????????????????? ?? 
?????????????????????????? ?????????????????? PIM ?? ?????????????????? 
??????????. ?????????????? ???????????????? ?????? ?????????????????? 
????????????????: <simplelist>
+<member
+>&kmail;</member>
+<member
+>&knotes;</member>
+<member
+>&akregator;</member>
+<member
+>&kaddressbook;</member>
+<member
+>&kalarm;</member>
+<member
+>&korganizer;</member>
+</simplelist>
+</para>
+
+<sect2 id="using-kapp">
+<title
+>???????????? ???? ?????????????????? ???????????????? ???????????? PIM</title>
+<para
+>?????????????????? ?????????????????????? ??? ?????? ???????????????????????? 
?????????? ???????????? ?? ???????????????????????? ???????????????? ?????? 
???????? ??????????????????????????. &i18n-pimdataexporter; ?????????????? 
???????????????? ?????? ???????????????? ?????????????????? ?????????? ?????? 
???????????????? ???????? ???????????????????????????????? ???????????????????? 
?????????????????? ?? ?????????? ???? ?????????? ????????????????????. 
&i18n-pimdataexporter; ?????????? ???????????????? ???????????????????????? 
?????? ?????????????? ?????????????????? ?????????? ?????????????????? 
??????????.</para>
+<para
+>?????? ?????????????????????????? ?????????????????? ???????????????? ?? 
???????? ???????? ?????????????????? ?????????????????? &kmail; ?????????? 
<menuchoice
+><guimenu
+>????????????</guimenu
+><guimenuitem
+>???????????? ?????? ?????????????? ???????????? &kmail;...</guimenuitem
+></menuchoice
+> ?????? ???????????????? ?????????????????? ?????? ?????????????????? 
???????????????????? ?? ?????????????? ???????? ?????????????? 
????????????????????.</para>
+
+<para
+>?????????? ?????????????????? ?????????????????? ??????????????????????, 
<action
+>???????????????? ?? ???????? ?????????? <menuchoice
+><guimenu
+>????????</guimenu
+><guimenuitem
+>???????????????????????????? ????????????...</guimenuitem
+></menuchoice
+></action
+>: ???????????????? ???????????????????? ???????? ?? ???????????????? ???? 
???????????????? ???????? ???????????????????? kdepim. <warning
+><para
+>??????????????????, ?????? ?????? ???????????????????? 
?????????????????????????? ??????????????, ?? ?????????????????? ???????????? 
???????????????? ???????????? ????????????.</para
+></warning
+> ?????????? ???????????????? ???????? ???????????????????? ?????????????? 
???????????? <guibutton
+>????????????????????</guibutton
+> ?? ???????????????????? ????????, ?????????? ???????????????????? 
?????????????????? ???????????????????? ??????????????????????, ???????? 
<guibutton
+>????????????</guibutton
+>, ?????????? ???? ????????????????.</para>
+<para
+>???????????????????????? ?????????? ???????????????????? ?????????????? 
?????? ?????????????????????? ?????????????????? ??????????; ?????????????? 
?????? ?? ?????????????????? ???????? <guilabel
+>????????</guilabel
+> (????????????????, <replaceable
+>????????????????????????????</replaceable
+>). ???? ?????????????????? ?????????????????? ?????????? 
?????????????????????? ?? ?????????????????????? <filename role="extension"
+>.zip</filename
+>. </para>
+<para
+>?????????????????? ???????? ???????????????? ??????????????, ?????? 
?????????????? ???????????????? ?? ?????????????????? ??????????. ???? 
?????????????????? ?????????????? ?????? ????????????. <note
+> <para
+>?????? ???????????? ?????????? &kmail; ?????????? ?????????????????????? 
?????????????????? ?????????? ???????????? ?????????????????? ??????????; 
???????????????????? ???????????????? ?????????????????? ?????????????????????? 
???????????????????? &imap;, ?? ???????????????? ?????????????????? ?????????? 
?????????????????????? ?????????? ????????????????????????????. ???????? 
?????????????????? ?????????????? ?????????????????? ?????????? ??????????, 
?????????????????????? ???? ?????????????? &imap;, ?? ?????????????????? ???? 
?? ?????????????????? ??????????, ?????????????? ???????????????????????? 
<ulink url="help:/akonadi_folderarchive_agent"
+>Folder Archive Agent (?????????? ?????? ???????????? ?? ???????????????? 
????????????)</ulink
+>.</para>
+</note
+></para>
+<screenshot>
+<screeninfo
+>???????????????????? ???????? ????????????</screeninfo>
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="selection-dialog.png" format="PNG"/>
+    </imageobject>
+    <textobject>
+      <phrase
+>???????????????????? ???????? ????????????</phrase>
+    </textobject>
+    <caption>
+      <para
+>???????????????????? ???????? ????????????</para>
+    </caption>
+  </mediaobject>
+</screenshot>
+<para
+>?????????????????? ???????? ???????????????????? ?????????? ?? ???????? 
???????????????? ???????????????????? ??????????????????????. 
??????????????????, ?????? ?????????????????? ?????????????????????? 
???????????? ??????????????, ?? ???????????????? ?????? ????????.</para>
+<para
+>?????????? ???????????????????????? ???????????? ???? ?????????????????? 
??????????, ???????????????? ?? ???????? ???????????????? ???????????????? 
???????????? PIM ?????????? <menuchoice
+><guimenu
+>????????</guimenu
+><guimenuitem
+>???????????????????????????? ????????????...</guimenuitem
+></menuchoice
+>.</para>
+<para
+>?????????? ?????????????????????? ???????????????????? ?????????????????? 
??????????, ???????????????? ?? ???????? ?????????? <menuchoice
+><guimenu
+>????????????</guimenu
+><guimenuitem
+>???????????????? ???????????????????? ???? ????????????...</guimenuitem
+></menuchoice
+>.</para>
+</sect2>
+</sect1>
+
+<sect1 id="credits">
+
+<title
+>?????????????????? ?????????? ?? ????????????????</title>
+<para
+>&i18n-pimdataexporter;</para>
+<para
+>?????????????????? ?????????? ???? ??????????????????: &Laurent.Montel; 
&Laurent.Montel.mail;, 2019 </para>
+<para
+>?????????????????? ?????????? ???? ????????????????????????: &copy; 
&Laurent.Montel; &Laurent.Montel.mail; &Scarlett.Clark; &Scarlett.Clark.mail;, 
2019 </para>
+
+<para
+>?????????? ????????????????<email
+>translation-t...@basealt.ru</email
+></para
+><para
+>?????????? ??????????????????????<email
+>translation-t...@basealt.ru</email
+></para
+> &underFDL; &underGPL; </sect1>
+
+&documentation.index;
+</article>
+
+<!--
+Local Variables:
+mode: xml
+sgml-minimize-attributes:nil
+sgml-general-insert-case:lower
+sgml-indent-step:0
+sgml-indent-data:nil
+End:
+
+vim:tabstop=2:shiftwidth=2:expandtab
+kate: space-indent on; indent-width 2; tab-width 2; indent-mode none;
+-->
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/pim-data-exporter-21.12.1/po/zh_CN/pimdataexporter.po 
new/pim-data-exporter-21.12.2/po/zh_CN/pimdataexporter.po
--- old/pim-data-exporter-21.12.1/po/zh_CN/pimdataexporter.po   2022-01-04 
01:24:21.000000000 +0100
+++ new/pim-data-exporter-21.12.2/po/zh_CN/pimdataexporter.po   2022-02-01 
01:15:21.000000000 +0100
@@ -7,7 +7,7 @@
 "Project-Id-Version: kdeorg\n"
 "Report-Msgid-Bugs-To: https://bugs.kde.org\n";
 "POT-Creation-Date: 2021-11-11 01:43+0000\n"
-"PO-Revision-Date: 2021-12-22 14:10\n"
+"PO-Revision-Date: 2022-01-08 15:25\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
@@ -39,7 +39,7 @@
 #: console/main.cpp:29
 #, kde-format
 msgid "Copyright ?? 2015-2021 pimdataexporter authors"
-msgstr ""
+msgstr "Copyright ?? 2015-2021 pimdataexporter authors"
 
 #: console/main.cpp:30 gui/pimdatacommandlineoption.cpp:44
 #, kde-format
@@ -863,7 +863,7 @@
 #: gui/pimdatacommandlineoption.cpp:43
 #, kde-format
 msgid "Copyright ?? 2012-2021 pimdataexporter authors"
-msgstr ""
+msgstr "Copyright ?? 2012-2021 pimdataexporter authors"
 
 #: gui/pimdatacommandlineoption.cpp:48
 #, kde-format

Reply via email to