[SCM] ktp-contact-runner packaging branch, master, updated. debian/16.04.2-1-47-g3973a3e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-runner.git;a=commitdiff;h=e7883f1

The following commit has been merged in the master branch:
commit e7883f11c889afa9ef7a15dfbb3fc3a9f1648fe4
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Nov 3 09:52:45 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"
---
 plasma-runner-ktp-contact.desktop.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plasma-runner-ktp-contact.desktop.cmake b/plasma-runner-ktp-contact.desktop.cmake
index 403175d..251650e 100644
--- a/plasma-runner-ktp-contact.desktop.cmake
+++ b/plasma-runner-ktp-contact.desktop.cmake
@@ -25,6 +25,7 @@ Name[lt]=Tikralaikiai pokalbiai
 Name[nb]=Lynmelding
 Name[nds]=Kortnarichten
 Name[nl]=Instant Messaging
+Name[nn]=Lynmeldingar
 Name[pl]=Komunikator internetowy
 Name[pt]=Mensagens Instantâneas
 Name[pt_BR]=Mensagens instantâneas
@@ -68,6 +69,7 @@ Comment[lt]=Pradėti pokalbį su bet kuriuo TP kontaktu arba pakeiskite savo TP
 Comment[nb]=Start en prat med en av dine LM-kontakter eller endre din LM-status
 Comment[nds]=En Klöönsnack mit een vun Dien KM-Kontakten starten oder Dien KN-Status ännern
 Comment[nl]=Begin een chat met een van uw IM-contactpersonen of wijzig uw IM-status
+Comment[nn]=Start ein prat med ein lynmeldingskontaktane dine eller endra din lynmeldingsstatus
 Comment[pl]=Rozpocznij rozmowę z którymkolwiek z twoich kontaktów lub zmień swoja dostępność
 Comment[pt]=Iniciar uma conversa com qualquer um dos seus contactos MI ou mudar o seu estado
 Comment[pt_BR]=Inicia uma conversa com um dos seus contatos de MI ou altera o seu status

-- 
ktp-contact-runner packaging