[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=5b712ef

The following commit has been merged in the master branch:
commit 5b712ef7c98517f7717acae2802e2bce89581531
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Nov 1 10:41:45 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/runcommand/kdeconnect_runcommand_config.desktop | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop
index 0e1fe40..6cbcd6d 100644
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@@ -8,6 +8,7 @@ X-KDE-ParentComponents=kdeconnect_runcommand
 Name=Run Command plugin settings
 Name[ca]=Ajustaments del connector Executa ordres
 Name[cs]=Nastavení modulu Spustit příkaz
+Name[de]=Modul-Einstellungen für Befehlsausführung
 Name[en_GB]=Run Command plugin settings
 Name[es]=Ajustes del complemento de ejecución de órdenes
 Name[fi]=Suorita komento -liitännäisen asetukset

-- 
kdeconnect packaging