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"

5 files changed, 6 insertions, 6 deletions

diff --git a/src/dolphinpart.desktop.in b/src/dolphinpart.desktop.in
index bc0e342e2..2a121dbe6 100644
--- a/src/dolphinpart.desktop.in
+++ b/src/dolphinpart.desktop.in
@@ -232,7 +232,7 @@ Name[tr]=Ayrıntılar
 Name[uk]=Подробиці
 Name[vi]=Chi tiết
 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 d6bb34581..fecb72eba 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -99,7 +99,7 @@ Comment[tr]=Bu servis genel Dolphin ayarlarını yapılandırmanızı sağlar.
 Comment[uk]=Ця служба надасть змогу налаштувати загальні параметри Dolphin.
 Comment[vi]=Dịch vụ này cho phép cấu hình các thiết lập chung của Dolphin.
 Comment[x-test]=xxThis service allows configuration of general Dolphin settings.xx
-Comment[zh_CN]=此服务允许您配置 Dolphin 的常规设置。
+Comment[zh_CN]=此服务用于配置 Dolphin 的常规设置。
 Comment[zh_TW]=此服務允許設定 Dolphin 的一般設定。
 
 [Desktop Entry]
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 43ae13617..b7f7fe8d3 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -99,7 +99,7 @@ Comment[tr]=Bu servis Dolphin gezintisini yapılandırmanızı sağlar.
 Comment[uk]=Ця служба надасть змогу налаштувати навігацію у Dolphin.
 Comment[vi]=Dịch vụ này cho phép cấu hình điều hướng Dolphin.
 Comment[x-test]=xxThis service allows configuration of the Dolphin navigation.xx
-Comment[zh_CN]=此服务允许您配置 Dolphin 的导航。
+Comment[zh_CN]=此服务用于配置 Dolphin 的导航功能。
 Comment[zh_TW]=此服務允許設定 Dolphin 的導覽。
 
 [Desktop Entry]
@@ -211,7 +211,7 @@ Comment[tr]=Dosya yöneticisi gezintisini yapılandır
 Comment[uk]=Налаштувати навігацію у менеджері файлів
 Comment[vi]=Cấu hình điều hướng trình quản lí tệp
 Comment[x-test]=xxConfigure file manager navigationxx
-Comment[zh_CN]=配置文件管理器导航
+Comment[zh_CN]=配置文件管理器导航功能
 Comment[zh_TW]=設定檔案管理員導覽
 X-KDE-Keywords=file manager
 X-KDE-Keywords[ar]=مدير ملفّات ملفات الملفّات الملفات
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 1a7557e56..c652f0d39 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -97,7 +97,7 @@ Comment[tr]=Bu servis Dolphin görünüm kiplerini yapılandırmanızı sağlar.
 Comment[uk]=Ця служба надасть змогу налаштувати режими перегляду Dolphin.
 Comment[vi]=Dịch vụ này cho phép cấu hình các chế độ xem Dolphin.
 Comment[x-test]=xxThis service allows configuration of the Dolphin view modes.xx
-Comment[zh_CN]=此服务允许您配置 Dolphin 的视图模式。
+Comment[zh_CN]=此服务用于配置 Dolphin 的视图模式。
 Comment[zh_TW]=此服務允許設定 Dolphin 的檢視模式。
 
 [Desktop Entry]
diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
index 26bee0bce..b82ac8483 100644
--- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
+++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
@@ -49,5 +49,5 @@ Comment[tr]=Dosya Görünümleri için Sürüm Kontrol Eklentisi
 Comment[uk]=Додаток керування версіями для панелей перегляду файлів
 Comment[vi]=Phần cài cắm "Quản lí phiên bản" cho khung xem tệp
 Comment[x-test]=xxVersion Control Plugin for File Viewsxx
-Comment[zh_CN]=文件视图的版本控制插件
+Comment[zh_CN]=文件视图的版本控制系统插件
 Comment[zh_TW]=檔案檢視的版本控制外掛程式