From 3333246dba8df1da7f0e735c7816efbce270c96a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 20 Oct 2022 02:11:03 +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 9502fd065..b01cb5dfa 100644 --- a/src/dolphinpart.json.in +++ b/src/dolphinpart.json.in @@ -9,7 +9,6 @@ ], "Name": "Dolphin View", "Name[ar]": "عرض دولفين", - "Name[ast]": "Vista de Dolphin", "Name[az]": "Dolphin görünüşü", "Name[bg]": "Изглед на Dolphin", "Name[ca@valencia]": "Vista de Dolphin", -- cgit v1.3