From e0a5805b3ee63d83248c6ada71728eac39136909 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 4 Mar 2026 01:42:19 +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 cd87eef50..6e6174016 100644
--- a/src/itemactions/hidefileitemaction.json
+++ b/src/itemactions/hidefileitemaction.json
@@ -21,6 +21,7 @@
         "Name[ia]": "Cela",
         "Name[is]": "Fela",
         "Name[it]": "Nascondi",
+        "Name[ja]": "隠す",
         "Name[ka]": "დამალვა",
         "Name[ko]": "숨기기",
         "Name[lt]": "Slėpti",
-- 
cgit v1.3