From 4f1d8fef9216d6ae7b5b9bd1fa5523103ccf419a Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 6 Nov 2022 01:51:33 +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 b01cb5dfa..f0727c711 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -28,6 +28,7 @@
         "Name[hu]": "Dolphin nézet",
         "Name[ia]": "Vista de Dolphin",
         "Name[id]": "Tampilan Dolphin",
+        "Name[ie]": "Vise de Dolphin",
         "Name[is]": "Dolphin-sýn",
         "Name[it]": "Vista di Dolphin",
         "Name[ja]": "Dolphin ビュー",
-- 
cgit v1.3