[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=dd4d6e5

The following commit has been merged in the master branch:
commit dd4d6e522fcdfafdac5ec556d4c83d7d14b82144
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Apr 8 09:52:37 2015 +0000

    SVN_SILENT made messages (.desktop file) - always resolve ours
    
    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
---
 org.kde.ktpcontactlist.desktop | 2 --
 1 file changed, 2 deletions(-)

diff --git a/org.kde.ktpcontactlist.desktop b/org.kde.ktpcontactlist.desktop
index e823286..1a3bf17 100644
--- a/org.kde.ktpcontactlist.desktop
+++ b/org.kde.ktpcontactlist.desktop
@@ -34,7 +34,6 @@ Name[x-test]=xxIM Contactsxx
 Name[zh_CN]=即时通讯联系人
 Name[zh_TW]=即時訊息聯絡人
 GenericName=Instant Messenger Contacts
-GenericName[ast]=Contautos de mensaxería nel intre
 GenericName[bs]=Kontakti za instant poruke
 GenericName[ca]=Contactes de missatgeria instantània
 GenericName[ca at valencia]=Contactes de missatgeria instantània
@@ -80,7 +79,6 @@ GenericName[x-test]=xxInstant Messenger Contactsxx
 GenericName[zh_CN]=即时通讯联系人
 GenericName[zh_TW]=即時訊息聯絡人
 Comment=Displays your instant messenger contacts
-Comment[ast]=Amuesa los tos contautos de mensaxería instanatanea
 Comment[bs]=Prikazuje kontakte programa za instant poruke
 Comment[ca]=Mostra els vostres contactes de missatgeria instantània
 Comment[ca at valencia]=Mostra els vostres contactes de missatgeria instantània

-- 
ktp-contact-list packaging