Skip to content

Commit b9ce6c9

Browse files
Improve "Replace in Files" dialog button text
1 parent 24b4607 commit b9ce6c9

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

editor/editor_node.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7697,24 +7697,28 @@ EditorNode::EditorNode() {
76977697

76987698
disk_changed = memnew(ConfirmationDialog);
76997699
{
7700-
disk_changed->set_title(TTR("Files have been modified on disk"));
7700+
disk_changed->set_title(TTR("Files have been modified outside Godot"));
77017701

77027702
VBoxContainer *vbc = memnew(VBoxContainer);
77037703
disk_changed->add_child(vbc);
77047704

77057705
Label *dl = memnew(Label);
7706-
dl->set_text(TTR("The following files are newer on disk.\nWhat action should be taken?"));
7706+
dl->set_text(TTR("The following files are newer on disk:"));
77077707
vbc->add_child(dl);
77087708

77097709
disk_changed_list = memnew(Tree);
77107710
vbc->add_child(disk_changed_list);
77117711
disk_changed_list->set_v_size_flags(Control::SIZE_EXPAND_FILL);
77127712

7713+
Label *what_action_label = memnew(Label);
7714+
what_action_label->set_text(TTR("What action should be taken?"));
7715+
vbc->add_child(what_action_label);
7716+
77137717
disk_changed->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_reload_modified_scenes));
77147718
disk_changed->connect(SceneStringName(confirmed), callable_mp(this, &EditorNode::_reload_project_settings));
7715-
disk_changed->set_ok_button_text(TTR("Discard local changes and reload"));
7719+
disk_changed->set_ok_button_text(TTR("Reload from disk"));
77167720

7717-
disk_changed->add_button(TTR("Keep local changes and overwrite"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave");
7721+
disk_changed->add_button(TTR("Ignore external changes"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave");
77187722
disk_changed->connect("custom_action", callable_mp(this, &EditorNode::_resave_scenes));
77197723
}
77207724

editor/plugins/script_editor_plugin.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4349,28 +4349,28 @@ ScriptEditor::ScriptEditor(WindowWrapper *p_wrapper) {
43494349

43504350
disk_changed = memnew(ConfirmationDialog);
43514351
{
4352-
disk_changed->set_title(TTR("Files have been modified on disk"));
4352+
disk_changed->set_title(TTR("Files have been modified outside Godot"));
43534353

43544354
VBoxContainer *vbc = memnew(VBoxContainer);
43554355
disk_changed->add_child(vbc);
43564356

43574357
Label *files_are_newer_label = memnew(Label);
4358-
files_are_newer_label->set_text(TTR("The following files are newer on disk."));
4358+
files_are_newer_label->set_text(TTR("The following files are newer on disk:"));
43594359
vbc->add_child(files_are_newer_label);
43604360

4361-
Label *what_action_label = memnew(Label);
4362-
what_action_label->set_text(TTR("What action should be taken?:"));
4363-
vbc->add_child(what_action_label);
4364-
43654361
disk_changed_list = memnew(Tree);
43664362
vbc->add_child(disk_changed_list);
43674363
disk_changed_list->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
43684364
disk_changed_list->set_v_size_flags(SIZE_EXPAND_FILL);
43694365

4366+
Label *what_action_label = memnew(Label);
4367+
what_action_label->set_text(TTR("What action should be taken?"));
4368+
vbc->add_child(what_action_label);
4369+
43704370
disk_changed->connect(SceneStringName(confirmed), callable_mp(this, &ScriptEditor::reload_scripts).bind(false));
4371-
disk_changed->set_ok_button_text(TTR("Discard local changes and reload"));
4371+
disk_changed->set_ok_button_text(TTR("Reload from disk"));
43724372

4373-
disk_changed->add_button(TTR("Keep local changes and overwrite"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave");
4373+
disk_changed->add_button(TTR("Ignore external changes"), !DisplayServer::get_singleton()->get_swap_cancel_ok(), "resave");
43744374
disk_changed->connect("custom_action", callable_mp(this, &ScriptEditor::_resave_scripts));
43754375
}
43764376

0 commit comments

Comments
 (0)