[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/0.6.3-1-34-g0c7af73

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-accounts-kcm.git;a=commitdiff;h=ee2fecf

The following commit has been merged in the master branch:
commit ee2fecf9de351d6d1b1eeeaf39cae7297a998baf
Merge: 06d40d3578d29fbdece657ba0e47364eaa271b83 c51f1471f9f044b56393772a016ad556e0a51037
Author: Diane Trout <diane at ghic.org>
Date:   Sun Sep 21 11:03:12 2014 -0700

    Merge tag 'upstream/0.8.80'
    
    Upstream version 0.8.80

 CMakeLists.txt                                     |   2 +-
 plugins/CMakeLists.txt                             |   1 +
 .../ktpaccountskcm_plugin_butterfly.desktop.cmake  |   2 +
 .../ktpaccountskcm_plugin_gabble.desktop.cmake     |   4 +
 .../haze/ktpaccountskcm_plugin_haze.desktop.cmake  |   4 +
 .../idle/ktpaccountskcm_plugin_idle.desktop.cmake  |   2 +
 plugins/{butterfly => morse}/CMakeLists.txt        |  24 +-
 plugins/{butterfly => morse}/Messages.sh           |   0
 .../ktpaccountskcm_plugin_morse.desktop.cmake      |  14 ++
 .../{butterfly => morse}/main-options-widget.cpp   |   7 +-
 plugins/{butterfly => morse}/main-options-widget.h |   2 +-
 .../{butterfly => morse}/main-options-widget.ui    |  42 +---
 .../morse-account-ui-plugin.cpp}                   |  25 ++-
 .../morse-account-ui-plugin.h}                     |  14 +-
 .../telegram-account-ui.cpp}                       |  13 +-
 .../telegram-account-ui.h}                         |  10 +-
 .../ktpaccountskcm_plugin_pintxo.desktop.cmake     |  10 +-
 .../ktpaccountskcm_plugin_rakia.desktop.cmake      |   4 +
 .../ktpaccountskcm_plugin_salut.desktop.cmake      |   4 +
 .../sipe/ktpaccountskcm_plugin_sipe.desktop.cmake  |  24 +-
 .../ktpaccountskcm_plugin_sunshine.desktop.cmake   |   4 +
 po/en_GB/kcm_ktp_accounts.po                       | 242 +++++++++++----------
 .../kcmtelepathyaccounts_plugin_butterfly.po       |  18 +-
 .../kcmtelepathyaccounts_plugin_gabble.po          |  83 ++++---
 .../kcmtelepathyaccounts_plugin_haze.po            | 103 +++++----
 .../kcmtelepathyaccounts_plugin_idle.po            |  34 +--
 .../kcmtelepathyaccounts_plugin_rakia.po           | 100 ++++-----
 .../kcmtelepathyaccounts_plugin_salut.po           |  28 +--
 .../kcmtelepathyaccounts_plugin_sunshine.po        |  32 +--
 po/et/kcm_ktp_accounts.po                          |  22 +-
 po/et/kcmtelepathyaccounts_plugin_gabble.po        |  10 +-
 po/et/kcmtelepathyaccounts_plugin_haze.po          |  60 ++---
 po/et/kcmtelepathyaccounts_plugin_salut.po         |  12 +-
 po/fi/kcmtelepathyaccounts_plugin_gabble.po        |   7 +-
 po/hu/kcmtelepathyaccounts_plugin_gabble.po        |   6 +-
 po/hu/kcmtelepathyaccounts_plugin_haze.po          |  50 ++---
 po/hu/kcmtelepathyaccounts_plugin_salut.po         |  17 +-
 po/ko/kcm_ktp_accounts.po                          |   1 -
 po/ko/kcmtelepathyaccounts_plugin_butterfly.po     |   1 -
 po/ko/kcmtelepathyaccounts_plugin_gabble.po        |   5 +-
 po/ko/kcmtelepathyaccounts_plugin_haze.po          |  51 ++---
 po/ko/kcmtelepathyaccounts_plugin_idle.po          |   1 -
 po/ko/kcmtelepathyaccounts_plugin_rakia.po         |   7 +-
 po/ko/kcmtelepathyaccounts_plugin_salut.po         |   9 +-
 po/ko/kcmtelepathyaccounts_plugin_sunshine.po      |   1 -
 po/nds/kcm_ktp_accounts.po                         | 198 +++++++++--------
 po/nds/kcmtelepathyaccounts_plugin_butterfly.po    |   8 +-
 po/nds/kcmtelepathyaccounts_plugin_gabble.po       |  75 ++++---
 po/nds/kcmtelepathyaccounts_plugin_haze.po         | 109 +++++-----
 po/nds/kcmtelepathyaccounts_plugin_rakia.po        |  98 ++++++---
 po/nds/kcmtelepathyaccounts_plugin_salut.po        |  15 +-
 po/nds/kcmtelepathyaccounts_plugin_sunshine.po     |  14 +-
 po/sl/kcm_ktp_accounts.po                          |   6 +-
 po/sl/kcmtelepathyaccounts_plugin_butterfly.po     |   6 +-
 po/sl/kcmtelepathyaccounts_plugin_gabble.po        |   4 +-
 po/sl/kcmtelepathyaccounts_plugin_haze.po          |  10 +-
 po/uk/kcm_ktp_accounts.po                          |   2 +-
 po/uk/kcmtelepathyaccounts_plugin_butterfly.po     |   2 +-
 po/uk/kcmtelepathyaccounts_plugin_gabble.po        |   2 +-
 po/uk/kcmtelepathyaccounts_plugin_haze.po          |   2 +-
 po/uk/kcmtelepathyaccounts_plugin_idle.po          |   2 +-
 po/uk/kcmtelepathyaccounts_plugin_rakia.po         |   2 +-
 po/uk/kcmtelepathyaccounts_plugin_salut.po         |   2 +-
 po/uk/kcmtelepathyaccounts_plugin_sunshine.po      |   2 +-
 .../ktpaccountskcminternal-accountuiplugin.desktop |   3 +
 src/avatar-button.cpp                              |   2 +-
 src/kcm_ktp_accounts.desktop                       |   4 +
 src/settings-im-and-voip.desktop                   |  10 +-
 68 files changed, 846 insertions(+), 844 deletions(-)

-- 
ktp-accounts-kcm packaging