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 f0cda29da5066866d96cc0e064cc5d35cdf91fb5..a217e34c5bf87134a5032dc571df2f9ed47d5476 100644 (file)
--- 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]=ç®\80æ´\81视图
+Name[zh_CN]=ç²¾ç®\80视图
 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

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index 5f569237cc3072749d98d1848381d65a2da91c5c..c0faa31a2440f48b027ff045676eb0c51ba828b6 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -226,5 +226,5 @@ X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
 X-KDE-Keywords[x-test]=xxfile managerxx
-X-KDE-Keywords[zh_CN]=file manager,文件管理器
+X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員

diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 974ebc3d2aa724a54feca12f5a3ef2cd925dc7b9..35f0fc7239af86eaace2596a65c262ff8b835052 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -227,5 +227,5 @@ X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
 X-KDE-Keywords[x-test]=xxfile managerxx
-X-KDE-Keywords[zh_CN]=file manager,文件管理器
+X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員

diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index a2421a848387899235948735b88bb50f1df71d24..024c44a5de2a1a18cb7d368ad086e885167428ed 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -181,5 +181,5 @@ X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
 X-KDE-Keywords[x-test]=xxfile managerxx
-X-KDE-Keywords[zh_CN]=file manager,文件管理器
+X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員

diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 286320eaab44a611734778e2f0bf414fc2c6523b..14f3e530e2c4223ccc247a56f695511d4a640987 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -226,5 +226,5 @@ X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
 X-KDE-Keywords[x-test]=xxfile managerxx
-X-KDE-Keywords[zh_CN]=file manager,文件管理器
+X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員