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/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 4f8f268ec4ef5955ddbecc2027e98724ae579c20..c0e72d94276f8cf363edbfd92acff1e6cb7b8cef 100755 (executable)
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -163,6 +163,7 @@ Keywords[uk]=files;file management;file browsing;samba;network shares;Explorer;F
 Keywords[vi]=files;file management;file browsing;samba;network shares;Explorer;Finder;tệp;quản lí tệp;duyệt tệp;chia sẻ mạng;
 Keywords[x-test]=xxfilesxx;xxfile managementxx;xxfile browsingxx;xxsambaxx;xxnetwork sharesxx;xxExplorerxx;xxFinderxx;
 Keywords[zh_CN]=files;file management;file browsing;samba;network shares;文件;文件管理;文件浏览;共享;共享文件夹;网络共享;浏览器;访达;查找器;
+Keywords[zh_TW]=files;file management;file browsing;samba;network shares;Explorer;Finder;檔案總管;檔案管理員;檔案;
 X-DBUS-ServiceName=org.kde.dolphin
 X-KDE-Shortcuts=Meta+E
 StartupWMClass=dolphin

diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json
index 4db0084871fbb7e26f150a00bcf37aa8694578dd..c3c9bda9e7ab81b74cbcd84144eba08c9de984d6 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.json
+++ b/src/settings/kcm/kcmdolphingeneral.json
@@ -41,6 +41,7 @@
         "Description[vi]": "Cấu hình các thiết lập chung cho trình quản lí tệp",
         "Description[x-test]": "xxConfigure general file manager settingsxx",
         "Description[zh_CN]": "配置文件管理器常规设置",
+        "Description[zh_TW]": "配置一般檔案管理員設定",
         "Icon": "system-file-manager",
         "Name": "General",
         "Name[ar]": "عامّ",
@@ -83,6 +84,7 @@
         "Name[vi]": "Chung",
         "Name[x-test]": "xxGeneralxx",
         "Name[zh_CN]": "常规",
+        "Name[zh_TW]": "一般",
         "ServiceTypes": [
             "KCModule"
         ]

diff --git a/src/settings/kcm/kcmdolphinnavigation.json b/src/settings/kcm/kcmdolphinnavigation.json
index e7e152f27b6ef852f77a72ee371a9bee4572cb66..bd6b2cef684ba30015487881abd18d4231a21bb2 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.json
+++ b/src/settings/kcm/kcmdolphinnavigation.json
@@ -41,6 +41,7 @@
         "Description[vi]": "Cấu hình điều hướng trình quản lí tệp",
         "Description[x-test]": "xxConfigure file manager navigationxx",
         "Description[zh_CN]": "配置文件管理器导航功能",
+        "Description[zh_TW]": "設定檔案管理員導覽",
         "Icon": "preferences-desktop-navigation",
         "Name": "Navigation",
         "Name[ar]": "التّنقّل",

diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json
index 3e31b8e4571203a77d7011f2c027c443260a292f..27fa2c5283ac9a25900e4ae8adb31c7991c61df4 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.json
+++ b/src/settings/kcm/kcmdolphinviewmodes.json
@@ -41,6 +41,7 @@
         "Description[vi]": "Cấu hình các chế độ xem trình quản lí tệp",
         "Description[x-test]": "xxConfigure file manager view modesxx",
         "Description[zh_CN]": "配置文件管理器视图模式",
+        "Description[zh_TW]": "設定檔案管理員檢視模式",
         "Icon": "preferences-desktop-icons",
         "Name": "View Modes",
         "Name[ar]": "أوضاع المنظور",