[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=0a1f4c0

The following commit has been merged in the master branch:
commit 0a1f4c0f6a9f86b0b74b7c30a54970830800b5f4
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Apr 27 10:19:17 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 | 4 ++++
 person/org.kde.person/metadata.desktop.cmake               | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
index 3470909..6fddba7 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -10,6 +10,7 @@ Name[en_GB]=Instant Messaging
 Name[es]=Mensajería instantánea
 Name[fi]=Pikaviestintä
 Name[fr]=Messagerie instantanée
+Name[gl]=Mensaxaría instantánea
 Name[hu]=Azonnali üzenetküldés
 Name[it]=Messaggistica istantanea
 Name[nb]=Lynmelding
@@ -17,6 +18,7 @@ Name[nl]=Instant Messaging
 Name[pl]=Komunikator internetowy
 Name[pt]=Mensagens Instantâneas
 Name[pt_BR]=Mensagens instantâneas
+Name[ro]=Mesagerie instantanee
 Name[ru]=Мгновенные сообщения
 Name[sk]=Priama komunikácia
 Name[sl]=Hipno sporočanje
@@ -39,12 +41,14 @@ Comment[en_GB]=Displays your presence and contacts
 Comment[es]=Muestra su estado y sus contactos
 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.
 Comment[hu]=Megjeleníti a jelenlétét és partnereit
 Comment[it]=Mostra la tua presenza e i tuoi contatti
 Comment[nl]=Toont uw aanwezigheid en contactpersonen
 Comment[pl]=Wyświetla twoją dostępności i kontakty
 Comment[pt]=Mostra a sua presença e contactos
 Comment[pt_BR]=Mostra a sua presença e contatos
+Comment[ro]=Vă afișează prezența și contactele
 Comment[ru]=Показывает список контактов и ваш статус
 Comment[sk]=Zobrazí vašu prítomnosť a kontakty
 Comment[sl]=Prikaže vašo prisotnost in stike
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index d4b5565..ae4e96a 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -10,11 +10,13 @@ Name[en_GB]=Person
 Name[es]=Persona
 Name[fi]=Henkilö
 Name[fr]=Personne
+Name[gl]=Persoa
 Name[it]=Persona
 Name[nl]=Persoon
 Name[pl]=Osoba
 Name[pt]=Pessoa
 Name[pt_BR]=Pessoa
+Name[ro]=Persoană
 Name[ru]=Человек
 Name[sk]=Osoba
 Name[sl]=Oseba
@@ -36,11 +38,14 @@ Comment[en_GB]=Makes a person easily accessible
 Comment[es]=Hace a una persona fácilmente accesible
 Comment[fi]=Helppo pääsy henkilöön
 Comment[fr]=Rendre une personne facilement accessible
+Comment[gl]=Permite acceder facilmente a unha persoa.
 Comment[it]=Rende una persona facilmente accessibile
 Comment[nl]=Maakt een persoon gemakkelijk toegankelijk
 Comment[pl]=Czyni osobę łatwo dostępną
 Comment[pt]=Torna uma pessoa facilmente acessível
 Comment[pt_BR]=Torna uma pessoa facilmente acessível
+Comment[ro]=Face o persoană să fie accesibilă ușor
+Comment[ru]=Виджет для быстрого начала разговора с человеком
 Comment[sk]=Urobí osobu ľahko prístupnú
 Comment[sl]=Napravi osebo enostavno dostopno
 Comment[sr]=Чини особу лако доступном

-- 
ktp-contact-applet packaging