From 552382a82f0e4ad923fd6dd019200c6a25e84686 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Sat, 27 Sep 2025 01:35:28 +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 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json
index 04cd35dd0..f3153578e 100644
--- a/src/itemactions/hidefileitemaction.json
+++ b/src/itemactions/hidefileitemaction.json
@@ -6,8 +6,10 @@
         ],
         "Name": "Hide",
         "Name[ar]": "أخفِ",
+        "Name[ca@valencia]": "Oculta",
         "Name[ca]": "Oculta",
         "Name[es]": "Ocultar",
+        "Name[fr]": "Masquer",
         "Name[he]": "הסתרה",
         "Name[ia]": "Cela",
         "Name[it]": "Nascondi",
-- 
cgit v1.3