From: l10n daemon script <scripty@kde.org>
Date: Tue, 29 Oct 2024 01:24:40 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/99c3c8be59bf1828ab1b9e8827a7c82baddc7501

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/movetonewfolderitemaction.json b/src/itemactions/movetonewfolderitemaction.json
index 3f2e4fc88..c82fccc9d 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -11,6 +11,7 @@
         "Name[ca@valencia]": "Mou cap a una carpeta nova",
         "Name[ca]": "Mou a una carpeta nova",
         "Name[cs]": "Přesunout do nové složky",
+        "Name[da]": "Flyt til ny mappe",
         "Name[de]": "In neuen Ordner verschieben",
         "Name[el]": "Μετακίνηση σε Νέο Φάκελο",
         "Name[en_GB]": "Move to New Folder",