From 08347a59c0a442c42b6c97c692b6d4aabb2e70df Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 28 Jun 2024 01:27:14 +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/kcmdolphinviewmodes.json | 1 - 1 file changed, 1 deletion(-) (limited to 'src/settings/kcm/kcmdolphinviewmodes.json') diff --git a/src/settings/kcm/kcmdolphinviewmodes.json b/src/settings/kcm/kcmdolphinviewmodes.json index abb2401a7..508bb908a 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.json +++ b/src/settings/kcm/kcmdolphinviewmodes.json @@ -11,7 +11,6 @@ "Name[cs]": "Režimy pohledu", "Name[da]": "Visningstilstande", "Name[de]": "Ansichts-Modi", - "Name[en_GB]": "View Modes", "Name[eo]": "Vidreĝimoj", "Name[es]": "Modos de vistas", "Name[et]": "Vaaterežiimid", -- cgit v1.3