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

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 bf31f6739..3f8efeddc 100644
--- a/src/itemactions/movetonewfolderitemaction.json
+++ b/src/itemactions/movetonewfolderitemaction.json
@@ -27,6 +27,7 @@
         "Name[ka]": "ááááá¢ááá áá®áá á¡áá¥áá¦ááááá¨á",
         "Name[ko]": "ì í´ëë¡ ì´ë",
         "Name[lt]": "Perkelti Ä¯ naujÄ aplankÄ",
+        "Name[lv]": "PÄrvietot uz jaunu mapi",
         "Name[nl]": "Naar nieuwe map verplaatsen",
         "Name[nn]": "Flytt til ny mappe",
         "Name[pa]": "à¨¨à¨µà©à¨ à¨«à©à¨²à¨¡à¨° à¨µà¨¿à©±à¨ à¨­à©à¨à©",