┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/settings/kcm/kcmdolphingeneral.json
diff options
context:
space:
mode:
authorl10n daemon script <[email protected]>2023-01-30 02:05:00 +0000
committerl10n daemon script <[email protected]>2023-01-30 02:05:00 +0000
commit572f4d2e9ac5dcb188630281227b545af41275bb (patch)
tree693701774ce7aa9eb758e8b0366fb927f5aea742 /src/settings/kcm/kcmdolphingeneral.json
parent4a3ddf29f96d935c0a8e550f7a32d94d74eb8b39 (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/kcmdolphingeneral.json')
-rw-r--r--src/settings/kcm/kcmdolphingeneral.json2
1 files changed, 2 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"
]