[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=10c92dc

The following commit has been merged in the master branch:
commit 10c92dc347fa234c60f8ed775d5acb66b717c27e
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Nov 7 21:16:48 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"
---
 config/appearance/kcm_ktp_chat_appearance.desktop | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/appearance/kcm_ktp_chat_appearance.desktop b/config/appearance/kcm_ktp_chat_appearance.desktop
index f841f2e..74dbfa1 100644
--- a/config/appearance/kcm_ktp_chat_appearance.desktop
+++ b/config/appearance/kcm_ktp_chat_appearance.desktop
@@ -61,8 +61,8 @@ Comment=Choose a Style for your Chat Window and customize it
 Comment[ar]=اختر نمطًا لنافذة الدّردشة وخصّصه
 Comment[ast]=Escueyi un estilu pa la to ventana de charra y personalízalu
 Comment[bs]=Izaberite stil za prozor ćaskanja i prilagodite ga
-Comment[ca]=Seleccioneu un estil per la finestra de xat i personalitzeu-la
-Comment[ca at valencia]=Seleccioneu un estil per la finestra de xat i personalitzeu-la
+Comment[ca]=Seleccioneu un estil per a la finestra de xat i personalitzeu-la
+Comment[ca at valencia]=Seleccioneu un estil per a la finestra de xat i personalitzeu-la
 Comment[cs]=Vyberte styl pro okno rozhovoru a upravte jej
 Comment[da]=Vælg chatvinduestil og tilpas den
 Comment[de]=Wählen Sie einen Stil für Ihr Chat-Fenster und passen Sie ihn an

-- 
ktp-text-ui packaging