From d22a837edd132b29535810c01aacfcc1a004c10a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 9 Sep 2025 02:12:34 +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 | 1 - src/settings/kcm/kcmdolphinviewmodes.json | 1 - 2 files changed, 2 deletions(-) (limited to 'src/settings/kcm') diff --git a/src/settings/kcm/kcmdolphingeneral.json b/src/settings/kcm/kcmdolphingeneral.json index eec426486..36b99c7d7 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -49,7 +49,6 @@ "Name[tr]": "Genel", "Name[uk]": "Загальне", "Name[vi]": "Chung", - "Name[x-test]": "xxGeneralxx", "Name[zh_CN]": "常规", "Name[zh_TW]": "一般" }, diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index 4af7e5b2b..2c72ff866 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -57,7 +57,6 @@ "Name[tr]": "Görünüm Kipleri", "Name[uk]": "Режими перегляду", "Name[vi]": "Các chế độ xem", - "Name[x-test]": "xxView Modesxx", "Name[zh_CN]": "视图模式", "Name[zh_TW]": "檢視模式" }, -- cgit v1.3