[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=2ca1d97

The following commit has been merged in the master branch:
commit 2ca1d9720e4341176ba1f83cf4a94752a8892660
Author: l10n daemon script <scripty at kde.org>
Date:   Thu Dec 3 09:40:02 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/remotecontrol/kdeconnect_remotecontrol.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index d008f0e..a3eeddf 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -12,6 +12,7 @@
         "Description[ca at valencia]": "Sistemes de control remot", 
         "Description[ca]": "Sistemes de control remot", 
         "Description[cs]": "Ovládejte vzdálené systémy", 
+        "Description[de]": "Entfernte Systeme steuern", 
         "Description[en_GB]": "Control Remote systems", 
         "Description[es]": "Controlar sistemas remotos", 
         "Description[fi]": "Ohjaa järjestelmiä etänä", 
@@ -38,6 +39,7 @@
         "Name[ca at valencia]": "Control remot", 
         "Name[ca]": "Control remot", 
         "Name[cs]": "Dálkové ovládání", 
+        "Name[de]": "Fernsteuerung", 
         "Name[en_GB]": "RemoteControl", 
         "Name[es]": "Control remoto", 
         "Name[fi]": "Kauko-ohjain", 

-- 
kdeconnect packaging