From: l10n daemon script <scripty@kde.org>
Date: Fri, 13 Jun 2025 01:33:37 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/c5a563089f801b9612413e2cca63d0fa138855cd?hp=8e3addb7e73122a4c89ef347b03f714ff75a253a

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 15e953d60..61ee6b40a 100644
--- a/src/itemactions/setfoldericonitemaction.json
+++ b/src/itemactions/setfoldericonitemaction.json
@@ -5,6 +5,7 @@
             "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",
@@ -15,6 +16,7 @@
         "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",