From 40a39559d11fce6faf5c9f2b1e4323dad077b97c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 10 Apr 2026 02:00:54 +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/hidefileitemaction.json')

diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json
index 234fa10c6..2397a93ca 100644
--- a/src/itemactions/hidefileitemaction.json
+++ b/src/itemactions/hidefileitemaction.json
@@ -35,6 +35,7 @@
         "Name[pt_BR]": "Ocultar",
         "Name[ro]": "Ascunde",
         "Name[ru]": "Скрыть",
+        "Name[sk]": "Skryť",
         "Name[sl]": "Skrij",
         "Name[sv]": "Dölj",
         "Name[tr]": "Gizle",
-- 
cgit v1.3