[SCM] ktp-contact-list packaging branch, upstream, updated. upstream/0.8.80-5-g6dda1c3

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=619f7d5

The following commit has been merged in the upstream branch:
commit 619f7d580008da5efca59bd78c695cbfec5936da
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Sep 10 14:05:39 2015 +0200

    Imported Upstream version 15.08.0
---
 CMakeLists.txt                 | 10 +++++++---
 context-menu.cpp               |  9 ++++-----
 org.kde.ktpcontactlist.desktop |  7 ++++++-
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ab2f11..4fb4099 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,12 @@ project (ktp-contactlist)
 
 cmake_minimum_required(VERSION 2.8.12)
 
-set(KTP_CONTACT_LIST_VERSION "15.04.2")
+# KDE Application Version, managed by release script
+set (KDE_APPLICATIONS_VERSION_MAJOR "15")
+set (KDE_APPLICATIONS_VERSION_MINOR "08")
+set (KDE_APPLICATIONS_VERSION_MICRO "0")
+
+set(KTP_CONTACT_LIST_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}")
 
 set(IS_KTP_INTERNAL_MODULE TRUE)
 
@@ -10,10 +15,9 @@ find_package(ECM 1.3.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 
 find_package (Qt5 5.0 REQUIRED COMPONENTS Widgets Xml)
-find_package (KF5 5.0 REQUIRED COMPONENTS DBusAddons KIO KCMUtils Notifications WindowSystem NotifyConfig I18n IconThemes XmlGui KCMUtils)
+find_package (KF5 5.11 REQUIRED COMPONENTS DBusAddons KIO KCMUtils Notifications WindowSystem NotifyConfig I18n IconThemes XmlGui KCMUtils People)
 find_package (TelepathyQt5 0.9.3 REQUIRED)
 find_package (KTp REQUIRED)
-find_package (KF5People 0.5)
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
diff --git a/context-menu.cpp b/context-menu.cpp
index e863cca..952b73a 100644
--- a/context-menu.cpp
+++ b/context-menu.cpp
@@ -158,7 +158,7 @@ QMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
             action->setEnabled(true);
         }
 
-        action = menu->addAction(i18n("Open Log Viewer..."));
+        action = menu->addAction(i18n("Open Log..."));
         action->setIcon(QIcon::fromTheme("documentation"));
         action->setDisabled(true);
         connect(action, SIGNAL(triggered(bool)),
@@ -274,15 +274,14 @@ QMenu* ContextMenu::contactContextMenu(const QModelIndex &index)
         }
 
         // remove contact action, must be QAction because that's what menu->addAction returns
-
         //TODO find an "if canRemove"
-        QAction *removeAction = menu->addAction(QIcon::fromTheme("list-remove-user"), i18n("Remove Contact"));
+        QAction *removeAction = menu->addAction(QIcon::fromTheme("list-remove-user"), i18n("Remove Contact..."));
         connect(removeAction, SIGNAL(triggered(bool)), this, SLOT(onDeleteContactTriggered()));
 
         menu->addSeparator();
     }
 
-    action = menu->addAction(i18n("Show Info..."));
+    action = menu->addAction(i18n("Show Contact Information..."));
     action->setIcon(QIcon::fromTheme(""));
     connect(action, SIGNAL(triggered()), SLOT(onShowInfoTriggered()));
 
@@ -349,7 +348,7 @@ void ContextMenu::onShowInfoTriggered()
 
     if (KTp::kpeopleEnabled()) {
     #ifdef HAVE_KPEOPLE
-        const QString &personId = m_currentIndex.data(KTp::PersonIdRole).toString();
+        QString personId = m_currentIndex.data(KTp::PersonIdRole).toString();
         if (!personId.isEmpty()) {
             KPeople::PersonDetailsDialog *view = new KPeople::PersonDetailsDialog(m_mainWidget);
             KPeople::PersonData *person = new KPeople::PersonData(personId, view);
diff --git a/org.kde.ktpcontactlist.desktop b/org.kde.ktpcontactlist.desktop
index a5d0041..b24ccf3 100644
--- a/org.kde.ktpcontactlist.desktop
+++ b/org.kde.ktpcontactlist.desktop
@@ -1,5 +1,7 @@
 [Desktop Entry]
 Name=IM Contacts
+Name[ar]=متراسلون ت‌م
+Name[ast]=Contautos MI
 Name[bs]=IM kontakti
 Name[ca]=Contactes de MI
 Name[cs]=Kontakty IM
@@ -11,6 +13,7 @@ Name[es]=Contactos de MI
 Name[et]=Kiirsuhtluskontaktid
 Name[fi]=Pikaviestinkäyttäjät
 Name[fr]=Contacts de messagerie instantanée
+Name[gl]=Contactos de mensaxaría instantánea
 Name[hu]=Azonnali üzenetküldési partnerek
 Name[ia]=IM Contacts (Contactos de  IM)
 Name[it]=Contatti di MI
@@ -20,7 +23,7 @@ Name[nds]=KN-Kontakten
 Name[nl]=IM-contactpersonen
 Name[pl]=Kontakty komunikatorów internetowych
 Name[pt]=Contactos de MI
-Name[pt_BR]=Contatos de mensagens instantâneas
+Name[pt_BR]=Contatos de Mensagens Instantâneas
 Name[ro]=Contacte de MI
 Name[ru]=Список контактов
 Name[sk]=IM kontakty
@@ -36,6 +39,7 @@ Name[x-test]=xxIM Contactsxx
 Name[zh_CN]=即时通讯联系人
 Name[zh_TW]=即時訊息聯絡人
 GenericName=Instant Messenger Contacts
+GenericName[ar]=متراسلو المرسال المباشر
 GenericName[ast]=Contautos de mensaxería nel intre
 GenericName[bs]=Kontakti za instant poruke
 GenericName[ca]=Contactes de missatgeria instantània
@@ -82,6 +86,7 @@ GenericName[x-test]=xxInstant Messenger Contactsxx
 GenericName[zh_CN]=即时通讯联系人
 GenericName[zh_TW]=即時訊息聯絡人
 Comment=Displays your instant messenger contacts
+Comment[ar]=يعرض متراسلي المرسال المباشر
 Comment[ast]=Amuesa los tos contautos de mensaxería instanatanea
 Comment[bs]=Prikazuje kontakte programa za instant poruke
 Comment[ca]=Mostra els vostres contactes de missatgeria instantània

-- 
ktp-contact-list packaging