From bf3c9f90bbbeb164841d772a22067afffd70ed3b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 1 Oct 2025 01:40:20 +0000
Subject: 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/itemactions/hidefileitemaction.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/itemactions')

diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json
index 547c72d3f..0efd6f72f 100644
--- a/src/itemactions/hidefileitemaction.json
+++ b/src/itemactions/hidefileitemaction.json
@@ -23,6 +23,7 @@
         "Name[sv]": "Dölj",
         "Name[tr]": "Gizle",
         "Name[uk]": "Приховати",
+        "Name[zh_CN]": "隐藏",
         "Name[zh_TW]": "隱藏"
     },
     "X-KDE-Show-In-Submenu": true
-- 
cgit v1.3