[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=45f945c

The following commit has been merged in the master branch:
commit 45f945c0ef1e117e2897374da43cab0bd3b522d7
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Nov 4 17:14:58 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"
---
 contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake | 2 ++
 person/org.kde.person/metadata.desktop.cmake               | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
index 7cbaa8a..205b841 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -3,6 +3,7 @@ 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
 Name[da]=Instant messaging
 Name[de]=Instant-Messaging
@@ -38,6 +39,7 @@ 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
 Comment[da]=Viser din tilstedeværelse og kontakter
 Comment[de]=Zeigt Ihre Anwesenheit und Kontakte
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index 9d97504..3579a55 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -3,6 +3,7 @@ Name=Person
 Name[ar]=شخص
 Name[ast]=Persona
 Name[ca]=Persona
+Name[ca at valencia]=Persona
 Name[cs]=Osoba
 Name[da]=Person
 Name[de]=Person
@@ -37,6 +38,7 @@ 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
 Comment[da]=Gør en person nemt tilgængelig
 Comment[de]=Ermöglicht den einfachen Zugriff auf eine Person

-- 
ktp-contact-applet packaging