From 3333246dba8df1da7f0e735c7816efbce270c96a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 20 Oct 2022 02:11:03 +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 | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop
index 0d99a03ef..854997b56 100755
--- a/src/org.kde.dolphin.desktop
+++ b/src/org.kde.dolphin.desktop
@@ -1,7 +1,6 @@
 [Desktop Entry]
 Name=Dolphin
 Name[ar]=دولفين
-Name[ast]=Dolphin
 Name[az]=Dolphin
 Name[bg]=Dolphin
 Name[ca]=Dolphin
@@ -62,7 +61,6 @@ X-DocPath=dolphin/index.html
 Categories=Qt;KDE;System;FileTools;FileManager;
 GenericName=File Manager
 GenericName[ar]=مدير ملفّات
-GenericName[ast]=Xestor de ficheros
 GenericName[az]=Fayl meneceri
 GenericName[bg]=Файлов мениджър
 GenericName[ca]=Gestor de fitxers
-- 
cgit v1.3