From d185e218871f7fb8016291994564bf266dd5df70 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 12 Feb 2023 02:02:18 +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 481ee6f40..ae36ac0d9 100644
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -18,6 +18,7 @@ Name[da]=Ikoner
 Name[de]=Symbole
 Name[el]=Εικονίδια
 Name[en_GB]=Icons
+Name[eo]=Piktogramoj
 Name[es]=Iconos
 Name[et]=Ikoonid
 Name[eu]=Ikonoak
@@ -80,6 +81,7 @@ Name[da]=Kompakt
 Name[de]=Kompakt
 Name[el]=Σύμπτυξη
 Name[en_GB]=Compact
+Name[eo]=Kompakta
 Name[es]=Compacto
 Name[et]=Kompaktne
 Name[eu]=Trinkoa
@@ -141,6 +143,7 @@ Name[da]=Detaljer
 Name[de]=Details
 Name[el]=Λεπτομέρειες
 Name[en_GB]=Details
+Name[eo]=Detaloj
 Name[es]=Detalles
 Name[et]=Üksikasjad
 Name[eu]=Xehetasunak
-- 
cgit v1.3