[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=e450855

The following commit has been merged in the master branch:
commit e450855f61790d73570c6879bdeb30fdbe45d435
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Apr 12 10:29:57 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"
---
 chat/org.kde.ktp-chat/metadata.desktop.cmake               | 2 ++
 contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake | 1 +
 person/org.kde.person/metadata.desktop.cmake               | 1 +
 3 files changed, 4 insertions(+)

diff --git a/chat/org.kde.ktp-chat/metadata.desktop.cmake b/chat/org.kde.ktp-chat/metadata.desktop.cmake
index c9c202f..fac997b 100644
--- a/chat/org.kde.ktp-chat/metadata.desktop.cmake
+++ b/chat/org.kde.ktp-chat/metadata.desktop.cmake
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Quick Chat
+Name[ar]=محادثة سريعة
 Name[bs]=Brzo ćaskanje
 Name[ca]=Xat ràpid
 Name[ca at valencia]=Xat ràpid
@@ -43,6 +44,7 @@ Name[x-test]=xxQuick Chatxx
 Name[zh_CN]=快捷聊天
 Name[zh_TW]=快速聊天
 Comment=Simple chats from your workspace
+Comment[ar]=محادثات بسيطة من مساحة العمل
 Comment[bs]=Prosta ćaskanja iz radnog prostora
 Comment[ca]=Xats normals des de l'espai de treball
 Comment[ca at valencia]=Xats normals des de l'espai de treball
diff --git a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
index 5a896e3..3470909 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Instant Messaging
+Name[ar]=التّراسل المباشر
 Name[ca]=Missatgeria instantània
 Name[cs]=Instant Messaging
 Name[da]=Instant messaging
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index 6e302d9..d4b5565 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -1,5 +1,6 @@
 [Desktop Entry]
 Name=Person
+Name[ar]=شخص
 Name[ca]=Persona
 Name[cs]=Osoba
 Name[da]=Person

-- 
ktp-contact-applet packaging