From 83964c2071893b65e6fd8dc96bad5388107c8ef3 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 22 Jan 2023 02:03:57 +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 d48aff759..9510ce34e 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -39,7 +39,7 @@
         "Name[lv]": "Dolphin skats",
         "Name[ml]": "ഡോള്‍ഫിന്‍ അവതരണരീതി",
         "Name[my]": "လင်းပိုင် မြင်ကွင်း",
-        "Name[nb]": "Dolphin visning",
+        "Name[nb]": "Dolphin-visning",
         "Name[nl]": "Dolphin-weergave",
         "Name[nn]": "Dolphin-vising",
         "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ",
-- 
cgit v1.3