[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=f8e0037

The following commit has been merged in the master branch:
commit f8e00377c616117847b3c1b83c53620d6bb47be2
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Jun 11 04:38:17 2017 +0200

    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 bf9d340..b58e7d6 100644
--- a/ktp_integration_module.desktop
+++ b/ktp_integration_module.desktop
@@ -67,7 +67,7 @@ Comment[et]=Moodul kiirsuhtluse tihedamaks lõimimiseks KDE-ga.
 Comment[fi]=KDE:lle kiinteämmän integroinnin pikaviestintään tarjoava moduuli
 Comment[fr]=Module fournissant une intégration approfondie de la messagerie instantanée avec KDE.
 Comment[ga]=Modúl a dhéanann comhtháthú níos doimhne de Theachtaireachtaí Meandaracha in KDE.
-Comment[gl]=Módulo que fornece maior integración da mensaxería instantánea co KDE.
+Comment[gl]=Módulo que fornece maior integración da mensaxería instantánea con KDE.
 Comment[hu]=A KDE és az azonnali üzenetküldés mélyebb integrációját biztosító modul.
 Comment[ia]=Modulo que forni un integration plus profunde de Messagerie Instantanee con KDE.
 Comment[it]=Modulo che fornisce una maggiore integrazione di messaggistica istantanea in KDE.

-- 
ktp-kded-integration-module packaging