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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit feb3166eff0a223a685e846630f604d817931f34
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Jul 21 13:28:01 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 e625122..0d50c51 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
@@ -19,7 +19,7 @@ Name[it]=Messaggistica istantanea
 Name[ko]=인스턴트 메시징
 Name[nb]=Lynmelding
 Name[nl]=Instant Messaging
-Name[nn]=Lydmeldingar
+Name[nn]=Lynmeldingar
 Name[pl]=Komunikator internetowy
 Name[pt]=Mensagens Instantâneas
 Name[pt_BR]=Mensagens instantâneas

-- 
ktp-contact-applet packaging