[SCM] ktp-contact-applet packaging branch, master, updated. debian/0.7.0-1-23-g3b5f64c

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-desktop-applets.git;a=commitdiff;h=1d8ad22

The following commit has been merged in the master branch:
commit 1d8ad22916a1a69edaf709fda75e9e6e2d30295c
Merge: f9bc7b387fa03623b9bff7e59af22815915a129a 78bc7189162ccb656aa84548d32ba961215510ea
Author: Diane Trout <diane at ghic.org>
Date:   Sat Sep 20 20:29:31 2014 -0700

    Merge tag 'upstream/0.8.80'
    
    Upstream version 0.8.80

 CMakeLists.txt                                     |   2 +-
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml   |  20 +---
 .../contents/ui/ConversationDelegate.qml           |   9 ++
 chat/org.kde.ktp-chat/contents/ui/TextDelegate.qml |   2 +-
 chat/org.kde.ktp-chat/metadata.desktop.cmake       |   9 +-
 contact/plasma-applet-ktp-contact.desktop.cmake    |   6 ++
 .../org.kde.ktp-contactlist/metadata.desktop.cmake |   7 +-
 po/CMakeLists.txt                                  |   1 +
 po/en_GB/CMakeLists.txt                            |   2 +
 .../plasma_applet_org.kde.ktp-contact.po           |  19 ++--
 .../plasma_applet_org.kde.ktp-presence.po          |  34 +++---
 po/et/plasma_applet_org.kde.ktp-contact.po         |   8 +-
 po/et/plasma_applet_org.kde.ktp-presence.po        |   9 +-
 po/fr/plasma_applet_org.kde.ktp-presence.po        |  10 +-
 po/hu/plasma_applet_org.kde.ktp-contact.po         |  11 +-
 po/ja/plasma_applet_org.kde.ktp-contact.po         |   2 +-
 po/ja/plasma_applet_org.kde.ktp-presence.po        |   2 +-
 po/ko/plasma_applet_org.kde.ktp-contact.po         |   5 +-
 po/nds/plasma_applet_org.kde.ktp-contact.po        |  12 ++-
 po/nds/plasma_applet_org.kde.ktp-presence.po       |  27 +++--
 po/ro/plasma_applet_org.kde.ktp-contact.po         |   8 +-
 po/uk/plasma_applet_org.kde.ktp-contact.po         |   2 +-
 po/uk/plasma_applet_org.kde.ktp-presence.po        |   2 +-
 presence/plasma-applet-ktp-presence.desktop.cmake  |   3 +
 presence/src/presence-applet.cpp                   | 114 +++++----------------
 presence/src/presence-applet.h                     |   6 +-
 26 files changed, 140 insertions(+), 192 deletions(-)

-- 
ktp-contact-applet packaging