[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=1b76d2e

The following commit has been merged in the master branch:
commit 1b76d2e84acf6576fdc753e36a2948b8e83ed25b
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Dec 10 09:12:39 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/notifications/kdeconnect_notifications_config.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/notifications/kdeconnect_notifications_config.desktop b/plugins/notifications/kdeconnect_notifications_config.desktop
index 639543f..4bc4412 100644
--- a/plugins/notifications/kdeconnect_notifications_config.desktop
+++ b/plugins/notifications/kdeconnect_notifications_config.desktop
@@ -9,6 +9,7 @@ Name=Notification synchronization plugin settings
 Name[ca]=Ajustament del connector per a la sincronització de 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
 Name[fi]=Ilmoitusten synkronointiliitännäisen asetukset
 Name[gl]=Configuración do complemento de sincronización de notificacións
 Name[nl]=Instellingen van plug-in voor synchronisatie van meldingen

-- 
kdeconnect packaging