[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=f9f7f2b

The following commit has been merged in the master branch:
commit f9f7f2bbcb195514297894e8389ff82dcfff8950
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Jan 16 10:23:35 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"
---
 plasmoid/package/metadata.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index 9d64822..a7d9b3a 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -33,7 +33,7 @@ Comment=Show notifications from your devices using KDE Connect
 Comment[ast]=Amuesa avisos de los tos preseos usando KDE Connect
 Comment[bg]=Показване на уведомления от вашите устройства чрез KDE Connect
 Comment[bs]=Prikaži obavlještenja sa uređaja koji koriste KDE konekciju
-Comment[ca]=Mostra les notificacions dels vostres dispositius usant el KDE Connect
+Comment[ca]=Mostra les notificacions dels vostres dispositius emprant el KDE Connect
 Comment[ca at valencia]=Mostra les notificacions dels vostres dispositius usant el KDE Connect
 Comment[cs]=Zobrazit upozornění z vašich zařízení pomocí KDE Connect
 Comment[da]=Vis bekendtgørelser fra dine enheder med KDE Connect

-- 
kdeconnect packaging