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/dolphinpart.desktop b/src/dolphinpart.desktop
index a217e34c5bf87134a5032dc571df2f9ed47d5476..033a27e98757b15997bb9caac4d849f4b1f61aa0 100644 (file)
--- 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]=ç²¾ç®\80è§\86å\9b¾
+Name[zh_CN]=ç´§å\87\91
 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