From 6c65d06bcd4b34ef7a82203b3ba06b6c3604986b Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 21 Sep 2022 01:48:38 +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 insertions(+)

(limited to 'src/dolphinpartactions.desktop')

diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop
index 5e93de16d..595df530b 100644
--- a/src/dolphinpartactions.desktop
+++ b/src/dolphinpartactions.desktop
@@ -32,6 +32,7 @@ Name[id]=Ikon
 Name[is]=Táknmyndir
 Name[it]=Icone
 Name[ja]=アイコン
+Name[ka]=ხატულები
 Name[ko]=아이콘
 Name[lt]=Piktogramos
 Name[lv]=Ikonas
@@ -92,6 +93,7 @@ Name[id]=Ringkas
 Name[is]=Þjappað
 Name[it]=Compatta
 Name[ja]=コンパクト
+Name[ka]=დაპატარავება
 Name[ko]=축소됨
 Name[lt]=Kompaktiškas
 Name[lv]=Kompakts
@@ -151,6 +153,7 @@ Name[id]=Perincian
 Name[is]=Nánar
 Name[it]=Dettagli
 Name[ja]=詳細
+Name[ka]=დეტალები
 Name[ko]=자세히
 Name[lt]=Išsamus
 Name[lv]=Detaļas
-- 
cgit v1.3.1