From 4c32c38655c33751da19e0ed36f09588c3064a88 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 8 Jul 2021 01:22:49 +0000
Subject: [PATCH] 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"
---
 src/plugins/dummy/pmdummybackendplugin.json   | 4 ++--
 src/plugins/sfdisk/pmsfdiskbackendplugin.json | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/dummy/pmdummybackendplugin.json b/src/plugins/dummy/pmdummybackendplugin.json
index 652ad7a..398be1c 100644
--- a/src/plugins/dummy/pmdummybackendplugin.json
+++ b/src/plugins/dummy/pmdummybackendplugin.json
@@ -66,7 +66,7 @@
         "Description[sv]": "Ett bakgrundsprogram till KDE:s partitionshanterare i testsyfte.",
         "Description[uk]": "Тестовий додаток сервера Керування розділами KDE.",
         "Description[x-test]": "xxA KDE Partition Manager dummy backend for testing purposes.xx",
-        "Description[zh_CN]": "测试用的 KDE 分区管理器的虚拟后端",
+        "Description[zh_CN]": "用于测试的 KDE 分区管理器虚拟后端。",
         "Description[zh_TW]": "使用虛設後端的 KDE 磁碟分割區管理員，可用來測試。",
         "EnabledByDefault": true,
         "Icon": "preferences-plugin",
@@ -101,7 +101,7 @@
         "Name[sv]": "KDE:s partitionshanterare bakgrundsprogram för test",
         "Name[uk]": "Тестовий додаток сервера Керування розділами KDE",
         "Name[x-test]": "xxKDE Partition Manager Dummy Backendxx",
-        "Name[zh_CN]": "KDE 分区管理器虚拟后端",
+        "Name[zh_CN]": "KDE 分区管理器（虚拟后端）",
         "Name[zh_TW]": "KDE 磁碟分割區管理員 (虛設後端)",
         "ServiceTypes": [
             "PartitionManager/Plugin"
diff --git a/src/plugins/sfdisk/pmsfdiskbackendplugin.json b/src/plugins/sfdisk/pmsfdiskbackendplugin.json
index f8bed3b..83c3e57 100644
--- a/src/plugins/sfdisk/pmsfdiskbackendplugin.json
+++ b/src/plugins/sfdisk/pmsfdiskbackendplugin.json
@@ -66,6 +66,7 @@
         "Description[sv]": "Ett sfdisk bakgrundsprogram till KDE:s partitionshanterare",
         "Description[uk]": "Додаток sfdisk сервера Керування розділами KDE.",
         "Description[x-test]": "xxA KDE Partition Manager sfdisk backend.xx",
+        "Description[zh_CN]": "使用 sfdisk 作为后端的 KDE 分区管理器。",
         "Description[zh_TW]": "使用 sfdisk 作為後端的 KDE 磁碟分割區管理員。",
         "EnabledByDefault": true,
         "Icon": "preferences-plugin",
@@ -99,6 +100,7 @@
         "Name[sv]": "KDE:s partitionshanterare sfdisk bakgrundsprogram",
         "Name[uk]": "Додаток sfdisk сервера Керування розділами KDE",
         "Name[x-test]": "xxKDE Partition Manager sfdisk Backendxx",
+        "Name[zh_CN]": "KDE 分区管理器（sfdisk 后端）",
         "Name[zh_TW]": "KDE 磁碟分割區管理員 (sfdisk 後端)",
         "ServiceTypes": [
             "PartitionManager/Plugin"