[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=aaf2820

The following commit has been merged in the master branch:
commit aaf28201a1f32a029c283485fb9a3ac7037bb455
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Jun 1 10:06:32 2015 +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"
---
 .../urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake b/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
index ca558eb..1fe776e 100644
--- a/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
+++ b/filters/urlexpansion/ktptextui_message_filter_urlexpansion.desktop.cmake
@@ -45,7 +45,7 @@ Name[zh_TW]=短網址
 Comment=Shows the actual URL to which a shortened URL is redirecting to
 Comment[ar]=يظهر العنوان الفعليّ الّذي يعيد العنوان المقصّر التّوجيه إليه
 Comment[bs]=Prikazuje stvarni URL na koji je skraćeni preusmjeren
-Comment[ca]=Mostra l'URL real al que es redirigeix un URL breu
+Comment[ca]=Mostra l'URL real al qual es redirigeix un URL breu
 Comment[ca at valencia]=Mostra l'URL real al que es redirigeix un URL breu
 Comment[cs]=Zobrazí skutečné URL, na které je přesměrováno zkrácené URL
 Comment[da]=Viser den faktiske URL som en afkortet URL videresender til

-- 
ktp-text-ui packaging