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

The following commit has been merged in the master branch:
commit 949408119de85211e0ed396a5b9d91c367edba3f
Author: l10n daemon script <scripty at kde.org>
Date:   Mon Nov 30 10:26: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/runcommand/kdeconnect_runcommand.json           | 2 ++
 plugins/runcommand/kdeconnect_runcommand_config.desktop | 1 +
 2 files changed, 3 insertions(+)

diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json
index c7b9963..5ad4445 100644
--- a/plugins/runcommand/kdeconnect_runcommand.json
+++ b/plugins/runcommand/kdeconnect_runcommand.json
@@ -32,6 +32,7 @@
         "Description[tr]": "Konsol komutlarını uzaktan çalıştır", 
         "Description[uk]": "Віддалене виконання консольних команд", 
         "Description[x-test]": "xxExecute console commands remotelyxx", 
+        "Description[zh_CN]": "远程执行控制台命令", 
         "EnabledByDefault": true, 
         "Icon": "system-run", 
         "Id": "kdeconnect_runcommand", 
@@ -58,6 +59,7 @@
         "Name[tr]": "Komut çalıştır", 
         "Name[uk]": "Виконання команд", 
         "Name[x-test]": "xxRun commandsxx", 
+        "Name[zh_CN]": "执行命令", 
         "ServiceTypes": [
             "KdeConnect/Plugin"
         ], 
diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop
index b063714..79708a8 100644
--- a/plugins/runcommand/kdeconnect_runcommand_config.desktop
+++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop
@@ -28,5 +28,6 @@ Name[sv]=Inställningar av insticksprogram för kör kommando
 Name[tr]=Komut Çalıştır eklenti ayarları
 Name[uk]=Параметри додатка запуску команд
 Name[x-test]=xxRun Command plugin settingsxx
+Name[zh_CN]=执行命令插件设置
 
 Categories=Qt;KDE;X-KDE-settings-kdeconnect;

-- 
kdeconnect packaging