From 2f93755e135e799b8de753a0ac17d4389593657f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 23 Aug 2025 01:36:30 +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 42376d260..7c655d7f6 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -148,6 +148,7 @@ Comment[lv]=Pārvaldiet ierīces datnes
 Comment[nl]=Uw bestanden beheren
 Comment[pl]=Zarządzaj swoimi plikami
 Comment[pt_BR]=Gerencie seus arquivos
+Comment[ru]=Управление файлами
 Comment[sl]=Upravlja vaše datoteke
 Comment[sv]=Hantera filer
 Comment[tr]=Dosyalarınızı yönetin
-- 
cgit v1.3