From 0778b805cd823172f179809f535048c41bccef8d Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 25 Sep 2025 01:35: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 4537f88a0..2e7b68a75 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -58,7 +58,7 @@
         "Name[sa]": "डॉल्फिन दृश्य",
         "Name[se]": "Dolphinčájeheapmi",
         "Name[sk]": "Dolphin pohľad",
-        "Name[sl]": "Dolphin - pogled",
+        "Name[sl]": "Dolphinov pogled",
         "Name[sr@ijekavian]": "Делфинов приказ",
         "Name[sr@ijekavianlatin]": "Dolphinov prikaz",
         "Name[sr@latin]": "Dolphinov prikaz",
-- 
cgit v1.3