[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/16.04.2-1-55-ge100b8a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-kded-module.git;a=commitdiff;h=658c417

The following commit has been merged in the master branch:
commit 658c417b66afbbb99f9fb5c1ad0501bfd211ef18
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Nov 8 10:01:18 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"
---
 config/kcm_ktp_integration_module.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/kcm_ktp_integration_module.desktop b/config/kcm_ktp_integration_module.desktop
index f6d9804..ad8493f 100644
--- a/config/kcm_ktp_integration_module.desktop
+++ b/config/kcm_ktp_integration_module.desktop
@@ -41,6 +41,7 @@ Name[mr]=सामान्य
 Name[nb]=Generelt
 Name[nds]=Allmeen
 Name[nl]=Algemeen
+Name[nn]=Generelt
 Name[pa]=ਆਮ
 Name[pl]=Ogólne
 Name[pt]=Geral

-- 
ktp-kded-integration-module packaging