[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/0.4.0-1-21-gfbe7a29

Diane Trout diane-guest at alioth.debian.org
Wed Jul 10 04:04:20 UTC 2013


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

The following commit has been merged in the master branch:
commit 0827ab98a3773c16a0029ef0c0af9d0d5fe23deb
Merge: 64d762c9f300f2da0a150b6c958ecf76de477ab1 0b554377d47ad36a67e9169025099a9a4320858d
Author: Diane Trout <diane at caltech.edu>
Date:   Fri May 17 13:22:13 2013 -0700

    Merge tag 'upstream/0.6.1'
    
    Upstream version 0.6.1

 CMakeLists.txt                                     |    2 +-
 plugins/gabble/main-options-widget-facebook.ui     |    9 +++
 po/bs/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/bs/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/ca/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/ca/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/ca at valencia/kcm_ktp_accounts.po                 |   68 ++++++++---------
 .../kcmtelepathyaccounts_plugin_gabble.po          |    6 +-
 po/cs/kcm_ktp_accounts.po                          |   78 ++++++++++----------
 po/cs/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/da/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/da/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/de/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/de/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/el/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/el/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/en_GB/kcm_ktp_accounts.po                       |   68 ++++++++---------
 po/eo/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/es/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/es/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/et/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/et/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/fi/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/fi/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/fr/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/fr/kcmtelepathyaccounts_plugin_gabble.po        |   15 ++--
 po/ga/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/ga/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/gl/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/gl/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/hu/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/hu/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/ia/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/ia/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/ia/kcmtelepathyaccounts_plugin_rakia.po         |    7 +-
 po/it/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/it/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/ja/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/ja/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/kk/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/kk/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/km/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/km/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/lt/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/lt/kcmtelepathyaccounts_plugin_gabble.po        |   12 +--
 po/mai/kcm_ktp_accounts.po                         |   68 ++++++++---------
 po/mr/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/mr/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/nb/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/nb/kcmtelepathyaccounts_plugin_gabble.po        |   14 ++--
 po/nb/kcmtelepathyaccounts_plugin_haze.po          |    2 +-
 po/nb/kcmtelepathyaccounts_plugin_rakia.po         |    8 +-
 po/nds/kcm_ktp_accounts.po                         |   68 ++++++++---------
 po/nds/kcmtelepathyaccounts_plugin_gabble.po       |    6 +-
 po/nl/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/nl/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/pa/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/pl/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/pl/kcmtelepathyaccounts_plugin_gabble.po        |   18 ++---
 po/pt/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/pt/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/pt_BR/kcm_ktp_accounts.po                       |   68 ++++++++---------
 po/pt_BR/kcmtelepathyaccounts_plugin_gabble.po     |    6 +-
 po/ro/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/ro/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/ru/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/ru/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/sk/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/sk/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/sl/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/sl/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/sr/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/sr/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/sr at ijekavian/kcm_ktp_accounts.po                |   68 ++++++++---------
 .../kcmtelepathyaccounts_plugin_gabble.po          |    6 +-
 po/sr at ijekavianlatin/kcm_ktp_accounts.po           |   68 ++++++++---------
 .../kcmtelepathyaccounts_plugin_gabble.po          |    6 +-
 po/sr at latin/kcm_ktp_accounts.po                    |   68 ++++++++---------
 po/sr at latin/kcmtelepathyaccounts_plugin_gabble.po  |    6 +-
 po/sv/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/sv/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/tr/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/ug/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/ug/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/uk/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/uk/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/vi/kcmtelepathyaccounts_plugin_gabble.po        |    6 +-
 po/wa/kcm_ktp_accounts.po                          |   68 ++++++++---------
 po/zh_CN/kcm_ktp_accounts.po                       |   68 ++++++++---------
 po/zh_CN/kcmtelepathyaccounts_plugin_gabble.po     |    6 +-
 po/zh_TW/kcm_ktp_accounts.po                       |   68 ++++++++---------
 po/zh_TW/kcmtelepathyaccounts_plugin_gabble.po     |    6 +-
 src/add-account-assistant.cpp                      |    7 +-
 src/kcm-telepathy-accounts.cpp                     |    8 +-
 src/kcm-telepathy-accounts.h                       |    2 +
 src/salut-enabler.cpp                              |    7 +-
 96 files changed, 1718 insertions(+), 1691 deletions(-)

-- 
ktp-accounts-kcm packaging



More information about the pkg-kde-commits mailing list