From: l10n daemon script Date: Mon, 17 Jun 2024 01:19: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/ba8026df8259ac4570129018096e835ec5071724 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 7b47b521c..f493b6521 100644 --- a/src/itemactions/movetonewfolderitemaction.json +++ b/src/itemactions/movetonewfolderitemaction.json @@ -6,6 +6,7 @@ ], "Name": "Move to New Folder", "Name[ar]": "انقل إلى مجلد جديد", + "Name[be]": "Перамясціць у новы каталог", "Name[bg]": "Преместване в нова папка", "Name[ca@valencia]": "Mou cap a una carpeta nova", "Name[ca]": "Mou a una carpeta nova", @@ -24,6 +25,8 @@ "Name[ro]": "Mută în dosar nou", "Name[ru]": "Переместить в новую папку", "Name[sl]": "Premakni v novo mapo", + "Name[sv]": "Flytta till ny katalog", + "Name[ta]": "புதிய அடைவிற்கு நகர்த்து", "Name[tr]": "Yeni Klasöre Taşı", "Name[uk]": "Пересунути до нової теки", "Name[x-test]": "xxMove to New Folderxx",