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

The following commit has been merged in the master branch:
commit 7546118157140968ababd1db53a47d48ae4359ee
Author: l10n daemon script <scripty at kde.org>
Date:   Mon May 18 10:02:50 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/battery/kdeconnect_battery.json   | 2 +-
 plugins/mousepad/kdeconnect_mousepad.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json
index 0fb4010..118f6cf 100644
--- a/plugins/battery/kdeconnect_battery.json
+++ b/plugins/battery/kdeconnect_battery.json
@@ -26,7 +26,7 @@
         "Description[x-test]": "xxShow your phone battery next to your computer batteryxx", 
         "Description[zh_CN]": "在计算机电池旁显示手机电池", 
         "EnabledByDefault": true, 
-        "Icon": "preferences-system-power-management",
+        "Icon": "preferences-system-power-management", 
         "Id": "kdeconnect_battery", 
         "License": "GPL", 
         "Name": "Battery monitor", 
diff --git a/plugins/mousepad/kdeconnect_mousepad.json b/plugins/mousepad/kdeconnect_mousepad.json
index ed5058f..988f926 100644
--- a/plugins/mousepad/kdeconnect_mousepad.json
+++ b/plugins/mousepad/kdeconnect_mousepad.json
@@ -26,7 +26,7 @@
         "Description[x-test]": "xxUse your phone as a touchpad and keyboardxx", 
         "Description[zh_CN]": "用您的手机作为触摸板和键盘", 
         "EnabledByDefault": true, 
-        "Icon": "edit-select",
+        "Icon": "edit-select", 
         "Id": "kdeconnect_mousepad", 
         "License": "GPL", 
         "Name": "Virtual input", 

-- 
kdeconnect packaging