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 61ee6b40a81eff93be320ab2ca88655360bb18fe..b74773e5b2ad561ff3e2669d959ebed831cd4e65 100644 (file)
--- 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]": "საქაღალდის ხატულას დაყენება",