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 8b1f628ca8bbbf081fb935f7113b11080f3a8f81..9d4e865c335d6c176f85e02c7a180f02b007603e 100755 (executable)
--- 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