[SCM] ktp-contact-runner packaging branch, master, updated. debian/15.12.1-2-244-g38a1f58

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-runner.git;a=commitdiff;h=82f84a7

The following commit has been merged in the master branch:
commit 82f84a73148897e92659d25409adca9692daf582
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Apr 12 10:29:54 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"
---
 plasma-runner-ktp-contact.desktop.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plasma-runner-ktp-contact.desktop.cmake b/plasma-runner-ktp-contact.desktop.cmake
index 20ed2bd..156d7be 100644
--- a/plasma-runner-ktp-contact.desktop.cmake
+++ b/plasma-runner-ktp-contact.desktop.cmake
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Instant Messaging
+Name[ar]=التّراسل المباشر
 Name[bs]=Brze poruke
 Name[ca]=Missatgeria instantània
 Name[ca at valencia]=Missatgeria instantània
@@ -42,6 +43,7 @@ Name[x-test]=xxInstant Messagingxx
 Name[zh_CN]=即时通讯
 Name[zh_TW]=即時訊息
 Comment=Start a chat with any of your IM contacts or change your IM status
+Comment[ar]=ابدأ محادثة بأيّ من متراسلي ت‌م أو غيّر حالة ت‌م
 Comment[bs]=Pokrenite ćaskanje s bilo kojim od vaših IM kontakta ili promijenite svoj IM status
 Comment[ca]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat de MI
 Comment[ca at valencia]=Inicia un xat amb qualsevol dels vostres contactes de MI o canvia el vostre estat de MI

-- 
ktp-contact-runner packaging