From 2f0369b333ac5c714d59b74665e76a41a5936042 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 28 Jul 2023 01:43:52 +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 80477a832..3ba03c5fa 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[el]": "Λειτουργίες Προβολής", "Name[en_GB]": "View Modes", "Name[eo]": "Vidreĝimoj", "Name[es]": "Modos de vistas", -- cgit v1.3