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/dolphinpart.json.in | 1 - 1 file changed, 1 deletion(-) (limited to 'src/dolphinpart.json.in') diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in index 59be51716..e8c87b8f2 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -17,7 +17,6 @@ "Name[cs]": "Pohled Dolphin", "Name[da]": "Dolphin-visning", "Name[de]": "Dolphin-Ansicht", - "Name[el]": "Dolphin View", "Name[en_GB]": "Dolphin View", "Name[eo]": "Dolfin-Vido", "Name[es]": "Vista de Dolphin", -- cgit v1.3