From 0a18c04e19da3d94e3c885237c9d4d2a9fc822e1 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 6 Feb 2026 01:41:48 +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 b730aff84..2d888da56 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -15,6 +15,7 @@ "Name[eu]": "Ezarri karpetaren ikonoa", "Name[fi]": "Aseta kansiokuvake", "Name[fr]": "Définir l'icône de dossiers", + "Name[ga]": "Socraigh Deilbhín Fillteáin", "Name[gl]": "Definir a icona do cartafol", "Name[he]": "הגדרת סמל תיקייה", "Name[hu]": "Mappaikon beállítása", -- cgit v1.3