[SCM] ktp-send-file packaging branch, master, updated. debian/16.04.2-1-48-gd52156b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-send-file.git;a=commitdiff;h=e0a63d3

The following commit has been merged in the master branch:
commit e0a63d34c9ec5f379de1fb4720e9054433b8114c
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Nov 29 04:27:15 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-send-file.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ktp-send-file.desktop b/ktp-send-file.desktop
index ec693d5..2065561 100644
--- a/ktp-send-file.desktop
+++ b/ktp-send-file.desktop
@@ -33,6 +33,7 @@ Name[mr]=आयएम संपर्काकडे फाईल पाठव
 Name[nb]=Send fil til lynmeldingskontakt
 Name[nds]=En KN-Kontakt en Datei tostüern
 Name[nl]=Bestand naar IM-contactpersoon verzenden
+Name[nn]=Send fil til lynmeldingskontakt
 Name[pa]=IM ਸੰਪਰਕ ਨੂੰ ਫਾਇਲ ਭੇਜੋ
 Name[pl]=Wyślij plik do kontaktu komunikatora internetowego
 Name[pt]=Enviar o ficheiro para o contacto MI

-- 
ktp-send-file packaging