From d11d4781487243dddc3a3899bd65d21542a93383 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Mon, 2 Jan 2023 02:34:18 +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 030710cea..d48aff759 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -30,7 +30,7 @@
         "Name[ia]": "Vista de Dolphin",
         "Name[id]": "Tampilan Dolphin",
         "Name[ie]": "Vise de Dolphin",
-        "Name[is]": "Dolphin-sýn",
+        "Name[is]": "Dolphin-yfirlit",
         "Name[it]": "Vista di Dolphin",
         "Name[ja]": "Dolphin ビュー",
         "Name[ka]": "Dolphin -ის ხედი",
-- 
cgit v1.3