From 8339575e58264138f22c8b3d465e54e4276ac12a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 6 Jan 2019 05:32:12 +0100
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/plasma/packagestructure/plasmageneric-packagestructure.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plasma/packagestructure/plasmageneric-packagestructure.json b/src/plasma/packagestructure/plasmageneric-packagestructure.json
index 59447b54c..29b9db6c9 100644
--- a/src/plasma/packagestructure/plasmageneric-packagestructure.json
+++ b/src/plasma/packagestructure/plasmageneric-packagestructure.json
@@ -79,7 +79,7 @@
         "Name[tr]": "Genel",
         "Name[uk]": "Загальний",
         "Name[x-test]": "xxGenericxx",
-        "Name[zh_CN]": "常规",
+        "Name[zh_CN]": "通用",
         "Name[zh_TW]": "一般",
         "ServiceTypes": [
             "KPackage/PackageStructure"