From 391c55f0a86a151b9f45d7a65f92db713bcc7013 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 27 Aug 2025 01:36:52 +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 94bcb2970..87489f09e 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -52,7 +52,7 @@
         "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ",
         "Name[pl]": "Widok Dolphina",
         "Name[pt]": "Área do Dolphin",
-        "Name[pt_BR]": "Visualização do Dolphin",
+        "Name[pt_BR]": "Exibição do Dolphin",
         "Name[ro]": "Vizualizare Dolphin",
         "Name[ru]": "Представление Dolphin",
         "Name[sa]": "डॉल्फिन दृश्य",
-- 
cgit v1.3