From: l10n daemon script <scripty@kde.org>
Date: Tue, 17 May 2022 01:46:51 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/e34eba7e0fe1720830fd410e4df42205d28f355a?ds=inline

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 d5f41b793..2d56db904 100644
--- a/src/dolphinpart.json.in
+++ b/src/dolphinpart.json.in
@@ -38,6 +38,7 @@
         "Name[nl]": "Dolphin-weergave",
         "Name[pa]": "ਡਾਲਫਿਨ ਝਲਕ",
         "Name[pl]": "Widok Dolphina",
+        "Name[pt]": "Área do Dolphin",
         "Name[pt_BR]": "Visualização do Dolphin",
         "Name[ro]": "Dolphin – Vizualizare",
         "Name[ru]": "Представление Dolphin",