From 4d74e6555482dc289f5b2c2e1c7c0af2f80399d5 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Tue, 2 Jun 2026 02:07:16 +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 | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/org.kde.dolphin.desktop')

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 8c41e6288..89b346c39 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -56,6 +56,7 @@ Name[sv]=Dolphin
 Name[ta]=டால்பின்
 Name[tok]=ilo ijo Dolphin
 Name[tr]=Dolphin
+Name[ug]=Dolphin ھۆججەت باشقۇرغۇچ
 Name[uk]=Dolphin
 Name[vi]=Dolphin
 Name[zh_CN]=Dolphin 文件管理器
@@ -122,6 +123,7 @@ GenericName[sv]=Filhanterare
 GenericName[ta]=கோப்பு உலாவி
 GenericName[tok]=ilo ijo
 GenericName[tr]=Dosya Yöneticisi
+GenericName[ug]=ھۆججەت باشقۇرغۇچ
 GenericName[uk]=Менеджер файлів
 GenericName[vi]=Trình quản lí tệp
 GenericName[zh_CN]=文件管理器
@@ -162,6 +164,7 @@ Comment[sk]=Spravujte svoje súbory
 Comment[sl]=Upravlja vaše datoteke
 Comment[sv]=Hantera filer
 Comment[tr]=Dosyalarınızı yönetin
+Comment[ug]=ھۆججەت باشقۇرۇش
 Comment[uk]=Керування вашими файлами
 Comment[zh_CN]=文件管理应用
 Comment[zh_TW]=管理您的檔案
-- 
cgit v1.3.1