From: l10n daemon script <scripty@kde.org>
Date: Tue, 23 Jul 2024 01:21:39 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/dd4f41bc61866d9deaeaed534ba61099f5f65e89

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 7cdb60c8b..7c8f43289 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -24,6 +24,7 @@
         "Name[lt]": "Perkelti į naują aplanką",
         "Name[nl]": "Naar nieuwe map verplaatsen",
         "Name[nn]": "Flytt til ny mappe",
+        "Name[pa]": "ਨਵੇਂ ਫੋਲਡਰ ਵਿੱਚ ਭੇਜੋ",
         "Name[pl]": "Przenieś do nowego katalogu",
         "Name[pt_BR]": "Mover para pasta",
         "Name[ro]": "Mută în dosar nou",