From b7701d6341b5c562ae46b32ca7bfed51d9ddecf9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 12 Nov 2025 01:38:58 +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/itemactions') diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index fd915a85b..ba918f0b5 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -14,11 +14,13 @@ "Name[fi]": "Piilota", "Name[fr]": "Masquer", "Name[he]": "הסתרה", + "Name[hu]": "Elrejtés", "Name[ia]": "Cela", "Name[is]": "Fela", "Name[it]": "Nascondi", "Name[ka]": "დამალვა", "Name[ko]": "숨기기", + "Name[lv]": "Paslēpt", "Name[nl]": "Verbergen", "Name[pl]": "Ukryj", "Name[pt_BR]": "Ocultar", -- cgit v1.3