From 3fde6cbeb0b2df48a91870c74c4ef74462a82058 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 8 Nov 2023 09:18:27 +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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/dolphinpartactions.desktop')

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index 24ee78f7e..52cdf58c0 100644
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -8,6 +8,7 @@ Actions=icons;details;compact;
 [Desktop Action icons]
 Name=Icons
 Name[ar]=الأيقونات
+Name[ast]=Iconos
 Name[az]=İkonlar
 Name[be]=Значкі
 Name[bg]=Икони
@@ -88,7 +89,7 @@ Name[eu]=Trinkoa
 Name[fi]=Tiivis
 Name[fr]=Concis
 Name[gl]=Compacta
-Name[he]=חסכונית
+Name[he]=מצומצמת
 Name[hi]=सघन
 Name[hu]=Kompakt
 Name[ia]=Compacte
@@ -133,6 +134,7 @@ Exec=dolphin
 [Desktop Action details]
 Name=Details
 Name[ar]=التّفاصيل
+Name[ast]=Detalles
 Name[az]=Ətraflı
 Name[be]=Падрабязы выгляд
 Name[bg]=Подробности
-- 
cgit v1.3.1