From e48bb0405ec431cf9f6048981ca08d3dcfbeeba7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 27 Jul 2025 01:34:32 +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/org.kde.dolphin.desktop')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 581013d2b..42376d260 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -138,6 +138,7 @@ Comment[fi]=Hallinnoi tiedostojasi
 Comment[fr]=Gérer vos fichiers
 Comment[gl]=Xestione os seus ficheiros.
 Comment[he]=ניהול הקבצים שלך
+Comment[hu]=Kezelje fájljait
 Comment[ia]=Gere tu files
 Comment[is]=Hafðu umsjón með skránum þínum
 Comment[it]=Gestisci i tuoi file
-- 
cgit v1.3