[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=174374e

The following commit has been merged in the master branch:
commit 174374e1f51900e38c842bd92c6625410296a495
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Apr 30 10:12:33 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 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/org.kde.ktpcontactlist.desktop b/org.kde.ktpcontactlist.desktop
index e777306..06d7133 100644
--- a/org.kde.ktpcontactlist.desktop
+++ b/org.kde.ktpcontactlist.desktop
@@ -1,6 +1,7 @@
 [Desktop Entry]
 Name=IM Contacts
 Name[ar]=متراسلون ت‌م
+Name[ast]=Contautos MI
 Name[bs]=IM kontakti
 Name[ca]=Contactes de MI
 Name[cs]=Kontakty IM
@@ -39,6 +40,7 @@ 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
@@ -85,6 +87,7 @@ 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