summaryrefslogtreecommitdiffstats
path: root/editor/editor_node.cpp
diff options
context:
space:
mode:
authorThaddeus Crews <repiteo@outlook.com>2024-11-14 14:51:58 -0600
committerThaddeus Crews <repiteo@outlook.com>2024-11-14 14:51:58 -0600
commita595ae2abb9ce66a981e9d157d40047a0290e9d3 (patch)
treedf6b2cbad886da7cdcdec5e8fe8b85b7f46e6836 /editor/editor_node.cpp
parent5dbc5af33d767b294110488dc0098761e3aaca6f (diff)
parentb9ce6c90471239c9f0de43147ce3a35e98212c5c (diff)
downloadredot-engine-a595ae2abb9ce66a981e9d157d40047a0290e9d3.tar.gz
Merge pull request #97461 from lalitshankarchowdhury/better-replace
Improve "Replace in Files" dialog button text
Diffstat (limited to 'editor/editor_node.cpp')
-rw-r--r--editor/editor_node.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 0df062c508..87f1f1b8a0 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -7706,24 +7706,28 @@ EditorNode::EditorNode() {
disk_changed = memnew(ConfirmationDialog);
{
- disk_changed->set_title(TTR("Files have been modified on disk"));
+ disk_changed->set_title(TTR("Files have been modified outside Godot"));
VBoxContainer *vbc = memnew(VBoxContainer);
disk_changed->add_child(vbc);
Label *dl = memnew(Label);
- dl->set_text(TTR("The following files are newer on disk.\nWhat action should be taken?"));
+ dl->set_text(TTR("The following files are newer on disk:"));
vbc->add_child(dl);
disk_changed_list = memnew(Tree);
vbc->add_child(disk_changed_list);
disk_changed_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+ Label *what_action_label = memnew(Label);
+ what_action_label->set_text(TTR("What action should be taken?"));
+ vbc->add_child(what_action_label);
+
disk_changed->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_reload_modified_scenes));
disk_changed->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_reload_project_settings));
- disk_changed->set_ok_button_text(TTR("Discard local changes and reload"));
+ disk_changed->set_ok_button_text(TTR("Reload from disk"));
- disk_changed->add_button(TTR("Keep local changes and overwrite"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave");
+ disk_changed->add_button(TTR("Ignore external changes"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave");
disk_changed->connect("custom_action", callable_mp(this, &EditorNode::_resave_scenes));
}