From: l10n daemon script <scripty@kde.org>
Date: Sun, 3 Jul 2022 01:59:38 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/7b4644c0842697b8fb56f23dbce6d7fcc6fec67e

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"
---

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 8b1f628ca..9d4e865c3 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -52,7 +52,7 @@ Name[tr]=Dolphin
 Name[uk]=Dolphin
 Name[vi]=Dolphin
 Name[x-test]=xxDolphinxx
-Name[zh_CN]=Dolphin
+Name[zh_CN]=Dolphin 文件管理器
 Name[zh_TW]=Dolphin
 Exec=dolphin %u
 Icon=system-file-manager