From b6e66e90d71a49a2ad2040a79fecd670425d375f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 9 Apr 2026 01:50:12 +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 575d6862b..8c41e6288 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -158,6 +158,7 @@ Comment[pt]=Gerir os seus ficheiros
 Comment[pt_BR]=Gerencie seus arquivos
 Comment[ro]=Gestionați-vă fișierele
 Comment[ru]=Управление файлами
+Comment[sk]=Spravujte svoje súbory
 Comment[sl]=Upravlja vaše datoteke
 Comment[sv]=Hantera filer
 Comment[tr]=Dosyalarınızı yönetin
-- 
cgit v1.3