[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=74183af

The following commit has been merged in the master branch:
commit 74183afa13d4768cc22cb1a0ce1954862a3c1b51
Merge: 8896e89e50ee6e062693a987408cf236f30853c8 d57901ab55947c1f3bae152c7d30bd6704b056b7
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Tue Oct 23 14:18:02 2012 +0200

    Merge branch 'kde-telepathy-0.5'
    
    Conflicts:
    	ktp-contactlist.desktop

 abstract-contact-delegate.cpp | 10 ++++------
 abstract-contact-delegate.h   |  1 -
 contact-delegate-compact.cpp  |  8 ++++----
 contact-delegate.cpp          |  8 ++++----
 ktp-contactlist.desktop       |  2 ++
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --cc ktp-contactlist.desktop
index 43f087f,fb74b7b..7288150
--- a/ktp-contactlist.desktop
+++ b/ktp-contactlist.desktop
@@@ -72,10 -69,10 +73,11 @@@ Comment[es]=Muestra sus contactos de me
  Comment[et]=Sinu kiirsuhtlusrakenduse kontaktide näitamine
  Comment[fi]=Näyttää pikaviestiyhteystietosi
  Comment[fr]=Affiche vos contacts de messagerie instantanée
+ Comment[ga]=Taispeánann sé do chuid teagmhálacha teachtaireachtaí meandaracha
  Comment[gl]=Mostra os seus contactos de mensaxaría instantánea
 -Comment[hu]=Megjeleni az azonnali üzenetküldő partnereit
 +Comment[hu]=Megjeleníti az azonnali üzenetküldő partnereit
  Comment[it]=Mostra i tuoi contatti di messaggistica istantanea
 +Comment[km]=បង្ហាញ​​ទំនាក់ទំនង​កម្មវិធី​ផ្ញើ​សារ​បន្ទាន់​របស់​អ្នក
  Comment[lt]=Rodo jūsų tiesioginio pranešimo kontaktus
  Comment[nb]=Viser dine lynmeldingskontakter
  Comment[nl]=Contacten van Instant messenger tonen

-- 
ktp-contact-list packaging