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

The following commit has been merged in the master branch:
commit c7cc056e132b7efc0c908c2d13285f234b6a157a
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Sep 19 11:44:07 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 +
 2 files changed, 2 insertions(+)

diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc
index 4d2eb51..e809946 100644
--- a/plugins/kdeconnect.notifyrc
+++ b/plugins/kdeconnect.notifyrc
@@ -95,6 +95,7 @@ Comment=Pairing request received from a device
 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[de]=Verbindungsanfrage von einem Gerät erhalten
 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
diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop
index 2e026a5..f278e2f 100644
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@@ -9,6 +9,7 @@ Name=Run Command plugin settings
 Name[ca]=Ajustaments del connector Executa ordres
 Name[ca at valencia]=Ajustaments del connector Executa ordes
 Name[cs]=Nastavení modulu Spustit příkaz
+Name[de]=Modul-Einstellungen für Befehlsausführung
 Name[en_GB]=Run Command plugin settings
 Name[es]=Ejecutar preferencias del complemento Orden
 Name[et]=Käsu käivitamise plugina seadistused

-- 
kdeconnect packaging