From: l10n daemon script Date: Sun, 22 Jun 2025 01:35:32 +0000 (+0000) Subject: SVN_SILENT made messages (.desktop file) - always resolve ours X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/9f233850beb60168e8773623e0b5ae052c5287e9 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" --- diff --git a/src/itemactions/setfoldericonitemaction.json b/src/itemactions/setfoldericonitemaction.json index f5bad45a9..7090654a2 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -11,6 +11,7 @@ "Name[ca]": "Estableix la icona de carpeta", "Name[es]": "Definir icono de carpeta", "Name[fr]": "Définir l'icône de dossiers", + "Name[gl]": "Definir a icona do cartafol", "Name[he]": "הגדרת סמל תיקייה", "Name[it]": "Imposta icona della cartella", "Name[ka]": "საქაღალდის ხატულას დაყენება",