From 572f4d2e9ac5dcb188630281227b545af41275bb Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 30 Jan 2023 02:05:00 +0000 Subject: 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/settings/kcm/kcmdolphingeneral.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/settings/kcm/kcmdolphingeneral.json') 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" ] -- cgit v1.3.1