[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=9772efa

The following commit has been merged in the master branch:
commit 9772efa7f40312fd6e62c97269d9dbe6a4daaf72
Merge: 5395d20b05058f451111a6be99092a27b71a768a e47bf886b9d215fb5ed4e826442eb89f51041bae
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Wed Dec 12 12:39:44 2012 -0800

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop
    	plugins/gabble/ktpaccountskcm_plugin_gabble.desktop
    	plugins/haze/ktpaccountskcm_plugin_haze.desktop
    	plugins/idle/ktpaccountskcm_plugin_idle.desktop
    	plugins/rakia/ktpaccountskcm_plugin_rakia.desktop
    	plugins/salut/ktpaccountskcm_plugin_salut.desktop
    	plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop
    	src/KCMTelepathyAccounts/ktpaccountskcminternal-accountuiplugin.desktop
    	src/settings-im-and-voip.desktop

 plugins/butterfly/ktpaccountskcm_plugin_butterfly.desktop | 2 +-
 plugins/gabble/ktpaccountskcm_plugin_gabble.desktop       | 2 +-
 plugins/haze/ktpaccountskcm_plugin_haze.desktop           | 2 +-
 plugins/idle/ktpaccountskcm_plugin_idle.desktop           | 2 +-
 plugins/rakia/ktpaccountskcm_plugin_rakia.desktop         | 2 +-
 plugins/salut/ktpaccountskcm_plugin_salut.desktop         | 2 +-
 plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop   | 2 +-
 src/edit-account-dialog.cpp                               | 5 +++++
 src/kcm-telepathy-accounts.cpp                            | 2 +-
 src/settings-im-and-voip.desktop                          | 5 +----
 10 files changed, 14 insertions(+), 12 deletions(-)

diff --cc src/settings-im-and-voip.desktop
index b6467b7,94a7b16..3ecbe8e
--- a/src/settings-im-and-voip.desktop
+++ b/src/settings-im-and-voip.desktop
@@@ -19,9 -19,8 +19,7 @@@ Name[fr]=Messagerie instantanée et VoI
  Name[gl]=Mensaxaría instantánea e voz por internet
  Name[hu]=Azonnali üzenetküldés és VoIP
  Name[it]=Messaggistica istantanea e VoIP
--Name[kk]=Лезде хабарласу мен VoIP
- Name[km]=VoIP និង​ការ​ផ្ញើ​សារ​បន្ទាន់
--Name[lt]=Pokalbiai ir VoIP
++Name[lt]=Tikralaikiai pokalbiai ir VoIP
  Name[nb]=Lynmelding og VoIP
  Name[nl]=Instant Messaging en VoIP
  Name[pl]=Komunikator internetowy i VoIP

-- 
ktp-accounts-kcm packaging