From d11d4781487243dddc3a3899bd65d21542a93383 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 2 Jan 2023 02:34:18 +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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/dolphinpartactions.desktop')

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index 8e7523daf..481ee6f40 100644
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -30,7 +30,7 @@ Name[hu]=Ikonok
 Name[ia]=Icones
 Name[id]=Ikon
 Name[ie]=Icones
-Name[is]=Táknmyndir
+Name[is]=Tákn
 Name[it]=Icone
 Name[ja]=アイコン
 Name[ka]=ხატულები
@@ -92,7 +92,7 @@ Name[hu]=Kompakt
 Name[ia]=Compacte
 Name[id]=Ringkas
 Name[ie]=Compact
-Name[is]=Þjappað
+Name[is]=Þétt
 Name[it]=Compatta
 Name[ja]=コンパクト
 Name[ka]=დაპატარავება
@@ -153,7 +153,7 @@ Name[hu]=Részletek
 Name[ia]=Detalios
 Name[id]=Perincian
 Name[ie]=Detallies
-Name[is]=Nánar
+Name[is]=Ítarlegt
 Name[it]=Dettagli
 Name[ja]=詳細
 Name[ka]=დეტალები
-- 
cgit v1.3.1