[SCM] ktp-kded-integration-module packaging branch, master, updated. debian/16.04.1-1-6-gbde9eba

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 60090613b7bdf915c38021d1e3ab27e4f0aaf172
Author: l10n daemon script <scripty at kde.org>
Date:   Sat May 28 13:04:32 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"
---
 ktp_integration_module.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ktp_integration_module.desktop b/ktp_integration_module.desktop
index 225de36..d51d572 100644
--- a/ktp_integration_module.desktop
+++ b/ktp_integration_module.desktop
@@ -78,7 +78,7 @@ Comment[nb]=Modul som gir dypere integrering av lynmelding med KDE.
 Comment[nds]=Moduul, dat en wiedergahn Integreren vun Kortnarichten na KDE praatstellt
 Comment[nl]=Deze module biedt een diepere integratie van Instant Messaging met KDE.
 Comment[pa]=ਮੋਡੀਊਲ ਤੁਰੰਤ ਸੁਨੇਹੇਦਾਰ ਨੂੰ KDE ਨਾਲ ਡੂੰਘੇ ਰੂਪ ਵਿੱਚ ਜੋੜਦਾ ਹੈ।
-Comment[pl]=Moduł zapewniający głębszą integrację komunikatora internetowego z KDE.
+Comment[pl]=Zapewnia głębszą integrację komunikatora internetowego z KDE.
 Comment[pt]=Um módulo que fornece maior integração com as Mensagens Instantâneas no KDE.
 Comment[pt_BR]=Módulo que proporciona maior integração com as mensagens instantâneas no KDE.
 Comment[ro]=Modul ce furnizează integrare mai profundă între mesageria instantanee și KDE.

-- 
ktp-kded-integration-module packaging