[SCM] ktp-contact-list packaging branch, master, updated. debian/16.04.2-1-51-g8ec8bc9

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4be5a38259769d7382f7b08e4e82e09cc28cef57
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Nov 3 09:52:33 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"
---
 org.kde.ktpcontactlist.desktop | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/org.kde.ktpcontactlist.desktop b/org.kde.ktpcontactlist.desktop
index c4fe317..a790bf8 100644
--- a/org.kde.ktpcontactlist.desktop
+++ b/org.kde.ktpcontactlist.desktop
@@ -22,6 +22,7 @@ Name[ko]=IM 대화 상대
 Name[nb]=LM-kontakter
 Name[nds]=KN-Kontakten
 Name[nl]=IM-contactpersonen
+Name[nn]=LM-kontaktar
 Name[pl]=Kontakty komunikatorów internetowych
 Name[pt]=Contactos de MI
 Name[pt_BR]=Contatos de Mensagens Instantâneas
@@ -67,6 +68,7 @@ GenericName[mr]=त्वरित संदेशवाहक संपर्
 GenericName[nb]=Lynmeldingskontakter
 GenericName[nds]=Kortnarichtenkontakten
 GenericName[nl]=Contacten van Instant messenger
+GenericName[nn]=Lynmeldingskontaktar
 GenericName[pa]=ਤੁਰੰਤ ਸੁਨੇਹੇ ਸੰਪਰਕ
 GenericName[pl]=Kontakty komunikatora internetowego
 GenericName[pt]=Contactos de Mensagens Instantâneas
@@ -114,6 +116,7 @@ Comment[mr]=तुमचे त्वरित संदेशवाहक स
 Comment[nb]=Viser dine lynmeldingskontakter
 Comment[nds]=Wiest Dien Kortnarichtenkontakten
 Comment[nl]=Contacten van Instant messenger tonen
+Comment[nn]=Viser lynmeldingskontaktane dine
 Comment[pa]=ਆਪਣੇ ਤੁਰੰਤ ਸੁਨੇਹੇ ਸੰਪਰਕ ਵੇਖਾਓ
 Comment[pl]=Wyświetla twoje kontakty komunikatora internetowego
 Comment[pt]=Mostrar os seus contactos das mensagens instantâneas

-- 
ktp-contact-list packaging