From 4f1d8fef9216d6ae7b5b9bd1fa5523103ccf419a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 6 Nov 2022 01:51:33 +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 ed96c55e7..459a01a73 100644
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -28,6 +28,7 @@ Name[hi]=प्रतीक
 Name[hu]=Ikonok
 Name[ia]=Icones
 Name[id]=Ikon
+Name[ie]=Icones
 Name[is]=Táknmyndir
 Name[it]=Icone
 Name[ja]=アイコン
@@ -88,6 +89,7 @@ Name[hi]=सघन
 Name[hu]=Kompakt
 Name[ia]=Compacte
 Name[id]=Ringkas
+Name[ie]=Compact
 Name[is]=Þjappað
 Name[it]=Compatta
 Name[ja]=コンパクト
@@ -147,6 +149,7 @@ Name[hi]=विवरण
 Name[hu]=Részletek
 Name[ia]=Detalios
 Name[id]=Perincian
+Name[ie]=Detallies
 Name[is]=Nánar
 Name[it]=Dettagli
 Name[ja]=詳細
-- 
cgit v1.3