From e48bb0405ec431cf9f6048981ca08d3dcfbeeba7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 27 Jul 2025 01:34:32 +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') diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index 5d02aeb06..19648c9da 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -9,6 +9,7 @@ "Name[bg]": "Задаване на икона на папка", "Name[ca@valencia]": "Establix la icona de carpeta", "Name[ca]": "Estableix la icona de carpeta", + "Name[de]": "Ordnersymbol festlegen", "Name[es]": "Definir icono de carpeta", "Name[eu]": "Ezarri karpetaren ikonoa", "Name[fi]": "Aseta kansiokuvake", -- cgit v1.3