From 8d6fd599e68ff93f28071285d076f86b24bdccc0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 9 Oct 2025 10:45:22 +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(+) diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index 0f8e4742c..595da6ff7 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -17,6 +17,7 @@ "Name[is]": "Fela", "Name[it]": "Nascondi", "Name[ka]": "დამალვა", + "Name[ko]": "숨기기", "Name[nl]": "Verbergen", "Name[pl]": "Ukryj", "Name[pt_BR]": "Ocultar", -- cgit v1.3