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/org.kde.dolphin.desktop | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/org.kde.dolphin.desktop')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index c0e72d942..8b957e66e 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -11,6 +11,7 @@ Name[da]=Dolphin
 Name[de]=Dolphin
 Name[el]=Dolphin
 Name[en_GB]=Dolphin
+Name[eo]=Dolfin
 Name[es]=Dolphin
 Name[et]=Dolphin
 Name[eu]=Dolphin
@@ -73,6 +74,7 @@ GenericName[da]=Filhåndtering
 GenericName[de]=Dateiverwaltung
 GenericName[el]=Διαχειριστής αρχείων
 GenericName[en_GB]=File Manager
+GenericName[eo]=Dosiermastrumilo
 GenericName[es]=Gestor de archivos
 GenericName[et]=Failihaldur
 GenericName[eu]=Fitxategi-kudeatzailea
-- 
cgit v1.3