Hello community,
here is the log from the commit of package akonadi-import-wizard for
openSUSE:Factory checked in at 2020-08-18 11:54:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/akonadi-import-wizard (Old)
and /work/SRC/openSUSE:Factory/.akonadi-import-wizard.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-import-wizard"
Tue Aug 18 11:54:53 2020 rev:49 rq:826328 version:20.08.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/akonadi-import-wizard/akonadi-import-wizard.changes
2020-07-14 07:45:34.351127660 +0200
+++
/work/SRC/openSUSE:Factory/.akonadi-import-wizard.new.3399/akonadi-import-wizard.changes
2020-08-18 11:55:04.479255335 +0200
@@ -1,0 +2,28 @@
+Sun Aug 9 09:08:00 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 20.08.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/releases/2020-08-apps-update
+- No code change since 20.07.90
+
+-------------------------------------------------------------------
+Sun Aug 2 07:58:21 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 20.07.90
+ * New feature release
+- No code change since 20.07.80
+
+-------------------------------------------------------------------
+Sun Jul 19 10:03:32 UTC 2020 - Christophe Giboudeaux <[email protected]>
+
+- Update to 20.07.80
+ * New feature release
+- Changes since 20.04.3:
+ * Fix clang warning
+ * Adapt to new API
+ * Adapt to new api
+ * Fix include. Use camelcase
+ * Fix includes
+
+-------------------------------------------------------------------
Old:
----
akonadi-import-wizard-20.04.3.tar.xz
akonadi-import-wizard-20.04.3.tar.xz.sig
New:
----
akonadi-import-wizard-20.08.0.tar.xz
akonadi-import-wizard-20.08.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ akonadi-import-wizard.spec ++++++
--- /var/tmp/diff_new_pack.YerVjS/_old 2020-08-18 11:55:06.475256213 +0200
+++ /var/tmp/diff_new_pack.YerVjS/_new 2020-08-18 11:55:06.475256213 +0200
@@ -22,7 +22,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: akonadi-import-wizard
-Version: 20.04.3
+Version: 20.08.0
Release: 0
Summary: Assistant to import PIM data
License: GPL-2.0-or-later AND LGPL-2.1-or-later
++++++ akonadi-import-wizard-20.04.3.tar.xz ->
akonadi-import-wizard-20.08.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-import-wizard-20.04.3/.arcconfig
new/akonadi-import-wizard-20.08.0/.arcconfig
--- old/akonadi-import-wizard-20.04.3/.arcconfig 2020-06-18
08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/.arcconfig 1970-01-01
01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-{
- "phabricator.uri": "https://phabricator.kde.org/project/profile/34/";
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-import-wizard-20.04.3/.gitlab-ci.yml
new/akonadi-import-wizard-20.08.0/.gitlab-ci.yml
--- old/akonadi-import-wizard-20.04.3/.gitlab-ci.yml 1970-01-01
01:00:00.000000000 +0100
+++ new/akonadi-import-wizard-20.08.0/.gitlab-ci.yml 2020-08-06
09:21:16.000000000 +0200
@@ -0,0 +1,30 @@
+include:
+ - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml
+ -
https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml
+
+build_clazy_clang_tidy:
+ stage: build
+ image: kdeorg/ci-suse-qt514
+ extends: .linux
+ #only:
+ # - merge_requests
+ before_script:
+ - zypper install -y clazy
+ - git clone --depth=1 https://invent.kde.org/sysadmin/ci-tooling.git
$CI_TOOLING
+ - git clone --depth=1 https://invent.kde.org/sysadmin/repo-metadata.git
$CI_TOOLING/repo-metadata
+ - git clone --depth=1
https://invent.kde.org/sysadmin/kde-build-metadata.git
$CI_TOOLING/kde-build-metadata
+ - git clone --depth=1 https://invent.kde.org/sdk/kde-dev-scripts.git
$CI_TOOLING/kde-dev-scripts
+
+ script:
+ - export CXX=clazy
+ - export CC=clang
+ - export CXXFLAGS="-Wno-deprecated-declarations"
+ - export CLAZY_HEADER_FILTER='^(?!ui_)\w+.h\$'
+ - export
CLAZY_CHECKS="level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs"
+ - python3 -u $CI_TOOLING/helpers/prepare-dependencies.py --product
$PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --environment
production --platform $PLATFORM --installTo $INSTALL_PREFIX
+ - python3 -u $CI_TOOLING/helpers/configure-build.py --product $PRODUCT
--project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --installTo
$INSTALL_PREFIX
+ - python3 -u $CI_TOOLING/helpers/compile-build.py --product $PRODUCT
--project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM
--usingInstall $INSTALL_PREFIX
+ - cd build && run-clang-tidy
+ variables:
+ PLATFORM: SUSEQt5.14
+ BRANCH_GROUP: kf5-qt5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-import-wizard-20.04.3/CMakeLists.txt
new/akonadi-import-wizard-20.08.0/CMakeLists.txt
--- old/akonadi-import-wizard-20.04.3/CMakeLists.txt 2020-07-07
03:07:42.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/CMakeLists.txt 2020-08-07
09:08:25.000000000 +0200
@@ -1,9 +1,9 @@
cmake_minimum_required(VERSION 3.5)
-set(PIM_VERSION "5.14.3")
+set(PIM_VERSION "5.15.0")
project(AkonadiImportWizard VERSION ${PIM_VERSION})
-set(KF5_MIN_VERSION "5.68.0")
+set(KF5_MIN_VERSION "5.71.0")
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
@@ -27,8 +27,8 @@
include(ECMQtDeclareLoggingCategory)
# Do NOT add quote
-set(KDEPIM_DEV_VERSION )
-set(RELEASE_SERVICE_VERSION "20.04.3")
+set(KDEPIM_DEV_VERSION)
+set(RELEASE_SERVICE_VERSION "20.08.0")
# add an extra space
if(DEFINED KDEPIM_DEV_VERSION)
@@ -36,24 +36,23 @@
endif()
-set(KDEPIM_VERSION_NUMBER "${PIM_VERSION}")
-set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}
(${RELEASE_SERVICE_VERSION})")
+set(PIM_VERSION "${PIM_VERSION}")
+set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION}
(${RELEASE_SERVICE_VERSION})")
-set(KMAILTRANSPORT_LIB_VERSION "5.14.3")
-set(AKONADI_VERSION "5.14.3")
+set(KMAILTRANSPORT_LIB_VERSION "5.15.0")
+set(AKONADI_VERSION "5.15.0")
-set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
+set(KDEPIM_LIB_VERSION "${PIM_VERSION}")
set(KDEPIM_LIB_SOVERSION "5")
-set(QT_REQUIRED_VERSION "5.12.0")
+set(QT_REQUIRED_VERSION "5.13.0")
find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Gui)
-set(MAILIMPORTER_VERSION_LIB "5.14.3")
-set(MAILCOMMON_LIB_VERSION_LIB "5.14.3")
-set(MESSAGELIB_LIB_VERSION_LIB "5.14.3")
-set(PIMCOMMON_LIB_VERSION_LIB "5.14.3")
-set(LIBKDEPIM_LIB_VERSION_LIB "5.14.3")
-set(IDENTITYMANAGEMENT_LIB_VERSION "5.14.3")
+set(MAILIMPORTER_VERSION_LIB "5.15.0")
+set(MAILCOMMON_LIB_VERSION_LIB "5.15.0")
+set(MESSAGELIB_LIB_VERSION_LIB "5.15.0")
+set(PIMCOMMON_LIB_VERSION_LIB "5.15.0")
+set(IDENTITYMANAGEMENT_LIB_VERSION "5.15.0")
# Find KF5 package
find_package(KF5Wallet ${KF5_MIN_VERSION} CONFIG REQUIRED)
@@ -75,20 +74,20 @@
find_package(KF5MailImporterAkonadi ${MAILIMPORTER_VERSION_LIB} CONFIG
REQUIRED)
find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED)
find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION_LIB} CONFIG REQUIRED)
-find_package(KF5Libkdepim ${LIBKDEPIM_LIB_VERSION_LIB} CONFIG REQUIRED)
include_directories(${importwizard_SOURCE_DIR} ${importwizard_BINARY_DIR})
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_definitions(-DQT_USE_QSTRINGBUILDER)
-if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
- add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050e00)
- add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054400)
-endif()
+add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
+add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054800)
if(BUILD_TESTING)
add_definitions(-DBUILD_TESTING)
endif()
add_definitions(-DQT_NO_FOREACH)
+add_definitions(-DQT_NO_KEYWORDS)
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
add_subdirectory(src)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/po/ca/akonadiimportwizard.po
new/akonadi-import-wizard-20.08.0/po/ca/akonadiimportwizard.po
--- old/akonadi-import-wizard-20.04.3/po/ca/akonadiimportwizard.po
2020-07-07 03:07:41.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/po/ca/akonadiimportwizard.po
2020-08-07 09:08:24.000000000 +0200
@@ -10,7 +10,7 @@
"Project-Id-Version: akonadiimportwizard\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-01-02 03:11+0100\n"
-"PO-Revision-Date: 2020-01-02 10:09+0100\n"
+"PO-Revision-Date: 2020-07-11 21:36+0200\n"
"Last-Translator: Antoni Bella Pérez <[email protected]>\n"
"Language-Team: Catalan <[email protected]>\n"
"Language: ca\n"
@@ -19,7 +19,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
-"X-Generator: Lokalize 20.03.70\n"
+"X-Generator: Lokalize 20.04.3\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
@@ -275,7 +275,7 @@
#: manual/manualselectfilterpage.cpp:96
#, kde-format
msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Escrit per %1.</i></p>"
+msgstr "<p><i>Escrit per en %1.</i></p>"
#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
#: plugins/sylpheed/sylpheedaddressbook.cpp:43
@@ -395,7 +395,7 @@
#: ui/autodetect/importmailpage.ui:32 ui/manual/manualselectfilterpage.ui:136
#, kde-format
msgid "Please select the folder to import to:"
-msgstr "Seleccioneu una carpeta per importar-hi:"
+msgstr "Seleccioneu una carpeta per a importar-hi:"
#. i18n: ectx: property (text), widget (QPushButton, importMails)
#: ui/autodetect/importmailpage.ui:60
@@ -478,7 +478,7 @@
#: ui/manual/manualimportmailpage.ui:96
#, kde-format
msgid "Click 'Back' to import more emails"
-msgstr "Cliqueu «Enrere» per importar més correus"
+msgstr "Cliqueu «Enrere» per a importar més correus"
#. i18n: ectx: property (text), widget (QLabel, TextLabel6)
#: ui/manual/manualselectfilterpage.ui:103
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/po/ca@valencia/akonadiimportwizard.po
new/akonadi-import-wizard-20.08.0/po/ca@valencia/akonadiimportwizard.po
--- old/akonadi-import-wizard-20.04.3/po/ca@valencia/akonadiimportwizard.po
2020-07-07 03:07:41.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/po/ca@valencia/akonadiimportwizard.po
2020-08-07 09:08:24.000000000 +0200
@@ -10,7 +10,7 @@
"Project-Id-Version: akonadiimportwizard\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-01-02 03:11+0100\n"
-"PO-Revision-Date: 2020-01-02 10:09+0100\n"
+"PO-Revision-Date: 2020-07-11 21:36+0200\n"
"Last-Translator: Antoni Bella Pérez <[email protected]>\n"
"Language-Team: Catalan <[email protected]>\n"
"Language: ca@valencia\n"
@@ -19,7 +19,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
-"X-Generator: Lokalize 20.03.70\n"
+"X-Generator: Lokalize 20.04.3\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
@@ -275,7 +275,7 @@
#: manual/manualselectfilterpage.cpp:96
#, kde-format
msgid "<p><i>Written by %1.</i></p>"
-msgstr "<p><i>Escrit per %1.</i></p>"
+msgstr "<p><i>Escrit per en %1.</i></p>"
#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
#: plugins/sylpheed/sylpheedaddressbook.cpp:43
@@ -395,7 +395,7 @@
#: ui/autodetect/importmailpage.ui:32 ui/manual/manualselectfilterpage.ui:136
#, kde-format
msgid "Please select the folder to import to:"
-msgstr "Seleccioneu una carpeta per importar-hi:"
+msgstr "Seleccioneu una carpeta per a importar-hi:"
#. i18n: ectx: property (text), widget (QPushButton, importMails)
#: ui/autodetect/importmailpage.ui:60
@@ -478,7 +478,7 @@
#: ui/manual/manualimportmailpage.ui:96
#, kde-format
msgid "Click 'Back' to import more emails"
-msgstr "Cliqueu «Arrere» per importar més correus"
+msgstr "Cliqueu «Arrere» per a importar més correus"
#. i18n: ectx: property (text), widget (QLabel, TextLabel6)
#: ui/manual/manualselectfilterpage.ui:103
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/po/da/akonadiimportwizard.po
new/akonadi-import-wizard-20.08.0/po/da/akonadiimportwizard.po
--- old/akonadi-import-wizard-20.04.3/po/da/akonadiimportwizard.po
2020-07-07 03:07:41.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/po/da/akonadiimportwizard.po
2020-08-07 09:08:24.000000000 +0200
@@ -1,13 +1,13 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Martin Schlander <[email protected]>, 2012, 2013, 2014, 2015, 2016.
+# Martin Schlander <[email protected]>, 2012, 2013, 2014, 2015, 2016,
2020.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-01-02 03:11+0100\n"
-"PO-Revision-Date: 2016-08-11 20:51+0100\n"
+"PO-Revision-Date: 2020-07-27 22:04+0200\n"
"Last-Translator: Martin Schlander <[email protected]>\n"
"Language-Team: Danish <[email protected]>\n"
"Language: da\n"
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Lokalize 20.04.2\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
@@ -33,8 +33,7 @@
msgstr "Intet program fundet."
#: importwizard.cpp:54
-#, fuzzy, kde-format
-#| msgid "PIM Import Tool"
+#, kde-format
msgctxt "@title:window"
msgid "PIM Import Tool"
msgstr "Importværktøj til personlig information (PIM)"
@@ -105,10 +104,9 @@
msgstr "Importér adressebog fra %1..."
#: importwizard.cpp:226
-#, fuzzy, kde-format
-#| msgid "Import addressbook from %1..."
+#, kde-format
msgid "Import addressbook from %1: Done"
-msgstr "Importér adressebog fra %1..."
+msgstr "Importér adressebog fra %1: Færdig"
#: importwizard.cpp:232
#, kde-format
@@ -116,10 +114,9 @@
msgstr "Importér filtre fra %1..."
#: importwizard.cpp:235
-#, fuzzy, kde-format
-#| msgid "Import filters from %1..."
+#, kde-format
msgid "Import filters from %1: Done"
-msgstr "Importér filtre fra %1..."
+msgstr "Importér filtre fra %1: Færdig"
#: importwizard.cpp:241
#, kde-format
@@ -127,10 +124,9 @@
msgstr "Importér e-mails fra %1..."
#: importwizard.cpp:244
-#, fuzzy, kde-format
-#| msgid "Import mails from %1..."
+#, kde-format
msgid "Import mails from %1: Done"
-msgstr "Importér e-mails fra %1..."
+msgstr "Importér e-mails fra %1: Færdig"
#: importwizard.cpp:250
#, kde-format
@@ -138,10 +134,9 @@
msgstr "Importér indstillinger fra %1..."
#: importwizard.cpp:253
-#, fuzzy, kde-format
-#| msgid "Import settings from %1..."
+#, kde-format
msgid "Import settings from %1: Done"
-msgstr "Importér indstillinger fra %1..."
+msgstr "Importér indstillinger fra %1: Færdig"
#: importwizard.cpp:259
#, kde-format
@@ -149,10 +144,9 @@
msgstr "Importér kalender fra %1..."
#: importwizard.cpp:262
-#, fuzzy, kde-format
-#| msgid "Import calendar from %1..."
+#, kde-format
msgid "Import calendar from %1: Done"
-msgstr "Importér kalender fra %1..."
+msgstr "Importér kalender fra %1: Færdig"
#: importwizard.cpp:351 plugins/balsa/balsaimportdata.cpp:61
#: plugins/claws-mail/clawsmailimportdata.cpp:62
@@ -182,8 +176,7 @@
msgstr "Opretter ny kontakt..."
#: libimportwizard/abstractaddressbook.cpp:49
-#, fuzzy, kde-format
-#| msgid "Select Address Book"
+#, kde-format
msgctxt "@title:window"
msgid "Select Address Book"
msgstr "Vælg adressebog"
@@ -214,10 +207,9 @@
msgstr "Oprettelse af kontakt gennemført"
#: libimportwizard/abstractimporter.cpp:80
-#, fuzzy, kde-format
-#| msgid "Importing of filters was canceled."
+#, kde-format
msgid "Importing of filters from \"%1\" was canceled."
-msgstr "Import af filtre blev annulleret."
+msgstr "Import af filtre fra \"%1\" blev annulleret."
#: libimportwizard/abstractimporter.cpp:82
#, kde-format
@@ -257,10 +249,9 @@
msgstr "Importværktøj til personlig information (PIM)"
#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2016 importwizard authors"
+#, kde-format
msgid "Copyright © 2012-2020 ImportWizard authors"
-msgstr "Ophavsret © 2012-2016 importguide-udviklerne"
+msgstr "Ophavsret © 2012-2020 importguide-udviklerne"
#: main.cpp:54
#, kde-format
@@ -273,10 +264,9 @@
msgstr "Vedligeholder"
#: main.cpp:61
-#, fuzzy, kde-format
-#| msgid "Mode"
+#, kde-format
msgid "Mode: %1"
-msgstr "Tilstand"
+msgstr "Tilstand: %1"
#: manual/manualselectfilterpage.cpp:96
#, kde-format
@@ -344,16 +334,14 @@
msgstr "Evolution-kalender blev ikke fundet."
#: plugins/icedove/icedoveimportdata.cpp:84
-#, fuzzy, kde-format
-#| msgid "Sylpheed settings not found."
+#, kde-format
msgid "Icedove settings not found."
-msgstr "Sylpheed-indstillinger blev ikke fundet."
+msgstr "Icedove-indstillinger blev ikke fundet."
#: plugins/seamonkey/seamonkeyimportdata.cpp:84
-#, fuzzy, kde-format
-#| msgid "Sylpheed settings not found."
+#, kde-format
msgid "SeaMonkey settings not found."
-msgstr "Sylpheed-indstillinger blev ikke fundet."
+msgstr "SeaMonkey-indstillinger blev ikke fundet."
#: plugins/sylpheed/sylpheedaddressbook.cpp:78
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/po/el/akonadiimportwizard.po
new/akonadi-import-wizard-20.08.0/po/el/akonadiimportwizard.po
--- old/akonadi-import-wizard-20.04.3/po/el/akonadiimportwizard.po
2020-07-07 03:07:41.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/po/el/akonadiimportwizard.po
2020-08-07 09:08:24.000000000 +0200
@@ -2,14 +2,14 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Bouklis Panos <[email protected]>, 2012.
-# Stelios <[email protected]>, 2012.
+# Stelios <[email protected]>, 2012, 2020.
# Dimitrios Glentadakis <[email protected]>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-01-02 03:11+0100\n"
-"PO-Revision-Date: 2013-01-17 21:31+0200\n"
+"PO-Revision-Date: 2020-08-05 12:37+0300\n"
"Last-Translator: Stelios <[email protected]>\n"
"Language-Team: Greek <[email protected]>\n"
"Language: el\n"
@@ -17,7 +17,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 20.04.2\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
@@ -30,14 +30,12 @@
msgstr "[email protected]"
#: autodetect/widgets/selectprogramlistwidget.cpp:62
-#, fuzzy, kde-format
-#| msgid "No program found"
+#, kde-format
msgid "No program found."
msgstr "Δεν βρέθηκε πρόγραμμα"
#: importwizard.cpp:54
-#, fuzzy, kde-format
-#| msgid "PIM Import Tool"
+#, kde-format
msgctxt "@title:window"
msgid "PIM Import Tool"
msgstr "Εργαλείο εισαγωγής PIM"
@@ -54,12 +52,12 @@
#: importwizard.cpp:138
#, kde-format
msgid "Step 1: Select Filter"
-msgstr ""
+msgstr "Βήμα 1: Επιλογή φίλτρου"
#: importwizard.cpp:143
#, kde-format
msgid "Step 2: Importing..."
-msgstr ""
+msgstr "Βήμα 2: Εισαγωγή..."
#: importwizard.cpp:172
#, kde-format
@@ -108,10 +106,9 @@
msgstr "Εισαγωγή βιβλίου διευθύνσεων από %1..."
#: importwizard.cpp:226
-#, fuzzy, kde-format
-#| msgid "Import addressbook from %1..."
+#, kde-format
msgid "Import addressbook from %1: Done"
-msgstr "Εισαγωγή βιβλίου διευθύνσεων από %1..."
+msgstr "Εισαγωγή βιβλίου διευθύνσεων από %1: Έγινε"
#: importwizard.cpp:232
#, kde-format
@@ -119,10 +116,9 @@
msgstr "Εισαγωγή φίλτρων από %1..."
#: importwizard.cpp:235
-#, fuzzy, kde-format
-#| msgid "Import filters from %1..."
+#, kde-format
msgid "Import filters from %1: Done"
-msgstr "Εισαγωγή φίλτρων από %1..."
+msgstr "Εισαγωγή φίλτρων από %1: Έγινε"
#: importwizard.cpp:241
#, kde-format
@@ -130,10 +126,9 @@
msgstr "Εισαγωγή αλληλογραφίας από %1..."
#: importwizard.cpp:244
-#, fuzzy, kde-format
-#| msgid "Import mails from %1..."
+#, kde-format
msgid "Import mails from %1: Done"
-msgstr "Εισαγωγή αλληλογραφίας από %1..."
+msgstr "Εισαγωγή αλληλογραφίας από %1: Έγινε"
#: importwizard.cpp:250
#, kde-format
@@ -141,10 +136,9 @@
msgstr "Εισαγωγή ρυθμίσεων από %1..."
#: importwizard.cpp:253
-#, fuzzy, kde-format
-#| msgid "Import settings from %1..."
+#, kde-format
msgid "Import settings from %1: Done"
-msgstr "Εισαγωγή ρυθμίσεων από %1..."
+msgstr "Εισαγωγή ρυθμίσεων από %1: Έγινε"
#: importwizard.cpp:259
#, kde-format
@@ -152,10 +146,9 @@
msgstr "Εισαγωγή ημερολογίου από %1..."
#: importwizard.cpp:262
-#, fuzzy, kde-format
-#| msgid "Import calendar from %1..."
+#, kde-format
msgid "Import calendar from %1: Done"
-msgstr "Εισαγωγή ημερολογίου από %1..."
+msgstr "Εισαγωγή ημερολογίου από %1: Έγινε"
#: importwizard.cpp:351 plugins/balsa/balsaimportdata.cpp:61
#: plugins/claws-mail/clawsmailimportdata.cpp:62
@@ -185,8 +178,7 @@
msgstr "Δημιουργία νέας επαφής..."
#: libimportwizard/abstractaddressbook.cpp:49
-#, fuzzy, kde-format
-#| msgid "Select Address Book"
+#, kde-format
msgctxt "@title:window"
msgid "Select Address Book"
msgstr "Επιλογή βιβλίου διευθύνσεων"
@@ -202,10 +194,9 @@
msgstr "Δεν επιλέχθηκε βιβλίο διευθύνσεων."
#: libimportwizard/abstractaddressbook.cpp:82
-#, fuzzy, kde-format
-#| msgid "Import calendar from %1..."
+#, kde-format
msgid "Imported from \"%1\""
-msgstr "Εισαγωγή ημερολογίου από %1..."
+msgstr "Εισήχθη από «%1»"
#: libimportwizard/abstractaddressbook.cpp:101
#, kde-format
@@ -218,10 +209,9 @@
msgstr "Η δημιουργία της επαφής ολοκληρώθηκε"
#: libimportwizard/abstractimporter.cpp:80
-#, fuzzy, kde-format
-#| msgid "Import Filters"
+#, kde-format
msgid "Importing of filters from \"%1\" was canceled."
-msgstr "Εισαγωγή φίλτρων"
+msgstr "Η εισαγωγή των φίλτρων από το «%1» ακυρώθηκε."
#: libimportwizard/abstractimporter.cpp:82
#, kde-format
@@ -261,10 +251,9 @@
msgstr "Εργαλείο εισαγωγής PIM"
#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2013 importwizard authors"
+#, kde-format
msgid "Copyright © 2012-2020 ImportWizard authors"
-msgstr "Πνευματικά δικαιώματα © 2012-2013 οι συγγραφείς του importwizard"
+msgstr "Πνευματικά δικαιώματα © 2012-2020 οι συγγραφείς του importwizard"
#: main.cpp:54
#, kde-format
@@ -279,30 +268,28 @@
#: main.cpp:61
#, kde-format
msgid "Mode: %1"
-msgstr ""
+msgstr "Λειτουργία: %1"
#: manual/manualselectfilterpage.cpp:96
#, kde-format
msgid "<p><i>Written by %1.</i></p>"
-msgstr ""
+msgstr "<p><i>Γράφτηκε από %1.</i></p>"
#: plugins/balsa/balsaaddressbook.cpp:50 plugins/balsa/balsaaddressbook.cpp:63
#: plugins/sylpheed/sylpheedaddressbook.cpp:43
-#, fuzzy, kde-format
-#| msgid "Import addressbook"
+#, kde-format
msgid "No addressbook found"
-msgstr "Εισαγωγή βιβλίου διευθύνσεων"
+msgstr "Δε βρέθηκε βιβλίο διευθύνσεων"
#: plugins/balsa/balsaaddressbook.cpp:77
#, kde-format
msgid "Ldap created"
-msgstr ""
+msgstr "Δημιουργήθηκε ldap"
#: plugins/balsa/balsaaddressbook.cpp:107
-#, fuzzy, kde-format
-#| msgid "Import addressbook from %1..."
+#, kde-format
msgid "New addressbook created: %1"
-msgstr "Εισαγωγή βιβλίου διευθύνσεων από %1..."
+msgstr "Νέο βιβλίο διευθύνσεων δημιουργήθηκε: %1"
#: plugins/claws-mail/clawsmailimportdata.cpp:91
#, kde-format
@@ -349,16 +336,14 @@
msgstr "Δε βρέθηκε το ημερολόγιο του Evolution."
#: plugins/icedove/icedoveimportdata.cpp:84
-#, fuzzy, kde-format
-#| msgid "Sylpheed settings not found."
+#, kde-format
msgid "Icedove settings not found."
-msgstr "Δε βρέθηκαν οι ρυθμίσεις του Sylpheed."
+msgstr "Δε βρέθηκαν οι ρυθμίσεις του Icedove."
#: plugins/seamonkey/seamonkeyimportdata.cpp:84
-#, fuzzy, kde-format
-#| msgid "Sylpheed settings not found."
+#, kde-format
msgid "SeaMonkey settings not found."
-msgstr "Δε βρέθηκαν οι ρυθμίσεις του Sylpheed."
+msgstr "Δε βρέθηκαν οι ρυθμίσεις του SeaMonkey."
#: plugins/sylpheed/sylpheedaddressbook.cpp:78
#, kde-format
@@ -371,10 +356,9 @@
msgstr "Δε βρέθηκαν οι ρυθμίσεις του Sylpheed."
#: plugins/thunderbird/thunderbirdaddressbook.cpp:61
-#, fuzzy, kde-format
-#| msgid "Filters file was not found"
+#, kde-format
msgid "Contacts file '%1' not found"
-msgstr "Το αρχείο φίλτρων δε βρέθηκε"
+msgstr "Το αρχείο επαφών '%1' δε βρέθηκε"
#: plugins/thunderbird/thunderbirdimportdata.cpp:86
#, kde-format
@@ -478,8 +462,7 @@
#. i18n: ectx: property (text), widget (QLabel, label_2)
#: ui/autodetect/selectprogrampage.ui:86
-#, fuzzy, kde-format
-#| msgid "No program found"
+#, kde-format
msgid "No program found"
msgstr "Δεν βρέθηκε πρόγραμμα"
@@ -487,13 +470,13 @@
#: ui/autodetect/selectprogrampage.ui:112
#, kde-format
msgid "Manual Selection"
-msgstr ""
+msgstr "Χειροκίνητη επιλογή"
#. i18n: ectx: property (text), widget (QLabel, textLabel1_2)
#: ui/manual/manualimportmailpage.ui:96
#, kde-format
msgid "Click 'Back' to import more emails"
-msgstr ""
+msgstr "Με κλικ 'Πίσω' γίνεται εισαγωγή περισσότερων μηνυμάτων"
#. i18n: ectx: property (text), widget (QLabel, TextLabel6)
#: ui/manual/manualselectfilterpage.ui:103
@@ -515,12 +498,28 @@
"you would like to import from. Next, select the folder you would like to "
"import to, then click 'Next'.</span></p></body></html>"
msgstr ""
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/";
+"REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
+"p, li { white-space: pre-wrap; }\n"
+"</style></head><body style=\" font-family:'Sans Serif'; font-size:10pt; font-"
+"weight:400; font-style:normal;\">\n"
+"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
+"right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
+"family:'DejaVu Sans'; font-size:9pt; font-weight:600;\">Καλώς ήρθατε στο "
+"ImportWizard το εργαλείο εισαγωγής μηνυμάτων αλληλογραφίας</span><span style="
+"\" font-family:'DejaVu Sans'; font-size:9pt;\"> <br /><br />Αυτό το "
+"πρόγραμμα θα σας βοηθήσει να μεταφέρετε τα μηνύματά σας από προηγούμενη "
+"εφαρμογή αλληλογραφίας.<br /><br />Επιλέξτε το πρόγραμμα από το οποίο θέλετε "
+"να γίνει η εισαγωγή. Έπειτα, επιλέξτε το φάκελο στον οποίο θέλετε να γίνει η "
+"εισαγωγή και πιέστε 'Επόμενο'.</span></p></body></html>"
#. i18n: ectx: property (text), widget (QCheckBox, remDupMsg)
#: ui/manual/manualselectfilterpage.ui:146
#, kde-format
msgid "Remove &duplicate messages during import"
-msgstr ""
+msgstr "Να αφαιρεθούν τα &διπλά μηνύματα κατά την εισαγωγή"
#~ msgid "importwizard"
#~ msgstr "Οδηγός εισαγωγής"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/po/en_GB/akonadiimportwizard.po
new/akonadi-import-wizard-20.08.0/po/en_GB/akonadiimportwizard.po
--- old/akonadi-import-wizard-20.04.3/po/en_GB/akonadiimportwizard.po
2020-07-07 03:07:41.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/po/en_GB/akonadiimportwizard.po
2020-08-07 09:08:24.000000000 +0200
@@ -7,7 +7,7 @@
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-01-02 03:11+0100\n"
-"PO-Revision-Date: 2020-03-31 12:29+0100\n"
+"PO-Revision-Date: 2020-03-30 20:39+0100\n"
"Last-Translator: Steve Allewell <[email protected]>\n"
"Language-Team: British English <[email protected]>\n"
"Language: en_GB\n"
Binary files
old/akonadi-import-wizard-20.04.3/po/it/docs/importwizard/import-selection.png
and
new/akonadi-import-wizard-20.08.0/po/it/docs/importwizard/import-selection.png
differ
Binary files
old/akonadi-import-wizard-20.04.3/po/it/docs/importwizard/manual-import.png and
new/akonadi-import-wizard-20.08.0/po/it/docs/importwizard/manual-import.png
differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/po/sk/akonadiimportwizard.po
new/akonadi-import-wizard-20.08.0/po/sk/akonadiimportwizard.po
--- old/akonadi-import-wizard-20.04.3/po/sk/akonadiimportwizard.po
2020-07-07 03:07:42.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/po/sk/akonadiimportwizard.po
2020-08-07 09:08:25.000000000 +0200
@@ -1,19 +1,19 @@
# translation of importwizard.po to Slovak
-# Roman Paholik <[email protected]>, 2012, 2013, 2014, 2015, 2016, 2017,
2020.
+# Roman Paholik <[email protected]>, 2012, 2013, 2014, 2015, 2016, 2017.
# Matej Mrenica <[email protected]>, 2019.
msgid ""
msgstr ""
"Project-Id-Version: importwizard\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-01-02 03:11+0100\n"
-"PO-Revision-Date: 2020-06-01 12:47+0200\n"
-"Last-Translator: Roman Paholik <[email protected]>\n"
-"Language-Team: Slovak <[email protected]>\n"
+"PO-Revision-Date: 2019-07-17 16:14+0200\n"
+"Last-Translator: Matej Mrenica <[email protected]>\n"
+"Language-Team: Slovak <[email protected]>\n"
"Language: sk\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 19.12.3\n"
+"X-Generator: Lokalize 19.04.3\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
#, kde-format
@@ -32,7 +32,8 @@
msgstr "Nenájdený program."
#: importwizard.cpp:54
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "PIM Import Tool"
msgctxt "@title:window"
msgid "PIM Import Tool"
msgstr "Importovací nástroj PIM"
@@ -175,7 +176,8 @@
msgstr "Vytváram nový kontakt..."
#: libimportwizard/abstractaddressbook.cpp:49
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Select Address Book"
msgctxt "@title:window"
msgid "Select Address Book"
msgstr "Vybrať knihu adries"
@@ -249,9 +251,10 @@
msgstr "Importovací nástroj PIM"
#: main.cpp:52
-#, kde-format
+#, fuzzy, kde-format
+#| msgid "Copyright © 2012-2018 ImportWizard authors"
msgid "Copyright © 2012-2020 ImportWizard authors"
-msgstr "Copyright © 2012-2020 Autori ImportWizard"
+msgstr "Copyright © 2012-2018 Autori ImportWizard"
#: main.cpp:54
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/po/sl/akonadiimportwizard.po
new/akonadi-import-wizard-20.08.0/po/sl/akonadiimportwizard.po
--- old/akonadi-import-wizard-20.04.3/po/sl/akonadiimportwizard.po
2020-07-07 03:07:42.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/po/sl/akonadiimportwizard.po
2020-08-07 09:08:25.000000000 +0200
@@ -4,33 +4,35 @@
# Andrej Vernekar <[email protected]>, 2012.
# Jure Repinc <[email protected]>, 2012, 2013.
# Andrej Mernik <[email protected]>, 2014, 2015, 2016, 2017, 2018.
+# Matjaž Jeran <[email protected]>, 2020.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-01-02 03:11+0100\n"
-"PO-Revision-Date: 2018-01-16 17:27+0100\n"
-"Last-Translator: Andrej Mernik <[email protected]>\n"
+"PO-Revision-Date: 2020-02-23 23:34+0100\n"
+"Last-Translator: Matjaž Jeran <[email protected]>\n"
"Language-Team: Slovenian <[email protected]>\n"
"Language: sl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Translator: Andrej Mernik <[email protected]>\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
"%100==4 ? 3 : 0);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Poedit 2.3\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
-msgstr "Jure Repinc,Andrej Vernekar,Miha Merkun,Andrej Mernik"
+msgstr "Jure Repinc,Andrej Vernekar,Miha Merkun,Andrej Mernik,Matjaž Jeran"
#, kde-format
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
msgstr ""
"[email protected],[email protected],[email protected],"
-"[email protected]"
+"[email protected],[email protected]"
#: autodetect/widgets/selectprogramlistwidget.cpp:62
#, kde-format
@@ -38,8 +40,7 @@
msgstr "Najden ni bil noben program."
#: importwizard.cpp:54
-#, fuzzy, kde-format
-#| msgid "PIM Import Tool"
+#, kde-format
msgctxt "@title:window"
msgid "PIM Import Tool"
msgstr "Orodje za uvoz osebnih podatkov"
@@ -92,7 +93,7 @@
#: importwizard.cpp:193
#, kde-format
msgid "Import addressbooks"
-msgstr "Uvozi imenike"
+msgstr "Uvozi adresarje"
#: importwizard.cpp:197
#, kde-format
@@ -107,12 +108,12 @@
#: importwizard.cpp:223
#, kde-format
msgid "Import addressbook from %1..."
-msgstr "Uvozi imenik iz %1 ..."
+msgstr "Uvozi adresar iz %1 ..."
#: importwizard.cpp:226
#, kde-format
msgid "Import addressbook from %1: Done"
-msgstr "Uvozi imenik iz %1: končano"
+msgstr "Uvozi adresar iz %1: Končano"
#: importwizard.cpp:232
#, kde-format
@@ -182,26 +183,25 @@
msgstr "Ustvarjanje novega stika ..."
#: libimportwizard/abstractaddressbook.cpp:49
-#, fuzzy, kde-format
-#| msgid "Select Address Book"
+#, kde-format
msgctxt "@title:window"
msgid "Select Address Book"
-msgstr "Izberite imenik"
+msgstr "Izberite adresar"
#: libimportwizard/abstractaddressbook.cpp:50
#, kde-format
msgid "Select the address book the new contact shall be saved in:"
-msgstr "Izberite imenik, v katerega naj se shrani nov stik:"
+msgstr "Izberite adresar, v katerega naj se shrani nov stik:"
#: libimportwizard/abstractaddressbook.cpp:55
#, kde-format
msgid "Address Book was not selected."
-msgstr "Niste izbrali imenika."
+msgstr "Niste izbrali adresarja."
#: libimportwizard/abstractaddressbook.cpp:82
#, kde-format
msgid "Imported from \"%1\""
-msgstr "Uvoženo iz »%1«"
+msgstr "Uvoženo iz \"%1\""
#: libimportwizard/abstractaddressbook.cpp:101
#, kde-format
@@ -216,16 +216,16 @@
#: libimportwizard/abstractimporter.cpp:80
#, kde-format
msgid "Importing of filters from \"%1\" was canceled."
-msgstr "Uvažanje filtrov iz »%1« je bilo preklicano."
+msgstr "Uvažanje filtrov iz \"%1\" je bilo preklicano."
#: libimportwizard/abstractimporter.cpp:82
#, kde-format
msgid "1 filter was imported from \"%2\""
msgid_plural "%1 filters were imported from \"%2\""
-msgstr[0] "Iz »%2« je bilo uvoženih %1 filtrov"
-msgstr[1] "Iz »%2« je bil uvožen %1 filter"
-msgstr[2] "Iz »%2« sta bila uvožena %1 filtra"
-msgstr[3] "Iz »%2« so bili uvoženi %1 filtri"
+msgstr[0] "Iz \"%2\" je bilo uvožen %1 filter"
+msgstr[1] "Iz \"%2\" sta bila uvožena %1 filtra"
+msgstr[2] "Iz \"%2\" so bili uvoženi %1 filtri"
+msgstr[3] "Iz \"%2\" je bilo uvoženih %1 filtrov"
#: libimportwizard/abstractimporter.cpp:86
#, kde-format
@@ -258,10 +258,9 @@
msgstr "Orodje za uvoz osebnih podatkov"
#: main.cpp:52
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2018 ImportWizard authors"
+#, kde-format
msgid "Copyright © 2012-2020 ImportWizard authors"
-msgstr "Avtorske pravice © 2012-2018 avtorji ImportWizard-a"
+msgstr "Avtorske pravice © 2012-2020 avtorji ImportWizard-a"
#: main.cpp:54
#, kde-format
@@ -287,7 +286,7 @@
#: plugins/sylpheed/sylpheedaddressbook.cpp:43
#, kde-format
msgid "No addressbook found"
-msgstr "Imenik ni bil najden"
+msgstr "Noben adresar ni bil najden"
#: plugins/balsa/balsaaddressbook.cpp:77
#, kde-format
@@ -297,7 +296,7 @@
#: plugins/balsa/balsaaddressbook.cpp:107
#, kde-format
msgid "New addressbook created: %1"
-msgstr "Nov imenik je ustvarjen: %1"
+msgstr "Nov adresar je ustvarjen: %1"
#: plugins/claws-mail/clawsmailimportdata.cpp:91
#, kde-format
@@ -310,13 +309,13 @@
"Evolution address book will be exported as vCard. Import vCard in "
"KAddressBook."
msgstr ""
-"Imenik programa Evolution bo izvožen kot vCard, ki ga nato uvozite v program "
-"KAddressBook."
+"Adresar programa Evolution bo izvožen kot vCard, ki ga nato uvozite v "
+"program KAddressBook."
#: plugins/evolutionv3/evolutionaddressbook.cpp:38
#, kde-format
msgid "Export Evolution Address Book"
-msgstr "Izvozi imenik Evolution"
+msgstr "Izvozi adresar Evolution"
#: plugins/evolutionv3/evolutionaddressbook.cpp:40
#, kde-format
@@ -326,12 +325,12 @@
#: plugins/evolutionv3/evolutionaddressbook.cpp:93
#, kde-format
msgid "Address book \"%1\" exported."
-msgstr "Imenik »%1« je bil izvožen."
+msgstr "Adresar \"%1\" je bil izvožen."
#: plugins/evolutionv3/evolutionaddressbook.cpp:95
#, kde-format
msgid "Failed to export address book \"%1\"."
-msgstr "Izvoz imenika »%1« ni uspel."
+msgstr "Izvoz adresarja \"%1\" ni uspel."
#: plugins/evolutionv3/evolutionv3importdata.cpp:72
#, kde-format
@@ -377,7 +376,7 @@
#: ui/autodetect/importaddressbookpage.ui:47
#, kde-format
msgid "Import addressbook"
-msgstr "Uvozi imenik"
+msgstr "Uvozi adresar"
#. i18n: ectx: property (text), widget (QPushButton, importCalendar)
#: ui/autodetect/importcalendarpage.ui:47
@@ -431,7 +430,7 @@
#: ui/autodetect/selectcomponentpage.ui:79
#, kde-format
msgid "Address Books"
-msgstr "Imeniki"
+msgstr "Adresarji"
#. i18n: ectx: property (text), widget (QCheckBox, calendars)
#: ui/autodetect/selectcomponentpage.ui:89
@@ -446,8 +445,8 @@
"This wizard will import mail messages, addressbook entries, filters and/or "
"settings from other mail programs into KMail"
msgstr ""
-"Ta čarovnik bo v KMail uvozil e-poštna sporočila, vnose iz imenikov, filtre "
-"in/ali nastavitve iz drugih poštnih programov"
+"Ta čarovnik bo v KMail uvozil e-poštna sporočila, vnose iz adresarjev, "
+"filtre in/ali nastavitve iz drugih poštnih programov"
#. i18n: ectx: property (text), widget (QLabel, label)
#: ui/autodetect/selectcomponentpage.ui:136
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/po/zh_CN/akonadiimportwizard.po
new/akonadi-import-wizard-20.08.0/po/zh_CN/akonadiimportwizard.po
--- old/akonadi-import-wizard-20.04.3/po/zh_CN/akonadiimportwizard.po
2020-07-07 03:07:42.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/po/zh_CN/akonadiimportwizard.po
2020-08-07 09:08:25.000000000 +0200
@@ -3,7 +3,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-01-02 03:11+0100\n"
-"PO-Revision-Date: 2020-06-24 08:01\n"
+"PO-Revision-Date: 2020-07-31 15:02\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-import-wizard-20.04.3/src/CMakeLists.txt
new/akonadi-import-wizard-20.08.0/src/CMakeLists.txt
--- old/akonadi-import-wizard-20.04.3/src/CMakeLists.txt 2020-06-18
08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/CMakeLists.txt 2020-08-06
09:21:16.000000000 +0200
@@ -70,7 +70,6 @@
KF5::MailImporterAkonadi
KF5::PimCommon
KF5::MailCommon
- KF5::Libkdepim
KF5::I18n
KF5::CoreAddons
KF5::Crash
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/autodetect/importfilterinfogui.cpp
new/akonadi-import-wizard-20.08.0/src/autodetect/importfilterinfogui.cpp
--- old/akonadi-import-wizard-20.04.3/src/autodetect/importfilterinfogui.cpp
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/autodetect/importfilterinfogui.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -20,7 +20,7 @@
#include "importfilterinfogui.h"
#include "importmailpage.h"
-#include "mailimporter/importmailswidget.h"
+#include <MailImporter/ImportMailsWidget>
#include <KMessageBox>
#include <QApplication>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/data/org.kde.akonadiimportwizard.desktop
new/akonadi-import-wizard-20.08.0/src/data/org.kde.akonadiimportwizard.desktop
---
old/akonadi-import-wizard-20.04.3/src/data/org.kde.akonadiimportwizard.desktop
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/data/org.kde.akonadiimportwizard.desktop
2020-08-06 09:21:16.000000000 +0200
@@ -48,8 +48,8 @@
Comment=Launch the import wizard to migrate data from mailer as
thunderbird/evolution etc.
Comment[ar]=أطلِق مرشد الاستيراد لنقل البيانات من عميل بريد مثل «ثَندربيرد» أو
«إڤلوشن» أو غيرها.
Comment[bs]=Pokrenite i uvedite čarobnjaka za pomjeranje podataka iz mailera
kao thunderbird/evolution etc.
-Comment[ca]=Llança l'assistent d'importació per migrar les dades dels agents
de correus com el Thunderbird/Evolution, etc.
-Comment[ca@valencia]=Llança l'assistent d'importació per migrar les dades dels
agents de correus com el Thunderbird/Evolution, etc.
+Comment[ca]=Llança l'assistent d'importació per a migrar les dades dels agents
de correus com el Thunderbird/Evolution, etc.
+Comment[ca@valencia]=Llança l'assistent d'importació per a migrar les dades
dels agents de correus com el Thunderbird/Evolution, etc.
Comment[da]=Kør importguiden for at migrere data fra e-mail-programmer såsom
Thunderbird, Evolution osv.
Comment[de]=Starten Sie den Import-Assistenten für den Import aus
E-Mail-Programmen wie Thunderbird, Evolution usw.
Comment[el]=Εκτελέστε τον οδηγό εισαγωγής για να μεταφέρετε δεδομένα από
πελάτες αλληλογραφίας όπως το thunderbird, evolution κλπ.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-import-wizard-20.04.3/src/importwizard.cpp
new/akonadi-import-wizard-20.08.0/src/importwizard.cpp
--- old/akonadi-import-wizard-20.04.3/src/importwizard.cpp 2020-06-18
08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/importwizard.cpp 2020-08-06
09:21:16.000000000 +0200
@@ -33,7 +33,7 @@
#include "manual/manualselectfilterpage.h"
#include "manual/importwizardfilterinfogui.h"
-#include "mailimporter/filterinfo.h"
+#include <MailImporter/FilterInfo>
#include <MailImporterAkonadi/FilterImporterAkonadi>
#include <KAboutData>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/libimportwizard/abstractbase.cpp
new/akonadi-import-wizard-20.08.0/src/libimportwizard/abstractbase.cpp
--- old/akonadi-import-wizard-20.04.3/src/libimportwizard/abstractbase.cpp
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/libimportwizard/abstractbase.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -18,7 +18,7 @@
*/
#include "abstractbase.h"
-#include "PimCommonAkonadi/CreateResource"
+#include <PimCommonAkonadi/CreateResource>
#include <KSharedConfig>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/libimportwizard/abstractimporter.cpp
new/akonadi-import-wizard-20.08.0/src/libimportwizard/abstractimporter.cpp
--- old/akonadi-import-wizard-20.04.3/src/libimportwizard/abstractimporter.cpp
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/libimportwizard/abstractimporter.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -20,8 +20,8 @@
#include "abstractimporter.h"
#include "abstractdisplayinfo.h"
-#include "mailimporter/filterinfo.h"
-#include "MailCommon/FilterManager"
+#include <MailImporter/FilterInfo>
+#include <MailCommon/FilterManager>
#include <MailImporterAkonadi/FilterImporterAkonadi>
#include <QFileInfo>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/libimportwizard/abstractsettings.cpp
new/akonadi-import-wizard-20.08.0/src/libimportwizard/abstractsettings.cpp
--- old/akonadi-import-wizard-20.04.3/src/libimportwizard/abstractsettings.cpp
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/libimportwizard/abstractsettings.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -21,7 +21,7 @@
#include <KIdentityManagement/kidentitymanagement/identitymanager.h>
#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <mailtransport/transportmanager.h>
+#include <MailTransport/TransportManager>
#include <KLocalizedString>
#include <KSharedConfig>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/balsa/balsaimportdata.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/balsa/balsaimportdata.cpp
--- old/akonadi-import-wizard-20.04.3/src/plugins/balsa/balsaimportdata.cpp
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/plugins/balsa/balsaimportdata.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -20,9 +20,9 @@
#include "balsaimportdata.h"
#include "balsasettings.h"
#include "balsaaddressbook.h"
-#include "mailimporter/filterbalsa.h"
-#include "mailimporter/filterinfo.h"
-#include "MailCommon/FilterImporterBalsa"
+#include <MailImporter/FilterBalsa>
+#include <MailImporter/FilterInfo>
+#include <MailCommon/FilterImporterBalsa>
#include <KLocalizedString>
#include <KPluginFactory>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/balsa/balsaimporter.json
new/akonadi-import-wizard-20.08.0/src/plugins/balsa/balsaimporter.json
--- old/akonadi-import-wizard-20.04.3/src/plugins/balsa/balsaimporter.json
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/plugins/balsa/balsaimporter.json
2020-08-06 09:21:16.000000000 +0200
@@ -6,7 +6,9 @@
"Name[ca@valencia]": "Importador del Balsa",
"Name[ca]": "Importador del Balsa",
"Name[cs]": "Importér Balsa",
+ "Name[da]": "Balsa-importør",
"Name[de]": "Import-Modul für Balsa",
+ "Name[el]": "Εισαγωγέας Balsa",
"Name[en_GB]": "Balsa Importer",
"Name[es]": "Importador Balsa",
"Name[et]": "Balsa importija",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/balsa/balsasettings.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/balsa/balsasettings.cpp
--- old/akonadi-import-wizard-20.04.3/src/plugins/balsa/balsasettings.cpp
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/plugins/balsa/balsasettings.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -19,9 +19,9 @@
#include "balsasettings.h"
#include "balsaplugin_debug.h"
-#include <mailtransport/transportmanager.h>
-#include "MailCommon/MailUtil"
-#include "messageviewer/kxface.h"
+#include <MailTransport/TransportManager>
+#include <MailCommon/MailUtil>
+#include <MessageViewer/KXFace>
#include <KIdentityManagement/kidentitymanagement/identity.h>
#include <KIdentityManagement/kidentitymanagement/signature.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/claws-mail/clawsmailimportdata.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/claws-mail/clawsmailimportdata.cpp
---
old/akonadi-import-wizard-20.04.3/src/plugins/claws-mail/clawsmailimportdata.cpp
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/claws-mail/clawsmailimportdata.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -20,9 +20,9 @@
#include "clawsmailimportdata.h"
#include "clawsmailsettings.h"
#include "clawsmailaddressbook.h"
-#include "mailimporter/filterclawsmail.h"
-#include "MailCommon/FilterImporterClawsMail"
-#include "mailimporter/filterinfo.h"
+#include <MailImporter/FilterClawsMail>
+#include <MailCommon/FilterImporterClawsMail>
+#include <MailImporter/FilterInfo>
#include <KPluginFactory>
#include <KLocalizedString>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/claws-mail/clawsmailimporter.json
new/akonadi-import-wizard-20.08.0/src/plugins/claws-mail/clawsmailimporter.json
---
old/akonadi-import-wizard-20.04.3/src/plugins/claws-mail/clawsmailimporter.json
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/claws-mail/clawsmailimporter.json
2020-08-06 09:21:16.000000000 +0200
@@ -6,7 +6,9 @@
"Name[ca@valencia]": "Importador del ClawsMail",
"Name[ca]": "Importador del ClawsMail",
"Name[cs]": "Importér ClawsMail",
+ "Name[da]": "ClawsMail-importør",
"Name[de]": "Import-Modul für ClawsMail",
+ "Name[el]": "Εισαγωγέας ClawsMail",
"Name[en_GB]": "ClawsMail Importer",
"Name[es]": "Importador ClawsMail",
"Name[et]": "ClawsMaili importija",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/claws-mail/clawsmailsettings.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/claws-mail/clawsmailsettings.cpp
---
old/akonadi-import-wizard-20.04.3/src/plugins/claws-mail/clawsmailsettings.cpp
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/claws-mail/clawsmailsettings.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -20,8 +20,8 @@
#include "clawsmailsettings.h"
#include <ImportWizard/ImportWizardUtil>
-#include <mailtransport/transportmanager.h>
-#include "MailCommon/MailUtil"
+#include <MailTransport/TransportManager>
+#include <MailCommon/MailUtil>
#include <KIdentityManagement/kidentitymanagement/identity.h>
#include <KIdentityManagement/kidentitymanagement/signature.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/evolutionv3/evolutionsettings.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/evolutionv3/evolutionsettings.cpp
---
old/akonadi-import-wizard-20.04.3/src/plugins/evolutionv3/evolutionsettings.cpp
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/evolutionv3/evolutionsettings.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -19,12 +19,12 @@
#include "evolutionsettings.h"
#include "evolutionutil.h"
-#include "MailCommon/MailUtil"
+#include <MailCommon/MailUtil>
#include <ImportWizard/ImportWizardUtil>
#include <KIdentityManagement/kidentitymanagement/identity.h>
-#include <mailtransport/transportmanager.h>
+#include <MailTransport/TransportManager>
#include "evolutionv3plugin_debug.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/evolutionv3/evolutionv3importdata.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/evolutionv3/evolutionv3importdata.cpp
---
old/akonadi-import-wizard-20.04.3/src/plugins/evolutionv3/evolutionv3importdata.cpp
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/evolutionv3/evolutionv3importdata.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -21,10 +21,10 @@
#include "evolutionsettings.h"
#include "evolutioncalendar.h"
#include "evolutionaddressbook.h"
-#include "mailimporter/filterevolution_v3.h"
-#include "mailimporter/filterinfo.h"
+#include <MailImporter/FilterEvolution_v3>
+#include <MailImporter/FilterInfo>
-#include "MailCommon/FilterImporterExporter"
+#include <MailCommon/FilterImporterExporter>
#include <KPluginFactory>
#include <KLocalizedString>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/evolutionv3/evolutionv3importer.json
new/akonadi-import-wizard-20.08.0/src/plugins/evolutionv3/evolutionv3importer.json
---
old/akonadi-import-wizard-20.04.3/src/plugins/evolutionv3/evolutionv3importer.json
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/evolutionv3/evolutionv3importer.json
2020-08-06 09:21:16.000000000 +0200
@@ -6,7 +6,9 @@
"Name[ca@valencia]": "Importador de l'Evolution3",
"Name[ca]": "Importador de l'Evolution3",
"Name[cs]": "Importér Evolution3",
+ "Name[da]": "Evolution3-importør",
"Name[de]": "Import-Modul für Evolution 3",
+ "Name[el]": "Εισαγωγέας Evolution3",
"Name[en_GB]": "Evolution3 Importer",
"Name[es]": "Importador Evolution3",
"Name[et]": "Evolution3 importija",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/icedove/icedoveimportdata.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/icedove/icedoveimportdata.cpp
--- old/akonadi-import-wizard-20.04.3/src/plugins/icedove/icedoveimportdata.cpp
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/plugins/icedove/icedoveimportdata.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -23,9 +23,9 @@
#include "../thunderbird/thunderbirdsettings.h"
#include "../thunderbird/thunderbirdaddressbook.h"
-#include "mailimporter/filtericedove.h"
-#include "mailimporter/filterinfo.h"
-#include "MailCommon/FilterImporterExporter"
+#include <MailImporter/FilterIcedove>
+#include <MailImporter/FilterInfo>
+#include <MailCommon/FilterImporterExporter>
#include <KLocalizedString>
#include <KPluginFactory>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/icedove/icedoveimporter.json
new/akonadi-import-wizard-20.08.0/src/plugins/icedove/icedoveimporter.json
--- old/akonadi-import-wizard-20.04.3/src/plugins/icedove/icedoveimporter.json
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/plugins/icedove/icedoveimporter.json
2020-08-06 09:21:16.000000000 +0200
@@ -6,7 +6,9 @@
"Name[ca@valencia]": "Importador de l'Icedove",
"Name[ca]": "Importador de l'Icedove",
"Name[cs]": "Importér Icedove",
+ "Name[da]": "Icedove-importør",
"Name[de]": "Import-Modul für Icedove",
+ "Name[el]": "Εισαγωγέας Icedove",
"Name[en_GB]": "Icedove Importer",
"Name[es]": "Importador Icedove",
"Name[et]": "Icedove'i importija",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/seamonkey/seamonkeyimportdata.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/seamonkey/seamonkeyimportdata.cpp
---
old/akonadi-import-wizard-20.04.3/src/plugins/seamonkey/seamonkeyimportdata.cpp
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/seamonkey/seamonkeyimportdata.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -23,9 +23,9 @@
#include "../thunderbird/thunderbirdsettings.h"
#include "../thunderbird/thunderbirdaddressbook.h"
-#include "mailimporter/filterseamonkey.h"
-#include "mailimporter/filterinfo.h"
-#include "MailCommon/FilterImporterExporter"
+#include <MailImporter/FilterSeaMonkey>
+#include <MailImporter/FilterInfo>
+#include <MailCommon/FilterImporterExporter>
#include <KLocalizedString>
#include <KPluginFactory>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/seamonkey/seamonkeyimporter.json
new/akonadi-import-wizard-20.08.0/src/plugins/seamonkey/seamonkeyimporter.json
---
old/akonadi-import-wizard-20.04.3/src/plugins/seamonkey/seamonkeyimporter.json
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/seamonkey/seamonkeyimporter.json
2020-08-06 09:21:16.000000000 +0200
@@ -6,7 +6,9 @@
"Name[ca@valencia]": "Importador del SeaMonkey",
"Name[ca]": "Importador del SeaMonkey",
"Name[cs]": "Importér SeaMonkey",
+ "Name[da]": "SeaMonkey-importør",
"Name[de]": "Import-Modul für SeaMonkey",
+ "Name[el]": "Εισαγωγέας SeaMonkey",
"Name[en_GB]": "SeaMonkey Importer",
"Name[es]": "Importador SeaMonkey",
"Name[et]": "SeaMonkey importija",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/sylpheed/sylpheedimportdata.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/sylpheed/sylpheedimportdata.cpp
---
old/akonadi-import-wizard-20.04.3/src/plugins/sylpheed/sylpheedimportdata.cpp
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/sylpheed/sylpheedimportdata.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -18,10 +18,10 @@
*/
#include "sylpheedimportdata.h"
-#include "mailimporter/filtersylpheed.h"
-#include "mailimporter/filterinfo.h"
+#include <MailImporter/FilterSylpheed>
+#include <MailImporter/FilterInfo>
-#include "MailCommon/FilterImporterExporter"
+#include <MailCommon/FilterImporterExporter>
#include "sylpheedsettings.h"
#include "sylpheedaddressbook.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/sylpheed/sylpheedimporter.json
new/akonadi-import-wizard-20.08.0/src/plugins/sylpheed/sylpheedimporter.json
---
old/akonadi-import-wizard-20.04.3/src/plugins/sylpheed/sylpheedimporter.json
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/sylpheed/sylpheedimporter.json
2020-08-06 09:21:16.000000000 +0200
@@ -6,7 +6,9 @@
"Name[ca@valencia]": "Importador del Sylpheed",
"Name[ca]": "Importador del Sylpheed",
"Name[cs]": "Importér Sylpheed",
+ "Name[da]": "Sylpheed-importør",
"Name[de]": "Import-Modul für Sylpheed",
+ "Name[el]": "Εισαγωγέας Sylpheed",
"Name[en_GB]": "Sylpheed Importer",
"Name[es]": "Importador Sylpheed",
"Name[et]": "Sylpheedi importija",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/sylpheed/sylpheedsettings.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/sylpheed/sylpheedsettings.cpp
--- old/akonadi-import-wizard-20.04.3/src/plugins/sylpheed/sylpheedsettings.cpp
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/plugins/sylpheed/sylpheedsettings.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -19,8 +19,8 @@
#include "sylpheedsettings.h"
#include "sylpheedsettingsutils.h"
-#include <mailtransport/transportmanager.h>
-#include "MailCommon/MailUtil"
+#include <MailTransport/TransportManager>
+#include <MailCommon/MailUtil>
#include <QFileInfo>
#include <KIdentityManagement/kidentitymanagement/identity.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/thunderbird/addressbook/MorkParser.h
new/akonadi-import-wizard-20.08.0/src/plugins/thunderbird/addressbook/MorkParser.h
---
old/akonadi-import-wizard-20.04.3/src/plugins/thunderbird/addressbook/MorkParser.h
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/thunderbird/addressbook/MorkParser.h
2020-08-06 09:21:16.000000000 +0200
@@ -11,8 +11,8 @@
///
///////////////////////////////////////////////////////////////////
-#ifndef __MorkParser_h__
-#define __MorkParser_h__
+#ifndef MorkParser_h
+#define MorkParser_h
#include <QMap>
#include <QByteArray>
@@ -136,4 +136,4 @@
} nowParsing_;
};
-#endif // __MorkParser_h__
+#endif // MorkParser_h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/thunderbird/thunderbirdimportdata.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/thunderbird/thunderbirdimportdata.cpp
---
old/akonadi-import-wizard-20.04.3/src/plugins/thunderbird/thunderbirdimportdata.cpp
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/thunderbird/thunderbirdimportdata.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -23,9 +23,9 @@
#include "thunderbirdaddressbook.h"
#include "abstractdisplayinfo.h"
-#include "mailimporter/filterthunderbird.h"
-#include "mailimporter/filterinfo.h"
-#include "MailCommon/FilterImporterExporter"
+#include <MailImporter/FilterThunderbird>
+#include <MailImporter/FilterInfo>
+#include <MailCommon/FilterImporterExporter>
#include <KLocalizedString>
#include <KPluginFactory>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/thunderbird/thunderbirdimporter.json
new/akonadi-import-wizard-20.08.0/src/plugins/thunderbird/thunderbirdimporter.json
---
old/akonadi-import-wizard-20.04.3/src/plugins/thunderbird/thunderbirdimporter.json
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/thunderbird/thunderbirdimporter.json
2020-08-06 09:21:16.000000000 +0200
@@ -6,7 +6,9 @@
"Name[ca@valencia]": "Importador del Thunderbird",
"Name[ca]": "Importador del Thunderbird",
"Name[cs]": "Importér Thunderbird",
+ "Name[da]": "Thunderbird-importør",
"Name[de]": "Import-Modul für Thunderbird",
+ "Name[el]": "Εισαγωγέας Thunderbird",
"Name[en_GB]": "Thunderbird Importer",
"Name[es]": "Importador Thunderbird",
"Name[et]": "Thunderbirdi importija",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/thunderbird/thunderbirdsettings.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/thunderbird/thunderbirdsettings.cpp
---
old/akonadi-import-wizard-20.04.3/src/plugins/thunderbird/thunderbirdsettings.cpp
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/plugins/thunderbird/thunderbirdsettings.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -18,8 +18,8 @@
*/
#include "thunderbirdsettings.h"
-#include <mailtransport/transportmanager.h>
-#include "MailCommon/MailUtil"
+#include <MailTransport/TransportManager>
+#include <MailCommon/MailUtil>
#include <ImportWizard/ImportWizardUtil>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/trojita/trojitaimportdata.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/trojita/trojitaimportdata.cpp
--- old/akonadi-import-wizard-20.04.3/src/plugins/trojita/trojitaimportdata.cpp
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/plugins/trojita/trojitaimportdata.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -20,8 +20,8 @@
#include "trojitaimportdata.h"
#include "trojitasettings.h"
#include "trojitaaddressbook.h"
-#include "mailimporter/filterinfo.h"
-#include "mailimporter/othermailerutil.h"
+#include <MailImporter/FilterInfo>
+#include <MailImporter/OtherMailerUtil>
#include <KPluginFactory>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/trojita/trojitaimporter.json
new/akonadi-import-wizard-20.08.0/src/plugins/trojita/trojitaimporter.json
--- old/akonadi-import-wizard-20.04.3/src/plugins/trojita/trojitaimporter.json
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/plugins/trojita/trojitaimporter.json
2020-08-06 09:21:16.000000000 +0200
@@ -6,7 +6,9 @@
"Name[ca@valencia]": "Importador del Trojita",
"Name[ca]": "Importador del Trojita",
"Name[cs]": "Importér Trojitá",
+ "Name[da]": "Trojita-importør",
"Name[de]": "Import-Modul für Trojita",
+ "Name[el]": "Εισαγωγέας Trojita",
"Name[en_GB]": "Trojita Importer",
"Name[es]": "Importador Trojita",
"Name[et]": "Trojita importija",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/plugins/trojita/trojitasettings.cpp
new/akonadi-import-wizard-20.08.0/src/plugins/trojita/trojitasettings.cpp
--- old/akonadi-import-wizard-20.04.3/src/plugins/trojita/trojitasettings.cpp
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/plugins/trojita/trojitasettings.cpp
2020-08-06 09:21:16.000000000 +0200
@@ -20,7 +20,7 @@
#include "trojitasettings.h"
#include <ImportWizard/ImportWizardUtil>
-#include <mailtransport/transportmanager.h>
+#include <MailTransport/TransportManager>
#include <KIdentityManagement/kidentitymanagement/identity.h>
#include <KIdentityManagement/kidentitymanagement/signature.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/ui/autodetect/importaddressbookpage.ui
new/akonadi-import-wizard-20.08.0/src/ui/autodetect/importaddressbookpage.ui
---
old/akonadi-import-wizard-20.04.3/src/ui/autodetect/importaddressbookpage.ui
2020-06-18 08:29:32.000000000 +0200
+++
new/akonadi-import-wizard-20.08.0/src/ui/autodetect/importaddressbookpage.ui
2020-08-06 09:21:16.000000000 +0200
@@ -24,7 +24,7 @@
<number>0</number>
</property>
<item>
- <widget class="KPIM::CustomLogWidget" name="logAddressbook" native="true"/>
+ <widget class="PimCommon::CustomLogWidget" name="logAddressbook"
native="true"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
@@ -54,9 +54,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>KPIM::CustomLogWidget</class>
+ <class>PimCommon::CustomLogWidget</class>
<extends>QWidget</extends>
- <header location="global">Libkdepim/CustomLogWidget</header>
+ <header location="global">PimCommon/CustomLogWidget</header>
<container>1</container>
</customwidget>
</customwidgets>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/ui/autodetect/importcalendarpage.ui
new/akonadi-import-wizard-20.08.0/src/ui/autodetect/importcalendarpage.ui
--- old/akonadi-import-wizard-20.04.3/src/ui/autodetect/importcalendarpage.ui
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/ui/autodetect/importcalendarpage.ui
2020-08-06 09:21:16.000000000 +0200
@@ -24,7 +24,7 @@
<number>0</number>
</property>
<item>
- <widget class="KPIM::CustomLogWidget" name="logCalendar" native="true"/>
+ <widget class="PimCommon::CustomLogWidget" name="logCalendar"
native="true"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
@@ -54,9 +54,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>KPIM::CustomLogWidget</class>
+ <class>PimCommon::CustomLogWidget</class>
<extends>QWidget</extends>
- <header location="global">Libkdepim/CustomLogWidget</header>
+ <header location="global">PimCommon/CustomLogWidget</header>
<container>1</container>
</customwidget>
</customwidgets>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/ui/autodetect/importfilterpage.ui
new/akonadi-import-wizard-20.08.0/src/ui/autodetect/importfilterpage.ui
--- old/akonadi-import-wizard-20.04.3/src/ui/autodetect/importfilterpage.ui
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/ui/autodetect/importfilterpage.ui
2020-08-06 09:21:16.000000000 +0200
@@ -24,7 +24,7 @@
<number>0</number>
</property>
<item>
- <widget class="KPIM::CustomLogWidget" name="logFilters" native="true"/>
+ <widget class="PimCommon::CustomLogWidget" name="logFilters"
native="true"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
@@ -54,9 +54,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>KPIM::CustomLogWidget</class>
+ <class>PimCommon::CustomLogWidget</class>
<extends>QWidget</extends>
- <header location="global">Libkdepim/CustomLogWidget</header>
+ <header location="global">PimCommon/CustomLogWidget</header>
<container>1</container>
</customwidget>
</customwidgets>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/ui/autodetect/importfinishpage.ui
new/akonadi-import-wizard-20.08.0/src/ui/autodetect/importfinishpage.ui
--- old/akonadi-import-wizard-20.04.3/src/ui/autodetect/importfinishpage.ui
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/ui/autodetect/importfinishpage.ui
2020-08-06 09:21:16.000000000 +0200
@@ -31,15 +31,15 @@
</widget>
</item>
<item>
- <widget class="KPIM::CustomLogWidget" name="logFinish" native="true"/>
+ <widget class="PimCommon::CustomLogWidget" name="logFinish" native="true"/>
</item>
</layout>
</widget>
<customwidgets>
<customwidget>
- <class>KPIM::CustomLogWidget</class>
+ <class>PimCommon::CustomLogWidget</class>
<extends>QWidget</extends>
- <header location="global">Libkdepim/CustomLogWidget</header>
+ <header location="global">PimCommon/CustomLogWidget</header>
<container>1</container>
</customwidget>
</customwidgets>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-import-wizard-20.04.3/src/ui/autodetect/importsettingpage.ui
new/akonadi-import-wizard-20.08.0/src/ui/autodetect/importsettingpage.ui
--- old/akonadi-import-wizard-20.04.3/src/ui/autodetect/importsettingpage.ui
2020-06-18 08:29:32.000000000 +0200
+++ new/akonadi-import-wizard-20.08.0/src/ui/autodetect/importsettingpage.ui
2020-08-06 09:21:16.000000000 +0200
@@ -24,7 +24,7 @@
<number>0</number>
</property>
<item>
- <widget class="KPIM::CustomLogWidget" name="logSettings" native="true"/>
+ <widget class="PimCommon::CustomLogWidget" name="logSettings"
native="true"/>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
@@ -54,9 +54,9 @@
</widget>
<customwidgets>
<customwidget>
- <class>KPIM::CustomLogWidget</class>
+ <class>PimCommon::CustomLogWidget</class>
<extends>QWidget</extends>
- <header location="global">Libkdepim/CustomLogWidget</header>
+ <header location="global">PimCommon/CustomLogWidget</header>
<container>1</container>
</customwidget>
</customwidgets>
