From 1cfe9f9ad3569be01da2e4a8877017c03ac484cf Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sun, 5 Oct 2025 01:30:38 +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/itemactions')

diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json
index 0efd6f72f..0f8e4742c 100644
--- a/src/itemactions/hidefileitemaction.json
+++ b/src/itemactions/hidefileitemaction.json
@@ -14,6 +14,7 @@
         "Name[fr]": "Masquer",
         "Name[he]": "הסתרה",
         "Name[ia]": "Cela",
+        "Name[is]": "Fela",
         "Name[it]": "Nascondi",
         "Name[ka]": "დამალვა",
         "Name[nl]": "Verbergen",
-- 
cgit v1.3