[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=b61cdb1

The following commit has been merged in the master branch:
commit b61cdb15b1cda5b96bb66049a6e85edd91412800
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Sep 12 11:51:43 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 insertions(+)

diff --git a/chat/org.kde.ktp-chat/metadata.desktop.cmake b/chat/org.kde.ktp-chat/metadata.desktop.cmake
index dca6381..a10e2c3 100644
--- a/chat/org.kde.ktp-chat/metadata.desktop.cmake
+++ b/chat/org.kde.ktp-chat/metadata.desktop.cmake
@@ -25,6 +25,7 @@ Name[mr]=त्वरित गप्पा
 Name[nb]=Kjapp prat
 Name[nds]=Fixklönen
 Name[nl]=Snelle chat
+Name[nn]=Snøggprat
 Name[pa]=ਤੁਰੰਤ ਗੱਲਬਾਤ
 Name[pl]=Szybkie rozmowy
 Name[pt]=Conversa Rápida
@@ -70,6 +71,7 @@ Comment[mr]=तुमच्या कार्यस्थानातून स
 Comment[nb]=Enkel prat fra arbeidsflaten
 Comment[nds]=Eenfach Klönen ut Dien Arbeitrebeet
 Comment[nl]=Eenvoudige chats vanuit uw werkruimte
+Comment[nn]=Enkel prat frå arbeidsflata
 Comment[pa]=ਤੁਹਾਡੇ ਵਰਕਸਪੇਸ ਤੋਂ ਆਮ ਗੱਲਾਬਾਤਾਂ
 Comment[pl]=Proste rozmowy z twojej przestrzeni roboczej
 Comment[pt]=Conversas simples a partir da sua área de trabalho
diff --git a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
index d98c59f..7cbaa8a 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -17,6 +17,7 @@ Name[it]=Messaggistica istantanea
 Name[ko]=인스턴트 메시징
 Name[nb]=Lynmelding
 Name[nl]=Instant Messaging
+Name[nn]=Lydmeldingar
 Name[pl]=Komunikator internetowy
 Name[pt]=Mensagens Instantâneas
 Name[pt_BR]=Mensagens instantâneas
@@ -50,6 +51,7 @@ Comment[hu]=Megjeleníti a jelenlétét és partnereit
 Comment[it]=Mostra la tua presenza e i tuoi contatti
 Comment[ko]=온라인 상태와 대화 상대 표시
 Comment[nl]=Toont uw aanwezigheid en contactpersonen
+Comment[nn]=Vis lynmeldingskontaktar
 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
diff --git a/person/org.kde.person/metadata.desktop.cmake b/person/org.kde.person/metadata.desktop.cmake
index e3c8be2..9d97504 100644
--- a/person/org.kde.person/metadata.desktop.cmake
+++ b/person/org.kde.person/metadata.desktop.cmake
@@ -16,6 +16,7 @@ Name[it]=Persona
 Name[ko]=사람
 Name[lt]=Asmuo
 Name[nl]=Persoon
+Name[nn]=Person
 Name[pl]=Osoba
 Name[pt]=Pessoa
 Name[pt_BR]=Pessoa
@@ -48,6 +49,7 @@ Comment[gl]=Permite acceder facilmente a unha persoa.
 Comment[it]=Rende una persona facilmente accessibile
 Comment[ko]=특정 사람과 빠르게 대화합니다
 Comment[nl]=Maakt een persoon gemakkelijk toegankelijk
+Comment[nn]=Gjer ein person lett tilgjengeleg
 Comment[pl]=Czyni osobę łatwo dostępną
 Comment[pt]=Torna uma pessoa facilmente acessível
 Comment[pt_BR]=Torna uma pessoa facilmente acessível

-- 
ktp-contact-applet packaging