Hello community,
here is the log from the commit of package kpeople5 for openSUSE:Factory checked in at 2017-01-31 12:07:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kpeople5 (Old)
and /work/SRC/openSUSE:Factory/.kpeople5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpeople5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kpeople5/kpeople5.changes 2016-12-17 11:12:07.444664721 +0100
+++ /work/SRC/openSUSE:Factory/.kpeople5.new/kpeople5.changes 2017-02-03 17:45:58.602420738 +0100
@@ -1,0 +2,7 @@
+Sun Jan 8 23:43:04 UTC 2017 - hrvoje.senjan@gmail.com
+
+- Update to 5.30.0
+ * For more details please see:
+ https://www.kde.org/announcements/kde-frameworks-5.30.0.php
+
+-------------------------------------------------------------------
Old:
----
kpeople-5.29.0.tar.xz
New:
----
kpeople-5.30.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kpeople5.spec ++++++
--- /var/tmp/diff_new_pack.v0OQBB/_old 2017-02-03 17:45:58.982366958 +0100
+++ /var/tmp/diff_new_pack.v0OQBB/_new 2017-02-03 17:45:58.982366958 +0100
@@ -1,7 +1,7 @@
#
# spec file for package kpeople5
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,9 +18,9 @@
%bcond_without lang
%define rname kpeople
-%define _tar_path 5.29
+%define _tar_path 5.30
Name: kpeople5
-Version: 5.29.0
+Version: 5.30.0
Release: 0
%define kf5_version %{version}
BuildRequires: extra-cmake-modules >= %{_tar_path}
++++++ kpeople-5.29.0.tar.xz -> kpeople-5.30.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/CMakeLists.txt new/kpeople-5.30.0/CMakeLists.txt
--- old/kpeople-5.29.0/CMakeLists.txt 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/CMakeLists.txt 2017-01-08 21:59:37.000000000 +0100
@@ -1,17 +1,16 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)
-project (KPeople)
+set(KF5_VERSION "5.30.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.30.0") # handled by release scripts
+project (KPeople VERSION ${KF5_VERSION})
include(FeatureSummary)
-find_package(ECM 5.29.0 NO_MODULE)
+find_package(ECM 5.30.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.29.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.29.0") # handled by release scripts
-
set(REQUIRED_QT_VERSION 5.5.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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/KF5PeopleConfig.cmake.in new/kpeople-5.30.0/KF5PeopleConfig.cmake.in
--- old/kpeople-5.29.0/KF5PeopleConfig.cmake.in 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/KF5PeopleConfig.cmake.in 2017-01-08 21:59:37.000000000 +0100
@@ -1,5 +1,6 @@
@PACKAGE_INIT@
+include(CMakeFindDependencyMacro)
find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
include("${CMAKE_CURRENT_LIST_DIR}/KPeopleTargets.cmake")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/autotests/fakecontactsource.cpp new/kpeople-5.30.0/autotests/fakecontactsource.cpp
--- old/kpeople-5.29.0/autotests/fakecontactsource.cpp 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/autotests/fakecontactsource.cpp 2017-01-08 21:59:37.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/autotests/fakecontactsource.h new/kpeople-5.30.0/autotests/fakecontactsource.h
--- old/kpeople-5.29.0/autotests/fakecontactsource.h 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/autotests/fakecontactsource.h 2017-01-08 21:59:37.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/examples/contactlistwidgets.cpp new/kpeople-5.30.0/examples/contactlistwidgets.cpp
--- old/kpeople-5.29.0/examples/contactlistwidgets.cpp 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/examples/contactlistwidgets.cpp 2017-01-08 21:59:37.000000000 +0100
@@ -40,8 +40,8 @@
PersonsDelegate(QObject *parent = 0);
~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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/ast/kpeople5.po new/kpeople-5.30.0/po/ast/kpeople5.po
--- old/kpeople-5.29.0/po/ast/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/ast/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -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: 2016-11-19 20:12+0100\n"
-"PO-Revision-Date: 2015-07-11 16:23+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"
@@ -49,7 +49,7 @@
#: 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
@@ -66,7 +66,7 @@
#: 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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/bs/kpeople5.po new/kpeople-5.30.0/po/bs/kpeople5.po
--- old/kpeople-5.29.0/po/bs/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/bs/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -82,24 +82,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telefon"
-
-#~ msgid "No Subject"
-#~ msgstr "Bez naslova"
-
-#~ msgid "Subject: "
-#~ msgstr "Predmet: "
-
-#~ msgid "No Emails"
-#~ msgstr "Nema e-pošte"
-
-#, fuzzy
-#~| msgid "Mails"
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Pošta"
-
-#~ msgid "Email"
-#~ msgstr "E-pošta"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "SweetPeople - KPeople primjer"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/ca/kpeople5.po new/kpeople-5.30.0/po/ca/kpeople5.po
--- old/kpeople-5.29.0/po/ca/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/ca/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -81,19 +81,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telèfon"
-
-#~ msgid "No Subject"
-#~ msgstr "Sense assumpte"
-
-#~ msgid "Subject: "
-#~ msgstr "Assumpte: "
-
-#~ msgid "No Emails"
-#~ msgstr "Sense correu electrònic"
-
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Correus"
-
-#~ msgid "Email"
-#~ msgstr "Correu electrònic"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/ca@valencia/kpeople5.po new/kpeople-5.30.0/po/ca@valencia/kpeople5.po
--- old/kpeople-5.29.0/po/ca@valencia/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/ca@valencia/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -81,19 +81,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telèfon"
-
-#~ msgid "No Subject"
-#~ msgstr "Sense assumpte"
-
-#~ msgid "Subject: "
-#~ msgstr "Assumpte: "
-
-#~ msgid "No Emails"
-#~ msgstr "Sense correu electrònic"
-
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Correus"
-
-#~ msgid "Email"
-#~ msgstr "Correu electrònic"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/da/kpeople5.po new/kpeople-5.30.0/po/da/kpeople5.po
--- old/kpeople-5.29.0/po/da/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/da/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -78,31 +78,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telefon"
-
-#~ msgid "No Subject"
-#~ msgstr "Intet emne"
-
-#~ msgid "Subject: "
-#~ msgstr "Emne: "
-
-#~ msgid "No Emails"
-#~ msgstr "Ingen e-mails"
-
-#, fuzzy
-#~| msgid "Mails"
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "E-mails"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "SweetPeople - KPeople eksempel"
-
-#~ msgid "Unknown contact"
-#~ msgstr "Ukendt kontakt"
-
-#~ msgctxt "%1 is a specific email address"
-#~ msgid "Email %1"
-#~ msgstr "E-mail %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/de/kpeople5.po new/kpeople-5.30.0/po/de/kpeople5.po
--- old/kpeople-5.29.0/po/de/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/de/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -75,34 +75,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telefon"
-
-#~ msgid "No Subject"
-#~ msgstr "Kein Betreff"
-
-#~ msgid "Subject: "
-#~ msgstr "Betreff: "
-
-#~ msgid "No Emails"
-#~ msgstr "Keine E-Mails"
-
-#, fuzzy
-#~| msgid "Mails"
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "E-Mails"
-
-#~ msgid "Email"
-#~ msgstr "E-Mail"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "Nette Leute - Beispiel für KPeople"
-
-#~ msgid "Form"
-#~ msgstr "Formular"
-
-#~ msgid "Unknown contact"
-#~ msgstr "Unbekannter Kontakt"
-
-#~ msgctxt "%1 is a specific email address"
-#~ msgid "Email %1"
-#~ msgstr "E-Mail %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/el/kpeople5.po new/kpeople-5.30.0/po/el/kpeople5.po
--- old/kpeople-5.29.0/po/el/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/el/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -79,14 +79,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Τηλέφωνο"
-
-#, fuzzy
-#~| msgid "Email"
-#~ msgid "No Emails"
-#~ msgstr "Email"
-
-#~ msgid "Email"
-#~ msgstr "Email"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "SweetPeople - Παράδειγμα KPeople"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/es/kpeople5.po new/kpeople-5.30.0/po/es/kpeople5.po
--- old/kpeople-5.29.0/po/es/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/es/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -78,24 +78,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Teléfono"
-
-#~ msgid "No Subject"
-#~ msgstr "Sin asunto"
-
-#~ msgid "Subject: "
-#~ msgstr "Asunto: "
-
-#~ msgid "No Emails"
-#~ msgstr "Ningún correo electrónico"
-
-#, fuzzy
-#~| msgid "Mails"
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Correos electrónicos"
-
-#~ msgid "Email"
-#~ msgstr "Correo electrónico"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "SweetPeople - Ejemplo de KPeople"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/fi/kpeople5.po new/kpeople-5.30.0/po/fi/kpeople5.po
--- old/kpeople-5.29.0/po/fi/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/fi/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -78,22 +78,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Puhelin"
-
-#~ msgid "No Subject"
-#~ msgstr "Ei aihetta"
-
-#~ msgid "Subject: "
-#~ msgstr "Aihe: "
-
-#~ msgid "No Emails"
-#~ msgstr "Ei sähköpostia"
-
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Sähköpostit"
-
-#~ msgid "Email"
-#~ msgstr "Sähköposti"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "SweetPeople – KPeople-esimerkki"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/fr/kpeople5.po new/kpeople-5.30.0/po/fr/kpeople5.po
--- old/kpeople-5.29.0/po/fr/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/fr/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -82,24 +82,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Téléphone"
-
-#~ msgid "No Subject"
-#~ msgstr "Aucun sujet"
-
-#~ msgid "Subject: "
-#~ msgstr "Sujet : "
-
-#~ msgid "No Emails"
-#~ msgstr "Aucune adresse électronique"
-
-#, fuzzy
-#~| msgid "Mails"
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Adresse électronique"
-
-#~ msgid "Email"
-#~ msgstr "Adresse électronique"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "Personnes Sympas - Un exemple KPeople"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/hu/kpeople5.po new/kpeople-5.30.0/po/hu/kpeople5.po
--- old/kpeople-5.29.0/po/hu/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/hu/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -79,31 +79,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telefon"
-
-#~ msgid "No Subject"
-#~ msgstr "Nincs tárgy"
-
-#~ msgid "Subject: "
-#~ msgstr "Tárgy: "
-
-#~ msgid "No Emails"
-#~ msgstr "Nincsenek e-mailek"
-
-#, fuzzy
-#~| msgid "Mails"
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Levelek"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "Kedves emberek - KPeople példa"
-
-#~ msgid "Unknown contact"
-#~ msgstr "Ismeretlen partner"
-
-#~ msgctxt "%1 is a specific email address"
-#~ msgid "Email %1"
-#~ msgstr "E-mail %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/lt/kpeople5.po new/kpeople-5.30.0/po/lt/kpeople5.po
--- old/kpeople-5.29.0/po/lt/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/lt/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -85,21 +85,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telefonas"
-
-#~ msgid "No Subject"
-#~ msgstr "Nėra temos"
-
-#~ msgid "Subject: "
-#~ msgstr "Tema: "
-
-#~ msgid "No Emails"
-#~ msgstr "Nėra el. laiškų"
-
-#, fuzzy
-#~| msgid "Mails"
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Laiškai"
-
-#~ msgid "Email"
-#~ msgstr "El. paštas"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/nl/kpeople5.po new/kpeople-5.30.0/po/nl/kpeople5.po
--- old/kpeople-5.29.0/po/nl/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/nl/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -78,32 +78,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telefoon"
-
-#~ msgid "No Subject"
-#~ msgstr "Geen onderwerp"
-
-#~ msgid "Subject: "
-#~ msgstr "Onderwerp: "
-
-#~ msgid "No Emails"
-#~ msgstr "Geen e-mailberichten"
-
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "E-mailberichten"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "SweetPeople - KPeople voorbeeld"
-
-#~ msgid "Form"
-#~ msgstr "Formulier"
-
-#~ msgid "Unknown contact"
-#~ msgstr "Onbekende contactpersoon"
-
-#~ msgctxt "%1 is a specific email address"
-#~ msgid "Email %1"
-#~ msgstr "E-mail %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/pl/kpeople5.po new/kpeople-5.30.0/po/pl/kpeople5.po
--- old/kpeople-5.29.0/po/pl/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/pl/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -79,24 +79,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telefon"
-
-#~ msgid "No Subject"
-#~ msgstr "Brak tematu"
-
-#~ msgid "Subject: "
-#~ msgstr "Temat"
-
-#~ msgid "No Emails"
-#~ msgstr "Brak poczty"
-
-#, fuzzy
-#~| msgid "Mails"
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Wiadomości"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "SweetPeople - Przykład KPeople"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/pt/kpeople5.po new/kpeople-5.30.0/po/pt/kpeople5.po
--- old/kpeople-5.29.0/po/pt/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/pt/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -75,16 +75,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telefone"
-
-#~ msgid "No Subject"
-#~ msgstr "Sem Assunto"
-
-#~ msgid "Subject: "
-#~ msgstr "Assunto: "
-
-#~ msgid "No Emails"
-#~ msgstr "Sem E-Mails"
-
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "E-Mails"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/pt_BR/kpeople5.po new/kpeople-5.30.0/po/pt_BR/kpeople5.po
--- old/kpeople-5.29.0/po/pt_BR/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/pt_BR/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -80,16 +80,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telefone"
-
-#~ msgid "No Subject"
-#~ msgstr "Sem assunto"
-
-#~ msgid "Subject: "
-#~ msgstr "Assunto: "
-
-#~ msgid "No Emails"
-#~ msgstr "Sem e-mails"
-
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Mensagens"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/ro/kpeople5.po new/kpeople-5.30.0/po/ro/kpeople5.po
--- old/kpeople-5.29.0/po/ro/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/ro/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -82,11 +82,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telefon"
-
-#, fuzzy
-#~| msgid "Email"
-#~ msgid "No Emails"
-#~ msgstr "Email"
-
-#~ msgid "Email"
-#~ msgstr "Email"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/ru/kpeople5.po new/kpeople-5.30.0/po/ru/kpeople5.po
--- old/kpeople-5.29.0/po/ru/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/ru/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -79,14 +79,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Телефон"
-
-#, fuzzy
-#~| msgid "Email"
-#~ msgid "No Emails"
-#~ msgstr "Адрес электронной почты"
-
-#~ msgid "Email"
-#~ msgstr "Адрес электронной почты"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "SweetPeople — Пример использования KPeople"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/sk/kpeople5.po new/kpeople-5.30.0/po/sk/kpeople5.po
--- old/kpeople-5.29.0/po/sk/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/sk/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -76,24 +76,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telefón"
-
-#~ msgid "No Subject"
-#~ msgstr "Bez predmetu"
-
-#~ msgid "Subject: "
-#~ msgstr "Predmet: "
-
-#~ msgid "No Emails"
-#~ msgstr "Žiadne e-maily"
-
-#, fuzzy
-#~| msgid "Mails"
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Maily"
-
-#~ msgid "Email"
-#~ msgstr "E-mail"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "SweetPeople - Príklad KPeople"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/sl/kpeople5.po new/kpeople-5.30.0/po/sl/kpeople5.po
--- old/kpeople-5.29.0/po/sl/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/sl/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -80,24 +80,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telefon"
-
-#~ msgid "No Subject"
-#~ msgstr "Brez zadeve"
-
-#~ msgid "Subject: "
-#~ msgstr "Zadeva: "
-
-#~ msgid "No Emails"
-#~ msgstr "Ni e-pošte"
-
-#, fuzzy
-#~| msgid "Mails"
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Pošta"
-
-#~ msgid "Email"
-#~ msgstr "E-pošta"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "Primer za KPeople - SweetPeople"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/sv/kpeople5.po new/kpeople-5.30.0/po/sv/kpeople5.po
--- old/kpeople-5.29.0/po/sv/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/sv/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -78,32 +78,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Telefon"
-
-#~ msgid "No Subject"
-#~ msgstr "Ingen rubrik"
-
-#~ msgid "Subject: "
-#~ msgstr "Rubrik: "
-
-#~ msgid "No Emails"
-#~ msgstr "Ingen e-post"
-
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Brev"
-
-#~ msgid "Email"
-#~ msgstr "E-post"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "Kpeople-exempel: Trevligt folk"
-
-#~ msgid "Form"
-#~ msgstr "Formulär"
-
-#~ msgid "Unknown contact"
-#~ msgstr "Okänd kontakt"
-
-#~ msgctxt "%1 is a specific email address"
-#~ msgid "Email %1"
-#~ msgstr "Skicka e-post till %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/po/uk/kpeople5.po new/kpeople-5.30.0/po/uk/kpeople5.po
--- old/kpeople-5.29.0/po/uk/kpeople5.po 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/po/uk/kpeople5.po 2017-01-08 21:59:37.000000000 +0100
@@ -81,32 +81,3 @@
msgctxt "Phone details title"
msgid "Phone"
msgstr "Телефон"
-
-#~ msgid "No Subject"
-#~ msgstr "Без теми"
-
-#~ msgid "Subject: "
-#~ msgstr "Тема: "
-
-#~ msgid "No Emails"
-#~ msgstr "Немає повідомлень"
-
-#~ msgctxt "Emails field label"
-#~ msgid "Mails"
-#~ msgstr "Пошта"
-
-#~ msgid "Email"
-#~ msgstr "Електронна пошта"
-
-#~ msgid "SweetPeople - KPeople Example"
-#~ msgstr "SweetPeople — приклад KPeople"
-
-#~ msgid "Form"
-#~ msgstr "Форма"
-
-#~ msgid "Unknown contact"
-#~ msgstr "Невідомий контакт"
-
-#~ msgctxt "%1 is a specific email address"
-#~ msgid "Email %1"
-#~ msgstr "Надіслати за адресою %1"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/src/backends/allcontactsmonitor.cpp new/kpeople-5.30.0/src/backends/allcontactsmonitor.cpp
--- old/kpeople-5.29.0/src/backends/allcontactsmonitor.cpp 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/src/backends/allcontactsmonitor.cpp 2017-01-08 21:59:37.000000000 +0100
@@ -67,4 +67,3 @@
Q_EMIT initialFetchComplete(success);
}
-#include "allcontactsmonitor.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/src/backends/contactmonitor.cpp new/kpeople-5.30.0/src/backends/contactmonitor.cpp
--- old/kpeople-5.29.0/src/backends/contactmonitor.cpp 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/src/backends/contactmonitor.cpp 2017-01-08 21:59:37.000000000 +0100
@@ -63,4 +63,3 @@
return d->m_contactUri;
}
-#include "contactmonitor.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/src/backends/defaultcontactmonitor.cpp new/kpeople-5.30.0/src/backends/defaultcontactmonitor.cpp
--- old/kpeople-5.29.0/src/backends/defaultcontactmonitor.cpp 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/src/backends/defaultcontactmonitor.cpp 2017-01-08 21:59:37.000000000 +0100
@@ -55,4 +55,3 @@
}
}
-#include "defaultcontactmonitor.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/src/declarative/peopleqmlplugin.h new/kpeople-5.30.0/src/declarative/peopleqmlplugin.h
--- old/kpeople-5.29.0/src/declarative/peopleqmlplugin.h 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/src/declarative/peopleqmlplugin.h 2017-01-08 21:59:37.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/src/declarative/personactionsmodel_p.h new/kpeople-5.30.0/src/declarative/personactionsmodel_p.h
--- old/kpeople-5.29.0/src/declarative/personactionsmodel_p.h 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/src/declarative/personactionsmodel_p.h 2017-01-08 21:59:37.000000000 +0100
@@ -45,8 +45,8 @@
PersonActionsModel(QObject *parent = 0);
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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/src/matchessolver_p.h new/kpeople-5.30.0/src/matchessolver_p.h
--- old/kpeople-5.29.0/src/matchessolver_p.h 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/src/matchessolver_p.h 2017-01-08 21:59:37.000000000 +0100
@@ -58,7 +58,7 @@
*
* @see KJob::finished()
*/
- virtual void start();
+ void start() Q_DECL_OVERRIDE;
private Q_SLOTS:
void startMatching();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/src/metacontact.cpp new/kpeople-5.30.0/src/metacontact.cpp
--- old/kpeople-5.29.0/src/metacontact.cpp 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/src/metacontact.cpp 2017-01-08 21:59:37.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/src/personmanager.cpp new/kpeople-5.30.0/src/personmanager.cpp
--- old/kpeople-5.29.0/src/personmanager.cpp 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/src/personmanager.cpp 2017-01-08 21:59:37.000000000 +0100
@@ -19,7 +19,6 @@
#include "personmanager_p.h"
-// #include "personmanager.moc"
#include <QVariant>
#include <QDebug>
#include <QStandardPaths>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/src/widgets/mergedelegate.h new/kpeople-5.30.0/src/widgets/mergedelegate.h
--- old/kpeople-5.29.0/src/widgets/mergedelegate.h 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/src/widgets/mergedelegate.h 2017-01-08 21:59:37.000000000 +0100
@@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/src/widgets/persondetailsdialog.cpp new/kpeople-5.30.0/src/widgets/persondetailsdialog.cpp
--- old/kpeople-5.29.0/src/widgets/persondetailsdialog.cpp 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/src/widgets/persondetailsdialog.cpp 2017-01-08 21:59:37.000000000 +0100
@@ -66,4 +66,3 @@
setWindowTitle(person->name());
}
-#include "persondetailsdialog.moc"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/src/widgets/persondetailsview.cpp new/kpeople-5.30.0/src/widgets/persondetailsview.cpp
--- old/kpeople-5.29.0/src/widgets/persondetailsview.cpp 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/src/widgets/persondetailsview.cpp 2017-01-08 21:59:37.000000000 +0100
@@ -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;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.29.0/src/widgets/plugins/emaildetailswidget.h new/kpeople-5.30.0/src/widgets/plugins/emaildetailswidget.h
--- old/kpeople-5.29.0/src/widgets/plugins/emaildetailswidget.h 2016-12-03 22:09:08.000000000 +0100
+++ new/kpeople-5.30.0/src/widgets/plugins/emaildetailswidget.h 2017-01-08 21:59:37.000000000 +0100
@@ -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