From 5c71e6189488ca3e3f28c45e274f67f77c7cdfed Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 15 Jun 2025 01:33:49 +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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json
index b74773e5b..f5bad45a9 100644
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -16,11 +16,13 @@
         "Name[ka]": "á¡áá¥áá¦ááááá¡ á®áá¢á£ááá¡ ááá§ááááá",
         "Name[ko]": "í´ë ìì´ì½ ì¤ì ",
         "Name[nl]": "Mappictogram instellen",
+        "Name[pl]": "Ustaw ikonÄ katalogu",
         "Name[sl]": "Nastavi ikono mape",
         "Name[sv]": "Ange katalogikon",
         "Name[tr]": "KlasÃ¶r Simgesi Ayarla",
         "Name[uk]": "ÐÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð¿ÑÐºÑÐ¾Ð³ÑÐ°Ð¼Ñ ÑÐµÐºÐ¸",
         "Name[x-test]": "xxSet Folder Iconxx",
+        "Name[zh_CN]": "è®¾ç½®æä»¶å¤¹å¾æ ",
         "Name[zh_TW]": "è¨­å®è³æå¤¾åç¤º"
     },
     "X-KDE-Require": "Write",
-- 
2.47.3