From 3fad514921f528145d4af3f921afaf3d1908a3cf Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 25 May 2024 01:19:17 +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/dolphinpart.json.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/dolphinpart.json.in')

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index 91cfd0f75..d6928ef5e 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -33,7 +33,7 @@
         "Name[is]": "Dolphin-yfirlit",
         "Name[it]": "Vista di Dolphin",
         "Name[ja]": "Dolphin ビュー",
-        "Name[ka]": "Dolphin -ის ხედი",
+        "Name[ka]": "Dolphin-ის ხედი",
         "Name[ko]": "Dolphin 보기",
         "Name[lt]": "Dolphin rodinys",
         "Name[lv]": "„Dolphin“ skats",
-- 
cgit v1.3