From: l10n daemon script <scripty@kde.org>
Date: Sun, 15 Jun 2025 01:33:49 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/5c71e6189488ca3e3f28c45e274f67f77c7cdfed

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