[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=81bdf6c

The following commit has been merged in the master branch:
commit 81bdf6cba11bbe97043c08cb878e4277673c878f
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Jan 14 10:16:08 2016 +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 205b841..b8ed184 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -10,6 +10,7 @@ Name[de]=Instant-Messaging
 Name[el]=Στιγμιαία μηνύματα
 Name[en_GB]=Instant Messaging
 Name[es]=Mensajería instantánea
+Name[et]=Kiirsuhtlus
 Name[fi]=Pikaviestintä
 Name[fr]=Messagerie instantanée
 Name[gl]=Mensaxaría instantánea
@@ -46,6 +47,7 @@ Comment[de]=Zeigt Ihre Anwesenheit und Kontakte
 Comment[el]=Εμφανίζει τις επαφές και την παρουσία σας
 Comment[en_GB]=Displays your presence and contacts
 Comment[es]=Muestra su estado y sus contactos
+Comment[et]=Oleku ja kontaktide näitamine
 Comment[fi]=Näyttää läsnäolon ja yhteystiedot
 Comment[fr]=Affiche votre présence et vos contacts
 Comment[gl]=Mostra a súa presenza e contactos.
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index 1bc6f71..d61bdfc 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -10,6 +10,7 @@ Name[de]=Person
 Name[el]=Πρόσωπο
 Name[en_GB]=Person
 Name[es]=Persona
+Name[et]=Isik
 Name[fi]=Henkilö
 Name[fr]=Personne
 Name[gl]=Persoa
@@ -45,6 +46,7 @@ Comment[de]=Ermöglicht den einfachen Zugriff auf eine Person
 Comment[el]=Καθιστά ένα πρόσωπο προσβάσιμο εύκολα
 Comment[en_GB]=Makes a person easily accessible
 Comment[es]=Hace a una persona fácilmente accesible
+Comment[et]=Isiku hõlpsasti kättesaadavaks muutmine
 Comment[fi]=Helppo pääsy henkilöön
 Comment[fr]=Rendre une personne facilement accessible
 Comment[gl]=Permite acceder facilmente a unha persoa.

-- 
ktp-contact-applet packaging