[SCM] ktp-contact-applet packaging branch, master, updated. debian/16.04.2-1-67-g066859a

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 12be0420995ffdbe7f0dea43740cc6b116cf0386
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Dec 20 13:10:30 2016 +0100

    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 ae0d4c9..0a5f9cc 100644
--- a/chat/org.kde.ktp-chat/metadata.desktop.cmake
+++ b/chat/org.kde.ktp-chat/metadata.desktop.cmake
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Quick Chat
 Name[ar]=محادثة سريعة
-Name[ast]=Charra rápida
 Name[bs]=Brzo ćaskanje
 Name[ca]=Xat ràpid
 Name[ca at valencia]=Xat ràpid
@@ -47,7 +46,6 @@ Name[zh_CN]=快捷聊天
 Name[zh_TW]=快速聊天
 Comment=Simple chats from your workspace
 Comment[ar]=محادثات بسيطة من مساحة العمل
-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 782c1a9..68d4e9c 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Instant Messaging
 Name[ar]=التّراسل المباشر
-Name[ast]=Mensaxería nel intre
 Name[ca]=Missatgeria instantània
 Name[ca at valencia]=Missatgeria instantània
 Name[cs]=Instant Messaging
@@ -39,7 +38,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[ca at valencia]=Mostra la vostra presència i els contactes
 Comment[cs]=Zobrazuje vaši dostupnost a kontakty
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index c002f78..84f166e 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Person
 Name[ar]=شخص
-Name[ast]=Persona
 Name[ca]=Persona
 Name[ca at valencia]=Persona
 Name[cs]=Osoba
@@ -37,7 +36,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[ca at valencia]=Fa accessible una persona fàcilment
 Comment[cs]=Usnadňuje přístup k osobám

-- 
ktp-contact-applet packaging