From: l10n daemon script <scripty@kde.org>
Date: Sun, 4 Jul 2021 01:17:03 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/7f562433c03534933d118b3b4abd6ab85bb4cabb

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"
---

diff --git a/src/dolphinpart.desktop.in b/src/dolphinpart.desktop.in
index 848f847d5..619b3c3a8 100644
--- a/src/dolphinpart.desktop.in
+++ b/src/dolphinpart.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Service
 Name=Dolphin View
-Name[ar]=منظور دولفين
+Name[ar]=عرض دولفين
 Name[ast]=Vista de Dolphin
 Name[az]=Dolphin görünüşü
 Name[ca]=Vista del Dolphin