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 15e953d601e9bb9ca9b8c62c26c0d41ec853ba6e..61ee6b40a81eff93be320ab2ca88655360bb18fe 100644 (file)
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -5,6 +5,7 @@
             "inode/directory"
         ],
         "Name": "Set Folder Icon",
             "inode/directory"
         ],
         "Name": "Set Folder Icon",

+        "Name[ar]": "عيّن أيقونة المجلد",

         "Name[bg]": "Задаване на икона на папка",
         "Name[ca@valencia]": "Establix la icona de carpeta",
         "Name[ca]": "Estableix la icona de carpeta",
         "Name[bg]": "Задаване на икона на папка",
         "Name[ca@valencia]": "Establix la icona de carpeta",
         "Name[ca]": "Estableix la icona de carpeta",


@@ -15,6 +16,7 @@
         "Name[ko]": "폴더 아이콘 설정",
         "Name[nl]": "Mappictogram instellen",
         "Name[sl]": "Nastavi ikono mape",
         "Name[ko]": "폴더 아이콘 설정",
         "Name[nl]": "Mappictogram instellen",
         "Name[sl]": "Nastavi ikono mape",

+        "Name[sv]": "Ange katalogikon",

         "Name[tr]": "Klasör Simgesi Ayarla",
         "Name[uk]": "Встановити піктограму теки",
         "Name[x-test]": "xxSet Folder Iconxx",
         "Name[tr]": "Klasör Simgesi Ayarla",
         "Name[uk]": "Встановити піктограму теки",
         "Name[x-test]": "xxSet Folder Iconxx",