From 572f4d2e9ac5dcb188630281227b545af41275bb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 30 Jan 2023 02:05:00 +0000 Subject: [PATCH] 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/org.kde.dolphin.desktop | 1 + src/settings/kcm/kcmdolphingeneral.json | 2 ++ src/settings/kcm/kcmdolphinnavigation.json | 1 + src/settings/kcm/kcmdolphinviewmodes.json | 1 + 4 files changed, 5 insertions(+) diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 4f8f268ec..c0e72d942 100755 --- 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 4db008487..c3c9bda9e 100644 --- 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 e7e152f27..bd6b2cef6 100644 --- 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 3e31b8e45..27fa2c528 100644 --- 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]": "أوضاع المنظور",