From c9a694a11d77c61a55dd3a6550a28a81b6cc951d Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Fri, 14 Aug 2020 20:42:27 +0200 Subject: [PATCH] Rename the "Delete" option in the FileSystem dock to "Move to Trash" It actually moves files to the system trash instead of removing them completely. (cherry picked from commit e7ed287fda97d68f2985d4a56cf7dbda28b4a179) --- editor/dependency_editor.cpp | 4 ++-- editor/filesystem_dock.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index df957611cf9..560ebd6ccb1 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -474,13 +474,13 @@ void DependencyRemoveDialog::show(const Vector &p_folders, const Vector< removed_deps.sort(); if (removed_deps.empty()) { owners->hide(); - text->set_text(TTR("Remove selected files from the project? (Can't be restored)")); + text->set_text(TTR("Remove selected files from the project? (no undo)\nYou can find the removed files in the system trash to restore them.")); set_size(Size2()); popup_centered(); } else { _build_removed_dependency_tree(removed_deps); owners->show(); - text->set_text(TTR("The files being removed are required by other resources in order for them to work.\nRemove them anyway? (no undo)")); + text->set_text(TTR("The files being removed are required by other resources in order for them to work.\nRemove them anyway? (no undo)\nYou can find the removed files in the system trash to restore them.")); popup_centered(Size2(500, 350)); } EditorFileSystem::get_singleton()->scan_changes(); diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 2e8ef7a9300..f9842dfb61d 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -2252,7 +2252,7 @@ void FileSystemDock::_file_and_folders_fill_popup(PopupMenu *p_popup, Vector 1 || p_paths[0] != "res://") { p_popup->add_icon_item(get_icon("MoveUp", "EditorIcons"), TTR("Move To..."), FILE_MOVE); - p_popup->add_icon_item(get_icon("Remove", "EditorIcons"), TTR("Delete"), FILE_REMOVE); + p_popup->add_icon_item(get_icon("Remove", "EditorIcons"), TTR("Move to Trash"), FILE_REMOVE); } if (p_paths.size() == 1) {