From 69a98144f385dae4fcdd77fb1565364d3ab9079d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 12 Dec 2025 01:36:36 +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(+)

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 7612c7dfd..7f34e2425 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -129,6 +129,7 @@ Comment[ar]=أدر ملفاتك
 Comment[bg]=Управление на файловете
 Comment[ca]=Gestioneu els fitxers
 Comment[ca@valencia]=Gestioneu els fitxers
+Comment[cs]=Spravujte své soubory
 Comment[de]=Verwalten Sie Ihre Dateien
 Comment[es]=Gestión de archivos
 Comment[eu]=Kudeatu zure fitxategiak
-- 
cgit v1.3