[SCM] ktp-contact-list packaging branch, master, updated. debian/16.04.2-1-51-g8ec8bc9

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 1d33fd3caae3e1538c18023da3da263a5d1d8a04
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Dec 20 13:10:06 2016 +0100

    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 a790bf8..0fdd00e 100644
--- a/org.kde.ktpcontactlist.desktop
+++ b/org.kde.ktpcontactlist.desktop
@@ -42,7 +42,6 @@ Name[zh_CN]=即时通讯联系人
 Name[zh_TW]=即時訊息聯絡人
 GenericName=Instant Messenger Contacts
 GenericName[ar]=متراسلو المرسال المباشر
-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
@@ -90,7 +89,6 @@ GenericName[zh_CN]=即时通讯联系人
 GenericName[zh_TW]=即時訊息聯絡人
 Comment=Displays your instant messenger contacts
 Comment[ar]=يعرض متراسلي المرسال المباشر
-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