From: l10n daemon script <scripty@kde.org>
Date: Sun, 30 Jun 2024 01:20:00 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/5eb3240e165ba9875c54ac47c4badf0260653d47?ds=inline

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 1b040416f..99fdbccd2 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -13,6 +13,7 @@
         "Name[cs]": "Přesunout do nové složky",
         "Name[eo]": "Movi al Nova Dosierujo",
         "Name[es]": "Mover a una nueva carpeta",
+        "Name[eu]": "Eraman karpeta berrira",
         "Name[fr]": "Déplacer vers le nouveau dossier",
         "Name[he]": "העברה לתיקייה חדשה",
         "Name[ia]": "Move a nove dossier",