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

Diane Trout diane-guest at moszumanska.debian.org
Thu May 22 06:36:37 UTC 2014


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

The following commit has been merged in the master branch:
commit 62ab3377811b0072d08e270a4f5670fb231a1f00
Merge: c72959a4fa134e83af8172a719d8e7ee9d84f36b 8fc3148aa6b3fb911fea58ce60ac22347e62944d
Author: Diane Trout <diane at ghic.org>
Date:   Wed Feb 19 22:35:04 2014 -0800

    Merge tag 'upstream/0.7.80'
    
    Upstream version 0.7.80

 CMakeLists.txt                                     |   2 +-
 .../contents/ui/ActionDelegate.qml                 |   2 +
 chat/org.kde.ktp-chat/contents/ui/ChatWidget.qml   |   8 +-
 .../contents/ui/ConversationDelegate.qml           |  10 +-
 .../contents/ui/ConversationDelegateButton.qml     |   2 +-
 contact/CMakeLists.txt                             |   1 +
 contact/src/contact-wrapper.cpp                    | 168 ++++++++++++++-------
 contact/src/contact-wrapper.h                      |  63 +++++---
 contact/src/declarative/contents/ui/Avatar.qml     |  70 +++------
 contact/src/declarative/contents/ui/Contact.qml    |  41 +----
 .../src/declarative/contents/ui/DropDownMenu.qml   |  65 ++++----
 contact/src/declarative/contents/ui/main.qml       |  17 +--
 contact/src/telepathy-contact.cpp                  |  42 ++----
 contact/src/telepathy-contact.h                    |   3 +-
 po/CMakeLists.txt                                  |   2 +
 po/bs/plasma_applet_org.kde.ktp-contact.po         |  13 +-
 po/bs/plasma_applet_org.kde.ktp-presence.po        |  10 +-
 po/ca/plasma_applet_org.kde.ktp-contact.po         |  13 +-
 po/ca/plasma_applet_org.kde.ktp-presence.po        |   4 +-
 .../plasma_applet_org.kde.ktp-contact.po           |   7 +-
 .../plasma_applet_org.kde.ktp-presence.po          |   4 +-
 po/cs/plasma_applet_org.kde.ktp-contact.po         |   9 +-
 po/cs/plasma_applet_org.kde.ktp-presence.po        |   2 +-
 po/da/plasma_applet_org.kde.ktp-contact.po         |  17 ++-
 po/da/plasma_applet_org.kde.ktp-presence.po        |   4 +-
 po/de/plasma_applet_org.kde.ktp-contact.po         |  13 +-
 po/de/plasma_applet_org.kde.ktp-presence.po        |   4 +-
 po/el/plasma_applet_org.kde.ktp-contact.po         |   7 +-
 po/el/plasma_applet_org.kde.ktp-presence.po        |   6 +-
 po/es/plasma_applet_org.kde.ktp-contact.po         |  20 ++-
 po/es/plasma_applet_org.kde.ktp-presence.po        |   8 +-
 po/et/plasma_applet_org.kde.ktp-contact.po         |   7 +-
 po/et/plasma_applet_org.kde.ktp-presence.po        |   3 +-
 po/fi/plasma_applet_org.kde.ktp-contact.po         |  14 +-
 po/fi/plasma_applet_org.kde.ktp-presence.po        |  18 +--
 po/fr/plasma_applet_org.kde.ktp-contact.po         |  17 ++-
 po/fr/plasma_applet_org.kde.ktp-presence.po        |   2 +-
 po/ga/plasma_applet_org.kde.ktp-contact.po         |   7 +-
 po/ga/plasma_applet_org.kde.ktp-presence.po        |   3 +-
 po/gl/plasma_applet_org.kde.ktp-contact.po         |  16 +-
 po/gl/plasma_applet_org.kde.ktp-presence.po        |  10 +-
 po/hu/plasma_applet_org.kde.ktp-contact.po         |  16 +-
 po/hu/plasma_applet_org.kde.ktp-presence.po        |   4 +-
 po/ia/plasma_applet_org.kde.ktp-contact.po         |  13 +-
 po/ia/plasma_applet_org.kde.ktp-presence.po        |  10 +-
 po/it/plasma_applet_org.kde.ktp-contact.po         |  13 +-
 po/it/plasma_applet_org.kde.ktp-presence.po        |   2 +-
 po/ja/plasma_applet_org.kde.ktp-contact.po         |   7 +-
 po/ja/plasma_applet_org.kde.ktp-presence.po        |   2 +-
 po/kk/plasma_applet_org.kde.ktp-contact.po         |   7 +-
 po/kk/plasma_applet_org.kde.ktp-presence.po        |   2 +-
 po/km/plasma_applet_org.kde.ktp-contact.po         |   7 +-
 po/km/plasma_applet_org.kde.ktp-presence.po        |   2 +-
 po/lt/plasma_applet_org.kde.ktp-contact.po         |  30 +---
 po/lt/plasma_applet_org.kde.ktp-presence.po        |  11 +-
 po/mr/plasma_applet_org.kde.ktp-contact.po         |   7 +-
 po/mr/plasma_applet_org.kde.ktp-presence.po        |   2 +-
 po/nb/plasma_applet_org.kde.ktp-contact.po         |  13 +-
 po/nb/plasma_applet_org.kde.ktp-presence.po        |  32 ++--
 po/nds/plasma_applet_org.kde.ktp-contact.po        |   8 +-
 po/nds/plasma_applet_org.kde.ktp-presence.po       |   6 +-
 po/nl/plasma_applet_org.kde.ktp-contact.po         |   9 +-
 po/nl/plasma_applet_org.kde.ktp-presence.po        |   2 +-
 po/pa/CMakeLists.txt                               |   2 +
 po/pa/plasma_applet_org.kde.ktp-contact.po         |  34 +++++
 .../plasma_applet_org.kde.ktp-presence.po          |  40 ++---
 po/pl/plasma_applet_org.kde.ktp-contact.po         |   7 +-
 po/pl/plasma_applet_org.kde.ktp-presence.po        |  15 +-
 po/pt/plasma_applet_org.kde.ktp-contact.po         |   7 +-
 po/pt/plasma_applet_org.kde.ktp-presence.po        |   2 +-
 po/pt_BR/plasma_applet_org.kde.ktp-contact.po      |  35 +----
 po/pt_BR/plasma_applet_org.kde.ktp-presence.po     |   6 +-
 po/ro/plasma_applet_org.kde.ktp-contact.po         |   7 +-
 po/ro/plasma_applet_org.kde.ktp-presence.po        |   6 +-
 po/ru/plasma_applet_org.kde.ktp-contact.po         |   7 +-
 po/ru/plasma_applet_org.kde.ktp-presence.po        |   4 +-
 po/sk/plasma_applet_org.kde.ktp-contact.po         |  12 +-
 po/sk/plasma_applet_org.kde.ktp-presence.po        |   2 +-
 po/sl/plasma_applet_org.kde.ktp-contact.po         |  40 ++---
 po/sl/plasma_applet_org.kde.ktp-presence.po        |   4 +-
 po/sr/plasma_applet_org.kde.ktp-contact.po         |  10 +-
 po/sr/plasma_applet_org.kde.ktp-presence.po        |   6 +-
 .../plasma_applet_org.kde.ktp-contact.po           |  10 +-
 .../plasma_applet_org.kde.ktp-presence.po          |   6 +-
 .../plasma_applet_org.kde.ktp-contact.po           |  10 +-
 .../plasma_applet_org.kde.ktp-presence.po          |   6 +-
 po/sr at latin/plasma_applet_org.kde.ktp-contact.po   |  10 +-
 po/sr at latin/plasma_applet_org.kde.ktp-presence.po  |   6 +-
 po/sv/plasma_applet_org.kde.ktp-contact.po         |  17 ++-
 po/sv/plasma_applet_org.kde.ktp-presence.po        |   8 +-
 po/tr/plasma_applet_org.kde.ktp-contact.po         |  10 +-
 po/tr/plasma_applet_org.kde.ktp-presence.po        |   4 +-
 po/ug/CMakeLists.txt                               |   2 +
 po/ug/plasma_applet_org.kde.ktp-contact.po         |  31 ++++
 .../plasma_applet_org.kde.ktp-presence.po          |  42 +++---
 po/uk/plasma_applet_org.kde.ktp-contact.po         |   9 +-
 po/uk/plasma_applet_org.kde.ktp-presence.po        |   4 +-
 po/vi/plasma_applet_org.kde.ktp-contact.po         |   7 +-
 po/vi/plasma_applet_org.kde.ktp-presence.po        |  28 ++--
 po/wa/plasma_applet_org.kde.ktp-contact.po         |   9 +-
 po/zh_CN/plasma_applet_org.kde.ktp-contact.po      |   7 +-
 po/zh_CN/plasma_applet_org.kde.ktp-presence.po     |   2 +-
 po/zh_TW/plasma_applet_org.kde.ktp-contact.po      |   9 +-
 po/zh_TW/plasma_applet_org.kde.ktp-presence.po     |   4 +-
 presence/plasma-applet-ktp-presence.desktop.cmake  |   2 +-
 105 files changed, 805 insertions(+), 623 deletions(-)

-- 
ktp-contact-applet packaging



More information about the pkg-kde-commits mailing list