From 51fcd600a8adb235bd510724fb3b8f8df9e0c6b6 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 16 Jun 2023 01:40:55 +0000
Subject: [PATCH] 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(-)

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index 9a547f0cad..24ee78f7ed 100644
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -97,7 +97,7 @@ Name[ie]=Compact
 Name[is]=Þétt
 Name[it]=Compatta
 Name[ja]=コンパクト
-Name[ka]=დაპატარავება
+Name[ka]=კომპაქტური
 Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[lv]=Kompakts