From: l10n daemon script <scripty@kde.org>
Date: Sun, 13 Jul 2025 01:35:02 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/43cc016f8b3ec48157a86815a050518a41b423b2

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 8eb1ce0c5..814ae8c9b 100644
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -11,6 +11,7 @@
         "Name[ca]": "Estableix la icona de carpeta",
         "Name[es]": "Definir icono de carpeta",
         "Name[eu]": "Ezarri karpetaren ikonoa",
+        "Name[fi]": "Aseta kansiokuvake",
         "Name[fr]": "Définir l'icône de dossiers",
         "Name[gl]": "Definir a icona do cartafol",
         "Name[he]": "הגדרת סמל תיקייה",