[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=988d4b8

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

diff --git a/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop.cmake b/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop.cmake
index 36c18b7..11296eb 100644
--- a/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop.cmake
+++ b/plugins/sunshine/ktpaccountskcm_plugin_sunshine.desktop.cmake
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Comment=Custom account configuration user interface for Gadu-Gadu accounts using the Sunshine connection manager.
 Comment[ast]=Interfaz d'usuariu de configuración de cuenta personalizada pa cuentes Gadu-Gadu qu'usen el xestor de conexones Sunshine.
 Comment[bs]=Korisnički interfejs za konfiguraciju Gadu-Gadu korisničkih naloga koristeći Sunshine menadžer konekcja.
-Comment[ca]=Interfície d'usuari de configuració de compte personalitzat per comptes del Gadu-Gadu que utilitzen el gestor de connexions Sunshine.
+Comment[ca]=Interfície d'usuari de configuració de compte personalitzat en comptes del Gadu-Gadu que utilitzen el gestor de connexions Sunshine.
 Comment[ca at valencia]=Interfície d'usuari de configuració de compte personalitzat per comptes del Gadu-Gadu que utilitzen el gestor de connexions Sunshine.
 Comment[cs]=Vlastní uživatelské rozhraní nastavení účtů pro účty Gadu-Gadu používající správce spojení Sunshine.
 Comment[da]=Brugerflade til brugertilpasset kontokonfiguration til Gadu-Gadu-konti der bruger forbindelseshåndteringen Sunshine.

-- 
ktp-accounts-kcm packaging