From 7b2a09511d5e2cb0ba85da33043007c9269ecad7 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 6 Mar 2023 01:43:29 +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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/dolphinpartactions.desktop')

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index ae36ac0d9..9a547f0ca 100644
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -107,7 +107,7 @@ Name[nb]=Kompakt
 Name[nl]=Compact
 Name[nn]=Kompakt
 Name[pa]=ਸੰਖੇਪ
-Name[pl]=Kompaktowy
+Name[pl]=Zwarty
 Name[pt]=Compacta
 Name[pt_BR]=Compacto
 Name[ro]=Compactă
-- 
cgit v1.3