diff options
| author | l10n daemon script <[email protected]> | 2023-01-30 02:05:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-01-30 02:05:00 +0000 |
| commit | 572f4d2e9ac5dcb188630281227b545af41275bb (patch) | |
| tree | 693701774ce7aa9eb758e8b0366fb927f5aea742 /src/settings/kcm | |
| parent | 4a3ddf29f96d935c0a8e550f7a32d94d74eb8b39 (diff) | |
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"
Diffstat (limited to 'src/settings/kcm')
| -rw-r--r-- | src/settings/kcm/kcmdolphingeneral.json | 2 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinnavigation.json | 1 | ||||
| -rw-r--r-- | src/settings/kcm/kcmdolphinviewmodes.json | 1 |
3 files changed, 4 insertions, 0 deletions
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]": "أوضاع المنظور", |