From 0a18c04e19da3d94e3c885237c9d4d2a9fc822e1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 6 Feb 2026 01:41:48 +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 2e7b68a75..fa243cd6d 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -30,6 +30,7 @@
         "Name[eu]": "Dolphin-en ikuspegia",
         "Name[fi]": "Dolphin-näkymä",
         "Name[fr]": "Vue de Dolphin",
+        "Name[ga]": "Radharc Dolphin",
         "Name[gl]": "Vista de Dolphin",
         "Name[he]": "תצוגת Dolphin",
         "Name[hi]": "डॉल्फ़िन दृश्य",
-- 
cgit v1.3