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/dolphinpart.json.in | 1 +
 1 file changed, 1 insertion(+)

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

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index 907fe2962..9502fd065 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -32,6 +32,7 @@
         "Name[is]": "Dolphin-sýn",
         "Name[it]": "Vista di Dolphin",
         "Name[ja]": "Dolphin ビュー",
+        "Name[ka]": "Dolphin -ის ხედი",
         "Name[ko]": "Dolphin 보기",
         "Name[lt]": "Dolphin rodinys",
         "Name[lv]": "Dolphin skats",
-- 
cgit v1.3