From 3fde6cbeb0b2df48a91870c74c4ef74462a82058 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 8 Nov 2023 09:18:27 +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 e8c87b8f2..58c0d9a9c 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -25,6 +25,7 @@
         "Name[fi]": "Dolphin-näkymä",
         "Name[fr]": "Vue de Dolphin",
         "Name[gl]": "Vista de Dolphin",
+        "Name[he]": "תצוגת Dolphin",
         "Name[hi]": "डॉल्फ़िन दृश्य",
         "Name[hu]": "Dolphin nézet",
         "Name[ia]": "Vista de Dolphin",
-- 
cgit v1.3