From e76bf5cb18ca46a0adc84ead3801726814cf6fd3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 23 Aug 2021 01:28:23 +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/dolphinpart.desktop.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/dolphinpart.desktop.in')

diff --git a/src/dolphinpart.desktop.in b/src/dolphinpart.desktop.in
index bc0e342e2..2a121dbe6 100644
--- a/src/dolphinpart.desktop.in
+++ b/src/dolphinpart.desktop.in
@@ -232,7 +232,7 @@ Name[tr]=Ayrıntılar
 Name[uk]=Подробиці
 Name[vi]=Chi tiết
 Name[x-test]=xxDetailsxx
-Name[zh_CN]=详细
+Name[zh_CN]=详情
 Name[zh_TW]=詳細模式
 Icon=view-list-tree
 # Dummy
-- 
cgit v1.3