diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-21 22:34:55 -0300 |
| commit | eacb8f04c4697b8123afeec03088eebb3c4b20bd (patch) | |
| tree | 8070f7807ec5d6a375df7184b151abbee8790608 /tools/editor/scene_tree_editor.cpp | |
| parent | a75f8963380a1f6ae8501f21a1d3f3bef8a89d91 (diff) | |
| parent | 4c4d79e3c98182faf348f41f98d1cc3e5d843e69 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'tools/editor/scene_tree_editor.cpp')
| -rw-r--r-- | tools/editor/scene_tree_editor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp index 7332bbb8b0..09a5e7860f 100644 --- a/tools/editor/scene_tree_editor.cpp +++ b/tools/editor/scene_tree_editor.cpp @@ -293,13 +293,13 @@ bool SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) { if (p_node==get_scene_node() && p_node->get_scene_inherited_state().is_valid()) { item->add_button(0,get_icon("InstanceOptions","EditorIcons"),BUTTON_SUBSCENE); - item->set_tooltip(0,TTR("Inherits: ")+p_node->get_scene_inherited_state()->get_path()+"\nType: "+p_node->get_type()); + item->set_tooltip(0,TTR("Inherits:")+" "+p_node->get_scene_inherited_state()->get_path()+"\n"+TTR("Type:")+" "+p_node->get_type()); } else if (p_node!=get_scene_node() && p_node->get_filename()!="" && can_open_instance) { item->add_button(0,get_icon("InstanceOptions","EditorIcons"),BUTTON_SUBSCENE); - item->set_tooltip(0,TTR("Instance: ")+p_node->get_filename()+"\nType: "+p_node->get_type()); + item->set_tooltip(0,TTR("Instance:")+" "+p_node->get_filename()+"\n"+TTR("Type:")+" "+p_node->get_type()); } else { - item->set_tooltip(0,String(p_node->get_name())+"\nType: "+p_node->get_type()); + item->set_tooltip(0,String(p_node->get_name())+"\n"+TTR("Type:")+" "+p_node->get_type()); } if (can_open_instance) { @@ -684,7 +684,7 @@ void SceneTreeEditor::_renamed() { String new_name=which->get_text(0); if (new_name.find(".") != -1 || new_name.find("/") != -1) { - error->set_text(TTR("Invalid node name, the following characters are not allowed:\n \".\", \"/\"")); + error->set_text(TTR("Invalid node name, the following characters are not allowed:")+"\n \".\", \"/\""); error->popup_centered_minsize(); new_name=n->get_name(); } |