[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=326feca

The following commit has been merged in the master branch:
commit 326fecad6fd28b663aad25725d27368a47b117c6
Author: l10n daemon script <scripty at kde.org>
Date:   Sat May 2 11:45:00 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/clipboard/kdeconnect_clipboard.json | 2 +-
 plugins/sftp/kdeconnect_sftp.json           | 2 +-
 plugins/share/kdeconnect_share.json         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json
index 85c2530..44a7767 100644
--- a/plugins/clipboard/kdeconnect_clipboard.json
+++ b/plugins/clipboard/kdeconnect_clipboard.json
@@ -26,7 +26,7 @@
         "Description[x-test]": "xxShare the clipboard between devicesxx", 
         "Description[zh_CN]": "在设备间共享剪贴板", 
         "EnabledByDefault": true, 
-        "Icon": "klipper",
+        "Icon": "klipper", 
         "Id": "kdeconnect_clipboard", 
         "License": "GPL", 
         "Name": "Clipboard", 
diff --git a/plugins/sftp/kdeconnect_sftp.json b/plugins/sftp/kdeconnect_sftp.json
index d9557de..c5f6da6 100644
--- a/plugins/sftp/kdeconnect_sftp.json
+++ b/plugins/sftp/kdeconnect_sftp.json
@@ -26,7 +26,7 @@
         "Description[x-test]": "xxBrowse the remote device filesystem using SFTPxx", 
         "Description[zh_CN]": "通过 SFTP 浏览远程设备文件系统", 
         "EnabledByDefault": true, 
-        "Icon": "folder-documents",
+        "Icon": "folder-documents", 
         "Id": "kdeconnect_sftp", 
         "License": "GPL", 
         "Name": "Remote filesystem browser", 
diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json
index 6fa5b65..da53c59 100644
--- a/plugins/share/kdeconnect_share.json
+++ b/plugins/share/kdeconnect_share.json
@@ -26,7 +26,7 @@
         "Description[x-test]": "xxReceive and send files, URLs or plain text easilyxx", 
         "Description[zh_CN]": "简单地接收和发送文件，URL 或者文本", 
         "EnabledByDefault": true, 
-        "Icon": "folder-network",
+        "Icon": "folder-network", 
         "Id": "kdeconnect_share", 
         "License": "GPL", 
         "Name": "Share and receive", 

-- 
kdeconnect packaging