[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=36fff22

The following commit has been merged in the master branch:
commit 36fff2276be52922bd282eab08c14f6b88d6973f
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Jan 11 13:02:16 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"
---
 plugins/notifications/kdeconnect_notifications_config.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/notifications/kdeconnect_notifications_config.desktop b/plugins/notifications/kdeconnect_notifications_config.desktop
index 333e664..6fd58ba 100644
--- a/plugins/notifications/kdeconnect_notifications_config.desktop
+++ b/plugins/notifications/kdeconnect_notifications_config.desktop
@@ -6,7 +6,7 @@ X-KDE-Library=kdeconnect_notifications_config
 X-KDE-ParentComponents=kdeconnect_notifications
 
 Name=Notification synchronization plugin settings
-Name[ca]=Ajustament del connector per a la sincronització de les notificacions
+Name[ca]=Ajustament del connector Sincronitza les notificacions
 Name[ca at valencia]=Ajustament del connector per a la sincronització de les notificacions
 Name[en_GB]=Notification synchronisation plugin settings
 Name[es]=Preferencias del complemento de sincronización de notificaciones

-- 
kdeconnect packaging