From 8d74542b11d1c4afc7f61707be34b2794ad0ffed Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 13 Feb 2026 01:41:32 +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/hidefileitemaction.json | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json
index 0abaa8a91..14947faa1 100644
--- a/src/itemactions/hidefileitemaction.json
+++ b/src/itemactions/hidefileitemaction.json
@@ -26,6 +26,7 @@
         "Name[lt]": "Slėpti",
         "Name[lv]": "Paslēpt",
         "Name[nl]": "Verbergen",
+        "Name[pa]": "ਓਹਲੇ",
         "Name[pl]": "Ukryj",
         "Name[pt]": "Ocultar",
         "Name[pt_BR]": "Ocultar",
-- 
cgit v1.3