From 84476434514a201f2354c53489f1fd677b099404 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 5 Feb 2026 01:41:49 +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/dolphinpartactions.desktop | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/dolphinpartactions.desktop')

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index e60352692..6b83e04e8 100644
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -25,6 +25,7 @@ Name[et]=Ikoonid
 Name[eu]=Ikonoak
 Name[fi]=Kuvakkeet
 Name[fr]=Icônes
+Name[ga]=Deilbhíní
 Name[gl]=Iconas
 Name[he]=סמלים
 Name[hi]=प्रतीक
@@ -88,6 +89,7 @@ Name[et]=Kompaktne
 Name[eu]=Trinkoa
 Name[fi]=Tiivis
 Name[fr]=Concis
+Name[ga]=Dlúth
 Name[gl]=Compacta
 Name[he]=מצומצמת
 Name[hi]=सघन
@@ -151,6 +153,7 @@ Name[et]=Üksikasjad
 Name[eu]=Xehetasunak
 Name[fi]=Yksityiskohdat
 Name[fr]=Détails
+Name[ga]=Sonraí
 Name[gl]=Detalles
 Name[he]=פרטים
 Name[hi]=विवरण
-- 
cgit v1.3.1