[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=3b79d6e

The following commit has been merged in the master branch:
commit 3b79d6e75e12a346c1d5ba5aa76bedc18eb25b0d
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Apr 8 09:52:45 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 | 2 --
 person/org.kde.person/metadata.desktop.cmake               | 2 --
 3 files changed, 6 deletions(-)

diff --git a/chat/org.kde.ktp-chat/metadata.desktop.cmake b/chat/org.kde.ktp-chat/metadata.desktop.cmake
index a8ec7de..c9c202f 100644
--- a/chat/org.kde.ktp-chat/metadata.desktop.cmake
+++ b/chat/org.kde.ktp-chat/metadata.desktop.cmake
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Name=Quick Chat
-Name[ast]=Charra rápida
 Name[bs]=Brzo ćaskanje
 Name[ca]=Xat ràpid
 Name[ca at valencia]=Xat ràpid
@@ -44,7 +43,6 @@ Name[x-test]=xxQuick Chatxx
 Name[zh_CN]=快捷聊天
 Name[zh_TW]=快速聊天
 Comment=Simple chats from your workspace
-Comment[ast]=Charres simples dende la to estaya de trabayu
 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 fc594d9..c0955f8 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Name=Instant Messaging
-Name[ast]=Mensaxería nel intre
 Name[ca]=Missatgeria instantània
 Name[cs]=Instant Messaging
 Name[da]=Instant messaging
@@ -29,7 +28,6 @@ Name[x-test]=xxInstant Messagingxx
 Name[zh_CN]=即时通讯
 Name[zh_TW]=即時訊息
 Comment=Displays your presence and contacts
-Comment[ast]=Amuesa la to presencia y contautos
 Comment[ca]=Mostra la vostra presència i els contactes
 Comment[cs]=Zobrazuje vaši dostupnost a kontakty
 Comment[da]=Viser din tilstedeværelse og kontakter
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index 40c561e..591346c 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -1,6 +1,5 @@
 [Desktop Entry]
 Name=Person
-Name[ast]=Persona
 Name[ca]=Persona
 Name[cs]=Osoba
 Name[da]=Person
@@ -27,7 +26,6 @@ Name[x-test]=xxPersonxx
 Name[zh_CN]=个人
 Name[zh_TW]=人物
 Comment=Makes a person easily accessible
-Comment[ast]=Fai d'accesu cenciellu una persona
 Comment[ca]=Fa accessible una persona fàcilment
 Comment[cs]=Usnadňuje přístup k osobám
 Comment[da]=Gør en person nemt tilgængelig

-- 
ktp-contact-applet packaging