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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6612b3e81d2d6092689424b24c7950eb8f73ea92
Author: l10n daemon script <scripty at kde.org>
Date:   Tue Apr 26 11:52:59 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/kcm_ktp_integration_module.desktop b/config/kcm_ktp_integration_module.desktop
index 8ce537c..e63b98a 100644
--- a/config/kcm_ktp_integration_module.desktop
+++ b/config/kcm_ktp_integration_module.desktop
@@ -64,7 +64,7 @@ Name[zh_TW]=一般的
 Comment=General settings for Instant Messaging and VoIP
 Comment[ast]=Axustes xenerales pa la mensaxería nel intre y VoIP
 Comment[bs]=Opšte postavke za instant poruke i  VoIP
-Comment[ca]=Arranjament general per la missatgeria instantània i VoIP
+Comment[ca]=Arranjament general per a la missatgeria instantània i VoIP
 Comment[ca at valencia]=Arranjament general per la missatgeria instantània i VoIP
 Comment[cs]=Obecná nastavení pro IM a VOIP
 Comment[da]=Generelle indstillinger for instant messaging og VoIP

-- 
ktp-kded-integration-module packaging