From bd839796f1e165016f8a4dfd01b222b31fb7773f Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 14 Jun 2025 01:34:10 +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 61ee6b40a..b74773e5b 100644
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -10,6 +10,7 @@
         "Name[ca@valencia]": "Establix la icona de carpeta",
         "Name[ca]": "Estableix la icona de carpeta",
         "Name[es]": "Definir icono de carpeta",
+        "Name[fr]": "DÃ©finir l'icÃ´ne de dossiers",
         "Name[he]": "××××¨×ª ×¡×× ×ª××§×××",
         "Name[it]": "Imposta icona della cartella",
         "Name[ka]": "á¡áá¥áá¦ááááá¡ á®áá¢á£ááá¡ ááá§ááááá",
-- 
2.47.3