From d8461fc02ed4eac062840f0dbd3eee9fe3047101 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 12 Feb 2026 01:41:25 +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 2d888da56..5c45705aa 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -30,6 +30,7 @@ "Name[nl]": "Mappictogram instellen", "Name[pa]": "ਫੋਲਡਰ ਲਈ ਆਈਕਾਨ ਦਿਓ", "Name[pl]": "Ustaw ikonę katalogu", + "Name[pt]": "Definir ícone da pasta", "Name[pt_BR]": "Definir ícone da pasta", "Name[ro]": "Stabilește pictograma dosarului", "Name[ru]": "Задать значок папки", -- cgit v1.3