diff options
| author | l10n daemon script <[email protected]> | 2025-06-14 01:34:10 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-06-14 01:34:10 +0000 |
| commit | bd839796f1e165016f8a4dfd01b222b31fb7773f (patch) | |
| tree | 16ccfd510f6477693d6b2470cfdeaa46d59de5c4 | |
| parent | 82c859a0863dc861011d4c362580888b5d6add33 (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"
| -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 61ee6b40a..b74773e5b 100644 --- a/src/itemactions/setfoldericonitemaction.json +++ b/src/itemactions/setfoldericonitemaction.json @@ -10,6 +10,7 @@ "Name[ca@valencia]": "Establix la icona de carpeta", "Name[ca]": "Estableix la icona de carpeta", "Name[es]": "Definir icono de carpeta", + "Name[fr]": "Définir l'icône de dossiers", "Name[he]": "הגדרת סמל תיקייה", "Name[it]": "Imposta icona della cartella", "Name[ka]": "საქაღალდის ხატულას დაყენება", |