i18n: Second pass at proofreading

Mostly removing commented out strings, plus a few critical ones
that should not be translated.

38 files changed, 272 insertions, 320 deletions

diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index 1c17077f92..b479872510 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 a376169a78..0c6c64a33b 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 d74c6bb7c6..b99cd12f65 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 b295909648..151208ace0 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 6a8778567a..7cff6dab9c 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 244642b7a6..b6311a7604 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 92f6129e51..dfaeca03db 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 296439c39e..6ac67ab8a6 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 212ef93316..c608fe906f 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 01ae0150ec..84ef5f1973 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 3b7186f18a..1b6d94b2cf 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 8abb51159e..14a61d46b5 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 5cd09f1a93..b18afe7838 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 0958343f2c..9dff5e6ce4 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 fe031d1657..bf3b2fa68d 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 f7462db20f..8a0c6b3fe8 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<VisualInstance>();
diff --git a/tools/editor/plugins/navigation_polygon_editor_plugin.cpp b/tools/editor/plugins/navigation_polygon_editor_plugin.cpp
index 038c1d48a7..1ee388ca18 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 0fab183902..107ec30a91 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 f07c43b8e4..f873b43fd9 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 dfe667dd02..cce0ba3d62 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<String>& 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 93db7fdc6a..c333d1d85f 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<String>& 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 581017a4ac..bff4301dab 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 8a65a3641f..c1069c77f1 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 7baabd9899..30296100d0 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 abd316ff30..4532e91e1f 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<String>& 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 7d839bea2f..5321a7b6d8 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 843fc35d8b..b1ddac7076 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 5bf70b4d7d..ee9eee1590 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 395760fb52..c06a8cd081 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 e484b94c5c..605b12c879 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 b6e090472b..587f6f19f0 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 8626c632e3..75b5c69bc2 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 7803208c89..38b0372232 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 fd2e9f9759..abcfe125f3 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 88307bcace..0da233deca 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 0dedbe245a..ca615da783 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 b7fc722113..c32e3a2116 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<SphereShape>()) {
 
-		return TTR("Radius");
+		return "Radius";
 	}
 
 	if (s->cast_to<BoxShape>()) {
 
-		return TTR("Extents");
+		return "Extents";
 	}
 
 	if (s->cast_to<CapsuleShape>()) {
 
-		return p_idx==0?TTR("Radius"):"Height";
+		return p_idx==0?"Radius":"Height";
 	}
 
 	if (s->cast_to<RayShape>()) {
 
-		return TTR("Length");
+		return "Length";
 	}
 
 	return "";
diff --git a/tools/translations/tools.pot b/tools/translations/tools.pot
index df1207f58d..56aebe503e 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 ""
@@ -2996,6 +2908,14 @@ 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 ""