Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mailimporter for openSUSE:Factory checked in at 2022-08-19 17:52:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailimporter (Old) and /work/SRC/openSUSE:Factory/.mailimporter.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailimporter" Fri Aug 19 17:52:44 2022 rev:78 rq:997946 version:22.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mailimporter/mailimporter.changes 2022-07-09 17:02:01.676705751 +0200 +++ /work/SRC/openSUSE:Factory/.mailimporter.new.2083/mailimporter.changes 2022-08-19 17:53:32.495731049 +0200 @@ -1,0 +2,20 @@ +Sun Aug 14 09:43:56 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 22.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/22.08.0/ + +------------------------------------------------------------------- +Fri Aug 5 12:11:41 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 22.07.90 + * New feature release + +------------------------------------------------------------------- +Sat Jul 16 08:28:56 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 22.07.80 + * New feature release + +------------------------------------------------------------------- Old: ---- mailimporter-22.04.3.tar.xz mailimporter-22.04.3.tar.xz.sig New: ---- mailimporter-22.08.0.tar.xz mailimporter-22.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailimporter.spec ++++++ --- /var/tmp/diff_new_pack.kchjj1/_old 2022-08-19 17:53:33.103732323 +0200 +++ /var/tmp/diff_new_pack.kchjj1/_new 2022-08-19 17:53:33.107732332 +0200 @@ -20,7 +20,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without released Name: mailimporter -Version: 22.04.3 +Version: 22.08.0 Release: 0 Summary: Mail import functionality for KDE PIM applications License: GPL-2.0-or-later @@ -46,8 +46,6 @@ BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) -# It can only build on the same platforms as Qt Webengine -ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mips mips64 %description The mailimporter library is a KDE PIM project to provide a framework ++++++ mailimporter-22.04.3.tar.xz -> mailimporter-22.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/.codespellrc new/mailimporter-22.08.0/.codespellrc --- old/mailimporter-22.04.3/.codespellrc 1970-01-01 01:00:00.000000000 +0100 +++ new/mailimporter-22.08.0/.codespellrc 2022-08-08 07:08:18.000000000 +0200 @@ -0,0 +1,4 @@ +[codespell] +skip = ./build*,.git,*.notifyrc,*.desktop,*.json,*.xml +interactive = 3 +ignore-words-list = accessort diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/.gitlab-ci.yml new/mailimporter-22.08.0/.gitlab-ci.yml --- old/mailimporter-22.04.3/.gitlab-ci.yml 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/.gitlab-ci.yml 2022-08-08 07:08:18.000000000 +0200 @@ -4,3 +4,4 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/.kde-ci.yml new/mailimporter-22.08.0/.kde-ci.yml --- old/mailimporter-22.04.3/.kde-ci.yml 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/.kde-ci.yml 2022-08-08 07:08:18.000000000 +0200 @@ -10,3 +10,6 @@ 'pim/kmime' : '@same' 'pim/libkdepim' : '@same' 'pim/pimcommon' : '@same' + +Options: + require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/CMakeLists.txt new/mailimporter-22.08.0/CMakeLists.txt --- old/mailimporter-22.04.3/CMakeLists.txt 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/CMakeLists.txt 2022-08-08 07:08:18.000000000 +0200 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.20.3") +set(PIM_VERSION "5.21.0") project(MailImporter VERSION ${PIM_VERSION}) -set(KF5_MIN_VERSION "5.91.0") +set(KF5_MIN_VERSION "5.95.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -35,11 +35,11 @@ add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") -set(AKONADIMIME_LIB_VERSION "5.20.3") +set(AKONADIMIME_LIB_VERSION "5.21.0") set(QT_REQUIRED_VERSION "5.15.2") -set(KMIME_LIB_VERSION "5.20.3") -set(AKONADI_VERSION "5.20.3") -set(PIMCOMMON_LIB_VERSION "5.20.3") +set(KMIME_LIB_VERSION "5.21.0") +set(AKONADI_VERSION "5.21.0") +set(PIMCOMMON_LIB_VERSION "5.21.0") find_package(Qt${QT_MAJOR_VERSION} ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Xml) @@ -56,7 +56,7 @@ ########### Targets ########### -ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.92.0) +ecm_set_disabled_deprecation_versions(QT 5.15.2 KF 5.96.0) ########### CMake Config Files ########### diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/CMakePresets.json new/mailimporter-22.08.0/CMakePresets.json --- old/mailimporter-22.04.3/CMakePresets.json 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/CMakePresets.json 2022-08-08 07:08:18.000000000 +0200 @@ -2,81 +2,89 @@ "version": 3, "configurePresets": [ { + "name": "base", + "displayName": "base preset", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-${presetName}", + "installDir": "$env{KF5}", + "hidden": true + }, + { "name": "dev", "displayName": "Build as debug", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] + }, { "name": "coverage", "displayName": "Build as debug", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "BUILD_COVERAGE": "ON", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "dev-qt6", "displayName": "Build against qt6", - "generator": "Ninja", "binaryDir": "${sourceDir}/build-qt6", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "BUILD_WITH_QT6": "ON", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF6}" + "inherits": [ + "base" + ] }, { "name": "dev-disable-deprecated", "displayName": "Build as without deprecated methods", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-disable-deprecated", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", "CMAKE_CXX_FLAGS_INIT": "-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "asan", "displayName": "Build with Asan support.", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-asan", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "ECM_ENABLE_SANITIZERS" : "'address;undefined'", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "pch", "displayName": "Build with PCH support.", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-pch", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "dev-clang", "displayName": "dev-clang", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-clang", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" @@ -85,46 +93,46 @@ "CXX": "clang++", "CCACHE_DISABLE": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "unity", "displayName": "Build with CMake unity support.", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-unity", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "USE_UNITY_CMAKE_SUPPORT": "ON", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "release", "displayName": "Build as release mode.", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-release", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "profile", "displayName": "profile", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-profile", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] }, { "name": "clazy", "displayName": "clazy", - "generator": "Ninja", - "binaryDir": "${sourceDir}/build-clazy", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug" }, @@ -132,7 +140,9 @@ "CXX": "clazy", "CCACHE_DISABLE": "ON" }, - "installDir": "$env{KF5}" + "inherits": [ + "base" + ] } ], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/po/ca@valencia/libmailimporter.po new/mailimporter-22.08.0/po/ca@valencia/libmailimporter.po --- old/mailimporter-22.04.3/po/ca@valencia/libmailimporter.po 2022-07-05 06:42:37.000000000 +0200 +++ new/mailimporter-22.08.0/po/ca@valencia/libmailimporter.po 2022-08-12 02:13:02.000000000 +0200 @@ -73,7 +73,7 @@ #: mailimporter/filters/filterthunderbird.cpp:178 #, kde-format msgid "No files found for import." -msgstr "No s'ha trobat cap fitxer que s'ha d'importar." +msgstr "No s'ha trobat cap fitxer que s'haja d'importar." #: mailimporter/filters/filterbalsa.cpp:109 #: mailimporter/filters/filterevolution.cpp:83 @@ -314,7 +314,7 @@ #: mailimporter/filters/filtericedove.cpp:14 #, kde-format msgid "Import Icedove Mails and Folder Structure" -msgstr "Importa els correus i l'estructura de carpetes de l'Icedove" +msgstr "Importa els correus i l'estructura de carpetes d'Icedove" #: mailimporter/filters/filtericedove.cpp:17 #, kde-format @@ -326,13 +326,12 @@ "possible to recreate the folder structure, the folders will be stored under: " "\"Icedove-Import\".</p>" msgstr "" -"<p><b>Filtre d'importaci?? de l'Icedove</b></p><p>Seleccioneu la carpeta de " -"correu base de l'Icedove (normalment ~/.icedove/*.default/Mail/" -"LocalFolders/).</p><p><b>Nota:</b> No seleccioneu mai una carpeta que <u>no</" -"u> continga fitxers mbox (per exemple, un directori de correu): si ho feu, " -"generareu moltes carpetes noves.</p><p>Com que ??s possible recrear " -"l'estructura de les carpetes, estes s'emmagatzemaran davall: ??Icedove-" -"Import??.</p>" +"<p><b>Filtre d'importaci?? d'Icedove</b></p><p>Seleccioneu la carpeta de " +"correu base d'Icedove (normalment ~/.icedove/*.default/Mail/LocalFolders/).</" +"p><p><b>Nota:</b> No seleccioneu mai una carpeta que <u>no</u> continga " +"fitxers mbox (per exemple, un directori de correu): si ho feu, generareu " +"moltes carpetes noves.</p><p>Com que ??s possible recrear l'estructura de les " +"carpetes, estes s'emmagatzemaran davall: ??Icedove-Import??.</p>" #: mailimporter/filters/filtericedove.cpp:34 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/po/sk/libmailimporter.po new/mailimporter-22.08.0/po/sk/libmailimporter.po --- old/mailimporter-22.04.3/po/sk/libmailimporter.po 2022-07-05 06:42:37.000000000 +0200 +++ new/mailimporter-22.08.0/po/sk/libmailimporter.po 2022-08-12 02:13:03.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: libmailimporter\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-10-10 00:19+0000\n" -"PO-Revision-Date: 2022-04-06 20:32+0200\n" +"PO-Revision-Date: 2022-04-09 19:27+0200\n" "Last-Translator: Roman Paholik <wizzar...@gmail.com>\n" "Language-Team: Slovak <kde...@linux.sk>\n" "Language: sk\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/po/tr/libmailimporter.po new/mailimporter-22.08.0/po/tr/libmailimporter.po --- old/mailimporter-22.04.3/po/tr/libmailimporter.po 2022-07-05 06:42:37.000000000 +0200 +++ new/mailimporter-22.08.0/po/tr/libmailimporter.po 2022-08-12 02:13:03.000000000 +0200 @@ -32,7 +32,7 @@ #: mailimporter/filters/filterbalsa.cpp:22 #, kde-format msgid "Import Balsa Local Mails and Folder Structure" -msgstr "Balsa Yerel Postalar??n?? ve Dizin Yap??s??n?? ????eriye Aktar" +msgstr "Balsa Yerel Postalar??n?? ve Dizin Yap??s??n?? ????e Aktar" #: mailimporter/filters/filterbalsa.cpp:24 #, kde-format @@ -41,9 +41,9 @@ "Balsa mailfolder (usually ~/mail/).</p><p>Since it is possible to recreate " "the folder structure, the folders will be stored under: \"Balsa-Import\".</p>" msgstr "" -"<p><b>Balsa i??e aktarma s??zgeci</b></p><p>Balsa e-postalar??n??n ana dizinini " -"se??in (genellikle ~/mail/ dizinindedir).</p><p>Dizin yap??s?? yeniden " -"olu??turulabildi??inden, dizinleriniz burada tutulacakt??r: \"Balsa-Import\".</" +"<p><b>Balsa i??e aktarma s??zgeci</b></p><p>Balsa e-postalar??n??n ana klas??r??n?? " +"se??in (genellikle ~/mail/ klas??r??ndedir).</p><p>Dizin yap??s?? yeniden " +"olu??turulabildi??inden, klas??rleriniz burada tutulacakt??r: \"Balsa-Import\".</" "p>" #: mailimporter/filters/filterbalsa.cpp:39 @@ -147,7 +147,7 @@ #: mailimporter/filters/filterthebat.cpp:209 #, kde-format msgid "Import folder %1..." -msgstr "%1 dizinini i??eriye aktar..." +msgstr "%1 klas??r??n?? i??e aktar..." #: mailimporter/filters/filterbalsa.cpp:195 #: mailimporter/filters/filterevolution.cpp:194 @@ -169,7 +169,7 @@ #: mailimporter/filters/filterthunderbird.cpp:344 #, kde-format msgid "Could not import %1" -msgstr "%1 i??eriye aktar??lamad??" +msgstr "%1 i??e aktar??lamad??" #: mailimporter/filters/filterclawsmail.cpp:22 #, kde-format @@ -186,7 +186,7 @@ "recreates the status of message, e.g. new or forwarded.</p>" msgstr "" "<p><b>Claws-mail i??e aktarma s??zgeci</b></p><p>Claws-mail e-postalar??n??n ana " -"dizinini se??in (genellikle: ~/Mail konumundad??r).</p><p>Dizin yap??s?? " +"klas??r??n?? se??in (genellikle: ~/Mail konumundad??r).</p><p>Dizin yap??s?? " "yeniden olu??turulabilece??inden, yerel klas??r??n??zde burada tutulacakt??r: " "\"ClawsMail-Aktar??m\".</p><p>Bu filtre iletilerin durumlar??n?? da yeniden " "olu??turur. ??rn. yeni veya y??nlendirilmi??.</p>" @@ -206,7 +206,7 @@ #: mailimporter/filters/filterevolution.cpp:17 #, kde-format msgid "Import Evolution 1.x Local Mails and Folder Structure" -msgstr "Evolution 1.x Yerel Postalar??n?? ve Dizin Yap??s??n?? ????eriye Aktar" +msgstr "Evolution 1.x Yerel Postalar??n?? ve Dizin Yap??s??n?? ????e Aktar" #: mailimporter/filters/filterevolution.cpp:18 #, kde-format @@ -224,7 +224,7 @@ msgstr "" "<p><b>Evolution 1.x i??e aktarma s??zgeci</b></p><p>Evolution e-postalar??n??n " "ana dizinini se??in (genellikle ~/evolution/local dizinindedir).</p><p>Dizin " -"yap??s?? yeniden olu??turulana kadar eski dizinleriniz burada tutulacakt??r: " +"yap??s?? yeniden olu??turulana kadar eski klas??rleriniz burada tutulacakt??r: " "\"Evolution-Import\".</p>" #: mailimporter/filters/filterevolution.cpp:35 @@ -261,7 +261,7 @@ #: mailimporter/filters/filterevolution_v2.cpp:22 #, kde-format msgid "Import Evolution 2.x Local Mails and Folder Structure" -msgstr "Evolution 2.x Yerel E-postalar??n?? ve Dizin Yap??s??n?? ????eriye Aktar" +msgstr "Evolution 2.x Yerel E-postalar??n?? ve Dizin Yap??s??n?? ????e Aktar" #: mailimporter/filters/filterevolution_v2.cpp:24 #, kde-format @@ -278,7 +278,7 @@ "dosyalar??n?? <u>i??ermeyen</u> bir dizini asla se??meyin (??rne??in bir maildir): " "E??er yine de bunu yaparsan??z, bir??ok yeni dizin olu??acakt??r.</p><p> Ancak " "dizin yap??s??n?? yeniden olu??turman??z m??mk??nd??r. E??er bunu yaparsan??z dizinler " -"\"Evolution-Import\" dizini alt??nda saklanacakt??r.</p>" +"\"Evolution-Import\" klas??r?? alt??nda saklanacakt??r.</p>" #: mailimporter/filters/filterevolution_v2.cpp:42 #, kde-format @@ -297,7 +297,7 @@ #: mailimporter/filters/filterevolution_v3.cpp:22 #, kde-format msgid "Import Evolution 3.x Local Mails and Folder Structure" -msgstr "Evolution 3.x Yerel E-postalar??n?? ve Dizin Yap??s??n?? ????eriye Aktar" +msgstr "Evolution 3.x Yerel E-postalar??n?? ve Dizin Yap??s??n?? ????e Aktar" #: mailimporter/filters/filterevolution_v3.cpp:24 #, kde-format @@ -309,7 +309,7 @@ msgstr "" "<p><b>Evolution 3.x i??e aktarma s??zgeci</b></p><p>Evolution e-postalar??n??n " "ana dizinini se??in (genellikle ~/evolution/local dizinindedir).</p><p>Dizin " -"yap??s?? yeniden olu??turulana kadar eski dizinleriniz burada tutulacakt??r: " +"yap??s?? yeniden olu??turulana kadar eski klas??rleriniz burada tutulacakt??r: " "\"Evolution-Import\".</p>" #: mailimporter/filters/filterevolution_v3.cpp:39 @@ -334,11 +334,11 @@ "\"Icedove-Import\".</p>" msgstr "" "<p><b>Icedove i??e aktarma filtresi</b></p><p>Temel Icedove e-posta " -"dizininizi se??in (genellikle ~/.icedove/*.default/Mail/Local Folders/).</" +"klas??r??n??z?? se??in (genellikle ~/.icedove/*.default/Mail/Local Folders/).</" "p><p><b>Not:</b>Asla mbox-dosyalar?? <u>i??ermeyen </u> bir Dizin se??meyin " -"(??rne??in, bir maildir): Se??erseniz, bir s??r?? yeni dizininiz olur.</" -"p><p>Dizin yap??s??n?? yeniden olu??turmak m??mk??n oldu??undan, dizinler: " -"\"Icedove-Import\" alt??na kaydedeilir.</p>" +"(??rne??in, bir maildir): Se??erseniz, bir s??r?? yeni klas??r??n??z olur.</" +"p><p>Dizin yap??s??n?? yeniden olu??turmak m??mk??n oldu??undan, klas??rler: " +"\"Icedove-Import\" alt??na kaydedilir.</p>" #: mailimporter/filters/filtericedove.cpp:34 #, kde-format @@ -349,7 +349,7 @@ #: mailimporter/filters/filterkmail_maildir.cpp:26 #, kde-format msgid "Import KMail Maildirs and Folder Structure" -msgstr "KMail E-postalar??n?? ve Dizin Yap??s??n?? ????eriye Aktar" +msgstr "KMail E-postalar??n?? ve Dizin Yap??s??n?? ????e Aktar" #: mailimporter/filters/filterkmail_maildir.cpp:28 #, kde-format @@ -363,22 +363,22 @@ "\"KMail-Import\" in your local folder.</p>" msgstr "" "<p><b>KMail i??e aktarma s??zgeci</b></p><p>????e aktarmak istedi??iniz KMail ana " -"posta dizinini se??in.</p><p><b>Not:</b> Asla yerel KMail posta dizininizi " +"posta klas??r??n?? se??in.</p><p><b>Not:</b> Asla yerel KMail posta klas??r??n??z?? " "se??meyin (genelde ~/Mail veya ~/.kde/share/apps/kmail/mail ): bu durumda, " "ImportWizard s??rekli bir d??ng??ye saplanabilir. </p><p>Bu s??zge??, mbox " -"dosyalar??n??n oldu??u KMail posta dizinlerini i??eriye aktarmaz.</p><p>Dizin " -"yap??s??n?? yeniden olu??turmak m??mk??n oldu??undan, dizinler, yerel dizininizdeki " -"\"KMail-Import\" i??erisinde depolanacakt??r:</p>" +"dosyalar??n??n oldu??u KMail posta klas??rlerini i??e aktarmaz.</p><p>Dizin " +"yap??s??n?? yeniden olu??turmak m??mk??n oldu??undan, klas??rler, yerel " +"klas??r??nzdeki \"KMail-Import\" i??erisinde depolanacakt??r:</p>" #: mailimporter/filters/filterkmail_maildir.cpp:176 #, kde-format msgid "Could not import %1, duplicated message" -msgstr "%1 i??eriye aktar??lamad??, yinelenmi?? ileti" +msgstr "%1 i??e aktar??lamad??, yinelenmi?? ileti" #: mailimporter/filters/filterkmailarchive.cpp:31 #, kde-format msgid "Import KMail Archive File" -msgstr "KMail Ar??iv Dosyas??n?? ????eriye Aktar" +msgstr "KMail Ar??iv Dosyas??n?? ????e Aktar" #: mailimporter/filters/filterkmailarchive.cpp:33 #, kde-format @@ -389,12 +389,12 @@ msgstr "" "<p><b>KMail Ar??iv Dosyas?? ????eri Aktarma S??zgeci</b></p><p>Bu s??zge?? ??nceden " "KMail taraf??ndan olu??turulan ar??ivleri i??eri aktaracakt??r.</p><p>Ar??iv " -"dosyalar??, s??k????t??r??lm???? halde tam bir dizin a??ac?? i??erir.</p>" +"dosyalar??, s??k????t??r??lm???? halde tam bir klas??r a??ac?? i??erir.</p>" #: mailimporter/filters/filterkmailarchive.cpp:71 #, kde-format msgid "Importing folder '%1'..." -msgstr "%1 dizini i??e aktar??l??yor..." +msgstr "%1 klas??r?? i??e aktar??l??yor..." #: mailimporter/filters/filterkmailarchive.cpp:97 #, kde-format @@ -466,7 +466,7 @@ #: mailimporter/filters/filterlnotes.cpp:30 #, kde-format msgid "Import Lotus Notes Emails" -msgstr "Lotus Notes E-postalar??n?? ????eriye Aktar" +msgstr "Lotus Notes E-postalar??n?? ????e Aktar" #: mailimporter/filters/filterlnotes.cpp:32 #, kde-format @@ -479,13 +479,13 @@ "will be stored in subfolders named by the files they came from under: " "\"LNotes-Import\" in your local folder.</p>" msgstr "" -"<p><b>Lotus Notes Yap??sal Metin postas?? i??eriye aktarma s??zgeci</b></p><p>Bu " +"<p><b>Lotus Notes Yap??sal Metin postas?? i??e aktarma s??zgeci</b></p><p>Bu " "s??zge??, bir Lotus Notes e-posta istemcisindeki Yap??sal Metin dosyalar??n?? " "KMail i??erisine aktaracakt??r. Lotus veya Lotus Notes Yap??sal Metin bi??imini " "kullanan di??er e-posta istemcilerindeki postalar?? i??e aktarmak istiyorsan??z " "bu s??zgeci kullan??n.</p><p><b>Not:</b> Dizin yap??s??n?? yeniden olu??turmak " "m??mk??n oldu??undan, i??e aktar??lan iletiler geldikleri dosyalarla " -"adland??r??lm???? alt dizinlerde depolanacakt??r: yerel dizininizdeki \"LNotes-" +"adland??r??lm???? alt klas??rlerde depolanacakt??r: yerel klas??r??n??zdeki \"LNotes-" "Import\" konumu.</p>" #: mailimporter/filters/filterlnotes.cpp:52 @@ -510,7 +510,7 @@ #, kde-format msgctxt "Define folder name where we import lotus note mails" msgid "LNotes-Import" -msgstr "LNotes-????eriye Aktar" +msgstr "LNotes-????e Aktar" #: mailimporter/filters/filterlnotes.cpp:110 #: mailimporter/filters/filterpmail.cpp:266 @@ -521,7 +521,7 @@ #: mailimporter/filters/filtermailapp.cpp:28 #, kde-format msgid "Import From OS X Mail" -msgstr "OS X Mail Uygulamas??ndan ????eriye Aktar" +msgstr "OS X Mail Uygulamas??ndan ????e Aktar" #: mailimporter/filters/filtermailapp.cpp:29 #, kde-format @@ -544,8 +544,8 @@ #, kde-format msgid "1 duplicate message not imported to folder %2 in KMail" msgid_plural "%1 duplicate messages not imported to folder %2 in KMail" -msgstr[0] "1 ayn??s?? olan ileti KMail'deki %2 dizinine aktar??lmad??" -msgstr[1] "%1 ayn??s?? olan ileti KMail'deki %2 dizinine aktar??lmad??" +msgstr[0] "1 ayn??s?? olan ileti KMail'deki %2 klas??r??ne aktar??lmad??" +msgstr[1] "%1 ayn??s?? olan ileti KMail'deki %2 klas??r??ne aktar??lmad??" #: mailimporter/filters/filtermailmangzip.cpp:19 #, kde-format @@ -561,7 +561,7 @@ msgstr "" "<p><b>mailman gzip i??e aktarma s??zgeci</b></p> <p>Bu filtre mailman gzip'li " "dosyalar??n??z?? KMail'e alacak.</p> <p><b>Not:</b>E-postalar, MAILMAN- " -"??nekinden sonra gelen dosya isimleriyle adland??r??lan dizinlere al??nacakt??r.</" +"??nekinden sonra gelen dosya adlar??yla adland??r??lan klas??rlere al??nacakt??r.</" "p>" #: mailimporter/filters/filtermailmangzip.cpp:35 @@ -598,8 +598,8 @@ "<p><b>mbox i??e aktarma s??zgeci</b></p> <p>Bu filtre mbox dosyalar??n??z?? " "KMail'e alacak. E-postalar??n??z??, Ximian Evolution ya da geleneksel UNIX " "bi??imini kullanan di??er uygulamalardan almak i??in bu filtreyi kullan??n.</p> " -"<p><b>Not:</b>E-postalar, MBOX- ??nekinden sonra gelen dosya isimleriyle " -"adland??r??lan dizinlere al??nacakt??r.</p>" +"<p><b>Not:</b>E-postalar, MBOX- ??nekinden sonra gelen dosya adlar??yla " +"adland??r??lan klas??rlere al??nacakt??r.</p>" #: mailimporter/filters/filtermbox.cpp:38 #, kde-format @@ -628,13 +628,13 @@ "folders from Outlook Express 5 and 6 will be stored under: \"OE-Import\" in " "your local folder.</p>" msgstr "" -"<p><b>Outlook Express 4/5/6 i??eriye aktarma s??zgeci</b></p><p>E-posta " -"dosyalar??n??n sakland?????? dizini belirtmelisiniz. E-postalar??n nerede " +"<p><b>Outlook Express 4/5/6 i??e aktarma s??zgeci</b></p><p>E-posta " +"dosyalar??n??n sakland?????? klas??r?? belirtmelisiniz. E-postalar??n nerede " "sakland??????n?? bulmak i??in .dbx ya da .mbx uzant??l?? dosyalar?? a??a????daki " -"dizinlerde arayabilirsiniz<ul><li><i>C:\\Windows\\Application Data</i> " +"klas??rlerde arayabilirsiniz<ul><li><i>C:\\Windows\\Application Data</i> " "Windows 9x s??r??m??nde</li><li><i>Documents and Settings</i> Windows 2000 veya " -"daha yukar??s??nda</li></ul></p><p><b>Not:</b>Ancak dizin yap??s??n?? yeniden " -"olu??turman??z m??mk??nd??r. E??er bunu yaparsan??z dizinler \"OE-Import\" dizini " +"daha yukar??s??nda</li></ul></p><p><b>Not:</b>Ancak klas??r yap??s??n?? yeniden " +"olu??turman??z m??mk??nd??r. E??er bunu yaparsan??z klas??rler \"OE-Import\" klas??r?? " "alt??nda saklanacakt??r.</p>" #: mailimporter/filters/filteroe.cpp:66 @@ -645,7 +645,7 @@ #: mailimporter/filters/filteroe.cpp:82 #, kde-format msgid "Import folder structure..." -msgstr "Dizin yap??s??n?? i??eriye aktar..." +msgstr "Dizin yap??s??n?? i??e aktar..." #: mailimporter/filters/filteroe.cpp:106 #, kde-format @@ -670,7 +670,7 @@ #: mailimporter/filters/filteroe.cpp:161 #, kde-format msgid "Importing OE5+ Folder file %1" -msgstr "OE5+ Dizin dosyas?? %1 i??eriye aktar??l??yor" +msgstr "OE5+ Dizin dosyas?? %1 i??e aktar??l??yor" #: mailimporter/filters/filteropera.cpp:19 #, kde-format @@ -688,11 +688,11 @@ "OPERA-</p>" msgstr "" "<p><b>Opera e-posta i??e aktarma s??zgeci</b></p> <p>Bu filtre iletileri Opera " -"posta dizininden alacak. Opera posta dizinindeki bir hesab??n??zdan b??t??n " -"iletileri almak istiyorsan??z bu filtreyi kullan??n</p> <p>Hesap dizinini " +"posta klas??r??nden alacak. Opera posta klas??r??ndeki bir hesab??n??zdan b??t??n " +"iletileri almak istiyorsan??z bu filtreyi kullan??n</p> <p>Hesap klas??r??n?? " "se??in (genellikle ~/.opera/mail/store/account*).</p><p><b>Not:</b>E-" -"postalar, OPERA- ??nekinden sonra gelen hesap isimleriyle adland??r??lan " -"dizinlere al??nacakt??r.</p>" +"postalar, OPERA- ??nekinden sonra gelen hesap adlar??yla adland??r??lan " +"klas??rlere al??nacakt??r.</p>" #: mailimporter/filters/filteropera.cpp:38 #, kde-format @@ -733,7 +733,7 @@ #: mailimporter/filters/filterpmail.cpp:22 #, kde-format msgid "Import Folders From Pegasus-Mail" -msgstr "Pegasus Mail'den Dizinleri ????eriye Aktar" +msgstr "Pegasus Mail'den Dizinleri ????e Aktar" #: mailimporter/filters/filterpmail.cpp:23 #, kde-format @@ -761,7 +761,7 @@ "Cannot parse the folder structure; continuing import without subfolder " "support." msgstr "" -"Dizin yap??s?? ayr????t??r??lamad??; alt dizin deste??i olmadan i??eriye aktarma " +"Dizin yap??s?? ayr????t??r??lamad??; alt klas??r deste??i olmadan i??e aktarma " "i??lemine devam ediliyor." #: mailimporter/filters/filterpmail.cpp:65 @@ -772,12 +772,12 @@ #: mailimporter/filters/filterpmail.cpp:67 #, kde-format msgid "Importing mail folders ('.pmm')..." -msgstr "E-posta dizinleri i??eriye aktar??l??yor ('.pmm')..." +msgstr "E-posta klas??rleri i??e aktar??l??yor ('.pmm')..." #: mailimporter/filters/filterpmail.cpp:69 #, kde-format msgid "Importing 'UNIX' mail folders ('.mbx')..." -msgstr "'UNIX' e-posta dizinleri i??eriye aktar??l??yor ('.mbx')..." +msgstr "'UNIX' e-posta klas??rleri i??e aktar??l??yor ('.mbx')..." #: mailimporter/filters/filterpmail.cpp:159 #, kde-format @@ -821,7 +821,7 @@ #: mailimporter/filters/filtersylpheed.cpp:28 #, kde-format msgid "Import Sylpheed Maildirs and Folder Structure" -msgstr "Sylpheed Posta Dizinlerini ve Dizin Yap??s??n?? ????eriye Aktar" +msgstr "Sylpheed Posta Dizinlerini ve Dizin Yap??s??n?? ????e Aktar" #: mailimporter/filters/filtersylpheed.cpp:30 #, kde-format @@ -853,7 +853,7 @@ #: mailimporter/filters/filterthebat.cpp:28 #, kde-format msgid "Import The Bat! Mails and Folder Structure" -msgstr "Bat! Postalar?? ve Dizin Yap??s??n?? ????eriye Aktar" +msgstr "Bat! Postalar?? ve Dizin Yap??s??n?? ????e Aktar" #: mailimporter/filters/filterthebat.cpp:30 #, kde-format @@ -881,7 +881,7 @@ #: mailimporter/filters/filterthunderbird.cpp:24 #, kde-format msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure" -msgstr "Thunderbird/Mozilla Yerel Postalar??n?? ve Dizin Yap??s??n?? ????eriye Aktar" +msgstr "Thunderbird/Mozilla Yerel Postalar??n?? ve Dizin Yap??s??n?? ????e Aktar" #: mailimporter/filters/filterthunderbird.cpp:26 #, kde-format @@ -893,13 +893,12 @@ "new folders.</p><p>Since it is possible to recreate the folder structure, " "the folders will be stored under: \"Thunderbird-Import\".</p>" msgstr "" -"<p><b>Thunderbird/Mozilla i??eriye aktarma s??zgeci</b></p><p>Thunderbird/" -"Mozilla ana e-posta dizininizi se??in (genellikle ~/.thunderbird/*.default/" -"Mail/Local Folders/).</p><p><b>Not:</b> mbox dosyalar??n?? <u>i??ermeyen</u> " -"bir dizini asla se??meyin (??rne??in bir maildir). E??er yine de bunu " -"yaparsan??z, bir??ok yeni dizin olu??acakt??r.</p><p>Dizin yap??s??n?? yeniden " -"olu??turmak m??mk??n oldu??undan, dizinler, \"Thunderbird-Import\" konumunda " -"depolanacakt??r.</p>" +"<p><b>Thunderbird/Mozilla i??e aktarma s??zgeci</b></p><p>Thunderbird/Mozilla " +"ana e-posta dizininizi se??in (genellikle ~/.thunderbird/*.default/Mail/Local " +"Folders/).</p><p><b>Not:</b> mbox dosyalar??n?? <u>i??ermeyen</u> bir dizini " +"asla se??meyin (??rne??in bir maildir). E??er yine de bunu yaparsan??z, bir??ok " +"yeni dizin olu??acakt??r.</p><p>Dizin yap??s??n?? yeniden olu??turmak m??mk??n " +"oldu??undan, dizinler, \"Thunderbird-Import\" konumunda depolanacakt??r.</p>" #: mailimporter/filters/filterthunderbird.cpp:58 #, kde-format @@ -1014,12 +1013,9 @@ #: mailimporterakonadi/filterimporterakonadi.cpp:275 #, kde-format msgid "<b>Error:</b> Could not add message to folder %1. Reason: %2" -msgstr "<b>Hata:</b>??leti %1 dizinine eklenemedi. Neden: %2" +msgstr "<b>Hata:</b>??leti %1 klas??r??ne eklenemedi. Neden: %2" #: mailimporterakonadi/filterimporterakonadi.cpp:295 #, kde-format msgid "Unable to retrieve folder for folder path %1." msgstr "%1 klas??r yolundan klas??r al??namad??." - -#~ msgid "KMail Archive Files (*.tar *.tar.gz *.tar.bz2 *.zip)" -#~ msgstr "KMail Ar??iv Dosyalar?? (*.tar, *.tar.gz, *.tar.bz2, *.zip)" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/po/zh_CN/libmailimporter.po new/mailimporter-22.08.0/po/zh_CN/libmailimporter.po --- old/mailimporter-22.04.3/po/zh_CN/libmailimporter.po 2022-07-05 06:42:37.000000000 +0200 +++ new/mailimporter-22.08.0/po/zh_CN/libmailimporter.po 2022-08-12 02:13:03.000000000 +0200 @@ -1,19 +1,9 @@ -# translation of kmailcvt.po to ???????????? -# Copyright (C) 2002,2003, 2009 Free Software Foundation, Inc. -# -# Xuedong Zhang <z...@bu.edu>, 2001. -# Xiong Jiang <jxi...@offtopic.org>, 2002,2003. -# Funda Wang <fundaw...@linux.net.cn>, 2002,2004. -# Ni Hui <shuizhuyuan...@126.com>, 2009. -# Lie_Ex <lilith...@gmail.com>, 2007-2010. -# Weng Xuetian <wen...@gmail.com>, 2015. -# Guo Yunhe <guoyunhebr...@gmail.com>, 2017. msgid "" msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-10-10 00:19+0000\n" -"PO-Revision-Date: 2022-07-02 11:02\n" +"PO-Revision-Date: 2022-08-07 13:32\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/filterbalsamailtest.h new/mailimporter-22.08.0/src/mailimporter/autotests/filterbalsamailtest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/filterbalsamailtest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/filterbalsamailtest.h 2022-08-08 07:08:18.000000000 +0200 @@ -20,4 +20,3 @@ void canNotImportDataUnknowPath(); void canNotImportDataWhenHomeDirSelected(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/filterclawsmailtest.h new/mailimporter-22.08.0/src/mailimporter/autotests/filterclawsmailtest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/filterclawsmailtest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/filterclawsmailtest.h 2022-08-08 07:08:18.000000000 +0200 @@ -20,4 +20,3 @@ void canNotImportDataUnknowPath(); void canNotImportDataWhenHomeDirSelected(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/filtericedovetest.h new/mailimporter-22.08.0/src/mailimporter/autotests/filtericedovetest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/filtericedovetest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/filtericedovetest.h 2022-08-08 07:08:18.000000000 +0200 @@ -21,4 +21,3 @@ void canNotImportDataUnknowPath(); void canNotImportDataWhenHomeDirSelected(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/filterimportertest.h new/mailimporter-22.08.0/src/mailimporter/autotests/filterimportertest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/filterimportertest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/filterimportertest.h 2022-08-08 07:08:18.000000000 +0200 @@ -32,4 +32,3 @@ private: QVector<FilterImporterData> mFilterImporterDataList; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/filterimportertestutil.h new/mailimporter-22.08.0/src/mailimporter/autotests/filterimportertestutil.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/filterimportertestutil.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/filterimportertestutil.h 2022-08-08 07:08:18.000000000 +0200 @@ -17,4 +17,3 @@ private: QString mFileName; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/filterlnotestest.h new/mailimporter-22.08.0/src/mailimporter/autotests/filterlnotestest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/filterlnotestest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/filterlnotestest.h 2022-08-08 07:08:18.000000000 +0200 @@ -19,4 +19,3 @@ void canNotImportDataEmptyPath(); void canNotImportDataUnknowPath(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/filtermailapptest.h new/mailimporter-22.08.0/src/mailimporter/autotests/filtermailapptest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/filtermailapptest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/filtermailapptest.h 2022-08-08 07:08:18.000000000 +0200 @@ -19,4 +19,3 @@ void canNotImportDataEmptyPath(); void canNotImportDataUnknowPath(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/filtermailmangziptest.h new/mailimporter-22.08.0/src/mailimporter/autotests/filtermailmangziptest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/filtermailmangziptest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/filtermailmangziptest.h 2022-08-08 07:08:18.000000000 +0200 @@ -19,4 +19,3 @@ void canNotImportDataEmptyPath(); void canNotImportDataUnknowPath(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/filtermboxtest.h new/mailimporter-22.08.0/src/mailimporter/autotests/filtermboxtest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/filtermboxtest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/filtermboxtest.h 2022-08-08 07:08:18.000000000 +0200 @@ -19,4 +19,3 @@ void canNotImportDataEmptyPath(); void canNotImportDataUnknowPath(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/filterplaintest.h new/mailimporter-22.08.0/src/mailimporter/autotests/filterplaintest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/filterplaintest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/filterplaintest.h 2022-08-08 07:08:18.000000000 +0200 @@ -19,4 +19,3 @@ void canNotImportDataEmptyPath(); void canNotImportDataUnknowPath(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/filtersylpheedtest.h new/mailimporter-22.08.0/src/mailimporter/autotests/filtersylpheedtest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/filtersylpheedtest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/filtersylpheedtest.h 2022-08-08 07:08:18.000000000 +0200 @@ -20,4 +20,3 @@ void canNotImportDataUnknowPath(); void canNotImportDataWhenHomeDirSelected(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/filterthebattest.h new/mailimporter-22.08.0/src/mailimporter/autotests/filterthebattest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/filterthebattest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/filterthebattest.h 2022-08-08 07:08:18.000000000 +0200 @@ -20,4 +20,3 @@ void canNotImportDataUnknowPath(); void canNotImportDataWhenHomeDirSelected(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/filterthunderbirdtest.h new/mailimporter-22.08.0/src/mailimporter/autotests/filterthunderbirdtest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/filterthunderbirdtest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/filterthunderbirdtest.h 2022-08-08 07:08:18.000000000 +0200 @@ -21,4 +21,3 @@ void canNotImportDataUnknowPath(); void canNotImportDataWhenHomeDirSelected(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/messagestatustest.h new/mailimporter-22.08.0/src/mailimporter/autotests/messagestatustest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/messagestatustest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/messagestatustest.h 2022-08-08 07:08:18.000000000 +0200 @@ -19,4 +19,3 @@ void shouldAssignValues(); void shouldAssignValues_data(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/autotests/selectthunderbirdprofiledialogtest.h new/mailimporter-22.08.0/src/mailimporter/autotests/selectthunderbirdprofiledialogtest.h --- old/mailimporter-22.04.3/src/mailimporter/autotests/selectthunderbirdprofiledialogtest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/autotests/selectthunderbirdprofiledialogtest.h 2022-08-08 07:08:18.000000000 +0200 @@ -17,4 +17,3 @@ private Q_SLOTS: void shouldHaveDefaultValue(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filterinfo.h new/mailimporter-22.08.0/src/mailimporter/filterinfo.h --- old/mailimporter-22.04.3/src/mailimporter/filterinfo.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filterinfo.h 2022-08-08 07:08:18.000000000 +0200 @@ -48,4 +48,3 @@ std::unique_ptr<FilterInfoPrivate> const d; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filterinfogui.h new/mailimporter-22.08.0/src/mailimporter/filterinfogui.h --- old/mailimporter-22.04.3/src/mailimporter/filterinfogui.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filterinfogui.h 2022-08-08 07:08:18.000000000 +0200 @@ -34,4 +34,3 @@ virtual QWidget *parent() const; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filterbalsa.h new/mailimporter-22.08.0/src/mailimporter/filters/filterbalsa.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filterbalsa.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filterbalsa.h 2022-08-08 07:08:18.000000000 +0200 @@ -36,4 +36,3 @@ std::unique_ptr<FilterBalsaPrivate> const d; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filterclawsmail.h new/mailimporter-22.08.0/src/mailimporter/filters/filterclawsmail.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filterclawsmail.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filterclawsmail.h 2022-08-08 07:08:18.000000000 +0200 @@ -31,4 +31,3 @@ Q_REQUIRED_RESULT QString markFile() const override; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filterevolution.h new/mailimporter-22.08.0/src/mailimporter/filters/filterevolution.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filterevolution.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filterevolution.h 2022-08-08 07:08:18.000000000 +0200 @@ -29,4 +29,3 @@ void importMBox(const QString &, const QString &, const QString &); }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filterevolution_v2.h new/mailimporter-22.08.0/src/mailimporter/filters/filterevolution_v2.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filterevolution_v2.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filterevolution_v2.h 2022-08-08 07:08:18.000000000 +0200 @@ -36,4 +36,3 @@ Q_REQUIRED_RESULT bool excludeFiles(const QString &file); }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filterevolution_v3.h new/mailimporter-22.08.0/src/mailimporter/filters/filterevolution_v3.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filterevolution_v3.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filterevolution_v3.h 2022-08-08 07:08:18.000000000 +0200 @@ -34,4 +34,3 @@ std::unique_ptr<FilterEvolution_v3Private> const d; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filtericedove.h new/mailimporter-22.08.0/src/mailimporter/filters/filtericedove.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filtericedove.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filtericedove.h 2022-08-08 07:08:18.000000000 +0200 @@ -27,4 +27,3 @@ Q_REQUIRED_RESULT QString settingsPath() override; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filterkmail_maildir.h new/mailimporter-22.08.0/src/mailimporter/filters/filterkmail_maildir.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filterkmail_maildir.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filterkmail_maildir.h 2022-08-08 07:08:18.000000000 +0200 @@ -34,4 +34,3 @@ std::unique_ptr<FilterKMail_maildirPrivate> const d; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filterkmailarchive.h new/mailimporter-22.08.0/src/mailimporter/filters/filterkmailarchive.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filterkmailarchive.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filterkmailarchive.h 2022-08-08 07:08:18.000000000 +0200 @@ -35,4 +35,3 @@ std::unique_ptr<FilterKMailArchivePrivate> const d; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filterlnotes.h new/mailimporter-22.08.0/src/mailimporter/filters/filterlnotes.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filterlnotes.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filterlnotes.h 2022-08-08 07:08:18.000000000 +0200 @@ -33,4 +33,3 @@ void ImportLNotes(const QString &file); }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filtermailapp.h new/mailimporter-22.08.0/src/mailimporter/filters/filtermailapp.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filtermailapp.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filtermailapp.h 2022-08-08 07:08:18.000000000 +0200 @@ -32,4 +32,3 @@ void traverseDirectory(const QString &); }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filtermailmangzip.h new/mailimporter-22.08.0/src/mailimporter/filters/filtermailmangzip.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filtermailmangzip.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filtermailmangzip.h 2022-08-08 07:08:18.000000000 +0200 @@ -24,4 +24,3 @@ void import() override; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filtermbox.h new/mailimporter-22.08.0/src/mailimporter/filters/filtermbox.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filtermbox.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filtermbox.h 2022-08-08 07:08:18.000000000 +0200 @@ -26,4 +26,3 @@ void import() override; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filteroe.h new/mailimporter-22.08.0/src/mailimporter/filters/filteroe.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filteroe.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filteroe.h 2022-08-08 07:08:18.000000000 +0200 @@ -74,4 +74,3 @@ /** name of the chosen folder */ }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filteropera.h new/mailimporter-22.08.0/src/mailimporter/filters/filteropera.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filteropera.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filteropera.h 2022-08-08 07:08:18.000000000 +0200 @@ -32,4 +32,3 @@ void importRecursive(const QDir &maildir, const QString &accountName = QString()); }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filterplain.h new/mailimporter-22.08.0/src/mailimporter/filters/filterplain.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filterplain.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filterplain.h 2022-08-08 07:08:18.000000000 +0200 @@ -25,4 +25,3 @@ void importMails(const QString &mailDir); }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filterseamonkey.h new/mailimporter-22.08.0/src/mailimporter/filters/filterseamonkey.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filterseamonkey.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filterseamonkey.h 2022-08-08 07:08:18.000000000 +0200 @@ -26,4 +26,3 @@ Q_REQUIRED_RESULT QString settingsPath() override; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filtersylpheed.h new/mailimporter-22.08.0/src/mailimporter/filters/filtersylpheed.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filtersylpheed.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filtersylpheed.h 2022-08-08 07:08:18.000000000 +0200 @@ -47,4 +47,3 @@ std::unique_ptr<FilterSylpheedPrivate> const d; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filterthebat.h new/mailimporter-22.08.0/src/mailimporter/filters/filterthebat.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filterthebat.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filterthebat.h 2022-08-08 07:08:18.000000000 +0200 @@ -34,4 +34,3 @@ std::unique_ptr<FilterTheBatPrivate> const d; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters/filterthunderbird.h new/mailimporter-22.08.0/src/mailimporter/filters/filterthunderbird.h --- old/mailimporter-22.04.3/src/mailimporter/filters/filterthunderbird.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters/filterthunderbird.h 2022-08-08 07:08:18.000000000 +0200 @@ -42,4 +42,3 @@ Q_REQUIRED_RESULT bool excludeFiles(const QString &file); }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/filters.h new/mailimporter-22.08.0/src/mailimporter/filters.h --- old/mailimporter-22.04.3/src/mailimporter/filters.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/filters.h 2022-08-08 07:08:18.000000000 +0200 @@ -64,4 +64,3 @@ std::unique_ptr<FilterPrivate> const d; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/importmailswidget.h new/mailimporter-22.08.0/src/mailimporter/importmailswidget.h --- old/mailimporter-22.04.3/src/mailimporter/importmailswidget.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/importmailswidget.h 2022-08-08 07:08:18.000000000 +0200 @@ -39,4 +39,3 @@ std::unique_ptr<ImportMailsWidgetPrivate> const d; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/mailimporter_private_export.h new/mailimporter-22.08.0/src/mailimporter/mailimporter_private_export.h --- old/mailimporter-22.04.3/src/mailimporter/mailimporter_private_export.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/mailimporter_private_export.h 2022-08-08 07:08:18.000000000 +0200 @@ -16,4 +16,3 @@ #else /* not compiling tests */ #define MAILIMPORTER_TESTS_EXPORT #endif - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/mailimporter_utils.h new/mailimporter-22.08.0/src/mailimporter/mailimporter_utils.h --- old/mailimporter-22.04.3/src/mailimporter/mailimporter_utils.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/mailimporter_utils.h 2022-08-08 07:08:18.000000000 +0200 @@ -13,7 +13,8 @@ /** * Glorified QString[N] for (a) understandability (b) older gcc compatibility. */ -template<unsigned int size> class FolderStructureBase +template<unsigned int size> +class FolderStructureBase { public: typedef QString NString[size]; @@ -78,4 +79,3 @@ QString d[size]; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/othermailerutil.h new/mailimporter-22.08.0/src/mailimporter/othermailerutil.h --- old/mailimporter-22.04.3/src/mailimporter/othermailerutil.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/othermailerutil.h 2022-08-08 07:08:18.000000000 +0200 @@ -19,4 +19,3 @@ Q_REQUIRED_RESULT MAILIMPORTER_EXPORT QString nylasMailDefaultPath(); } } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporter/selectthunderbirdprofilewidget.h new/mailimporter-22.08.0/src/mailimporter/selectthunderbirdprofilewidget.h --- old/mailimporter-22.04.3/src/mailimporter/selectthunderbirdprofilewidget.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporter/selectthunderbirdprofilewidget.h 2022-08-08 07:08:18.000000000 +0200 @@ -46,4 +46,3 @@ SelectThunderbirdProfileWidget *mSelectProfile = nullptr; }; } - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterbalsamailtest.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterbalsamailtest.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterbalsamailtest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterbalsamailtest.h 2022-08-08 07:08:18.000000000 +0200 @@ -20,4 +20,3 @@ void canNotImportDataUnknowPath(); void canNotImportDataWhenHomeDirSelected(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterclawsmailtest.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterclawsmailtest.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterclawsmailtest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterclawsmailtest.h 2022-08-08 07:08:18.000000000 +0200 @@ -20,4 +20,3 @@ void canNotImportDataUnknowPath(); void canNotImportDataWhenHomeDirSelected(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filtericedovetest.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filtericedovetest.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filtericedovetest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filtericedovetest.h 2022-08-08 07:08:18.000000000 +0200 @@ -21,4 +21,3 @@ void canNotImportDataUnknowPath(); void canNotImportDataWhenHomeDirSelected(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterimporterakonaditest.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterimporterakonaditest.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterimporterakonaditest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterimporterakonaditest.h 2022-08-08 07:08:18.000000000 +0200 @@ -15,4 +15,3 @@ explicit FilterImporterAkonadiTest(QObject *parent = nullptr); ~FilterImporterAkonadiTest() = default; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterimportertest.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterimportertest.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterimportertest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterimportertest.h 2022-08-08 07:08:18.000000000 +0200 @@ -32,4 +32,3 @@ private: QVector<FilterImporterData> mFilterImporterDataList; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterimportertestutil.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterimportertestutil.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterimportertestutil.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterimportertestutil.h 2022-08-08 07:08:18.000000000 +0200 @@ -17,4 +17,3 @@ private: QString mFileName; }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterlnotestest.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterlnotestest.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterlnotestest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterlnotestest.h 2022-08-08 07:08:18.000000000 +0200 @@ -19,4 +19,3 @@ void canNotImportDataEmptyPath(); void canNotImportDataUnknowPath(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filtermailapptest.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filtermailapptest.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filtermailapptest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filtermailapptest.h 2022-08-08 07:08:18.000000000 +0200 @@ -19,4 +19,3 @@ void canNotImportDataEmptyPath(); void canNotImportDataUnknowPath(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filtermailmangziptest.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filtermailmangziptest.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filtermailmangziptest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filtermailmangziptest.h 2022-08-08 07:08:18.000000000 +0200 @@ -19,4 +19,3 @@ void canNotImportDataEmptyPath(); void canNotImportDataUnknowPath(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filtermboxtest.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filtermboxtest.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filtermboxtest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filtermboxtest.h 2022-08-08 07:08:18.000000000 +0200 @@ -19,4 +19,3 @@ void canNotImportDataEmptyPath(); void canNotImportDataUnknowPath(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterplaintest.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterplaintest.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterplaintest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterplaintest.h 2022-08-08 07:08:18.000000000 +0200 @@ -19,4 +19,3 @@ void canNotImportDataEmptyPath(); void canNotImportDataUnknowPath(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filtersylpheedtest.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filtersylpheedtest.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filtersylpheedtest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filtersylpheedtest.h 2022-08-08 07:08:18.000000000 +0200 @@ -20,4 +20,3 @@ void canNotImportDataUnknowPath(); void canNotImportDataWhenHomeDirSelected(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterthebattest.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterthebattest.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterthebattest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterthebattest.h 2022-08-08 07:08:18.000000000 +0200 @@ -20,4 +20,3 @@ void canNotImportDataUnknowPath(); void canNotImportDataWhenHomeDirSelected(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterthunderbirdtest.h new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterthunderbirdtest.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/autotests/filterthunderbirdtest.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/autotests/filterthunderbirdtest.h 2022-08-08 07:08:18.000000000 +0200 @@ -21,4 +21,3 @@ void canNotImportDataUnknowPath(); void canNotImportDataWhenHomeDirSelected(); }; - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-22.04.3/src/mailimporterakonadi/filterimportertestutil.h new/mailimporter-22.08.0/src/mailimporterakonadi/filterimportertestutil.h --- old/mailimporter-22.04.3/src/mailimporterakonadi/filterimportertestutil.h 2022-06-10 07:00:07.000000000 +0200 +++ new/mailimporter-22.08.0/src/mailimporterakonadi/filterimportertestutil.h 2022-08-08 07:08:18.000000000 +0200 @@ -17,4 +17,3 @@ private: QString mFileName; }; -
