From df3c2c1391a59a4d7d55365c6259f786e81ae642 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 28 Jan 2019 08:29:51 +0100
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.desktop | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index a217e34c5b..033a27e987 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -150,7 +150,7 @@ Name[sv]=Kompakt
 Name[tr]=Sıkışık
 Name[uk]=Компактний
 Name[x-test]=xxCompactxx
-Name[zh_CN]=精简视图
+Name[zh_CN]=紧凑
 Name[zh_TW]=簡潔模式
 Icon=view-list-details
 # Dummy
@@ -199,7 +199,7 @@ Name[sv]=Detaljinformation
 Name[tr]=Ayrıntılar
 Name[uk]=Подробиці
 Name[x-test]=xxDetailsxx
-Name[zh_CN]=详细信息
+Name[zh_CN]=详细
 Name[zh_TW]=詳細模式
 Icon=view-list-tree
 # Dummy