From 6179f7654763cefa1611ab2f0ce998caf1f17926 Mon Sep 17 00:00:00 2001 From: Haoyu Qiu Date: Tue, 13 Jul 2021 13:31:48 +0800 Subject: [PATCH] Merge similar editor strings (cherry picked from commit 4383f8a7906dad841052190ad4a8d2613fe2e4ef) --- editor/animation_track_editor.cpp | 4 ++-- editor/editor_node.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index 23f9946f03..1e01a77f68 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -4418,7 +4418,7 @@ void AnimationTrackEditor::_new_track_node_selected(NodePath p_path) { } if (node == AnimationPlayerEditor::singleton->get_player()) { - EditorNode::get_singleton()->show_warning(TTR("An animation player can't animate itself, only other players.")); + EditorNode::get_singleton()->show_warning(TTR("AnimationPlayer can't animate itself, only other players.")); return; } @@ -5242,7 +5242,7 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) { } break; case EDIT_PASTE_TRACKS: { if (track_clipboard.size() == 0) { - EditorNode::get_singleton()->show_warning(TTR("Clipboard is empty")); + EditorNode::get_singleton()->show_warning(TTR("Clipboard is empty!")); break; } diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index e2c6866753..cd07b276a0 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -2658,7 +2658,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { } save_confirmation->get_ok()->set_text(TTR("Save & Quit")); - save_confirmation->set_text((p_option == FILE_QUIT ? TTR("Save changes to the following scene(s) before quitting?") : TTR("Save changes the following scene(s) before opening Project Manager?")) + unsaved_scenes); + save_confirmation->set_text((p_option == FILE_QUIT ? TTR("Save changes to the following scene(s) before quitting?") : TTR("Save changes to the following scene(s) before opening Project Manager?")) + unsaved_scenes); save_confirmation->popup_centered_minsize(); } }