From d1f4e8d1e79814f6ddf56e56c7d121c9f1838b4e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 4 Nov 2023 12:00:15 +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 57fcaa3da..27db6ba17 100644 --- a/src/settings/kcm/kcmdolphingeneral.json +++ b/src/settings/kcm/kcmdolphingeneral.json @@ -42,7 +42,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 3ba03c5fa..aeaba2eb5 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -54,7 +54,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