From 0959642be297bf0749467c204e511f5887b17ee1 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 28 May 2025 01:34:23 +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 de074fa4f..888440844 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -127,6 +127,7 @@ GenericName[x-test]=xxFile Managerxx
 GenericName[zh_CN]=文件管理器
 GenericName[zh_TW]=檔案管理員
 Comment=Manage your files
+Comment[ar]=أدر ملفاتك
 Comment[ca]=Gestioneu els fitxers
 Comment[ca@valencia]=Gestioneu els fitxers
 Comment[es]=Gestión de archivos
-- 
2.47.3