diff --git a/tools/chatgui/src/member_files/browser.cpp b/tools/chatgui/src/member_files/browser.cpp index b229a76c..2a60eefc 100644 --- a/tools/chatgui/src/member_files/browser.cpp +++ b/tools/chatgui/src/member_files/browser.cpp @@ -642,8 +642,9 @@ void MemberFileBrowser::mutate(uint8_t command) { auto entries = selectedEntries(); if (entries.isEmpty()) return; QPointer guard(this); m_dropId = requestId(); updateActions(); - QString prompt = entries.size() == 1 ? text("Delete %1?").arg(entries.first().remote) : - text("Delete %1 selected entries? Non-empty folders will not be removed.").arg(entries.size()); + QString prompt = entries.size() == 1 + ? (entries.first().directory ? text("Delete %1 and all its contents?") : text("Delete %1?")).arg(entries.first().remote) + : text("Delete %1 selected entries and all folder contents?").arg(entries.size()); auto answer = QMessageBox::question(this, text("Delete"), prompt, QMessageBox::Yes | QMessageBox::No, QMessageBox::No); if (!guard) return; bool cancelled = !m_dropId; m_dropId = 0; updateActions(); diff --git a/tools/chatgui/translations/chatgui_en.ts b/tools/chatgui/translations/chatgui_en.ts index 2268be8d..bd9f6a58 100644 --- a/tools/chatgui/translations/chatgui_en.ts +++ b/tools/chatgui/translations/chatgui_en.ts @@ -52,8 +52,20 @@ File and folder types conflict: %1 - Delete %1 selected entries? Non-empty folders will not be removed. - Delete %1 selected entries? Non-empty folders will not be removed. + Delete %1 selected entries and all folder contents? + Delete %1 selected entries and all folder contents? + + + Delete %1 and all its contents? + Delete %1 and all its contents? + + + Preparing deletion: %1 entries found — %2 + Preparing deletion: %1 entries found — %2 + + + Deletion cancelled + Deletion cancelled Copy file diff --git a/tools/chatgui/translations/chatgui_ru.ts b/tools/chatgui/translations/chatgui_ru.ts index 42d0917a..8aa95e93 100644 --- a/tools/chatgui/translations/chatgui_ru.ts +++ b/tools/chatgui/translations/chatgui_ru.ts @@ -52,8 +52,20 @@ Конфликт типов файла и папки: %1 - Delete %1 selected entries? Non-empty folders will not be removed. - Удалить выбранные объекты (%1)? Непустые папки удалены не будут. + Delete %1 selected entries and all folder contents? + Удалить выбранные объекты (%1) и всё содержимое папок? + + + Delete %1 and all its contents? + Удалить %1 и всё содержимое? + + + Preparing deletion: %1 entries found — %2 + Подготовка удаления: найдено объектов — %1; %2 + + + Deletion cancelled + Удаление отменено Copy file