From fcc9b11db63b715b1e27475545a4b92b763c9ed0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 Oct 2025 01:36:16 +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') diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index 595da6ff7..fd915a85b 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -11,6 +11,7 @@ "Name[ca]": "Oculta", "Name[es]": "Ocultar", "Name[eu]": "Ezkutatu", + "Name[fi]": "Piilota", "Name[fr]": "Masquer", "Name[he]": "הסתרה", "Name[ia]": "Cela", -- cgit v1.3