From 7be1e4aa5f1dd257ac1ad9f811e2e7665d8751a4 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 17 Sep 2025 01:36:00 +0000
Subject: 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(+)

(limited to 'src')

diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json
index b12e1eba2..85febdccf 100644
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -23,6 +23,7 @@
         "Name[ko]": "폴더 아이콘 설정",
         "Name[lv]": "Norādīt datnes ikonu",
         "Name[nl]": "Mappictogram instellen",
+        "Name[pa]": "ਫੋਲਡਰ ਲਈ ਆਈਕਾਨ ਦਿਓ",
         "Name[pl]": "Ustaw ikonę katalogu",
         "Name[pt_BR]": "Definir ícone da pasta",
         "Name[ru]": "Задать значок папки",
-- 
cgit v1.3