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 19648c9da4eee5927ba18ec13eb6eb6b7e7edbed..fc54ce9aaba2f306d108e1b52aad50b7f5cf0ad4 100644 (file)
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -16,6 +16,7 @@
         "Name[fr]": "Définir l'icône de dossiers",
         "Name[gl]": "Definir a icona do cartafol",
         "Name[he]": "הגדרת סמל תיקייה",
         "Name[fr]": "Définir l'icône de dossiers",
         "Name[gl]": "Definir a icona do cartafol",
         "Name[he]": "הגדרת סמל תיקייה",

+        "Name[hu]": "Mappaikon beállítása",

         "Name[is]": "Velja möpputákn",
         "Name[it]": "Imposta icona della cartella",
         "Name[ka]": "საქაღალდის ხატულას დაყენება",
         "Name[is]": "Velja möpputákn",
         "Name[it]": "Imposta icona della cartella",
         "Name[ka]": "საქაღალდის ხატულას დაყენება",