From 94c34ff8906935cf0a9ef5ad82c6755ee21bbd07 Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Thu, 19 May 2016 00:08:12 +0200 Subject: i18n: Proofreading of all strings Done to ensure that no important identifiers are translatable, to fix compound strings using the new vformat() function, and some general English proofreading here and there. --- tools/editor/plugins/theme_editor_plugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/editor/plugins/theme_editor_plugin.cpp') diff --git a/tools/editor/plugins/theme_editor_plugin.cpp b/tools/editor/plugins/theme_editor_plugin.cpp index 3c394ab6a..7d839bea2 100644 --- a/tools/editor/plugins/theme_editor_plugin.cpp +++ b/tools/editor/plugins/theme_editor_plugin.cpp @@ -199,7 +199,7 @@ void ThemeEditor::_save_template_cbk(String fname) { if (!file) { - ERR_EXPLAIN(TTR("Can't save theme to file: ")+filename); + ERR_EXPLAIN(TTR("Can't save theme to file:")+" "+filename); return; } file->store_line("; ******************* "); -- cgit v1.3.1 From 00d8f8604476b525869787f0962bf41b4b591061 Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sat, 21 May 2016 01:18:35 +0200 Subject: i18n: Second pass at proofreading Mostly removing commented out strings, plus a few critical ones that should not be translated. --- tools/editor/animation_editor.cpp | 6 +- tools/editor/call_dialog.cpp | 2 +- tools/editor/connections_dialog.cpp | 10 +- tools/editor/create_dialog.cpp | 8 +- tools/editor/editor_node.cpp | 58 ++-- tools/editor/editor_reimport_dialog.cpp | 4 +- tools/editor/import_settings.cpp | 2 +- .../io_plugins/editor_font_import_plugin.cpp | 2 +- .../io_plugins/editor_sample_import_plugin.cpp | 2 +- .../io_plugins/editor_scene_import_plugin.cpp | 6 +- tools/editor/plugins/canvas_item_editor_plugin.cpp | 4 +- .../plugins/collision_polygon_2d_editor_plugin.cpp | 6 +- .../plugins/collision_polygon_editor_plugin.cpp | 4 +- tools/editor/plugins/control_editor_plugin.cpp | 12 +- .../plugins/light_occluder_2d_editor_plugin.cpp | 8 +- tools/editor/plugins/multimesh_editor_plugin.cpp | 4 +- .../plugins/navigation_polygon_editor_plugin.cpp | 8 +- tools/editor/plugins/path_2d_editor_plugin.cpp | 2 +- tools/editor/plugins/polygon_2d_editor_plugin.cpp | 6 +- .../plugins/resource_preloader_editor_plugin.cpp | 4 +- .../plugins/sample_library_editor_plugin.cpp | 6 +- tools/editor/plugins/script_editor_plugin.cpp | 6 +- tools/editor/plugins/shader_editor_plugin.cpp | 2 +- tools/editor/plugins/spatial_editor_plugin.cpp | 2 +- .../editor/plugins/sprite_frames_editor_plugin.cpp | 6 +- tools/editor/plugins/theme_editor_plugin.cpp | 12 +- tools/editor/plugins/tile_map_editor_plugin.cpp | 8 +- tools/editor/project_export.cpp | 2 +- tools/editor/project_manager.cpp | 8 +- tools/editor/project_settings.cpp | 6 +- tools/editor/property_editor.cpp | 4 +- tools/editor/pvrtc_compress.cpp | 2 +- tools/editor/reparent_dialog.cpp | 4 +- tools/editor/run_settings_dialog.cpp | 2 +- tools/editor/scene_tree_dock.cpp | 16 +- tools/editor/script_editor_debugger.cpp | 2 +- tools/editor/spatial_editor_gizmos.cpp | 16 +- tools/translations/tools.pot | 330 +++++++++------------ 38 files changed, 272 insertions(+), 320 deletions(-) (limited to 'tools/editor/plugins/theme_editor_plugin.cpp') diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp index 1c17077f9..b47987251 100644 --- a/tools/editor/animation_editor.cpp +++ b/tools/editor/animation_editor.cpp @@ -2096,7 +2096,7 @@ void AnimationKeyEditor::_track_editor_input_event(const InputEvent& p_input) { /* if (ofsx < remove_icon->get_width()) { - undo_redo->create_action(TTR("Remove Anim Track")); + undo_redo->create_action("Remove Anim Track"); undo_redo->add_do_method(animation.ptr(),"remove_track",idx); undo_redo->add_undo_method(animation.ptr(),"add_track",animation->track_get_type(idx),idx); undo_redo->add_undo_method(animation.ptr(),"track_set_path",idx,animation->track_get_path(idx)); @@ -2129,7 +2129,7 @@ void AnimationKeyEditor::_track_editor_input_event(const InputEvent& p_input) { if (ofsx < move_down_icon->get_width()) { if (idx < animation->get_track_count() -1) { - undo_redo->create_action(TTR("Move Anim Track Down")); + undo_redo->create_action("Move Anim Track Down"); undo_redo->add_do_method(animation.ptr(),"track_move_up",idx); undo_redo->add_undo_method(animation.ptr(),"track_move_down",idx+1); undo_redo->commit_action(); @@ -2142,7 +2142,7 @@ void AnimationKeyEditor::_track_editor_input_event(const InputEvent& p_input) { if (ofsx < move_up_icon->get_width()) { if (idx >0) { - undo_redo->create_action(TTR("Move Anim Track Up")); + undo_redo->create_action("Move Anim Track Up"); undo_redo->add_do_method(animation.ptr(),"track_move_down",idx); undo_redo->add_undo_method(animation.ptr(),"track_move_up",idx-1); undo_redo->commit_action(); diff --git a/tools/editor/call_dialog.cpp b/tools/editor/call_dialog.cpp index a376169a7..0c6c64a33 100644 --- a/tools/editor/call_dialog.cpp +++ b/tools/editor/call_dialog.cpp @@ -323,7 +323,7 @@ CallDialog::CallDialog() { label->set_begin( Point2( 15,54) ); label->set_end( Point2( 16,44) ); - label->set_text(TTR("Parameters:")); + label->set_text("Parameters:"); add_child(label); */ diff --git a/tools/editor/connections_dialog.cpp b/tools/editor/connections_dialog.cpp index d74c6bb7c..b99cd12f6 100644 --- a/tools/editor/connections_dialog.cpp +++ b/tools/editor/connections_dialog.cpp @@ -294,8 +294,8 @@ void ConnectDialog::_bind_methods() { ConnectDialog::ConnectDialog() { - int margin = get_constant("margin",TTR("Dialogs")); - int button_margin = get_constant("button_margin",TTR("Dialogs")); + int margin = get_constant("margin","Dialogs"); + int button_margin = get_constant("button_margin","Dialogs"); Label * label = memnew( Label ); @@ -416,7 +416,7 @@ ConnectDialog::ConnectDialog() { /*dst_method_list = memnew( MenuButton ); - dst_method_list->set_text(TTR("List..")); + dst_method_list->set_text("List.."); dst_method_list->set_anchor( MARGIN_RIGHT, ANCHOR_END ); dst_method_list->set_anchor( MARGIN_LEFT, ANCHOR_END ); dst_method_list->set_anchor( MARGIN_TOP, ANCHOR_END ); @@ -465,7 +465,7 @@ ConnectDialog::ConnectDialog() { add_child(error); error->get_ok()->set_text(TTR("Close")); get_ok()->set_text(TTR("Connect")); -// error->get_cancel()->set_text(TTR("Close")); +// error->get_cancel()->set_text("Close"); @@ -610,7 +610,7 @@ void ConnectionsDialog::_remove_confirm() { Dictionary meta=selected->get_metadata(0); - undo_redo->create_action(TTR("Remove Subscription")); + undo_redo->create_action("Remove Subscription"); undo_redo->add_do_method(node,"unsubscribe_path_event",meta["from_event"].operator String(),meta["from_path"].operator NodePath(),meta["to_method"].operator String()); undo_redo->add_undo_method(node,"subscribe_path_event_persist",meta["from_event"].operator String(),meta["from_path"].operator NodePath(),meta["to_method"].operator String(),Array(),false); undo_redo->add_do_method(this,"update_tree"); diff --git a/tools/editor/create_dialog.cpp b/tools/editor/create_dialog.cpp index b29590964..151208ace 100644 --- a/tools/editor/create_dialog.cpp +++ b/tools/editor/create_dialog.cpp @@ -541,7 +541,7 @@ void CreateDialog::_bind_methods() { void CreateDialog::set_base_type(const String& p_base) { - set_title(vformat(TTR("Create %s Type"),p_base)); + set_title(vformat("Create %s Type",p_base)); if (base==p_base) return; @@ -562,14 +562,14 @@ CreateDialog::CreateDialog() { add_child(vbc); set_child_rect(vbc); - get_ok()->set_text(TTR("Create")); + get_ok()->set_text("Create"); tree = memnew( Tree ); - vbc->add_margin_child(TTR("Type:"),tree,true); + vbc->add_margin_child("Type:",tree,true); //tree->set_hide_root(true); filter = memnew( LineEdit ); - vbc->add_margin_child(TTR("Filter:"),filter); + vbc->add_margin_child("Filter:",filter); base="Node"; set_as_toplevel(true); diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 6a8778567..7cff6dab9 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -1071,8 +1071,8 @@ void EditorNode::_import_action(const String& p_action) { current_option=-1; //accept->get_cancel()->hide(); - accept->get_ok()->set_text(TTR("Ugh")); - accept->set_text(TTR("Error importing scene.")); + accept->get_ok()->set_text("Ugh"); + accept->set_text("Error importing scene."); accept->popup_centered(Size2(300,70));; return; } @@ -1087,8 +1087,8 @@ void EditorNode::_import_action(const String& p_action) { memdelete(src); //accept->get_cancel()->hide(); - accept->get_ok()->set_text(TTR("Ugh")); - accept->set_text(TTR("Error load scene to update.")); + accept->get_ok()->set_text("Ugh"); + accept->set_text("Error load scene to update."); accept->popup_centered(Size2(300,70));; return; } @@ -1128,8 +1128,8 @@ void EditorNode::_import(const String &p_file) { current_option=-1; //accept->get_cancel()->hide(); - accept->get_ok()->set_text(TTR("Ugh")); - accept->set_text(TTR("Error importing scene.")); + accept->get_ok()->set_text("Ugh"); + accept->set_text("Error importing scene."); accept->popup_centered(Size2(300,70));; return; } @@ -1769,7 +1769,7 @@ void EditorNode::_edit_current() { } //p->add_separator(); - //p->add_item(TTR("All Methods"),OBJECT_CALL_METHOD); + //p->add_item("All Methods",OBJECT_CALL_METHOD); update_keying(); @@ -2001,7 +2001,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { // TODO: Drop such obsolete commented code /* if (!p_confirmed) { - confirmation->get_ok()->set_text(TTR("Yes")); + confirmation->get_ok()->set_text("Yes"); //confirmation->get_cancel()->show(); confirmation->set_text("Start a New Scene? (Current will be lost)"); confirmation->popup_centered_minsize(); @@ -2059,7 +2059,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { //quick_open->popup("Resource", false, true); - //quick_open->set_title(TTR("Quick Search File..")); + //quick_open->set_title("Quick Search File.."); scenes_dock->focus_on_filter(); } break; @@ -2222,7 +2222,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { current_option=-1; //confirmation->get_cancel()->hide(); - accept->get_ok()->set_text(TTR("I see..")); + accept->get_ok()->set_text("I see.."); accept->set_text("This operation can't be done without a tree root."); accept->popup_centered(Size2(300,70));; break; @@ -2244,8 +2244,8 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { } else { current_option=-1; //confirmation->get_cancel()->hide(); - accept->get_ok()->set_text(TTR("I see..")); - accept->set_text(TTR("Please save the scene first.")); + accept->get_ok()->set_text("I see.."); + accept->set_text("Please save the scene first."); accept->popup_centered(Size2(300,70));; break; @@ -2709,11 +2709,11 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) { if (ischecked) { file_server->stop(); //debug_button->set_icon(gui_base->get_icon("FileServer","EditorIcons")); - //debug_button->get_popup()->set_item_text( debug_button->get_popup()->get_item_index(RUN_FILE_SERVER),TTR("Enable File Server")); + //debug_button->get_popup()->set_item_text( debug_button->get_popup()->get_item_index(RUN_FILE_SERVER),"Enable File Server"); } else { file_server->start(); //debug_button->set_icon(gui_base->get_icon("FileServerActive","EditorIcons")); - //debug_button->get_popup()->set_item_text( debug_button->get_popup()->get_item_index(RUN_FILE_SERVER),TTR("Disable File Server")); + //debug_button->get_popup()->set_item_text( debug_button->get_popup()->get_item_index(RUN_FILE_SERVER),"Disable File Server"); } debug_button->get_popup()->set_item_checked( debug_button->get_popup()->get_item_index(RUN_FILE_SERVER),!ischecked); @@ -3922,7 +3922,7 @@ void EditorNode::_save_optimized() { if (err) { //accept->"()->hide(); - accept->get_ok()->set_text(TTR("I see..")); + accept->get_ok()->set_text("I see.."); accept->set_text("Error saving optimized scene: "+path); accept->popup_centered(Size2(300,70));; return; @@ -5518,20 +5518,20 @@ EditorNode::EditorNode() { menu_panel->add_child( node_menu ); p=node_menu->get_popup(); - p->add_item(TTR("Create"),NODE_CREATE); - p->add_item(TTR("Instance"),NODE_INSTANCE); + p->add_item("Create",NODE_CREATE); + p->add_item("Instance",NODE_INSTANCE); p->add_separator(); - p->add_item(TTR("Reparent"),NODE_REPARENT); - p->add_item(TTR("Move Up"),NODE_MOVE_UP); - p->add_item(TTR("Move Down"),NODE_MOVE_DOWN); + p->add_item("Reparent",NODE_REPARENT); + p->add_item("Move Up",NODE_MOVE_UP); + p->add_item("Move Down",NODE_MOVE_DOWN); p->add_separator(); - p->add_item(TTR("Duplicate"),NODE_DUPLICATE); + p->add_item("Duplicate",NODE_DUPLICATE); p->add_separator(); - p->add_item(TTR("Remove (Branch)"),NODE_REMOVE_BRANCH); - p->add_item(TTR("Remove (Element)"),NODE_REMOVE_ELEMENT); + p->add_item("Remove (Branch)",NODE_REMOVE_BRANCH); + p->add_item("Remove (Element)",NODE_REMOVE_ELEMENT); p->add_separator(); - p->add_item(TTR("Edit Subscriptions.."),NODE_CONNECTIONS); - p->add_item(TTR("Edit Groups.."),NODE_GROUPS); + p->add_item("Edit Subscriptions..",NODE_CONNECTIONS); + p->add_item("Edit Groups..",NODE_GROUPS); resource_menu = memnew( MenuButton ); resource_menu->set_text("Resource"); @@ -5604,7 +5604,7 @@ EditorNode::EditorNode() { pause_button->set_icon(gui_base->get_icon("Pause","EditorIcons")); pause_button->set_focus_mode(Control::FOCUS_NONE); pause_button->connect("pressed", this,"_menu_option",make_binds(RUN_PAUSE)); - pause_button->set_tooltip(TTR("Pause the scene (F7).")); + pause_button->set_tooltip("Pause the scene (F7)."); */ stop_button = memnew( ToolButton ); play_hb->add_child(stop_button); @@ -5727,9 +5727,9 @@ EditorNode::EditorNode() { right_menu_hb->add_child( settings_menu ); p=settings_menu->get_popup(); - //p->add_item(TTR("Export Settings"),SETTINGS_EXPORT_PREFERENCES); + //p->add_item("Export Settings",SETTINGS_EXPORT_PREFERENCES); p->add_item(TTR("Editor Settings"),SETTINGS_PREFERENCES); - //p->add_item(TTR("Optimization Presets"),SETTINGS_OPTIMIZED_PRESETS); + //p->add_item("Optimization Presets",SETTINGS_OPTIMIZED_PRESETS); p->add_separator(); editor_layouts = memnew( PopupMenu ); editor_layouts->set_name("Layouts"); @@ -5787,7 +5787,7 @@ EditorNode::EditorNode() { dock_slot[DOCK_SLOT_LEFT_UR]->add_child(scene_tree_dock); #if 0 resources_dock = memnew( ResourcesDock(this) ); - resources_dock->set_name(TTR("Resources")); + resources_dock->set_name("Resources"); //top_pallete->add_child(resources_dock); dock_slot[DOCK_SLOT_RIGHT_BL]->add_child(resources_dock); //top_pallete->set_v_size_flags(Control::SIZE_EXPAND_FILL); diff --git a/tools/editor/editor_reimport_dialog.cpp b/tools/editor/editor_reimport_dialog.cpp index 244642b7a..b6311a760 100644 --- a/tools/editor/editor_reimport_dialog.cpp +++ b/tools/editor/editor_reimport_dialog.cpp @@ -32,7 +32,7 @@ void EditorReImportDialog::popup_reimport() { if (EditorFileSystem::get_singleton()->is_scanning()) { - error->set_text(TTR("Please wait for scan to complete")); + error->set_text(TTR("Please wait for scan to complete.")); error->popup_centered_minsize(); return; } @@ -92,7 +92,7 @@ void EditorReImportDialog::popup_reimport() { void EditorReImportDialog::ok_pressed() { if (EditorFileSystem::get_singleton()->is_scanning()) { - error->set_text(TTR("Please wait for scan to complete")); + error->set_text(TTR("Please wait for scan to complete.")); error->popup_centered_minsize(); return; } diff --git a/tools/editor/import_settings.cpp b/tools/editor/import_settings.cpp index 92f6129e5..dfaeca03d 100644 --- a/tools/editor/import_settings.cpp +++ b/tools/editor/import_settings.cpp @@ -288,7 +288,7 @@ ImportSettingsDialog::ImportSettingsDialog(EditorNode *p_editor) { tree->connect("item_edited",this,"_item_edited"); tree->connect("button_pressed",this,"_button_pressed"); -// add_button(TTR("Re-Import"),"reimport"); +// add_button("Re-Import","reimport"); get_ok()->set_text(TTR("Re-Import")); get_cancel()->set_text(TTR("Close")); diff --git a/tools/editor/io_plugins/editor_font_import_plugin.cpp b/tools/editor/io_plugins/editor_font_import_plugin.cpp index 296439c39..6ac67ab8a 100644 --- a/tools/editor/io_plugins/editor_font_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_font_import_plugin.cpp @@ -664,7 +664,7 @@ public: upd_hb->add_spacer(); Button *update = memnew( Button); upd_hb->add_child(update); - update->set_text(TTR("Update")); + update->set_text("Update"); update->connect("pressed",this,"_update"); */ options = memnew( _EditorFontImportOptions ); diff --git a/tools/editor/io_plugins/editor_sample_import_plugin.cpp b/tools/editor/io_plugins/editor_sample_import_plugin.cpp index 212ef9331..c608fe906 100644 --- a/tools/editor/io_plugins/editor_sample_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_sample_import_plugin.cpp @@ -406,7 +406,7 @@ String EditorSampleImportPlugin::get_name() const { } String EditorSampleImportPlugin::get_visible_name() const{ - return TTR("Audio Sample"); + return "Audio Sample"; } void EditorSampleImportPlugin::import_dialog(const String& p_from){ diff --git a/tools/editor/io_plugins/editor_scene_import_plugin.cpp b/tools/editor/io_plugins/editor_scene_import_plugin.cpp index 01ae0150e..84ef5f197 100644 --- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp +++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp @@ -816,7 +816,7 @@ void EditorSceneImportDialog::_import(bool p_and_open) { if (err) { - error_dialog->set_text(TTR("Error importing scene.")); + error_dialog->set_text("Error importing scene."); error_dialog->popup_centered(Size2(200,100)); return; } @@ -1164,14 +1164,14 @@ EditorSceneImportDialog::EditorSceneImportDialog(EditorNode *p_editor, EditorSce this_import = memnew( OptionButton ); this_import->add_item(TTR("Overwrite Existing Scene")); - this_import->add_item("Overwrite Existing, Keep Materials"); + this_import->add_item(TTR("Overwrite Existing, Keep Materials")); this_import->add_item(TTR("Keep Existing, Merge with New")); this_import->add_item(TTR("Keep Existing, Ignore New")); vbc->add_margin_child(TTR("This Time:"),this_import); next_import = memnew( OptionButton ); next_import->add_item(TTR("Overwrite Existing Scene")); - next_import->add_item("Overwrite Existing, Keep Materials"); + next_import->add_item(TTR("Overwrite Existing, Keep Materials")); next_import->add_item(TTR("Keep Existing, Merge with New")); next_import->add_item(TTR("Keep Existing, Ignore New")); vbc->add_margin_child(TTR("Next Time:"),next_import); diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp index 3b7186f18..1b6d94b2c 100644 --- a/tools/editor/plugins/canvas_item_editor_plugin.cpp +++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp @@ -2229,7 +2229,7 @@ void CanvasItemEditor::_notification(int p_what) { key_insert_button->set_icon(get_icon("Key","EditorIcons")); - //anchor_menu->add_icon_override(TTR("Align Top Left")); + //anchor_menu->add_icon_override("Align Top Left"); anchor_menu->set_icon(get_icon("Anchor","EditorIcons")); PopupMenu *p=anchor_menu->get_popup(); @@ -3147,7 +3147,7 @@ void CanvasItemEditor::end_drag() { if (undo_redo) { - undo_redo->create_action(TTR("Edit CanvasItem")); + undo_redo->create_action("Edit CanvasItem"); for(CanvasItemMap::Element *E=canvas_items.front();E;E=E->next()) { CanvasItem *canvas_item = E->key(); Variant state=canvas_item->edit_get_state(); diff --git a/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp b/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp index 8abb51159..14a61d46b 100644 --- a/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp +++ b/tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp @@ -390,7 +390,7 @@ CollisionPolygon2DEditor::CollisionPolygon2DEditor(EditorNode *p_editor) { add_child(button_create); button_create->connect("pressed",this,"_menu_option",varray(MODE_CREATE)); button_create->set_toggle_mode(true); - button_create->set_tooltip(TTR("Create a new polygon from scratch")); + button_create->set_tooltip(TTR("Create a new polygon from scratch.")); button_edit = memnew( ToolButton ); add_child(button_edit); @@ -404,8 +404,8 @@ CollisionPolygon2DEditor::CollisionPolygon2DEditor(EditorNode *p_editor) { options = memnew( MenuButton ); add_child(options); options->set_area_as_parent_rect(); - options->set_text(TTR("Polygon")); - //options->get_popup()->add_item(TTR("Parse BBCODE"),PARSE_BBCODE); + options->set_text("Polygon"); + //options->get_popup()->add_item("Parse BBCode",PARSE_BBCODE); options->get_popup()->connect("item_pressed", this,"_menu_option"); #endif diff --git a/tools/editor/plugins/collision_polygon_editor_plugin.cpp b/tools/editor/plugins/collision_polygon_editor_plugin.cpp index 5cd09f1a9..b18afe783 100644 --- a/tools/editor/plugins/collision_polygon_editor_plugin.cpp +++ b/tools/editor/plugins/collision_polygon_editor_plugin.cpp @@ -559,8 +559,8 @@ CollisionPolygonEditor::CollisionPolygonEditor(EditorNode *p_editor) { options = memnew( MenuButton ); add_child(options); options->set_area_as_parent_rect(); - options->set_text(TTR("Polygon")); - //options->get_popup()->add_item(TTR("Parse BBCODE"),PARSE_BBCODE); + options->set_text("Polygon"); + //options->get_popup()->add_item("Parse BBCode",PARSE_BBCODE); options->get_popup()->connect("item_pressed", this,"_menu_option"); #endif diff --git a/tools/editor/plugins/control_editor_plugin.cpp b/tools/editor/plugins/control_editor_plugin.cpp index 0958343f2..9dff5e6ce 100644 --- a/tools/editor/plugins/control_editor_plugin.cpp +++ b/tools/editor/plugins/control_editor_plugin.cpp @@ -112,7 +112,7 @@ void ControlEditor::_key_move(const Vector2& p_dir, bool p_snap) { if (p_snap) motion*=snap_val->get_text().to_double(); - undo_redo->create_action(TTR("Edit Control")); + undo_redo->create_action("Edit Control"); for(ControlMap::Element *E=controls.front();E;E=E->next()) { Control *control = E->key(); undo_redo->add_do_method(control,"set_pos",control->get_pos()+motion); @@ -156,7 +156,7 @@ void ControlEditor::_input_event(InputEvent p_event) { if (undo_redo) { - undo_redo->create_action(TTR("Edit Control")); + undo_redo->create_action("Edit Control"); for(ControlMap::Element *E=controls.front();E;E=E->next()) { Control *control = E->key(); undo_redo->add_do_method(control,"set_pos",control->get_pos()); @@ -752,17 +752,17 @@ ControlEditor::ControlEditor(EditorNode *p_editor) { handle_len=10; popup=memnew( PopupMenu ); - popup->add_check_item(TTR("Use Snap")); - popup->add_item(TTR("Configure Snap..")); + popup->add_check_item("Use Snap"); + popup->add_item("Configure Snap.."); add_child(popup); snap_dialog = memnew( ConfirmationDialog ); snap_dialog->get_ok()->hide(); - snap_dialog->get_cancel()->set_text(TTR("Close")); + snap_dialog->get_cancel()->set_text("Close"); add_child(snap_dialog); Label *l = memnew(Label); - l->set_text(TTR("Snap:")); + l->set_text("Snap:"); l->set_pos(Point2(5,5)); snap_dialog->add_child(l); diff --git a/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp b/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp index fe031d165..bf3b2fa68 100644 --- a/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp +++ b/tools/editor/plugins/light_occluder_2d_editor_plugin.cpp @@ -421,13 +421,13 @@ LightOccluder2DEditor::LightOccluder2DEditor(EditorNode *p_editor) { add_child(button_create); button_create->connect("pressed",this,"_menu_option",varray(MODE_CREATE)); button_create->set_toggle_mode(true); - button_create->set_tooltip(TTR("Create a new polygon from scratch")); + button_create->set_tooltip(TTR("Create a new polygon from scratch.")); button_edit = memnew( ToolButton ); add_child(button_edit); button_edit->connect("pressed",this,"_menu_option",varray(MODE_EDIT)); button_edit->set_toggle_mode(true); - button_edit->set_tooltip("Edit existing polygon:\nLMB: Move Point.\nCtrl+LMB: Split Segment.\nRMB: Erase Point."); + button_edit->set_tooltip(TTR("Edit existing polygon:")+"\n"+TTR("LMB: Move Point.")+"\n"+TTR("Ctrl+LMB: Split Segment.")+"\n"+TTR("RMB: Erase Point.")); create_poly = memnew( ConfirmationDialog ); add_child(create_poly); @@ -440,8 +440,8 @@ LightOccluder2DEditor::LightOccluder2DEditor(EditorNode *p_editor) { options = memnew( MenuButton ); add_child(options); options->set_area_as_parent_rect(); - options->set_text(TTR("Polygon")); - //options->get_popup()->add_item(TTR("Parse BBCODE"),PARSE_BBCODE); + options->set_text("Polygon"); + //options->get_popup()->add_item("Parse BBCode",PARSE_BBCODE); options->get_popup()->connect("item_pressed", this,"_menu_option"); #endif diff --git a/tools/editor/plugins/multimesh_editor_plugin.cpp b/tools/editor/plugins/multimesh_editor_plugin.cpp index f7462db20..8a0c6b3fe 100644 --- a/tools/editor/plugins/multimesh_editor_plugin.cpp +++ b/tools/editor/plugins/multimesh_editor_plugin.cpp @@ -153,10 +153,10 @@ void MultiMeshEditor::_populate() { node->populate_parent(populate_rotate_random->get_val(),populate_tilt_random->get_val(),populate_scale_random->get_val(),populate_scale->get_val()); - ERR_EXPLAIN(TTR("Parent is not of type VisualInstance.")); + ERR_EXPLAIN("Parent is not of type VisualInstance."); ERR_FAIL_COND(!get_parent() || !get_parent()->is_type("VisualInstance")); - ERR_EXPLAIN(TTR("Multimesh not present.")); + ERR_EXPLAIN("Multimesh not present."); ERR_FAIL_COND(multimesh.is_null()); VisualInstance *vi = get_parent()->cast_to(); diff --git a/tools/editor/plugins/navigation_polygon_editor_plugin.cpp b/tools/editor/plugins/navigation_polygon_editor_plugin.cpp index 038c1d48a..1ee388ca1 100644 --- a/tools/editor/plugins/navigation_polygon_editor_plugin.cpp +++ b/tools/editor/plugins/navigation_polygon_editor_plugin.cpp @@ -469,13 +469,13 @@ NavigationPolygonEditor::NavigationPolygonEditor(EditorNode *p_editor) { add_child(button_create); button_create->connect("pressed",this,"_menu_option",varray(MODE_CREATE)); button_create->set_toggle_mode(true); - button_create->set_tooltip(TTR("Create a new polygon from scratch")); + button_create->set_tooltip(TTR("Create a new polygon from scratch.")); button_edit = memnew( ToolButton ); add_child(button_edit); button_edit->connect("pressed",this,"_menu_option",varray(MODE_EDIT)); button_edit->set_toggle_mode(true); - button_edit->set_tooltip("Edit existing polygon:\nLMB: Move Point.\nCtrl+LMB: Split Segment.\nRMB: Erase Point."); + button_edit->set_tooltip(TTR("Edit existing polygon:")+"\n"+TTR("LMB: Move Point.")+"\n"+TTR("Ctrl+LMB: Split Segment.")+"\n"+TTR("RMB: Erase Point.")); create_nav = memnew( ConfirmationDialog ); add_child(create_nav); create_nav->get_ok()->set_text(TTR("Create")); @@ -487,8 +487,8 @@ NavigationPolygonEditor::NavigationPolygonEditor(EditorNode *p_editor) { options = memnew( MenuButton ); add_child(options); options->set_area_as_parent_rect(); - options->set_text(TTR("Polygon")); - //options->get_popup()->add_item(TTR("Parse BBCODE"),PARSE_BBCODE); + options->set_text("Polygon"); + //options->get_popup()->add_item("Parse BBCode",PARSE_BBCODE); options->get_popup()->connect("item_pressed", this,"_menu_option"); #endif diff --git a/tools/editor/plugins/path_2d_editor_plugin.cpp b/tools/editor/plugins/path_2d_editor_plugin.cpp index 0fab18390..107ec30a9 100644 --- a/tools/editor/plugins/path_2d_editor_plugin.cpp +++ b/tools/editor/plugins/path_2d_editor_plugin.cpp @@ -623,7 +623,7 @@ Path2DEditor::Path2DEditor(EditorNode *p_editor) { add_child(options); options->set_area_as_parent_rect(); options->set_text("Polygon"); - //options->get_popup()->add_item(TTR("Parse BBCODE"),PARSE_BBCODE); + //options->get_popup()->add_item("Parse BBCode",PARSE_BBCODE); options->get_popup()->connect("item_pressed", this,"_menu_option"); #endif diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.cpp b/tools/editor/plugins/polygon_2d_editor_plugin.cpp index f07c43b8e..f873b43fd 100644 --- a/tools/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/tools/editor/plugins/polygon_2d_editor_plugin.cpp @@ -840,8 +840,8 @@ Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor) { options = memnew( MenuButton ); add_child(options); options->set_area_as_parent_rect(); - options->set_text(TTR("Polygon")); - //options->get_popup()->add_item(TTR("Parse BBCODE"),PARSE_BBCODE); + options->set_text("Polygon"); + //options->get_popup()->add_item("Parse BBCode",PARSE_BBCODE); options->get_popup()->connect("item_pressed", this,"_menu_option"); #endif @@ -868,7 +868,7 @@ Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor) { uv_button[i]->set_focus_mode(FOCUS_NONE); } - uv_button[0]->set_tooltip("Move Point\nCtrl: Rotate\nShift: Move All\n:Shift+Ctrl: Scale"); + uv_button[0]->set_tooltip(TTR("Move Point")+"\n"+TTR("Ctrl: Rotate")+"\n"+TTR("Shift: Move All")+"\n"+TTR("Shift+Ctrl: Scale")); uv_button[1]->set_tooltip(TTR("Move Polygon")); uv_button[2]->set_tooltip(TTR("Rotate Polygon")); uv_button[3]->set_tooltip(TTR("Scale Polygon")); diff --git a/tools/editor/plugins/resource_preloader_editor_plugin.cpp b/tools/editor/plugins/resource_preloader_editor_plugin.cpp index dfe667dd0..cce0ba3d6 100644 --- a/tools/editor/plugins/resource_preloader_editor_plugin.cpp +++ b/tools/editor/plugins/resource_preloader_editor_plugin.cpp @@ -72,7 +72,7 @@ void ResourcePreloaderEditor::_files_load_request(const Vector& p_paths) if (resource.is_null()) { dialog->set_text(TTR("ERROR: Couldn't load resource!")); dialog->set_title(TTR("Error!")); - //dialog->get_cancel()->set_text(TTR("Close")); + //dialog->get_cancel()->set_text("Close"); dialog->get_ok()->set_text(TTR("Close")); dialog->popup_centered_minsize(); return; ///beh should show an error i guess @@ -169,7 +169,7 @@ void ResourcePreloaderEditor::_paste_pressed() { if (!r.is_valid()) { dialog->set_text(TTR("Resource clipboard is empty!")); dialog->set_title(TTR("Error!")); - //dialog->get_cancel()->set_text(TTR("Close")); + //dialog->get_cancel()->set_text("Close"); dialog->get_ok()->set_text(TTR("Close")); dialog->popup_centered_minsize(); return; ///beh should show an error i guess diff --git a/tools/editor/plugins/sample_library_editor_plugin.cpp b/tools/editor/plugins/sample_library_editor_plugin.cpp index 93db7fdc6..c333d1d85 100644 --- a/tools/editor/plugins/sample_library_editor_plugin.cpp +++ b/tools/editor/plugins/sample_library_editor_plugin.cpp @@ -76,7 +76,7 @@ void SampleLibraryEditor::_file_load_request(const DVector& p_path) { if (sample.is_null()) { dialog->set_text(TTR("ERROR: Couldn't load sample!")); dialog->set_title(TTR("Error!")); - //dialog->get_cancel()->set_text(TTR("Close")); + //dialog->get_cancel()->set_text("Close"); dialog->get_ok()->set_text(TTR("Close")); dialog->popup_centered_minsize(); return; ///beh should show an error i guess @@ -248,7 +248,7 @@ void SampleLibraryEditor::_update_library() { ti->set_cell_mode(2,TreeItem::CELL_MODE_STRING); ti->set_editable(2,false); ti->set_selectable(2,false); - ti->set_text(2,String()+(smp->get_format()==Sample::FORMAT_PCM16?"16 Bits, ":(smp->get_format()==Sample::FORMAT_PCM8?"8 bits, ":"IMA-ADPCM,"))+(smp->is_stereo()?TTR("Stereo"):TTR("Mono"))); + ti->set_text(2,String()+(smp->get_format()==Sample::FORMAT_PCM16?TTR("16 Bits")+", ":(smp->get_format()==Sample::FORMAT_PCM8?TTR("8 Bits")+", ":"IMA-ADPCM,"))+(smp->is_stereo()?TTR("Stereo"):TTR("Mono"))); // Volume dB ti->set_cell_mode(3,TreeItem::CELL_MODE_RANGE); @@ -457,7 +457,7 @@ SampleLibraryEditor::SampleLibraryEditor() { tree->set_column_title(1,TTR("Preview")); tree->set_column_title(2,TTR("Format")); tree->set_column_title(3,"dB"); - tree->set_column_title(4,"Pitch"); + tree->set_column_title(4,TTR("Pitch")); tree->set_column_title(5,""); tree->set_column_min_width(1,150); diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp index 581017a4a..bff4301da 100644 --- a/tools/editor/plugins/script_editor_plugin.cpp +++ b/tools/editor/plugins/script_editor_plugin.cpp @@ -2441,7 +2441,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { #else edit_menu->get_popup()->add_item(TTR("Complete Symbol"),EDIT_COMPLETE,KEY_MASK_CMD|KEY_SPACE); #endif - edit_menu->get_popup()->add_item("Trim Trailing Whitespace", EDIT_TRIM_TRAILING_WHITESAPCE, KEY_MASK_CTRL|KEY_MASK_ALT|KEY_T); + edit_menu->get_popup()->add_item(TTR("Trim Trailing Whitespace"), EDIT_TRIM_TRAILING_WHITESAPCE, KEY_MASK_CTRL|KEY_MASK_ALT|KEY_T); edit_menu->get_popup()->add_item(TTR("Auto Indent"),EDIT_AUTO_INDENT,KEY_MASK_CMD|KEY_I); edit_menu->get_popup()->connect("item_pressed", this,"_menu_option"); @@ -2477,7 +2477,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { debug_menu->get_popup()->add_item(TTR("Break"),DEBUG_BREAK); debug_menu->get_popup()->add_item(TTR("Continue"),DEBUG_CONTINUE); debug_menu->get_popup()->add_separator(); - //debug_menu->get_popup()->add_check_item(TTR("Show Debugger"),DEBUG_SHOW); + //debug_menu->get_popup()->add_check_item("Show Debugger",DEBUG_SHOW); debug_menu->get_popup()->add_check_item(TTR("Keep Debugger Open"),DEBUG_SHOW_KEEP_OPEN); debug_menu->get_popup()->connect("item_pressed", this,"_menu_option"); @@ -2581,7 +2581,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { disk_changed->set_child_rect(vbc); Label *dl = memnew( Label ); - dl->set_text("The following files are newer on disk.\nWhat action should be taken?:"); + dl->set_text(TTR("The following files are newer on disk.\nWhat action should be taken?:")); vbc->add_child(dl); disk_changed_list = memnew( Tree ); diff --git a/tools/editor/plugins/shader_editor_plugin.cpp b/tools/editor/plugins/shader_editor_plugin.cpp index 8a65a3641..c1069c77f 100644 --- a/tools/editor/plugins/shader_editor_plugin.cpp +++ b/tools/editor/plugins/shader_editor_plugin.cpp @@ -507,7 +507,7 @@ ShaderEditor::ShaderEditor() { search_menu->get_popup()->add_item(TTR("Find Next"),SEARCH_FIND_NEXT,KEY_F3); search_menu->get_popup()->add_item(TTR("Replace.."),SEARCH_REPLACE,KEY_MASK_CMD|KEY_R); search_menu->get_popup()->add_separator(); -// search_menu->get_popup()->add_item(TTR("Locate Symbol.."),SEARCH_LOCATE_SYMBOL,KEY_MASK_CMD|KEY_K); +// search_menu->get_popup()->add_item("Locate Symbol..",SEARCH_LOCATE_SYMBOL,KEY_MASK_CMD|KEY_K); search_menu->get_popup()->add_item(TTR("Goto Line.."),SEARCH_GOTO_LINE,KEY_MASK_CMD|KEY_G); search_menu->get_popup()->connect("item_pressed", this,"_menu_option"); diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 7baabd989..30296100d 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -2482,7 +2482,7 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed view_menu->get_popup()->add_check_item(TTR("Orthogonal (Num5)"),VIEW_ORTHOGONAL); view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_PERSPECTIVE),true); view_menu->get_popup()->add_separator(); - view_menu->get_popup()->add_check_item("Environment",VIEW_ENVIRONMENT); + view_menu->get_popup()->add_check_item(TTR("Environment"),VIEW_ENVIRONMENT); view_menu->get_popup()->set_item_checked( view_menu->get_popup()->get_item_index(VIEW_ENVIRONMENT),true); view_menu->get_popup()->add_separator(); view_menu->get_popup()->add_check_item(TTR("Audio Listener"),VIEW_AUDIO_LISTENER); diff --git a/tools/editor/plugins/sprite_frames_editor_plugin.cpp b/tools/editor/plugins/sprite_frames_editor_plugin.cpp index abd316ff3..4532e91e1 100644 --- a/tools/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/tools/editor/plugins/sprite_frames_editor_plugin.cpp @@ -78,7 +78,7 @@ void SpriteFramesEditor::_file_load_request(const DVector& p_path,int p_ if (resource.is_null()) { dialog->set_text(TTR("ERROR: Couldn't load frame resource!")); dialog->set_title(TTR("Error!")); - //dialog->get_cancel()->set_text(TTR("Close")); + //dialog->get_cancel()->set_text("Close"); dialog->get_ok()->set_text(TTR("Close")); dialog->popup_centered_minsize(); return; ///beh should show an error i guess @@ -152,7 +152,7 @@ void SpriteFramesEditor::_item_edited() { } RES samp = frames->get_resource(old_name); - undo_redo->create_action(TTR("Rename Resource")); + undo_redo->create_action("Rename Resource"); undo_redo->add_do_method(frames,"remove_resource",old_name); undo_redo->add_do_method(frames,"add_resource",new_name,samp); undo_redo->add_undo_method(frames,"remove_resource",new_name); @@ -198,7 +198,7 @@ void SpriteFramesEditor::_paste_pressed() { if (!r.is_valid()) { dialog->set_text(TTR("Resource clipboard is empty or not a texture!")); dialog->set_title(TTR("Error!")); - //dialog->get_cancel()->set_text(TTR("Close")); + //dialog->get_cancel()->set_text("Close"); dialog->get_ok()->set_text(TTR("Close")); dialog->popup_centered_minsize(); return; ///beh should show an error i guess diff --git a/tools/editor/plugins/theme_editor_plugin.cpp b/tools/editor/plugins/theme_editor_plugin.cpp index 7d839bea2..5321a7b6d 100644 --- a/tools/editor/plugins/theme_editor_plugin.cpp +++ b/tools/editor/plugins/theme_editor_plugin.cpp @@ -599,7 +599,7 @@ ThemeEditor::ThemeEditor() { theme_menu->get_popup()->add_item(TTR("Add Item"),POPUP_ADD); theme_menu->get_popup()->add_item(TTR("Add Class Items"),POPUP_CLASS_ADD); theme_menu->get_popup()->add_item(TTR("Remove Item"),POPUP_REMOVE); - theme_menu->get_popup()->add_item("Remove Class Items",POPUP_CLASS_REMOVE); + theme_menu->get_popup()->add_item(TTR("Remove Class Items"),POPUP_CLASS_REMOVE); theme_menu->get_popup()->add_separator(); theme_menu->get_popup()->add_item(TTR("Create Template"),POPUP_CREATE_TEMPLATE); hb_menu->add_child(theme_menu); @@ -757,7 +757,7 @@ ThemeEditor::ThemeEditor() { line_edit = memnew( LineEdit ); line_edit->set_pos( Point2( 25, 275 ) ); line_edit->set_size( Point2( 150, 5 ) ); - line_edit->set_text(TTR("Line Edit")); + line_edit->set_text("Line Edit"); panel->add_child(line_edit); test_v_scroll = memnew( VScrollBar ); @@ -786,12 +786,12 @@ ThemeEditor::ThemeEditor() { item = test_tree->create_item( test_tree->get_root() ); item->set_cell_mode(0, TreeItem::CELL_MODE_RANGE); item->set_editable(0,true); - item->set_text(0,TTR("Have,Many,Several,Options!")); + item->set_text(0,"Have,Many,Several,Options!")); item->set_range(0,2); Button *fd_button= memnew( Button ); fd_button->set_pos(Point2(300,275)); - fd_button->set_text(TTR("Open File Dialog")); + fd_button->set_text("Open File Dialog"); panel->add_child(fd_button); test_file_dialog = memnew( EditorFileDialog ); @@ -852,8 +852,8 @@ ThemeEditor::ThemeEditor() { type_select = memnew( OptionButton ); type_select->add_item(TTR("Icon")); type_select->add_item(TTR("Style")); - type_select->add_item("Font"); - type_select->add_item("Color"); + type_select->add_item(TTR("Font")); + type_select->add_item(TTR("Color")); type_select->add_item(TTR("Constant")); type_select->set_pos( Point2( 400,25 ) ); type_select->set_size( Point2( 80,5 ) ); diff --git a/tools/editor/plugins/tile_map_editor_plugin.cpp b/tools/editor/plugins/tile_map_editor_plugin.cpp index 843fc35d8..b1ddac707 100644 --- a/tools/editor/plugins/tile_map_editor_plugin.cpp +++ b/tools/editor/plugins/tile_map_editor_plugin.cpp @@ -1318,13 +1318,13 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) { PopupMenu *p = options->get_popup(); - p->add_item("Bucket", OPTION_BUCKET); + p->add_item(TTR("Bucket"), OPTION_BUCKET); p->add_separator(); - p->add_item("Pick Tile", OPTION_PICK_TILE, KEY_CONTROL); + p->add_item(TTR("Pick Tile"), OPTION_PICK_TILE, KEY_CONTROL); p->add_separator(); - p->add_item("Select", OPTION_SELECT, KEY_MASK_CMD+KEY_B); + p->add_item(TTR("Select"), OPTION_SELECT, KEY_MASK_CMD+KEY_B); p->add_item(TTR("Duplicate Selection"), OPTION_DUPLICATE, KEY_MASK_CMD+KEY_D); - p->add_item("Erase Selection", OPTION_ERASE_SELECTION, KEY_DELETE); + p->add_item(TTR("Erase Selection"), OPTION_ERASE_SELECTION, KEY_DELETE); p->connect("item_pressed", this, "_menu_option"); diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp index 5bf70b4d7..ee9eee159 100644 --- a/tools/editor/project_export.cpp +++ b/tools/editor/project_export.cpp @@ -1218,7 +1218,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) { filters_exclude->connect("text_changed",this,"_filters_exclude_edited"); convert_text_scenes = memnew( CheckButton ); - convert_text_scenes->set_text(TTR("Convert text scenes to binary on export")); + convert_text_scenes->set_text(TTR("Convert text scenes to binary on export.")); vb->add_child(convert_text_scenes); convert_text_scenes->connect("toggled",this,"_export_mode_changed"); diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp index 395760fb5..c06a8cd08 100644 --- a/tools/editor/project_manager.cpp +++ b/tools/editor/project_manager.cpp @@ -822,8 +822,8 @@ void ProjectManager::_bind_methods() { ProjectManager::ProjectManager() { - int margin = get_constant("margin",TTR("Dialogs")); - int button_margin = get_constant("button_margin",TTR("Dialogs")); + int margin = get_constant("margin","Dialogs"); + int button_margin = get_constant("button_margin","Dialogs"); // load settings if (!EditorSettings::get_singleton()) @@ -999,8 +999,8 @@ ProjectManager::ProjectManager() { _scan_begin( EditorSettings::get_singleton()->get("global/autoscan_project_path") ); } - //get_ok()->set_text(TTR("Open")); - //get_ok()->set_text(TTR("Exit")); + //get_ok()->set_text("Open"); + //get_ok()->set_text("Exit"); last_clicked = ""; } diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp index e484b94c5..605b12c87 100644 --- a/tools/editor/project_settings.cpp +++ b/tools/editor/project_settings.cpp @@ -1556,7 +1556,7 @@ ProjectSettings::ProjectSettings(EditorData *p_data) { save->set_anchor(MARGIN_BOTTOM,ANCHOR_END); save->set_begin( Point2(80,28) ); save->set_end( Point2(10,20) ); - save->set_text(TTR("Save")); + save->set_text("Save"); save->connect("pressed",this,"_save"); */ @@ -1684,7 +1684,7 @@ ProjectSettings::ProjectSettings(EditorData *p_data) { save->set_anchor(MARGIN_BOTTOM,ANCHOR_END); save->set_begin( Point2(80,28) ); save->set_end( Point2(10,20) ); - save->set_text(TTR("Save")); + save->set_text("Save"); save->connect("pressed",this,"_save"); */ setting=false; @@ -1861,7 +1861,7 @@ ProjectSettings::ProjectSettings(EditorData *p_data) { /* Control * es = memnew( Control ); - es->set_name(TTR("Export")); + es->set_name("Export"); tab_container->add_child(es); export_settings = memnew( ProjectExportSettings ); es->add_child(export_settings); diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index b6e090472..587f6f19f 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -419,8 +419,8 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty //action_buttons[0]; - int button_margin = get_constant("button_margin",TTR("Dialogs")); - int margin = get_constant("margin",TTR("Dialogs")); + int button_margin = get_constant("button_margin","Dialogs"); + int margin = get_constant("margin","Dialogs"); action_buttons[0]->set_anchor( MARGIN_LEFT, ANCHOR_END ); action_buttons[0]->set_anchor( MARGIN_TOP, ANCHOR_END ); diff --git a/tools/editor/pvrtc_compress.cpp b/tools/editor/pvrtc_compress.cpp index 8626c632e..75b5c69bc 100644 --- a/tools/editor/pvrtc_compress.cpp +++ b/tools/editor/pvrtc_compress.cpp @@ -82,7 +82,7 @@ static void _compress_image(Image::CompressMode p_mode,Image *p_image) { } - if (EditorSettings::get_singleton()->get(TTR("PVRTC/fast_conversion")).operator bool()) { + if (EditorSettings::get_singleton()->get("PVRTC/fast_conversion").operator bool()) { args.push_back("-pvrtcfast"); } if (p_image->get_mipmaps()>0) diff --git a/tools/editor/reparent_dialog.cpp b/tools/editor/reparent_dialog.cpp index 7803208c8..38b037223 100644 --- a/tools/editor/reparent_dialog.cpp +++ b/tools/editor/reparent_dialog.cpp @@ -99,7 +99,7 @@ ReparentDialog::ReparentDialog() { //Label *label = memnew( Label ); //label->set_pos( Point2( 15,8) ); - //label->set_text(TTR("Reparent Location (Select new Parent):")); + //label->set_text("Reparent Location (Select new Parent):"); keep_transform = memnew( CheckBox ); keep_transform->set_text(TTR("Keep Global Transform")); @@ -107,7 +107,7 @@ ReparentDialog::ReparentDialog() { vbc->add_child(keep_transform); - //vbc->add_margin_child(TTR("Options:"),node_only);; + //vbc->add_margin_child("Options:",node_only);; //cancel->connect("pressed", this,"_cancel"); diff --git a/tools/editor/run_settings_dialog.cpp b/tools/editor/run_settings_dialog.cpp index fd2e9f975..abcfe125f 100644 --- a/tools/editor/run_settings_dialog.cpp +++ b/tools/editor/run_settings_dialog.cpp @@ -88,7 +88,7 @@ RunSettingsDialog::RunSettingsDialog() { arguments->set_editable(false); get_ok()->set_text(TTR("Close")); - //get_cancel()->set_text(TTR("Close")); + //get_cancel()->set_text("Close"); arguments->set_text("-l $scene"); diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index 88307bcac..0da233dec 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -225,7 +225,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { /* should be legal now current_option=-1; //confirmation->get_cancel()->hide(); - accept->get_ok()->set_text(TTR("I see..")); + accept->get_ok()->set_text("I see.."); accept->set_text("This operation can't be done without a tree root."); accept->popup_centered_minsize(); */ @@ -308,7 +308,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { current_option=-1; //accept->get_cancel()->hide(); accept->get_ok()->set_text(TTR("I see..")); - accept->set_text("This operation can't be done on the tree root."); + accept->set_text(TTR("This operation can't be done on the tree root.")); accept->popup_centered_minsize(); break; } @@ -376,7 +376,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { current_option=-1; //accept->get_cancel()->hide(); accept->get_ok()->set_text(TTR("I see..")); - accept->set_text("This operation can't be done on the tree root."); + accept->set_text(TTR("This operation can't be done on the tree root.")); accept->popup_centered_minsize(); break; } @@ -488,7 +488,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { current_option=-1; //confirmation->get_cancel()->hide(); accept->get_ok()->set_text(TTR("I see..")); - accept->set_text("This operation can't be done on the tree root."); + accept->set_text(TTR("This operation can't be done on the tree root.")); accept->popup_centered_minsize(); break; } @@ -548,7 +548,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { if (!scene) { accept->get_ok()->set_text(TTR("I see..")); - accept->set_text("This operation can't be done without a scene."); + accept->set_text(TTR("This operation can't be done without a scene.")); accept->popup_centered_minsize(); break; } @@ -566,7 +566,7 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { if (tocopy!=editor_data->get_edited_scene_root() && tocopy->get_filename()!="") { accept->get_ok()->set_text(TTR("I see..")); - accept->set_text("This operation can't be done on instanced scenes."); + accept->set_text(TTR("This operation can't be done on instanced scenes.")); accept->popup_centered_minsize(); break; } @@ -1411,7 +1411,7 @@ void SceneTreeDock::_import_subscene() { /* - editor_data->get_undo_redo().create_action(TTR("Import Subscene")); + editor_data->get_undo_redo().create_action("Import Subscene"); editor_data->get_undo_redo().add_do_method(parent,"add_child",ss); //editor_data->get_undo_redo().add_do_method(editor_selection,"clear"); //editor_data->get_undo_redo().add_do_method(editor_selection,"add_node",child); @@ -1768,7 +1768,7 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor,Node *p_scene_root,EditorSelec tb = memnew( ToolButton ); tb->connect("pressed",this,"_tool_selected",make_binds(TOOL_NEW, false)); - tb->set_tooltip("Add/Create a New Node\n("+keycode_get_string(KEY_MASK_CMD|KEY_A)+")"); + tb->set_tooltip(TTR("Add/Create a New Node")+"\n("+keycode_get_string(KEY_MASK_CMD|KEY_A)+")"); filter_hbc->add_child(tb); button_add=tb; diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp index 0dedbe245..ca615da78 100644 --- a/tools/editor/script_editor_debugger.cpp +++ b/tools/editor/script_editor_debugger.cpp @@ -1314,7 +1314,7 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){ errvb = memnew( VBoxContainer ); errvb->set_h_size_flags(SIZE_EXPAND_FILL); error_stack = memnew( ItemList ); - errvb->add_margin_child(TTR("Stack Trace (if applies):"),error_stack,true); + errvb->add_margin_child(TTR("Stack Trace (if applicable):"),error_stack,true); error_split->add_child(errvb); error_split->set_name(TTR("Errors")); diff --git a/tools/editor/spatial_editor_gizmos.cpp b/tools/editor/spatial_editor_gizmos.cpp index b7fc72211..c32e3a211 100644 --- a/tools/editor/spatial_editor_gizmos.cpp +++ b/tools/editor/spatial_editor_gizmos.cpp @@ -731,9 +731,9 @@ Vector3 EditorSpatialGizmo::get_handle_pos(int p_idx) const { String LightSpatialGizmo::get_handle_name(int p_idx) const { if (p_idx==0) - return TTR("Radius"); + return "Radius"; else - return TTR("Aperture"); + return "Aperture"; } @@ -1030,9 +1030,9 @@ LightSpatialGizmo::LightSpatialGizmo(Light* p_light){ String CameraSpatialGizmo::get_handle_name(int p_idx) const { if (camera->get_projection()==Camera::PROJECTION_PERSPECTIVE) { - return TTR("FOV"); + return "FOV"; } else { - return TTR("Size"); + return "Size"; } } Variant CameraSpatialGizmo::get_handle_value(int p_idx) const{ @@ -1695,22 +1695,22 @@ String CollisionShapeSpatialGizmo::get_handle_name(int p_idx) const { if (s->cast_to()) { - return TTR("Radius"); + return "Radius"; } if (s->cast_to()) { - return TTR("Extents"); + return "Extents"; } if (s->cast_to()) { - return p_idx==0?TTR("Radius"):"Height"; + return p_idx==0?"Radius":"Height"; } if (s->cast_to()) { - return TTR("Length"); + return "Length"; } return ""; diff --git a/tools/translations/tools.pot b/tools/translations/tools.pot index df1207f58..56aebe503 100644 --- a/tools/translations/tools.pot +++ b/tools/translations/tools.pot @@ -252,7 +252,7 @@ msgid "Filters to exclude from export (comma-separated, e.g.: *.json, *.txt):" msgstr "" #: tools/editor/project_export.cpp:1221 -msgid "Convert text scenes to binary on export" +msgid "Convert text scenes to binary on export." msgstr "" #: tools/editor/project_export.cpp:1226 @@ -495,10 +495,6 @@ msgstr "" msgid "Method in target Node must be specified!" msgstr "" -#: tools/editor/connections_dialog.cpp:297 -msgid "Dialogs" -msgstr "" - #: tools/editor/connections_dialog.cpp:303 msgid "Connect To Node:" msgstr "" @@ -523,10 +519,6 @@ msgstr "" msgid "Method In Node:" msgstr "" -#: tools/editor/connections_dialog.cpp:419 -msgid "List.." -msgstr "" - #: tools/editor/connections_dialog.cpp:432 msgid "Make Function" msgstr "" @@ -555,10 +547,6 @@ msgstr "" msgid "Create Subscription" msgstr "" -#: tools/editor/connections_dialog.cpp:613 -msgid "Remove Subscription" -msgstr "" - #: tools/editor/connections_dialog.cpp:792 msgid "Connect.." msgstr "" @@ -727,26 +715,10 @@ msgstr "" msgid "Delete" msgstr "" -#: tools/editor/spatial_editor_gizmos.cpp:734 -msgid "Radius" -msgstr "" - -#: tools/editor/spatial_editor_gizmos.cpp:736 -msgid "Aperture" -msgstr "" - #: tools/editor/spatial_editor_gizmos.cpp:833 msgid "Change Light Radius" msgstr "" -#: tools/editor/spatial_editor_gizmos.cpp:1033 -msgid "FOV" -msgstr "" - -#: tools/editor/spatial_editor_gizmos.cpp:1035 -msgid "Size" -msgstr "" - #: tools/editor/spatial_editor_gizmos.cpp:1083 msgid "Change Camera FOV" msgstr "" @@ -755,14 +727,6 @@ msgstr "" msgid "Change Camera Size" msgstr "" -#: tools/editor/spatial_editor_gizmos.cpp:1703 -msgid "Extents" -msgstr "" - -#: tools/editor/spatial_editor_gizmos.cpp:1713 -msgid "Length" -msgstr "" - #: tools/editor/spatial_editor_gizmos.cpp:1841 msgid "Change Sphere Shape Radius" msgstr "" @@ -1260,7 +1224,7 @@ msgid "Errors:" msgstr "" #: tools/editor/script_editor_debugger.cpp:1317 -msgid "Stack Trace (if applies):" +msgid "Stack Trace (if applicable):" msgstr "" #: tools/editor/script_editor_debugger.cpp:1328 @@ -1327,7 +1291,7 @@ msgstr "" msgid "Imported Resources" msgstr "" -#: tools/editor/import_settings.cpp:291 +#: tools/editor/import_settings.cpp:292 msgid "Re-Import" msgstr "" @@ -1575,10 +1539,6 @@ msgstr "" msgid "Del" msgstr "" -#: tools/editor/project_settings.cpp:1559 -msgid "Save" -msgstr "" - #: tools/editor/project_settings.cpp:1567 msgid "Copy To Platform.." msgstr "" @@ -1716,7 +1676,7 @@ msgid "Open" msgstr "" #: tools/editor/editor_reimport_dialog.cpp:35 -msgid "Please wait for scan to complete" +msgid "Please wait for scan to complete." msgstr "" #: tools/editor/editor_reimport_dialog.cpp:72 @@ -1815,10 +1775,6 @@ msgstr "" msgid "Keep Global Transform" msgstr "" -#: tools/editor/reparent_dialog.cpp:110 -msgid "Options:" -msgstr "" - #: tools/editor/reparent_dialog.cpp:114 msgid "Reparent" msgstr "" @@ -1951,6 +1907,10 @@ msgstr "" msgid "All Files (*)" msgstr "" +#: tools/editor/editor_file_dialog.cpp:774 +msgid "Save" +msgstr "" + #: tools/editor/editor_file_dialog.cpp:1215 msgid "Save a File" msgstr "" @@ -2135,18 +2095,6 @@ msgstr "" msgid "Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." msgstr "" -#: tools/editor/editor_node.cpp:1074 -msgid "Ugh" -msgstr "" - -#: tools/editor/editor_node.cpp:1075 -msgid "Error importing scene." -msgstr "" - -#: tools/editor/editor_node.cpp:1091 -msgid "Error load scene to update." -msgstr "" - #: tools/editor/editor_node.cpp:1173 msgid "Failed to load resource." msgstr "" @@ -2219,10 +2167,6 @@ msgstr "" msgid "Make Sub-Resources Unique" msgstr "" -#: tools/editor/editor_node.cpp:1772 -msgid "All Methods" -msgstr "" - #: tools/editor/editor_node.cpp:1835 msgid "There is no defined scene to run." msgstr "" @@ -2235,10 +2179,6 @@ msgstr "" msgid "Could not start subprocess!" msgstr "" -#: tools/editor/editor_node.cpp:2004 -msgid "Yes" -msgstr "" - #: tools/editor/editor_node.cpp:2041 msgid "Open Scene" msgstr "" @@ -2255,8 +2195,8 @@ msgstr "" msgid "Quick Open Script.." msgstr "" -#: tools/editor/editor_node.cpp:2062 -msgid "Quick Search File.." +#: tools/editor/editor_node.cpp:2081 +msgid "Yes" msgstr "" #: tools/editor/editor_node.cpp:2083 @@ -2315,12 +2255,8 @@ msgstr "" msgid "Quick Run Scene.." msgstr "" -#: tools/editor/editor_node.cpp:2712 -msgid "Enable File Server" -msgstr "" - -#: tools/editor/editor_node.cpp:2716 -msgid "Disable File Server" +#: tools/editor/editor_node.cpp:3581 +msgid "Ugh" msgstr "" #: tools/editor/editor_node.cpp:3582 @@ -2395,6 +2331,10 @@ msgstr "" msgid "Open Recent" msgstr "" +#: tools/editor/editor_node.cpp:5466 +msgid "Quick Search File.." +msgstr "" + #: tools/editor/editor_node.cpp:5472 msgid "Convert To.." msgstr "" @@ -2431,34 +2371,6 @@ msgstr "" msgid "Quit to Project List" msgstr "" -#: tools/editor/editor_node.cpp:5525 -msgid "Move Up" -msgstr "" - -#: tools/editor/editor_node.cpp:5526 -msgid "Move Down" -msgstr "" - -#: tools/editor/editor_node.cpp:5528 -msgid "Duplicate" -msgstr "" - -#: tools/editor/editor_node.cpp:5530 -msgid "Remove (Branch)" -msgstr "" - -#: tools/editor/editor_node.cpp:5531 -msgid "Remove (Element)" -msgstr "" - -#: tools/editor/editor_node.cpp:5533 -msgid "Edit Subscriptions.." -msgstr "" - -#: tools/editor/editor_node.cpp:5534 -msgid "Edit Groups.." -msgstr "" - #: tools/editor/editor_node.cpp:5543 msgid "Import assets to the project." msgstr "" @@ -2479,10 +2391,6 @@ msgstr "" msgid "Play the project (F5)." msgstr "" -#: tools/editor/editor_node.cpp:5607 -msgid "Pause the scene (F7)." -msgstr "" - #: tools/editor/editor_node.cpp:5615 msgid "Stop the scene (F8)." msgstr "" @@ -2527,14 +2435,6 @@ msgstr "" msgid "Settings" msgstr "" -#: tools/editor/editor_node.cpp:5730 -msgid "Export Settings" -msgstr "" - -#: tools/editor/editor_node.cpp:5732 -msgid "Optimization Presets" -msgstr "" - #: tools/editor/editor_node.cpp:5738 msgid "Editor Layout" msgstr "" @@ -2655,14 +2555,6 @@ msgstr "" msgid "Return:" msgstr "" -#: tools/editor/call_dialog.cpp:326 -msgid "Parameters:" -msgstr "" - -#: tools/editor/pvrtc_compress.cpp:85 -msgid "PVRTC/fast_conversion" -msgstr "" - #: tools/editor/pvrtc_compress.cpp:96 msgid "Could not execute PVRTC tool:" msgstr "" @@ -2851,6 +2743,10 @@ msgstr "" msgid "Instance Scene(s)" msgstr "" +#: tools/editor/scene_tree_dock.cpp:311 +msgid "This operation can't be done on the tree root." +msgstr "" + #: tools/editor/scene_tree_dock.cpp:344 msgid "Move Node In Parent" msgstr "" @@ -2867,10 +2763,18 @@ msgstr "" msgid "Delete Node(s)?" msgstr "" +#: tools/editor/scene_tree_dock.cpp:551 +msgid "This operation can't be done without a scene." +msgstr "" + #: tools/editor/scene_tree_dock.cpp:560 msgid "This operation requires a single selected node." msgstr "" +#: tools/editor/scene_tree_dock.cpp:569 +msgid "This operation can't be done on instanced scenes." +msgstr "" + #: tools/editor/scene_tree_dock.cpp:591 msgid "Save New Scene As.." msgstr "" @@ -2895,10 +2799,6 @@ msgstr "" msgid "Create Node" msgstr "" -#: tools/editor/scene_tree_dock.cpp:1414 -msgid "Import Subscene" -msgstr "" - #: tools/editor/scene_tree_dock.cpp:1448 msgid "Couldn't save new scene. Likely dependencies (instances) couldn't be satisfied." msgstr "" @@ -2943,6 +2843,18 @@ msgstr "" msgid "Add Script" msgstr "" +#: tools/editor/scene_tree_dock.cpp:1691 +msgid "Move Up" +msgstr "" + +#: tools/editor/scene_tree_dock.cpp:1692 +msgid "Move Down" +msgstr "" + +#: tools/editor/scene_tree_dock.cpp:1693 +msgid "Duplicate" +msgstr "" + #: tools/editor/scene_tree_dock.cpp:1698 msgid "Save Branch as Scene" msgstr "" @@ -2951,6 +2863,10 @@ msgstr "" msgid "Delete Node(s)" msgstr "" +#: tools/editor/scene_tree_dock.cpp:1771 +msgid "Add/Create a New Node" +msgstr "" + #: tools/editor/scene_tree_dock.cpp:1777 msgid "Instance a scene file as a Node. Creates an inherited scene if no root node exists." msgstr "" @@ -2959,10 +2875,6 @@ msgstr "" msgid "Create New" msgstr "" -#: tools/editor/create_dialog.cpp:544 -msgid "Create %s Type" -msgstr "" - #: tools/editor/plugins/rich_text_editor_plugin.cpp:110 msgid "Parse BBCode" msgstr "" @@ -2995,6 +2907,14 @@ msgstr "" msgid "Delete Sample" msgstr "" +#: tools/editor/plugins/sample_library_editor_plugin.cpp:251 +msgid "16 Bits" +msgstr "" + +#: tools/editor/plugins/sample_library_editor_plugin.cpp:251 +msgid "8 Bits" +msgstr "" + #: tools/editor/plugins/sample_library_editor_plugin.cpp:251 msgid "Stereo" msgstr "" @@ -3007,6 +2927,10 @@ msgstr "" msgid "Preview" msgstr "" +#: tools/editor/plugins/sample_library_editor_plugin.cpp:460 +msgid "Pitch" +msgstr "" + #: tools/editor/plugins/collision_polygon_editor_plugin.cpp:95 msgid "Create Poly3D" msgstr "" @@ -3019,14 +2943,6 @@ msgstr "" msgid "Edit Poly (Remove Point)" msgstr "" -#: tools/editor/plugins/collision_polygon_editor_plugin.cpp:562 -msgid "Polygon" -msgstr "" - -#: tools/editor/plugins/collision_polygon_editor_plugin.cpp:563 -msgid "Parse BBCODE" -msgstr "" - #: tools/editor/plugins/animation_player_editor_plugin.cpp:147 msgid "Toggle Autoplay" msgstr "" @@ -3188,7 +3104,23 @@ msgid "Create Occluder Polygon" msgstr "" #: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp:424 -msgid "Create a new polygon from scratch" +msgid "Create a new polygon from scratch." +msgstr "" + +#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp:430 +msgid "Edit existing polygon:" +msgstr "" + +#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp:430 +msgid "LMB: Move Point." +msgstr "" + +#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp:430 +msgid "Ctrl+LMB: Split Segment." +msgstr "" + +#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp:430 +msgid "RMB: Erase Point." msgstr "" #: tools/editor/plugins/canvas_item_editor_plugin.cpp:65 @@ -3227,10 +3159,6 @@ msgstr "" msgid "Edit CanvasItem" msgstr "" -#: tools/editor/plugins/canvas_item_editor_plugin.cpp:2232 -msgid "Align Top Left" -msgstr "" - #: tools/editor/plugins/canvas_item_editor_plugin.cpp:2467 msgid "Change Anchors" msgstr "" @@ -3415,6 +3343,22 @@ msgstr "" msgid "Erase TileMap" msgstr "" +#: tools/editor/plugins/tile_map_editor_plugin.cpp:1321 +msgid "Bucket" +msgstr "" + +#: tools/editor/plugins/tile_map_editor_plugin.cpp:1323 +msgid "Pick Tile" +msgstr "" + +#: tools/editor/plugins/tile_map_editor_plugin.cpp:1325 +msgid "Select" +msgstr "" + +#: tools/editor/plugins/tile_map_editor_plugin.cpp:1327 +msgid "Erase Selection" +msgstr "" + #: tools/editor/plugins/tile_map_editor_plugin.cpp:1337 msgid "Transpose" msgstr "" @@ -3619,14 +3563,6 @@ msgstr "" msgid "Surface source is invalid (no faces)." msgstr "" -#: tools/editor/plugins/multimesh_editor_plugin.cpp:156 -msgid "Parent is not of type VisualInstance." -msgstr "" - -#: tools/editor/plugins/multimesh_editor_plugin.cpp:159 -msgid "Multimesh not present." -msgstr "" - #: tools/editor/plugins/multimesh_editor_plugin.cpp:168 msgid "Parent has no solid faces to populate." msgstr "" @@ -3703,10 +3639,6 @@ msgstr "" msgid "Replace.." msgstr "" -#: tools/editor/plugins/shader_editor_plugin.cpp:510 -msgid "Locate Symbol.." -msgstr "" - #: tools/editor/plugins/shader_editor_plugin.cpp:511 msgid "Goto Line.." msgstr "" @@ -3747,6 +3679,10 @@ msgstr "" msgid "Add Class Items" msgstr "" +#: tools/editor/plugins/theme_editor_plugin.cpp:602 +msgid "Remove Class Items" +msgstr "" + #: tools/editor/plugins/theme_editor_plugin.cpp:604 msgid "Create Template" msgstr "" @@ -3795,14 +3731,6 @@ msgstr "" msgid "Tab 3" msgstr "" -#: tools/editor/plugins/theme_editor_plugin.cpp:760 -msgid "Line Edit" -msgstr "" - -#: tools/editor/plugins/theme_editor_plugin.cpp:794 -msgid "Open File Dialog" -msgstr "" - #: tools/editor/plugins/theme_editor_plugin.cpp:849 msgid "Data Type:" msgstr "" @@ -3815,6 +3743,14 @@ msgstr "" msgid "Style" msgstr "" +#: tools/editor/plugins/theme_editor_plugin.cpp:855 +msgid "Font" +msgstr "" + +#: tools/editor/plugins/theme_editor_plugin.cpp:856 +msgid "Color" +msgstr "" + #: tools/editor/plugins/baked_light_editor_plugin.cpp:182 msgid "BakedLightInstance does not contain a BakedLight resource." msgstr "" @@ -4003,6 +3939,10 @@ msgstr "" msgid "Orthogonal (Num5)" msgstr "" +#: tools/editor/plugins/spatial_editor_plugin.cpp:2485 +msgid "Environment" +msgstr "" + #: tools/editor/plugins/spatial_editor_plugin.cpp:2488 msgid "Audio Listener" msgstr "" @@ -4179,6 +4119,10 @@ msgstr "" msgid "Complete Symbol" msgstr "" +#: tools/editor/plugins/script_editor_plugin.cpp:2444 +msgid "Trim Trailing Whitespace" +msgstr "" + #: tools/editor/plugins/script_editor_plugin.cpp:2445 msgid "Auto Indent" msgstr "" @@ -4195,10 +4139,6 @@ msgstr "" msgid "Toggle Breakpoint" msgstr "" -#: tools/editor/plugins/script_editor_plugin.cpp:2480 -msgid "Show Debugger" -msgstr "" - #: tools/editor/plugins/script_editor_plugin.cpp:2481 msgid "Keep Debugger Open" msgstr "" @@ -4259,6 +4199,10 @@ msgstr "" msgid "Create Script" msgstr "" +#: tools/editor/plugins/script_editor_plugin.cpp:2584 +msgid "The following files are newer on disk.\nWhat action should be taken?:" +msgstr "" + #: tools/editor/plugins/script_editor_plugin.cpp:2592 msgid "Reload" msgstr "" @@ -4279,14 +4223,6 @@ msgstr "" msgid "%i frames" msgstr "" -#: tools/editor/plugins/sample_editor_plugin.cpp:331 -msgid "16 Bits" -msgstr "" - -#: tools/editor/plugins/sample_editor_plugin.cpp:331 -msgid "8 Bits" -msgstr "" - #: tools/editor/plugins/shader_graph_editor_plugin.cpp:677 msgid "Change Scalar Constant" msgstr "" @@ -4427,6 +4363,22 @@ msgstr "" msgid "Polygon 2D UV Editor" msgstr "" +#: tools/editor/plugins/polygon_2d_editor_plugin.cpp:871 +msgid "Move Point" +msgstr "" + +#: tools/editor/plugins/polygon_2d_editor_plugin.cpp:871 +msgid "Ctrl: Rotate" +msgstr "" + +#: tools/editor/plugins/polygon_2d_editor_plugin.cpp:871 +msgid "Shift: Move All" +msgstr "" + +#: tools/editor/plugins/polygon_2d_editor_plugin.cpp:871 +msgid "Shift+Ctrl: Scale" +msgstr "" + #: tools/editor/plugins/polygon_2d_editor_plugin.cpp:872 msgid "Move Polygon" msgstr "" @@ -4595,14 +4547,6 @@ msgstr "" msgid "Generated Point Count:" msgstr "" -#: tools/editor/plugins/control_editor_plugin.cpp:115 -msgid "Edit Control" -msgstr "" - -#: tools/editor/plugins/control_editor_plugin.cpp:765 -msgid "Snap:" -msgstr "" - #: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp:168 msgid "Creating Mesh Library" msgstr "" @@ -5155,6 +5099,10 @@ msgstr "" msgid "Invalid/broken script for post-import." msgstr "" +#: tools/editor/io_plugins/editor_scene_import_plugin.cpp:776 +msgid "Error importing scene." +msgstr "" + #: tools/editor/io_plugins/editor_scene_import_plugin.cpp:1038 msgid "Import 3D Scene" msgstr "" @@ -5175,6 +5123,10 @@ msgstr "" msgid "Target Texture Folder:" msgstr "" +#: tools/editor/io_plugins/editor_scene_import_plugin.cpp:1081 +msgid "Options:" +msgstr "" + #: tools/editor/io_plugins/editor_scene_import_plugin.cpp:1132 msgid "Post-Process Script:" msgstr "" @@ -5183,6 +5135,10 @@ msgstr "" msgid "Overwrite Existing Scene" msgstr "" +#: tools/editor/io_plugins/editor_scene_import_plugin.cpp:1167 +msgid "Overwrite Existing, Keep Materials" +msgstr "" + #: tools/editor/io_plugins/editor_scene_import_plugin.cpp:1168 msgid "Keep Existing, Merge with New" msgstr "" @@ -5343,10 +5299,6 @@ msgstr "" msgid "Source Sample(s):" msgstr "" -#: tools/editor/io_plugins/editor_sample_import_plugin.cpp:409 -msgid "Audio Sample" -msgstr "" - #: tools/editor/io_plugins/editor_mesh_import_plugin.cpp:205 msgid "No meshes to import!" msgstr "" -- cgit v1.3.1 From 33403d91f77f1f34b19bff763391500bc9c2616c Mon Sep 17 00:00:00 2001 From: Hubert Jarosz Date: Sat, 21 May 2016 15:29:25 +0200 Subject: remove trailing whitespace --- bin/tests/test_python.cpp | 2 +- core/bind/core_bind.cpp | 32 +++++++++---------- core/io/http_client.cpp | 2 +- core/ustring.cpp | 2 +- platform/android/globals/global_defaults.h | 2 +- platform/iphone/globals/global_defaults.h | 2 +- platform/javascript/dom_keys.h | 30 +++++++++--------- platform/windows/os_windows.h | 2 +- scene/animation/animation_player.cpp | 2 +- scene/main/http_request.cpp | 2 +- scene/main/viewport.cpp | 2 +- scene/resources/curve.cpp | 2 +- scene/resources/stb_truetype.h | 44 +++++++++++++------------- scene/resources/theme.cpp | 2 +- servers/visual/visual_server_raster.h | 2 +- tools/editor/editor_node.cpp | 6 ++-- tools/editor/editor_node.h | 4 +-- tools/editor/editor_settings.cpp | 2 +- tools/editor/plugins/spatial_editor_plugin.cpp | 8 ++--- tools/editor/plugins/theme_editor_plugin.cpp | 2 +- tools/editor/plugins/tile_map_editor_plugin.h | 2 +- tools/editor/project_export.cpp | 2 +- tools/editor/register_exporters.h | 2 +- tools/editor/scene_tree_dock.cpp | 2 +- 24 files changed, 80 insertions(+), 80 deletions(-) (limited to 'tools/editor/plugins/theme_editor_plugin.cpp') diff --git a/bin/tests/test_python.cpp b/bin/tests/test_python.cpp index 26fb4bdaf..f4a3d7a3a 100644 --- a/bin/tests/test_python.cpp +++ b/bin/tests/test_python.cpp @@ -53,4 +53,4 @@ void test() { } -#endif \ No newline at end of file +#endif diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 45d089599..e8703dccc 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -500,9 +500,9 @@ void _OS::set_icon(const Image& p_icon) { } /** - * Get current datetime with consideration for utc and + * Get current datetime with consideration for utc and * dst - */ + */ Dictionary _OS::get_datetime(bool utc) const { Dictionary dated = get_date(utc); @@ -564,17 +564,17 @@ uint64_t _OS::get_unix_time_from_datetime(Dictionary datetime) const { // Get all time values from the dictionary, set to zero if it doesn't exist. // Risk incorrect calculation over throwing errors - unsigned int second = ((datetime.has(SECOND_KEY))? + unsigned int second = ((datetime.has(SECOND_KEY))? static_cast(datetime[SECOND_KEY]): 0); - unsigned int minute = ((datetime.has(MINUTE_KEY))? + unsigned int minute = ((datetime.has(MINUTE_KEY))? static_cast(datetime[MINUTE_KEY]): 0); - unsigned int hour = ((datetime.has(HOUR_KEY))? + unsigned int hour = ((datetime.has(HOUR_KEY))? static_cast(datetime[HOUR_KEY]): 0); - unsigned int day = ((datetime.has(DAY_KEY))? + unsigned int day = ((datetime.has(DAY_KEY))? static_cast(datetime[DAY_KEY]): 0); - unsigned int month = ((datetime.has(MONTH_KEY))? + unsigned int month = ((datetime.has(MONTH_KEY))? static_cast(datetime[MONTH_KEY]) -1: 0); - unsigned int year = ((datetime.has(YEAR_KEY))? + unsigned int year = ((datetime.has(YEAR_KEY))? static_cast(datetime[YEAR_KEY]):0); /// How many days come before each month (0-12) @@ -604,7 +604,7 @@ uint64_t _OS::get_unix_time_from_datetime(Dictionary datetime) const { ERR_FAIL_COND_V( day > MONTH_DAYS_TABLE[LEAPYEAR(year)][month], 0); // Calculate all the seconds from months past in this year - uint64_t SECONDS_FROM_MONTHS_PAST_THIS_YEAR = + uint64_t SECONDS_FROM_MONTHS_PAST_THIS_YEAR = DAYS_PAST_THIS_YEAR_TABLE[LEAPYEAR(year)][month] * SECONDS_PER_DAY; uint64_t SECONDS_FROM_YEARS_PAST = 0; @@ -614,13 +614,13 @@ uint64_t _OS::get_unix_time_from_datetime(Dictionary datetime) const { SECONDS_PER_DAY; } - uint64_t epoch = - second + - minute * SECONDS_PER_MINUTE + + uint64_t epoch = + second + + minute * SECONDS_PER_MINUTE + hour * SECONDS_PER_HOUR + // Subtract 1 from day, since the current day isn't over yet // and we cannot count all 24 hours. - (day-1) * SECONDS_PER_DAY + + (day-1) * SECONDS_PER_DAY + SECONDS_FROM_MONTHS_PAST_THIS_YEAR + SECONDS_FROM_YEARS_PAST; return epoch; @@ -631,7 +631,7 @@ uint64_t _OS::get_unix_time_from_datetime(Dictionary datetime) const { * Get a dictionary of time values when given epoch time * * Dictionary Time values will be a union if values from #get_time - * and #get_date dictionaries (with the exception of dst = + * and #get_date dictionaries (with the exception of dst = * day light standard time, as it cannot be determined from epoch) * * @param unix_time_val epoch time to convert @@ -660,14 +660,14 @@ Dictionary _OS::get_datetime_from_unix_time( uint64_t unix_time_val) const { time.hour = dayclock / 3600; /* day 0 was a thursday */ - date.weekday = static_cast((dayno + 4) % 7); + date.weekday = static_cast((dayno + 4) % 7); while (dayno >= YEARSIZE(year)) { dayno -= YEARSIZE(year); year++; } - date.year = year; + date.year = year; size_t imonth = 0; diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp index 680e0ef7f..11f953624 100644 --- a/core/io/http_client.cpp +++ b/core/io/http_client.cpp @@ -116,7 +116,7 @@ Error HTTPClient::request_raw( Method p_method, const String& p_url, const Vecto } request+="\r\n"; CharString cs=request.utf8(); - + DVector data; //Maybe this goes faster somehow? diff --git a/core/ustring.cpp b/core/ustring.cpp index c2520a7a8..a039ba11c 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -3635,7 +3635,7 @@ String String::percent_decode() const { CharString cs = utf8(); for(int i=0;ianimation_started, c.assigned); if (is_inside_tree() && get_tree()->is_editor_hint()) diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp index 90e371379..328ad8fb2 100644 --- a/scene/main/http_request.cpp +++ b/scene/main/http_request.cpp @@ -494,7 +494,7 @@ HTTPRequest::HTTPRequest() max_redirects=8; body_len=-1; got_response=false; - validate_ssl=false; + validate_ssl=false; use_ssl=false; response_code=0; request_sent=false; diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index ebc8d4942..5ce53194a 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1841,7 +1841,7 @@ void Viewport::_gui_input_event(InputEvent p_event) { if (gui.mouse_over) gui.mouse_over->notification(Control::NOTIFICATION_MOUSE_EXIT); - + _gui_cancel_tooltip(); if (over) diff --git a/scene/resources/curve.cpp b/scene/resources/curve.cpp index 516156c31..88ff09e96 100644 --- a/scene/resources/curve.cpp +++ b/scene/resources/curve.cpp @@ -544,7 +544,7 @@ void Curve2D::_bake() const { List pointlist; pointlist.push_back(pos); //start always from origin - + for(int i=0;ix1 - e->x0) / (e->y1 - e->y0); STBTT_assert(z != NULL); if (!z) return z; - + // round dx down to avoid overshooting if (dxdy < 0) z->dx = -STBTT_ifloor(STBTT_FIX * -dxdy); @@ -1769,7 +1769,7 @@ static void stbtt__fill_active_edges(unsigned char *scanline, int len, stbtt__ac } } } - + e = e->next; } } @@ -2441,7 +2441,7 @@ STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info { int ix0,iy0,ix1,iy1; stbtt__bitmap gbm; - stbtt_vertex *vertices; + stbtt_vertex *vertices; int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices); if (scale_x == 0) scale_x = scale_y; @@ -2464,7 +2464,7 @@ STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info if (height) *height = gbm.h; if (xoff ) *xoff = ix0; if (yoff ) *yoff = iy0; - + if (gbm.w && gbm.h) { gbm.pixels = (unsigned char *) STBTT_malloc(gbm.w * gbm.h, info->userdata); if (gbm.pixels) { @@ -2475,7 +2475,7 @@ STBTT_DEF unsigned char *stbtt_GetGlyphBitmapSubpixel(const stbtt_fontinfo *info } STBTT_free(vertices, info->userdata); return gbm.pixels; -} +} STBTT_DEF unsigned char *stbtt_GetGlyphBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int glyph, int *width, int *height, int *xoff, int *yoff) { @@ -2487,7 +2487,7 @@ STBTT_DEF void stbtt_MakeGlyphBitmapSubpixel(const stbtt_fontinfo *info, unsigne int ix0,iy0; stbtt_vertex *vertices; int num_verts = stbtt_GetGlyphShape(info, glyph, &vertices); - stbtt__bitmap gbm; + stbtt__bitmap gbm; stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale_x, scale_y, shift_x, shift_y, &ix0,&iy0,0,0); gbm.pixels = output; @@ -2509,7 +2509,7 @@ STBTT_DEF void stbtt_MakeGlyphBitmap(const stbtt_fontinfo *info, unsigned char * STBTT_DEF unsigned char *stbtt_GetCodepointBitmapSubpixel(const stbtt_fontinfo *info, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint, int *width, int *height, int *xoff, int *yoff) { return stbtt_GetGlyphBitmapSubpixel(info, scale_x, scale_y,shift_x,shift_y, stbtt_FindGlyphIndex(info,codepoint), width,height,xoff,yoff); -} +} STBTT_DEF void stbtt_MakeCodepointBitmapSubpixel(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, float shift_x, float shift_y, int codepoint) { @@ -2519,7 +2519,7 @@ STBTT_DEF void stbtt_MakeCodepointBitmapSubpixel(const stbtt_fontinfo *info, uns STBTT_DEF unsigned char *stbtt_GetCodepointBitmap(const stbtt_fontinfo *info, float scale_x, float scale_y, int codepoint, int *width, int *height, int *xoff, int *yoff) { return stbtt_GetCodepointBitmapSubpixel(info, scale_x, scale_y, 0.0f,0.0f, codepoint, width,height,xoff,yoff); -} +} STBTT_DEF void stbtt_MakeCodepointBitmap(const stbtt_fontinfo *info, unsigned char *output, int out_w, int out_h, int out_stride, float scale_x, float scale_y, int codepoint) { @@ -2644,7 +2644,7 @@ static void stbrp_init_target(stbrp_context *con, int pw, int ph, stbrp_node *no con->y = 0; con->bottom_y = 0; STBTT__NOTUSED(nodes); - STBTT__NOTUSED(num_nodes); + STBTT__NOTUSED(num_nodes); } static void stbrp_pack_rects(stbrp_context *con, stbrp_rect *rects, int num_rects) @@ -2996,7 +2996,7 @@ STBTT_DEF int stbtt_PackFontRanges(stbtt_pack_context *spc, unsigned char *fontd n = 0; for (i=0; i < num_ranges; ++i) n += ranges[i].num_chars; - + rects = (stbrp_rect *) STBTT_malloc(sizeof(*rects) * n, spc->user_allocator_context); if (rects == NULL) return 0; @@ -3007,7 +3007,7 @@ STBTT_DEF int stbtt_PackFontRanges(stbtt_pack_context *spc, unsigned char *fontd n = stbtt_PackFontRangesGatherRects(spc, &info, ranges, num_ranges, rects); stbtt_PackFontRangesPackRects(spc, rects, n); - + return_value = stbtt_PackFontRangesRenderIntoRects(spc, &info, ranges, num_ranges, rects); STBTT_free(rects, spc->user_allocator_context); @@ -3060,7 +3060,7 @@ STBTT_DEF void stbtt_GetPackedQuad(stbtt_packedchar *chardata, int pw, int ph, i // // check if a utf8 string contains a prefix which is the utf16 string; if so return length of matching utf8 string -static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(const stbtt_uint8 *s1, stbtt_int32 len1, const stbtt_uint8 *s2, stbtt_int32 len2) +static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(const stbtt_uint8 *s1, stbtt_int32 len1, const stbtt_uint8 *s2, stbtt_int32 len2) { stbtt_int32 i=0; @@ -3099,7 +3099,7 @@ static stbtt_int32 stbtt__CompareUTF8toUTF16_bigendian_prefix(const stbtt_uint8 return i; } -STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const char *s2, int len2) +STBTT_DEF int stbtt_CompareUTF8toUTF16_bigendian(const char *s1, int len1, const char *s2, int len2) { return len1 == stbtt__CompareUTF8toUTF16_bigendian_prefix((const stbtt_uint8*) s1, len1, (const stbtt_uint8*) s2, len2); } diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index 20405a57b..8d0aedbf9 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -374,7 +374,7 @@ void Theme::get_stylebox_types(List *p_list) const { const StringName *key=NULL; while((key=style_map.next(key))) { p_list->push_back(*key); - } + } } void Theme::set_font(const StringName& p_name,const StringName& p_type,const Ref& p_font) { diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h index cb9e96e28..5abad863e 100644 --- a/servers/visual/visual_server_raster.h +++ b/servers/visual/visual_server_raster.h @@ -657,7 +657,7 @@ public: virtual RID texture_create(); virtual void texture_allocate(RID p_texture,int p_width, int p_height,Image::Format p_format,uint32_t p_flags=TEXTURE_FLAGS_DEFAULT); - virtual void texture_set_data(RID p_texture,const Image& p_image,CubeMapSide p_cube_side=CUBEMAP_LEFT); + virtual void texture_set_data(RID p_texture,const Image& p_image,CubeMapSide p_cube_side=CUBEMAP_LEFT); virtual Image texture_get_data(RID p_texture,CubeMapSide p_cube_side=CUBEMAP_LEFT) const; virtual void texture_set_flags(RID p_texture,uint32_t p_flags) ; virtual uint32_t texture_get_flags(RID p_texture) const; diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 7cff6dab9..f638f177e 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -1712,7 +1712,7 @@ void EditorNode::_edit_current() { _set_top_editors(sub_plugins); _set_editing_top_editors(current_obj); _display_top_editors(true); - + } else if (!editor_plugins_over->get_plugins_list().empty()) { _hide_top_editors(); @@ -6400,7 +6400,7 @@ EditorNode::EditorNode() { EditorNode::~EditorNode() { - + memdelete( EditorHelp::get_doc_data() ); memdelete(editor_selection); memdelete(editor_plugins_over); @@ -6466,6 +6466,6 @@ EditorPluginList::EditorPluginList() { EditorPluginList::~EditorPluginList() { } - + diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h index 8fa6cfefc..72bf8c624 100644 --- a/tools/editor/editor_node.h +++ b/tools/editor/editor_node.h @@ -451,7 +451,7 @@ private: void _display_top_editors(bool p_display); void _set_top_editors(Vector p_editor_plugins_over); void _set_editing_top_editors(Object * p_current_object); - + void _quick_opened(); void _quick_run(); @@ -746,7 +746,7 @@ public: EditorPluginList(); ~EditorPluginList(); -} ; +} ; struct EditorProgressBG { diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp index a83125d0b..91d7e7ebd 100644 --- a/tools/editor/editor_settings.cpp +++ b/tools/editor/editor_settings.cpp @@ -464,7 +464,7 @@ void EditorSettings::_load_defaults(Ref p_extra_config) { set("2d_editor/bone_color2",Color(0.75,0.75,0.75,0.9)); set("2d_editor/bone_selected_color",Color(0.9,0.45,0.45,0.9)); set("2d_editor/bone_ik_color",Color(0.9,0.9,0.45,0.9)); - + set("2d_editor/keep_margins_when_changing_anchors", false); set("game_window_placement/rect",0); diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp index 30296100d..fa99a3d33 100644 --- a/tools/editor/plugins/spatial_editor_plugin.cpp +++ b/tools/editor/plugins/spatial_editor_plugin.cpp @@ -1229,7 +1229,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { case InputEvent::MOUSE_MOTION: { const InputEventMouseMotion &m=p_event.mouse_motion; _edit.mouse_pos=Point2(p_event.mouse_motion.x,p_event.mouse_motion.y); - + if (spatial_editor->get_selected()) { @@ -1265,7 +1265,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { NavigationScheme nav_scheme = _get_navigation_schema("3d_editor/navigation_scheme"); NavigationMode nav_mode = NAVIGATION_NONE; - + if (_edit.gizmo.is_valid()) { Plane plane=Plane(_edit.gizmo_initial_pos,_get_camera_normal()); @@ -1591,7 +1591,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) { mod=KEY_CONTROL; if (m.mod.meta) mod=KEY_META; - + if(mod){ if (mod == _get_key_modifier("3d_editor/pan_modifier")) nav_mode = NAVIGATION_PAN; @@ -1815,7 +1815,7 @@ void SpatialEditorViewport::_notification(int p_what) { if (visible) _update_camera(); - + call_deferred("update_transform_gizmo_view"); } diff --git a/tools/editor/plugins/theme_editor_plugin.cpp b/tools/editor/plugins/theme_editor_plugin.cpp index 5321a7b6d..37cb0398e 100644 --- a/tools/editor/plugins/theme_editor_plugin.cpp +++ b/tools/editor/plugins/theme_editor_plugin.cpp @@ -398,7 +398,7 @@ void ThemeEditor::_dialog_cbk() { } - } break; + } break; case POPUP_CLASS_REMOVE: { StringName fromtype = type_edit->get_text(); List names; diff --git a/tools/editor/plugins/tile_map_editor_plugin.h b/tools/editor/plugins/tile_map_editor_plugin.h index b1da1bc48..92b54a4cb 100644 --- a/tools/editor/plugins/tile_map_editor_plugin.h +++ b/tools/editor/plugins/tile_map_editor_plugin.h @@ -130,7 +130,7 @@ class TileMapEditor : public VBoxContainer { void _fill_points(const DVector p_points, const Dictionary& p_op); void _erase_points(const DVector p_points); - + void _select(const Point2i& p_from, const Point2i& p_to); void _draw_cell(int p_cell, const Point2i& p_point, bool p_flip_h, bool p_flip_v, bool p_transpose, const Matrix32& p_xform); diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp index ee9eee159..dea15ebd3 100644 --- a/tools/editor/project_export.cpp +++ b/tools/editor/project_export.cpp @@ -470,7 +470,7 @@ void ProjectExportDialog::_export_action(const String& p_file) { /* Checked if the export location is outside the project directory, * now will check if a file name has been entered */ if (p_file.ends_with("/")) { - + error->set_text("Please enter a file name!"); error->popup_centered_minsize(); return; diff --git a/tools/editor/register_exporters.h b/tools/editor/register_exporters.h index 364ad5efc..dccaa0641 100644 --- a/tools/editor/register_exporters.h +++ b/tools/editor/register_exporters.h @@ -32,4 +32,4 @@ void register_exporters(); -#endif \ No newline at end of file +#endif diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp index 0da233dec..7c64ed60b 100644 --- a/tools/editor/scene_tree_dock.cpp +++ b/tools/editor/scene_tree_dock.cpp @@ -1241,7 +1241,7 @@ void SceneTreeDock::_selection_changed() { //automatically turn on multi-edit _tool_selected(TOOL_MULTI_EDIT); } - + //tool_buttons[TOOL_MULTI_EDIT]->set_disabled(EditorNode::get_singleton()->get_editor_selection()->get_selection().size()<2); } -- cgit v1.3.1