From: l10n daemon script <scripty@kde.org>
Date: Tue, 20 Aug 2024 01:25:27 +0000 (+0000)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/427a430fe427f1173121bf57c11e7d9a0d0bdefa

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 2dd9eb815..d85984cf2 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -24,6 +24,7 @@
         "Name[is]": "FÃ¦ra Ã­ nÃ½ja mÃ¶ppu",
         "Name[it]": "Sposta in una nuova cartella",
         "Name[ka]": "ááááá¢ááá áá®áá á¡áá¥áá¦ááááá¨á",
+        "Name[ko]": "ì í´ëë¡ ì´ë",
         "Name[lt]": "Perkelti Ä¯ naujÄ aplankÄ",
         "Name[nl]": "Naar nieuwe map verplaatsen",
         "Name[nn]": "Flytt til ny mappe",