From 165448bc7f5dc943c259b37d9e3438335ca0251e Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Thu, 2 Jun 2022 01:44:29 +0000
Subject: [PATCH] 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(-)

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index fe0cb0210d..887e6c7c48 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -42,7 +42,7 @@
         "Name[pl]": "Widok Dolphina",
         "Name[pt]": "Área do Dolphin",
         "Name[pt_BR]": "Visualização do Dolphin",
-        "Name[ro]": "Dolphin – Vizualizare",
+        "Name[ro]": "Vizualizare Dolphin",
         "Name[ru]": "Представление Dolphin",
         "Name[se]": "Dolphinčájeheapmi",
         "Name[sk]": "Dolphin pohľad",