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

The following commit has been merged in the master branch:
commit b37582308af20f57de96567109fe3bb8448308de
Author: l10n daemon script <scripty at kde.org>
Date:   Sun Jul 26 09:31: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/lockdevice/kdeconnect_lockdevice.json | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json
index a9ed6e1..0a909ac 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -9,6 +9,7 @@
         ], 
         "Description": "Locks your systems", 
         "Description[ca]": "Bloqueja els vostres sistemes", 
+        "Description[de]": "Sperrt Ihre Systeme", 
         "Description[gl]": "Bloquea os seus sistemas.", 
         "Description[nl]": "Vergrendeld uw systemen", 
         "Description[pl]": "Zablokuj swoje systemy", 
@@ -23,6 +24,7 @@
         "License": "GPL", 
         "Name": "LockDevice", 
         "Name[ca]": "Bloqueja el dispositiu", 
+        "Name[de]": "Gerätesperrung", 
         "Name[gl]": "Bloqueo do dispositivo", 
         "Name[nl]": "Apparaat vergrendelen", 
         "Name[pl]": "ZablokujUrządzenie", 

-- 
kdeconnect packaging