From 40a39559d11fce6faf5c9f2b1e4323dad077b97c Mon Sep 17 00:00:00 2001 From: l10n daemon script 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/setfoldericonitemaction.json | 1 + 1 file changed, 1 insertion(+) (limited to 'src/itemactions/setfoldericonitemaction.json') diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index b91ceb23f..5809a454c 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -36,6 +36,7 @@ "Name[pt_BR]": "Definir ícone da pasta", "Name[ro]": "Stabilește pictograma dosarului", "Name[ru]": "Задать значок папки", + "Name[sk]": "Nastaviť ikonu priečinka", "Name[sl]": "Nastavi ikono mape", "Name[sv]": "Ange katalogikon", "Name[tr]": "Klasör Simgesi Ayarla", -- cgit v1.3