From fb9561c457207d5c1661a9ffc7fafdd0710c7ff1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 13 Dec 2025 01:38:58 +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 6868e0e85..cadd7187e 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[cs]": "Nastavit ikonu složky", "Name[de]": "Ordnersymbol festlegen", "Name[es]": "Definir icono de carpeta", "Name[eu]": "Ezarri karpetaren ikonoa", -- cgit v1.3.1