[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=2b9217f

The following commit has been merged in the master branch:
commit 2b9217fab3f4bf0ded5e74d09aa672c9ede22de3
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Jan 17 10:49:15 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 +-
 plugins/notifications/kdeconnect_notifications_config.desktop | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop
index a7d9b3a..0823adc 100644
--- a/plasmoid/package/metadata.desktop
+++ b/plasmoid/package/metadata.desktop
@@ -34,7 +34,7 @@ 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 emprant el KDE Connect
-Comment[ca at valencia]=Mostra les notificacions dels vostres dispositius usant el KDE Connect
+Comment[ca at valencia]=Mostra les notificacions dels vostres dispositius emprant 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
 Comment[de]=Zeigt Benachrichtigungen von Ihren Geräten mit KDE-Connect
diff --git a/plugins/notifications/kdeconnect_notifications_config.desktop b/plugins/notifications/kdeconnect_notifications_config.desktop
index 6fd58ba..0197529 100644
--- a/plugins/notifications/kdeconnect_notifications_config.desktop
+++ b/plugins/notifications/kdeconnect_notifications_config.desktop
@@ -7,7 +7,7 @@ X-KDE-ParentComponents=kdeconnect_notifications
 
 Name=Notification synchronization plugin settings
 Name[ca]=Ajustament del connector Sincronitza les notificacions
-Name[ca at valencia]=Ajustament del connector per a la sincronització de les notificacions
+Name[ca at valencia]=Ajustament del connector Sincronitza les notificacions
 Name[en_GB]=Notification synchronisation plugin settings
 Name[es]=Preferencias del complemento de sincronización de notificaciones
 Name[fi]=Ilmoitusten synkronointiliitännäisen asetukset

-- 
kdeconnect packaging