[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=0419d2e

The following commit has been merged in the master branch:
commit 0419d2e0ffa501e1a7f0e51a2d4abf5259bb157e
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Apr 12 10:29:49 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 3e84bdd..dd0f321 100644
--- a/org.kde.ktpcontactlist.desktop
+++ b/org.kde.ktpcontactlist.desktop
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=IM Contacts
+Name[ar]=متراسلون ت‌م
 Name[bs]=IM kontakti
 Name[ca]=Contactes de MI
 Name[cs]=Kontakty IM
@@ -35,6 +36,7 @@ Name[x-test]=xxIM Contactsxx
 Name[zh_CN]=即时通讯联系人
 Name[zh_TW]=即時訊息聯絡人
 GenericName=Instant Messenger Contacts
+GenericName[ar]=متراسلو المرسال المباشر
 GenericName[bs]=Kontakti za instant poruke
 GenericName[ca]=Contactes de missatgeria instantània
 GenericName[ca at valencia]=Contactes de missatgeria instantània
@@ -80,6 +82,7 @@ GenericName[x-test]=xxInstant Messenger Contactsxx
 GenericName[zh_CN]=即时通讯联系人
 GenericName[zh_TW]=即時訊息聯絡人
 Comment=Displays your instant messenger contacts
+Comment[ar]=يعرض متراسلي المرسال المباشر
 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