From: l10n daemon script <scripty@kde.org>
Date: Sat, 10 Aug 2024 01:29: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/bc6803eeefd3d9c9a2f426f5677dd8373a37343a?ds=sidebyside

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 bb8bb48e9..2dd9eb815 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -16,6 +16,7 @@
         "Name[es]": "Mover a una nueva carpeta",
         "Name[eu]": "Eraman karpeta berrira",
         "Name[fr]": "Déplacer vers le nouveau dossier",
+        "Name[gl]": "Mover a un novo cartafol",
         "Name[he]": "העברה לתיקייה חדשה",
         "Name[hu]": "Áthelyezés új mappába",
         "Name[ia]": "Move a nove dossier",