[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=2971921

The following commit has been merged in the master branch:
commit 29719215e0db4e502132cc89a094f0d3693b2e62
Merge: 020f880c5ba7c384852c45afd878a472f5d65af8 0545262944f1f1eb6da212383ff91f018db165d4
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date:   Fri Jun 15 17:06:29 2012 +0300

    Merge branch 'kde-telepathy-0.4'
    
    Conflicts:
    	org.kde.ktp.contactlist/metadata.desktop

 CMakeLists.txt                                   | 1 -
 contact-applet/plasma_applet_ktp_contact.desktop | 1 +
 org.kde.ktp.contactlist/metadata.desktop         | 8 ++------
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --cc org.kde.ktp.contactlist/metadata.desktop
index b2ee21b,27045bb..aa55c5a
--- a/org.kde.ktp.contactlist/metadata.desktop
+++ b/org.kde.ktp.contactlist/metadata.desktop
@@@ -1,11 -1,7 +1,8 @@@
  [Desktop Entry]
  Name=Telepathy Contact List Applet
  Name[ca]=Miniaplicació de llista de contactes del Telepathy
- Name[da]=Kontaktliste-applet til Telepathy
- Name[de]=Telepathy-Kontaktlisten-Miniprogramm
- Name[el]=Μικροεφαρμογή λίστας επαφών telepathy
  Name[et]=Telepathy kontaktide nimekirja aplett
 +Name[fr]=Applet de listes de contacts Telepathy
  Name[hu]=Telepathy partnerlista kisalkalmazás
  Name[it]=Applet della lista dei contatti di Telepathy
  Name[nl]=Applet voor contacten van Telepathy
@@@ -19,11 -16,7 +17,8 @@@ Name[zh_CN]=Telepathy 联系人列表éƒ
  Name[zh_TW]=Telepathy 聯絡人清單小程式
  Comment=telepathy contact list applet
  Comment[ca]=miniaplicació de llista de contactes del telepathy
- Comment[da]=Kontaktliste-applet til Telepathy
- Comment[de]=Telepathy-Kontaktlisten-Miniprogramm
- Comment[el]=μικροεφαρμογή λίστας επαφών telepathy
  Comment[et]=Telepathy kontaktide nimekirja aplett
 +Comment[fr]=Applet de listes de contacts Telepathy
  Comment[hu]=Telepathy partnerlista kisalkalmazás
  Comment[it]=Applet della lista dei contatti di Telepathy
  Comment[nl]=applet voor contacten van telepathy

-- 
ktp-contact-applet packaging