[SCM] ktp-contact-applet packaging branch, master, updated. debian/16.04.2-1-67-g066859a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=a421374

The following commit has been merged in the master branch:
commit a4213741cfaee17e51452b9cebf1db017724ed0c
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Oct 23 09:28: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"
---
 contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
index 0d50c51..6a928d2 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -55,7 +55,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[nn]=Vis lynmeldings­kontaktar
 Comment[pl]=Wyświetla twoją dostępność i kontakty
 Comment[pt]=Mostra a sua presença e contactos
 Comment[pt_BR]=Mostra a sua presença e contatos

-- 
ktp-contact-applet packaging