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/dolphinpartactions.desktop | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/dolphinpartactions.desktop')

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index 595df530b..ed96c55e7 100644
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -8,7 +8,6 @@ Actions=icons;details;compact;
 [Desktop Action icons]
 Name=Icons
 Name[ar]=الأيقونات
-Name[ast]=Iconos
 Name[az]=İkonlar
 Name[bg]=Икони
 Name[ca]=Icones
@@ -69,7 +68,6 @@ Exec=dolphin
 [Desktop Action compact]
 Name=Compact
 Name[ar]=متراصّ
-Name[ast]=Compauta
 Name[az]=Yığcam
 Name[bg]=Компактен
 Name[ca]=Compacta
@@ -129,7 +127,6 @@ Exec=dolphin
 [Desktop Action details]
 Name=Details
 Name[ar]=التّفاصيل
-Name[ast]=Detalles
 Name[az]=Ətraflı
 Name[bg]=Подробности
 Name[ca]=Detalls
-- 
cgit v1.3.1