From b9530db1b070086b6539f1f1892aeac4d503c2ae Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 22 Mar 2026 01:39:35 +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 + src/itemactions/setfoldericonitemaction.json | 1 + 2 files changed, 2 insertions(+) (limited to 'src') diff --git a/src/itemactions/hidefileitemaction.json b/src/itemactions/hidefileitemaction.json index 6e6174016..234fa10c6 100644 --- a/src/itemactions/hidefileitemaction.json +++ b/src/itemactions/hidefileitemaction.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Oculta", "Name[ca]": "Oculta", "Name[cs]": "Skrýt", + "Name[da]": "Skjul", "Name[de]": "Ausblenden", "Name[es]": "Ocultar", "Name[eu]": "Ezkutatu", diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index 4d385aec8..b91ceb23f 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Establix la icona de carpeta", "Name[ca]": "Estableix la icona de carpeta", "Name[cs]": "Nastavit ikonu složky", + "Name[da]": "Indstil ikonfarve", "Name[de]": "Ordnersymbol festlegen", "Name[es]": "Definir icono de carpeta", "Name[eu]": "Ezarri karpetaren ikonoa", -- cgit v1.3