[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=7f668b5

The following commit has been merged in the master branch:
commit 7f668b59a3e6432404b6b8524a0ec96327136682
Author: l10n daemon script <scripty at kde.org>
Date:   Sat Feb 13 09:43:43 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/kdeconnect.notifyrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index e1435bd..59bf0b3 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -99,6 +99,7 @@ Comment[ca]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
 Comment[ca at valencia]=Les sol·licituds d'aparellament rebudes des d'un dispositiu
 Comment[de]=Verbindungsanfrage von einem Gerät erhalten
 Comment[el]=Λήφθηκε αίτημα σύζευξης από μια συσκευή
+Comment[es]=Petición de vinculación recibida desde un dispositivo
 Comment[fi]=Saatiin paripyyntö laitteelta
 Comment[gl]=Recibiuse unha solicitude de emparellamento dun dispositivo.
 Comment[nl]=Verzoek om een paar te maken ontvangen van apparaten

-- 
kdeconnect packaging