From 57a3dbe6b1913af0788a7b8ec98b93c149aa5d0e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 21 Mar 2026 01:42:09 +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 | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index b74480aac..575d6862b 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -132,6 +132,7 @@ Comment[bg]=Управление на файловете
 Comment[ca]=Gestioneu els fitxers
 Comment[ca@valencia]=Gestioneu els fitxers
 Comment[cs]=Spravujte své soubory
+Comment[da]=Adminstrér dine filer
 Comment[de]=Verwalten Sie Ihre Dateien
 Comment[es]=Gestión de archivos
 Comment[eu]=Kudeatu zure fitxategiak
-- 
cgit v1.3