From 1873e2f08fed0397542c04ca02f67efc2fa307d3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 6 Jan 2019 05:25:48 +0100
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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/dolphinpart.desktop')

diff --git a/src/dolphinpart.desktop b/src/dolphinpart.desktop
index f0cda29da..a217e34c5 100644
--- a/src/dolphinpart.desktop
+++ b/src/dolphinpart.desktop
@@ -101,7 +101,7 @@ Name[sv]=Ikoner
 Name[tr]=Simgeler
 Name[uk]=Піктограми
 Name[x-test]=xxIconsxx
-Name[zh_CN]=图标视图
+Name[zh_CN]=图标
 Name[zh_TW]=圖示
 Icon=view-list-icons
 # Dummy
@@ -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
-- 
cgit v1.3