From 57615e7ba2c7702321684c56fa2a86d65b7eee4b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 2 Jun 2025 01:32:45 +0000
Subject: [PATCH] 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 b82eaaecc..c114295ec 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -138,6 +138,7 @@ Comment[fr]=Gérer vos fichiers
 Comment[gl]=Xestione os seus ficheiros.
 Comment[he]=ניהול הקבצים שלך
 Comment[ia]=Gere tu files
+Comment[is]=Hafðu umsjón með skránum þínum
 Comment[it]=Gestisci i tuoi file
 Comment[ka]=მართეთ თქვენი ფაილები
 Comment[nl]=Uw bestanden beheren
-- 
2.47.3