From: l10n daemon script <scripty@kde.org>
Date: Thu, 2 Jun 2022 01:44:29 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/165448bc7f5dc943c259b37d9e3438335ca0251e

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"
---

diff --git a/src/dolphinpart.json.in b/src/dolphinpart.json.in
index fe0cb0210..887e6c7c4 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",