[SCM] ktp-approver packaging branch, master, updated. debian/16.04.2-1-46-g6136066

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-approver.git;a=commitdiff;h=4ae6d75

The following commit has been merged in the master branch:
commit 4ae6d75b09cbdf6a575f96380bd919e21eb4e8e1
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Nov 29 04:26:39 2016 +0100

    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"
---
 ktp-approver.desktop     | 1 +
 src/ktp_approver.desktop | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/ktp-approver.desktop b/ktp-approver.desktop
index 69e9b5a..933b84b 100644
--- a/ktp-approver.desktop
+++ b/ktp-approver.desktop
@@ -24,6 +24,7 @@ Comment[ko]=KTp 승인 도구
 Comment[nb]=KTp-Godkjenner
 Comment[nds]=KTp-Beglöver
 Comment[nl]=Goedkeuringgever van KTp
+Comment[nn]=KTp-godkjennar
 Comment[pl]=Program zatwierdzający KTp
 Comment[pt]=Aprovação do KTp
 Comment[pt_BR]=Aprovação KTp
diff --git a/src/ktp_approver.desktop b/src/ktp_approver.desktop
index 3c38c46..0edf946 100644
--- a/src/ktp_approver.desktop
+++ b/src/ktp_approver.desktop
@@ -26,6 +26,7 @@ Name[mr]=त्वरित संदेश प्रमाणित करण
 Name[nb]=Godkjenner for lynmelding
 Name[nds]=Kortnarichten-Beglöver
 Name[nl]=Goedkeuringgever van Instant Messaging
+Name[nn]=Lynmeldingsgodkjennar
 Name[pa]=ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਮਨਜ਼ੂਰਕਰਤਾ
 Name[pl]=Program zatwierdzający dla komunikatorów internetowych
 Name[pt]=Aprovação das Mensagens Instantâneas
@@ -71,6 +72,7 @@ Comment[lt]=Rodo pranešimus įeinančioms IM/Skambučių užklausoms ir leidži
 Comment[nb]=Viser varslinger om innkommende lynmelding/lydanrop så du kan åpne en behandler for å svare
 Comment[nds]=Gifft bi ankamen Kortnaricht-/Anroop-Anfragen Bescheed un lett Di en Programm för't Antern opmaken
 Comment[nl]=Toont meldingen van binnenkomende IM/telefoonoproep en maakt het mogelijk dat u een antwoorder opent
+Comment[nn]=Viser varslingar om innkommande lynmeldingar/lydanrop og lèt deg opna eit program for å svara
 Comment[pl]=Pokazuje powiadomienia komunikatorów internetowych/żądań rozmowy telefonicznej i pozwala na otwieranie programu obsługującego, aby umożliwić odpowiedź
 Comment[pt]=Mostra as notificações dos pedidos de MI/chamadas recebidos e permite-lhe abrir um módulo de resposta
 Comment[pt_BR]=Mostra as notificações dos pedidos de MI/chamadas recebidos e permite-lhe abrir um módulo de resposta

-- 
ktp-approver packaging