From: l10n daemon script <scripty@kde.org>
Date: Fri, 1 Aug 2025 01:37:09 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/e1b325a867ede95c5815ca11998017c67fc78ea9?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/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json
index fc54ce9aa..29638e4e5 100644
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -24,6 +24,7 @@
         "Name[lv]": "Norādīt datnes ikonu",
         "Name[nl]": "Mappictogram instellen",
         "Name[pl]": "Ustaw ikonę katalogu",
+        "Name[pt_BR]": "Definir ícone da pasta",
         "Name[sl]": "Nastavi ikono mape",
         "Name[sv]": "Ange katalogikon",
         "Name[tr]": "Klasör Simgesi Ayarla",