From e1b325a867ede95c5815ca11998017c67fc78ea9 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 1 Aug 2025 01:37:09 +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/itemactions/setfoldericonitemaction.json | 1 +
 1 file changed, 1 insertion(+)

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