From 6b1a5a2779f404165fd1e0b117fdac6dbdf75cc5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 28 Aug 2024 01:32:24 +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 insertion(+)

(limited to 'src/dolphinpart.json.in')

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index 1b1343d11..d0cf5174a 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -17,6 +17,7 @@
         "Name[da]": "Dolphin-visning",
         "Name[de]": "Dolphin-Ansicht",
         "Name[el]": "Προβολή Dolphin",
+        "Name[en_GB]": "Dolphin View",
         "Name[eo]": "Dolfin-Vido",
         "Name[es]": "Vista de Dolphin",
         "Name[et]": "Dolphini vaade",
-- 
cgit v1.3