[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=8a2c59d

The following commit has been merged in the master branch:
commit 8a2c59d5d760c081e6921c67e153173e0829e845
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Aug 14 11:54:14 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 +
 plugins/runcommand/kdeconnect_runcommand_config.desktop               | 1 +
 plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop | 1 +
 3 files changed, 3 insertions(+)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 1c44e25..12196be 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -96,6 +96,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[cs]=Požadavek na párování přijat ze zařízení
 Comment[en_GB]=Pairing request received from a device
+Comment[es]=Petición de vinculación recibida desde un dispositivo
 Comment[et]=Seadmelt saadi paardumissoov
 Comment[it]=Richiesta di associazione ricevuta da un dispositivo
 Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat
diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop
index 43df28f..2e026a5 100644
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@@ -10,6 +10,7 @@ Name[ca]=Ajustaments del connector Executa ordres
 Name[ca at valencia]=Ajustaments del connector Executa ordes
 Name[cs]=Nastavení modulu Spustit příkaz
 Name[en_GB]=Run Command plugin settings
+Name[es]=Ejecutar preferencias del complemento Orden
 Name[et]=Käsu käivitamise plugina seadistused
 Name[fi]=Suorita komento -liitännäisen asetukset
 Name[it]=Impostazioni estensione Esegui comando
diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
index e62f9ab..77bed1f 100644
--- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
+++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
@@ -10,6 +10,7 @@ Name[ca]=Ajustament del connector Sincronitza les notificacions
 Name[ca at valencia]=Ajustament del connector Sincronitza les notificacions
 Name[cs]=Nastavení modulu synchronizace upozornění
 Name[en_GB]=Notification synchronisation plugin settings
+Name[es]=Preferencias del complemento de sincronización de notificaciones
 Name[et]=Märguande sünkroonimise plugina seaditused
 Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche
 Name[nl]=Instellingen voor meldingen van synchronisatie plug-in

-- 
kdeconnect packaging