From aa289451e6d82cc6dea266d98236ac0f8a47f2fe Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 24 Aug 2025 01:34:51 +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') diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index 29638e4e5..ac7e333ac 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -25,6 +25,7 @@ "Name[nl]": "Mappictogram instellen", "Name[pl]": "Ustaw ikonę katalogu", "Name[pt_BR]": "Definir ícone da pasta", + "Name[ru]": "Задать значок папки", "Name[sl]": "Nastavi ikono mape", "Name[sv]": "Ange katalogikon", "Name[tr]": "Klasör Simgesi Ayarla", -- cgit v1.3