[SCM] ktp-common-internals packaging branch, master, updated. debian/16.04.2-1-111-g6e00b1c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=81691f2

The following commit has been merged in the master branch:
commit 81691f21480701b46cff507af0b0d789d19d5c95
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Feb 23 06:17:10 2017 +0100

    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/Logger/plugins/tplogger/ktploggerplugin_tplogger.desktop.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KTp/Logger/plugins/tplogger/ktploggerplugin_tplogger.desktop.cmake b/KTp/Logger/plugins/tplogger/ktploggerplugin_tplogger.desktop.cmake
index afa50ed..4a21bc7 100644
--- a/KTp/Logger/plugins/tplogger/ktploggerplugin_tplogger.desktop.cmake
+++ b/KTp/Logger/plugins/tplogger/ktploggerplugin_tplogger.desktop.cmake
@@ -43,7 +43,7 @@ Comment=Provides integration with Telepathy Logger
 Comment[ast]=Forne integración col rexistrador de Telepathy
 Comment[bs]=Obavlja integraciju s Telepathy dnevnikom
 Comment[ca]=Aquest connector proporciona integració amb l'enregistrador del Telepathy
-Comment[ca at valencia]=Este connector proporciona integració amb l'enregistrador del Telepathy
+Comment[ca at valencia]=Este connector proporciona integració amb l'gravadora del Telepathy
 Comment[cs]=Poskytuje integraci se zaznamenáváním Telepathy
 Comment[da]=Giver integration med Telepathy Logger
 Comment[de]=Stellt Integration mit Telepathy-Protokollen zur Verfügung

-- 
ktp-common-internals packaging