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 814ae8c9b161d5d82a49a45d68366301476c5edd..5d02aeb06577dd01159a721f665a27d8f146aa13 100644 (file)
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -15,6 +15,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[is]": "Velja möpputákn",

         "Name[it]": "Imposta icona della cartella",
         "Name[ka]": "საქაღალდის ხატულას დაყენება",
         "Name[ko]": "폴더 아이콘 설정",
         "Name[it]": "Imposta icona della cartella",
         "Name[ka]": "საქაღალდის ხატულას დაყენება",
         "Name[ko]": "폴더 아이콘 설정",