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

The following commit has been merged in the master branch:
commit eb5c099661679dfb4c2402bfd08eb3b31b6e5d66
Author: l10n daemon script <scripty at kde.org>
Date:   Wed Jul 22 10:07:40 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       | 18 +++++++++++-------
 plugins/mousepad/kdeconnect_mousepad.json           |  4 ++--
 plugins/remotecontrol/kdeconnect_remotecontrol.json |  8 ++++----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json
index 43ea901..10e06ef 100644
--- a/plugins/lockdevice/kdeconnect_lockdevice.json
+++ b/plugins/lockdevice/kdeconnect_lockdevice.json
@@ -7,18 +7,22 @@
                 "Name": "Aleix Pol"
             }
         ], 
-        "Description": "Locks your systems",
+        "Description": "Locks your systems", 
         "EnabledByDefault": true, 
-        "Icon": "applications-miscelaneaous",
-        "Id": "kdeconnect_lockdevice",
+        "Icon": "applications-miscelaneaous", 
+        "Id": "kdeconnect_lockdevice", 
         "License": "GPL", 
-        "Name": "LockDevice",
+        "Name": "LockDevice", 
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ], 
         "Version": "0.1", 
         "Website": "https://kde.org"
     }, 
-    "X-KdeConnect-OutgoingPackageType": [ "kdeconnect.lock" ],
-    "X-KdeConnect-SupportedPackageType": [ "kdeconnect.lock" ]
-}
+    "X-KdeConnect-OutgoingPackageType": [
+        "kdeconnect.lock"
+    ], 
+    "X-KdeConnect-SupportedPackageType": [
+        "kdeconnect.lock"
+    ]
+}
\ No newline at end of file
diff --git a/plugins/mousepad/kdeconnect_mousepad.json b/plugins/mousepad/kdeconnect_mousepad.json
index b09c444..eb4ea9f 100644
--- a/plugins/mousepad/kdeconnect_mousepad.json
+++ b/plugins/mousepad/kdeconnect_mousepad.json
@@ -56,8 +56,8 @@
         ], 
         "Version": "0.1"
     }, 
-    "X-KdeConnect-OutgoingPackageType": [],
+    "X-KdeConnect-OutgoingPackageType": [], 
     "X-KdeConnect-SupportedPackageType": [
         "kdeconnect.mousepad"
     ]
-}
+}
\ No newline at end of file
diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json
index 5ff9ca3..325d23f 100644
--- a/plugins/remotecontrol/kdeconnect_remotecontrol.json
+++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json
@@ -7,12 +7,12 @@
                 "Name": "Aleix Pol"
             }
         ], 
-        "Description": "Control Remote systems",
+        "Description": "Control Remote systems", 
         "EnabledByDefault": true, 
         "Icon": "applications-multimedia", 
-        "Id": "kdeconnect_remotecontrol",
+        "Id": "kdeconnect_remotecontrol", 
         "License": "GPL", 
-        "Name": "RemoteControl",
+        "Name": "RemoteControl", 
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ], 
@@ -23,4 +23,4 @@
         "kdeconnect.mousepad"
     ], 
     "X-KdeConnect-SupportedPackageType": []
-}
+}
\ No newline at end of file

-- 
kdeconnect packaging