diff options
| author | l10n daemon script <[email protected]> | 2025-06-22 01:35:32 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-22 01:35:32 +0000 |
| commit | 9f233850beb60168e8773623e0b5ae052c5287e9 (patch) | |
| tree | 3b54b4aaed4f493f3657d565627a155ca60c8813 /src | |
| parent | e57f6215659ee36877c7c36c9e3fcba0ba5d03a0 (diff) | |
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"
Diffstat (limited to 'src')
| -rw-r--r-- | src/itemactions/setfoldericonitemaction.json | 1 |
1 files changed, 1 insertions, 0 deletions
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]": "საქაღალდის ხატულას დაყენება", |