godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #50410 from timothyqiu/similar-msg 

Merge similar editor strings
This commit is contained in:
Rémi Verschelde 2021-07-13 08:44:38 +02:00 committed by GitHub
parent 6a47de653a 4383f8a790
commit d5cbd6cdb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/animation_track_editor.cpp
View File

@ -4450,7 +4450,7 @@ void AnimationTrackEditor::_new_track_node_selected(NodePath p_path) {
} }
if (node == AnimationPlayerEditor::singleton->get_player()) { 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; return;
} }
@ -5334,7 +5334,7 @@ void AnimationTrackEditor::_edit_menu_pressed(int p_option) {
} break; } break;
case EDIT_PASTE_TRACKS: { case EDIT_PASTE_TRACKS: {
if (track_clipboard.size() == 0) { if (track_clipboard.size() == 0) {
EditorNode::get_singleton()->show_warning(TTR("Clipboard is empty")); EditorNode::get_singleton()->show_warning(TTR("Clipboard is empty!"));
break; break;
} }

2
editor/editor_node.cpp
View File

@ -2713,7 +2713,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) {
} }
save_confirmation->get_ok_button()->set_text(TTR("Save & Quit")); save_confirmation->get_ok_button()->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(); save_confirmation->popup_centered();
} }
} }