diffstat for kpeople-5.25.0 kpeople-5.34.0 CMakeLists.txt | 19 +-- KF5PeopleConfig.cmake.in | 1 autotests/fakecontactsource.cpp | 3 autotests/fakecontactsource.h | 6 - autotests/persondatatests.cpp | 2 autotests/personsmodeltest.cpp | 2 autotests/personsproxymodeltest.cpp | 2 debian/changelog | 153 +++++++++++++++++++++++++++++ debian/control | 5 debian/upstream/signing-key.asc | 30 +++++ debian/watch | 5 examples/CMakeLists.txt | 2 examples/contactlistwidgets.cpp | 6 - metainfo.yaml | 1 po/ar/kpeople5.po | 12 ++ po/ast/kpeople5.po | 22 +++- po/bs/kpeople5.po | 15 ++ po/ca/kpeople5.po | 12 ++ po/ca@valencia/kpeople5.po | 12 ++ po/cs/kpeople5.po | 12 ++ po/da/kpeople5.po | 12 ++ po/de/kpeople5.po | 12 ++ po/el/kpeople5.po | 12 ++ po/en_GB/kpeople5.po | 12 ++ po/es/kpeople5.po | 12 ++ po/et/kpeople5.po | 80 +++++++++++++++ po/fi/kpeople5.po | 12 ++ po/fr/kpeople5.po | 12 ++ po/gd/kpeople5.po | 12 ++ po/gl/kpeople5.po | 12 ++ po/he/kpeople5.po | 12 ++ po/hu/kpeople5.po | 12 ++ po/ia/kpeople5.po | 22 +++- po/it/kpeople5.po | 12 ++ po/ja/kpeople5.po | 12 ++ po/ko/kpeople5.po | 12 ++ po/lt/kpeople5.po | 16 ++- po/nb/kpeople5.po | 12 ++ po/nl/kpeople5.po | 12 ++ po/nn/kpeople5.po | 12 ++ po/pl/kpeople5.po | 12 ++ po/pt/kpeople5.po | 14 ++ po/pt_BR/kpeople5.po | 12 ++ po/ro/kpeople5.po | 15 ++ po/ru/kpeople5.po | 12 ++ po/sk/kpeople5.po | 12 ++ po/sl/kpeople5.po | 12 ++ po/sr/kpeople5.po | 12 ++ po/sr@ijekavian/kpeople5.po | 12 ++ po/sr@ijekavianlatin/kpeople5.po | 12 ++ po/sr@latin/kpeople5.po | 12 ++ po/sv/kpeople5.po | 12 ++ po/uk/kpeople5.po | 12 ++ po/zh_CN/kpeople5.po | 12 ++ po/zh_TW/kpeople5.po | 12 ++ src/backends/allcontactsmonitor.cpp | 1 src/backends/contactmonitor.cpp | 3 src/backends/defaultcontactmonitor.cpp | 1 src/declarative/declarativepersondata.cpp | 2 src/declarative/declarativepersondata.h | 2 src/declarative/peopleqmlplugin.cpp | 2 src/declarative/peopleqmlplugin.h | 2 src/declarative/personactionsmodel.cpp | 2 src/declarative/personactionsmodel_p.h | 6 - src/duplicatesfinder_p.h | 2 src/match_p.h | 2 src/matchessolver_p.h | 4 src/metacontact.cpp | 2 src/persondata.h | 2 src/personmanager.cpp | 3 src/personmanager_p.h | 2 src/personpluginmanager.cpp | 2 src/personsmodel.h | 4 src/personssortfilterproxymodel.h | 2 src/widgets/abstractfieldwidgetfactory.h | 2 src/widgets/actions.cpp | 2 src/widgets/mergedelegate.h | 2 src/widgets/mergedialog.cpp | 6 - src/widgets/mergedialog.h | 2 src/widgets/persondetailsdialog.cpp | 1 src/widgets/persondetailsdialog.h | 2 src/widgets/persondetailsview.cpp | 12 +- src/widgets/persondetailsview.h | 2 src/widgets/plugins/emaildetailswidget.cpp | 2 src/widgets/plugins/emaildetailswidget.h | 6 - 85 files changed, 782 insertions(+), 132 deletions(-) diff -Nru kpeople-5.25.0/CMakeLists.txt kpeople-5.34.0/CMakeLists.txt --- kpeople-5.25.0/CMakeLists.txt 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/CMakeLists.txt 2017-05-06 11:58:13.000000000 +0000 @@ -1,18 +1,17 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.0) -project (KPeople) +set(KF5_VERSION "5.34.0") # handled by release scripts +set(KF5_DEP_VERSION "5.34.0") # handled by release scripts +project (KPeople VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.25.0 NO_MODULE) +find_package(ECM 5.34.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -set(KF5_VERSION "5.25.0") # handled by release scripts -set(KF5_DEP_VERSION "5.25.0") # handled by release scripts - -set(REQUIRED_QT_VERSION 5.5.0) +set(REQUIRED_QT_VERSION 5.6.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Sql DBus Widgets Qml) @@ -27,7 +26,7 @@ include(ECMSetupVersion) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMAddTests) -include(ECMPackageConfigHelpers) +include(CMakePackageConfigHelpers) include(ECMGeneratePriFile) include(GenerateExportHeader) @@ -38,12 +37,12 @@ set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KF5People") -ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KPEOPLE +ecm_setup_version(PROJECT VARIABLE_PREFIX KPEOPLE VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kpeople_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5PeopleConfigVersion.cmake" SOVERSION 5) -ecm_configure_package_config_file( +configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5PeopleConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5PeopleConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} diff -Nru kpeople-5.25.0/KF5PeopleConfig.cmake.in kpeople-5.34.0/KF5PeopleConfig.cmake.in --- kpeople-5.25.0/KF5PeopleConfig.cmake.in 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/KF5PeopleConfig.cmake.in 2017-05-06 11:58:13.000000000 +0000 @@ -1,5 +1,6 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) find_dependency(Qt5Core @REQUIRED_QT_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KPeopleTargets.cmake") diff -Nru kpeople-5.25.0/autotests/fakecontactsource.cpp kpeople-5.34.0/autotests/fakecontactsource.cpp --- kpeople-5.25.0/autotests/fakecontactsource.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/autotests/fakecontactsource.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -48,7 +48,7 @@ : m_properties(props) {} - virtual QVariant customProperty(const QString &key) const + QVariant customProperty(const QString &key) const Q_DECL_OVERRIDE { if (key.startsWith(QLatin1Literal("all-"))) { return QStringList(m_properties[key.mid(4)].toString()); @@ -118,4 +118,3 @@ Q_EMIT contactChanged(QStringLiteral("fakesource://contact1"), contact1); } -#include "fakecontactsource.moc" diff -Nru kpeople-5.25.0/autotests/fakecontactsource.h kpeople-5.34.0/autotests/fakecontactsource.h --- kpeople-5.25.0/autotests/fakecontactsource.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/autotests/fakecontactsource.h 2017-05-06 11:58:13.000000000 +0000 @@ -37,11 +37,11 @@ { public: FakeContactSource(QObject *parent, const QVariantList &args = QVariantList()); - virtual QString sourcePluginId() const; + QString sourcePluginId() const Q_DECL_OVERRIDE; void changeProperty(const QString& key, const QVariant& value); protected: - virtual KPeople::AllContactsMonitor *createAllContactsMonitor(); + KPeople::AllContactsMonitor *createAllContactsMonitor() Q_DECL_OVERRIDE; }; //---------------------------------------------------------------------------- @@ -52,7 +52,7 @@ public: explicit FakeAllContactsMonitor(); void changeProperty(const QString& key, const QVariant& value); - virtual QMap contacts(); + QMap contacts() Q_DECL_OVERRIDE; }; #endif // FAKECONTACTSOURCE_H diff -Nru kpeople-5.25.0/autotests/persondatatests.cpp kpeople-5.34.0/autotests/persondatatests.cpp --- kpeople-5.25.0/autotests/persondatatests.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/autotests/persondatatests.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -49,7 +49,7 @@ PersonManager::instance(m_database.fileName()); PersonManager::instance()->mergeContacts(QStringList() << QStringLiteral("fakesource://contact2") << QStringLiteral("fakesource://contact3")); - m_source = new FakeContactSource(0); //don't own. PersonPluginManager removes it on destruction + m_source = new FakeContactSource(nullptr); //don't own. PersonPluginManager removes it on destruction QHash sources; sources[QStringLiteral("fakesource")] = m_source; PersonPluginManager::setDataSourcePlugins(sources); diff -Nru kpeople-5.25.0/autotests/personsmodeltest.cpp kpeople-5.34.0/autotests/personsmodeltest.cpp --- kpeople-5.25.0/autotests/personsmodeltest.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/autotests/personsmodeltest.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -43,7 +43,7 @@ // Called before the first testfunction is executed PersonManager::instance(m_database.fileName()); - m_source = new FakeContactSource(0); //don't own. PersonPluginManager removes it on destruction + m_source = new FakeContactSource(nullptr); //don't own. PersonPluginManager removes it on destruction QHash sources; sources[QStringLiteral("fakesource")] = m_source; PersonPluginManager::setDataSourcePlugins(sources); diff -Nru kpeople-5.25.0/autotests/personsproxymodeltest.cpp kpeople-5.34.0/autotests/personsproxymodeltest.cpp --- kpeople-5.25.0/autotests/personsproxymodeltest.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/autotests/personsproxymodeltest.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -44,7 +44,7 @@ // Called before the first testfunction is executed PersonManager::instance(m_database.fileName()); - m_source = new FakeContactSource(0); //don't own. PersonPluginManager removes it on destruction + m_source = new FakeContactSource(nullptr); //don't own. PersonPluginManager removes it on destruction QHash sources; sources[QStringLiteral("fakesource")] = m_source; PersonPluginManager::setDataSourcePlugins(sources); diff -Nru kpeople-5.25.0/debian/changelog kpeople-5.34.0/debian/changelog --- kpeople-5.25.0/debian/changelog 2016-08-20 07:59:18.000000000 +0000 +++ kpeople-5.34.0/debian/changelog 2017-06-01 16:36:45.000000000 +0000 @@ -1,3 +1,63 @@ +kpeople (5.34.0-0neon+20170531+backports+build11) backports; urgency=medium + + * Automatic CI Build + + -- Debian CI Thu, 01 Jun 2017 16:36:45 +0000 + +kpeople (5.34.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Sun, 14 May 2017 17:39:50 +0000 + +kpeople (5.33.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Fri, 07 Apr 2017 16:24:16 +0000 + +kpeople (5.32.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Sun, 12 Mar 2017 13:23:11 +0000 + +kpeople (5.31.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 13 Feb 2017 14:38:34 +0000 + +kpeople (5.30.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 16 Jan 2017 13:42:03 +0000 + +kpeople (5.29.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Fri, 09 Dec 2016 19:08:53 +0000 + +kpeople (5.28.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Thu, 17 Nov 2016 09:45:55 +0000 + +kpeople (5.27.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Sat, 08 Oct 2016 11:31:59 +0000 + +kpeople (5.26.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 12 Sep 2016 08:32:23 +0000 + kpeople (5.25.0-1) unstable; urgency=medium [ Automatic packaging ] @@ -5,6 +65,18 @@ -- Maximiliano Curia Sat, 20 Aug 2016 09:58:52 +0200 +kpeople (5.25.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Sat, 13 Aug 2016 20:16:25 +0000 + +kpeople (5.24.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 11 Jul 2016 07:42:39 +0000 + kpeople (5.23.0-1) unstable; urgency=medium [ Automatic packaging ] @@ -12,6 +84,12 @@ -- Maximiliano Curia Sun, 19 Jun 2016 18:45:02 +0200 +kpeople (5.23.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 13 Jun 2016 09:39:51 +0000 + kpeople (5.22.0-1) unstable; urgency=medium [ Automatic packaging ] @@ -20,6 +98,12 @@ -- Maximiliano Curia Thu, 19 May 2016 17:19:52 +0200 +kpeople (5.22.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Tue, 17 May 2016 07:37:12 +0000 + kpeople (5.21.0-1) experimental; urgency=medium [ Maximiliano Curia ] @@ -35,6 +119,18 @@ -- Maximiliano Curia Tue, 10 May 2016 15:20:09 +0200 +kpeople (5.21.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 11 Apr 2016 09:23:23 +0000 + +kpeople (5.20.0-0neon) wily; urgency=medium + + * New release + + -- Neon CI Fri, 01 Apr 2016 11:07:34 +0000 + kpeople (5.19.0-1) experimental; urgency=medium * New upstream release (5.19.0). @@ -48,6 +144,16 @@ -- Maximiliano Curia Wed, 27 Jan 2016 13:34:06 +0100 +kpeople (5.18.0-0ubuntu1) UNRELEASED; urgency=medium + + [ Scarlett Clark ] + * New upstream release Xenial + + [ Philip Muškovac ] + * New upstream release + + -- Philip Muškovac Wed, 06 Jan 2016 15:06:39 +0100 + kpeople (5.16.0-1) unstable; urgency=medium * New upstream release (5.16.0). @@ -60,18 +166,46 @@ -- Maximiliano Curia Fri, 09 Oct 2015 19:16:31 +0200 +kpeople (5.15.0-0ubuntu2) UNRELEASED; urgency=medium + + * Vivid backport. + + -- Scarlett Clark Thu, 08 Oct 2015 23:54:01 -0700 + +kpeople (5.15.0-0ubuntu1) wily; urgency=medium + + [ Scarlett Clark ] + * Vivid backport + + [ Jonathan Riddell ] + * new upstream release + + -- Jonathan Riddell Wed, 07 Oct 2015 13:54:24 +0100 + kpeople (5.14.0-1) unstable; urgency=medium * New upstream release (5.14.0). -- Maximiliano Curia Tue, 15 Sep 2015 13:49:19 +0200 +kpeople (5.14.0-0ubuntu1) wily; urgency=medium + + * new upstream release + + -- Clive Johnston Thu, 17 Sep 2015 13:24:47 +0100 + kpeople (5.13.0-1) unstable; urgency=medium * New upstream release (5.13.0). -- Maximiliano Curia Sun, 30 Aug 2015 23:38:34 +0200 +kpeople (5.13.0-0ubuntu1) wily; urgency=medium + + * new upstream release + + -- Jonathan Riddell Mon, 10 Aug 2015 13:27:51 +0200 + kpeople (5.12.0-1) unstable; urgency=medium * New upstream release (5.12.0). @@ -79,6 +213,14 @@ -- Maximiliano Curia Thu, 09 Jul 2015 12:43:43 +0200 +kpeople (5.12.0-0ubuntu1) wily; urgency=medium + + * New upstream release + * Fix merge. + * Vivid backport. + + -- Scarlett Clark Mon, 03 Aug 2015 16:07:43 +0200 + kpeople (5.11.0-1) unstable; urgency=medium * New upstream release (5.10.0). @@ -87,6 +229,17 @@ -- Maximiliano Curia Sun, 28 Jun 2015 16:04:17 +0200 +kpeople (5.10.0-0ubuntu1) wily; urgency=medium + + [ Maximiliano Curia ] + * New upstream release (5.10.0). + * Remove upstream applied patch: upstream_rename-tranlations.diff + + [ Jonathan Riddell ] + * New upstream release + + -- Jonathan Riddell Wed, 03 Jun 2015 20:32:16 +0200 + kpeople (5.9.0-1) experimental; urgency=medium * Add breaks/replaces with libkpeople3. diff -Nru kpeople-5.25.0/debian/control kpeople-5.34.0/debian/control --- kpeople-5.25.0/debian/control 2016-08-20 07:59:18.000000000 +0000 +++ kpeople-5.34.0/debian/control 2017-06-01 16:36:45.000000000 +0000 @@ -18,8 +18,8 @@ qtdeclarative5-dev (>= 5.5.0~) Standards-Version: 3.9.8 Homepage: https://projects.kde.org/projects/frameworks/kpeople -Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/frameworks/kpeople.git -Vcs-Git: https://anonscm.debian.org/git/pkg-kde/frameworks/kpeople.git +Vcs-Git: https://github.com/ds9-debian-frameworks/kpeople +Vcs-Browser: https://github.com/ds9-debian-frameworks/kpeople Package: libkf5people-dev Section: libdevel @@ -115,3 +115,4 @@ provided in user interfaces by providing QML and Qt Widgets components. . This package is part of KDE Frameworks 5. + diff -Nru kpeople-5.25.0/debian/upstream/signing-key.asc kpeople-5.34.0/debian/upstream/signing-key.asc --- kpeople-5.25.0/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 +++ kpeople-5.34.0/debian/upstream/signing-key.asc 2017-06-01 16:36:45.000000000 +0000 @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQENBFfNUR8BCADDjPXScwObp7mWwUnrjqrM0gGg+pId6vqe0a5A4xr+Rgj26quK +2qJLym0mmul/uh2M8z486qDTQYQaTEppFCosH3WqFonTN2LWpHcujeVABXkAe9qo +DHBZZRMw8CXtiEwvJ/xV/MXTR7G0QCqT4HF045SAyyBjusBiiGly32JEDD4FdjHj +KKUrAJyyoc6frake7ZMO0SO3tQNwmi4T5KLSoxhi3Zgez2k9GPZEj4/W7l5Ne0zQ +7C8Tgo8wraqj/8pzjfP6+Dc2LHOTtu8DGDQkXEFa9VvuAotOtI8Kjff+bOd36WTL +L2dk69Bb7WbhRLkkavHZCdKOpfyBtVn+hGWRABEBAAG0G0RhdmlkIEZhdXJlIDxm +YXVyZUBrZGUub3JnPokBPQQTAQgAJwUCV81RHwIbAwUJCWYBgAULCQgHAgYVCAkK +CwIEFgIDAQIeAQIXgAAKCRBY0O5kikizu/01B/46hG+MaTFW1CVevZrGyPacmDRj +pQhx/ODadBkVXXaJyr7aNKT3EvAedyT82SGT/ch+aqXjZK1kEwK6zITqoOZZUt2I +CjBN4+UfLrWwlKldZShbhJ6NMHJIeYQ5EDlMw7TWVn0OPkRuDvLEasgOhxR9ZjWW +c5wlcZXXy8N+wGSR0bThzl0pdFcIy9Z3g411ZOvjUdDuWqtKUH9iy1VdVyba7FXI +x/BqAXIVsAaIFNsJBZZ7C7j1a1IlTykRLiDjh3mpyBfX4xfMTo4z6pjfQsoPebJl +TlCnwAkIxeyatGXm4OCqEA9zPVd1Ju7+XuEr6+15ENYJ4oYsZjfyScHHJdWMuQEN +BFfNUR8BCADe5wRc/QFL92npVAgzPQ9mJKopscRcxs0f2DM7EBPzUFvWGRIGRdB8 +obXfzBp4Pfyzqky7C1X/j7ENzx+Kol1AJ93wjUEfLoZ/zsvoj9ZT3GdjeVQeReKY +d4th7Jqo4qxvi33Pud0jZsENezzgdd4npiNN9bFX0mjNKNHL9o1n5nTm9pfDI/AS +PZz2RoRO7oUJb+aX6hKxTBaKoAiZHybAXQVchtwJx0O4wLbZ3E4ytJdcATlPDNXS +jw2Lmns8aGa6DBGyqiG6g1PlCnOI2Q/cQK1zbkSisfoCbpEq1MgIzuZSoJ00NIEp +eiACoR82565G68yAb+uKHkcFrYkfDT41ABEBAAGJASUEGAEIAA8FAlfNUR8CGwwF +CQlmAYAACgkQWNDuZIpIs7vWkgf9GNUZmD0UgbQmj0nwkEHum1g7LD+MZL0+P2kg +HyEL3Cm01ot9d+X5ed/gAJ6hDR55KYxHi+/wwwkCNDLoQoP+7VZq2fMiGD0/bDar +oWQqbckqDZU4l69u9NbYvVWHUerfwKfi0ZKN5sJqLwIkr57wEX0I/TBGoMuFB27q +2qyloS5m1Q2pke2mmZjKSqE0jxZJ7iFGJO/Buyjgd1B2kr0DaGaCrh0wjfVjAWpt +klK95Phry1jQc7W0Z4ZdWpB79S1yW670eutSC4fMjvsNxROGkPx4dDkyG5nToeau +zhEh/pXho2Eo/aFEqqY42GMSlN9rf7ekaTNo7OxsE7vvCB0fug== +=4o3u +-----END PGP PUBLIC KEY BLOCK----- diff -Nru kpeople-5.25.0/debian/watch kpeople-5.34.0/debian/watch --- kpeople-5.25.0/debian/watch 2016-08-20 07:59:18.000000000 +0000 +++ kpeople-5.34.0/debian/watch 2017-06-01 16:36:45.000000000 +0000 @@ -1,2 +1,3 @@ -version=3 -http://download.kde.org/stable/frameworks/([\d.]+)/kpeople-([\d.]+)\.tar\.xz +version=4 + +opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/frameworks/([\d.]+)/kpeople-([\d.]+)\.tar\.xz diff -Nru kpeople-5.25.0/examples/CMakeLists.txt kpeople-5.34.0/examples/CMakeLists.txt --- kpeople-5.25.0/examples/CMakeLists.txt 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/examples/CMakeLists.txt 2017-05-06 11:58:13.000000000 +0000 @@ -16,7 +16,7 @@ # target_link_libraries(loadcontact Qt5::Core Qt5::Gui KF5::People) add_executable(duplicates duplicates.cpp) -target_link_libraries(duplicates KF5::People KF5::CoreAddons) +target_link_libraries(duplicates KF5::People KF5::CoreAddons KF5::PeopleBackend) add_executable(duplicatesdialog duplicatesdialog.cpp) target_link_libraries(duplicatesdialog KF5::PeopleWidgets Qt5::Widgets) diff -Nru kpeople-5.25.0/examples/contactlistwidgets.cpp kpeople-5.34.0/examples/contactlistwidgets.cpp --- kpeople-5.25.0/examples/contactlistwidgets.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/examples/contactlistwidgets.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -37,11 +37,11 @@ class PersonsDelegate : public QStyledItemDelegate { public: - PersonsDelegate(QObject *parent = 0); + PersonsDelegate(QObject *parent = nullptr); ~PersonsDelegate(); - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; - QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; + QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; }; PersonsDelegate::PersonsDelegate(QObject *parent) diff -Nru kpeople-5.25.0/metainfo.yaml kpeople-5.34.0/metainfo.yaml --- kpeople-5.25.0/metainfo.yaml 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/metainfo.yaml 2017-05-06 11:58:13.000000000 +0000 @@ -4,6 +4,7 @@ type: functional platforms: - name: Linux + - name: FreeBSD - name: Windows - name: MacOSX portingAid: false diff -Nru kpeople-5.25.0/po/ar/kpeople5.po kpeople-5.34.0/po/ar/kpeople5.po --- kpeople-5.25.0/po/ar/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/ar/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: ٢٠١٥-٠٤-٠٥ ١٨:٤٣+0300\n" "Last-Translator: Safa Alfulaij \n" "Language-Team: Arabic \n" @@ -19,16 +19,19 @@ "X-Generator: Lokalize 2.0\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "الاسم" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "البريد الإلكترونيّ" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr "، " @@ -40,32 +43,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "مدير التكرارات" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "حدّد متراسلين لدمجهم" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "البريد الإلكترونيّ" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "أظهر اقتراحات الدّمج..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "ادمج بالمتراسلين المحدّدين" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "الهاتف" diff -Nru kpeople-5.25.0/po/ast/kpeople5.po kpeople-5.34.0/po/ast/kpeople5.po --- kpeople-5.25.0/po/ast/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/ast/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -1,15 +1,15 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# enolp , 2015. +# enolp , 2016. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" -"PO-Revision-Date: 2015-07-11 16:23+0100\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" +"PO-Revision-Date: 2016-12-20 21:44+0100\n" "Last-Translator: enolp \n" -"Language-Team: Asturian \n" +"Language-Team: Asturian \n" "Language: ast\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,16 +18,19 @@ "X-Generator: Lokalize 2.0\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Nome" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "Corréu" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -39,32 +42,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Xestor de duplicaos" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" -msgstr "Esbilla los contautos pa mecer" +msgstr "Esbilla los contautos a mecer" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "Corréu" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." -msgstr "Amosar suxerencies de mecíu..." +msgstr "Amosar suxerencies de mecedura..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Mecer colos contautos esbillaos" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Teléfonu" diff -Nru kpeople-5.25.0/po/bs/kpeople5.po kpeople-5.34.0/po/bs/kpeople5.po --- kpeople-5.25.0/po/bs/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/bs/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: bosnianuniversetranslation\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-02-16 11:52+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian \n" @@ -21,17 +21,19 @@ "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "" #: match.cpp:55 -#, fuzzy +#, fuzzy, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-pošta" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr "" @@ -43,34 +45,39 @@ msgstr "" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Menadžer duplikata" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Označava kontakte koji se trebaju povezati" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 -#, fuzzy +#, fuzzy, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-pošta" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Prikaži prijedloge povezivanja..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Poveži sa označenim kontaktima" #: widgets/plugins/phonedetailswidget.cpp:38 -#, fuzzy +#, fuzzy, kde-format #| msgid "Phone" msgctxt "Phone details title" msgid "Phone" diff -Nru kpeople-5.25.0/po/ca/kpeople5.po kpeople-5.34.0/po/ca/kpeople5.po --- kpeople-5.25.0/po/ca/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/ca/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kpeople5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-02-24 22:43+0100\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" @@ -21,16 +21,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Nom" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "Correu electrònic" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -42,32 +45,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Gestor de duplicats" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Seleccioneu els contactes a fusionar" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "Correu electrònic" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Mostra els suggeriments pel fusionat..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Fusiona amb els contactes seleccionats" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telèfon" diff -Nru kpeople-5.25.0/po/ca@valencia/kpeople5.po kpeople-5.34.0/po/ca@valencia/kpeople5.po --- kpeople-5.25.0/po/ca@valencia/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/ca@valencia/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kpeople5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-02-24 22:43+0100\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" @@ -21,16 +21,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Nom" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "Correu electrònic" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -42,32 +45,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Gestor de duplicats" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Seleccioneu els contactes a fusionar" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "Correu electrònic" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Mostra els suggeriments pel fusionat..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Fusiona amb els contactes seleccionats" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telèfon" diff -Nru kpeople-5.25.0/po/cs/kpeople5.po kpeople-5.34.0/po/cs/kpeople5.po --- kpeople-5.25.0/po/cs/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/cs/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-03-04 16:08+0100\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" @@ -20,16 +20,19 @@ "X-Source-Language: en_US\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Jméno" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-mail" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -41,32 +44,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Správce duplikátů" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Zvolte kontakty ke sloučení" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-mail" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Zobrazit návrhy sloučení..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Sloučit s vybranými kontakty" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefon" diff -Nru kpeople-5.25.0/po/da/kpeople5.po kpeople-5.34.0/po/da/kpeople5.po --- kpeople-5.25.0/po/da/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/da/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-04-25 15:19+0200\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" @@ -18,16 +18,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Navn" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-mail" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -39,32 +42,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Håndtering af dubletter" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Vælg kontakter der skal flettes" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-mail" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Vis fletteforslag..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Flet med valgte kontakter" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefon" diff -Nru kpeople-5.25.0/po/de/kpeople5.po kpeople-5.34.0/po/de/kpeople5.po --- kpeople-5.25.0/po/de/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/de/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-03-09 21:35+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" @@ -15,16 +15,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Name" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-Mail" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -36,32 +39,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Verwaltung von Duplikaten" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Kontakte zum Zusammenführen auswählen" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-Mail" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Zusammenführungs-Vorschläge anzeigen ..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Mit ausgewählte Kontakten zusammenführen" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefon" diff -Nru kpeople-5.25.0/po/el/kpeople5.po kpeople-5.34.0/po/el/kpeople5.po --- kpeople-5.25.0/po/el/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/el/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-03-02 16:14+0200\n" "Last-Translator: Dimitris Kardarakos \n" "Language-Team: Greek \n" @@ -19,16 +19,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Όνομα" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-mail" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -40,32 +43,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Διαχειριστής διπλότυπων" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Επιλέξτε επαφές για συγχώνευση" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Εικόνα" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-mail" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Εμφάνιση προτάσεων για συγχώνευση..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Συγχώνευση με επιλεγμένες επαφές" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Τηλέφωνο" diff -Nru kpeople-5.25.0/po/en_GB/kpeople5.po kpeople-5.34.0/po/en_GB/kpeople5.po --- kpeople-5.25.0/po/en_GB/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/en_GB/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-03-14 14:49+0000\n" "Last-Translator: \n" "Language-Team: British English \n" @@ -18,16 +18,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Name" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-mail" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -39,32 +42,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Duplicates Manager" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Select contacts to be merged" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-mail" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Show Merge Suggestions..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Merge with Selected Contacts" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Phone" diff -Nru kpeople-5.25.0/po/es/kpeople5.po kpeople-5.34.0/po/es/kpeople5.po --- kpeople-5.25.0/po/es/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/es/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-03-05 22:46+0100\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" @@ -18,16 +18,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Nombre" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "Correo electrónico" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -39,32 +42,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Duplica el gestor" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Seleccione los contactos a fusionar" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "Correo electrónico" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Mostrar las sugerencias de fusión..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Fusionar con los contactos seleccionados" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Teléfono" diff -Nru kpeople-5.25.0/po/et/kpeople5.po kpeople-5.34.0/po/et/kpeople5.po --- kpeople-5.25.0/po/et/kpeople5.po 1970-01-01 00:00:00.000000000 +0000 +++ kpeople-5.34.0/po/et/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -0,0 +1,80 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Marek Laane , 2016. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" +"PO-Revision-Date: 2016-09-09 01:34+0300\n" +"Last-Translator: Marek Laane \n" +"Language-Team: Estonian \n" +"Language: et\n" +"MIME-Version: 1.0\n" +"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.5\n" + +#: match.cpp:52 +#, kde-format +msgctxt "@title:column" +msgid "Name" +msgstr "Nimi" + +#: match.cpp:55 +#, kde-format +msgctxt "@title:column" +msgid "E-mail" +msgstr "E-post" + +#: widgets/mergedelegate.cpp:99 +#, kde-format +msgctxt "reasons join" +msgid ", " +msgstr ", " + +#: widgets/mergedelegate.cpp:99 +#, kde-format +msgctxt "name: merge reasons" +msgid "%1: %2" +msgstr "%1: %2" + +#: widgets/mergedialog.cpp:64 +#, kde-format +msgid "Duplicates Manager" +msgstr "Topeltkirjete haldur" + +#: widgets/mergedialog.cpp:73 +#, kde-format +msgid "Select contacts to be merged" +msgstr "Ühendatavate kontaktide valimine" + +#. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) +#: widgets/person-details-presentation.ui:43 +#, kde-format +msgid "Avatar" +msgstr "Avatar" + +#: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format +msgctxt "E-mail field label" +msgid "E-mail" +msgstr "E-post" + +#: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format +msgid "Show Merge Suggestions..." +msgstr "Näita ühendamissoovitusi ..." + +#: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format +msgid "Merge with Selected Contacts" +msgstr "Ühenda valitud kontaktidega" + +#: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format +msgctxt "Phone details title" +msgid "Phone" +msgstr "Telefon" diff -Nru kpeople-5.25.0/po/fi/kpeople5.po kpeople-5.34.0/po/fi/kpeople5.po --- kpeople-5.25.0/po/fi/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/fi/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-02-26 16:53+0200\n" "Last-Translator: Lasse Liehu \n" "Language-Team: Finnish \n" @@ -18,16 +18,19 @@ "X-Generator: Lokalize 2.0\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Nimi" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "Sähköposti" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -39,32 +42,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Kaksoiskappaleiden hallinta" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Valitse yhdistettävät yhteystiedot" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "Sähköposti" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Näytä yhdistämisehdotukset…" #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Yhdistä valitut yhteystiedot" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Puhelin" diff -Nru kpeople-5.25.0/po/fr/kpeople5.po kpeople-5.34.0/po/fr/kpeople5.po --- kpeople-5.25.0/po/fr/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/fr/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-10-31 12:10+0100\n" "Last-Translator: Thomas Vergnaud \n" "Language-Team: French \n" @@ -22,16 +22,19 @@ "X-Text-Markup: kde4\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Sébastien Renard, Thomas Vergnaud" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "renard@kde.org, thomas.vergnaud@gmx.fr" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -43,32 +46,39 @@ msgstr "%1 : %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Gestionnaire de doublons" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Sélectionnez les contacts à fusionner" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "renard@kde.org, thomas.vergnaud@gmx.fr" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Afficher les suggestions de fusion..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Fusionner avec les contacts sélectionnés" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Téléphone" diff -Nru kpeople-5.25.0/po/gd/kpeople5.po kpeople-5.34.0/po/gd/kpeople5.po --- kpeople-5.25.0/po/gd/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/gd/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-11-04 15:15+0000\n" "Last-Translator: Michael Bauer \n" "Language-Team: Fòram na Gàidhlig\n" @@ -20,16 +20,19 @@ "X-Project-Style: kde\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Ainm" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "Post-d" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -41,32 +44,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Manaidsear nan dùblachaidhean" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Tagh an luchd-aithne airson co-aonadh" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "Post-d" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Seall molaidhean co-aonaidh..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Co-aonaich leis an luchd-aithne a chaidh a thaghadh" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Fòn" diff -Nru kpeople-5.25.0/po/gl/kpeople5.po kpeople-5.34.0/po/gl/kpeople5.po --- kpeople-5.25.0/po/gl/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/gl/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-03-14 07:28+0100\n" "Last-Translator: Adrián Chaves Fernández \n" "Language-Team: Galician \n" @@ -18,16 +18,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Nome" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "Correo electrónico" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -39,32 +42,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Xestor de duplicados" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Seleccione contactos para fusionar" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "Correo electrónico" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Mostras as suxestións de fusión…" #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Fusionar cos contactos seleccionados" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Teléfono" diff -Nru kpeople-5.25.0/po/he/kpeople5.po kpeople-5.34.0/po/he/kpeople5.po --- kpeople-5.25.0/po/he/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/he/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2016-06-21 17:23+0200\n" "Last-Translator: elkana bardugo \n" "Language-Team: Hebrew \n" @@ -18,16 +18,19 @@ "X-Generator: Lokalize 2.0\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr "" @@ -39,32 +42,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "מנהל כפולים" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "בחר איש קשר למיזוג" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "תמונה" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "דואר אלקטרוני" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "הראה הצעות למיזוג" #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "מזג עם האנשי קשר הנבחרים" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "פלאפון" diff -Nru kpeople-5.25.0/po/hu/kpeople5.po kpeople-5.34.0/po/hu/kpeople5.po --- kpeople-5.25.0/po/hu/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/hu/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-09-04 15:10+0200\n" "Last-Translator: Kristóf Kiszel \n" "Language-Team: Hungarian \n" @@ -19,16 +19,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Név" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-mail" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -40,32 +43,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Duplikátumkezelő" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Válassza ki az egyesítendő névjegyeket" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-mail" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Egyesítési javaslatok megjelenítése…" #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Egyesítés a kijelölt névjegyekkel" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefon" diff -Nru kpeople-5.25.0/po/ia/kpeople5.po kpeople-5.34.0/po/ia/kpeople5.po --- kpeople-5.25.0/po/ia/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/ia/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" -"PO-Revision-Date: 2016-02-01 12:01+0100\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" +"PO-Revision-Date: 2016-11-29 13:44+0100\n" "Last-Translator: Giovanni Sora \n" "Language-Team: Interlingua \n" "Language: ia\n" @@ -18,16 +18,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Nomine" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-posta:" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -39,32 +42,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" -msgstr "" +msgstr "Gerente de duplicatos" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" -msgstr "" +msgstr "Selige contactos que on debe fusionar" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-posta:" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." -msgstr "" +msgstr "Monstra suggerentias de fusion...." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" -msgstr "" +msgstr "Fusiona con contactos seligite" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telephono" diff -Nru kpeople-5.25.0/po/it/kpeople5.po kpeople-5.34.0/po/it/kpeople5.po --- kpeople-5.25.0/po/it/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/it/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: libkpeople\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-03-15 13:53+0100\n" "Last-Translator: Vincenzo Reale \n" "Language-Team: Italian \n" @@ -17,16 +17,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Nome" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "Posta elettronica" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -38,32 +41,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Gestore dei duplicati" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Seleziona i contatti da unire" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Immagine" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "Posta elettronica" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Mostra suggerimenti di unione..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Unisci con i contatti selezionati" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefono" diff -Nru kpeople-5.25.0/po/ja/kpeople5.po kpeople-5.34.0/po/ja/kpeople5.po --- kpeople-5.25.0/po/ja/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/ja/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: libkpeople\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2013-09-25 00:43-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" @@ -15,16 +15,19 @@ "X-Text-Markup: kde4\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr "" @@ -36,32 +39,39 @@ msgstr "" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "" #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "" diff -Nru kpeople-5.25.0/po/ko/kpeople5.po kpeople-5.34.0/po/ko/kpeople5.po --- kpeople-5.25.0/po/ko/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/ko/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-04-26 17:41+0200\n" "Last-Translator: Shinjo Park \n" "Language-Team: Korean \n" @@ -18,16 +18,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "이름" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "이메일" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -39,32 +42,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "중복 항목 관리자" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "합칠 연락처 선택" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "아바타" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "이메일" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "제안하는 합칠 항목 보기..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "선택한 연락처와 합치기" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "전화" diff -Nru kpeople-5.25.0/po/lt/kpeople5.po kpeople-5.34.0/po/lt/kpeople5.po --- kpeople-5.25.0/po/lt/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/lt/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: l 10n\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-01-28 09:52+0200\n" "Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian \n" @@ -21,20 +21,21 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 -#, fuzzy +#, fuzzy, kde-format #| msgid "Name" msgctxt "@title:column" msgid "Name" msgstr "Pavadinimas" #: match.cpp:55 -#, fuzzy +#, fuzzy, kde-format #| msgid "E-mail" msgctxt "@title:column" msgid "E-mail" msgstr "El. paštas" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -46,35 +47,40 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Dublikatų tvarkymo programa" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Pasirinkite kontaktus suliejimui" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avataras" #: widgets/plugins/emaildetailswidget.cpp:50 -#, fuzzy +#, fuzzy, kde-format #| msgid "E-mail" msgctxt "E-mail field label" msgid "E-mail" msgstr "El. paštas" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Rodyti suliejimo pasiūlymus..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Sulieti su pažymėtais kontaktais" #: widgets/plugins/phonedetailswidget.cpp:38 -#, fuzzy +#, fuzzy, kde-format #| msgid "Phone" msgctxt "Phone details title" msgid "Phone" diff -Nru kpeople-5.25.0/po/nb/kpeople5.po kpeople-5.34.0/po/nb/kpeople5.po --- kpeople-5.25.0/po/nb/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/nb/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-04-30 08:42+0200\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" @@ -20,16 +20,19 @@ "X-Text-Markup: kde4\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Navn" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-post" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -41,32 +44,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Håndterer duplikater" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Velg kontakter som skal flettes sammen" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-post" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Vis forslag til sammenfletting …" #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Flett sammen med valgte kontakter" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefon" diff -Nru kpeople-5.25.0/po/nl/kpeople5.po kpeople-5.34.0/po/nl/kpeople5.po --- kpeople-5.25.0/po/nl/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/nl/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-02-24 18:02+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" @@ -18,16 +18,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Naam" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-mail" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -39,32 +42,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Beheerder van duplicaten" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Samen te voegen contactpersonen selecteren" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-mail" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Suggesties voor samenvoegen tonen..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Met geselecteerde contactpersonen samenvoegen" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefoon" diff -Nru kpeople-5.25.0/po/nn/kpeople5.po kpeople-5.34.0/po/nn/kpeople5.po --- kpeople-5.25.0/po/nn/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/nn/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-06-01 20:32+0100\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk \n" @@ -20,16 +20,19 @@ "X-Text-Markup: kde4\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Namn" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-postadresse" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -41,32 +44,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Duplikathandsaming" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Vel kontaktane du vil slå saman" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-postadresse" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Vis samanslåingsforslag …" #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Slå saman med merkte kontaktar" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefonnummer" diff -Nru kpeople-5.25.0/po/pl/kpeople5.po kpeople-5.34.0/po/pl/kpeople5.po --- kpeople-5.25.0/po/pl/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/pl/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-02-28 08:39+0100\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" @@ -19,16 +19,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Imię i nazwisko" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-mail" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -40,32 +43,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Zarządzanie powieleniami" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Wybierz kontakty do scalenia" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Awatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-mail" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Pokaż sugestie scalania..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Scal z wybranymi kontaktami" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefon" diff -Nru kpeople-5.25.0/po/pt/kpeople5.po kpeople-5.34.0/po/pt/kpeople5.po --- kpeople-5.25.0/po/pt/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/pt/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -2,11 +2,11 @@ msgstr "" "Project-Id-Version: libkpeople\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-02-25 00:29+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" -"Language: \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -15,16 +15,19 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Nome" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-mail" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -36,32 +39,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Gestor de Duplicados" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Seleccionar os contactos a reunir" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-mail" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Mostrar as Sugestões de Reunião..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Reunir com os Contactos Seleccionados" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefone" diff -Nru kpeople-5.25.0/po/pt_BR/kpeople5.po kpeople-5.34.0/po/pt_BR/kpeople5.po --- kpeople-5.25.0/po/pt_BR/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/pt_BR/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: libkpeople\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-02-24 21:59-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" @@ -20,16 +20,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Nome" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-mail" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -41,32 +44,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Gerenciador de duplicados" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Selecione os contatos a serem mesclados" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Imagem" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-mail" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Mostrar sugestões de mesclagem..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Mesclar os contatos selecionados" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefone" diff -Nru kpeople-5.25.0/po/ro/kpeople5.po kpeople-5.34.0/po/ro/kpeople5.po --- kpeople-5.25.0/po/ro/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/ro/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2014-03-25 16:18+0200\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" @@ -19,18 +19,20 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "" #: match.cpp:55 -#, fuzzy +#, fuzzy, kde-format #| msgid "Email" msgctxt "@title:column" msgid "E-mail" msgstr "Email" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr "" @@ -42,35 +44,40 @@ msgstr "" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Gestionar de duplicate" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Alegeți contactele de îmbinat" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 -#, fuzzy +#, fuzzy, kde-format #| msgid "Email" msgctxt "E-mail field label" msgid "E-mail" msgstr "Email" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Arată sugestii de îmbinare..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Îmbină cu contactele alese" #: widgets/plugins/phonedetailswidget.cpp:38 -#, fuzzy +#, fuzzy, kde-format #| msgid "Phone" msgctxt "Phone details title" msgid "Phone" diff -Nru kpeople-5.25.0/po/ru/kpeople5.po kpeople-5.34.0/po/ru/kpeople5.po --- kpeople-5.25.0/po/ru/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/ru/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-03-02 05:38+0300\n" "Last-Translator: Alexander Potashev \n" "Language-Team: Russian \n" @@ -19,16 +19,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Имя" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "Адрес эл. почты" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -40,32 +43,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Диспетчер дубликатов" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Выберите учётные записи для объединения" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Аватар" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "Адрес электронной почты" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Показать вероятные дубликаты..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Объединить с выбранными контактами" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Телефон" diff -Nru kpeople-5.25.0/po/sk/kpeople5.po kpeople-5.34.0/po/sk/kpeople5.po --- kpeople-5.25.0/po/sk/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/sk/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: libkpeople\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-02-28 12:12+0100\n" "Last-Translator: Roman Paholik \n" "Language-Team: Slovak \n" @@ -16,16 +16,19 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Názov" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-mail" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -37,32 +40,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Správca duplikátov" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Vyberte kontakty na zlúčenie" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-mail" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Zobraziť návrhy zlúčení..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Zlúčiť s vybranými kontaktmi" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefón" diff -Nru kpeople-5.25.0/po/sl/kpeople5.po kpeople-5.34.0/po/sl/kpeople5.po --- kpeople-5.25.0/po/sl/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/sl/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-04-03 10:06+0200\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" @@ -20,16 +20,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Ime" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-pošta" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -41,32 +44,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Upravljalnik podvojitev" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Izberite stike za združevanje" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Podoba" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-pošta" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Pokaži predloge združevanja ..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Združi z izbranimi stiki" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefon" diff -Nru kpeople-5.25.0/po/sr/kpeople5.po kpeople-5.34.0/po/sr/kpeople5.po --- kpeople-5.25.0/po/sr/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/sr/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: libkpeople\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-03-07 13:10+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -19,16 +19,19 @@ "X-Environment: kde\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "име" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "е‑пошта" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -41,32 +44,39 @@ # >> @title:window #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Менаџер дупликата" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Изаберите контакте за стапање" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Аватар" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "Е‑пошта" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Предлози стапања..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Стопи са изабраним контактима" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Телефон" diff -Nru kpeople-5.25.0/po/sr@ijekavian/kpeople5.po kpeople-5.34.0/po/sr@ijekavian/kpeople5.po --- kpeople-5.25.0/po/sr@ijekavian/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/sr@ijekavian/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: libkpeople\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-03-07 13:10+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -19,16 +19,19 @@ "X-Environment: kde\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "име" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "е‑пошта" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -41,32 +44,39 @@ # >> @title:window #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Менаџер дупликата" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Изаберите контакте за стапање" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Аватар" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "Е‑пошта" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Предлози стапања..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Стопи са изабраним контактима" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Телефон" diff -Nru kpeople-5.25.0/po/sr@ijekavianlatin/kpeople5.po kpeople-5.34.0/po/sr@ijekavianlatin/kpeople5.po --- kpeople-5.25.0/po/sr@ijekavianlatin/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/sr@ijekavianlatin/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: libkpeople\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-03-07 13:10+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -19,16 +19,19 @@ "X-Environment: kde\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "ime" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "e‑pošta" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -41,32 +44,39 @@ # >> @title:window #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Menadžer duplikata" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Izaberite kontakte za stapanje" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E‑pošta" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Predlozi stapanja..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Stopi sa izabranim kontaktima" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefon" diff -Nru kpeople-5.25.0/po/sr@latin/kpeople5.po kpeople-5.34.0/po/sr@latin/kpeople5.po --- kpeople-5.25.0/po/sr@latin/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/sr@latin/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: libkpeople\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-03-07 13:10+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" @@ -19,16 +19,19 @@ "X-Environment: kde\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "ime" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "e‑pošta" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -41,32 +44,39 @@ # >> @title:window #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Menadžer duplikata" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Izaberite kontakte za stapanje" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E‑pošta" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Predlozi stapanja..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Stopi sa izabranim kontaktima" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefon" diff -Nru kpeople-5.25.0/po/sv/kpeople5.po kpeople-5.34.0/po/sv/kpeople5.po --- kpeople-5.25.0/po/sv/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/sv/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-02-24 19:01+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" @@ -18,16 +18,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Namn" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "E-post" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -39,32 +42,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Hantering av dubbletter" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Välj kontakter att sammanfoga" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Avatar" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "E-post" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Visa förslag på sammanfogning..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Sammanfoga med markerade kontakter" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Telefon" diff -Nru kpeople-5.25.0/po/uk/kpeople5.po kpeople-5.34.0/po/uk/kpeople5.po --- kpeople-5.25.0/po/uk/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/uk/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kpeople5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-02-24 19:51+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -21,16 +21,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "Ім’я" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "Адреса ел. пошти" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -42,32 +45,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "Керування дублікатами" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "Виберіть записи контактів, які слід об’єднати" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "Аватар" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "Адреса ел. пошти" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "Показати пропозиції щодо об’єднання…" #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "Об’єднати з позначеними записами контактів" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "Телефон" diff -Nru kpeople-5.25.0/po/zh_CN/kpeople5.po kpeople-5.34.0/po/zh_CN/kpeople5.po --- kpeople-5.25.0/po/zh_CN/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/zh_CN/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-03-01 12:14-0500\n" "Last-Translator: Weng Xuetian \n" "Language-Team: Chinese Simplified \n" @@ -18,16 +18,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "姓名" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "电子邮件" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -39,32 +42,39 @@ msgstr "%1：%2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "重复项管理器" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "选择要合并的联系人" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "头像" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "电子邮件" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "显示合并建议" #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "合并选中联系人" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "电话" diff -Nru kpeople-5.25.0/po/zh_TW/kpeople5.po kpeople-5.34.0/po/zh_TW/kpeople5.po --- kpeople-5.25.0/po/zh_TW/kpeople5.po 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/po/zh_TW/kpeople5.po 2017-05-06 11:58:13.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"POT-Creation-Date: 2016-11-19 20:12+0100\n" "PO-Revision-Date: 2015-05-13 16:50+0800\n" "Last-Translator: Franklin\n" "Language-Team: Chinese Traditional \n" @@ -18,16 +18,19 @@ "X-Generator: Lokalize 1.5\n" #: match.cpp:52 +#, kde-format msgctxt "@title:column" msgid "Name" msgstr "名字" #: match.cpp:55 +#, kde-format msgctxt "@title:column" msgid "E-mail" msgstr "電子郵件" #: widgets/mergedelegate.cpp:99 +#, kde-format msgctxt "reasons join" msgid ", " msgstr ", " @@ -39,32 +42,39 @@ msgstr "%1: %2" #: widgets/mergedialog.cpp:64 +#, kde-format msgid "Duplicates Manager" msgstr "重複管理員" #: widgets/mergedialog.cpp:73 +#, kde-format msgid "Select contacts to be merged" msgstr "選擇要合併的聯絡人" #. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) #: widgets/person-details-presentation.ui:43 +#, kde-format msgid "Avatar" msgstr "頭像" #: widgets/plugins/emaildetailswidget.cpp:50 +#, kde-format msgctxt "E-mail field label" msgid "E-mail" msgstr "電子郵件" #: widgets/plugins/mergecontactswidget.cpp:50 +#, kde-format msgid "Show Merge Suggestions..." msgstr "顯示合併建議..." #: widgets/plugins/mergecontactswidget.cpp:88 +#, kde-format msgid "Merge with Selected Contacts" msgstr "與選取的聯絡人合併" #: widgets/plugins/phonedetailswidget.cpp:38 +#, kde-format msgctxt "Phone details title" msgid "Phone" msgstr "電話" diff -Nru kpeople-5.25.0/src/backends/allcontactsmonitor.cpp kpeople-5.34.0/src/backends/allcontactsmonitor.cpp --- kpeople-5.25.0/src/backends/allcontactsmonitor.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/backends/allcontactsmonitor.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -67,4 +67,3 @@ Q_EMIT initialFetchComplete(success); } -#include "allcontactsmonitor.moc" diff -Nru kpeople-5.25.0/src/backends/contactmonitor.cpp kpeople-5.34.0/src/backends/contactmonitor.cpp --- kpeople-5.25.0/src/backends/contactmonitor.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/backends/contactmonitor.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -29,7 +29,7 @@ }; ContactMonitor::ContactMonitor(const QString &contactUri) - : QObject(0), + : QObject(nullptr), d_ptr(new ContactMonitorPrivate) { Q_D(ContactMonitor); @@ -63,4 +63,3 @@ return d->m_contactUri; } -#include "contactmonitor.moc" diff -Nru kpeople-5.25.0/src/backends/defaultcontactmonitor.cpp kpeople-5.34.0/src/backends/defaultcontactmonitor.cpp --- kpeople-5.25.0/src/backends/defaultcontactmonitor.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/backends/defaultcontactmonitor.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -55,4 +55,3 @@ } } -#include "defaultcontactmonitor.moc" diff -Nru kpeople-5.25.0/src/declarative/declarativepersondata.cpp kpeople-5.34.0/src/declarative/declarativepersondata.cpp --- kpeople-5.25.0/src/declarative/declarativepersondata.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/declarative/declarativepersondata.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -36,7 +36,7 @@ m_id = id; delete m_person; if (m_id.isEmpty()) { - m_person = 0; + m_person = nullptr; } else { m_person = new KPeople::PersonData(id, this); } diff -Nru kpeople-5.25.0/src/declarative/declarativepersondata.h kpeople-5.34.0/src/declarative/declarativepersondata.h --- kpeople-5.25.0/src/declarative/declarativepersondata.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/declarative/declarativepersondata.h 2017-05-06 11:58:13.000000000 +0000 @@ -31,7 +31,7 @@ Q_PROPERTY(KPeople::PersonData *person READ person NOTIFY personChanged) public: - DeclarativePersonData(QObject *parent = 0); + DeclarativePersonData(QObject *parent = nullptr); void setPersonUri(const QString &id); QString personUri() const; diff -Nru kpeople-5.25.0/src/declarative/peopleqmlplugin.cpp kpeople-5.34.0/src/declarative/peopleqmlplugin.cpp --- kpeople-5.25.0/src/declarative/peopleqmlplugin.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/declarative/peopleqmlplugin.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -40,7 +40,7 @@ SendFileAction = KPeople::SendFileAction, OtherAction = KPeople::OtherAction }; - Q_ENUMS(ActionType) + Q_ENUM(ActionType) }; void PeopleQMLPlugin::registerTypes(const char *uri) diff -Nru kpeople-5.25.0/src/declarative/peopleqmlplugin.h kpeople-5.34.0/src/declarative/peopleqmlplugin.h --- kpeople-5.25.0/src/declarative/peopleqmlplugin.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/declarative/peopleqmlplugin.h 2017-05-06 11:58:13.000000000 +0000 @@ -27,7 +27,7 @@ Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: - virtual void registerTypes(const char *uri); + void registerTypes(const char *uri) Q_DECL_OVERRIDE; }; #endif // PEOPLEQMLPLUGIN_H diff -Nru kpeople-5.25.0/src/declarative/personactionsmodel.cpp kpeople-5.34.0/src/declarative/personactionsmodel.cpp --- kpeople-5.25.0/src/declarative/personactionsmodel.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/declarative/personactionsmodel.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -27,7 +27,7 @@ { struct PersonActionsPrivate { PersonActionsPrivate() - : person(0) + : person(nullptr) {} QList actions; diff -Nru kpeople-5.25.0/src/declarative/personactionsmodel_p.h kpeople-5.34.0/src/declarative/personactionsmodel_p.h --- kpeople-5.25.0/src/declarative/personactionsmodel_p.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/declarative/personactionsmodel_p.h 2017-05-06 11:58:13.000000000 +0000 @@ -42,11 +42,11 @@ ActionTypeRole }; - PersonActionsModel(QObject *parent = 0); + PersonActionsModel(QObject *parent = nullptr); virtual ~PersonActionsModel(); - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; QString personUri() const; void setPersonUri(const QString &personUri); diff -Nru kpeople-5.25.0/src/duplicatesfinder_p.h kpeople-5.34.0/src/duplicatesfinder_p.h --- kpeople-5.25.0/src/duplicatesfinder_p.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/duplicatesfinder_p.h 2017-05-06 11:58:13.000000000 +0000 @@ -39,7 +39,7 @@ { Q_OBJECT public: - explicit DuplicatesFinder(PersonsModel *model, QObject *parent = 0); + explicit DuplicatesFinder(PersonsModel *model, QObject *parent = nullptr); /** Specifies a @p personUri id to look contacts for, in contrast to the whole contact list. */ void setSpecificPerson(const QString &personUri); diff -Nru kpeople-5.25.0/src/match_p.h kpeople-5.34.0/src/match_p.h --- kpeople-5.25.0/src/match_p.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/match_p.h 2017-05-06 11:58:13.000000000 +0000 @@ -43,7 +43,7 @@ NameMatch, EmailMatch }; - Q_ENUMS(MatchReason) + Q_ENUM(MatchReason) Match() {} Match(const QList &roles, const QPersistentModelIndex &a, const QPersistentModelIndex &b); diff -Nru kpeople-5.25.0/src/matchessolver_p.h kpeople-5.34.0/src/matchessolver_p.h --- kpeople-5.25.0/src/matchessolver_p.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/matchessolver_p.h 2017-05-06 11:58:13.000000000 +0000 @@ -51,14 +51,14 @@ * * Note: Obviously, the @p model should be the same @p matches refers to. */ - explicit MatchesSolver(const QList &matches, PersonsModel *model, QObject *parent = 0); + explicit MatchesSolver(const QList &matches, PersonsModel *model, QObject *parent = nullptr); /** * Start doing some crazy matching! * * @see KJob::finished() */ - virtual void start(); + void start() Q_DECL_OVERRIDE; private Q_SLOTS: void startMatching(); diff -Nru kpeople-5.25.0/src/metacontact.cpp kpeople-5.34.0/src/metacontact.cpp --- kpeople-5.25.0/src/metacontact.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/metacontact.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -44,7 +44,7 @@ : m_contacts(contacts) {} - virtual QVariant customProperty(const QString &key) const + QVariant customProperty(const QString &key) const Q_DECL_OVERRIDE { if (key.startsWith(QLatin1String("all-"))) { QVariantList ret; diff -Nru kpeople-5.25.0/src/persondata.h kpeople-5.34.0/src/persondata.h --- kpeople-5.25.0/src/persondata.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/persondata.h 2017-05-06 11:58:13.000000000 +0000 @@ -53,7 +53,7 @@ * The ID can be either a local application specific ID (such as akonadi://?item=15) * or a kpeople ID in the form kpeople://15 */ - PersonData(const QString &id, QObject *parent = 0); + PersonData(const QString &id, QObject *parent = nullptr); virtual ~PersonData(); diff -Nru kpeople-5.25.0/src/personmanager.cpp kpeople-5.34.0/src/personmanager.cpp --- kpeople-5.25.0/src/personmanager.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/personmanager.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -19,7 +19,6 @@ #include "personmanager_p.h" -// #include "personmanager.moc" #include #include #include @@ -277,7 +276,7 @@ PersonManager *PersonManager::instance(const QString &databasePath) { - static PersonManager *s_instance = 0; + static PersonManager *s_instance = nullptr; if (!s_instance) { QString path = databasePath; if (path.isEmpty()) { diff -Nru kpeople-5.25.0/src/personmanager_p.h kpeople-5.34.0/src/personmanager_p.h --- kpeople-5.25.0/src/personmanager_p.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/personmanager_p.h 2017-05-06 11:58:13.000000000 +0000 @@ -82,7 +82,7 @@ void contactAddedToPerson(const QString &contactUri, const QString &newPersonUri); protected: - explicit PersonManager(const QString &databasePath, QObject *parent = 0); + explicit PersonManager(const QString &databasePath, QObject *parent = nullptr); virtual ~PersonManager(); private: diff -Nru kpeople-5.25.0/src/personpluginmanager.cpp kpeople-5.34.0/src/personpluginmanager.cpp --- kpeople-5.25.0/src/personpluginmanager.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/personpluginmanager.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -73,7 +73,7 @@ //TODO: Remove as soon as KTp sources are released with the new plugin system KService::List servicesList = KServiceTypeTrader::self()->query(QStringLiteral("KPeople/DataSource")); Q_FOREACH (const KService::Ptr &service, servicesList) { - BasePersonsDataSource *dataSource = service->createInstance(0); + BasePersonsDataSource *dataSource = service->createInstance(nullptr); if (dataSource) { diff -Nru kpeople-5.25.0/src/personsmodel.h kpeople-5.34.0/src/personsmodel.h --- kpeople-5.25.0/src/personsmodel.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/personsmodel.h 2017-05-06 11:58:13.000000000 +0000 @@ -56,9 +56,9 @@ UserRole = Qt::UserRole + 0x1000 ///< in case it's needed to extend, use this one to start from }; - Q_ENUMS(Role) + Q_ENUM(Role) - PersonsModel(QObject *parent = 0); + PersonsModel(QObject *parent = nullptr); virtual ~PersonsModel(); diff -Nru kpeople-5.25.0/src/personssortfilterproxymodel.h kpeople-5.34.0/src/personssortfilterproxymodel.h --- kpeople-5.25.0/src/personssortfilterproxymodel.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/personssortfilterproxymodel.h 2017-05-06 11:58:13.000000000 +0000 @@ -42,7 +42,7 @@ /** Specifies the properties that should be provided by the contact for the contact to be shown. */ Q_PROPERTY(QStringList requiredProperties READ requiredProperties WRITE setRequiredProperties) public: - PersonsSortFilterProxyModel(QObject *parent = Q_NULLPTR); + PersonsSortFilterProxyModel(QObject *parent = nullptr); ~PersonsSortFilterProxyModel(); QStringList requiredProperties() const; diff -Nru kpeople-5.25.0/src/widgets/abstractfieldwidgetfactory.h kpeople-5.34.0/src/widgets/abstractfieldwidgetfactory.h --- kpeople-5.25.0/src/widgets/abstractfieldwidgetfactory.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/widgets/abstractfieldwidgetfactory.h 2017-05-06 11:58:13.000000000 +0000 @@ -33,7 +33,7 @@ { Q_OBJECT public: - explicit AbstractFieldWidgetFactory(QObject *parent = 0); + explicit AbstractFieldWidgetFactory(QObject *parent = nullptr); virtual ~AbstractFieldWidgetFactory(); virtual QString label() const = 0; diff -Nru kpeople-5.25.0/src/widgets/actions.cpp kpeople-5.34.0/src/widgets/actions.cpp --- kpeople-5.25.0/src/widgets/actions.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/widgets/actions.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -50,7 +50,7 @@ //TODO: Remove as soon as KTp sources are released with the new plugin system KService::List personServicesList = KServiceTypeTrader::self()->query(QStringLiteral("KPeople/Plugin")); Q_FOREACH (const KService::Ptr &service, personServicesList) { - AbstractPersonAction *plugin = service->createInstance(0); + AbstractPersonAction *plugin = service->createInstance(nullptr); if (plugin) { diff -Nru kpeople-5.25.0/src/widgets/mergedelegate.h kpeople-5.34.0/src/widgets/mergedelegate.h --- kpeople-5.25.0/src/widgets/mergedelegate.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/widgets/mergedelegate.h 2017-05-06 11:58:13.000000000 +0000 @@ -45,7 +45,7 @@ private: - void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index)const; + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index)const Q_DECL_OVERRIDE; QWidget *buildExtensionWidget(const QModelIndex &idx); QWidget *buildMultipleLineLabel(const QModelIndex &idx); diff -Nru kpeople-5.25.0/src/widgets/mergedialog.cpp kpeople-5.34.0/src/widgets/mergedialog.cpp --- kpeople-5.25.0/src/widgets/mergedialog.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/widgets/mergedialog.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -57,9 +57,9 @@ { Q_D(MergeDialog); - d_ptr->personsModel = 0; - d_ptr->delegate = 0; - d_ptr->duplicatesFinder = 0; + d_ptr->personsModel = nullptr; + d_ptr->delegate = nullptr; + d_ptr->duplicatesFinder = nullptr; setWindowTitle(i18n("Duplicates Manager")); setLayout(new QVBoxLayout()); diff -Nru kpeople-5.25.0/src/widgets/mergedialog.h kpeople-5.34.0/src/widgets/mergedialog.h --- kpeople-5.25.0/src/widgets/mergedialog.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/widgets/mergedialog.h 2017-05-06 11:58:13.000000000 +0000 @@ -53,7 +53,7 @@ MergeReasonRole }; - explicit MergeDialog(QWidget *parent = 0); + explicit MergeDialog(QWidget *parent = nullptr); ~MergeDialog(); /** diff -Nru kpeople-5.25.0/src/widgets/persondetailsdialog.cpp kpeople-5.34.0/src/widgets/persondetailsdialog.cpp --- kpeople-5.25.0/src/widgets/persondetailsdialog.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/widgets/persondetailsdialog.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -66,4 +66,3 @@ setWindowTitle(person->name()); } -#include "persondetailsdialog.moc" diff -Nru kpeople-5.25.0/src/widgets/persondetailsdialog.h kpeople-5.34.0/src/widgets/persondetailsdialog.h --- kpeople-5.25.0/src/widgets/persondetailsdialog.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/widgets/persondetailsdialog.h 2017-05-06 11:58:13.000000000 +0000 @@ -34,7 +34,7 @@ Q_OBJECT public: - explicit PersonDetailsDialog(QWidget *parent = 0, Qt::WindowFlags f = 0); + explicit PersonDetailsDialog(QWidget *parent = nullptr, Qt::WindowFlags f = nullptr); virtual ~PersonDetailsDialog(); void setPerson(PersonData *person); diff -Nru kpeople-5.25.0/src/widgets/persondetailsview.cpp kpeople-5.34.0/src/widgets/persondetailsview.cpp --- kpeople-5.25.0/src/widgets/persondetailsview.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/widgets/persondetailsview.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -58,9 +58,9 @@ public: CoreFieldsPlugin(const QString &field); virtual ~CoreFieldsPlugin(); - virtual QString label() const; - virtual int sortWeight() const; - virtual QWidget *createDetailsWidget(const PersonData &person, QWidget *parent) const; + QString label() const Q_DECL_OVERRIDE; + int sortWeight() const Q_DECL_OVERRIDE; + QWidget *createDetailsWidget(const PersonData &person, QWidget *parent) const Q_DECL_OVERRIDE; private: QString m_field; }; @@ -90,12 +90,12 @@ { // we have a plugin specific for e-mails. if (m_field == QLatin1String("email")) { - return 0; + return nullptr; } QString text = person.contactCustomProperty(m_field).toString(); if (text.isEmpty()) { - return 0; + return nullptr; } return new QLabel(text, parent); } @@ -107,7 +107,7 @@ Q_D(PersonDetailsView); setLayout(new QVBoxLayout(this)); d->m_mainWidget = new QWidget(this); - d->m_person = 0; + d->m_person = nullptr; QWidget *details = new QWidget(); d->m_personDetailsPresentation = new Ui::PersonDetailsPresentation(); diff -Nru kpeople-5.25.0/src/widgets/persondetailsview.h kpeople-5.34.0/src/widgets/persondetailsview.h --- kpeople-5.25.0/src/widgets/persondetailsview.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/widgets/persondetailsview.h 2017-05-06 11:58:13.000000000 +0000 @@ -41,7 +41,7 @@ { Q_OBJECT public: - PersonDetailsView(QWidget *parent = 0); + PersonDetailsView(QWidget *parent = nullptr); virtual ~PersonDetailsView(); public Q_SLOTS: diff -Nru kpeople-5.25.0/src/widgets/plugins/emaildetailswidget.cpp kpeople-5.34.0/src/widgets/plugins/emaildetailswidget.cpp --- kpeople-5.25.0/src/widgets/plugins/emaildetailswidget.cpp 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/widgets/plugins/emaildetailswidget.cpp 2017-05-06 11:58:13.000000000 +0000 @@ -33,7 +33,7 @@ QWidget *EmailFieldsPlugin::createDetailsWidget(const PersonData &person, QWidget *parent) const { if (person.allEmails().isEmpty()) { - return 0; + return nullptr; } QWidget *widget = new QWidget(parent); QVBoxLayout *layout = new QVBoxLayout(widget); diff -Nru kpeople-5.25.0/src/widgets/plugins/emaildetailswidget.h kpeople-5.34.0/src/widgets/plugins/emaildetailswidget.h --- kpeople-5.25.0/src/widgets/plugins/emaildetailswidget.h 2016-08-07 13:55:48.000000000 +0000 +++ kpeople-5.34.0/src/widgets/plugins/emaildetailswidget.h 2017-05-06 11:58:13.000000000 +0000 @@ -26,9 +26,9 @@ class EmailFieldsPlugin : public AbstractFieldWidgetFactory { public: - virtual QString label() const; - virtual int sortWeight() const; - virtual QWidget *createDetailsWidget(const PersonData &person, QWidget *parent) const; + QString label() const Q_DECL_OVERRIDE; + int sortWeight() const Q_DECL_OVERRIDE; + QWidget *createDetailsWidget(const PersonData &person, QWidget *parent) const Q_DECL_OVERRIDE; }; #endif // EMAIL_DETAILS_WIDGET_H