Hello community,
here is the log from the commit of package mailimporter for openSUSE:Factory checked in at 2018-04-25 09:54:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mailimporter (Old)
and /work/SRC/openSUSE:Factory/.mailimporter.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailimporter"
Wed Apr 25 09:54:31 2018 rev:25 rq:599142 version:18.04.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/mailimporter/mailimporter.changes 2018-03-20 21:41:55.241515015 +0100
+++ /work/SRC/openSUSE:Factory/.mailimporter.new/mailimporter.changes 2018-04-25 09:54:35.669715519 +0200
@@ -1,0 +2,22 @@
+Wed Apr 18 07:49:56 CEST 2018 - lbeltrame@kde.org
+
+- Update to 18.04.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-18.04.0.php
+- Changes since 18.03.90:
+ * None
+
+-------------------------------------------------------------------
+Fri Apr 06 07:10:10 CEST 2018 - lbeltrame@kde.org
+
+- Update to 18.03.90
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-18.03.90.php
+- Changes since 17.12.3:
+ * Use QLatin1String
+ * Use QLAtin1String
+ * Fix endif
+
+-------------------------------------------------------------------
Old:
----
mailimporter-17.12.3.tar.xz
New:
----
mailimporter-18.04.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mailimporter.spec ++++++
--- /var/tmp/diff_new_pack.p2eiap/_old 2018-04-25 09:54:37.009666371 +0200
+++ /var/tmp/diff_new_pack.p2eiap/_new 2018-04-25 09:54:37.009666371 +0200
@@ -19,7 +19,7 @@
%bcond_without lang
Name: mailimporter
-Version: 17.12.3
+Version: 18.04.0
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
++++++ mailimporter-17.12.3.tar.xz -> mailimporter-18.04.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/CMakeLists.txt new/mailimporter-18.04.0/CMakeLists.txt
--- old/mailimporter-17.12.3/CMakeLists.txt 2018-03-06 01:32:25.000000000 +0100
+++ new/mailimporter-18.04.0/CMakeLists.txt 2018-04-13 02:16:48.000000000 +0200
@@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 3.0)
-set(PIM_VERSION "5.7.3")
+set(PIM_VERSION "5.8.0")
project(MailImporter VERSION ${PIM_VERSION})
-set(KF5_VERSION "5.39.0")
+set(KF5_VERSION "5.44.0")
find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
@@ -26,11 +26,11 @@
set(MAILIMPORTER_LIB ${PIM_VERSION})
-set(AKONADIMIME_LIB_VERSION "5.7.3")
-set(KDEPIM_LIB_VERSION "5.7.3")
+set(AKONADIMIME_LIB_VERSION "5.8.0")
+set(KDEPIM_LIB_VERSION "5.8.0")
set(QT_REQUIRED_VERSION "5.8.0")
-set(KMIME_LIB_VERSION "5.7.3")
-set(AKONADI_VERSION "5.7.3")
+set(KMIME_LIB_VERSION "5.8.0")
+set(AKONADI_VERSION "5.8.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Xml)
@@ -57,7 +57,7 @@
if(BUILD_TESTING)
add_definitions(-DBUILD_TESTING)
-endif(BUILD_TESTING)
+endif()
add_subdirectory(src)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/po/ca/libmailimporter.po new/mailimporter-18.04.0/po/ca/libmailimporter.po
--- old/mailimporter-17.12.3/po/ca/libmailimporter.po 2018-03-06 01:32:25.000000000 +0100
+++ new/mailimporter-18.04.0/po/ca/libmailimporter.po 2018-04-13 02:16:48.000000000 +0200
@@ -1015,3 +1015,6 @@
#, kde-format
msgid "Unable to retrieve folder for folder path %1."
msgstr "No s'ha pogut recuperar la carpeta pel camí de carpetes %1."
+
+#~ msgid "KMail Archive Files (*.tar *.tar.gz *.tar.bz2 *.zip)"
+#~ msgstr "Fitxers d'arxiu del KMail (*.tar *.tar.gz *.tar.bz2 *.zip)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/po/ca@valencia/libmailimporter.po new/mailimporter-18.04.0/po/ca@valencia/libmailimporter.po
--- old/mailimporter-17.12.3/po/ca@valencia/libmailimporter.po 2018-03-06 01:32:25.000000000 +0100
+++ new/mailimporter-18.04.0/po/ca@valencia/libmailimporter.po 2018-04-13 02:16:48.000000000 +0200
@@ -36,8 +36,8 @@
msgstr ""
"<p><b>Filtre d'importació del Balsa</b></p><p>Seleccioneu el directori base "
"dels correus del Balsa (normalment ~/mail/local/).</p> <p>Com que és "
-"possible recrear l'estructura de les carpetes, estes s'emmagatzemaran sota: "
-"«Balsa-Import».</p>"
+"possible recrear l'estructura de les carpetes, aquestes s'emmagatzemaran "
+"sota: «Balsa-Import».</p>"
#: mailimporter/filters/filterbalsa.cpp:59
#, kde-format
@@ -168,8 +168,8 @@
"<p><b>Filtre d'importació del Claws-mail</b></p><p>Seleccioneu el directori "
"base de la bústia de correu del Claws-mail que desitgeu importar "
"(normalment: ~/Mail).</p><p>Com que és possible recrear l'estructura de les "
-"carpetes, estes s'emmagatzemaran sota: «ClawsMail-Import» de la carpeta "
-"local.</p><p>Este filtre també recrea l'estat del missatge, p. ex. nou o "
+"carpetes, aquestes s'emmagatzemaran sota: «ClawsMail-Import» de la carpeta "
+"local.</p><p>Aquest filtre també recrea l'estat del missatge, p. ex. nou o "
"reenviat.</p>"
#: mailimporter/filters/filterclawsmail.cpp:51
@@ -205,7 +205,7 @@
msgstr ""
"<p><b>Filtre d'importació de l'Evolution 1.x</b></p><p>Seleccioneu el "
"directori base dels correus de l'Evolution (normalment ~/evolution/local)."
-"p><p>Com que és possible recrear l'estructura de les carpetes, estes "
+"p><p>Com que és possible recrear l'estructura de les carpetes, aquestes "
"s'emmagatzemaran sota: «Evolution-Import».</p>"
#: mailimporter/filters/filterevolution.cpp:48
@@ -260,8 +260,8 @@
"evolution/mail/local/).</p><p><b>Nota:</b> No trieu 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'emmagatzemen sota: «Evolution-Import»."
-"</p>"
+"l'estructura de les carpetes, aquestes s'emmagatzemen sota: «Evolution-"
+"Import».</p>"
#: mailimporter/filters/filterevolution_v2.cpp:48
#, kde-format
@@ -294,7 +294,7 @@
"<p><b>Filtre d'importació de l'Evolution 3.x</b></p><p>Seleccioneu el "
"directori base dels correus de l'Evolution (normalment ~/.local/share/"
"evolution/mail/local/).</p><p>Com que és possible recrear l'estructura de "
-"les carpetes, estes s'emmagatzemaran sota: «Evolution-Import».</p>"
+"les carpetes, aquestes s'emmagatzemaran sota: «Evolution-Import».</p>"
#: mailimporter/filters/filterevolution_v3.cpp:57
#, kde-format
@@ -322,8 +322,8 @@
"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 sota: «Icedove-Import»."
-"</p>"
+"l'estructura de les carpetes, aquestes s'emmagatzemaran sota: «Icedove-"
+"Import».</p>"
#: mailimporter/filters/filtericedove.cpp:44
#, kde-format
@@ -350,10 +350,10 @@
"<p><b>Filtre d'importació del KMail</b></p><p>Seleccioneu el directori base "
"de la bústia de correu del KMail que desitgeu importar.</p><p><b>Nota:</b> "
"No seleccioneu mai el directori de correu actual del KMail (normalment ~/"
-"Mail o ~/.kde/share/apps/kmail/mail ): en este cas l'ImportWizard pot "
-"arribar a entrar en un bucle continuat. </p><p>Este filtre no importa "
+"Mail o ~/.kde/share/apps/kmail/mail ): en aquest cas l'ImportWizard pot "
+"arribar a entrar en un bucle continuat. </p><p>Aquest filtre no importa "
"directoris de correu del KMail amb fitxers mbox.</p><p>Com que és possible "
-"recrear l'estructura de les carpetes, estes s'emmagatzemaran sota: «KMail-"
+"recrear l'estructura de les carpetes, aquestes s'emmagatzemaran sota: «KMail-"
"Import» de la carpeta local.</p>"
#: mailimporter/filters/filterkmail_maildir.cpp:191
@@ -373,10 +373,10 @@
"archives files previously exported by KMail.</p><p>Archive files contain a "
"complete folder subtree compressed into a single file.</p>"
msgstr ""
-"<p><b>Filtre d'importació de fitxer d'arxiu del KMail</b></p><p>Este filtre "
-"importa fitxers d'arxiu prèviament exportats pel KMail.</p><p>Els camps de "
-"l'arxiu contenen un subarbre de carpetes complet comprimit en un sol fitxer."
-"</p>"
+"<p><b>Filtre d'importació de fitxer d'arxiu del KMail</b></p><p>Aquest "
+"filtre importa fitxers d'arxiu prèviament exportats pel KMail.</p><p>Els "
+"camps de l'arxiu contenen un subarbre de carpetes complet comprimit en un "
+"sol fitxer.</p>"
#: mailimporter/filters/filterkmailarchive.cpp:90
#, kde-format
@@ -421,7 +421,7 @@
#: mailimporter/filters/filterkmailarchive.cpp:202
#, kde-format
msgid "The file '%1' does not appear to be a valid archive."
-msgstr "El fitxer «%1» no pareix que siga un arxiu vàlid."
+msgstr "El fitxer «%1» no sembla que siga un arxiu vàlid."
#: mailimporter/filters/filterkmailarchive.cpp:207
#, kde-format
@@ -468,8 +468,8 @@
"\"LNotes-Import\" in your local folder.</p>"
msgstr ""
"<p><b>Filtre d'importació del correu de text estructurat del Lotus Notes"
-"b></p><p>Este filtre importarà fitxers de text estructurat des d'un client "
-"de correu exportat del Lotus Notes cap al KMail. Useu este filtre si "
+"b></p><p>Aquest filtre importarà fitxers de text estructurat des d'un client "
+"de correu exportat del Lotus Notes cap al KMail. Useu aquest filtre si "
"desitgeu importar correus des del Lotus o altres clients de correu que "
"emprin el format de text estructurat del Lotus Notes.</p><p><b>Nota:</b> Com "
"que és possible recrear l'estructura de les carpetes, els missatges "
@@ -523,7 +523,7 @@
"<p><b>OS X Mail Import Filter</b></p><p>This filter imports e-mails from the "
"Mail client in Apple Mac OS X.</p>"
msgstr ""
-"<p><b>Filtre d'importació per al Mail de l'OS X</b></p><p>Este filtre "
+"<p><b>Filtre d'importació per al Mail de l'OS X</b></p><p>Aquest filtre "
"importa els correus electrònics del client de correu del Mac OS X d'Apple."
"p>"
@@ -548,7 +548,7 @@
"gzipped files into KMail.</p><p><b>Note:</b> Emails will be imported into "
"folders named after the file they came from, prefixed with MAILMAN-</p>"
msgstr ""
-"<p><b>Filtre d'importació per a GZIP del mailman</b></p><p>Este filtre "
+"<p><b>Filtre d'importació per a GZIP del mailman</b></p><p>Aquest filtre "
"importarà els fitxers comprimits amb GZIP del mailman al KMail."
"p><p><b>Nota:</b> Els correus seran importats cap a carpetes amb un nom que "
"mostrarà el seu origen, prefixades amb MAILMAN-</p>"
@@ -583,11 +583,12 @@
"Emails will be imported into folders named after the file they came from, "
"prefixed with MBOX-</p>"
msgstr ""
-"<p><b>Filtre d'importació per a mbox</b></p><p>Este filtre importarà els "
-"fitxers mbox al KMail. Useu este filtre si desitgeu importar correus des de "
-"l'Evolution de Ximian o des d'altres clients de correu que emprin el format "
-"tradicional de UNIX.</p><p><b>Nota:</b> Els correus seran importats cap a "
-"carpetes amb un nom que mostrarà el seu origen, prefixades amb MBOX-</p>"
+"<p><b>Filtre d'importació per a mbox</b></p><p>Aquest filtre importarà els "
+"fitxers mbox al KMail. Useu aquest filtre si desitgeu importar correus des "
+"de l'Evolution de Ximian o des d'altres clients de correu que emprin el "
+"format tradicional de UNIX.</p><p><b>Nota:</b> Els correus seran importats "
+"cap a carpetes amb un nom que mostrarà el seu origen, prefixades amb MBOX-"
+"p>"
#: mailimporter/filters/filtermbox.cpp:47
#, kde-format
@@ -673,8 +674,8 @@
"imported into a folder named after the account they came from, prefixed with "
"OPERA-</p>"
msgstr ""
-"<p><b>Filtre d'importació dels correus de l'Opera</b></p><p>Este filtre "
-"importarà els correus de la carpeta de correu de l'Opera. Useu este filtre "
+"<p><b>Filtre d'importació dels correus de l'Opera</b></p><p>Aquest filtre "
+"importarà els correus de la carpeta de correu de l'Opera. Useu aquest filtre "
"si desitgeu importar tots els correus d'un compte del directori de correu de "
"l'Opera.</p> <p>Escolliu el directori del compte (normalment ~/.opera/mail/"
"store/account*).</p><p><b>Nota:</b> Els correus seran importats cap a "
@@ -714,8 +715,8 @@
msgstr ""
"<p>Seleccioneu el directori del sistema que continga els correus "
"electrònics. Els correus s'emplaçaran en una carpeta amb el mateix nom que "
-"el directori on es troben, prefixats amb PLAIN-</p><p>Este filtre importarà "
-"tots els correus electrònics .msg, .eml i .txt.</p>"
+"el directori on es troben, prefixats amb PLAIN-</p><p>Aquest filtre "
+"importarà tots els correus electrònics .msg, .eml i .txt.</p>"
#: mailimporter/filters/filterpmail.cpp:30
#, kde-format
@@ -739,7 +740,7 @@
"<p>Seleccioneu el directori del Pegasus-Mail al sistema (el que continga els "
"fitxers *.CNM, *.PMN i *.MBX). En molts sistemes estan emmagatzemats a C:"
"\\pmail\\mail\\admin</p><p><b>Nota:</b> Com que és possible recrear "
-"l'estructura de les carpetes, estes s'emmagatzemaran sota: «PegasusMail-"
+"l'estructura de les carpetes, aquestes s'emmagatzemaran sota: «PegasusMail-"
"Import».</p>"
#: mailimporter/filters/filterpmail.cpp:67
@@ -803,7 +804,7 @@
"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 sota: «SeaMonkey-"
+"l'estructura de les carpetes, aquestes s'emmagatzemaran sota: «SeaMonkey-"
"Import».</p>"
#: mailimporter/filters/filtersylpheed.cpp:41
@@ -824,9 +825,9 @@
"<p><b>Filtre d'importació del Sylpheed</b></p><p>Seleccioneu el directori "
"base de la bústia de correu del Sylpheed que desitgeu importar (normalment: "
"~/Mail ).</p><p>Com que és possible recrear l'estructura de les carpetes, "
-"estes s'emmagatzemaran sota: «Sylpheed-Import» a la carpeta local."
-"p><p>Este filtre també recrea l'estat del missatge, p. ex. nou o reenviat."
-"p>"
+"aquestes s'emmagatzemaran sota: «Sylpheed-Import» a la carpeta local."
+"p><p>Aquest filtre també recrea l'estat del missatge, p. ex. nou o reenviat."
+"</p>"
#: mailimporter/filters/filtersylpheed.cpp:63
#, kde-format
@@ -857,10 +858,10 @@
msgstr ""
"<p><b>Filtre d'importació del The Bat!</b></p><p>Seleccioneu el directori "
"base de la bústia de correu local del «The Bat!» que desitgeu importar."
-"p><p><b>Nota:</b> Este filtre importa els fitxers *.tbb des de la carpeta "
+"p><p><b>Nota:</b> Aquest filtre importa els fitxers *.tbb des de la carpeta "
"local del «The Bat!», p. ex. des dels comptes POP, però no des dels comptes "
"IMAP/DIMAP.</p><p>Com que és possible recrear l'estructura de les carpetes, "
-"estes s'emmagatzemaran sota: «TheBat-Import» al compte local.</p>"
+"aquestes s'emmagatzemaran sota: «TheBat-Import» al compte local.</p>"
#: mailimporter/filters/filterthebat.cpp:220
#, kde-format
@@ -889,8 +890,8 @@
"default/Mail/Local Folders/).</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 sota: "
-"«Thunderbird-Import».</p>"
+"possible recrear l'estructura de les carpetes, aquestes s'emmagatzemaran "
+"sota: «Thunderbird-Import».</p>"
#: mailimporter/filters/filterthunderbird.cpp:67
#, kde-format
@@ -1014,3 +1015,6 @@
#, kde-format
msgid "Unable to retrieve folder for folder path %1."
msgstr "No s'ha pogut recuperar la carpeta pel camí de carpetes %1."
+
+#~ msgid "KMail Archive Files (*.tar *.tar.gz *.tar.bz2 *.zip)"
+#~ msgstr "Fitxers d'arxiu del KMail (*.tar *.tar.gz *.tar.bz2 *.zip)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/po/en_GB/libmailimporter.po new/mailimporter-18.04.0/po/en_GB/libmailimporter.po
--- old/mailimporter-17.12.3/po/en_GB/libmailimporter.po 2018-03-06 01:32:25.000000000 +0100
+++ new/mailimporter-18.04.0/po/en_GB/libmailimporter.po 2018-04-13 02:16:48.000000000 +0200
@@ -9,7 +9,7 @@
"Project-Id-Version: kmailcvt\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-11-03 03:13+0100\n"
-"PO-Revision-Date: 2017-11-26 21:08+0000\n"
+"PO-Revision-Date: 2017-11-26 13:55+0000\n"
"Last-Translator: Steve Allewell \n"
"Language-Team: British English \n"
"Language: en_GB\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/po/gl/libmailimporter.po new/mailimporter-18.04.0/po/gl/libmailimporter.po
--- old/mailimporter-17.12.3/po/gl/libmailimporter.po 2018-03-06 01:32:25.000000000 +0100
+++ new/mailimporter-18.04.0/po/gl/libmailimporter.po 2018-04-13 02:16:48.000000000 +0200
@@ -362,7 +362,7 @@
#: mailimporter/filters/filterkmail_maildir.cpp:191
#, kde-format
msgid "Could not import %1, duplicated message"
-msgstr "Non foi posíbel importar %1; é unha mensaxe duplicada"
+msgstr "Non se puido importar %1; é unha mensaxe duplicada"
#: mailimporter/filters/filterkmailarchive.cpp:47
#, kde-format
@@ -753,7 +753,7 @@
"Cannot parse the folder structure; continuing import without subfolder "
"support."
msgstr ""
-"Non é posíbel interpretar a estrutura de cartafoles, continuarase a "
+"Non se pode interpretar a estrutura de cartafoles, continuarase a "
"importación sen compatibilidade con subcartafoles."
#: mailimporter/filters/filterpmail.cpp:70
@@ -995,13 +995,12 @@
msgid ""
"<b>Warning:</b> Could not check that the folder already exists. Reason: %1"
msgstr ""
-"<b>Advertencia</b> Non foi posíbel comprobar que o cartafol xa exista. "
-"Razón: %1"
+"<b>Advertencia</b> Non se puido comprobar que o cartafol xa exista. Razón: %1"
#: mailimporterakonadi/filterimporterakonadi.cpp:198
#, kde-format
msgid "<b>Error:</b> Could not create folder. Reason: %1"
-msgstr "<b>Erro:</b>Non foi posíbel crear o cartafol. Razón: %1"
+msgstr "<b>Erro:</b>Non se puido crear o cartafol. Razón: %1"
#: mailimporterakonadi/filterimporterakonadi.cpp:226
#, kde-format
@@ -1009,7 +1008,7 @@
"<b>Warning:</b> Could not fetch mail in folder %1. Reason: %2 You may have "
"duplicate messages."
msgstr ""
-"<b>Advertencia</b> Non foi posíbel obter o correo do cartafol %1. Razón: %2. "
+"<b>Advertencia</b> Non se puido obter o correo do cartafol %1. Razón: %2. "
"Pode que haxa mensaxes duplicadas."
#: mailimporterakonadi/filterimporterakonadi.cpp:232
@@ -1020,8 +1019,7 @@
#: mailimporterakonadi/filterimporterakonadi.cpp:287
#, kde-format
msgid "<b>Error:</b> Could not add message to folder %1. Reason: %2"
-msgstr ""
-"<b>Erro:</b> Non foi posíbel engadir a mensaxe ao cartafol %1. Razón: %2"
+msgstr "<b>Erro:</b> Non se puido engadir a mensaxe ao cartafol %1. Razón: %2"
#: mailimporterakonadi/filterimporterakonadi.cpp:308
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/po/zh_CN/libmailimporter.po new/mailimporter-18.04.0/po/zh_CN/libmailimporter.po
--- old/mailimporter-17.12.3/po/zh_CN/libmailimporter.po 2018-03-06 01:32:25.000000000 +0100
+++ new/mailimporter-18.04.0/po/zh_CN/libmailimporter.po 2018-04-13 02:16:48.000000000 +0200
@@ -13,7 +13,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-11-03 03:13+0100\n"
-"PO-Revision-Date: 2018-02-28 02:28-0500\n"
+"PO-Revision-Date: 2018-04-05 09:39-0400\n"
"Last-Translator: guoyunhebrave \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterbalsamailtest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/filterbalsamailtest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterbalsamailtest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterbalsamailtest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterbalsamailtest.h new/mailimporter-18.04.0/src/mailimporter/autotests/filterbalsamailtest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterbalsamailtest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterbalsamailtest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterclawsmailtest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/filterclawsmailtest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterclawsmailtest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterclawsmailtest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterclawsmailtest.h new/mailimporter-18.04.0/src/mailimporter/autotests/filterclawsmailtest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterclawsmailtest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterclawsmailtest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filtericedovetest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/filtericedovetest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filtericedovetest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filtericedovetest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filtericedovetest.h new/mailimporter-18.04.0/src/mailimporter/autotests/filtericedovetest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filtericedovetest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filtericedovetest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterimportertest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/filterimportertest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterimportertest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterimportertest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterimportertest.h new/mailimporter-18.04.0/src/mailimporter/autotests/filterimportertest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterimportertest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterimportertest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterimportertestutil.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/filterimportertestutil.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterimportertestutil.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterimportertestutil.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterimportertestutil.h new/mailimporter-18.04.0/src/mailimporter/autotests/filterimportertestutil.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterimportertestutil.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterimportertestutil.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterlnotestest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/filterlnotestest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterlnotestest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterlnotestest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterlnotestest.h new/mailimporter-18.04.0/src/mailimporter/autotests/filterlnotestest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterlnotestest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterlnotestest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filtermailapptest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/filtermailapptest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filtermailapptest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filtermailapptest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filtermailapptest.h new/mailimporter-18.04.0/src/mailimporter/autotests/filtermailapptest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filtermailapptest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filtermailapptest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filtermailmangziptest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/filtermailmangziptest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filtermailmangziptest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filtermailmangziptest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filtermailmangziptest.h new/mailimporter-18.04.0/src/mailimporter/autotests/filtermailmangziptest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filtermailmangziptest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filtermailmangziptest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filtermboxtest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/filtermboxtest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filtermboxtest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filtermboxtest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filtermboxtest.h new/mailimporter-18.04.0/src/mailimporter/autotests/filtermboxtest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filtermboxtest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filtermboxtest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterplaintest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/filterplaintest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterplaintest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterplaintest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterplaintest.h new/mailimporter-18.04.0/src/mailimporter/autotests/filterplaintest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterplaintest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterplaintest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filtersylpheedtest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/filtersylpheedtest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filtersylpheedtest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filtersylpheedtest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filtersylpheedtest.h new/mailimporter-18.04.0/src/mailimporter/autotests/filtersylpheedtest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filtersylpheedtest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filtersylpheedtest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterthebattest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/filterthebattest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterthebattest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterthebattest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterthebattest.h new/mailimporter-18.04.0/src/mailimporter/autotests/filterthebattest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterthebattest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterthebattest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterthunderbirdtest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/filterthunderbirdtest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterthunderbirdtest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterthunderbirdtest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/filterthunderbirdtest.h new/mailimporter-18.04.0/src/mailimporter/autotests/filterthunderbirdtest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/filterthunderbirdtest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/filterthunderbirdtest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/messagestatustest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/messagestatustest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/messagestatustest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/messagestatustest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/messagestatustest.h new/mailimporter-18.04.0/src/mailimporter/autotests/messagestatustest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/messagestatustest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/messagestatustest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/selectthunderbirdprofiledialogtest.cpp new/mailimporter-18.04.0/src/mailimporter/autotests/selectthunderbirdprofiledialogtest.cpp
--- old/mailimporter-17.12.3/src/mailimporter/autotests/selectthunderbirdprofiledialogtest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/selectthunderbirdprofiledialogtest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/autotests/selectthunderbirdprofiledialogtest.h new/mailimporter-18.04.0/src/mailimporter/autotests/selectthunderbirdprofiledialogtest.h
--- old/mailimporter-17.12.3/src/mailimporter/autotests/selectthunderbirdprofiledialogtest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/autotests/selectthunderbirdprofiledialogtest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filterimporterbase.cpp new/mailimporter-18.04.0/src/mailimporter/filterimporterbase.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filterimporterbase.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filterimporterbase.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filterimporterbase.h new/mailimporter-18.04.0/src/mailimporter/filterimporterbase.h
--- old/mailimporter-17.12.3/src/mailimporter/filterimporterbase.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filterimporterbase.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filterinfo.cpp new/mailimporter-18.04.0/src/mailimporter/filterinfo.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filterinfo.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filterinfo.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* Copyright (c) 2012-2017 Montel Laurent */
+/* Copyright (c) 2012-2018 Montel Laurent */
#include "filterinfo.h"
#include "filterinfogui.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filterinfo.h new/mailimporter-18.04.0/src/mailimporter/filterinfo.h
--- old/mailimporter-17.12.3/src/mailimporter/filterinfo.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filterinfo.h 2018-04-10 13:51:09.000000000 +0200
@@ -17,7 +17,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* Copyright (c) 2012-2017 Montel Laurent */
+/* Copyright (c) 2012-2018 Montel Laurent */
#include "mailimporter_export.h"
#include <QString>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filterinfogui.cpp new/mailimporter-18.04.0/src/mailimporter/filterinfogui.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filterinfogui.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filterinfogui.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2017 Montel Laurent
+ Copyright (c) 2012-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filterinfogui.h new/mailimporter-18.04.0/src/mailimporter/filterinfogui.h
--- old/mailimporter-17.12.3/src/mailimporter/filterinfogui.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filterinfogui.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2017 Montel Laurent
+ Copyright (c) 2012-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterbalsa.cpp new/mailimporter-18.04.0/src/mailimporter/filters/filterbalsa.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterbalsa.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterbalsa.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2017 Montel Laurent
+ Copyright (c) 2012-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterbalsa.h new/mailimporter-18.04.0/src/mailimporter/filters/filterbalsa.h
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterbalsa.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterbalsa.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2017 Montel Laurent
+ Copyright (c) 2012-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterclawsmail.cpp new/mailimporter-18.04.0/src/mailimporter/filters/filterclawsmail.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterclawsmail.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterclawsmail.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2017 Montel Laurent
+ Copyright (c) 2012-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterclawsmail.h new/mailimporter-18.04.0/src/mailimporter/filters/filterclawsmail.h
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterclawsmail.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterclawsmail.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2017 Montel Laurent
+ Copyright (c) 2012-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterevolution.cpp new/mailimporter-18.04.0/src/mailimporter/filters/filterevolution.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterevolution.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterevolution.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -150,7 +150,7 @@
if (mboxName.length() > 20) {
QString tmp_info = mboxName;
tmp_info = tmp_info.replace(mailDir(), QStringLiteral(".."));
- if (tmp_info.contains(QStringLiteral("subfolders/"))) {
+ if (tmp_info.contains(QLatin1String("subfolders/"))) {
tmp_info.remove(QStringLiteral("subfolders/"));
}
filterInfo()->setFrom(tmp_info);
@@ -158,7 +158,7 @@
} else {
filterInfo()->setFrom(mboxName);
}
- if (targetDir.contains(QStringLiteral("subfolders/"))) {
+ if (targetDir.contains(QLatin1String("subfolders/"))) {
QString tmp_info = targetDir;
tmp_info.remove(QStringLiteral("subfolders/"));
filterInfo()->setTo(tmp_info);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterevolution_v2.cpp new/mailimporter-18.04.0/src/mailimporter/filters/filterevolution_v2.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterevolution_v2.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterevolution_v2.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -206,7 +206,7 @@
if (mboxName.length() > 20) {
QString tmp_info = mboxName;
tmp_info = tmp_info.replace(mailDir(), QStringLiteral("../"));
- if (tmp_info.contains(QStringLiteral(".sbd"))) {
+ if (tmp_info.contains(QLatin1String(".sbd"))) {
tmp_info.remove(QStringLiteral(".sbd"));
}
filterInfo()->setFrom(tmp_info);
@@ -214,7 +214,7 @@
filterInfo()->setFrom(mboxName);
}
- if (targetDir.contains(QStringLiteral(".sbd"))) {
+ if (targetDir.contains(QLatin1String(".sbd"))) {
QString tmp_info = targetDir;
tmp_info.remove(QStringLiteral(".sbd"));
filterInfo()->setTo(tmp_info);
@@ -253,13 +253,13 @@
QString destFolder;
QString _targetDir = targetDir;
if (!targetDir.isNull()) {
- if (_targetDir.contains(QStringLiteral(".sbd"))) {
+ if (_targetDir.contains(QLatin1String(".sbd"))) {
_targetDir.remove(QStringLiteral(".sbd"));
}
destFolder += QStringLiteral("Evolution-Import/") + _targetDir + QLatin1Char('/') + filenameInfo.completeBaseName(); // mboxName;
} else {
destFolder = QStringLiteral("Evolution-Import/") + rootDir;
- if (destFolder.contains(QStringLiteral(".sbd"))) {
+ if (destFolder.contains(QLatin1String(".sbd"))) {
destFolder.remove(QStringLiteral(".sbd"));
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterevolution_v3.cpp new/mailimporter-18.04.0/src/mailimporter/filters/filterevolution_v3.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterevolution_v3.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterevolution_v3.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2017 Montel Laurent
+ Copyright (c) 2012-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterevolution_v3.h new/mailimporter-18.04.0/src/mailimporter/filters/filterevolution_v3.h
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterevolution_v3.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterevolution_v3.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2017 Montel Laurent
+ Copyright (c) 2012-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filtericedove.cpp new/mailimporter-18.04.0/src/mailimporter/filters/filtericedove.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filters/filtericedove.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filtericedove.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filtericedove.h new/mailimporter-18.04.0/src/mailimporter/filters/filtericedove.h
--- old/mailimporter-17.12.3/src/mailimporter/filters/filtericedove.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filtericedove.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterkmail_maildir.cpp new/mailimporter-18.04.0/src/mailimporter/filters/filterkmail_maildir.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterkmail_maildir.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterkmail_maildir.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* Copyright (c) 2012-2017 Montel Laurent */
+/* Copyright (c) 2012-2018 Montel Laurent */
#include "filterkmail_maildir.h"
@@ -168,7 +168,7 @@
for (QStringList::ConstIterator it = subFList.constBegin(); it != end; ++it) {
QString _cat = *it;
if (!(_cat == *mailFile)) {
- if (_cat.startsWith(QLatin1Char('.')) && _cat.endsWith(QStringLiteral(".directory"))) {
+ if (_cat.startsWith(QLatin1Char('.')) && _cat.endsWith(QLatin1String(".directory"))) {
_cat.remove(0, 1);
_cat.remove((_cat.length() - 10), 10);
} else if (_cat.startsWith(QLatin1Char('.'))) {
@@ -177,7 +177,7 @@
_path += QLatin1Char('/') + _cat;
}
}
- if (_path.endsWith(QStringLiteral("cur"))) {
+ if (_path.endsWith(QLatin1String("cur"))) {
_path.remove(_path.length() - 4, 4);
}
QString _info = _path;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterkmail_maildir.h new/mailimporter-18.04.0/src/mailimporter/filters/filterkmail_maildir.h
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterkmail_maildir.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterkmail_maildir.h 2018-04-10 13:51:09.000000000 +0200
@@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* Copyright (c) 2012-2017 Montel Laurent */
+/* Copyright (c) 2012-2018 Montel Laurent */
#ifndef MAILIMPORTER_FILTER_KMAIL_MAILDIR_H
#define MAILIMPORTER_FILTER_KMAIL_MAILDIR_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filtermailmangzip.cpp new/mailimporter-18.04.0/src/mailimporter/filters/filtermailmangzip.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filters/filtermailmangzip.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filtermailmangzip.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2013-2017 Montel Laurent
+ Copyright (c) 2013-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filtermailmangzip.h new/mailimporter-18.04.0/src/mailimporter/filters/filtermailmangzip.h
--- old/mailimporter-17.12.3/src/mailimporter/filters/filtermailmangzip.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filtermailmangzip.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2013-2017 Montel Laurent
+ Copyright (c) 2013-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterseamonkey.cpp new/mailimporter-18.04.0/src/mailimporter/filters/filterseamonkey.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterseamonkey.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterseamonkey.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterseamonkey.h new/mailimporter-18.04.0/src/mailimporter/filters/filterseamonkey.h
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterseamonkey.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterseamonkey.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filtersylpheed.cpp new/mailimporter-18.04.0/src/mailimporter/filters/filtersylpheed.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filters/filtersylpheed.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filtersylpheed.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* Copyright (c) 2012-2017 Montel Laurent */
+/* Copyright (c) 2012-2018 Montel Laurent */
#include "filtersylpheed.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filtersylpheed.h new/mailimporter-18.04.0/src/mailimporter/filters/filtersylpheed.h
--- old/mailimporter-17.12.3/src/mailimporter/filters/filtersylpheed.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filtersylpheed.h 2018-04-10 13:51:09.000000000 +0200
@@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* Copyright (c) 2012-2017 Montel Laurent */
+/* Copyright (c) 2012-2018 Montel Laurent */
#ifndef MAILIMPORTER_FILTER_SYLPHEED_H
#define MAILIMPORTER_FILTER_SYLPHEED_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterthebat.cpp new/mailimporter-18.04.0/src/mailimporter/filters/filterthebat.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterthebat.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterthebat.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* Copyright (c) 2012-2017 Montel Laurent */
+/* Copyright (c) 2012-2018 Montel Laurent */
#include "filterthebat.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterthebat.h new/mailimporter-18.04.0/src/mailimporter/filters/filterthebat.h
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterthebat.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterthebat.h 2018-04-10 13:51:09.000000000 +0200
@@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* Copyright (c) 2012-2017 Montel Laurent */
+/* Copyright (c) 2012-2018 Montel Laurent */
#ifndef MAILIMPORTER_FILTER_THEBAT_H
#define MAILIMPORTER_FILTER_THEBAT_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterthunderbird.cpp new/mailimporter-18.04.0/src/mailimporter/filters/filterthunderbird.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterthunderbird.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterthunderbird.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -294,14 +294,14 @@
if (mboxName.length() > 20) {
QString tmp_info = mboxName;
tmp_info = tmp_info.replace(mailDir(), QStringLiteral("../"));
- if (tmp_info.contains(QStringLiteral(".sbd"))) {
+ if (tmp_info.contains(QLatin1String(".sbd"))) {
tmp_info.remove(QStringLiteral(".sbd"));
}
filterInfo()->setFrom(tmp_info);
} else {
filterInfo()->setFrom(mboxName);
}
- if (targetDir.contains(QStringLiteral(".sbd"))) {
+ if (targetDir.contains(QLatin1String(".sbd"))) {
QString tmp_info = targetDir;
tmp_info.remove(QStringLiteral(".sbd"));
filterInfo()->setTo(tmp_info);
@@ -340,13 +340,13 @@
QString destFolder;
QString _targetDir = targetDir;
if (!targetDir.isNull()) {
- if (_targetDir.contains(QStringLiteral(".sbd"))) {
+ if (_targetDir.contains(QLatin1String(".sbd"))) {
_targetDir.remove(QStringLiteral(".sbd"));
}
destFolder += defaultInstallFolder() + _targetDir + QLatin1Char('/') + filenameInfo.completeBaseName();// mboxName;
} else {
destFolder = defaultInstallFolder() + rootDir;
- if (destFolder.contains(QStringLiteral(".sbd"))) {
+ if (destFolder.contains(QLatin1String(".sbd"))) {
destFolder.remove(QStringLiteral(".sbd"));
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters/filterthunderbird.h new/mailimporter-18.04.0/src/mailimporter/filters/filterthunderbird.h
--- old/mailimporter-17.12.3/src/mailimporter/filters/filterthunderbird.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters/filterthunderbird.h 2018-04-10 13:51:09.000000000 +0200
@@ -5,7 +5,7 @@
copyright : (C) 2005 by Danny Kukawka
email : danny.kukawka@web.de
***************************************************************************/
-/* Copyright (c) 2012-2017 Montel Laurent */
+/* Copyright (c) 2012-2018 Montel Laurent */
/***************************************************************************
* *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters.cpp new/mailimporter-18.04.0/src/mailimporter/filters.cpp
--- old/mailimporter-17.12.3/src/mailimporter/filters.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* Copyright (c) 2012-2017 Montel Laurent */
+/* Copyright (c) 2012-2018 Montel Laurent */
// Local Includes
#include "filters.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/filters.h new/mailimporter-18.04.0/src/mailimporter/filters.h
--- old/mailimporter-17.12.3/src/mailimporter/filters.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/filters.h 2018-04-10 13:51:09.000000000 +0200
@@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
-/* Copyright (c) 2012-2017 Montel Laurent */
+/* Copyright (c) 2012-2018 Montel Laurent */
#ifndef FILTERS_H
#define FILTERS_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/importmailswidget.cpp new/mailimporter-18.04.0/src/mailimporter/importmailswidget.cpp
--- old/mailimporter-17.12.3/src/mailimporter/importmailswidget.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/importmailswidget.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2017 Montel Laurent
+ Copyright (c) 2012-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/importmailswidget.h new/mailimporter-18.04.0/src/mailimporter/importmailswidget.h
--- old/mailimporter-17.12.3/src/mailimporter/importmailswidget.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/importmailswidget.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2017 Montel Laurent
+ Copyright (c) 2012-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/mailimporter_private_export.h new/mailimporter-18.04.0/src/mailimporter/mailimporter_private_export.h
--- old/mailimporter-17.12.3/src/mailimporter/mailimporter_private_export.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/mailimporter_private_export.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/* This file is part of the KDE project
- Copyright (C) 2017 Laurent Montel
+ Copyright (C) 2017-2018 Laurent Montel
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/mailimporter_utils.h new/mailimporter-18.04.0/src/mailimporter/mailimporter_utils.h
--- old/mailimporter-17.12.3/src/mailimporter/mailimporter_utils.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/mailimporter_utils.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2017 Montel Laurent
+ Copyright (c) 2012-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/messagestatus.cpp new/mailimporter-18.04.0/src/mailimporter/messagestatus.cpp
--- old/mailimporter-17.12.3/src/mailimporter/messagestatus.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/messagestatus.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/messagestatus.h new/mailimporter-18.04.0/src/mailimporter/messagestatus.h
--- old/mailimporter-17.12.3/src/mailimporter/messagestatus.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/messagestatus.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/othermailerutil.cpp new/mailimporter-18.04.0/src/mailimporter/othermailerutil.cpp
--- old/mailimporter-17.12.3/src/mailimporter/othermailerutil.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/othermailerutil.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2013-2017 Montel Laurent
+ Copyright (c) 2013-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/othermailerutil.h new/mailimporter-18.04.0/src/mailimporter/othermailerutil.h
--- old/mailimporter-17.12.3/src/mailimporter/othermailerutil.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/othermailerutil.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2013-2017 Montel Laurent
+ Copyright (c) 2013-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/selectthunderbirdprofilewidget.cpp new/mailimporter-18.04.0/src/mailimporter/selectthunderbirdprofilewidget.cpp
--- old/mailimporter-17.12.3/src/mailimporter/selectthunderbirdprofilewidget.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/selectthunderbirdprofilewidget.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2017 Montel Laurent
+ Copyright (c) 2012-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporter/selectthunderbirdprofilewidget.h new/mailimporter-18.04.0/src/mailimporter/selectthunderbirdprofilewidget.h
--- old/mailimporter-17.12.3/src/mailimporter/selectthunderbirdprofilewidget.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporter/selectthunderbirdprofilewidget.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2012-2017 Montel Laurent
+ Copyright (c) 2012-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterbalsamailtest.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterbalsamailtest.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterbalsamailtest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterbalsamailtest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterbalsamailtest.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterbalsamailtest.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterbalsamailtest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterbalsamailtest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterclawsmailtest.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterclawsmailtest.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterclawsmailtest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterclawsmailtest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterclawsmailtest.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterclawsmailtest.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterclawsmailtest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterclawsmailtest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtericedovetest.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtericedovetest.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtericedovetest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtericedovetest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtericedovetest.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtericedovetest.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtericedovetest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtericedovetest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterimporterakonaditest.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterimporterakonaditest.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterimporterakonaditest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterimporterakonaditest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterimporterakonaditest.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterimporterakonaditest.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterimporterakonaditest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterimporterakonaditest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterimportertest.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterimportertest.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterimportertest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterimportertest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterimportertest.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterimportertest.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterimportertest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterimportertest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterimportertestutil.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterimportertestutil.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterimportertestutil.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterimportertestutil.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterimportertestutil.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterimportertestutil.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterimportertestutil.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterimportertestutil.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterlnotestest.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterlnotestest.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterlnotestest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterlnotestest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterlnotestest.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterlnotestest.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterlnotestest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterlnotestest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtermailapptest.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtermailapptest.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtermailapptest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtermailapptest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtermailapptest.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtermailapptest.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtermailapptest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtermailapptest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtermailmangziptest.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtermailmangziptest.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtermailmangziptest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtermailmangziptest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtermailmangziptest.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtermailmangziptest.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtermailmangziptest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtermailmangziptest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtermboxtest.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtermboxtest.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtermboxtest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtermboxtest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtermboxtest.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtermboxtest.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtermboxtest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtermboxtest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterplaintest.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterplaintest.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterplaintest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterplaintest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterplaintest.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterplaintest.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterplaintest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterplaintest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtersylpheedtest.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtersylpheedtest.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtersylpheedtest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtersylpheedtest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtersylpheedtest.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtersylpheedtest.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filtersylpheedtest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filtersylpheedtest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterthebattest.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterthebattest.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterthebattest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterthebattest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterthebattest.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterthebattest.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterthebattest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterthebattest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterthunderbirdtest.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterthunderbirdtest.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterthunderbirdtest.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterthunderbirdtest.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterthunderbirdtest.h new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterthunderbirdtest.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/autotests/filterthunderbirdtest.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/autotests/filterthunderbirdtest.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2015-2017 Montel Laurent
+ Copyright (c) 2015-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/filterimporterakonadi.cpp new/mailimporter-18.04.0/src/mailimporterakonadi/filterimporterakonadi.cpp
--- old/mailimporter-17.12.3/src/mailimporterakonadi/filterimporterakonadi.cpp 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/filterimporterakonadi.cpp 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/filterimporterakonadi.h new/mailimporter-18.04.0/src/mailimporterakonadi/filterimporterakonadi.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/filterimporterakonadi.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/filterimporterakonadi.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.3/src/mailimporterakonadi/filterimportertestutil.h new/mailimporter-18.04.0/src/mailimporterakonadi/filterimportertestutil.h
--- old/mailimporter-17.12.3/src/mailimporterakonadi/filterimportertestutil.h 2018-02-26 06:42:57.000000000 +0100
+++ new/mailimporter-18.04.0/src/mailimporterakonadi/filterimportertestutil.h 2018-04-10 13:51:09.000000000 +0200
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2017 Montel Laurent
+ Copyright (C) 2017-2018 Montel Laurent
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License, version 2, as