From: l10n daemon script <scripty@kde.org>
Date: Fri, 31 May 2024 01:20: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/035d5b64e1698e55ac20b2f65e51caf08beac3de?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 e0c0978e3..2c516d0bc 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -9,12 +9,14 @@
         "Name[bg]": "ÐÑÐµÐ¼ÐµÑÑÐ²Ð°Ð½Ðµ Ð² Ð½Ð¾Ð²Ð° Ð¿Ð°Ð¿ÐºÐ°",
         "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[en_GB]": "Move to New Folder",
         "Name[eo]": "Movi al Nova Dosierujo",
         "Name[es]": "Mover a una nueva carpeta",
         "Name[fr]": "DÃ©placer vers le nouveau dossier",
         "Name[he]": "××¢××¨× ××ª××§××× ×××©×",
         "Name[ia]": "Move a nove dossier",
+        "Name[it]": "Sposta in una nuova cartella",
         "Name[ka]": "ááááá¢ááá áá®áá á¡áá¥áá¦ááááá¨á",
         "Name[lt]": "Perkelti Ä¯ naujÄ aplankÄ",
         "Name[nl]": "Naar nieuwe map verplaatsen",