[SCM] kdeconnect packaging branch, master, updated. upstream/1.0.1-206-gf661872

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=642e530

The following commit has been merged in the master branch:
commit 642e530836b9ff3285df2d0e13eb5597d41191a0
Author: l10n daemon script <scripty at kde.org>
Date:   Fri Nov 4 12:19:24 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/runcommand/kdeconnect_runcommand_config.desktop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop
index 83fb6ca..6c59cb3 100644
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@@ -12,7 +12,7 @@ Name[cs]=Nastavení modulu Spustit příkaz
 Name[da]=Indstilling af kør kommando-plugin
 Name[de]=Modul-Einstellungen für Befehlsausführung
 Name[en_GB]=Run Command plugin settings
-Name[es]=Ejecutar preferencias del complemento Orden
+Name[es]=Ajustes del complemento de ejecución de órdenes
 Name[et]=Käsu käivitamise plugina seadistused
 Name[fi]=Suorita komento -liitännäisen asetukset
 Name[it]=Impostazioni estensione Esegui comando

-- 
kdeconnect packaging