From 1fc3108f1444df18600bebc8bee11972d164ccf1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 29 May 2022 01:46:43 +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/dolphinpart.json.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index d99151f72e..fe0cb0210d 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -57,6 +57,7 @@
         "Name[uk]": "Перегляд Dolphin",
         "Name[vi]": "Khung xem Dolphin",
         "Name[x-test]": "xxDolphin Viewxx",
+        "Name[zh_CN]": "Dolphin 视图",
         "Name[zh_TW]": "Dolphin 檢視",
         "ServiceTypes": [
             "KParts/ReadOnlyPart",