Merge remote-tracking branch 'origin/master'

81 files changed, 2870 insertions, 2751 deletions

diff --git a/tools/editor/addon_editor_plugin.cpp b/tools/editor/addon_editor_plugin.cpp
index 3b74330c1e..ee0b4b595f 100644
--- a/tools/editor/addon_editor_plugin.cpp
+++ b/tools/editor/addon_editor_plugin.cpp
@@ -1085,7 +1085,7 @@ EditorAddonLibrary::EditorAddonLibrary() {
 
 
 
-	search_hb->add_child( memnew( Label(TTR("Search: "))));
+	search_hb->add_child( memnew( Label(TTR("Search:")+" ")));
 	filter =memnew( LineEdit );
 	search_hb->add_child(filter);
 	filter->set_h_size_flags(SIZE_EXPAND_FILL);
@@ -1112,7 +1112,7 @@ EditorAddonLibrary::EditorAddonLibrary() {
 	HBoxContainer *search_hb2 = memnew( HBoxContainer );
 	library_main->add_child(search_hb2);
 
-	search_hb2->add_child( memnew( Label("Sort: ")));
+	search_hb2->add_child( memnew( Label(TTR("Sort:")+" ")));
 	sort = memnew( OptionButton );
 	for(int i=0;i<SORT_MAX;i++) {
 		sort->add_item(sort_text[i]);
@@ -1123,26 +1123,26 @@ EditorAddonLibrary::EditorAddonLibrary() {
 	sort->set_h_size_flags(SIZE_EXPAND_FILL);
 
 	reverse = memnew( CheckBox);
-	reverse->set_text("Reverse");
+	reverse->set_text(TTR("Reverse"));
 	search_hb2->add_child(reverse);
 
 	search_hb2->add_child(memnew(VSeparator));
 
 	//search_hb2->add_spacer();
 
-	search_hb2->add_child( memnew( Label("Category: ")));
+	search_hb2->add_child( memnew( Label(TTR("Category:")+" ")));
 	categories = memnew( OptionButton );
-	categories->add_item("All");
+	categories->add_item(TTR("All"));
 	search_hb2->add_child(categories);
 	categories->set_h_size_flags(SIZE_EXPAND_FILL);
 	//search_hb2->add_spacer();
 
 	search_hb2->add_child(memnew(VSeparator));
 
-	search_hb2->add_child( memnew( Label("Site: ")));
+	search_hb2->add_child( memnew( Label(TTR("Site:")+" ")));
 	repository = memnew( OptionButton );
 
-	repository->add_item(TTR("Godot"));
+	repository->add_item("Godot");
 	search_hb2->add_child(repository);
 	repository->set_h_size_flags(SIZE_EXPAND_FILL);
 
@@ -1232,7 +1232,7 @@ EditorAddonLibrary::EditorAddonLibrary() {
 	asset_open = memnew( EditorFileDialog );
 
 	asset_open->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
-	asset_open->add_filter("*.zip ; Assets ZIP File");
+	asset_open->add_filter("*.zip ; "+TTR("Assets ZIP File"));
 	asset_open->set_mode(EditorFileDialog::MODE_OPEN_FILE);
 	add_child(asset_open);
 	asset_open->connect("file_selected",this,"_asset_file_selected");
diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index f4fda7ba6e..08b90b5408 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -889,7 +889,7 @@ void AnimationKeyEditor::_menu_track(int p_type) {
 				case TRACK_MENU_SET_ALL_TRANS_OUTIN: t=-2.0; break;
 			}
 
-			undo_redo->create_action(TTR("Set Transitions to: ")+rtos(t));
+			undo_redo->create_action(TTR("Set Transitions to:")+" "+rtos(t));
 
 			for(Map<SelectedKey,KeyInfo>::Element *E=selection.back();E;E=E->prev()) {
 
@@ -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();
@@ -2893,7 +2893,7 @@ void AnimationKeyEditor::_notification(int p_what) {
 				optimize_dialog->connect("confirmed",this,"_animation_optimize");
 
 				menu_track->get_popup()->add_child(tpp);
-				//menu_track->get_popup()->add_submenu_item(TTR("Set Transitions.."),"Transitions");
+				//menu_track->get_popup()->add_submenu_item("Set Transitions..","Transitions");
 				//menu_track->get_popup()->add_separator();
 				menu_track->get_popup()->add_item(TTR("Optimize Animation"),TRACK_MENU_OPTIMIZE);
 				menu_track->get_popup()->add_item(TTR("Clean-Up Animation"),TRACK_MENU_CLEAN_UP);
@@ -3113,9 +3113,9 @@ void AnimationKeyEditor::_query_insert(const InsertData& p_id) {
 		if (bool(EDITOR_DEF("animation/confirm_insert_track",true))) {
 			//potential new key, does not exist
 			if (insert_data.size()==1)
-				insert_confirm->set_text(TTR("Create NEW track for ")+p_id.query+TTR(" and insert key?"));
+				insert_confirm->set_text(vformat(TTR("Create NEW track for %s and insert key?"),p_id.query));
 			else
-				insert_confirm->set_text(TTR("Create ")+itos(insert_data.size())+TTR(" NEW tracks and insert keys?"));
+				insert_confirm->set_text(vformat(TTR("Create %d NEW tracks and insert keys?"),insert_data.size()));
 
 			insert_confirm->get_ok()->set_text(TTR("Create"));
 			insert_confirm->popup_centered_minsize();
@@ -3510,7 +3510,7 @@ void AnimationKeyEditor::_insert_delay() {
 		return;
 	}
 
-	undo_redo->create_action(TTR("Anim  Insert"));
+	undo_redo->create_action(TTR("Anim Insert"));
 
 	int last_track = animation->get_track_count();
 	bool advance=false;
@@ -3818,7 +3818,7 @@ AnimationKeyEditor::AnimationKeyEditor() {
 	hb->add_child( memnew( VSeparator ) );
 
 	Label *l = memnew( Label );
-	l->set_text(TTR("Len(s):"));
+	l->set_text(TTR("Length (s):"));
 	hb->add_child(l);
 
 	length = memnew( SpinBox );
@@ -3833,7 +3833,7 @@ AnimationKeyEditor::AnimationKeyEditor() {
 	length->connect("value_changed",this,"_animation_len_changed");
 
 	l = memnew( Label );
-	l->set_text(TTR("Step(s):"));
+	l->set_text(TTR("Step (s):"));
 	hb->add_child(l);
 
 	step = memnew( SpinBox );
@@ -3929,7 +3929,7 @@ AnimationKeyEditor::AnimationKeyEditor() {
 
 	/*keying = memnew( Button );
 	keying->set_toggle_mode(true);
-	//keying->set_text(TTR("Keys"));
+	//keying->set_text("Keys");
 	keying->set_anchor_and_margin(MARGIN_LEFT,ANCHOR_END,60);
 	keying->set_anchor_and_margin(MARGIN_RIGHT,ANCHOR_END,10);
 	keying->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_BEGIN,55);
@@ -3939,7 +3939,7 @@ AnimationKeyEditor::AnimationKeyEditor() {
 	*/
 
 /*	l = memnew( Label );
-	l->set_text(TTR("Base: "));
+	l->set_text("Base: ");
 	l->set_pos(Point2(0,3));
 //	dr_panel->add_child(l);*/
 
@@ -4089,10 +4089,10 @@ AnimationKeyEditor::AnimationKeyEditor() {
 	cleanup_vb->add_child(cleanup_tracks);
 
 	cleanup_all = memnew( CheckButton );
-	cleanup_all->set_text(TTR("Clean-Up all animations"));
+	cleanup_all->set_text(TTR("Clean-up all animations"));
 	cleanup_vb->add_child(cleanup_all);
 
-	cleanup_dialog->set_title(TTR("Clean up Animation(s) (NO UNDO!)"));
+	cleanup_dialog->set_title(TTR("Clean-Up Animation(s) (NO UNDO!)"));
 	cleanup_dialog->get_ok()->set_text(TTR("Clean-Up"));
 
 	cleanup_dialog->connect("confirmed",this,"_menu_track",varray(TRACK_MENU_CLEAN_UP_CONFIRM));
diff --git a/tools/editor/call_dialog.cpp b/tools/editor/call_dialog.cpp
index 2ab9a79d3b..0c6c64a33b 100644
--- a/tools/editor/call_dialog.cpp
+++ b/tools/editor/call_dialog.cpp
@@ -239,7 +239,7 @@ void CallDialog::set_object(Object *p_object,StringName p_selected) {
 	return_value->clear();
 
 	_update_method_list();
-	method_label->set_text(TTR("Method List For ' ")+p_object->get_type()+" ':");
+	method_label->set_text(vformat(TTR("Method List For '%s':"),p_object->get_type()));
 }
 
 CallDialog::CallDialog() {
@@ -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/code_editor.cpp b/tools/editor/code_editor.cpp
index 970a0477c1..c92b40628c 100644
--- a/tools/editor/code_editor.cpp
+++ b/tools/editor/code_editor.cpp
@@ -216,7 +216,7 @@ void FindReplaceDialog::_replace() {
 
 		text_edit->set_v_scroll(vsval);
 //		text_edit->set_h_scroll(hsval);
-		error_label->set_text(TTR("Replaced ")+itos(rc)+TTR(" ocurrence(s)."));
+		error_label->set_text(vformat(TTR("Replaced %d ocurrence(s)."),rc));
 
 
 		//hide();
@@ -274,7 +274,7 @@ bool FindReplaceDialog::_search() {
 		return true;
 	} else {
 
-		set_error(TTR("Not Found!"));
+		set_error(TTR("Not found!"));
 		return false;
 	}
 
@@ -498,7 +498,7 @@ FindReplaceDialog::FindReplaceDialog() {
 
 void CodeTextEditor::_line_col_changed() {
 
-	String text = String()+TTR("Line: ")+itos(text_editor->cursor_get_line()+1)+TTR(", Col: ")+itos(text_editor->cursor_get_column());
+	String text = String()+TTR("Line:")+" "+itos(text_editor->cursor_get_line()+1)+", "+TTR("Col:")+" "+itos(text_editor->cursor_get_column());
 	line_col->set_text(text);
 }
 
diff --git a/tools/editor/connections_dialog.cpp b/tools/editor/connections_dialog.cpp
index 3795860472..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 );
@@ -429,7 +429,7 @@ ConnectDialog::ConnectDialog() {
 	make_callback = memnew( CheckButton );
 	make_callback->set_toggle_mode(true);
 	make_callback->set_pressed( EDITOR_DEF("text_editor/create_signal_callbacks",true));
-	make_callback->set_text(TTR("Make Function  "));
+	make_callback->set_text(TTR("Make Function"));
 	dstm_hb->add_child(make_callback);
 
 	deferred = memnew( CheckButton );
@@ -447,7 +447,7 @@ ConnectDialog::ConnectDialog() {
 	realtime->set_anchor( MARGIN_RIGHT, ANCHOR_END );
 	realtime->set_begin( Point2( 120, button_margin-10 ) );
 	realtime->set_end( Point2( 80, margin ) );
-	realtime->set_text(TTR("Realtime"));
+	realtime->set_text("Realtime");
 	add_child(realtime);
 */
 
@@ -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");
 
 
 
@@ -511,7 +511,7 @@ void ConnectionsDialog::_connect() {
 	StringArray args =  it->get_metadata(0).operator Dictionary()["args"];
 	int flags = CONNECT_PERSIST | (defer?CONNECT_DEFERRED:0) | (oshot?CONNECT_ONESHOT:0);
 
-	undo_redo->create_action(TTR("Connect '")+signal+"' to '"+String(dst_method)+"'");
+	undo_redo->create_action(vformat(TTR("Connect '%s' to '%s'"),signal,String(dst_method)));
 	undo_redo->add_do_method(node,"connect",signal,target,dst_method,binds,flags);
 	undo_redo->add_undo_method(node,"disconnect",signal,target,dst_method);
 	undo_redo->add_do_method(this,"update_tree");
@@ -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 c156b1b2de..151208ace0 100644
--- a/tools/editor/create_dialog.cpp
+++ b/tools/editor/create_dialog.cpp
@@ -251,7 +251,7 @@ void CreateDialog::_notification(int p_what) {
 void CreateDialog::set_base_type(const String& p_base) {
 
 	base_type=p_base;
-	set_title(TTR("Create New ")+p_base);
+	set_title(TTR("Create New")+" "+p_base);
 	_update_search();
 }
 
@@ -541,7 +541,7 @@ void CreateDialog::_bind_methods() {
 
 void CreateDialog::set_base_type(const String& p_base) {
 
-	set_title(TTR("Create ")+p_base+" Type");
+	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/dependency_editor.cpp b/tools/editor/dependency_editor.cpp
index 784315522c..633a414b07 100644
--- a/tools/editor/dependency_editor.cpp
+++ b/tools/editor/dependency_editor.cpp
@@ -27,7 +27,7 @@ void DependencyEditor::_load_pressed(Object* p_item,int p_cell,int p_button){
 	String fname = ti->get_text(0);
 	replacing = ti->get_text(1);
 
-	search->set_title(TTR("Search Replacement For: ")+replacing.get_file());
+	search->set_title(TTR("Search Replacement For:")+" "+replacing.get_file());
 
 	search->clear_filters();
 	List<String> ext;
@@ -180,7 +180,7 @@ void DependencyEditor::_update_list() {
 		String name = path.get_file();
 
 		Ref<Texture> icon;
-		if (has_icon(type,TTR("EditorIcons"))) {
+		if (has_icon(type,"EditorIcons")) {
 			icon=get_icon(type,"EditorIcons");
 		} else {
 			icon=get_icon("Object","EditorIcons");
@@ -209,15 +209,15 @@ void DependencyEditor::edit(const String& p_path) {
 
 
 	editing=p_path;
-	set_title(TTR("Dependencies For: ")+p_path.get_file());
+	set_title(TTR("Dependencies For:")+" "+p_path.get_file());
 
 	_update_list();
 	popup_centered_ratio();
 
 	if (EditorNode::get_singleton()->is_scene_open(p_path)) {
-		EditorNode::get_singleton()->show_warning(TTR("Scene '")+p_path.get_file()+"' is currently being edited.\nChanges will not take effect unless reloaded.");
+		EditorNode::get_singleton()->show_warning(vformat(TTR("Scene '%s' is currently being edited.\nChanges will not take effect unless reloaded."),p_path.get_file()));
 	} else if (ResourceCache::has(p_path)) {
-		EditorNode::get_singleton()->show_warning(TTR("Resource '")+p_path.get_file()+"' is in use.\nChanges will take effect when reloaded.");
+		EditorNode::get_singleton()->show_warning(vformat(TTR("Resource '%s' is in use.\nChanges will take effect when reloaded."),p_path.get_file()));
 	}
 }
 
@@ -301,7 +301,7 @@ void DependencyEditorOwners::_fill_owners(EditorFileSystemDirectory *efsd) {
 
 		Ref<Texture> icon;
 		String type=efsd->get_file_type(i);
-		if (!has_icon(type,TTR("EditorIcons"))) {
+		if (!has_icon(type,"EditorIcons")) {
 			icon=get_icon("Object","EditorIcons");
 		} else {
 			icon=get_icon(type,"EditorIcons");
@@ -319,7 +319,7 @@ void DependencyEditorOwners::show(const String& p_path) {
 	_fill_owners(EditorFileSystem::get_singleton()->get_filesystem());
 	popup_centered_ratio();
 
-	set_title(TTR("Owners Of: ")+p_path.get_file());
+	set_title(TTR("Owners Of:")+" "+p_path.get_file());
 
 }
 
@@ -362,7 +362,7 @@ void DependencyRemoveDialog::_fill_owners(EditorFileSystemDirectory *efsd) {
 
 		Ref<Texture> icon;
 		String type=efsd->get_file_type(i);
-		if (!has_icon(type,TTR("EditorIcons"))) {
+		if (!has_icon(type,"EditorIcons")) {
 			icon=get_icon("Object","EditorIcons");
 		} else {
 			icon=get_icon(type,"EditorIcons");
@@ -448,7 +448,7 @@ void DependencyErrorDialog::show(const String& p_for_file,const Vector<String> &
 
 
 	for_file=p_for_file;
-	set_title(TTR("Error loading: ")+p_for_file.get_file());
+	set_title(TTR("Error loading:")+" "+p_for_file.get_file());
 	files->clear();
 
 	TreeItem *root = files->create_item(NULL);
@@ -461,7 +461,7 @@ void DependencyErrorDialog::show(const String& p_for_file,const Vector<String> &
 			type=report[i].get_slice("::",1);
 
 		Ref<Texture> icon;
-		if (!has_icon(type,TTR("EditorIcons"))) {
+		if (!has_icon(type,"EditorIcons")) {
 			icon=get_icon("Object","EditorIcons");
 		} else {
 			icon=get_icon(type,"EditorIcons");
@@ -523,7 +523,7 @@ void OrphanResourcesDialog::ok_pressed() {
 	if (paths.empty())
 		return;
 
-	delete_confirm->set_text(TTR("Permanently Delete ")+itos(paths.size())+" Item(s) ? (No Undo!!)");
+	delete_confirm->set_text(vformat(TTR("Permanently delete %d item(s)? (No undo!)"),paths.size()));
 	delete_confirm->popup_centered_minsize();
 }
 
@@ -580,7 +580,7 @@ bool OrphanResourcesDialog::_fill_owners(EditorFileSystemDirectory *efsd,HashMap
 				String type=efsd->get_file_type(i);
 
 				Ref<Texture> icon;
-				if (has_icon(type,TTR("EditorIcons"))) {
+				if (has_icon(type,"EditorIcons")) {
 					icon=get_icon(type,"EditorIcons");
 				} else {
 					icon=get_icon("Object","EditorIcons");
diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp
index 8c16955d9f..b9d4949018 100644
--- a/tools/editor/editor_file_dialog.cpp
+++ b/tools/editor/editor_file_dialog.cpp
@@ -677,7 +677,7 @@ void EditorFileDialog::update_filters() {
 		if (max_filters<filters.size())
 			all_filters+=", ...";
 
-		filter->add_item(TTR("All Recognized ( ")+all_filters+" )");
+		filter->add_item(TTR("All Recognized")+" ( "+all_filters+" )");
 	}
 	for(int i=0;i<filters.size();i++) {
 
diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp
index 6423b75abc..1062417fec 100644
--- a/tools/editor/editor_file_system.cpp
+++ b/tools/editor/editor_file_system.cpp
@@ -314,7 +314,7 @@ void EditorFileSystem::_scan_filesystem() {
 
 
 
-	EditorProgressBG scan_progress("efs",TTR("ScanFS"),1000);
+	EditorProgressBG scan_progress("efs","ScanFS",1000);
 
 	ScanProgress sp;
 	sp.low=0;
@@ -609,7 +609,7 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir,DirAccess
 
 			da->change_dir("..");
 		} else {
-			ERR_PRINTS(TTR("Can't go into subdir: ")+E->get());
+			ERR_PRINTS(TTR("Cannot go into subdir:")+" "+E->get());
 		}
 
 		p_progress.update(idx,total);
diff --git a/tools/editor/editor_help.cpp b/tools/editor/editor_help.cpp
index a8cb1a5730..616037c545 100644
--- a/tools/editor/editor_help.cpp
+++ b/tools/editor/editor_help.cpp
@@ -519,7 +519,7 @@ EditorHelpIndex::EditorHelpIndex() {
 	search_box->connect("input_event", this, "_sbox_input");
 
 	class_list = memnew( Tree );
-	vbc->add_margin_child(TTR("Class List: "), class_list, true);
+	vbc->add_margin_child(TTR("Class List:")+" ", class_list, true);
 	class_list->set_v_size_flags(SIZE_EXPAND_FILL);
 
 	class_list->connect("item_activated",this,"_tree_item_selected");
@@ -710,7 +710,7 @@ Error EditorHelp::_goto_desc(const String& p_class,int p_vscr) {
 
 	class_desc->push_font(doc_title_font);
 	class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color"));
-	class_desc->add_text(TTR("Class: "));
+	class_desc->add_text(TTR("Class:")+" ");
 	class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/base_type_color"));
 	_add_text(p_class);
 	class_desc->pop();
@@ -722,7 +722,7 @@ Error EditorHelp::_goto_desc(const String& p_class,int p_vscr) {
 
 		class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color"));
 		class_desc->push_font(doc_title_font);
-		class_desc->add_text(TTR("Inherits: "));
+		class_desc->add_text(TTR("Inherits:")+" ");
 		class_desc->pop();
 		class_desc->pop();
 
@@ -756,7 +756,7 @@ Error EditorHelp::_goto_desc(const String& p_class,int p_vscr) {
 				if (!found) {
 					class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color"));
 					class_desc->push_font(doc_title_font);
-					class_desc->add_text("Inherited by: ");
+					class_desc->add_text(TTR("Inherited by:")+" ");
 					class_desc->pop();
 					class_desc->pop();
 
diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp
index 91357e0f80..25dced4745 100644
--- a/tools/editor/editor_import_export.cpp
+++ b/tools/editor/editor_import_export.cpp
@@ -240,12 +240,12 @@ static void _edit_files_with_filter(DirAccess *da,const List<String>& p_filters,
 		for(const List<String>::Element *F=p_filters.front();F;F=F->next()) {
 
 			if (fullpath.matchn(F->get())) {
-				String act = TTR("Added: ");
+				String act = TTR("Added:")+" ";
 
 				if (!exclude) {
 					r_list.insert(fullpath);
 				} else {
-					act = TTR("Removed: ");
+					act = TTR("Removed:")+" ";
 					r_list.erase(fullpath);
 				}
 
@@ -866,7 +866,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func
 			Error err = plugin->import2(dst_file,imd,get_image_compression(),true);
 			if (err) {
 
-				EditorNode::add_io_error(TTR("Error saving atlas! ")+dst_file.get_file());
+				EditorNode::add_io_error(TTR("Error saving atlas:")+" "+dst_file.get_file());
 				return ERR_CANT_CREATE;
 			}
 
@@ -916,7 +916,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func
 				String path = EditorSettings::get_singleton()->get_settings_path()+"/tmp/tmpatlas.atex";
 				Error err = ResourceSaver::save(path,atex);
 				if (err!=OK) {
-					EditorNode::add_io_error(TTR("Could not save atlas subtexture: ")+path);
+					EditorNode::add_io_error(TTR("Could not save atlas subtexture:")+" "+path);
 					return ERR_CANT_CREATE;
 				}
 				Vector<uint8_t> data = FileAccess::get_file_as_array(path);
@@ -1157,7 +1157,7 @@ Error EditorExportPlatform::save_pack_file(void *p_userdata,const String& p_path
 		MD5Final(&ctx);
 		pd->f->store_buffer(ctx.digest,16);
 	}
-	pd->ep->step(TTR("Storing File: ")+p_path,2+p_file*100/p_total,false);
+	pd->ep->step(TTR("Storing File:")+" "+p_path,2+p_file*100/p_total,false);
 	pd->count++;
 	pd->ftmp->store_buffer(p_data.ptr(),p_data.size());
 	if (pd->alignment > 1) {
@@ -1195,7 +1195,7 @@ Error EditorExportPlatform::save_zip_file(void *p_userdata,const String& p_path,
 	zipWriteInFileInZip(zip,p_data.ptr(),p_data.size());
 	zipCloseFileInZip(zip);
 
-	zd->ep->step(TTR("Storing File: ")+p_path,2+p_file*100/p_total,false);
+	zd->ep->step(TTR("Storing File:")+" "+p_path,2+p_file*100/p_total,false);
 	zd->count++;
 	return OK;
 
@@ -1309,7 +1309,7 @@ Error EditorExportPlatformPC::export_project(const String& p_path, bool p_debug,
 
 
 
-	EditorProgress ep("export",TTR("Exporting for ")+get_name(),102);
+	EditorProgress ep("export",vformat(TTR("Exporting for %s"),get_name()),102);
 
 	const int BUFSIZE = 32768;
 
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 25c854ce56..eef148b405 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -432,7 +432,7 @@ void EditorNode::_rebuild_import_menu()
 {
 	PopupMenu* p = import_menu->get_popup();
 	p->clear();
-	p->add_item(TTR("Node from scene"), FILE_IMPORT_SUBSCENE);
+	p->add_item(TTR("Node From Scene"), FILE_IMPORT_SUBSCENE);
 	p->add_separator();
 	for (int i = 0; i < editor_import_export->get_import_plugin_count(); i++) {
 		p->add_item(editor_import_export->get_import_plugin(i)->get_visible_name(), IMPORT_PLUGIN_BASE + i);
@@ -606,15 +606,15 @@ void EditorNode::_dialog_display_file_error(String p_file,Error p_error) {
 
 			case ERR_FILE_CANT_WRITE: {
 
-				accept->set_text(TTR("Can't open file for writing: ")+p_file.extension());
+				accept->set_text(TTR("Can't open file for writing:")+" "+p_file.extension());
 			} break;
 			case ERR_FILE_UNRECOGNIZED: {
 
-				accept->set_text(TTR("File format requested unknown: ")+p_file.extension());
+				accept->set_text(TTR("Requested file format unknown:")+" "+p_file.extension());
 			} break;
 			default: {
 
-				accept->set_text(TTR("Error Saving."));
+				accept->set_text(TTR("Error while saving."));
 			}break;
 		}
 
@@ -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;
 	}
@@ -1251,7 +1251,7 @@ void EditorNode::_dialog_action(String p_file) {
 					current_option=-1;
 					//accept->get_cancel()->hide();
 					accept->get_ok()->set_text(TTR("I see.."));
-					accept->set_text(TTR("Can't load MeshLibrary for merging!."));
+					accept->set_text(TTR("Can't load MeshLibrary for merging!"));
 					accept->popup_centered_minsize();
 					return;
 				}
@@ -1268,7 +1268,7 @@ void EditorNode::_dialog_action(String p_file) {
 			if (err) {
 
 				accept->get_ok()->set_text(TTR("I see.."));
-				accept->set_text(TTR("Error saving MeshLibrary!."));
+				accept->set_text(TTR("Error saving MeshLibrary!"));
 				accept->popup_centered_minsize();
 				return;
 			}
@@ -1286,7 +1286,7 @@ void EditorNode::_dialog_action(String p_file) {
 						current_option=-1;
 						//accept->get_cancel()->hide();
 						accept->get_ok()->set_text(TTR("I see.."));
-						accept->set_text(TTR("Can't load TileSet for merging!."));
+						accept->set_text(TTR("Can't load TileSet for merging!"));
 						accept->popup_centered_minsize();
 						return;
 					}
@@ -1304,7 +1304,7 @@ void EditorNode::_dialog_action(String p_file) {
 			if (err) {
 
 				accept->get_ok()->set_text(TTR("I see.."));
-				accept->set_text(TTR("Error saving TileSet!."));
+				accept->set_text(TTR("Error saving TileSet!"));
 				accept->popup_centered_minsize();
 				return;
 			}
@@ -1328,7 +1328,7 @@ void EditorNode::_dialog_action(String p_file) {
 			}
 			int ret = unzGoToFirstFile(pkg);
 
-			int fc=0; //coun them
+			int fc=0; //count them
 
 			while(ret==UNZ_OK) {
 				fc++;
@@ -1368,7 +1368,7 @@ void EditorNode::_dialog_action(String p_file) {
 
 				file=file.get_file();
 
-				p.step(TTR("Importing: ")+file,fc);
+				p.step(TTR("Importing:")+" "+file,fc);
 				print_line("IMPORT "+file);
 
 				FileAccess *f = FileAccess::open(EditorSettings::get_singleton()->get_settings_path()+"/templates/"+file,FileAccess::WRITE);
@@ -1454,7 +1454,7 @@ void EditorNode::_dialog_action(String p_file) {
 			_update_layouts_menu();
 
 			if (p_file=="Default") {
-				show_warning(TTR("Restored Default layout to base settings."));
+				show_warning(TTR("Restored default layout to base settings."));
 			}
 
 		} break;
@@ -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();
@@ -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();
@@ -1832,7 +1832,7 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
 			current_option=-1;
 			//accept->get_cancel()->hide();
 			accept->get_ok()->set_text(TTR("I see.."));
-			accept->set_text(TTR("No scene to run exists."));
+			accept->set_text(TTR("There is no defined scene to run."));
 			accept->popup_centered_minsize();
 			return;
 		}
@@ -1896,7 +1896,7 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
 					current_option=-1;
 					//accept->get_cancel()->hide();
 					accept->get_ok()->set_text(TTR("I see.."));
-					accept->set_text(TTR("Current scene was never saved, please save scene before running."));
+					accept->set_text(TTR("Current scene was never saved, please save it prior to running."));
 					accept->popup_centered_minsize();
 					return;
 				}
@@ -1998,11 +1998,12 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 	switch( p_option ) {
 		case FILE_NEW_SCENE: {
 
+			// 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(TTR("Start a New Scene? (Current will be lost)"));
+				confirmation->set_text("Start a New Scene? (Current will be lost)");
 				confirmation->popup_centered_minsize();
 				break;
 			}*/
@@ -2058,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;
@@ -2221,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;
@@ -2243,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;
 
@@ -2259,7 +2260,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 			String target = export_db->get_current_platform();
 			Ref<EditorExporter> exporter = export_db->get_exporter(target);
 			if (exporter.is_null()) {
-				accept->set_text(TTR("No exporter for platform '")+target+"' yet.");
+				accept->set_text("No exporter for platform '"+target+"' yet.");
 				accept->popup_centered(Size2(300,70));;
 				return;
 			}
@@ -2343,7 +2344,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 				confirmation->get_ok()->set_text(TTR("Quit"));
 				//confirmation->get_cancel()->show();
-				confirmation->set_text(TTR("Exit the Editor?"));
+				confirmation->set_text(TTR("Exit the editor?"));
 				confirmation->popup_centered(Size2(180,70));
 				break;
 			}
@@ -2411,7 +2412,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 			String filename = scene->get_filename();
 
 			if (filename==String()) {
-				show_warning(TTR("Can't reload a scene that was never saved.."));
+				show_warning(TTR("Can't reload a scene that was never saved."));
 				break;
 			}
 
@@ -2440,7 +2441,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 				current_option=-1;
 				//accept->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 selected node.");
 				accept->popup_centered(Size2(300,70));;
 				break;
@@ -2452,7 +2453,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 selected node.");
 				accept->popup_centered(Size2(300,70));;
 				break;
@@ -2464,8 +2465,8 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 				current_option=-1;
 				//accept->get_cancel()->hide();
-				accept->get_ok()->set_text(TTR("Ugh"));
-				accept->set_text(String(TTR("Error loading scene from "))+external_file);
+				accept->get_ok()->set_text("Ugh");
+				accept->set_text("Error loading scene from "+external_file);
 				accept->popup_centered(Size2(300,70));;
 				return;
 			}
@@ -2473,7 +2474,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 			instanced_scene->generate_instance_state();
 			instanced_scene->set_filename( Globals::get_singleton()->localize_path(external_file) );
 
-			editor_data.get_undo_redo().create_action(TTR("Instance Scene"));
+			editor_data.get_undo_redo().create_action("Instance Scene");
 			editor_data.get_undo_redo().add_do_method(parent,"add_child",instanced_scene);
 			editor_data.get_undo_redo().add_do_method(instanced_scene,"set_owner",edited_scene);
 			editor_data.get_undo_redo().add_do_reference(instanced_scene);
@@ -2703,11 +2704,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);
@@ -2819,9 +2820,9 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 					if (!p_confirmed) {
 
 
-						confirmation->get_ok()->set_text(TTR("Open"));
+						confirmation->get_ok()->set_text("Open");
 						//confirmation->get_cancel()->show();
-						confirmation->set_text(TTR("Current scene changed, save and re-import ?"));
+						confirmation->set_text("Current scene changed, save and re-import ?");
 						confirmation->popup_centered(Size2(300,70));
 						break;
 
@@ -2834,8 +2835,8 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 					current_option=-1;
 					//accept->get_cancel()->hide();
-					accept->get_ok()->set_text(TTR("I see.."));
-					accept->set_text(TTR("Can't import if edited scene was not saved.")); //i dont think this code will ever run
+					accept->get_ok()->set_text("I see..");
+					accept->set_text("Can't import if edited scene was not saved."); //i dont think this code will ever run
 					accept->popup_centered(Size2(300,70));;
 					break;
 
@@ -3251,7 +3252,7 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres
 	if (!get_edited_scene()) {
 
 		get_scene()->quit();
-		ERR_EXPLAIN(TTR("No scene to optimize (loading failed?"));
+		ERR_EXPLAIN("No scene to optimize (loading failed?)");
 		ERR_FAIL_V(ERR_FILE_NOT_FOUND);
 	}
 
@@ -3276,10 +3277,10 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres
 	if (!Globals::get_singleton()->has(preset)) {
 
 		//accept->"()->hide();
-		accept->get_ok()->set_text(TTR("I see.."));
-		accept->set_text(TTR("Optimizer preset not found: ")+p_preset);
+		accept->get_ok()->set_text("I see..");
+		accept->set_text("Optimizer preset not found: "+p_preset);
 		accept->popup_centered(Size2(300,70));;
-		ERR_EXPLAIN(TTR("Optimizer preset not found: ")+p_preset);
+		ERR_EXPLAIN("Optimizer preset not found: "+p_preset);
 		ERR_FAIL_V(ERR_INVALID_PARAMETER);
 
 	}
@@ -3299,7 +3300,7 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres
 		}
 	}
 
-	ERR_EXPLAIN(TTR("Preset '")+p_preset+"' references nonexistent saver: "+type);
+	ERR_EXPLAIN("Preset '"+p_preset+"' references nonexistent saver: "+type);
 	ERR_FAIL_COND_V(saver.is_null(),ERR_INVALID_DATA);
 
 	List<Variant> keys;
@@ -3334,8 +3335,8 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres
 
 		current_option=-1;
 		//accept->get_cancel()->hide();
-		accept->get_ok()->set_text(TTR("I see.."));
-		accept->set_text(TTR("Couldn't save scene. Likely dependencies (instances) couldn't be satisfied."));
+		accept->get_ok()->set_text("I see..");
+		accept->set_text("Couldn't save scene. Likely dependencies (instances) couldn't be satisfied.");
 		accept->popup_centered(Size2(300,70));;
 		return ERR_INVALID_DATA;
 
@@ -3345,8 +3346,8 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres
 	if (err) {
 
 		//accept->"()->hide();
-		accept->get_ok()->set_text(TTR("I see.."));
-		accept->set_text(TTR("Error saving optimized scene: ")+path);
+		accept->get_ok()->set_text("I see..");
+		accept->set_text("Error saving optimized scene: "+path);
 		accept->popup_centered(Size2(300,70));;
 
 		ERR_FAIL_COND_V(err,err);
@@ -3635,7 +3636,7 @@ Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bo
 
 	for (Map<String,Set<String> >::Element *E=dependency_errors.front();E;E=E->next()) {
 
-		String txt=TTR("Scene '")+E->key()+"' has broken dependencies:\n";
+		String txt=vformat(TTR("Scene '%s' has broken dependencies:"),E->key())+"\n";
 		for(Set<String>::Element *F=E->get().front();F;F=F->next()) {
 			txt+="\t"+F->get()+"\n";
 		}
@@ -3916,8 +3917,8 @@ void EditorNode::_save_optimized() {
 	if (err) {
 
 		//accept->"()->hide();
-		accept->get_ok()->set_text(TTR("I see.."));
-		accept->set_text(TTR("Error saving optimized scene: ")+path);
+		accept->get_ok()->set_text("I see..");
+		accept->set_text("Error saving optimized scene: "+path);
 		accept->popup_centered(Size2(300,70));;
 		return;
 
@@ -4949,7 +4950,7 @@ Variant EditorNode::drag_files(const Vector<String>& p_files, Control *p_from){
 	if (p_files.size()>max_files) {
 
 		Label* label=memnew( Label );
-		label->set_text(itos(p_files.size()-max_files)+" "+TTR("More File(s)"));
+		label->set_text(vformat(TTR("%d more file(s)"), p_files.size()-max_files));
 		files->add_child(label);
 
 	}
@@ -4980,7 +4981,7 @@ Variant EditorNode::drag_files_and_dirs(const Vector<String>& p_files, Control *
 	if (p_files.size()>max_files) {
 
 		Label* label=memnew( Label );
-		label->set_text(itos(p_files.size()-max_files)+" "+TTR("More File(s) and/or Directory(s)"));
+		label->set_text(vformat(TTR("%d more file(s) or folder(s)"), p_files.size()-max_files));
 		files->add_child(label);
 
 	}
@@ -5151,7 +5152,7 @@ EditorNode::EditorNode() {
 	ObjectTypeDB::set_type_enabled("CollisionShape",true);
 	ObjectTypeDB::set_type_enabled("CollisionShape2D",true);
 	ObjectTypeDB::set_type_enabled("CollisionPolygon2D",true);
-	//ObjectTypeDB::set_type_enabled(TTR("BodyVolumeConvexPolygon"),true);
+	//ObjectTypeDB::set_type_enabled("BodyVolumeConvexPolygon",true);
 
 	gui_base = memnew( Panel );
 	add_child(gui_base);
@@ -5512,20 +5513,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");
@@ -5543,7 +5544,7 @@ EditorNode::EditorNode() {
 	p->connect("item_pressed",this,"_menu_option");
 
 	tool_menu = memnew( MenuButton );
-	tool_menu->set_tooltip(TTR("Miscelaneous project or scene wide tools."));
+	tool_menu->set_tooltip(TTR("Miscellaneous project or scene-wide tools."));
 	tool_menu->set_text(TTR("Tools"));
 
 	//tool_menu->set_icon(gui_base->get_icon("Save","EditorIcons"));
@@ -5602,6 +5603,7 @@ EditorNode::EditorNode() {
 	pause_button->set_disabled(true);
 	play_hb->add_child(pause_button);
 
+
 	stop_button = memnew( ToolButton );
 	play_hb->add_child(stop_button);
 	//stop_button->set_toggle_mode(true);
@@ -5636,7 +5638,7 @@ EditorNode::EditorNode() {
 	play_custom_scene_button->set_focus_mode(Control::FOCUS_NONE);
 	play_custom_scene_button->set_icon(gui_base->get_icon("PlayCustom","EditorIcons"));
 	play_custom_scene_button->connect("pressed", this,"_menu_option",make_binds(RUN_PLAY_CUSTOM_SCENE));
-	play_custom_scene_button->set_tooltip(TTR("Play custom scene (")+keycode_get_string(KEY_MASK_CMD|KEY_MASK_SHIFT|KEY_F5)+").");
+	play_custom_scene_button->set_tooltip(TTR("Play custom scene")+" ("+keycode_get_string(KEY_MASK_CMD|KEY_MASK_SHIFT|KEY_F5)+").");
 
 	debug_button = memnew( MenuButton );
 	debug_button->set_flat(true);
@@ -5645,7 +5647,7 @@ EditorNode::EditorNode() {
 	debug_button->set_focus_mode(Control::FOCUS_NONE);
 	debug_button->set_icon(gui_base->get_icon("Remote","EditorIcons"));
 	//debug_button->connect("pressed", this,"_menu_option",make_binds(RUN_LIVE_DEBUG));
-	debug_button->set_tooltip(TTR("Debug Options"));
+	debug_button->set_tooltip(TTR("Debug options"));
 
 	p=debug_button->get_popup();
 	p->add_check_item(TTR("Live Editing"),RUN_LIVE_DEBUG);
@@ -5723,9 +5725,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");
@@ -5783,7 +5785,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);
@@ -5817,21 +5819,21 @@ EditorNode::EditorNode() {
 	prop_editor_base->add_child(prop_editor_hb);
 
 	resource_new_button = memnew( ToolButton );
-	resource_new_button->set_tooltip(TTR("Create a new resource in memory and edit it"));
+	resource_new_button->set_tooltip(TTR("Create a new resource in memory and edit it."));
 	resource_new_button->set_icon(gui_base->get_icon("New","EditorIcons"));
 	prop_editor_hb->add_child(resource_new_button);
 	resource_new_button->connect("pressed",this,"_menu_option",varray(RESOURCE_NEW));
 	resource_new_button->set_focus_mode(Control::FOCUS_NONE);
 
 	resource_load_button = memnew( ToolButton );
-	resource_load_button->set_tooltip(TTR("Load an existing resource from disk and edit it"));
+	resource_load_button->set_tooltip(TTR("Load an existing resource from disk and edit it."));
 	resource_load_button->set_icon(gui_base->get_icon("Load","EditorIcons"));
 	prop_editor_hb->add_child(resource_load_button);
 	resource_load_button->connect("pressed",this,"_menu_option",varray(RESOURCE_LOAD));
 	resource_load_button->set_focus_mode(Control::FOCUS_NONE);
 
 	resource_save_button = memnew( MenuButton );
-	resource_save_button->set_tooltip(TTR("Save the currently edited resource"));
+	resource_save_button->set_tooltip(TTR("Save the currently edited resource."));
 	resource_save_button->set_icon(gui_base->get_icon("Save","EditorIcons"));
 	prop_editor_hb->add_child(resource_save_button);
 	resource_save_button->get_popup()->add_item(TTR("Save"),RESOURCE_SAVE);
@@ -5860,7 +5862,7 @@ EditorNode::EditorNode() {
 
 
 	editor_history_menu = memnew( MenuButton );
-	editor_history_menu->set_tooltip(TTR("History of recently edited objects"));
+	editor_history_menu->set_tooltip(TTR("History of recently edited objects."));
 	editor_history_menu->set_icon( gui_base->get_icon("History","EditorIcons"));
 	prop_editor_hb->add_child(editor_history_menu);
 	editor_history_menu->connect("about_to_show",this,"_prepare_history");
@@ -5896,7 +5898,7 @@ EditorNode::EditorNode() {
 	prop_editor_base->add_child(search_bar);
 	search_bar->hide();
 
-	Label *l = memnew( Label(TTR("Search: ")) );
+	Label *l = memnew( Label(TTR("Search:")+" ") );
 	search_bar->add_child(l);
 
 	search_box = memnew( LineEdit );
@@ -6081,7 +6083,7 @@ EditorNode::EditorNode() {
 
 
 	about = memnew( AcceptDialog );
-	about->set_title(TTR("Thanks so Much!"));
+	about->set_title(TTR("Thanks from the Godot community!"));
 	//about->get_cancel()->hide();
 	about->get_ok()->set_text(TTR("Thanks!"));
 	about->set_hide_on_ok(true);
@@ -6101,7 +6103,7 @@ EditorNode::EditorNode() {
 
 
 	file_templates = memnew( FileDialog );
-	file_templates->set_title(TTR("Import Templates from ZIP file"));
+	file_templates->set_title(TTR("Import Templates From ZIP File"));
 
 	gui_base->add_child( file_templates );
 	file_templates->set_mode(FileDialog::MODE_OPEN_FILE);
@@ -6396,7 +6398,7 @@ EditorNode::EditorNode() {
 
 
 EditorNode::~EditorNode() {
-        
+
 	memdelete( EditorHelp::get_doc_data() );
 	memdelete(editor_selection);
 	memdelete(editor_plugins_over);
@@ -6462,6 +6464,6 @@ EditorPluginList::EditorPluginList() {
 
 EditorPluginList::~EditorPluginList() {
 }
-        
+
 
 
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h
index 5bd6ef0bdf..8c83d1b556 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<EditorPlugin*> p_editor_plugins_over);
 	void _set_editing_top_editors(Object * p_current_object);
-        
+
 	void _quick_opened();
 	void _quick_run();
 
@@ -748,7 +748,7 @@ public:
 	EditorPluginList();
 	~EditorPluginList();
 
-} ; 
+} ;
 
 struct EditorProgressBG {
 
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/editor_run_script.cpp b/tools/editor/editor_run_script.cpp
index 65aaf3d734..d34cac1530 100644
--- a/tools/editor/editor_run_script.cpp
+++ b/tools/editor/editor_run_script.cpp
@@ -9,12 +9,12 @@
 void EditorScript::add_root_node(Node *p_node) {
 
 	if (!editor) {
-		EditorNode::add_io_error(TTR("EditorScript::add_root_node : Write your logic in the _run() method."));
+		EditorNode::add_io_error("EditorScript::add_root_node: "+TTR("Write your logic in the _run() method."));
 		return;
 	}
 
 	if (editor->get_edited_scene()) {
-		EditorNode::add_io_error(TTR("EditorScript::add_root_node : There is an edited scene already."));
+		EditorNode::add_io_error("EditorScript::add_root_node: "+TTR("There is an edited scene already."));
 		return;
 	}
 
@@ -24,7 +24,7 @@ void EditorScript::add_root_node(Node *p_node) {
 Node *EditorScript::get_scene() {
 
 	if (!editor) {
-		EditorNode::add_io_error(TTR("EditorScript::get_scene : Write your logic in the _run() method."));
+		EditorNode::add_io_error("EditorScript::get_scene: "+TTR("Write your logic in the _run() method."));
 		return NULL;
 	}
 
@@ -36,7 +36,7 @@ void EditorScript::_run() {
 	Ref<Script> s = get_script();
 	ERR_FAIL_COND(!s.is_valid());
 	if (!get_script_instance()) {
-		EditorNode::add_io_error("Couldn't instance script:\n "+s->get_path()+"\nDid you forget the 'tool' keyword?");
+		EditorNode::add_io_error(TTR("Couldn't instance script:")+"\n "+s->get_path()+"\n"+TTR("Did you forget the 'tool' keyword?"));
 		return;
 
 	}
@@ -46,7 +46,7 @@ void EditorScript::_run() {
 	get_script_instance()->call("_run",NULL,0,ce);
 	if (ce.error!=Variant::CallError::CALL_OK) {
 
-		EditorNode::add_io_error("Couldn't run script:\n "+s->get_path()+"\nDid you forget the '_run' method?");
+		EditorNode::add_io_error(TTR("Couldn't run script:")+"\n "+s->get_path()+"\n"+TTR("Did you forget the '_run' method?"));
 	}
 }
 
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index 1d79dddac9..91d7e7ebd4 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -263,7 +263,7 @@ void EditorSettings::create() {
 
 		memdelete(dir);
 
-		singleton = ResourceLoader::load(config_file_path,TTR("EditorSettings"));
+		singleton = ResourceLoader::load(config_file_path,"EditorSettings");
 		if (singleton.is_null()) {
 			WARN_PRINT("Could not open config file.");
 			goto fail;
@@ -464,7 +464,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> 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);
@@ -505,7 +505,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
 #else
 	hints["import/pvrtc_texture_tool"]=PropertyInfo(Variant::STRING,"import/pvrtc_texture_tool",PROPERTY_HINT_GLOBAL_FILE,"");
 #endif
-	set(TTR("PVRTC/fast_conversion"),false);
+	// TODO: Rename to "import/pvrtc_fast_conversion" to match other names?
+	set("PVRTC/fast_conversion",false);
 
 
 	set("run/auto_save_before_running",true);
diff --git a/tools/editor/editor_sub_scene.cpp b/tools/editor/editor_sub_scene.cpp
index 941ff6be1c..d32dbcd2e6 100644
--- a/tools/editor/editor_sub_scene.cpp
+++ b/tools/editor/editor_sub_scene.cpp
@@ -198,7 +198,7 @@ EditorSubScene::EditorSubScene() {
 
 	scene=NULL;
 
-	set_title(TTR("Select Sub-Scene.."));
+	set_title(TTR("Select Node(s) to Import"));
 	set_hide_on_ok(false);
 
 	VBoxContainer *vb = memnew( VBoxContainer );
diff --git a/tools/editor/import_settings.cpp b/tools/editor/import_settings.cpp
index 3b3ebb0ad7..dfaeca03db 100644
--- a/tools/editor/import_settings.cpp
+++ b/tools/editor/import_settings.cpp
@@ -278,7 +278,7 @@ ImportSettingsDialog::ImportSettingsDialog(EditorNode *p_editor) {
 	set_child_rect(tree);
 	set_title(TTR("Imported Resources"));
 
-	texformat=TTR("Keep,None,Disk,VRAM");
+//	texformat="Keep,None,Disk,VRAM";
 
 	tree->set_hide_root(true);
 	tree->set_columns(2);
@@ -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 970b8fe0ca..6ac67ab8a6 100644
--- a/tools/editor/io_plugins/editor_font_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_font_import_plugin.cpp
@@ -527,7 +527,7 @@ class EditorFontImportDialog : public ConfirmationDialog {
 		Ref<ResourceImportMetadata> rimd = get_rimd();
 
 		if (rimd.is_null()) {
-			error_dialog->set_text(TTR("Can't load/process source font"));
+			error_dialog->set_text(TTR("Can't load/process source font."));
 			error_dialog->popup_centered(Size2(200,100));
 			return;
 		}
@@ -657,14 +657,14 @@ public:
 		testhb->add_child(test_color);
 
 		vbl->add_spacer();
-		vbl->add_margin_child(TTR("Test: "),testhb);
+		vbl->add_margin_child(TTR("Test:")+" ",testhb);
 		/*
 		HBoxContainer *upd_hb = memnew( HBoxContainer );
 //		vbl->add_child(upd_hb);
 		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 );
@@ -887,7 +887,7 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe
 	if (src_path.extension().to_lower()=="fnt") {
 
 		if (ResourceLoader::load(src_path).is_valid()) {
-			EditorNode::get_singleton()->show_warning(TTR("Path: ")+src_path+"\nIs a Godot font file, please supply a BMFont type file instead.");
+			EditorNode::get_singleton()->show_warning(TTR("Path:")+" "+src_path+"\n"+TTR("This file is already a Godot font file, please supply a BMFont type file instead."));
 			return Ref<BitmapFont>();
 		}
 
@@ -895,7 +895,7 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe
 		font.instance();
 		Error err = font->create_from_fnt(src_path);
 		if (err) {
-			EditorNode::get_singleton()->show_warning(TTR("Path: ")+src_path+"\nFailed opening as BMFont file.");
+			EditorNode::get_singleton()->show_warning(TTR("Path:")+" "+src_path+"\n"+TTR("Failed opening as BMFont file."));
 			return Ref<BitmapFont>();
 		}
 
@@ -939,7 +939,7 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe
 
 	if ( error ) {
 		FT_Done_FreeType( library );
-		ERR_EXPLAIN(TTR("Invalid font size. "));
+		ERR_EXPLAIN(TTR("Invalid font size."));
 		ERR_FAIL_COND_V( error,Ref<BitmapFont>() );
 
 	}
@@ -986,7 +986,7 @@ Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMe
 		if ( !fa ) {
 
 			FT_Done_FreeType( library );
-			ERR_EXPLAIN(TTR("Invalid font custom source. "));
+			ERR_EXPLAIN(TTR("Invalid font custom source."));
 			ERR_FAIL_COND_V( !fa,Ref<BitmapFont>() );
 
 		}
diff --git a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
index e628bed2dd..9af7d8daa5 100644
--- a/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_mesh_import_plugin.cpp
@@ -207,6 +207,13 @@ public:
 			return;
 		}
 
+		String dst = save_path->get_text();
+		if (dst=="") {
+			error_dialog->set_text(TTR("Save path is empty!"));
+			error_dialog->popup_centered_minsize();
+			return;
+		}
+
 		for(int i=0;i<meshes.size();i++) {
 
 			Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
@@ -224,16 +231,9 @@ public:
 
 			imd->add_source(EditorImportPlugin::validate_source_path(meshes[i]));
 
-			String dst = save_path->get_text();
-			if (dst=="") {
-				error_dialog->set_text(TTR("Save path is empty!"));
-				error_dialog->popup_centered_minsize();
-				return;
-			}
-
-			dst = dst.plus_file(meshes[i].get_file().basename()+".msh");
+			String file_path = dst.plus_file(meshes[i].get_file().basename()+".msh");
 
-			plugin->import(dst,imd);
+			plugin->import(file_path,imd);
 		}
 
 		hide();
@@ -362,7 +362,7 @@ Error EditorMeshImportPlugin::import(const String& p_path, const Ref<ResourceImp
 				if (mesh->surface_get_name(i)!="")
 					name=mesh->surface_get_name(i);
 				else
-					name=TTR("Surface ")+itos(i+1);
+					name=vformat(TTR("Surface %d"),i+1);
 
 				name_map[name]=mesh->surface_get_material(i);
 			}
@@ -498,7 +498,7 @@ Error EditorMeshImportPlugin::import(const String& p_path, const Ref<ResourceImp
 				surf_tool->index();
 				mesh = surf_tool->commit(mesh);
 				if (name=="")
-					name=TTR("Surface ")+itos(mesh->get_surface_count()-1);
+					name=vformat(TTR("Surface %d"),mesh->get_surface_count()-1);
 				mesh->surface_set_name(mesh->get_surface_count()-1,name);
 				name="";
 				surf_tool->clear();
diff --git a/tools/editor/io_plugins/editor_sample_import_plugin.cpp b/tools/editor/io_plugins/editor_sample_import_plugin.cpp
index d2939cd556..c608fe906f 100644
--- a/tools/editor/io_plugins/editor_sample_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_sample_import_plugin.cpp
@@ -262,7 +262,7 @@ public:
 		}
 
 		if (!save_path->get_text().begins_with("res://")) {
-			error_dialog->set_text(TTR("Target path must be full resource path."));
+			error_dialog->set_text(TTR("Target path must be a complete resource path."));
 			error_dialog->popup_centered_minsize();
 			return;
 		}
@@ -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 1843fbf612..84ef5f1973 100644
--- a/tools/editor/io_plugins/editor_scene_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_scene_import_plugin.cpp
@@ -686,7 +686,7 @@ void EditorSceneImportDialog::_import(bool p_and_open) {
 	}
 
 	if (!save_path->get_text().begins_with("res://")) {
-		error_dialog->set_text(TTR("Target path must be full resource path."));
+		error_dialog->set_text(TTR("Target path must be a complete resource path."));
 		error_dialog->popup_centered_minsize();
 		return;
 	}
@@ -721,7 +721,7 @@ void EditorSceneImportDialog::_import(bool p_and_open) {
 	if (script_path->get_text()!="") {
 		Ref<Script> scr = ResourceLoader::load(script_path->get_text());
 		if (!scr.is_valid()) {
-			error_dialog->set_text(TTR("Couldn't load Post-Import Script."));
+			error_dialog->set_text(TTR("Couldn't load post-import script."));
 			error_dialog->popup_centered(Size2(200,100));
 			return;
 		}
@@ -730,7 +730,7 @@ void EditorSceneImportDialog::_import(bool p_and_open) {
 		pi->set_script(scr.get_ref_ptr());
 		if (!pi->get_script_instance()) {
 
-			error_dialog->set_text(TTR("Invalid/Broken Script for Post-Import."));
+			error_dialog->set_text(TTR("Invalid/broken script for post-import."));
 			error_dialog->popup_centered(Size2(200,100));
 			return;
 		}
@@ -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);
@@ -2735,13 +2735,13 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
 		post_import_script_path = post_import_script_path;
 		Ref<Script> scr = ResourceLoader::load(post_import_script_path);
 		if (!scr.is_valid()) {
-			EditorNode::add_io_error(TTR("Couldn't load post-import script: '")+post_import_script_path);
+			EditorNode::add_io_error(TTR("Couldn't load post-import script:")+" "+post_import_script_path);
 		} else {
 
 			post_import_script = Ref<EditorScenePostImport>( memnew( EditorScenePostImport ) );
 			post_import_script->set_script(scr.get_ref_ptr());
 			if (!post_import_script->get_script_instance()) {
-				EditorNode::add_io_error(TTR("Invalid/Broken Script for Post-Import: '")+post_import_script_path);
+				EditorNode::add_io_error(TTR("Invalid/broken script for post-import:")+" "+post_import_script_path);
 				post_import_script.unref();
 			}
 		}
@@ -2751,7 +2751,7 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
 	if (post_import_script.is_valid()) {
 		scene = post_import_script->post_import(scene);
 		if (!scene) {
-			EditorNode::add_io_error(TTR("Error running Post-Import script: '")+post_import_script_path);
+			EditorNode::add_io_error(TTR("Error running post-import script:")+" "+post_import_script_path);
 			return err;
 		}
 
@@ -2780,18 +2780,18 @@ Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, c
 		String path = texture->get_path();
 		String fname= path.get_file();
 		String target_path = Globals::get_singleton()->localize_path(target_res_path.plus_file(fname));
-		progress.step(TTR("Import Img: ")+fname,3+(idx)*100/imagemap.size());
+		progress.step(TTR("Import Image:")+" "+fname,3+(idx)*100/imagemap.size());
 
 		idx++;
 
 		if (path==target_path) {
 
-			EditorNode::add_io_error(TTR("Can't import a file over itself: '")+target_path);
+			EditorNode::add_io_error(TTR("Can't import a file over itself:")+" "+target_path);
 			continue;
 		}
 
 		if (!target_path.begins_with("res://")) {
-			EditorNode::add_io_error(TTR("Couldn't localize path: '")+target_path+"' (already local)");
+			EditorNode::add_io_error(vformat(TTR("Couldn't localize path: %s (already local)"),target_path));
 			continue;
 		}
 
diff --git a/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp b/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp
index 9cedf1c70a..0c388b91ca 100644
--- a/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp
+++ b/tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp
@@ -507,15 +507,15 @@ void EditorSceneImporterFBXConv::_parse_materials(State& state) {
 				if (tex.is_valid() && texture.has("type")) {
 
 					String type=texture["type"];
-					if (type==TTR("DIFFUSE"))
+					if (type=="DIFFUSE")
 						mat->set_texture(FixedMaterial::PARAM_DIFFUSE,tex);
-					else if (type==TTR("SPECULAR"))
+					else if (type=="SPECULAR")
 						mat->set_texture(FixedMaterial::PARAM_SPECULAR,tex);
-					else if (type==TTR("SHININESS"))
+					else if (type=="SHININESS")
 						mat->set_texture(FixedMaterial::PARAM_SPECULAR_EXP,tex);
 					else if (type=="NORMAL")
 						mat->set_texture(FixedMaterial::PARAM_NORMAL,tex);
-					else if (type==TTR("EMISSIVE"))
+					else if (type=="EMISSIVE")
 						mat->set_texture(FixedMaterial::PARAM_EMISSION,tex);
 				}
 
@@ -570,13 +570,13 @@ void EditorSceneImporterFBXConv::_parse_surfaces(State& state) {
 				exists[Mesh::ARRAY_COLOR]=true;
 				ofs[Mesh::ARRAY_COLOR]=stride;
 				stride+=4;
-			} else if (attr==TTR("COLORPACKED")) {
+			} else if (attr=="COLORPACKED") {
 				stride+=1; //ignore
-			} else if (attr==TTR("TANGENT")) {
+			} else if (attr=="TANGENT") {
 				exists[Mesh::ARRAY_TANGENT]=true;
 				ofs[Mesh::ARRAY_TANGENT]=stride;
 				stride+=3;
-			} else if (attr==TTR("BINORMAL")) {
+			} else if (attr=="BINORMAL") {
 				binormal_ofs=stride;
 				stride+=3;
 			} else if (attr=="TEXCOORD0") {
@@ -587,10 +587,10 @@ void EditorSceneImporterFBXConv::_parse_surfaces(State& state) {
 				exists[Mesh::ARRAY_TEX_UV2]=true;
 				ofs[Mesh::ARRAY_TEX_UV2]=stride;
 				stride+=2;
-			} else if (attr.begins_with(TTR("TEXCOORD"))) {
+			} else if (attr.begins_with("TEXCOORD")) {
 				stride+=2;
-			} else if (attr.begins_with(TTR("BLENDWEIGHT"))) {
-				int idx=attr.replace(TTR("BLENDWEIGHT"),"").to_int();
+			} else if (attr.begins_with("BLENDWEIGHT")) {
+				int idx=attr.replace("BLENDWEIGHT","").to_int();
 				if (idx==0) {
 					exists[Mesh::ARRAY_BONES]=true;
 					ofs[Mesh::ARRAY_BONES]=stride;
@@ -799,13 +799,13 @@ void EditorSceneImporterFBXConv::_parse_surfaces(State& state) {
 
 			if (part.has("type")) {
 				String type=part["type"];
-				if (type==TTR("LINES"))
+				if (type=="LINES")
 					pt=Mesh::PRIMITIVE_LINES;
-				else if (type==TTR("POINTS"))
+				else if (type=="POINTS")
 					pt=Mesh::PRIMITIVE_POINTS;
-				else if (type==TTR("TRIANGLE_STRIP"))
+				else if (type=="TRIANGLE_STRIP")
 					pt=Mesh::PRIMITIVE_TRIANGLE_STRIP;
-				else if (type==TTR("LINE_STRIP"))
+				else if (type=="LINE_STRIP")
 					pt=Mesh::PRIMITIVE_LINE_STRIP;
 			}
 
@@ -1056,7 +1056,7 @@ Error EditorSceneImporterFBXConv::_parse_fbx(State& state,const String& p_path)
 	}
 
 	args.push_back("-o");
-	args.push_back(TTR("G3DJ"));
+	args.push_back("G3DJ");
 	args.push_back(path);
 
 	int res;
diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.cpp b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
index 713b92b037..0e2d35b9f2 100644
--- a/tools/editor/io_plugins/editor_texture_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
@@ -53,17 +53,17 @@ static const char *flag_names[]={
 
 #if 0 // not used
 static const char *flag_short_names[]={
-	TTR("Stream"),
-	TTR("FixBorder"),
-	TTR("AlphBit"),
-	TTR("ExtComp"),
-	TTR("NoMipMap"),
-	TTR("Repeat"),
-	TTR("Filter"),
-	TTR("PMAlpha"),
-	TTR("ToLinear"),
-	TTR("ToRG"),
-	TTR("Anisoropic"),
+	"Stream",
+	"FixBorder",
+	"AlphBit",
+	"ExtComp",
+	"NoMipMap",
+	"Repeat",
+	"Filter",
+	"PMAlpha",
+	"ToLinear",
+	"ToRG",
+	"Anisoropic",
 	NULL
 };
 #endif
@@ -343,7 +343,7 @@ void EditorTextureImportDialog::_import() {
 	}
 
 	if (!save_path->get_text().begins_with("res://")) {
-		error_dialog->set_text(TTR("Target path must be full resource path."));
+		error_dialog->set_text(TTR("Target path must be a complete resource path."));
 		error_dialog->popup_centered_minsize();
 		return;
 	}
@@ -382,7 +382,7 @@ void EditorTextureImportDialog::_import() {
 		Error err = plugin->import(dst_file,imd);
 		if (err) {
 
-			error_dialog->set_text(TTR("Error importing: ")+dst_file.get_file());
+			error_dialog->set_text(TTR("Error importing:")+" "+dst_file.get_file());
 			error_dialog->popup_centered(Size2(200,100));
 			return;
 
@@ -391,7 +391,7 @@ void EditorTextureImportDialog::_import() {
 
 		if (files.size()!=1) {
 
-			error_dialog->set_text(TTR("Only one file is required for large texture"));
+			error_dialog->set_text(TTR("Only one file is required for large texture."));
 			error_dialog->popup_centered(Size2(200,100));
 			return;
 
@@ -414,7 +414,7 @@ void EditorTextureImportDialog::_import() {
 		Error err = plugin->import(dst_file,imd);
 		if (err) {
 
-			error_dialog->set_text(TTR("Error importing: ")+dst_file.get_file());
+			error_dialog->set_text(TTR("Error importing:")+" "+dst_file.get_file());
 			error_dialog->popup_centered(Size2(200,100));
 			return;
 
@@ -438,7 +438,7 @@ void EditorTextureImportDialog::_import() {
 			Error err = plugin->import(dst_file,imd);
 			if (err) {
 
-				error_dialog->set_text(TTR("Error importing: ")+dst_file.get_file());
+				error_dialog->set_text(TTR("Error importing:")+" "+dst_file.get_file());
 				error_dialog->popup_centered(Size2(200,100));
 				return;
 
@@ -499,7 +499,7 @@ void EditorTextureImportDialog::_notification(int p_what) {
 
 		List<String> extensions;
 		ImageLoader::get_recognized_extensions(&extensions);
-	//	ResourceLoader::get_recognized_extensions_for_type(TTR("PackedTexture"),&extensions);
+	//	ResourceLoader::get_recognized_extensions_for_type("PackedTexture",&extensions);
 		file_select->clear_filters();
 		for(int i=0;i<extensions.size();i++) {
 
@@ -579,7 +579,7 @@ EditorTextureImportDialog::EditorTextureImportDialog(EditorTextureImportPlugin*
 
 	if (p_atlas) {
 		size->set_val(2048);
-		vbc->add_margin_child(TTR("Max Texture size:"),size);
+		vbc->add_margin_child(TTR("Max Texture Size:"),size);
 	} else {
 		size->set_val(256);
 		vbc->add_margin_child(TTR("Cell Size:"),size);
@@ -612,9 +612,9 @@ EditorTextureImportDialog::EditorTextureImportDialog(EditorTextureImportPlugin*
 	save_file_select->set_mode(EditorFileDialog::MODE_SAVE_FILE);
 	save_file_select->clear_filters();
 	if (large)
-		save_file_select->add_filter("*.ltex;Large Texture");
+		save_file_select->add_filter("*.ltex;"+TTR("Large Texture"));
 	else
-		save_file_select->add_filter("*.tex;Base Atlas Texture");
+		save_file_select->add_filter("*.tex;"+TTR("Base Atlas Texture"));
 	save_file_select->connect("file_selected", this,"_choose_save_dir");
 
 	save_select = memnew(	EditorDirDialog );
@@ -1057,7 +1057,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 
 		err = ResourceSaver::save(p_path,existing);
 		if (err!=OK) {
-			EditorNode::add_io_error(TTR("Couldn't save large texture: ")+p_path);
+			EditorNode::add_io_error(TTR("Couldn't save large texture:")+" "+p_path);
 			return err;
 		}
 
@@ -1072,7 +1072,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 		bool alpha=false;
 		bool crop = from->get_option("crop");
 
-		EditorProgress ep("make_atlas",TTR("Build Atlas For: ")+p_path.get_file(),from->get_source_count()+3);
+		EditorProgress ep("make_atlas",TTR("Build Atlas For:")+" "+p_path.get_file(),from->get_source_count()+3);
 
 		print_line("sources: "+itos(from->get_source_count()));
 
@@ -1081,12 +1081,12 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 			String path = EditorImportPlugin::expand_source_path(from->get_source_path(i));
 			String md5 = FileAccess::get_md5(path);
 			from->set_source_md5(i,FileAccess::get_md5(path));
-			ep.step(TTR("Loading Image: ")+path,i);
+			ep.step(TTR("Loading Image:")+" "+path,i);
 			print_line("source path: "+path+" md5 "+md5);
 			Image src;
 			Error err = ImageLoader::load_image(path,&src);
 			if (err) {
-				EditorNode::add_io_error(TTR("Couldn't load image: ")+path);
+				EditorNode::add_io_error(TTR("Couldn't load image:")+" "+path);
 				return err;
 			}
 
@@ -1176,7 +1176,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 		Size2i dst_size;
 		EditorAtlas::fit(src_sizes,dst_positions,dst_size);
 
-		print_line("size that workeD: "+itos(dst_size.width)+","+itos(dst_size.height));
+		print_line("size that worked: "+itos(dst_size.width)+","+itos(dst_size.height));
 
 		ep.step(TTR("Blitting Images"),sources.size()+2);
 
@@ -1291,7 +1291,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 				atlases[i]->set_atlas(texture);
 				Error err = ResourceSaver::save(apath,atlases[i]);
 				if (err) {
-					EditorNode::add_io_error(TTR("Couldn't save atlas image: ")+apath);
+					EditorNode::add_io_error(TTR("Couldn't save atlas image:")+" "+apath);
 					return err;
 				}
 				//from->set_source_md5(i,FileAccess::get_md5(apath));
@@ -1433,7 +1433,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 
 	Error err = ResourceSaver::save(p_path,texture,save_flags);
 	if (err!=OK) {
-		EditorNode::add_io_error(TTR("Couldn't save converted texture: ")+p_path);
+		EditorNode::add_io_error(TTR("Couldn't save converted texture:")+" "+p_path);
 		return err;
 	}
 
diff --git a/tools/editor/io_plugins/editor_translation_import_plugin.cpp b/tools/editor/io_plugins/editor_translation_import_plugin.cpp
index 03abc3a82b..b57e4cb84c 100644
--- a/tools/editor/io_plugins/editor_translation_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_translation_import_plugin.cpp
@@ -236,7 +236,7 @@ public:
 		}
 
 		if (!save_path->get_text().begins_with("res://")) {
-			error_dialog->set_text(TTR("No target path!!"));
+			error_dialog->set_text(TTR("No target path!"));
 			error_dialog->popup_centered(Size2(200,100));
 		}
 
@@ -258,7 +258,7 @@ public:
 			String savefile = save_path->get_text().plus_file(import_path->get_text().get_file().basename()+"."+locale+".xl");
 			Error err = plugin->import(savefile,imd);
 			if (err!=OK) {
-				error_dialog->set_text(TTR("Couldnt import!"));
+				error_dialog->set_text(TTR("Couldn't import!"));
 				error_dialog->popup_centered(Size2(200,100));
 			} else if (add_to_project->is_pressed()) {
 
diff --git a/tools/editor/multi_node_edit.cpp b/tools/editor/multi_node_edit.cpp
index 54697d41ab..b5bae82ae0 100644
--- a/tools/editor/multi_node_edit.cpp
+++ b/tools/editor/multi_node_edit.cpp
@@ -9,7 +9,7 @@ bool MultiNodeEdit::_set(const StringName& p_name, const Variant& p_value){
 
 	UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
 
-	ur->create_action(TTR("MultiNode Set ")+String(p_name));
+	ur->create_action(TTR("MultiNode Set")+" "+String(p_name));
 	for (const List<NodePath>::Element *E=nodes.front();E;E=E->next()) {
 
 		if (!es->has_node(E->get()))
diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp
index 77bd5d0fef..343fcce5cd 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.cpp
+++ b/tools/editor/plugins/animation_player_editor_plugin.cpp
@@ -496,7 +496,7 @@ void AnimationPlayerEditor::_animation_name_edited() {
 	}
 
 	if (player->has_animation(new_name)) {
-		error_dialog->set_text(TTR("ERROR: Animation Name Already Exists!"));
+		error_dialog->set_text(TTR("ERROR: Animation name already exists!"));
 		error_dialog->popup_centered_minsize();
 		return;
 	}
@@ -1022,7 +1022,7 @@ void AnimationPlayerEditor::_editor_store() {
 		return; //already there
 
 
-	undo_redo->create_action(TTR("Store anim in editor"));
+	undo_redo->create_action("Store anim in editor");
 	undo_redo->add_do_method(key_editor,"set_animation",anim);
 	undo_redo->add_undo_method(key_editor,"remove_animation",anim);
 	undo_redo->commit_action();
@@ -1044,7 +1044,7 @@ void AnimationPlayerEditor::_editor_load(){
 	String base=anim->get_name();
 	bool noname=false;
 	if (base=="") {
-		base=TTR("New Anim");
+		base="New Anim";
 		noname=true;
 	}
 
@@ -1063,7 +1063,7 @@ void AnimationPlayerEditor::_editor_load(){
 	if (noname)
 		anim->set_name(base);
 
-	undo_redo->create_action(TTR("Add Animation From Editor"));
+	undo_redo->create_action("Add Animation From Editor");
 	undo_redo->add_do_method(player,"add_animation",base,anim);
 	undo_redo->add_undo_method(player,"remove_animation",base);
 	undo_redo->add_do_method(this,"_animation_player_changed",player);
@@ -1298,7 +1298,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
 	Label * l;
 
 	/*l= memnew( Label );
-	l->set_text(TTR("Animation Player:"));
+	l->set_text("Animation Player:");
 	add_child(l);*/
 
 	HBoxContainer *hb = memnew( HBoxContainer );
@@ -1306,11 +1306,11 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
 
 
 	play_bw_from = memnew( ToolButton );
-	play_bw_from->set_tooltip(TTR("Play backwards selected animation from current pos. (A)"));
+	play_bw_from->set_tooltip(TTR("Play selected animation backwards from current pos. (A)"));
 	hb->add_child(play_bw_from);
 
 	play_bw = memnew( ToolButton );
-	play_bw->set_tooltip(TTR("Play backwards selected animation from end. (Shift+A)"));
+	play_bw->set_tooltip(TTR("Play selected animation backwards from end. (Shift+A)"));
 	hb->add_child(play_bw);
 
 	stop = memnew( ToolButton );
@@ -1391,7 +1391,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
 
 	autoplay = memnew( ToolButton );
 	hb->add_child(autoplay);
-	autoplay->set_tooltip(TTR("Autoplay On Load"));
+	autoplay->set_tooltip(TTR("Autoplay on Load"));
 
 
 
@@ -1405,7 +1405,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
 	tool_anim->get_popup()->add_item(TTR("Copy Animation"),TOOL_COPY_ANIM);
 	tool_anim->get_popup()->add_item(TTR("Paste Animation"),TOOL_PASTE_ANIM);
 	//tool_anim->get_popup()->add_separator();
-	//tool_anim->get_popup()->add_item(TTR("Edit Anim Resource"),TOOL_PASTE_ANIM);
+	//tool_anim->get_popup()->add_item("Edit Anim Resource",TOOL_PASTE_ANIM);
 	hb->add_child(tool_anim);
 
 	nodename = memnew( Button );
@@ -1444,7 +1444,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
 
 	error_dialog = memnew( ConfirmationDialog );
 	error_dialog->get_ok()->set_text(TTR("Close"));
-	//error_dialog->get_cancel()->set_text(TTR("Close"));
+	//error_dialog->get_cancel()->set_text("Close");
 	error_dialog->set_text(TTR("Error!"));
 	add_child(error_dialog);
 
@@ -1459,7 +1459,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
 	blend_editor.dialog->set_child_rect(blend_vb);
 	blend_editor.tree = memnew( Tree );
 	blend_editor.tree->set_columns(2);
-	blend_vb->add_margin_child(TTR("Blend Times: "),blend_editor.tree,true);
+	blend_vb->add_margin_child(TTR("Blend Times:"),blend_editor.tree,true);
 	blend_editor.next = memnew( OptionButton );
 	blend_vb->add_margin_child(TTR("Next (Auto Queue):"),blend_editor.next);
 	blend_editor.dialog->set_title(TTR("Cross-Animation Blend Times"));
diff --git a/tools/editor/plugins/animation_player_editor_plugin.h b/tools/editor/plugins/animation_player_editor_plugin.h
index 9583f3e663..3f3cda25b2 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.h
+++ b/tools/editor/plugins/animation_player_editor_plugin.h
@@ -203,7 +203,7 @@ public:
 	virtual Dictionary get_state() const { return anim_editor->get_state(); }
 	virtual void set_state(const Dictionary& p_state)  { anim_editor->set_state(p_state); }
 
-	virtual String get_name() const { return TTR("Anim"); }
+	virtual String get_name() const { return "Anim"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_node);
 	virtual bool handles(Object *p_node) const;
diff --git a/tools/editor/plugins/animation_tree_editor_plugin.cpp b/tools/editor/plugins/animation_tree_editor_plugin.cpp
index dc857bfacb..a381ec4678 100644
--- a/tools/editor/plugins/animation_tree_editor_plugin.cpp
+++ b/tools/editor/plugins/animation_tree_editor_plugin.cpp
@@ -990,12 +990,12 @@ void AnimationTreeEditor::_notification(int p_what) {
 				case AnimationTreePlayer::CONNECT_OK: {
 
 					Ref<Font> f = get_font("font","Label");
-					f->draw(get_canvas_item(),Point2(5,25+f->get_ascent()),TTR("Animation Tree is Valid."),Color(0,1,0.6,0.8));
+					f->draw(get_canvas_item(),Point2(5,25+f->get_ascent()),TTR("Animation tree is valid."),Color(0,1,0.6,0.8));
 				} break;
 				default: {
 
 					   Ref<Font> f = get_font("font","Label");
-					   f->draw(get_canvas_item(),Point2(5,25+f->get_ascent()),TTR("Animation Tree is Invalid."),Color(1,0.6,0.0,0.8));
+					   f->draw(get_canvas_item(),Point2(5,25+f->get_ascent()),TTR("Animation tree is invalid."),Color(1,0.6,0.0,0.8));
 				} break;
 			}
 
@@ -1369,7 +1369,7 @@ AnimationTreeEditor::AnimationTreeEditor() {
 	p->add_item(TTR("TimeSeek Node"),AnimationTreePlayer::NODE_TIMESEEK);
 	p->add_item(TTR("Transition Node"),AnimationTreePlayer::NODE_TRANSITION);
 	p->add_separator();
-	p->add_item(TTR("Import Animations..."), MENU_IMPORT_ANIMATIONS); // wtf
+	p->add_item(TTR("Import Animations.."), MENU_IMPORT_ANIMATIONS); // wtf
 	p->add_separator();
 	p->add_item(TTR("Clear"),MENU_GRAPH_CLEAR);
 
@@ -1524,7 +1524,7 @@ AnimationTreeEditorPlugin::AnimationTreeEditorPlugin(EditorNode *p_node) {
 	anim_tree_editor = memnew( AnimationTreeEditor );
 	anim_tree_editor->set_custom_minimum_size(Size2(0,300));
 
-	button=editor->add_bottom_panel_item(TTR("AnimationTree"),anim_tree_editor);
+	button=editor->add_bottom_panel_item("AnimationTree",anim_tree_editor);
 	button->hide();
 
 
diff --git a/tools/editor/plugins/animation_tree_editor_plugin.h b/tools/editor/plugins/animation_tree_editor_plugin.h
index 989a6b0b04..4884a22d90 100644
--- a/tools/editor/plugins/animation_tree_editor_plugin.h
+++ b/tools/editor/plugins/animation_tree_editor_plugin.h
@@ -180,7 +180,7 @@ class AnimationTreeEditorPlugin : public EditorPlugin {
 
 public:
 
-	virtual String get_name() const { return TTR("AnimTree"); }
+	virtual String get_name() const { return "AnimTree"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_node);
 	virtual bool handles(Object *p_node) const;
diff --git a/tools/editor/plugins/baked_light_baker.cpp b/tools/editor/plugins/baked_light_baker.cpp
index c7ae98e919..b6bb774364 100644
--- a/tools/editor/plugins/baked_light_baker.cpp
+++ b/tools/editor/plugins/baked_light_baker.cpp
@@ -728,14 +728,14 @@ void BakedLightBaker::_make_octree() {
 	for(int i=0;i<8;i++)
 		root->children[i]=0;
 
-	EditorProgress ep("bake_octree",TTR("Parsing ")+itos(triangles.size())+" Triangles:",triangles.size());
+	EditorProgress ep("bake_octree",vformat(TTR("Parsing %d Triangles:"), triangles.size()),triangles.size());
 
 	for(int i=0;i<triangles.size();i++) {
 
 		_octree_insert(0,&triangles[i],octree_depth-1);
 		if ((i%1000)==0) {
 
-			ep.step(TTR("Triangle# ")+itos(i),i);
+			ep.step(TTR("Triangle #")+itos(i),i);
 		}
 	}
 
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp
index 0213dbda59..1b6d94b2cf 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp
@@ -1906,7 +1906,7 @@ void CanvasItemEditor::_viewport_draw() {
 		if (h_scroll->is_visible())
 			size.height-=h_scroll->get_size().height;
 
-		get_stylebox(TTR("EditorFocus"),"EditorStyles")->draw(ci,Rect2(Point2(),size));
+		get_stylebox("EditorFocus","EditorStyles")->draw(ci,Rect2(Point2(),size));
 	}
 
 	Ref<Texture> lock = get_icon("Lock","EditorIcons");
@@ -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();
@@ -3285,7 +3285,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	hb->add_child(select_button);
 	select_button->connect("pressed",this,"_tool_select",make_binds(TOOL_SELECT));
 	select_button->set_pressed(true);
-	select_button->set_tooltip("Select Mode (Q)\n"+keycode_get_string(KEY_MASK_CMD)+"Drag: Rotate\nAlt+Drag: Move\nPress 'v' to Change Pivot, 'Shift+v' to Drag Pivot (while moving).\nAlt+RMB: Depth list selection");
+	select_button->set_tooltip(TTR("Select Mode (Q)")+"\n"+keycode_get_string(KEY_MASK_CMD)+TTR("Drag: Rotate")+"\n"+TTR("Alt+Drag: Move")+"\n"+TTR("Press 'v' to Change Pivot, 'Shift+v' to Drag Pivot (while moving).")+"\n"+TTR("Alt+RMB: Depth list selection"));
 
 
 	move_button = memnew( ToolButton );
@@ -3306,13 +3306,13 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	list_select_button->set_toggle_mode(true);
 	hb->add_child(list_select_button);
 	list_select_button->connect("pressed",this,"_tool_select",make_binds(TOOL_LIST_SELECT));
-	list_select_button->set_tooltip("Show a list of all objects at the position clicked\n(same as Alt+RMB in selet mode).");
+	list_select_button->set_tooltip(TTR("Show a list of all objects at the position clicked\n(same as Alt+RMB in select mode)."));
 
 	pivot_button = memnew( ToolButton );
 	pivot_button->set_toggle_mode(true);
 	hb->add_child(pivot_button);
 	pivot_button->connect("pressed",this,"_tool_select",make_binds(TOOL_EDIT_PIVOT));
-	pivot_button->set_tooltip(TTR("Click to change object's rotation pivot"));
+	pivot_button->set_tooltip(TTR("Click to change object's rotation pivot."));
 
 	pan_button = memnew( ToolButton );
 	pan_button->set_toggle_mode(true);
@@ -3326,7 +3326,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	hb->add_child(lock_button);
 
 	lock_button->connect("pressed",this,"_popup_callback",varray(LOCK_SELECTED));
-	lock_button->set_tooltip("Lock the selected object in-place (can't be moved).");
+	lock_button->set_tooltip(TTR("Lock the selected object in place (can't be moved)."));
 
 	unlock_button = memnew( ToolButton );
 	hb->add_child(unlock_button);
@@ -3336,12 +3336,12 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	group_button = memnew( ToolButton );
 	hb->add_child(group_button);
 	group_button->connect("pressed",this,"_popup_callback",varray(GROUP_SELECTED));
-	group_button->set_tooltip("Makes sure the object's' children are not selectable.");
+	group_button->set_tooltip(TTR("Makes sure the object's children are not selectable."));
 
 	ungroup_button = memnew( ToolButton );
 	hb->add_child(ungroup_button);
 	ungroup_button->connect("pressed",this,"_popup_callback",varray(UNGROUP_SELECTED));
-	ungroup_button->set_tooltip("Restores the object's' children ability to be selected.");
+	ungroup_button->set_tooltip(TTR("Restores the object's children's ability to be selected."));
 
 	hb->add_child(memnew(VSeparator));
 
@@ -3375,10 +3375,10 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 
 
 	/*
-	p->add_item(TTR("Align Horizontal"),ALIGN_HORIZONTAL);
-	p->add_item(TTR("Align Vertical"),ALIGN_VERTICAL);
-	p->add_item(TTR("Space Horizontal"),SPACE_HORIZONTAL);
-	p->add_item(TTR("Space Vertical"),SPACE_VERTICAL);*/
+	p->add_item("Align Horizontal",ALIGN_HORIZONTAL);
+	p->add_item("Align Vertical",ALIGN_VERTICAL);
+	p->add_item("Space Horizontal",SPACE_HORIZONTAL);
+	p->add_item("Space Vertical",SPACE_VERTICAL);*/
 
 	view_menu = memnew( MenuButton );
 	view_menu->set_text(TTR("View"));
@@ -3436,7 +3436,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	key_insert_button = memnew( Button );
 	key_insert_button->set_focus_mode(FOCUS_NONE);
 	key_insert_button->connect("pressed",this,"_popup_callback",varray(ANIM_INSERT_KEY));
-	key_insert_button->set_tooltip(TTR("Insert Keys (Insert)"));
+	key_insert_button->set_tooltip(TTR("Insert Keys (Ins)"));
 
 	animation_hb->add_child(key_insert_button);
 
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/control_editor_plugin.h b/tools/editor/plugins/control_editor_plugin.h
index 67db981c0d..6234698ee8 100644
--- a/tools/editor/plugins/control_editor_plugin.h
+++ b/tools/editor/plugins/control_editor_plugin.h
@@ -125,7 +125,7 @@ class ControlEditorPlugin : public EditorPlugin {
 
 public:
 
-	virtual String get_name() const { return TTR("GUI"); }
+	virtual String get_name() const { return "GUI"; }
 	bool has_main_screen() const { return true; }
 	virtual void edit(Object *p_object);
 	virtual bool handles(Object *p_object) const;
diff --git a/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp b/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
index 788e3c61f1..b6f3db73f7 100644
--- a/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+++ b/tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
@@ -256,7 +256,7 @@ void MeshLibraryEditor::_menu_cbk(int p_option) {
 			if (p.begins_with("/MeshLibrary/item") && p.get_slice_count("/")>=3) {
 
 				to_erase = p.get_slice("/",3).to_int();
-				cd->set_text(TTR("Remove Item ")+itos(to_erase)+"?");
+				cd->set_text(vformat(TTR("Remove item %d?"),to_erase));
 				cd->popup_centered(Size2(300,60));
 			}
 		} break;
diff --git a/tools/editor/plugins/item_list_editor_plugin.cpp b/tools/editor/plugins/item_list_editor_plugin.cpp
index 9f47d26492..b711e13193 100644
--- a/tools/editor/plugins/item_list_editor_plugin.cpp
+++ b/tools/editor/plugins/item_list_editor_plugin.cpp
@@ -129,7 +129,7 @@ int ItemListOptionButtonPlugin::get_flags() const {
 
 void ItemListOptionButtonPlugin::add_item() {
 
-	ob->add_item( TTR("Item ")+itos(ob->get_item_count()));
+	ob->add_item( vformat(TTR("Item %d"),ob->get_item_count()));
 	_change_notify();
 }
 
@@ -171,7 +171,7 @@ int ItemListPopupMenuPlugin::get_flags() const {
 
 void ItemListPopupMenuPlugin::add_item() {
 
-	pp->add_item( TTR("Item ")+itos(pp->get_item_count()));
+	pp->add_item( vformat(TTR("Item %d"),pp->get_item_count()));
 	_change_notify();
 }
 
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 e22dfb3d13..8a0c6b3fe8 100644
--- a/tools/editor/plugins/multimesh_editor_plugin.cpp
+++ b/tools/editor/plugins/multimesh_editor_plugin.cpp
@@ -73,7 +73,7 @@ void MultiMeshEditor::_populate() {
 
 		if (!ms_node) {
 
-			err_dialog->set_text(TTR("Mesh source is invalid (Invalid Path)."));
+			err_dialog->set_text(TTR("Mesh source is invalid (invalid path)."));
 			err_dialog->popup_centered_minsize();
 			return;
 		}
@@ -82,7 +82,7 @@ void MultiMeshEditor::_populate() {
 
 		if (!ms_instance) {
 
-			err_dialog->set_text(TTR("Mesh source is invalid (Not a MeshInstance)."));
+			err_dialog->set_text(TTR("Mesh source is invalid (not a MeshInstance)."));
 			err_dialog->popup_centered_minsize();
 			return;
 		}
@@ -91,7 +91,7 @@ void MultiMeshEditor::_populate() {
 
 		if (mesh.is_null()) {
 
-			err_dialog->set_text(TTR("Mesh source is invalid (Contains no Mesh resource)."));
+			err_dialog->set_text(TTR("Mesh source is invalid (contains no Mesh resource)."));
 			err_dialog->popup_centered_minsize();
 			return;
 		}
@@ -109,7 +109,7 @@ void MultiMeshEditor::_populate() {
 
 	if (!ss_node) {
 
-		err_dialog->set_text(TTR("Surface source is invalid (Invalid Path)."));
+		err_dialog->set_text(TTR("Surface source is invalid (invalid path)."));
 		err_dialog->popup_centered_minsize();
 		return;
 	}
@@ -118,7 +118,7 @@ void MultiMeshEditor::_populate() {
 
 	if (!ss_instance) {
 
-		err_dialog->set_text(TTR("Surface source is invalid (Not Geometry)."));
+		err_dialog->set_text(TTR("Surface source is invalid (no geometry)."));
 		err_dialog->popup_centered_minsize();
 		return;
 	}
@@ -129,7 +129,7 @@ void MultiMeshEditor::_populate() {
 
 	if (geometry.size()==0) {
 
-		err_dialog->set_text(TTR("Surface source is invalid (No Faces)."));
+		err_dialog->set_text(TTR("Surface source is invalid (no faces)."));
 		err_dialog->popup_centered_minsize();
 		return;
 	}
@@ -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>();
@@ -184,9 +184,9 @@ void MultiMeshEditor::_populate() {
 		area_accum+=area;
 	}
 
-	ERR_EXPLAIN(TTR("Couldn't map area"));
+	ERR_EXPLAIN(TTR("Couldn't map area."));
 	ERR_FAIL_COND(triangle_area_map.size()==0);
-	ERR_EXPLAIN(TTR("Couldn't map area"));
+	ERR_EXPLAIN(TTR("Couldn't map area."));
 	ERR_FAIL_COND(area_accum==0);
 
 
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/particles_2d_editor_plugin.cpp b/tools/editor/plugins/particles_2d_editor_plugin.cpp
index 8892950feb..ce25f34c1f 100644
--- a/tools/editor/plugins/particles_2d_editor_plugin.cpp
+++ b/tools/editor/plugins/particles_2d_editor_plugin.cpp
@@ -66,7 +66,7 @@ void Particles2DEditorPlugin::_file_selected(const String& p_file) {
 
 	Image img;
 	Error err = ImageLoader::load_image(p_file,&img);
-	ERR_EXPLAIN(TTR("Error loading image: ")+p_file);
+	ERR_EXPLAIN(TTR("Error loading image:")+" "+p_file);
 	ERR_FAIL_COND(err!=OK);
 
 	img.convert(Image::FORMAT_GRAYSCALE_ALPHA);
diff --git a/tools/editor/plugins/particles_editor_plugin.cpp b/tools/editor/plugins/particles_editor_plugin.cpp
index b7ba987622..93e2fb2f38 100644
--- a/tools/editor/plugins/particles_editor_plugin.cpp
+++ b/tools/editor/plugins/particles_editor_plugin.cpp
@@ -249,7 +249,7 @@ void ParticlesEditor::_generate_emission_points() {
 
 		if (gcount==0) {
 
-			err_dialog->set_text(TTR("No Faces!"));
+			err_dialog->set_text(TTR("No faces!"));
 			err_dialog->popup_centered_minsize();
 			return;
 		}
diff --git a/tools/editor/plugins/path_2d_editor_plugin.cpp b/tools/editor/plugins/path_2d_editor_plugin.cpp
index 079ca3a339..107ec30a91 100644
--- a/tools/editor/plugins/path_2d_editor_plugin.cpp
+++ b/tools/editor/plugins/path_2d_editor_plugin.cpp
@@ -622,8 +622,8 @@ Path2DEditor::Path2DEditor(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
 
@@ -636,7 +636,7 @@ Path2DEditor::Path2DEditor(EditorNode *p_editor) {
 	curve_edit->set_icon(CanvasItemEditor::get_singleton()->get_icon("CurveEdit","EditorIcons"));
 	curve_edit->set_toggle_mode(true);
 	curve_edit->set_focus_mode(Control::FOCUS_NONE);
-	curve_edit->set_tooltip("Select Points\nShift+Drag: Select Control Points\n"+keycode_get_string(KEY_MASK_CMD)+"Click: Add Point\nRight Click: Delete Point.");
+	curve_edit->set_tooltip(TTR("Select Points")+"\n"+TTR("Shift+Drag: Select Control Points")+"\n"+keycode_get_string(KEY_MASK_CMD)+TTR("Click: Add Point")+"\n"+TTR("Right Click: Delete Point"));
 	curve_edit->connect("pressed",this,"_mode_selected",varray(MODE_EDIT));
 	base_hb->add_child(curve_edit);
 	curve_edit_curve = memnew( ToolButton );
@@ -650,14 +650,14 @@ Path2DEditor::Path2DEditor(EditorNode *p_editor) {
 	curve_create->set_icon(CanvasItemEditor::get_singleton()->get_icon("CurveCreate","EditorIcons"));
 	curve_create->set_toggle_mode(true);
 	curve_create->set_focus_mode(Control::FOCUS_NONE);
-	curve_create->set_tooltip("Add Point (in empty space)\nSplit Segment (in curve).");
+	curve_create->set_tooltip(TTR("Add Point (in empty space)")+"\n"+TTR("Split Segment (in curve)"));
 	curve_create->connect("pressed",this,"_mode_selected",varray(MODE_CREATE));
 	base_hb->add_child(curve_create);
 	curve_del = memnew( ToolButton );
 	curve_del->set_icon(CanvasItemEditor::get_singleton()->get_icon("CurveDelete","EditorIcons"));
 	curve_del->set_toggle_mode(true);
 	curve_del->set_focus_mode(Control::FOCUS_NONE);
-	curve_del->set_tooltip(TTR("Delete Point."));
+	curve_del->set_tooltip(TTR("Delete Point"));
 	curve_del->connect("pressed",this,"_mode_selected",varray(MODE_DELETE));
 	base_hb->add_child(curve_del);
 	curve_close = memnew( ToolButton );
diff --git a/tools/editor/plugins/path_editor_plugin.cpp b/tools/editor/plugins/path_editor_plugin.cpp
index 6820eed297..d7cc2bd157 100644
--- a/tools/editor/plugins/path_editor_plugin.cpp
+++ b/tools/editor/plugins/path_editor_plugin.cpp
@@ -546,21 +546,21 @@ PathEditorPlugin::PathEditorPlugin(EditorNode *p_node) {
 	curve_edit->set_toggle_mode(true);
 	curve_edit->hide();
 	curve_edit->set_focus_mode(Control::FOCUS_NONE);
-	curve_edit->set_tooltip("Select Points\nShift+Drag: Select Control Points\n"+keycode_get_string(KEY_MASK_CMD)+"Click: Add Point\nRight Click: Delete Point.");
+	curve_edit->set_tooltip(TTR("Select Points")+"\n"+TTR("Shift+Drag: Select Control Points")+"\n"+keycode_get_string(KEY_MASK_CMD)+TTR("Click: Add Point")+"\n"+TTR("Right Click: Delete Point"));
 	SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_edit);
 	curve_create = memnew( ToolButton );
 	curve_create->set_icon(SpatialEditor::get_singleton()->get_icon("CurveCreate","EditorIcons"));
 	curve_create->set_toggle_mode(true);
 	curve_create->hide();
 	curve_create->set_focus_mode(Control::FOCUS_NONE);
-	curve_create->set_tooltip("Add Point (in empty space)\nSplit Segment (in curve).");
+	curve_create->set_tooltip(TTR("Add Point (in empty space)")+"\n"+TTR("Split Segment (in curve)"));
 	SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_create);
 	curve_del = memnew( ToolButton );
 	curve_del->set_icon(SpatialEditor::get_singleton()->get_icon("CurveDelete","EditorIcons"));
 	curve_del->set_toggle_mode(true);
 	curve_del->hide();
 	curve_del->set_focus_mode(Control::FOCUS_NONE);
-	curve_del->set_tooltip(TTR("Delete Point."));
+	curve_del->set_tooltip(TTR("Delete Point"));
 	SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_del);
 	curve_close = memnew( ToolButton );
 	curve_close->set_icon(SpatialEditor::get_singleton()->get_icon("CurveClose","EditorIcons"));
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 cc9aca1a25..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
@@ -206,11 +206,11 @@ void ResourcePreloaderEditor::_delete_pressed() {
 
 	_delete_confirm_pressed(); //it has undo.. why bother with a dialog..
 	/*
-	dialog->set_title(TTR("Confirm..."));
-	dialog->set_text(TTR("Remove Resource '")+tree->get_selected()->get_text(0)+"' ?");
-	//dialog->get_cancel()->set_text(TTR("Cancel"));
+	dialog->set_title("Confirm...");
+	dialog->set_text("Remove Resource '"+tree->get_selected()->get_text(0)+"' ?");
+	//dialog->get_cancel()->set_text("Cancel");
 	//dialog->get_ok()->show();
-	dialog->get_ok()->set_text(TTR("Remove"));
+	dialog->get_ok()->set_text("Remove");
 	dialog->popup_centered(Size2(300,60));*/
 
 }
diff --git a/tools/editor/plugins/rich_text_editor_plugin.cpp b/tools/editor/plugins/rich_text_editor_plugin.cpp
index 99d75dff1d..bec48ca293 100644
--- a/tools/editor/plugins/rich_text_editor_plugin.cpp
+++ b/tools/editor/plugins/rich_text_editor_plugin.cpp
@@ -106,8 +106,8 @@ RichTextEditor::RichTextEditor() {
 	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(options);
 	options->set_area_as_parent_rect();
 
-	options->set_text(TTR("RichText"));
-	options->get_popup()->add_item(TTR("Parse BBCODE"),PARSE_BBCODE);
+	options->set_text("RichText");
+	options->get_popup()->add_item(TTR("Parse BBCode"),PARSE_BBCODE);
 	options->get_popup()->add_item(TTR("Clear"),CLEAR);
 
 	options->get_popup()->connect("item_pressed", this,"_menu_option");
diff --git a/tools/editor/plugins/rich_text_editor_plugin.h b/tools/editor/plugins/rich_text_editor_plugin.h
index 0196a30332..ae1d04be01 100644
--- a/tools/editor/plugins/rich_text_editor_plugin.h
+++ b/tools/editor/plugins/rich_text_editor_plugin.h
@@ -77,7 +77,7 @@ class RichTextEditorPlugin : public EditorPlugin {
 
 public:
 
-	virtual String get_name() const { return TTR("RichText"); }
+	virtual String get_name() const { return "RichText"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_node);
 	virtual bool handles(Object *p_node) const;
diff --git a/tools/editor/plugins/sample_editor_plugin.cpp b/tools/editor/plugins/sample_editor_plugin.cpp
index 8c5036b424..3a54273d14 100644
--- a/tools/editor/plugins/sample_editor_plugin.cpp
+++ b/tools/editor/plugins/sample_editor_plugin.cpp
@@ -328,7 +328,7 @@ void SampleEditor::_update_sample() {
 		return; //bye or unsupported
 
 	generate_preview_texture(sample,peakdisplay);
-	info_label->set_text(TTR("Length: ")+itos(sample->get_length())+" frames ("+String::num(sample->get_length()/(float)sample->get_mix_rate(),2)+" s), "+(sample->get_format()==Sample::FORMAT_PCM16?"16 Bits, ":"8 bits, ")+(sample->is_stereo()?"Stereo.":"Mono."));
+	info_label->set_text(TTR("Length:")+" "+vformat(TTR("%d frames"), sample->get_length())+" ("+String::num(sample->get_length()/(float)sample->get_mix_rate(),2)+" s), "+(sample->get_format()==Sample::FORMAT_PCM16?TTR("16 Bits"):TTR("8 Bits"))+", "+(sample->is_stereo()?TTR("Stereo"):TTR("Mono"))+".");
 
 	library->add_sample("default",sample);
 }
diff --git a/tools/editor/plugins/sample_library_editor_plugin.cpp b/tools/editor/plugins/sample_library_editor_plugin.cpp
index 8b03c4651d..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()+/*itos(smp->get_length())+" frames ("+String::num(smp->get_length()/(float)smp->get_mix_rate(),2)+" smp), "+*/(smp->get_format()==Sample::FORMAT_PCM16?"16 Bits, ":(smp->get_format()==Sample::FORMAT_PCM8?"8 bits, ":TTR("IMA-ADPCM,")))+(smp->is_stereo()?"Stereo":"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 d8d5fddfe9..8e0bae6c76 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -1252,16 +1252,35 @@ void ScriptEditor::_menu_option(int p_option) {
 				Ref<Script> scr = current->get_edited_script();
 				if (scr.is_null())
 					return;
-				int line = tx->cursor_get_line();
-				int next_line = line + 1;
+
+				int from_line = tx->cursor_get_line();
+				int to_line = tx->cursor_get_line();
 				int column = tx->cursor_get_column();
 
-				if (line >= tx->get_line_count() - 1)
-					tx->set_line(line, tx->get_line(line) + "\n");
+				if (tx->is_selection_active()) {
+					from_line = tx->get_selection_from_line();
+					to_line = tx->get_selection_to_line();
+					column = tx->cursor_get_column();
+				}
+				int next_line = to_line + 1;
+
+				tx->begin_complex_operation();
+				for (int i = from_line; i <= to_line; i++) {
+
+					if (i >= tx->get_line_count() - 1) {
+							tx->set_line(i, tx->get_line(i) + "\n");
+					}
+					String line_clone = tx->get_line(i);
+					tx->insert_at(line_clone, next_line);
+					next_line++;
+				}
 
-				String line_clone = tx->get_line(line);
-				tx->insert_at(line_clone, next_line);
 				tx->cursor_set_column(column);
+				if (tx->is_selection_active()) {
+					tx->select(to_line + 1, tx->get_selection_from_column(), next_line - 1, tx->get_selection_to_column());
+				}
+
+				tx->end_complex_operation();
 				tx->update();
 
 			} break;
@@ -2441,7 +2460,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 +2496,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");
 
@@ -2523,7 +2542,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
 	site_search->set_text(TTR("Tutorials"));
 	site_search->connect("pressed",this,"_menu_option",varray(SEARCH_WEBSITE));
 	menu_hb->add_child(site_search);
-	site_search->set_tooltip(TTR("Open http://www.godotengine.org at tutorials section."));
+	site_search->set_tooltip(TTR("Open https://godotengine.org at tutorials section."));
 
 	class_search = memnew( ToolButton );
 	class_search->set_text(TTR("Classes"));
@@ -2581,7 +2600,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/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp
index f618f41cf8..d567c8e9b3 100644
--- a/tools/editor/plugins/shader_graph_editor_plugin.cpp
+++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp
@@ -743,7 +743,7 @@ void ShaderGraphView::_vec_op_changed(int p_op, int p_id){
 void ShaderGraphView::_vec_scalar_op_changed(int p_op, int p_id){
 
 	UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
-	ur->create_action(TTR("Change VecxScalar Operator"));
+	ur->create_action(TTR("Change Vec Scalar Operator"));
 	ur->add_do_method(graph.ptr(),"vec_scalar_op_node_set_op",type,p_id,p_op);
 	ur->add_undo_method(graph.ptr(),"vec_scalar_op_node_set_op",type,p_id,graph->vec_scalar_op_node_get_op(type,p_id));
 	ur->add_do_method(this,"_update_graph");
@@ -902,7 +902,7 @@ void ShaderGraphView::_variant_edited() {
 				break;
 			}
 		UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
-		ur->create_action(TTR("Change default value"));
+		ur->create_action(TTR("Change Default Value"));
 		ur->add_do_method(graph.ptr(),"default_set_value",type,edited_id,edited_def, v);
 		ur->add_undo_method(graph.ptr(),"default_set_value",type,edited_id,edited_def, v2);
 		ur->add_do_method(this,"_update_graph");
@@ -1427,7 +1427,7 @@ void ShaderGraphView::_create_node(int p_id) {
 
 	} break; // all inputs (case Shader type dependent)
 	case ShaderGraph::NODE_SCALAR_CONST: {
-		gn->set_title(TTR("Scalar"));
+		gn->set_title("Scalar");
 		SpinBox *sb = memnew( SpinBox );
 		sb->set_min(-100000);
 		sb->set_max(100000);
@@ -1440,7 +1440,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; //scalar constant
 	case ShaderGraph::NODE_VEC_CONST: {
 
-		gn->set_title(TTR("Vector"));
+		gn->set_title("Vector");
 		Array v3p(true);
 		for(int i=0;i<3;i++) {
 			HBoxContainer *hbc = memnew( HBoxContainer );
@@ -1469,11 +1469,11 @@ void ShaderGraphView::_create_node(int p_id) {
 		cpb->connect("color_changed",this,"_rgb_const_changed",varray(p_id));
 		gn->add_child(cpb);
 		Label *l = memnew( Label );
-		l->set_text(TTR("RGB"));
+		l->set_text("RGB");
 		l->set_align(Label::ALIGN_RIGHT);
 		gn->add_child(l);
 		l = memnew( Label );
-		l->set_text(TTR("Alpha"));
+		l->set_text("Alpha");
 		l->set_align(Label::ALIGN_RIGHT);
 		gn->add_child(l);
 
@@ -1482,7 +1482,7 @@ void ShaderGraphView::_create_node(int p_id) {
 
 	} break; //rgb constant (shows a color picker instead)
 	case ShaderGraph::NODE_XFORM_CONST: {
-		gn->set_title(TTR("XForm"));
+		gn->set_title("XForm");
 		ToolButton *edit = memnew( ToolButton );
 		edit->set_text("edit..");
 		edit->connect("pressed",this,"_xform_const_changed",varray(p_id,edit));
@@ -1492,7 +1492,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // 4x4 matrix constant
 	case ShaderGraph::NODE_TIME: {
 
-		gn->set_title(TTR("Time"));
+		gn->set_title("Time");
 		Label *l = memnew( Label );
 		l->set_text("(s)");
 		l->set_align(Label::ALIGN_RIGHT);
@@ -1502,24 +1502,24 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // time in seconds
 	case ShaderGraph::NODE_SCREEN_TEX: {
 
-		gn->set_title(TTR("ScreenTex"));
+		gn->set_title("ScreenTex");
 		HBoxContainer *hbc = memnew( HBoxContainer );
 		hbc->add_constant_override("separation",0);
 		if (!graph->is_slot_connected(type,p_id,0)) {
 			Vector3 v = graph->default_get_value(type, p_id, 0);
-			hbc->add_child(make_editor(TTR("UV: ") + v,gn,p_id,0,Variant::VECTOR3));
+			hbc->add_child(make_editor("UV: " + v,gn,p_id,0,Variant::VECTOR3));
 		} else {
-			hbc->add_child(make_label(TTR("UV"),Variant::VECTOR3));
+			hbc->add_child(make_label("UV",Variant::VECTOR3));
 		}
 		hbc->add_spacer();
-		hbc->add_child( memnew(Label(TTR("RGB"))));
+		hbc->add_child( memnew(Label("RGB")));
 		gn->add_child(hbc);
 		gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
 
 	} break; // screen texture sampler (takes UV) (only usable in fragment case Shader)
 	case ShaderGraph::NODE_SCALAR_OP: {
 
-		gn->set_title(TTR("ScalarOp"));
+		gn->set_title("ScalarOp");
 		static const char* op_name[ShaderGraph::SCALAR_MAX_OP]={
 			("Add"),
 			("Sub"),
@@ -1567,7 +1567,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // scalar vs scalar op (mul: { } break; add: { } break; div: { } break; etc)
 	case ShaderGraph::NODE_VEC_OP: {
 
-		gn->set_title(TTR("VecOp"));
+		gn->set_title("VecOp");
 		static const char* op_name[ShaderGraph::VEC_MAX_OP]={
 			("Add"),
 			("Sub"),
@@ -1615,7 +1615,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // vec3 vs vec3 op (mul: { } break;ad: { } break;div: { } break;crossprod: { } break;etc)
 	case ShaderGraph::NODE_VEC_SCALAR_OP: {
 
-		gn->set_title(TTR("VecScalarOp"));
+		gn->set_title("VecScalarOp");
 		static const char* op_name[ShaderGraph::VEC_SCALAR_MAX_OP]={
 			("Mul"),
 			("Div"),
@@ -1657,7 +1657,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // vec3 vs scalar op (mul: { } break; add: { } break; div: { } break; etc)
 	case ShaderGraph::NODE_RGB_OP: {
 
-		gn->set_title(TTR("RGB Op"));
+		gn->set_title("RGB Op");
 		static const char* op_name[ShaderGraph::RGB_MAX_OP]={
 			("Screen"),
 			("Difference"),
@@ -1702,7 +1702,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // vec3 vs vec3 rgb op (with scalar amount): { } break; like brighten: { } break; darken: { } break; burn: { } break; dodge: { } break; multiply: { } break; etc.
 	case ShaderGraph::NODE_XFORM_MULT: {
 
-		gn->set_title(TTR("XFMult"));
+		gn->set_title("XFMult");
 		HBoxContainer *hbc = memnew( HBoxContainer );
 		if (graph->is_slot_connected(type, p_id, 0)) {
 			hbc->add_child(make_label("a",Variant::TRANSFORM));
@@ -1725,9 +1725,9 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // mat4 x mat4
 	case ShaderGraph::NODE_XFORM_VEC_MULT: {
 
-		gn->set_title(TTR("XFVecMult"));
+		gn->set_title("XFVecMult");
 
-		CheckBox *button = memnew (CheckBox(TTR("RotOnly")));
+		CheckBox *button = memnew (CheckBox("RotOnly"));
 		button->set_pressed(graph->xform_vec_mult_node_get_no_translation(type,p_id));
 		button->connect("toggled",this,"_xform_inv_rev_changed",varray(p_id));
 
@@ -1758,10 +1758,10 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break;
 	case ShaderGraph::NODE_XFORM_VEC_INV_MULT: {
 
-		gn->set_title(TTR("XFVecInvMult"));
+		gn->set_title("XFVecInvMult");
 
 
-		CheckBox *button = memnew( CheckBox(TTR("RotOnly")));
+		CheckBox *button = memnew( CheckBox("RotOnly"));
 		button->set_pressed(graph->xform_vec_mult_node_get_no_translation(type,p_id));
 		button->connect("toggled",this,"_xform_inv_rev_changed",varray(p_id));
 
@@ -1793,7 +1793,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // mat4 x vec3 inverse mult (with no-translation option)
 	case ShaderGraph::NODE_SCALAR_FUNC: {
 
-		gn->set_title(TTR("ScalarFunc"));
+		gn->set_title("ScalarFunc");
 		static const char* func_name[ShaderGraph::SCALAR_MAX_FUNC]={
 			("Sin"),
 			("Cos"),
@@ -1846,7 +1846,7 @@ void ShaderGraphView::_create_node(int p_id) {
 
 
 
-		gn->set_title(TTR("VecFunc"));
+		gn->set_title("VecFunc");
 		static const char* func_name[ShaderGraph::VEC_MAX_FUNC]={
 			("Normalize"),
 			("Saturate"),
@@ -1882,7 +1882,7 @@ void ShaderGraphView::_create_node(int p_id) {
 
 	} break; // vector function (normalize: { } break; negate: { } break; reciprocal: { } break; rgb2hsv: { } break; hsv2rgb: { } break; etc: { } break; etc)
 	case ShaderGraph::NODE_VEC_LEN: {
-		gn->set_title(TTR("VecLength"));
+		gn->set_title("VecLength");
 		HBoxContainer *hbc = memnew( HBoxContainer );
 		if (graph->is_slot_connected(type, p_id, 0)) {
 			hbc->add_child(make_label("in", Variant::VECTOR3));
@@ -1899,7 +1899,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // vec3 length
 	case ShaderGraph::NODE_DOT_PROD: {
 
-		gn->set_title(TTR("DotProduct"));
+		gn->set_title("DotProduct");
 		HBoxContainer *hbc = memnew( HBoxContainer );
 		hbc->add_constant_override("separation",0);
 		if (graph->is_slot_connected(type, p_id, 0)) {
@@ -1924,7 +1924,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // vec3 . vec3 (dot product -> scalar output)
 	case ShaderGraph::NODE_VEC_TO_SCALAR: {
 
-		gn->set_title(TTR("Vec2Scalar"));
+		gn->set_title("Vec2Scalar");
 		HBoxContainer *hbc = memnew( HBoxContainer );
 		hbc->add_constant_override("separation",0);
 		if (graph->is_slot_connected(type, p_id, 0)) {
@@ -1955,7 +1955,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // 1 vec3 input: { } break; 3 scalar outputs
 	case ShaderGraph::NODE_SCALAR_TO_VEC: {
 
-		gn->set_title(TTR("Scalar2Vec"));
+		gn->set_title("Scalar2Vec");
 		HBoxContainer *hbc = memnew( HBoxContainer );
 		if (graph->is_slot_connected(type, p_id, 0)) {
 			hbc->add_child(make_label("x", Variant::REAL));
@@ -1986,7 +1986,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // 3 scalar input: { } break; 1 vec3 output
 	case ShaderGraph::NODE_VEC_TO_XFORM: {
 
-		gn->set_title(TTR("Vec2XForm"));
+		gn->set_title("Vec2XForm");
 		HBoxContainer *hbc = memnew( HBoxContainer );
 		hbc->add_constant_override("separation",0);
 		if (graph->is_slot_connected(type, p_id, 0)) {
@@ -2025,7 +2025,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // 3 vec input: { } break; 1 xform output
 	case ShaderGraph::NODE_XFORM_TO_VEC: {
 
-		gn->set_title(TTR("XForm2Vec"));
+		gn->set_title("XForm2Vec");
 
 		HBoxContainer *hbc = memnew( HBoxContainer );
 		hbc->add_constant_override("separation",0);
@@ -2057,7 +2057,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // 3 vec input: { } break; 1 xform output
 	case ShaderGraph::NODE_SCALAR_INTERP: {
 
-		gn->set_title(TTR("ScalarInterp"));
+		gn->set_title("ScalarInterp");
 		HBoxContainer *hbc = memnew( HBoxContainer );
 		hbc->add_constant_override("separation",0);
 		if (graph->is_slot_connected(type, p_id, 0)) {
@@ -2090,7 +2090,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // scalar interpolation (with optional curve)
 	case ShaderGraph::NODE_VEC_INTERP: {
 
-		gn->set_title(TTR("VecInterp"));
+		gn->set_title("VecInterp");
 		HBoxContainer *hbc = memnew( HBoxContainer );
 		if (graph->is_slot_connected(type, p_id, 0)) {
 			hbc->add_child(make_label("a", Variant::VECTOR3));
@@ -2174,7 +2174,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // scalar interpolation (with optional curve)
 	case ShaderGraph::NODE_CURVE_MAP: {
 
-		gn->set_title(TTR("CurveMap"));
+		gn->set_title("CurveMap");
 		GraphCurveMapEdit * map  = memnew( GraphCurveMapEdit );
 
 		DVector<Vector2> points = graph->curve_map_node_get_points(type,p_id);
@@ -2221,7 +2221,7 @@ void ShaderGraphView::_create_node(int p_id) {
 
 	case ShaderGraph::NODE_SCALAR_INPUT: {
 
-		gn->set_title(TTR("ScalarUniform"));
+		gn->set_title("ScalarUniform");
 		LineEdit *le = memnew( LineEdit );
 		gn->add_child(le);
 		le->set_text(graph->input_node_get_name(type,p_id));
@@ -2238,7 +2238,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // scalar uniform (assignable in material)
 	case ShaderGraph::NODE_VEC_INPUT: {
 
-		gn->set_title(TTR("VectorUniform"));
+		gn->set_title("VectorUniform");
 		LineEdit *le = memnew( LineEdit );
 		gn->add_child(le);
 		le->set_text(graph->input_node_get_name(type,p_id));
@@ -2265,7 +2265,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // vec3 uniform (assignable in material)
 	case ShaderGraph::NODE_RGB_INPUT: {
 
-		gn->set_title(TTR("ColorUniform"));
+		gn->set_title("ColorUniform");
 		LineEdit *le = memnew( LineEdit );
 		gn->add_child(le);
 		le->set_text(graph->input_node_get_name(type,p_id));
@@ -2275,11 +2275,11 @@ void ShaderGraphView::_create_node(int p_id) {
 		cpb->connect("color_changed",this,"_rgb_input_changed",varray(p_id));
 		gn->add_child(cpb);
 		Label *l = memnew( Label );
-		l->set_text(TTR("RGB"));
+		l->set_text("RGB");
 		l->set_align(Label::ALIGN_RIGHT);
 		gn->add_child(l);
 		l = memnew( Label );
-		l->set_text(TTR("Alpha"));
+		l->set_text("Alpha");
 		l->set_align(Label::ALIGN_RIGHT);
 		gn->add_child(l);
 
@@ -2289,7 +2289,7 @@ void ShaderGraphView::_create_node(int p_id) {
 
 	} break; // color uniform (assignable in material)
 	case ShaderGraph::NODE_XFORM_INPUT: {
-		gn->set_title(TTR("XFUniform"));
+		gn->set_title("XFUniform");
 		LineEdit *le = memnew( LineEdit );
 		gn->add_child(le);
 		le->set_text(graph->input_node_get_name(type,p_id));
@@ -2303,7 +2303,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // mat4 uniform (assignable in material)
 	case ShaderGraph::NODE_TEXTURE_INPUT: {
 
-		gn->set_title(TTR("TexUniform"));
+		gn->set_title("TexUniform");
 		LineEdit *le = memnew( LineEdit );
 		gn->add_child(le);
 		le->set_text(graph->input_node_get_name(type,p_id));
@@ -2311,7 +2311,9 @@ void ShaderGraphView::_create_node(int p_id) {
 		TextureFrame *tex = memnew( TextureFrame );
 		tex->set_expand(true);
 		tex->set_custom_minimum_size(Size2(80,80));
+		tex->set_drag_forwarding(this);
 		gn->add_child(tex);
+		tex->set_ignore_mouse(false);
 		tex->set_texture(graph->texture_input_node_get_value(type,p_id));
 		ToolButton *edit = memnew( ToolButton );
 		edit->set_text("edit..");
@@ -2321,18 +2323,18 @@ void ShaderGraphView::_create_node(int p_id) {
 		HBoxContainer *hbc = memnew( HBoxContainer );
 		hbc->add_constant_override("separation",0);
 		if (graph->is_slot_connected(type, p_id, 0)) {
-			hbc->add_child(make_label(TTR("UV"), Variant::VECTOR3));
+			hbc->add_child(make_label("UV", Variant::VECTOR3));
 		} else {
 			Vector3 v = graph->default_get_value(type,p_id,0);
-			hbc->add_child(make_editor(String(TTR("UV: "))+v,gn,p_id,0,Variant::VECTOR3));
+			hbc->add_child(make_editor(String("UV: ")+v,gn,p_id,0,Variant::VECTOR3));
 		}
 		hbc->add_spacer();
-		Label *l=memnew(Label(TTR("RGB")));
+		Label *l=memnew(Label("RGB"));
 		l->set_align(Label::ALIGN_RIGHT);
 		hbc->add_child(l);
 		gn->add_child(hbc);
 		l = memnew( Label );
-		l->set_text(TTR("Alpha"));
+		l->set_text("Alpha");
 		l->set_align(Label::ALIGN_RIGHT);
 		gn->add_child(l);
 
@@ -2342,7 +2344,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // texture input (assignable in material)
 	case ShaderGraph::NODE_CUBEMAP_INPUT: {
 
-		gn->set_title(TTR("TexUniform"));
+		gn->set_title("TexUniform");
 		LineEdit *le = memnew( LineEdit );
 		gn->add_child(le);
 		le->set_text(graph->input_node_get_name(type,p_id));
@@ -2357,18 +2359,18 @@ void ShaderGraphView::_create_node(int p_id) {
 		HBoxContainer *hbc = memnew( HBoxContainer );
 		hbc->add_constant_override("separation",0);
 		if (graph->is_slot_connected(type, p_id, 0)) {
-			hbc->add_child(make_label(TTR("UV"), Variant::VECTOR3));
+			hbc->add_child(make_label("UV", Variant::VECTOR3));
 		} else {
 			Vector3 v = graph->default_get_value(type,p_id,0);
-			hbc->add_child(make_editor(String(TTR("UV: "))+v,gn,p_id,0,Variant::VECTOR3));
+			hbc->add_child(make_editor(String("UV: ")+v,gn,p_id,0,Variant::VECTOR3));
 		}
 		hbc->add_spacer();
-		Label *l=memnew(Label(TTR("RGB")));
+		Label *l=memnew(Label("RGB"));
 		l->set_align(Label::ALIGN_RIGHT);
 		hbc->add_child(l);
 		gn->add_child(hbc);
 		l = memnew( Label );
-		l->set_text(TTR("Alpha"));
+		l->set_text("Alpha");
 		l->set_align(Label::ALIGN_RIGHT);
 		gn->add_child(l);
 
@@ -2378,22 +2380,22 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // cubemap input (assignable in material)
 	case ShaderGraph::NODE_DEFAULT_TEXTURE: {
 
-		gn->set_title(TTR("CanvasItemTex"));
+		gn->set_title("CanvasItemTex");
 		HBoxContainer *hbc = memnew( HBoxContainer );
 		hbc->add_constant_override("separation",0);
 		if (graph->is_slot_connected(type, p_id, 0)) {
-			hbc->add_child(make_label(TTR("UV"), Variant::VECTOR3));
+			hbc->add_child(make_label("UV", Variant::VECTOR3));
 		} else {
 			Vector3 v = graph->default_get_value(type,p_id,0);
-			hbc->add_child(make_editor(String(TTR("UV: "))+v,gn,p_id,0,Variant::VECTOR3));
+			hbc->add_child(make_editor(String("UV: ")+v,gn,p_id,0,Variant::VECTOR3));
 		}
 		hbc->add_spacer();
-		Label *l=memnew(Label(TTR("RGB")));
+		Label *l=memnew(Label("RGB"));
 		l->set_align(Label::ALIGN_RIGHT);
 		hbc->add_child(l);
 		gn->add_child(hbc);
 		l = memnew( Label );
-		l->set_text(TTR("Alpha"));
+		l->set_text("Alpha");
 		l->set_align(Label::ALIGN_RIGHT);
 		gn->add_child(l);
 
@@ -2404,7 +2406,7 @@ void ShaderGraphView::_create_node(int p_id) {
 	} break; // screen texture sampler (takes UV) (only usable in fragment case Shader)
 
 	case ShaderGraph::NODE_OUTPUT: {
-		gn->set_title(TTR("Output"));
+		gn->set_title("Output");
 		gn->set_show_close_button(false);
 
 		List<ShaderGraph::SlotInfo> si;
@@ -2412,22 +2414,22 @@ void ShaderGraphView::_create_node(int p_id) {
 
 		Array colors;
 		colors.push_back("Color");
-		colors.push_back(TTR("LightColor"));
+		colors.push_back("LightColor");
 		colors.push_back("Light");
-		colors.push_back(TTR("Diffuse"));
-		colors.push_back(TTR("Specular"));
-		colors.push_back(TTR("Emmision"));
+		colors.push_back("Diffuse");
+		colors.push_back("Specular");
+		colors.push_back("Emmision");
 		Array reals;
-		reals.push_back(TTR("Alpha"));
-		reals.push_back(TTR("DiffuseAlpha"));
-		reals.push_back(TTR("NormalMapDepth"));
-		reals.push_back(TTR("SpecExp"));
-		reals.push_back(TTR("Glow"));
-		reals.push_back(TTR("ShadeParam"));
-		reals.push_back(TTR("SpecularExp"));
-		reals.push_back(TTR("LightAlpha"));
-		reals.push_back(TTR("PointSize"));
-		reals.push_back(TTR("Discard"));
+		reals.push_back("Alpha");
+		reals.push_back("DiffuseAlpha");
+		reals.push_back("NormalMapDepth");
+		reals.push_back("SpecExp");
+		reals.push_back("Glow");
+		reals.push_back("ShadeParam");
+		reals.push_back("SpecularExp");
+		reals.push_back("LightAlpha");
+		reals.push_back("PointSize");
+		reals.push_back("Discard");
 
 		int idx=0;
 		for (List<ShaderGraph::SlotInfo>::Element *E=si.front();E;E=E->next()) {
@@ -2448,7 +2450,7 @@ void ShaderGraphView::_create_node(int p_id) {
 
 	} break; // output (case Shader type dependent)
 	case ShaderGraph::NODE_COMMENT: {
-		gn->set_title(TTR("Comment"));
+		gn->set_title("Comment");
 		TextEdit *te = memnew(TextEdit);
 		te->set_custom_minimum_size(Size2(100,100));
 		gn->add_child(te);
@@ -2517,6 +2519,105 @@ void ShaderGraphView::_sg_updated() {
 	}
 }
 
+Variant ShaderGraphView::get_drag_data_fw(const Point2 &p_point, Control *p_from)
+{
+	TextureFrame* frame = p_from->cast_to<TextureFrame>();
+	if (!frame)
+		return Variant();
+
+	if (!frame->get_texture().is_valid())
+		return Variant();
+
+	RES res = frame->get_texture();
+	return EditorNode::get_singleton()->drag_resource(res,p_from);
+
+	return Variant();
+}
+
+bool ShaderGraphView::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const
+{
+	if (p_data.get_type() != Variant::DICTIONARY)
+		return false;
+
+	Dictionary d = p_data;
+
+	if (d.has("type")){
+		if (d["type"] == "resource" && d.has("resource")) {
+			Variant val = d["resource"];
+
+			if (val.get_type()==Variant::OBJECT) {
+				RES res = val;
+				if (res.is_valid() && res->cast_to<Texture>())
+					return true;
+			}
+		}
+		else if (d["type"] == "files" && d.has("files")) {
+			Vector<String> files = d["files"];
+			if (files.size() != 1)
+				return false;
+			return (ResourceLoader::get_resource_type(files[0]) == "ImageTexture");
+		}
+	}
+
+	return false;
+}
+
+void ShaderGraphView::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from)
+{
+	if (!can_drop_data_fw(p_point, p_data, p_from))
+		return;
+
+	TextureFrame *frame = p_from->cast_to<TextureFrame>();
+	if (!frame)
+		return;
+
+	Dictionary d = p_data;
+	Ref<Texture> tex;
+
+	if (d.has("type")) {
+		if (d["type"] == "resource" && d.has("resource")){
+			Variant val = d["resource"];
+
+			if (val.get_type()==Variant::OBJECT) {
+				RES res = val;
+				if (res.is_valid())
+					tex = Ref<Texture>(res->cast_to<Texture>());
+			}
+		}
+		else if (d["type"] == "files" && d.has("files")) {
+			Vector<String> files = d["files"];
+			RES res = ResourceLoader::load(files[0]);
+			if (res.is_valid())
+				tex = Ref<Texture>(res->cast_to<Texture>());
+		}
+	}
+
+	if (!tex.is_valid()) return;
+
+	GraphNode *gn = frame->get_parent()->cast_to<GraphNode>();
+	if (!gn) return;
+
+	int id = -1;
+	for(Map<int,GraphNode*>::Element *E = node_map.front();E;E=E->next())
+		if (E->get() == gn) {
+			id = E->key();
+			break;
+		}
+	print_line(String::num(double(id)));
+	if (id < 0) return;
+
+	if (graph->node_get_type(type,id)==ShaderGraph::NODE_TEXTURE_INPUT) {
+
+		UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
+		ur->create_action(TTR("Change Texture Uniform"));
+		ur->add_do_method(graph.ptr(),"texture_input_node_set_value",type,id,tex);
+		ur->add_undo_method(graph.ptr(),"texture_input_node_set_value",type,id,graph->texture_input_node_get_value(type,id));
+		ur->add_do_method(this,"_update_graph");
+		ur->add_undo_method(this,"_update_graph");
+		ur->commit_action();
+	}
+}
+
 void ShaderGraphView::set_graph(Ref<ShaderGraph> p_graph){
 
 
@@ -2623,6 +2724,10 @@ void ShaderGraphView::_bind_methods() {
 	ObjectTypeDB::bind_method("_color_ramp_changed",&ShaderGraphView::_color_ramp_changed);
 	ObjectTypeDB::bind_method("_curve_changed",&ShaderGraphView::_curve_changed);
 
+	ObjectTypeDB::bind_method(_MD("get_drag_data_fw"), &ShaderGraphView::get_drag_data_fw);
+	ObjectTypeDB::bind_method(_MD("can_drop_data_fw"), &ShaderGraphView::can_drop_data_fw);
+	ObjectTypeDB::bind_method(_MD("drop_data_fw"), &ShaderGraphView::drop_data_fw);
+
 	ObjectTypeDB::bind_method("_sg_updated",&ShaderGraphView::_sg_updated);
 }
 
diff --git a/tools/editor/plugins/shader_graph_editor_plugin.h b/tools/editor/plugins/shader_graph_editor_plugin.h
index 0336696911..b33432807b 100644
--- a/tools/editor/plugins/shader_graph_editor_plugin.h
+++ b/tools/editor/plugins/shader_graph_editor_plugin.h
@@ -116,7 +116,7 @@ public:
 	GraphCurveMapEdit();
 };
 
-class ShaderGraphView : public Node {
+class ShaderGraphView : public Control {
 
 	OBJ_TYPE(ShaderGraphView,Node);
 
@@ -181,6 +181,10 @@ class ShaderGraphView : public Node {
 	void _curve_changed(int p_id,Node* p_curve);
 	void _sg_updated();
 	Map<int,GraphNode*> node_map;
+
+	Variant get_drag_data_fw(const Point2& p_point,Control* p_from);
+	bool can_drop_data_fw(const Point2& p_point,const Variant& p_data,Control* p_from) const;
+	void drop_data_fw(const Point2& p_point,const Variant& p_data,Control* p_from);
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp
index fa709eb0cb..55485d8c92 100644
--- a/tools/editor/plugins/spatial_editor_plugin.cpp
+++ b/tools/editor/plugins/spatial_editor_plugin.cpp
@@ -561,7 +561,7 @@ void SpatialEditorViewport::_select_region() {
 
 void SpatialEditorViewport::_update_name() {
 
-	String ortho = orthogonal?TTR("Orthogonal"):"Perspective";
+	String ortho = orthogonal?TTR("Orthogonal"):TTR("Perspective");
 
 	if (name!="")
 		view_menu->set_text("[ "+name+" "+ortho+" ]");
@@ -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());
@@ -1353,7 +1353,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
 								scale = Math::stepify(scale,spatial_editor->get_scale_snap());
 							}
 
-							set_message(TTR("Scaling to ")+String::num(scale,1)+"%.");
+							set_message(vformat(TTR("Scaling to %s%%."),String::num(scale,1)));
 							scale/=100.0;
 
 							Transform r;
@@ -1431,7 +1431,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
 								motion.snap(snap);
 							}
 
-							//set_message(TTR("Translating: ")+motion);
+							//set_message("Translating: "+motion);
 
 							List<Node*> &selection = editor_selection->get_selected_node_list();
 
@@ -1493,13 +1493,13 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
 								if (snap) {
 									angle=Math::rad2deg(angle)+snap*0.5; //else it wont reach +180
 									angle-=Math::fmod(angle,snap);
-									set_message(TTR("Rotating ")+rtos(angle)+" degrees.");
+									set_message(vformat(TTR("Rotating %s degrees."),rtos(angle)));
 									angle=Math::deg2rad(angle);
 								} else
-									set_message(TTR("Rotating ")+rtos(Math::rad2deg(angle))+" degrees.");
+									set_message(vformat(TTR("Rotating %s degrees."),rtos(Math::rad2deg(angle))));
 
 							} else {
-								set_message(TTR("Rotating ")+rtos(Math::rad2deg(angle))+" degrees.");
+								set_message(vformat(TTR("Rotating %s degrees."),rtos(Math::rad2deg(angle))));
 							}
 
 
@@ -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");
 	}
 
@@ -1967,7 +1967,7 @@ void SpatialEditorViewport::_draw() {
 	if (surface->has_focus()) {
 		Size2 size = surface->get_size();
 		Rect2 r =Rect2(Point2(),size);
-		get_stylebox(TTR("EditorFocus"),"EditorStyles")->draw(surface->get_canvas_item(),r);
+		get_stylebox("EditorFocus","EditorStyles")->draw(surface->get_canvas_item(),r);
 	}
 
 
@@ -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 b2f10ccaae..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
@@ -333,11 +333,11 @@ void SpriteFramesEditor::_delete_pressed() {
 
 	_delete_confirm_pressed(); //it has undo.. why bother with a dialog..
 	/*
-	dialog->set_title(TTR("Confirm..."));
-	dialog->set_text(TTR("Remove Resource '")+tree->get_selected()->get_text(0)+"' ?");
-	//dialog->get_cancel()->set_text(TTR("Cancel"));
+	dialog->set_title("Confirm...");
+	dialog->set_text("Remove Resource '"+tree->get_selected()->get_text(0)+"' ?");
+	//dialog->get_cancel()->set_text("Cancel");
 	//dialog->get_ok()->show();
-	dialog->get_ok()->set_text(TTR("Remove"));
+	dialog->get_ok()->set_text("Remove");
 	dialog->popup_centered(Size2(300,60));*/
 
 }
@@ -530,7 +530,7 @@ void SpriteFramesEditor::_update_library(bool p_skip_selector) {
 
 		if (frames->get_frame(edited_anim,i).is_null()) {
 
-			name=itos(i)+TTR(": (empty)");
+			name=itos(i)+": "+TTR("(empty)");
 
 		} else {
 			name=itos(i)+": "+frames->get_frame(edited_anim,i)->get_name();
diff --git a/tools/editor/plugins/sprite_region_editor_plugin.h b/tools/editor/plugins/sprite_region_editor_plugin.h
index 6fe235c2ea..47cb210863 100644
--- a/tools/editor/plugins/sprite_region_editor_plugin.h
+++ b/tools/editor/plugins/sprite_region_editor_plugin.h
@@ -119,7 +119,7 @@ class SpriteRegionEditorPlugin : public EditorPlugin
 	EditorNode *editor;
 public:
 
-	virtual String get_name() const { return TTR("SpriteRegion"); }
+	virtual String get_name() const { return "SpriteRegion"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_node);
 	virtual bool handles(Object *p_node) const;
diff --git a/tools/editor/plugins/stream_editor_plugin.h b/tools/editor/plugins/stream_editor_plugin.h
index 90046a5fdf..5730612d61 100644
--- a/tools/editor/plugins/stream_editor_plugin.h
+++ b/tools/editor/plugins/stream_editor_plugin.h
@@ -69,7 +69,7 @@ class StreamEditorPlugin : public EditorPlugin {
 
 public:
 
-	virtual String get_name() const { return TTR("Stream"); }
+	virtual String get_name() const { return "Stream"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_node);
 	virtual bool handles(Object *p_node) const;
diff --git a/tools/editor/plugins/theme_editor_plugin.cpp b/tools/editor/plugins/theme_editor_plugin.cpp
index 3c394ab6ac..37cb0398e7 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("; ******************* ");
@@ -398,7 +398,7 @@ void ThemeEditor::_dialog_cbk() {
 			}
 
 
-		} break; 
+		} break;
 		case POPUP_CLASS_REMOVE: {
 			StringName fromtype = type_edit->get_text();
 			List<StringName> names;
@@ -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/plugins/tile_map_editor_plugin.h b/tools/editor/plugins/tile_map_editor_plugin.h
index b1da1bc48e..92b54a4cbb 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<Vector2> p_points, const Dictionary& p_op);
 	void _erase_points(const DVector<Vector2> 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/plugins/tile_set_editor_plugin.cpp b/tools/editor/plugins/tile_set_editor_plugin.cpp
index b77d3fb5b3..a2c7147bf3 100644
--- a/tools/editor/plugins/tile_set_editor_plugin.cpp
+++ b/tools/editor/plugins/tile_set_editor_plugin.cpp
@@ -175,7 +175,7 @@ void TileSetEditor::_name_dialog_confirm(const String& name) {
 			if (tileset->has_tile(id)) {
 				tileset->remove_tile(id);
 			} else {
-				err_dialog->set_text(TTR("Could not find tile: ") + name);
+				err_dialog->set_text(TTR("Could not find tile:")+" " + name);
 				err_dialog->popup_centered(Size2(300, 60));
 			}
 		} break;
diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp
index adb15c1f00..dea15ebd35 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;
@@ -505,7 +505,7 @@ void ProjectExportDialog::_export_action_pck(const String& p_file) {
 	if (p_file.ends_with(".pck")) {
 		FileAccess *f = FileAccess::open(p_file,FileAccess::WRITE);
 		if (!f) {
-			error->set_text(TTR("Error exporting project PCK! Can't write"));
+			error->set_text(TTR("Error writing the project PCK!"));
 			error->popup_centered_minsize();
 		}
 		ERR_FAIL_COND(!f);
@@ -586,7 +586,7 @@ void ProjectExportDialog::custom_action(const String&) {
 	Ref<EditorExportPlatform> exporter = EditorImportExport::get_singleton()->get_export_platform(platform);
 
 	if (exporter.is_null()) {
-		error->set_text(TTR("No exporter for platform '")+platform+"' yet.");
+		error->set_text(vformat(TTR("No exporter for platform '%s' yet."),platform));
 		error->popup_centered_minsize();
 		return;
 	}
@@ -858,17 +858,17 @@ void ProjectExportDialog::_group_add() {
 
 	if (name=="") {
 		group_new_name_error->show();
-		group_new_name_error->set_text(TTR("Group Name Can't be Empty!"));
+		group_new_name_error->set_text(TTR("Group name can't be empty!"));
 		return;
 	}
 	if (name.find("/")!=-1 || name.find(":")!=-1 || name.find(",")!=-1 || name.find("-")!=-1) {
-		group_new_name_error->set_text(TTR("Invalid Character in Group Name!"));
+		group_new_name_error->set_text(TTR("Invalid character in group name!"));
 		group_new_name_error->show();
 		return;
 	}
 
 	if (EditorImportExport::get_singleton()->image_export_has_group(name)) {
-		group_new_name_error->set_text(TTR("Group Name Already Exists!"));
+		group_new_name_error->set_text(TTR("Group name already exists!"));
 		group_new_name_error->show();
 		return;
 	}
@@ -1061,13 +1061,13 @@ void ProjectExportDialog::_group_atlas_preview() {
 	Error err = plugin->import2(dst_file,imd,EditorExportPlatform::IMAGE_COMPRESSION_NONE,true);
 	if (err) {
 
-		EditorNode::add_io_error(TTR("Error saving atlas! ")+dst_file.get_file());
+		EditorNode::add_io_error(TTR("Error saving atlas:")+" "+dst_file.get_file());
 		return;
 	}
 
 	Ref<Texture> tex = ResourceLoader::load(dst_file);
 	atlas_preview_frame->set_texture(tex); //clear previous
-	atlas_preview_dialog->set_title(TTR("Atlas Preview (")+itos(tex->get_width())+"x"+itos(tex->get_height())+")");
+	atlas_preview_dialog->set_title(TTR("Atlas Preview")+" ("+itos(tex->get_width())+"x"+itos(tex->get_height())+")");
 	atlas_preview_dialog->popup_centered_ratio(0.9);
 
 }
@@ -1211,14 +1211,14 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
 	tree->set_column_min_width(1,90);
 
 	filters = memnew( LineEdit );
-	vb->add_margin_child(TTR("Filters to export non-resource files (Comma Separated, eg: *.json, *.txt):"),filters);
+	vb->add_margin_child(TTR("Filters to export non-resource files (comma-separated, e.g.: *.json, *.txt):"),filters);
 	filters->connect("text_changed",this,"_filters_edited");
 	filters_exclude = memnew( LineEdit );
-	vb->add_margin_child(TTR("Filters to exclude from export (Comma Separated, eg: *.json, *.txt):"),filters_exclude);
+	vb->add_margin_child(TTR("Filters to exclude from export (comma-separated, e.g.: *.json, *.txt):"),filters_exclude);
 	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");
 
@@ -1260,7 +1260,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
 		fmt->set_editable(0,true);
 		formats.push_back(fmt);
 	}
-	image_vb->add_margin_child(TTR("Compress Formats: "),image_formats,true);
+	image_vb->add_margin_child(TTR("Compress Formats:")+" ",image_formats,true);
 
 	/// groups
 	HBoxContainer *group_hb = memnew( HBoxContainer );
@@ -1421,7 +1421,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
 	sample_max_hz = memnew( SpinBox );
 	sample_max_hz->set_max(192000);
 	sample_max_hz->set_min(8000);
-	sample_vbox->add_margin_child(TTR("Sampling Rate Limit: (hz)"),sample_max_hz);
+	sample_vbox->add_margin_child(TTR("Sampling Rate Limit (Hz):"),sample_max_hz);
 	sample_trim = memnew( CheckButton );
 	sample_trim->set_text(TTR("Trim"));
 	sample_vbox->add_margin_child(TTR("Trailing Silence:"),sample_trim);
@@ -1529,7 +1529,7 @@ Error ProjectExport::export_project(const String& p_preset) {
 	String preset_path=Globals::get_singleton()->get("export_presets_path/"+selected);
 	if (preset_path=="") {
 
-		error->set_text(TTR("Export path empty, see export options"));
+		error->set_text("Export path empty, see export options");
 		error->popup_centered_minsize(Size2(300,100));
 		ERR_FAIL_V(ERR_INVALID_DATA);
 	}
@@ -1551,9 +1551,9 @@ Error ProjectExport::export_project(const String& p_preset) {
 	}
 	if (pc%3 != 0 ) {
 		memdelete(d);
-		error->set_text(TTR("Corrupted export data.."));
+		error->set_text("Corrupted export data..");
 		error->popup_centered_minsize(Size2(300,100));
-		ERR_EXPLAIN(TTR("Corrupted export data..."));
+		ERR_EXPLAIN("Corrupted export data...");
 		ERR_FAIL_V(ERR_INVALID_DATA);
 	}
 
@@ -1706,7 +1706,7 @@ Error ProjectExport::export_project(const String& p_preset) {
 				if (err!=OK) {
 					memdelete(da);
 					memdelete(d);
-					ERR_EXPLAIN(TTR("Cannot make dir: ")+cwd+"/"+p);
+					ERR_EXPLAIN("Cannot make dir: "+cwd+"/"+p);
 					ERR_FAIL_V(ERR_CANT_CREATE);
 				}
 
@@ -1714,7 +1714,7 @@ Error ProjectExport::export_project(const String& p_preset) {
 
 					memdelete(da);
 					memdelete(d);
-					ERR_EXPLAIN(TTR("Cannot change to dir: ")+cwd+"/"+p);
+					ERR_EXPLAIN("Cannot change to dir: "+cwd+"/"+p);
 					ERR_FAIL_V(ERR_CANT_CREATE);
 				}
 
@@ -1742,7 +1742,7 @@ Error ProjectExport::export_project(const String& p_preset) {
 
 			if (!Globals::get_singleton()->has("optimizer_presets/"+preset)) {
 				memdelete(d);
-				ERR_EXPLAIN(TTR("Unknown optimizer preset: ")+preset);
+				ERR_EXPLAIN("Unknown optimizer preset: "+preset);
 				ERR_FAIL_V(ERR_INVALID_DATA);
 			}
 
@@ -1763,7 +1763,7 @@ Error ProjectExport::export_project(const String& p_preset) {
 
 			if (saver.is_null()) {
 				memdelete(d);
-				ERR_EXPLAIN(TTR("Preset '")+preset+"' references nonexistent saver: "+type);
+				ERR_EXPLAIN("Preset '"+preset+"' references nonexistent saver: "+type);
 				ERR_FAIL_COND_V(saver.is_null(),ERR_INVALID_DATA);
 			}
 
@@ -1807,7 +1807,7 @@ Error ProjectExport::export_project(const String& p_preset) {
 				if (res.is_null()) {
 
 					memdelete(d);
-					ERR_EXPLAIN(TTR("Errr loading resource to optimize: ")+path);
+					ERR_EXPLAIN("Error loading resource to optimize: "+path);
 					ERR_FAIL_V(ERR_INVALID_DATA);
 				}
 
@@ -1830,7 +1830,7 @@ Error ProjectExport::export_project(const String& p_preset) {
 				Error err = ResourceSaver::save(write_file,res,flags,saver);
 				if (err) {
 					memdelete(d);
-					ERR_EXPLAIN(TTR("Errr saving optimized resource: ")+write_file);
+					ERR_EXPLAIN("Error saving optimized resource: "+write_file);
 					ERR_FAIL_COND_V(err,ERR_CANT_OPEN);
 				}
 				source_file=write_file;
@@ -1853,7 +1853,7 @@ Error ProjectExport::export_project(const String& p_preset) {
 		if (err) {
 
 
-			ERR_EXPLAIN(TTR("Error copying from: ")+source_file+" to "+dst_file+".");
+			ERR_EXPLAIN("Error copying from: "+source_file+" to "+dst_file+".");
 			ERR_FAIL_COND_V(err,err);
 		}
 
diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp
index abc64cd9cb..c06a8cd081 100644
--- a/tools/editor/project_manager.cpp
+++ b/tools/editor/project_manager.cpp
@@ -66,7 +66,7 @@ class NewProjectDialog : public ConfirmationDialog {
 		get_ok()->set_disabled(true);
 		DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 		if (project_path->get_text() != "" && d->change_dir(project_path->get_text())!=OK) {
-			error->set_text(TTR("Invalid Path for Project, Path Must Exist!"));
+			error->set_text(TTR("Invalid project path, the path must exist!"));
 			memdelete(d);
 			return false;
 		}
@@ -75,7 +75,7 @@ class NewProjectDialog : public ConfirmationDialog {
 
 			if (d->file_exists("engine.cfg")) {
 
-				error->set_text(TTR("Invalid Project Path (engine.cfg must not exist)."));
+				error->set_text(TTR("Invalid project path, engine.cfg must not exist."));
 				memdelete(d);
 				return false;
 			}
@@ -84,7 +84,7 @@ class NewProjectDialog : public ConfirmationDialog {
 
 			if (project_path->get_text() != "" && !d->file_exists("engine.cfg")) {
 
-				error->set_text(TTR("Invalid Project Path (engine.cfg must exist)."));
+				error->set_text(TTR("Invalid project path, engine.cfg must exist."));
 				memdelete(d);
 				return false;
 			}
@@ -170,7 +170,7 @@ class NewProjectDialog : public ConfirmationDialog {
 			DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 
 			if (d->change_dir(project_path->get_text())!=OK) {
-				error->set_text(TTR("Invalid Path for Project (changed anything?)"));
+				error->set_text(TTR("Invalid project path (changed anything?)."));
 				memdelete(d);
 				return;
 			}
@@ -180,7 +180,7 @@ class NewProjectDialog : public ConfirmationDialog {
 
 			FileAccess *f = FileAccess::open(dir.plus_file("/engine.cfg"),FileAccess::WRITE);
 			if (!f) {
-				error->set_text(TTR("Couldn't create engine.cfg in project path"));
+				error->set_text(TTR("Couldn't create engine.cfg in project path."));
 			} else {
 
 				f->store_line("; Engine configuration file.");
@@ -247,7 +247,7 @@ public:
 		if (import_mode) {
 			set_title(TTR("Import Existing Project"));
 			get_ok()->set_text(TTR("Import"));
-			pp->set_text(TTR("Project Path: (Must exist)"));
+			pp->set_text(TTR("Project Path (Must Exist):"));
 			pn->set_text(TTR("Project Name:"));
 			pn->hide();
 			project_name->hide();
@@ -788,7 +788,7 @@ void ProjectManager::_erase_project()  {
 		return;
 
 
-	erase_ask->set_text(TTR("Remove project from list?? (Folder contents will not be modified)"));
+	erase_ask->set_text(TTR("Remove project from the list? (Folder contents will not be modified)"));
 	erase_ask->popup_centered_minsize();
 
 }
@@ -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 d69d565795..605b12c879 100644
--- a/tools/editor/project_settings.cpp
+++ b/tools/editor/project_settings.cpp
@@ -139,7 +139,7 @@ void ProjectSettings::_action_edited() {
 		ti->set_text(0,old_name);
 		add_at="input/"+old_name;
 
-		message->set_text(TTR("Invalid Action (Anything goes but / or :)."));
+		message->set_text(TTR("Invalid action (anything goes but '/' or ':')."));
 		message->popup_centered(Size2(300,100));
 		return;
 	}
@@ -151,7 +151,7 @@ void ProjectSettings::_action_edited() {
 		ti->set_text(0,old_name);
 		add_at="input/"+old_name;
 
-		message->set_text(TTR("Action '")+new_name+"' already exists!.");
+		message->set_text(vformat(TTR("Action '%s' already exists!"),new_name));
 		message->popup_centered(Size2(300,100));
 		return;
 	}
@@ -357,7 +357,7 @@ void ProjectSettings::_add_item(int p_item){
 			for(int i=0;i<JOY_AXIS_MAX*2;i++) {
 
 				String desc = _axis_names[i];
-				device_index->add_item(TTR("Axis ")+itos(i/2)+" "+(i&1?"+":"-")+desc);
+				device_index->add_item(TTR("Axis")+" "+itos(i/2)+" "+(i&1?"+":"-")+desc);
 			}
 			device_input->popup_centered(Size2(350,95));
 
@@ -517,7 +517,7 @@ void ProjectSettings::_update_actions() {
 				} break;
 				case InputEvent::JOYSTICK_BUTTON: {
 
-					String str = TTR("Device ")+itos(ie.device)+", Button "+itos(ie.joy_button.button_index);
+					String str = TTR("Device")+" "+itos(ie.device)+", "+TTR("Button")+" "+itos(ie.joy_button.button_index);
 					if (ie.joy_button.button_index>=0 && ie.joy_button.button_index<JOY_BUTTON_MAX)
 						str+=String()+" ("+_button_names[ie.joy_button.button_index]+").";
 					else
@@ -528,14 +528,14 @@ void ProjectSettings::_update_actions() {
 				} break;
 				case InputEvent::MOUSE_BUTTON: {
 
-					String str = TTR("Device ")+itos(ie.device)+", ";
+					String str = TTR("Device")+" "+itos(ie.device)+", ";
 					switch (ie.mouse_button.button_index) {
 						case BUTTON_LEFT: str+=TTR("Left Button."); break;
 						case BUTTON_RIGHT: str+=TTR("Right Button."); break;
 						case BUTTON_MIDDLE: str+=TTR("Middle Button."); break;
 						case BUTTON_WHEEL_UP: str+=TTR("Wheel Up."); break;
 						case BUTTON_WHEEL_DOWN: str+=TTR("Wheel Down."); break;
-						default: str+=TTR("Button ")+itos(ie.mouse_button.button_index)+".";
+						default: str+=TTR("Button")+" "+itos(ie.mouse_button.button_index)+".";
 					}
 
 					action->set_text(0,str);
@@ -546,7 +546,7 @@ void ProjectSettings::_update_actions() {
 					int ax = ie.joy_motion.axis;
 					int n = 2*ax + (ie.joy_motion.axis_value<0 ? 0:1);
 					String desc = _axis_names[n];
-					String str = TTR("Device ")+itos(ie.device)+", Axis "+itos(ax)+" "+(ie.joy_motion.axis_value<0?"-":"+")+desc +".";
+					String str = TTR("Device")+" "+itos(ie.device)+", "+TTR("Axis")+" "+itos(ax)+" "+(ie.joy_motion.axis_value<0?"-":"+")+desc +".";
 					action->set_text(0,str);
 					action->set_icon(0,get_icon("JoyAxis","EditorIcons"));
 				} break;
@@ -650,13 +650,13 @@ void ProjectSettings::_action_add() {
 
 	String action = action_name->get_text();
 	if (action.find("/")!=-1 || action.find(":")!=-1 || action=="") {
-		message->set_text(TTR("Invalid Action (Anything goes but / or :)."));
+		message->set_text(TTR("Invalid action (anything goes but '/' or ':')."));
 		message->popup_centered(Size2(300,100));
 		return;
 	}
 
 	if (Globals::get_singleton()->has("input/"+action)) {
-		message->set_text(TTR("Action '")+action+"' already exists!.");
+		message->set_text(vformat(TTR("Action '%s' already exists!"),action));
 		message->popup_centered(Size2(300,100));
 		return;
 	}
@@ -710,7 +710,7 @@ void ProjectSettings::_item_checked(const String& p_item, bool p_check) {
 void ProjectSettings::_save() {
 
 	Error err = Globals::get_singleton()->save();
-	message->set_text(err!=OK?TTR("Error saving settings."):"Settings Saved OK.");
+	message->set_text(err!=OK?TTR("Error saving settings."):TTR("Settings saved OK."));
 	message->popup_centered(Size2(300,100));
 }
 
@@ -851,7 +851,7 @@ void ProjectSettings::_autoload_edited() {
 	if (checked)
 		path="*"+path;
 
-	undo_redo->create_action(TTR("Toggle Autoload GlobalVar"));
+	undo_redo->create_action(TTR("Toggle AutoLoad Globals"));
 	undo_redo->add_do_property(Globals::get_singleton(),base,path);
 	undo_redo->add_undo_property(Globals::get_singleton(),base,Globals::get_singleton()->get(base));
 	undo_redo->add_do_method(Globals::get_singleton(),"set_order",base,order); // keep order, as config order matters for these
@@ -869,7 +869,7 @@ void ProjectSettings::_autoload_add() {
 
 	String name = autoload_add_name->get_text();
 	if (!name.is_valid_identifier()) {
-		message->set_text("Invalid Name.\nValid characters: a-z,A-Z,0-9 or _");
+		message->set_text(TTR("Invalid name.")+"\n"+TTR("Valid characters:")+" a-z, A-Z, 0-9 or _");
 		message->popup_centered(Size2(300,100));
 		return;
 
@@ -877,7 +877,7 @@ void ProjectSettings::_autoload_add() {
 
 	if (ObjectTypeDB::type_exists(name)) {
 
-		message->set_text(TTR("Invalid Name.Must not collide with an existing engine class name."));
+		message->set_text(TTR("Invalid name. Must not collide with an existing engine class name."));
 		message->popup_centered(Size2(300,100));
 		return;
 
@@ -886,7 +886,7 @@ void ProjectSettings::_autoload_add() {
 	for(int i=0;i<Variant::VARIANT_MAX;i++) {
 		if (Variant::get_type_name(Variant::Type(i))==name) {
 
-			message->set_text(TTR("Invalid Name.Must not collide with an existing buit-in type name."));
+			message->set_text(TTR("Invalid name. Must not collide with an existing buit-in type name."));
 			message->popup_centered(Size2(300,100));
 			return;
 
@@ -897,7 +897,7 @@ void ProjectSettings::_autoload_add() {
 
 		if (GlobalConstants::get_global_constant_name(i)==name) {
 
-			message->set_text(TTR("Invalid Name.Must not collide with an existing global constant name."));
+			message->set_text(TTR("Invalid name. Must not collide with an existing global constant name."));
 			message->popup_centered(Size2(300,100));
 			return;
 		}
@@ -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 c4f54e04cb..f94ca48ec2 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 );
@@ -691,10 +691,10 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 						int id = TYPE_BASE_ID+idx;
 						if (has_icon(t,"EditorIcons")) {
 
-							menu->add_icon_item(get_icon(t,"EditorIcons"),"New "+t,id);
+							menu->add_icon_item(get_icon(t,"EditorIcons"),TTR("New")+" "+t,id);
 						} else {
 
-							menu->add_item(TTR("New ")+t,id);
+							menu->add_item(TTR("New")+" "+t,id);
 						}
 
 						idx++;
@@ -936,7 +936,7 @@ void CustomPropertyEditor::_node_path_selected(NodePath p_path) {
 
 		if (owner->is_type("Node"))
 			node = owner->cast_to<Node>();
-		else if (owner->is_type(TTR("ArrayPropertyEdit")))
+		else if (owner->is_type("ArrayPropertyEdit"))
 			node = owner->cast_to<ArrayPropertyEdit>()->get_node();
 
 		if (!node) {
@@ -1732,7 +1732,7 @@ CustomPropertyEditor::CustomPropertyEditor() {
 		add_child(checks20[i]);
 		checks20[i]->hide();
 		checks20[i]->connect("pressed",this,"_action_pressed",make_binds(i));
-		checks20[i]->set_tooltip(TTR("Bit ")+itos(i)+", val "+itos(1<<i)+".");
+		checks20[i]->set_tooltip(vformat(TTR("Bit %d, val %d."), i, 1<<i));
 	}
 
 	text_edit = memnew( TextEdit );
@@ -2658,11 +2658,11 @@ void PropertyEditor::update_tree() {
 	TreeItem *title = tree->create_item(root);
 
 	title->set_custom_bg_color(0,get_color("prop_section","Editor"));
-	title->set_text(0,TTR("Property")); // todo, fetch name if ID exists in database
+	title->set_text(0,"Property"); // todo, fetch name if ID exists in database
 	title->set_editable(0,false);
 	title->set_selectable(0,false);
 	title->set_custom_bg_color(1,get_color("prop_section","Editor"));
-	title->set_text(1,TTR("Value")); // todo, fetch name if ID exists in database
+	title->set_text(1,"Value"); // todo, fetch name if ID exists in database
 	title->set_editable(1,false);
 	title->set_selectable(1,false);
 */
@@ -2671,7 +2671,7 @@ void PropertyEditor::update_tree() {
 	if (obj->cast_to<Node>() || obj->cast_to<Resource>()) {
 		TreeItem *type = tree->create_item(root);
 
-		type->set_text(0,TTR("Type")); // todo, fetch name if ID exists in database
+		type->set_text(0,"Type"); // todo, fetch name if ID exists in database
 		type->set_text(1,obj->get_type()); // todo, fetch name if ID exists in database
 		if (has_icon(obj->get_type(),"EditorIcons"))
 			type->set_icon(1,get_icon(obj->get_type(),"EditorIcons") );
@@ -2684,7 +2684,7 @@ void PropertyEditor::update_tree() {
 
 		TreeItem *name = tree->create_item(root);
 
-		name->set_text(0,TTR("Name")); // todo, fetch name if ID exists in database
+		name->set_text(0,"Name"); // todo, fetch name if ID exists in database
 		if (obj->is_type("Resource"))
 			name->set_text(1,obj->cast_to<Resource>()->get_name());
 		else if (obj->is_type("Node"))
@@ -2767,7 +2767,7 @@ void PropertyEditor::update_tree() {
 
 				}
 
-				sep->set_tooltip(0,TTR("Class: ")+p.name+":\n\n"+class_descr_cache[type]);
+				sep->set_tooltip(0,TTR("Class:")+" "+p.name+":\n\n"+class_descr_cache[type]);
 			}
 			//sep->set_custom_color(0,Color(1,1,1));
 
@@ -2864,7 +2864,7 @@ void PropertyEditor::update_tree() {
 					descr_cache[type][setter]=descr;
 				}
 
-				item->set_tooltip(0, TTR("Property: ")+p.name+"\n\n"+descr);
+				item->set_tooltip(0, TTR("Property:")+" "+p.name+"\n\n"+descr);
 			}
 		}
 		//EditorHelp::get_doc_data();
@@ -3433,7 +3433,7 @@ void PropertyEditor::_edit_set(const String& p_name, const Variant& p_value) {
 	} else {
 
 
-		undo_redo->create_action(TTR("Set ")+p_name,true);
+		undo_redo->create_action(TTR("Set")+" "+p_name,true);
 		undo_redo->add_do_property(obj,p_name,p_value);
 		undo_redo->add_undo_property(obj,p_name,obj->get(p_name));
 		undo_redo->add_do_method(this,"_changed_callback",obj,p_name);
diff --git a/tools/editor/pvrtc_compress.cpp b/tools/editor/pvrtc_compress.cpp
index fcb3c7abc8..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)
@@ -93,13 +93,13 @@ static void _compress_image(Image::CompressMode p_mode,Image *p_image) {
 	ResourceSaver::save(src_img,t);
 
 	Error err = OS::get_singleton()->execute(ttpath,args,true);
-	ERR_EXPLAIN(TTR("Could not execute PVRTC Tool: ")+ttpath);
+	ERR_EXPLAIN(TTR("Could not execute PVRTC tool:")+" "+ttpath);
 	ERR_FAIL_COND(err!=OK);
 
 
 	t=ResourceLoader::load(dst_img,"Texture");
 
-	ERR_EXPLAIN(TTR("Can't load back converted image using PVRTC Tool: ")+dst_img);
+	ERR_EXPLAIN(TTR("Can't load back converted image using PVRTC tool:")+" "+dst_img);
 	ERR_FAIL_COND(t.is_null());
 
 	*p_image=t->get_data();
diff --git a/tools/editor/register_exporters.h b/tools/editor/register_exporters.h
index 364ad5efc9..dccaa0641f 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/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 d0569920bd..7c64ed60b1 100644
--- a/tools/editor/scene_tree_dock.cpp
+++ b/tools/editor/scene_tree_dock.cpp
@@ -66,7 +66,7 @@ void SceneTreeDock::instance(const String& p_file) {
 
 		current_option=-1;
 		//accept->get_cancel()->hide();
-		accept->get_ok()->set_text(TTR("Ok :( "));
+		accept->get_ok()->set_text(TTR("OK :("));
 		accept->set_text(TTR("No parent to instance a child at."));
 		accept->popup_centered_minsize();
 		return;
@@ -98,7 +98,7 @@ void SceneTreeDock::instance_scenes(const Vector<String>& p_files,Node* parent,i
 			current_option=-1;
 			//accept->get_cancel()->hide();
 			accept->get_ok()->set_text(TTR("Ugh"));
-			accept->set_text(String(TTR("Error loading scene from "))+p_files[i]);
+			accept->set_text(vformat(TTR("Error loading scene from %s"),p_files[i]));
 			accept->popup_centered_minsize();
 			error=true;
 			break;
@@ -110,7 +110,7 @@ void SceneTreeDock::instance_scenes(const Vector<String>& p_files,Node* parent,i
 			current_option=-1;
 			//accept->get_cancel()->hide();
 			accept->get_ok()->set_text(TTR("Ugh"));
-			accept->set_text(String(TTR("Error instancing scene from "))+p_files[i]);
+			accept->set_text(vformat(TTR("Error instancing scene from %s"),p_files[i]));
 			accept->popup_centered_minsize();
 			error=true;
 			break;
@@ -122,7 +122,7 @@ void SceneTreeDock::instance_scenes(const Vector<String>& p_files,Node* parent,i
 			if (_cyclical_dependency_exists(edited_scene->get_filename(), instanced_scene)) {
 
 				accept->get_ok()->set_text(TTR("Ok"));
-				accept->set_text(String(TTR("Cannot instance the scene '"))+p_files[i]+String(TTR("' because the current scene exists within one of its' nodes.")));
+				accept->set_text(vformat(TTR("Cannot instance the scene '%s' because the current scene exists within one of its nodes."),p_files[i]));
 				accept->popup_centered_minsize();
 				error=true;
 				break;
@@ -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;
 			}
@@ -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);
 
 }
@@ -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/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp
index 7332bbb8b0..09a5e7860f 100644
--- a/tools/editor/scene_tree_editor.cpp
+++ b/tools/editor/scene_tree_editor.cpp
@@ -293,13 +293,13 @@ bool SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) {
 
 	if (p_node==get_scene_node() && p_node->get_scene_inherited_state().is_valid()) {
 		item->add_button(0,get_icon("InstanceOptions","EditorIcons"),BUTTON_SUBSCENE);
-		item->set_tooltip(0,TTR("Inherits: ")+p_node->get_scene_inherited_state()->get_path()+"\nType: "+p_node->get_type());
+		item->set_tooltip(0,TTR("Inherits:")+" "+p_node->get_scene_inherited_state()->get_path()+"\n"+TTR("Type:")+" "+p_node->get_type());
 	} else if (p_node!=get_scene_node() && p_node->get_filename()!="" && can_open_instance) {
 
 		item->add_button(0,get_icon("InstanceOptions","EditorIcons"),BUTTON_SUBSCENE);
-		item->set_tooltip(0,TTR("Instance: ")+p_node->get_filename()+"\nType: "+p_node->get_type());
+		item->set_tooltip(0,TTR("Instance:")+" "+p_node->get_filename()+"\n"+TTR("Type:")+" "+p_node->get_type());
 	} else {
-		item->set_tooltip(0,String(p_node->get_name())+"\nType: "+p_node->get_type());
+		item->set_tooltip(0,String(p_node->get_name())+"\n"+TTR("Type:")+" "+p_node->get_type());
 	}
 
 	if (can_open_instance) {
@@ -684,7 +684,7 @@ void SceneTreeEditor::_renamed() {
 	String new_name=which->get_text(0);
 	if (new_name.find(".") != -1 || new_name.find("/") != -1) {
 
-		error->set_text(TTR("Invalid node name, the following characters are not allowed:\n  \".\", \"/\""));
+		error->set_text(TTR("Invalid node name, the following characters are not allowed:")+"\n  \".\", \"/\"");
 		error->popup_centered_minsize();
 		new_name=n->get_name();
 	}
diff --git a/tools/editor/scenes_dock.cpp b/tools/editor/scenes_dock.cpp
index e00f470bc4..ee4258145e 100644
--- a/tools/editor/scenes_dock.cpp
+++ b/tools/editor/scenes_dock.cpp
@@ -859,7 +859,7 @@ void ScenesDock::_move_operation(const String& p_to_path) {
 
 	for(int i=0;i<move_dirs.size();i++) {
 		if (p_to_path.begins_with(move_dirs[i])) {
-			EditorNode::get_singleton()->show_warning(TTR("Can't move directories to within themselves"));
+			EditorNode::get_singleton()->show_warning(TTR("Can't move directories to within themselves."));
 			return;
 		}
 
@@ -944,6 +944,7 @@ void ScenesDock::_file_option(int p_option) {
 	switch(p_option) {
 
 
+		case FILE_SHOW_IN_EXPLORER:
 		case FILE_OPEN: {
 			int idx=-1;
 			for(int i=0;i<files->get_item_count();i++) {
@@ -959,6 +960,12 @@ void ScenesDock::_file_option(int p_option) {
 
 
 			String path = files->get_item_metadata(idx);
+			if (p_option == FILE_SHOW_IN_EXPLORER) {
+				String dir = Globals::get_singleton()->globalize_path(path);
+				dir = dir.substr(0, dir.find_last("/"));
+				OS::get_singleton()->shell_open(String("file://")+dir);
+				return;
+			}
 
 			if (path.ends_with("/")) {
 				if (path!="res://") {
@@ -1036,7 +1043,7 @@ void ScenesDock::_file_option(int p_option) {
 				rename_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE);
 				rename_dialog->set_current_path(move_files[0]);
 				rename_dialog->popup_centered_ratio();
-				rename_dialog->set_title(TTR("Pick New Name and Location For: ")+move_files[0].get_file());
+				rename_dialog->set_title(TTR("Pick New Name and Location For:")+" "+move_files[0].get_file());
 
 
 			} else {
@@ -1416,6 +1423,10 @@ void ScenesDock::_files_list_rmb_select(int p_item,const Vector2& p_pos) {
 
 	file_options->add_item(TTR("Delete"),FILE_REMOVE);
 	//file_options->add_item(TTR("Info"),FILE_INFO);
+
+	file_options->add_separator();
+	file_options->add_item(TTR("Show In File Manager"),FILE_SHOW_IN_EXPLORER);
+
 	file_options->set_pos(files->get_global_pos() + p_pos);
 	file_options->popup();
 
@@ -1635,4 +1646,3 @@ ScenesDock::ScenesDock(EditorNode *p_editor) {
 ScenesDock::~ScenesDock() {
 
 }
-
diff --git a/tools/editor/scenes_dock.h b/tools/editor/scenes_dock.h
index 327e5a25f0..42c1374be1 100644
--- a/tools/editor/scenes_dock.h
+++ b/tools/editor/scenes_dock.h
@@ -62,7 +62,8 @@ class ScenesDock : public VBoxContainer {
 		FILE_MOVE,
 		FILE_REMOVE,
 		FILE_REIMPORT,
-		FILE_INFO
+		FILE_INFO,
+		FILE_SHOW_IN_EXPLORER
 	};
 
 
diff --git a/tools/editor/script_create_dialog.cpp b/tools/editor/script_create_dialog.cpp
index 8d410f6fa3..e88d603b30 100644
--- a/tools/editor/script_create_dialog.cpp
+++ b/tools/editor/script_create_dialog.cpp
@@ -74,17 +74,17 @@ bool ScriptCreateDialog::_validate(const String& p_string) {
 void ScriptCreateDialog::_class_name_changed(const String& p_name) {
 
 	if (!_validate(parent_name->get_text())) {
-		error_label->set_text(TTR("Invaild parent class name"));
+		error_label->set_text(TTR("Invalid parent class name"));
 		error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8));
 	} else if (class_name->is_editable()) {
 		if (class_name->get_text()=="") {
-		error_label->set_text(TTR("Valid Chars: a-z A-Z 0-9 _"));
+		error_label->set_text(TTR("Valid chars:")+" a-z A-Z 0-9 _");
 		error_label->add_color_override("font_color",Color(1,1,1,0.6));
 		} else if (!_validate(class_name->get_text())) {
 			error_label->set_text(TTR("Invalid class name"));
 			error_label->add_color_override("font_color",Color(1,0.2,0.2,0.8));
 		} else {
-			error_label->set_text(TTR("Valid Name"));
+			error_label->set_text(TTR("Valid name"));
 			error_label->add_color_override("font_color",Color(0,1.0,0.8,0.8));
 		}
 	} else {
@@ -98,12 +98,12 @@ void ScriptCreateDialog::ok_pressed() {
 
 	if (class_name->is_editable() && !_validate(class_name->get_text())) {
 
-		alert->set_text(TTR("Class Name is Invalid!"));
+		alert->set_text(TTR("Class name is invalid!"));
 		alert->popup_centered_minsize();
 		return;
 	}
 	if (!_validate(parent_name->get_text())) {
-		alert->set_text(TTR("Parent Class Name is Invalid!"));
+		alert->set_text(TTR("Parent class name is invalid!"));
 		alert->popup_centered_minsize();
 
 		return;
@@ -133,7 +133,7 @@ void ScriptCreateDialog::ok_pressed() {
 		script->set_path(lpath);
 		if (!path_valid) {
 
-			alert->set_text(TTR("Path is Invalid!"));
+			alert->set_text(TTR("Invalid path!"));
 			alert->popup_centered_minsize();
 			return;
 
@@ -141,7 +141,7 @@ void ScriptCreateDialog::ok_pressed() {
 		Error err = ResourceSaver::save(lpath,scr,ResourceSaver::FLAG_CHANGE_PATH);
 		if (err!=OK) {
 
-			alert->set_text(TTR("Could not create script in filesystem: ")+String(""));
+			alert->set_text(TTR("Could not create script in filesystem."));
 			alert->popup_centered_minsize();
 			return;
 		}
@@ -215,7 +215,7 @@ void ScriptCreateDialog::_path_changed(const String& p_path) {
 
 	if (p=="")	 {
 
-		path_error_label->set_text(TTR("Path is Empty"));
+		path_error_label->set_text(TTR("Path is empty"));
 		path_error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8));
 		return;
 
@@ -234,7 +234,7 @@ void ScriptCreateDialog::_path_changed(const String& p_path) {
 
 		if (d->change_dir(p.get_base_dir())!=OK) {
 
-			path_error_label->set_text(TTR("Base Path Invalid"));
+			path_error_label->set_text(TTR("Invalid base path"));
 			path_error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8));
 			memdelete(d);
 			return;
@@ -249,7 +249,7 @@ void ScriptCreateDialog::_path_changed(const String& p_path) {
 
 	if (f->file_exists(p)) {
 
-		path_error_label->set_text(TTR("File Exists"));
+		path_error_label->set_text(TTR("File exists"));
 		path_error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8));
 		memdelete(f);
 		return;
@@ -273,13 +273,13 @@ void ScriptCreateDialog::_path_changed(const String& p_path) {
 
 	if (!found) {
 
-		path_error_label->set_text(TTR("Invalid Extension"));
+		path_error_label->set_text(TTR("Invalid extension"));
 		path_error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8));
 		return;
 	}
 
 
-	path_error_label->set_text(TTR("Path is Valid"));
+	path_error_label->set_text(TTR("Valid path"));
 	path_error_label->add_color_override("font_color",Color(0,1.0,0.8,0.8));
 
 	path_valid=true;
@@ -363,7 +363,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
 
 	set_size(Size2(200,150));
 	set_hide_on_ok(false);
-	set_title(TTR("Create Script for Node"));
+	set_title(TTR("Create Node Script"));
 
 	file_browse = memnew( EditorFileDialog );
 	file_browse->connect("file_selected",this,"_file_selected");
diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp
index b0cd2e925d..12840ee4c5 100644
--- a/tools/editor/script_editor_debugger.cpp
+++ b/tools/editor/script_editor_debugger.cpp
@@ -292,7 +292,7 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat
 				it->set_icon(0,get_icon(type,"EditorIcons"));
 		}
 
-		vmem_total->set_tooltip(TTR("Bytes: ")+itos(total));
+		vmem_total->set_tooltip(TTR("Bytes:")+" "+itos(total));
 		vmem_total->set_text(String::humanize_size(total));
 
 	} else if (p_msg=="stack_dump") {
@@ -412,12 +412,12 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat
 		String time = String("%d:%02d:%02d:%04d").sprintf(vals,&e);
 		String txt=time+" - "+String(err[8]);
 
-		String tooltip=TTR("Type:")+String(warning?"Warning":"Error");
-		tooltip+="\nDescription: "+String(err[8]);
-		tooltip+="\nTime: "+time;
-		tooltip+="\nC Error: "+String(err[7]);
-		tooltip+="\nC Source: "+String(err[5])+":"+String(err[6]);
-		tooltip+="\nC Function: "+String(err[4]);
+		String tooltip=TTR("Type:")+String(warning?TTR("Warning"):TTR("Error"));
+		tooltip+="\n"+TTR("Description:")+" "+String(err[8]);
+		tooltip+="\n"+TTR("Time:")+" "+time;
+		tooltip+="\nC "+TTR("Error:")+" "+String(err[7]);
+		tooltip+="\nC "+TTR("Source:")+" "+String(err[5])+":"+String(err[6]);
+		tooltip+="\nC "+TTR("Function:")+" "+String(err[4]);
 
 
 
@@ -702,8 +702,8 @@ void ScriptEditorDebugger::_notification(int p_what) {
 					debugger_button->set_icon(Ref<Texture>());
 					tabs->set_tab_icon(error_split->get_index(),Ref<Texture>());
 				} else {
-					error_split->set_name(TTR("Errors (")+itos(error_count)+")");
-					debugger_button->set_text(TTR("Debugger (")+itos(error_count)+")");
+					error_split->set_name(TTR("Errors")+" ("+itos(error_count)+")");
+					debugger_button->set_text(TTR("Debugger")+" ("+itos(error_count)+")");
 					debugger_button->set_icon(get_icon("Error","EditorIcons"));
 					tabs->set_tab_icon(error_split->get_index(),get_icon("Error","EditorIcons"));
 				}
@@ -1350,7 +1350,7 @@ void ScriptEditorDebugger::_error_selected(int p_idx) {
 
 		error_stack->add_item(str);
 		error_stack->set_item_metadata(error_stack->get_item_count()-1,md);
-		error_stack->set_item_tooltip(error_stack->get_item_count()-1,TTR("File: ")+String(st[i])+"\nLine: "+itos(line));
+		error_stack->set_item_tooltip(error_stack->get_item_count()-1,TTR("File:")+" "+String(st[i])+"\n"+TTR("Line:")+" "+itos(line));
 	}
 }
 
@@ -1484,7 +1484,7 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
 
 	forward = memnew( Button );
 	hbc->add_child(forward);
-	back->set_tooltip(TTR("Inspect Next Instance"));
+	forward->set_tooltip(TTR("Inspect Next Instance"));
 
 
 	HSplitContainer *sc = memnew( HSplitContainer );
@@ -1533,7 +1533,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"));
@@ -1591,10 +1591,10 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
 
 	VBoxContainer *vmem_vb = memnew( VBoxContainer );
 	HBoxContainer *vmem_hb = memnew( HBoxContainer );
-	Label *vmlb = memnew(Label(TTR("List of Video Memory Usage by Resource: ")) );
+	Label *vmlb = memnew(Label(TTR("List of Video Memory Usage by Resource:")+" ") );
 	vmlb->set_h_size_flags(SIZE_EXPAND_FILL);
 	vmem_hb->add_child( vmlb );
-	vmem_hb->add_child( memnew(Label(TTR("Total: "))) );
+	vmem_hb->add_child( memnew(Label(TTR("Total:")+" ")) );
 	vmem_total = memnew( LineEdit );
 	vmem_total->set_editable(false);
 	vmem_total->set_custom_minimum_size(Size2(100,1));
diff --git a/tools/editor/settings_config_dialog.cpp b/tools/editor/settings_config_dialog.cpp
index 2a871efb18..7d369d7262 100644
--- a/tools/editor/settings_config_dialog.cpp
+++ b/tools/editor/settings_config_dialog.cpp
@@ -122,7 +122,7 @@ EditorSettingsDialog::EditorSettingsDialog() {
 	vbc->add_child(hbc);
 
 	Label *l = memnew( Label );
-	l->set_text(TTR("Search: "));
+	l->set_text(TTR("Search:")+" ");
 	hbc->add_child(l);
 
 	search_box = memnew( LineEdit );
@@ -146,16 +146,16 @@ EditorSettingsDialog::EditorSettingsDialog() {
 
 	hbc = memnew( HBoxContainer );
 	vbc->add_child(hbc);
-	hbc->add_child( memnew( Label(TTR("Plugin List: "))));
+	hbc->add_child( memnew( Label(TTR("Plugin List:")+" ") ));
 	hbc->add_spacer();
 	//Button *load = memnew( Button );
-	//load->set_text(TTR("Load.."));
+	//load->set_text("Load..");
 	//hbc->add_child(load);
 
 
-	//get_ok()->set_text(TTR("Apply"));
+	//get_ok()->set_text("Apply");
 	set_hide_on_ok(true);
-	//get_cancel()->set_text(TTR("Close"));
+	//get_cancel()->set_text("Close");
 
 	timer = memnew( Timer );
 	timer->set_wait_time(1.5);
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/extract.py b/tools/translations/extract.py
index fc72c76bf3..195f45f637 100755
--- a/tools/translations/extract.py
+++ b/tools/translations/extract.py
@@ -2,73 +2,110 @@
 
 import fnmatch
 import os
-import re
 import shutil
 import subprocess
+import sys
+
+
+line_nb = False
+
+for arg in sys.argv[1:]:
+	if (arg == "--with-line-nb"):
+		print("Enabling line numbers in the context locations.")
+		line_nb = True
+	else:
+		os.sys.exit("Non supported argument '" + arg + "'. Aborting.")
+
 
 if (not os.path.exists("tools")):
 	os.sys.exit("ERROR: This script should be started from the root of the git repo.")
 
+
 matches = []
 for root, dirnames, filenames in os.walk('.'):
 	for filename in fnmatch.filter(filenames, '*.cpp'):
-		if (filename.find("collada")!=-1):
+		if (filename.find("collada") != -1):
 			continue
 		matches.append(os.path.join(root, filename))
 	for filename in fnmatch.filter(filenames, '*.h'):
-		if (filename.find("collada")!=-1):
+		if (filename.find("collada") != -1):
 			continue
 		matches.append(os.path.join(root, filename))
 
 
-unique_str=[]
-main_po=""
+unique_str = []
+unique_loc = {}
+main_po = """
+# LANGUAGE translation of the Godot Engine editor
+# Copyright (C) 2016 Juan Linietsky, Ariel Manzur and the Godot community
+# This file is distributed under the same license as the Godot source code.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Godot Engine editor\\n"
+"Content-Type: text/plain; charset=UTF-8\\n"
+"Content-Transfer-Encoding: 8-bit\\n"
+"""
 
 print("Updating the tools.pot template...")
 
 for fname in matches:
 
-	f = open(fname,"rb")
-
-	new_f = ""
+	f = open(fname, "rb")
 
 	l = f.readline()
-	lc=1
-	while(l):
+	lc = 1
+	while (l):
 
 		pos = 0
-		while(pos>=0):
-			pos = l.find('TTR(\"',pos)
-			if (pos==-1):
+		while (pos >= 0):
+			pos = l.find('TTR(\"', pos)
+			if (pos == -1):
 				break
-			pos+=5
+			pos += 5
+
+			msg = ""
+			while (pos < len(l) and (l[pos] != '"' or l[pos - 1] == '\\')):
+				msg += l[pos]
+				pos += 1
 
-			msg=""
-			while (pos < len(l) and (l[pos]!='"' or l[pos-1]=='\\') ):
-				msg+=l[pos]
-				pos+=1
+			location = os.path.relpath(fname).replace('\\','/')
+			if (line_nb):
+				location += ":" + str(lc)
 
 			if (not msg in unique_str):
-				main_po+="\n#:"+fname+":"+str(lc)+"\n"
-				main_po+='msgid "'+msg+'"\n'
-				main_po+='msgstr ""\n'
+				main_po += "\n#: " + location + "\n"
+				main_po += 'msgid "' + msg + '"\n'
+				main_po += 'msgstr ""\n'
 				unique_str.append(msg)
+				unique_loc[msg] = [location]
+			elif (not location in unique_loc[msg]):
+				# Add additional location to previous occurence too
+				msg_pos = main_po.find('\nmsgid "' + msg)
+				main_po = main_po[:msg_pos] + ' ' + location + main_po[msg_pos:]
+				unique_loc[msg].append(location)
 
 		l = f.readline()
-		lc+=1
+		lc += 1
 
 	f.close()
 
 
-f = open("tools.pot","wb")
+f = open("tools.pot", "wb")
 f.write(main_po)
 f.close()
 
+if (os.name == "posix"):
+	os.system("msgmerge -w80 tools.pot tools.pot > tools.pot.wrap")
+	shutil.move("tools.pot.wrap", "tools.pot")
+
 shutil.move("tools.pot", "tools/translations/tools.pot")
 
 # TODO: Make that in a portable way, if we care; if not, kudos to Unix users
 if (os.name == "posix"):
-	added = subprocess.check_output("git diff tools/translations/tools.pot | grep \+msgid | wc -l", shell=True)
-	removed = subprocess.check_output("git diff tools/translations/tools.pot | grep \\\-msgid | wc -l", shell=True)
+	added = subprocess.check_output("git diff tools/translations/tools.pot | grep \+msgid | wc -l", shell = True)
+	removed = subprocess.check_output("git diff tools/translations/tools.pot | grep \\\-msgid | wc -l", shell = True)
 	print("Template changes compared to the staged status:")
 	print("  Additions: %s msgids.\n  Deletions: %s msgids." % (int(added), int(removed)))
diff --git a/tools/translations/tools.pot b/tools/translations/tools.pot
index 6bef30c21a..41aba64129 100644
--- a/tools/translations/tools.pot
+++ b/tools/translations/tools.pot
@@ -1,5640 +1,5580 @@
+# LANGUAGE translation of the Godot Engine editor
+# Copyright (C) 2016 Juan Linietsky, Ariel Manzur and the Godot community
+# This file is distributed under the same license as the Godot source code.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Godot Engine editor\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8-bit\n"
+
+#: scene/audio/sample_player.cpp scene/2d/sample_player_2d.cpp
+msgid ""
+"A SampleLibrary resource must be created or set in the 'samples' property in "
+"order for SamplePlayer to play sound."
+msgstr ""
+
+#: scene/3d/body_shape.cpp
+msgid ""
+"CollisionShape only serves to provide a collision shape to a CollisionObject "
+"derived node. Please only use it as a child of Area, StaticBody, RigidBody, "
+"KinematicBody, etc. to give them a shape."
+msgstr ""
+
+#: scene/3d/body_shape.cpp
+msgid ""
+"A shape must be provided for CollisionShape to function. Please create a "
+"shape resource for it!"
+msgstr ""
+
+#: scene/3d/collision_polygon.cpp
+msgid ""
+"CollisionPolygon only serves to provide a collision shape to a "
+"CollisionObject derived node. Please only use it as a child of Area, "
+"StaticBody, RigidBody, KinematicBody, etc. to give them a shape."
+msgstr ""
+
+#: scene/3d/collision_polygon.cpp
+msgid "An empty CollisionPolygon has no effect on collision."
+msgstr ""
+
+#: scene/3d/scenario_fx.cpp
+msgid ""
+"Only one WorldEnvironment is allowed per scene (or set of instanced scenes)."
+msgstr ""
+
+#: scene/3d/spatial_sample_player.cpp
+msgid ""
+"A SampleLibrary resource must be created or set in the 'samples' property in "
+"order for SpatialSamplePlayer to play sound."
+msgstr ""
+
+#: scene/3d/navigation_mesh.cpp
+msgid "A NavigationMesh resource must be set or created for this node to work."
+msgstr ""
+
+#: scene/3d/navigation_mesh.cpp
+msgid ""
+"NavigationMeshInstance must be a child or grandchild to a Navigation node. It "
+"only provides navigation data."
+msgstr ""
+
+#: scene/2d/particles_2d.cpp
+msgid "Path property must point to a valid Particles2D node to work."
+msgstr ""
+
+#: scene/2d/parallax_layer.cpp
+msgid ""
+"ParallaxLayer node only works when set as child of a ParallaxBackground node."
+msgstr ""
+
+#: scene/2d/visibility_notifier_2d.cpp
+msgid ""
+"VisibilityEnable2D works best when used with the edited scene root directly "
+"as parent."
+msgstr ""
+
+#: scene/2d/light_occluder_2d.cpp
+msgid ""
+"An occluder polygon must be set (or drawn) for this occluder to take effect."
+msgstr ""
+
+#: scene/2d/light_occluder_2d.cpp
+msgid "The occluder polygon for this occluder is empty. Please draw a polygon!"
+msgstr ""
+
+#: scene/2d/navigation_polygon.cpp
+msgid ""
+"A NavigationPolygon resource must be set or created for this node to work. "
+"Please set a property or draw a polygon."
+msgstr ""
+
+#: scene/2d/navigation_polygon.cpp
+msgid ""
+"NavigationPolygonInstance must be a child or grandchild to a Navigation2D "
+"node. It only provides navigation data."
+msgstr ""
+
+#: scene/2d/sprite.cpp
+msgid ""
+"Path property must point to a valid Viewport node to work. Such Viewport must "
+"be set to 'render target' mode."
+msgstr ""
+
+#: scene/2d/sprite.cpp
+msgid ""
+"The Viewport set in the path property must be set as 'render target' in order "
+"for this sprite to work."
+msgstr ""
 
-#:./scene/gui/text_edit.cpp:4401
+#: scene/2d/collision_polygon_2d.cpp
+msgid ""
+"CollisionPolygon2D only serves to provide a collision shape to a "
+"CollisionObject2D derived node. Please only use it as a child of Area2D, "
+"StaticBody2D, RigidBody2D, KinematicBody2D, etc. to give them a shape."
+msgstr ""
+
+#: scene/2d/collision_polygon_2d.cpp
+msgid "An empty CollisionPolygon2D has no effect on collision."
+msgstr ""
+
+#: scene/2d/path_2d.cpp
+msgid "PathFollow2D only works when set as a child of a Path2D node."
+msgstr ""
+
+#: scene/2d/canvas_modulate.cpp
+msgid ""
+"Only one visible CanvasModulate is allowed per scene (or set of instanced "
+"scenes). The first created one will work, while the rest will be ignored."
+msgstr ""
+
+#: scene/2d/animated_sprite.cpp
+msgid ""
+"A SpriteFrames resource must be created or set in the 'Frames' property in "
+"order for AnimatedSprite to display frames."
+msgstr ""
+
+#: scene/2d/remote_transform_2d.cpp
+msgid "Path property must point to a valid Node2D node to work."
+msgstr ""
+
+#: scene/2d/collision_shape_2d.cpp
+msgid ""
+"CollisionShape2D only serves to provide a collision shape to a "
+"CollisionObject2D derived node. Please only use it as a child of Area2D, "
+"StaticBody2D, RigidBody2D, KinematicBody2D, etc. to give them a shape."
+msgstr ""
+
+#: scene/2d/collision_shape_2d.cpp
+msgid ""
+"A shape must be provided for CollisionShape2D to function. Please create a "
+"shape resource for it!"
+msgstr ""
+
+#: scene/2d/light_2d.cpp
+msgid ""
+"A texture with the shape of the light must be supplied to the 'texture' "
+"property."
+msgstr ""
+
+#: scene/gui/popup.cpp
+msgid ""
+"Popups will hide by default unless you call popup() or any of the popup*() "
+"functions. Making them visible for editing is fine though, but they will hide "
+"upon running."
+msgstr ""
+
+#: scene/gui/text_edit.cpp scene/gui/line_edit.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Cut"
 msgstr ""
 
-#:./scene/gui/text_edit.cpp:4402
+#: scene/gui/text_edit.cpp scene/gui/line_edit.cpp
+#: tools/editor/resources_dock.cpp tools/editor/property_editor.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Copy"
 msgstr ""
 
-#:./scene/gui/text_edit.cpp:4403
+#: scene/gui/text_edit.cpp scene/gui/line_edit.cpp
+#: tools/editor/resources_dock.cpp tools/editor/property_editor.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Paste"
 msgstr ""
 
-#:./scene/gui/text_edit.cpp:4405
+#: scene/gui/text_edit.cpp scene/gui/line_edit.cpp
+#: tools/editor/project_export.cpp tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Select All"
 msgstr ""
 
-#:./scene/gui/text_edit.cpp:4406
+#: scene/gui/text_edit.cpp scene/gui/line_edit.cpp
+#: tools/editor/script_editor_debugger.cpp tools/editor/editor_log.cpp
+#: tools/editor/property_editor.cpp
+#: tools/editor/plugins/rich_text_editor_plugin.cpp
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Clear"
 msgstr ""
 
-#:./scene/gui/text_edit.cpp:4408
+#: scene/gui/text_edit.cpp scene/gui/line_edit.cpp tools/editor/editor_node.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Undo"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:261
+#: scene/main/viewport.cpp
+msgid ""
+"This viewport is not set as render target. If you intend for it to display "
+"its contents directly to the screen, make it a child of a Control so it can "
+"obtain a size. Otherwise, make it a RenderTarget and assign its internal "
+"texture to some node for display."
+msgstr ""
+
+#: tools/editor/project_export.cpp
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
 msgid "Edit Script Options"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:460
+#: tools/editor/project_export.cpp
 msgid "Please export outside the project folder!"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:487
+#: tools/editor/project_export.cpp
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
 msgid "Error exporting project!"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:508
-msgid "Error exporting project PCK! Can't write"
+#: tools/editor/project_export.cpp
+msgid "Error writing the project PCK!"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:589
-msgid "No exporter for platform '"
+#: tools/editor/project_export.cpp
+msgid "No exporter for platform '%s' yet."
 msgstr ""
 
-#:./tools/editor/project_export.cpp:718
+#: tools/editor/project_export.cpp
 msgid "Include"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:808
+#: tools/editor/project_export.cpp
 msgid "Change Image Group"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:861
-msgid "Group Name Can't be Empty!"
+#: tools/editor/project_export.cpp tools/editor/groups_editor.cpp
+msgid "Group name can't be empty!"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:865
-msgid "Invalid Character in Group Name!"
+#: tools/editor/project_export.cpp
+msgid "Invalid character in group name!"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:871
-msgid "Group Name Already Exists!"
+#: tools/editor/project_export.cpp
+msgid "Group name already exists!"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:880
+#: tools/editor/project_export.cpp tools/editor/project_settings.cpp
+#: tools/editor/groups_editor.cpp tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/plugins/item_list_editor_plugin.cpp
 msgid "Add Image Group"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:906
+#: tools/editor/project_export.cpp tools/editor/scenes_dock.cpp
+#: tools/editor/editor_node.cpp tools/editor/plugins/item_list_editor_plugin.cpp
 msgid "Delete Image Group"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1064
-msgid "Error saving atlas! "
+#: tools/editor/project_export.cpp tools/editor/editor_import_export.cpp
+msgid "Error saving atlas:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1070
-msgid "Atlas Preview ("
+#: tools/editor/project_export.cpp
+msgid "Atlas Preview"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1139
+#: tools/editor/project_export.cpp
 msgid "Project Export Settings"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1147
+#: tools/editor/project_export.cpp
 msgid "Target"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1165
+#: tools/editor/project_export.cpp tools/editor/editor_node.cpp
 msgid "Export to Platform"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1176
+#: tools/editor/project_export.cpp tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Options"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1184
+#: tools/editor/project_export.cpp
 msgid "Resources"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1188
+#: tools/editor/project_export.cpp
 msgid "Export selected resources (including dependencies)."
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1189
+#: tools/editor/project_export.cpp
 msgid "Export all resources in the project."
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1190
+#: tools/editor/project_export.cpp
 msgid "Export all files in the project directory."
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1193
+#: tools/editor/project_export.cpp
 msgid "Export Mode:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1202
+#: tools/editor/project_export.cpp
 msgid "Resources to Export:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1208
+#: tools/editor/project_export.cpp tools/editor/plugins/script_editor_plugin.cpp
 msgid "File"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1209
+#: tools/editor/project_export.cpp
 msgid "Action"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1214
-msgid "Filters to export non-resource files (Comma Separated, eg: *.json, *.txt):"
+#: tools/editor/project_export.cpp
+msgid ""
+"Filters to export non-resource files (comma-separated, e.g.: *.json, *.txt):"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1217
-msgid "Filters to exclude from export (Comma Separated, eg: *.json, *.txt):"
+#: tools/editor/project_export.cpp
+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"
+#: tools/editor/project_export.cpp
+msgid "Convert text scenes to binary on export."
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1226
+#: tools/editor/project_export.cpp
 msgid "Images"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1228
+#: tools/editor/project_export.cpp
 msgid "Keep Original"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1229
+#: tools/editor/project_export.cpp
 msgid "Compress for Disk (Lossy, WebP)"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1230
+#: tools/editor/project_export.cpp
 msgid "Compress for RAM (BC/PVRTC/ETC)"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1231
+#: tools/editor/project_export.cpp
 msgid "Convert Images (*.png):"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1242
+#: tools/editor/project_export.cpp
 msgid "Compress for Disk (Lossy) Quality:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1247
+#: tools/editor/project_export.cpp
 msgid "Shrink All Images:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1263
-msgid "Compress Formats: "
+#: tools/editor/project_export.cpp
+msgid "Compress Formats:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1267
+#: tools/editor/project_export.cpp
 msgid "Image Groups"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1296
+#: tools/editor/project_export.cpp
 msgid "Groups:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1303
+#: tools/editor/project_export.cpp tools/editor/editor_node.cpp
 msgid "Default"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1304
+#: tools/editor/project_export.cpp
 msgid "Compress Disk"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1305
+#: tools/editor/project_export.cpp
 msgid "Compress RAM"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1307
+#: tools/editor/project_export.cpp
 msgid "Compress Mode:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1323
+#: tools/editor/project_export.cpp
 msgid "Lossy Quality:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1327
+#: tools/editor/project_export.cpp
 msgid "Atlas:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1335
+#: tools/editor/project_export.cpp
 msgid "Shrink By:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1339
+#: tools/editor/project_export.cpp tools/editor/plugins/camera_editor_plugin.cpp
 msgid "Preview Atlas"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1354
+#: tools/editor/project_export.cpp
 msgid "Image Filter:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1360
+#: tools/editor/project_export.cpp
 msgid "Images:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1368
+#: tools/editor/project_export.cpp
 msgid "Select None"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1388
+#: tools/editor/project_export.cpp
 msgid "Group"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1415
+#: tools/editor/project_export.cpp
 msgid "Samples"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1418
+#: tools/editor/project_export.cpp
 msgid "Sample Conversion Mode: (.wav files):"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1419
+#: tools/editor/project_export.cpp
 msgid "Keep"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1420
+#: tools/editor/project_export.cpp
 msgid "Compress (RAM - IMA-ADPCM)"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1424
-msgid "Sampling Rate Limit: (hz)"
+#: tools/editor/project_export.cpp
+msgid "Sampling Rate Limit (Hz):"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1426
+#: tools/editor/project_export.cpp
 msgid "Trim"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1427
+#: tools/editor/project_export.cpp
 msgid "Trailing Silence:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1433
+#: tools/editor/project_export.cpp
 msgid "Script Export Mode:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1434
+#: tools/editor/project_export.cpp
 msgid "Text"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1435
+#: tools/editor/project_export.cpp
 msgid "Compiled"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1436
+#: tools/editor/project_export.cpp
 msgid "Encrypted (Provide Key Below)"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1438
+#: tools/editor/project_export.cpp
 msgid "Script Encryption Key (256-bits as hex):"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1451
+#: tools/editor/project_export.cpp
 msgid "Export PCK/Zip"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1461
+#: tools/editor/project_export.cpp tools/editor/editor_node.cpp
 msgid "Export Project"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1467
+#: tools/editor/project_export.cpp tools/editor/editor_node.cpp
 msgid "Password:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1472
+#: tools/editor/project_export.cpp
 msgid "Export Project PCK"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1478
+#: tools/editor/project_export.cpp
 msgid "Export.."
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1532
-msgid "Export path empty, see export options"
-msgstr ""
-
-#:./tools/editor/project_export.cpp:1554
-msgid "Corrupted export data.."
-msgstr ""
-
-#:./tools/editor/project_export.cpp:1556
-msgid "Corrupted export data..."
-msgstr ""
-
-#:./tools/editor/project_export.cpp:1709
-msgid "Cannot make dir: "
-msgstr ""
-
-#:./tools/editor/project_export.cpp:1717
-msgid "Cannot change to dir: "
-msgstr ""
-
-#:./tools/editor/project_export.cpp:1745
-msgid "Unknown optimizer preset: "
-msgstr ""
-
-#:./tools/editor/project_export.cpp:1766
-msgid "Preset '"
-msgstr ""
-
-#:./tools/editor/project_export.cpp:1810
-msgid "Errr loading resource to optimize: "
-msgstr ""
-
-#:./tools/editor/project_export.cpp:1833
-msgid "Errr saving optimized resource: "
-msgstr ""
-
-#:./tools/editor/project_export.cpp:1856
-msgid "Error copying from: "
-msgstr ""
-
-#:./tools/editor/project_export.cpp:1908
+#: tools/editor/project_export.cpp
 msgid "Project Export"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1910
+#: tools/editor/project_export.cpp
 msgid "Export Preset:"
 msgstr ""
 
-#:./tools/editor/project_export.cpp:1914
+#: tools/editor/project_export.cpp
 msgid "Export"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:61
+#: tools/editor/code_editor.cpp
 msgid "Go to Line"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:63
+#: tools/editor/code_editor.cpp
 msgid "Line Number:"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:81
+#: tools/editor/code_editor.cpp tools/editor/project_settings.cpp
+#: tools/editor/addon_editor_plugin.cpp tools/editor/editor_help.cpp
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Search"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:87
+#: tools/editor/code_editor.cpp tools/editor/editor_help.cpp
 msgid "Find"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:101
+#: tools/editor/code_editor.cpp
 msgid "Replace"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:124
+#: tools/editor/code_editor.cpp
 msgid "Next"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:219
-msgid "Replaced "
-msgstr ""
-
-#:./tools/editor/code_editor.cpp:219
-msgid " ocurrence(s)."
+#: tools/editor/code_editor.cpp
+msgid "Replaced %d ocurrence(s)."
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:277
-msgid "Not Found!"
+#: tools/editor/code_editor.cpp
+msgid "Not found!"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:414
+#: tools/editor/code_editor.cpp
 msgid "Replace By"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:439
+#: tools/editor/code_editor.cpp
 msgid "Whole Words"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:443
+#: tools/editor/code_editor.cpp
 msgid "Case Sensitive"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:447
+#: tools/editor/code_editor.cpp
 msgid "Backwards"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:459
+#: tools/editor/code_editor.cpp
 msgid "Prompt On Replace"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:464
+#: tools/editor/code_editor.cpp
 msgid "Selection Only"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:478
+#: tools/editor/code_editor.cpp
 msgid "Skip"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:501
-msgid "Line: "
+#: tools/editor/code_editor.cpp tools/editor/script_editor_debugger.cpp
+msgid "Line:"
 msgstr ""
 
-#:./tools/editor/code_editor.cpp:501
-msgid ", Col: "
+#: tools/editor/code_editor.cpp
+msgid "Col:"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:179
+#: tools/editor/connections_dialog.cpp
 msgid "Method in target Node must be specified!"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:297
-msgid "Dialogs"
-msgstr ""
-
-#:./tools/editor/connections_dialog.cpp:303
+#: tools/editor/connections_dialog.cpp
 msgid "Connect To Node:"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:310
+#: tools/editor/connections_dialog.cpp
 msgid "Binds (Extra Params):"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:363
+#: tools/editor/connections_dialog.cpp
 msgid "Add"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:372
+#: tools/editor/connections_dialog.cpp tools/editor/dependency_editor.cpp
+#: tools/editor/project_manager.cpp
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Remove"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:381
+#: tools/editor/connections_dialog.cpp
 msgid "Path To Node:"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:400
+#: tools/editor/connections_dialog.cpp
 msgid "Method In Node:"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:419
-msgid "List.."
+#: tools/editor/connections_dialog.cpp
+msgid "Make Function"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:432
-msgid "Make Function  "
-msgstr ""
-
-#:./tools/editor/connections_dialog.cpp:436
+#: tools/editor/connections_dialog.cpp
 msgid "Deferred"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:440
+#: tools/editor/connections_dialog.cpp
 msgid "Oneshot"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:450
-msgid "Realtime"
-msgstr ""
-
-#:./tools/editor/connections_dialog.cpp:466
+#: tools/editor/connections_dialog.cpp tools/editor/settings_config_dialog.cpp
+#: tools/editor/import_settings.cpp tools/editor/run_settings_dialog.cpp
+#: tools/editor/project_settings.cpp tools/editor/groups_editor.cpp
+#: tools/editor/property_editor.cpp tools/editor/addon_editor_plugin.cpp
+#: tools/editor/call_dialog.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Close"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:467
+#: tools/editor/connections_dialog.cpp
 msgid "Connect"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:514
-msgid "Connect '"
+#: tools/editor/connections_dialog.cpp
+msgid "Connect '%s' to '%s'"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:575
+#: tools/editor/connections_dialog.cpp tools/editor/animation_editor.cpp
+#: tools/editor/project_manager.cpp tools/editor/create_dialog.cpp
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+#: tools/editor/plugins/particles_editor_plugin.cpp
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Create Subscription"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:613
-msgid "Remove Subscription"
-msgstr ""
-
-#:./tools/editor/connections_dialog.cpp:792
+#: tools/editor/connections_dialog.cpp
 msgid "Connect.."
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:802
+#: tools/editor/connections_dialog.cpp
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Disconnect"
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:823
+#: tools/editor/connections_dialog.cpp
 msgid "Edit Connections.."
 msgstr ""
 
-#:./tools/editor/connections_dialog.cpp:836
+#: tools/editor/connections_dialog.cpp
 msgid "Connections:"
 msgstr ""
 
-#:./tools/editor/editor_sub_scene.cpp:201
-msgid "Select Sub-Scene.."
+#: tools/editor/editor_sub_scene.cpp
+msgid "Select Node(s) to Import"
 msgstr ""
 
-#:./tools/editor/editor_sub_scene.cpp:217
+#: tools/editor/editor_sub_scene.cpp
 msgid "Scene Path:"
 msgstr ""
 
-#:./tools/editor/editor_sub_scene.cpp:221
+#: tools/editor/editor_sub_scene.cpp tools/editor/editor_node.cpp
+#: tools/editor/project_manager.cpp
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
 msgid "Import From Node:"
 msgstr ""
 
-#:./tools/editor/settings_config_dialog.cpp:110
+#: tools/editor/settings_config_dialog.cpp tools/editor/editor_node.cpp
 msgid "Editor Settings"
 msgstr ""
 
-#:./tools/editor/settings_config_dialog.cpp:118
+#: tools/editor/settings_config_dialog.cpp tools/editor/project_settings.cpp
 msgid "General"
 msgstr ""
 
-#:./tools/editor/settings_config_dialog.cpp:125
-msgid "Search: "
+#: tools/editor/settings_config_dialog.cpp tools/editor/quick_open.cpp
+#: tools/editor/addon_editor_plugin.cpp tools/editor/editor_node.cpp
+#: tools/editor/editor_help.cpp tools/editor/create_dialog.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Search:"
 msgstr ""
 
-#:./tools/editor/settings_config_dialog.cpp:145
+#: tools/editor/settings_config_dialog.cpp tools/editor/project_settings.cpp
+#: tools/editor/addon_editor_plugin.cpp
 msgid "Plugins"
 msgstr ""
 
-#:./tools/editor/settings_config_dialog.cpp:149
-msgid "Plugin List: "
-msgstr ""
-
-#:./tools/editor/settings_config_dialog.cpp:152
-msgid "Load.."
+#: tools/editor/settings_config_dialog.cpp
+msgid "Plugin List:"
 msgstr ""
 
-#:./tools/editor/settings_config_dialog.cpp:156
-msgid "Apply"
-msgstr ""
-
-#:./tools/editor/editor_dir_dialog.cpp:211
+#: tools/editor/editor_dir_dialog.cpp
 msgid "Choose a Directory"
 msgstr ""
 
-#:./tools/editor/editor_dir_dialog.cpp:219
+#: tools/editor/editor_dir_dialog.cpp tools/editor/editor_file_dialog.cpp
 msgid "Create Folder"
 msgstr ""
 
-#:./tools/editor/editor_dir_dialog.cpp:231
+#: tools/editor/editor_dir_dialog.cpp tools/editor/editor_plugin_settings.cpp
+#: tools/editor/editor_file_dialog.cpp tools/editor/project_manager.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Name:"
 msgstr ""
 
-#:./tools/editor/editor_dir_dialog.cpp:236
+#: tools/editor/editor_dir_dialog.cpp tools/editor/editor_file_dialog.cpp
 msgid "Could not create folder."
 msgstr ""
 
-#:./tools/editor/editor_dir_dialog.cpp:239
+#: tools/editor/editor_dir_dialog.cpp
 msgid "Choose"
 msgstr ""
 
-#:./tools/editor/editor_file_system.cpp:317
-msgid "ScanFS"
+#: tools/editor/editor_file_system.cpp
+msgid "Cannot go into subdir:"
 msgstr ""
 
-#:./tools/editor/editor_file_system.cpp:612
-msgid "Can't go into subdir: "
-msgstr ""
-
-#:./tools/editor/editor_file_system.cpp:826
+#: tools/editor/editor_file_system.cpp
 msgid "ScanSources"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:30
-msgid "Search Replacement For: "
+#: tools/editor/dependency_editor.cpp
+msgid "Search Replacement For:"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:183
-msgid "EditorIcons"
+#: tools/editor/dependency_editor.cpp
+msgid "Dependencies For:"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:212
-msgid "Dependencies For: "
+#: tools/editor/dependency_editor.cpp
+msgid ""
+"Scene '%s' is currently being edited.\n"
+"Changes will not take effect unless reloaded."
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:218
-msgid "Scene '"
+#: tools/editor/dependency_editor.cpp
+msgid ""
+"Resource '%s' is in use.\n"
+"Changes will take effect when reloaded."
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:220
-msgid "Resource '"
-msgstr ""
-
-#:./tools/editor/dependency_editor.cpp:236
+#: tools/editor/dependency_editor.cpp
 msgid "Dependencies"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:249
+#: tools/editor/dependency_editor.cpp
 msgid "Dependencies:"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:252
+#: tools/editor/dependency_editor.cpp
 msgid "Fix Broken"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:264
+#: tools/editor/dependency_editor.cpp
 msgid "Dependency Editor"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:268
+#: tools/editor/dependency_editor.cpp
 msgid "Search Replacement Resource:"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:322
-msgid "Owners Of: "
+#: tools/editor/dependency_editor.cpp
+msgid "Owners Of:"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:408
+#: tools/editor/dependency_editor.cpp
 msgid "Remove selected files from the project? (no undo)"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:451
-msgid "Error loading: "
+#: tools/editor/dependency_editor.cpp
+msgid "Error loading:"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:499
+#: tools/editor/dependency_editor.cpp
 msgid "Scene failed to load due to missing dependencies:"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:501
+#: tools/editor/dependency_editor.cpp tools/editor/scenes_dock.cpp
+#: tools/editor/editor_file_dialog.cpp tools/editor/editor_node.cpp
+#: tools/editor/editor_help.cpp tools/editor/plugins/script_editor_plugin.cpp
 msgid "Open Anyway"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:505
+#: tools/editor/dependency_editor.cpp
 msgid "Which action should be taken?"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:508
+#: tools/editor/dependency_editor.cpp
 msgid "Fix Dependencies"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:510
+#: tools/editor/dependency_editor.cpp
 msgid "Errors loading!"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:526
-msgid "Permanently Delete "
+#: tools/editor/dependency_editor.cpp
+msgid "Permanently delete %d item(s)? (No undo!)"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:679
+#: tools/editor/dependency_editor.cpp
 msgid "Owns"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:681
+#: tools/editor/dependency_editor.cpp
 msgid "Resources Without Explicit Ownership:"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:682
+#: tools/editor/dependency_editor.cpp tools/editor/editor_node.cpp
 msgid "Orphan Resource Explorer"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:684
+#: tools/editor/dependency_editor.cpp
 msgid "Delete selected files?"
 msgstr ""
 
-#:./tools/editor/dependency_editor.cpp:685
+#: tools/editor/dependency_editor.cpp
 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
+#: tools/editor/spatial_editor_gizmos.cpp
 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
+#: tools/editor/spatial_editor_gizmos.cpp
 msgid "Change Camera FOV"
 msgstr ""
 
-#:./tools/editor/spatial_editor_gizmos.cpp:1096
+#: tools/editor/spatial_editor_gizmos.cpp
 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
+#: tools/editor/spatial_editor_gizmos.cpp
 msgid "Change Sphere Shape Radius"
 msgstr ""
 
-#:./tools/editor/spatial_editor_gizmos.cpp:1857
+#: tools/editor/spatial_editor_gizmos.cpp
 msgid "Change Box Shape Extents"
 msgstr ""
 
-#:./tools/editor/spatial_editor_gizmos.cpp:1876
+#: tools/editor/spatial_editor_gizmos.cpp
 msgid "Change Capsule Shape Radius"
 msgstr ""
 
-#:./tools/editor/spatial_editor_gizmos.cpp:1880
+#: tools/editor/spatial_editor_gizmos.cpp
 msgid "Change Capsule Shape Height"
 msgstr ""
 
-#:./tools/editor/spatial_editor_gizmos.cpp:1899
+#: tools/editor/spatial_editor_gizmos.cpp
 msgid "Change Ray Shape Length"
 msgstr ""
 
-#:./tools/editor/spatial_editor_gizmos.cpp:2246
+#: tools/editor/spatial_editor_gizmos.cpp
 msgid "Change Notifier Extents"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:77
-msgid "Invaild parent class name"
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid parent class name"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:81
-msgid "Valid Chars: a-z A-Z 0-9 _"
+#: tools/editor/script_create_dialog.cpp
+msgid "Valid chars:"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:84
+#: tools/editor/script_create_dialog.cpp
 msgid "Invalid class name"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:87
-msgid "Valid Name"
+#: tools/editor/script_create_dialog.cpp
+msgid "Valid name"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:92
+#: tools/editor/script_create_dialog.cpp
 msgid "N/A"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:101
-msgid "Class Name is Invalid!"
+#: tools/editor/script_create_dialog.cpp
+msgid "Class name is invalid!"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:106
-msgid "Parent Class Name is Invalid!"
+#: tools/editor/script_create_dialog.cpp
+msgid "Parent class name is invalid!"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:136
-msgid "Path is Invalid!"
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid path!"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:144
-msgid "Could not create script in filesystem: "
+#: tools/editor/script_create_dialog.cpp
+msgid "Could not create script in filesystem."
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:218
-msgid "Path is Empty"
+#: tools/editor/script_create_dialog.cpp
+msgid "Path is empty"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:227
+#: tools/editor/script_create_dialog.cpp
 msgid "Path is not local"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:237
-msgid "Base Path Invalid"
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid base path"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:252
-msgid "File Exists"
+#: tools/editor/script_create_dialog.cpp
+msgid "File exists"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:276
-msgid "Invalid Extension"
+#: tools/editor/script_create_dialog.cpp
+msgid "Invalid extension"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:282
-msgid "Path is Valid"
+#: tools/editor/script_create_dialog.cpp
+msgid "Valid path"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:318
+#: tools/editor/script_create_dialog.cpp
 msgid "Class Name:"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:321
+#: tools/editor/script_create_dialog.cpp tools/editor/scene_tree_editor.cpp
+#: tools/editor/editor_help.cpp
 msgid "Inherits:"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:325
+#: tools/editor/script_create_dialog.cpp
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
 msgid "Language"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:353
+#: tools/editor/script_create_dialog.cpp tools/editor/property_editor.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Error!"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:358
+#: tools/editor/script_create_dialog.cpp
 msgid "Built-In Script"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:362
+#: tools/editor/script_create_dialog.cpp tools/editor/project_settings.cpp
+#: tools/editor/editor_file_dialog.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Path:"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:366
-msgid "Create Script for Node"
+#: tools/editor/script_create_dialog.cpp
+msgid "Create Node Script"
 msgstr ""
 
-#:./tools/editor/script_create_dialog.cpp:371
+#: tools/editor/script_create_dialog.cpp
 msgid "Create"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:151
+#: tools/editor/animation_editor.cpp
 msgid "Disabled"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:153
+#: tools/editor/animation_editor.cpp
 msgid "All Selection"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:320
+#: tools/editor/animation_editor.cpp
 msgid "Move Add Key"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:348
+#: tools/editor/animation_editor.cpp
 msgid "Anim Change Transition"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:369
+#: tools/editor/animation_editor.cpp
 msgid "Anim Change Transform"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:391
+#: tools/editor/animation_editor.cpp
 msgid "Anim Change Value"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:467
+#: tools/editor/animation_editor.cpp
 msgid "Anim Change Call"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:686
+#: tools/editor/animation_editor.cpp
 msgid "Anim Add Track"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:714
+#: tools/editor/animation_editor.cpp
 msgid "Move Anim Track Up"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:727
+#: tools/editor/animation_editor.cpp
 msgid "Move Anim Track Down"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:739
+#: tools/editor/animation_editor.cpp
 msgid "Remove Anim Track"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:795
+#: tools/editor/animation_editor.cpp
 msgid "Anim Duplicate Keys"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:892
-msgid "Set Transitions to: "
+#: tools/editor/animation_editor.cpp
+msgid "Set Transitions to:"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:1602
+#: tools/editor/animation_editor.cpp
 msgid "Anim Track Rename"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:1618
+#: tools/editor/animation_editor.cpp
 msgid "Anim Track Change Interpolation"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:1628
+#: tools/editor/animation_editor.cpp
 msgid "Anim Track Change Value Mode"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:1720
+#: tools/editor/animation_editor.cpp
 msgid "Edit Node Curve"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:1722
+#: tools/editor/animation_editor.cpp
 msgid "Edit Selection Curve"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:1865
+#: tools/editor/animation_editor.cpp
 msgid "Anim Delete Keys"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2257
+#: tools/editor/animation_editor.cpp
 msgid "Anim Add Key"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2422
+#: tools/editor/animation_editor.cpp
 msgid "Anim Move Keys"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2875
+#: tools/editor/animation_editor.cpp
 msgid "Scale Selection"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2876
+#: tools/editor/animation_editor.cpp
 msgid "Scale From Cursor"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2878
+#: tools/editor/animation_editor.cpp
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
 msgid "Duplicate Selection"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2879
+#: tools/editor/animation_editor.cpp
 msgid "Duplicate Transposed"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2881
+#: tools/editor/animation_editor.cpp
 msgid "Goto Next Step"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2882
+#: tools/editor/animation_editor.cpp
 msgid "Goto Prev Step"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2885
+#: tools/editor/animation_editor.cpp tools/editor/property_editor.cpp
 msgid "Linear"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2886
+#: tools/editor/animation_editor.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Constant"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2887
+#: tools/editor/animation_editor.cpp
 msgid "In"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2888
+#: tools/editor/animation_editor.cpp
 msgid "Out"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2889
+#: tools/editor/animation_editor.cpp
 msgid "In-Out"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2890
+#: tools/editor/animation_editor.cpp
 msgid "Out-In"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2891
+#: tools/editor/animation_editor.cpp
 msgid "Transitions"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2896
-msgid "Set Transitions.."
-msgstr ""
-
-#:./tools/editor/animation_editor.cpp:2898
+#: tools/editor/animation_editor.cpp
 msgid "Optimize Animation"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:2899
+#: tools/editor/animation_editor.cpp
 msgid "Clean-Up Animation"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3116
-msgid "Create NEW track for "
+#: tools/editor/animation_editor.cpp
+msgid "Create NEW track for %s and insert key?"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3116
-msgid " and insert key?"
+#: tools/editor/animation_editor.cpp
+msgid "Create %d NEW tracks and insert keys?"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3118
-msgid "Create "
-msgstr ""
-
-#:./tools/editor/animation_editor.cpp:3118
-msgid " NEW tracks and insert keys?"
-msgstr ""
-
-#:./tools/editor/animation_editor.cpp:3292
+#: tools/editor/animation_editor.cpp
 msgid "Anim Create & Insert"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3313
+#: tools/editor/animation_editor.cpp
 msgid "Anim Insert Track & Key"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3348
+#: tools/editor/animation_editor.cpp
 msgid "Anim Insert Key"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3425
+#: tools/editor/animation_editor.cpp
 msgid "Change Anim Len"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3454
+#: tools/editor/animation_editor.cpp
 msgid "Change Anim Loop"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3465
+#: tools/editor/animation_editor.cpp
 msgid "Anim Create Typed Value Key"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3513
-msgid "Anim  Insert"
+#: tools/editor/animation_editor.cpp
+msgid "Anim Insert"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3592
+#: tools/editor/animation_editor.cpp
 msgid "Anim Scale Keys"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3701
+#: tools/editor/animation_editor.cpp
 msgid "Anim Add Call Track"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3804
+#: tools/editor/animation_editor.cpp
 msgid "Animation zoom."
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3821
-msgid "Len(s):"
+#: tools/editor/animation_editor.cpp
+msgid "Length (s):"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3830
+#: tools/editor/animation_editor.cpp
 msgid "Animation length (in seconds)."
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3836
-msgid "Step(s):"
+#: tools/editor/animation_editor.cpp
+msgid "Step (s):"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3846
+#: tools/editor/animation_editor.cpp
 msgid "Cursor step snap (in seconds)."
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3855
+#: tools/editor/animation_editor.cpp
 msgid "Enable/Disable looping in animation."
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3862
+#: tools/editor/animation_editor.cpp
 msgid "Add new tracks."
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3869
+#: tools/editor/animation_editor.cpp
 msgid "Move current track up."
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3876
+#: tools/editor/animation_editor.cpp
 msgid "Move current track down."
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3883
+#: tools/editor/animation_editor.cpp
 msgid "Remove selected track."
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3890
+#: tools/editor/animation_editor.cpp
 msgid "Track tools"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3898
+#: tools/editor/animation_editor.cpp
 msgid "Enable editing of individual keys by clicking them."
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3902
+#: tools/editor/animation_editor.cpp
 msgid "Anim. Optimizer"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3911
+#: tools/editor/animation_editor.cpp
 msgid "Max. Linear Error:"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3918
+#: tools/editor/animation_editor.cpp
 msgid "Max. Angular Error:"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3920
+#: tools/editor/animation_editor.cpp
 msgid "Max Optimizable Angle:"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3926
+#: tools/editor/animation_editor.cpp
 msgid "Optimize"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3932
-msgid "Keys"
-msgstr ""
-
-#:./tools/editor/animation_editor.cpp:3942
-msgid "Base: "
-msgstr ""
-
-#:./tools/editor/animation_editor.cpp:3981
+#: tools/editor/animation_editor.cpp
 msgid "Key"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:3995
+#: tools/editor/animation_editor.cpp
 msgid "Transition"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:4068
+#: tools/editor/animation_editor.cpp
 msgid "Scale Ratio:"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:4074
+#: tools/editor/animation_editor.cpp
 msgid "Call Functions in Which Node?"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:4082
+#: tools/editor/animation_editor.cpp
 msgid "Remove invalid keys"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:4087
+#: tools/editor/animation_editor.cpp
 msgid "Remove unresolved and empty tracks"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:4092
-msgid "Clean-Up all animations"
+#: tools/editor/animation_editor.cpp
+msgid "Clean-up all animations"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:4095
-msgid "Clean up Animation(s) (NO UNDO!)"
+#: tools/editor/animation_editor.cpp
+msgid "Clean-Up Animation(s) (NO UNDO!)"
 msgstr ""
 
-#:./tools/editor/animation_editor.cpp:4096
+#: tools/editor/animation_editor.cpp
 msgid "Clean-Up"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:282
-msgid "Bytes: "
+#: tools/editor/script_editor_debugger.cpp
+msgid "Bytes:"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:402
+#: tools/editor/script_editor_debugger.cpp tools/editor/project_settings.cpp
+#: tools/editor/scene_tree_editor.cpp
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Type:"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:556
-msgid "Errors"
+#: tools/editor/script_editor_debugger.cpp
+msgid "Warning"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:557
-msgid "Debugger"
+#: tools/editor/script_editor_debugger.cpp
+msgid "Error"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp tools/editor/editor_help.cpp
+msgid "Description:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Time:"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:561
-msgid "Errors ("
+#: tools/editor/script_editor_debugger.cpp
+msgid "Error:"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:562
-msgid "Debugger ("
+#: tools/editor/script_editor_debugger.cpp
+msgid "Source:"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:587
+#: tools/editor/script_editor_debugger.cpp
+msgid "Function:"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+msgid "Errors"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Debugger"
+msgstr ""
+
+#: tools/editor/script_editor_debugger.cpp
 msgid "Child Process Connected"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1154
-msgid "File: "
+#: tools/editor/script_editor_debugger.cpp tools/editor/editor_file_dialog.cpp
+msgid "File:"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1240
+#: tools/editor/script_editor_debugger.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Step Into"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1245
+#: tools/editor/script_editor_debugger.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Step Over"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1252
+#: tools/editor/script_editor_debugger.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Break"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1257
+#: tools/editor/script_editor_debugger.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Continue"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1264
+#: tools/editor/script_editor_debugger.cpp
 msgid "Inspect Previous Instance"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1268
+#: tools/editor/script_editor_debugger.cpp
 msgid "Inspect Next Instance"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1278
+#: tools/editor/script_editor_debugger.cpp
 msgid "Stack Frames"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1287
+#: tools/editor/script_editor_debugger.cpp
 msgid "Variable"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1311
+#: tools/editor/script_editor_debugger.cpp
 msgid "Errors:"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1317
-msgid "Stack Trace (if applies):"
+#: tools/editor/script_editor_debugger.cpp
+msgid "Stack Trace (if applicable):"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1328
+#: tools/editor/script_editor_debugger.cpp
 msgid "Monitor"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1329
+#: tools/editor/script_editor_debugger.cpp
 msgid "Value"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1369
-msgid "List of Video Memory Usage by Resource: "
+#: tools/editor/script_editor_debugger.cpp
+msgid "List of Video Memory Usage by Resource:"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1372
-msgid "Total: "
+#: tools/editor/script_editor_debugger.cpp
+msgid "Total:"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1390
+#: tools/editor/script_editor_debugger.cpp
 msgid "Video Mem"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1393
+#: tools/editor/script_editor_debugger.cpp
 msgid "Resource Path"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1396
+#: tools/editor/script_editor_debugger.cpp
 msgid "Type"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1399
+#: tools/editor/script_editor_debugger.cpp
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
 msgid "Format"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1402
+#: tools/editor/script_editor_debugger.cpp
 msgid "Usage"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1409
+#: tools/editor/script_editor_debugger.cpp tools/editor/scenes_dock.cpp
 msgid "Info"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1416
+#: tools/editor/script_editor_debugger.cpp
 msgid "Clicked Control:"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1418
+#: tools/editor/script_editor_debugger.cpp
 msgid "Clicked Control Type:"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1424
+#: tools/editor/script_editor_debugger.cpp
 msgid "Live Edit Root:"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1427
+#: tools/editor/script_editor_debugger.cpp
 msgid "Set From Tree"
 msgstr ""
 
-#:./tools/editor/script_editor_debugger.cpp:1444
+#: tools/editor/script_editor_debugger.cpp
 msgid "Scene Tree:"
 msgstr ""
 
-#:./tools/editor/import_settings.cpp:279
+#: tools/editor/import_settings.cpp
 msgid "Imported Resources"
 msgstr ""
 
-#:./tools/editor/import_settings.cpp:281
-msgid "Keep,None,Disk,VRAM"
-msgstr ""
-
-#:./tools/editor/import_settings.cpp:291
+#: tools/editor/import_settings.cpp tools/editor/editor_reimport_dialog.cpp
+#: tools/editor/editor_node.cpp
 msgid "Re-Import"
 msgstr ""
 
-#:./tools/editor/multi_node_edit.cpp:12
-msgid "MultiNode Set "
+#: tools/editor/multi_node_edit.cpp
+msgid "MultiNode Set"
 msgstr ""
 
-#:./tools/editor/run_settings_dialog.cpp:82
+#: tools/editor/run_settings_dialog.cpp
 msgid "Run Mode:"
 msgstr ""
 
-#:./tools/editor/run_settings_dialog.cpp:83
+#: tools/editor/run_settings_dialog.cpp
 msgid "Current Scene"
 msgstr ""
 
-#:./tools/editor/run_settings_dialog.cpp:84
+#: tools/editor/run_settings_dialog.cpp
 msgid "Main Scene"
 msgstr ""
 
-#:./tools/editor/run_settings_dialog.cpp:87
+#: tools/editor/run_settings_dialog.cpp
 msgid "Main Scene Arguments:"
 msgstr ""
 
-#:./tools/editor/run_settings_dialog.cpp:95
+#: tools/editor/run_settings_dialog.cpp
 msgid "Scene Run Settings"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:142
-msgid "Invalid Action (Anything goes but / or :)."
+#: tools/editor/project_settings.cpp
+msgid "Invalid action (anything goes but '/' or ':')."
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:154
-msgid "Action '"
+#: tools/editor/project_settings.cpp
+msgid "Action '%s' already exists!"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:164
+#: tools/editor/project_settings.cpp
 msgid "Rename Input Action Event"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:248
+#: tools/editor/project_settings.cpp
 msgid "Add Input Action Event"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:307
+#: tools/editor/project_settings.cpp
 msgid "Meta+"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:309
+#: tools/editor/project_settings.cpp
 msgid "Shift+"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:311
+#: tools/editor/project_settings.cpp
 msgid "Alt+"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:313
+#: tools/editor/project_settings.cpp
 msgid "Control+"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:331
+#: tools/editor/project_settings.cpp
 msgid "Press a Key.."
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:339
+#: tools/editor/project_settings.cpp
 msgid "Mouse Button Index:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:341
+#: tools/editor/project_settings.cpp
 msgid "Left Button"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:342
+#: tools/editor/project_settings.cpp
 msgid "Right Button"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:343
+#: tools/editor/project_settings.cpp
 msgid "Middle Button"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:344
+#: tools/editor/project_settings.cpp
 msgid "Wheel Up Button"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:345
+#: tools/editor/project_settings.cpp
 msgid "Wheel Down Button"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:346
+#: tools/editor/project_settings.cpp
 msgid "Button 6"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:347
+#: tools/editor/project_settings.cpp
 msgid "Button 7"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:348
+#: tools/editor/project_settings.cpp
 msgid "Button 8"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:349
+#: tools/editor/project_settings.cpp
 msgid "Button 9"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:355
+#: tools/editor/project_settings.cpp
 msgid "Joystick Axis Index:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:360
-msgid "Axis "
+#: tools/editor/project_settings.cpp
+msgid "Axis"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:368
+#: tools/editor/project_settings.cpp
 msgid "Joystick Button Index:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:412
+#: tools/editor/project_settings.cpp
 msgid "Add Input Action"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:441
+#: tools/editor/project_settings.cpp
 msgid "Erase Input Action Event"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:520
-msgid "Device "
+#: tools/editor/project_settings.cpp
+msgid "Device"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:533
+#: tools/editor/project_settings.cpp
+msgid "Button"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
 msgid "Left Button."
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:534
+#: tools/editor/project_settings.cpp
 msgid "Right Button."
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:535
+#: tools/editor/project_settings.cpp
 msgid "Middle Button."
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:536
+#: tools/editor/project_settings.cpp
 msgid "Wheel Up."
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:537
+#: tools/editor/project_settings.cpp
 msgid "Wheel Down."
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:538
-msgid "Button "
-msgstr ""
-
-#:./tools/editor/project_settings.cpp:696
+#: tools/editor/project_settings.cpp
 msgid "Toggle Persisting"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:713
+#: tools/editor/project_settings.cpp
 msgid "Error saving settings."
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:797
+#: tools/editor/project_settings.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Settings saved OK."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
 msgid "Add Translation"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:854
-msgid "Toggle Autoload GlobalVar"
+#: tools/editor/project_settings.cpp
+msgid "Toggle AutoLoad Globals"
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Invalid name."
+msgstr ""
+
+#: tools/editor/project_settings.cpp
+msgid "Valid characters:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:880
-msgid "Invalid Name.Must not collide with an existing engine class name."
+#: tools/editor/project_settings.cpp
+msgid "Invalid name. Must not collide with an existing engine class name."
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:889
-msgid "Invalid Name.Must not collide with an existing buit-in type name."
+#: tools/editor/project_settings.cpp
+msgid "Invalid name. Must not collide with an existing buit-in type name."
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:900
-msgid "Invalid Name.Must not collide with an existing global constant name."
+#: tools/editor/project_settings.cpp
+msgid "Invalid name. Must not collide with an existing global constant name."
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:921
+#: tools/editor/project_settings.cpp
 msgid "Add Autoload"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:951
+#: tools/editor/project_settings.cpp
 msgid "Remove Autoload"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:978
+#: tools/editor/project_settings.cpp
 msgid "Move Autoload"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1007
+#: tools/editor/project_settings.cpp
 msgid "Remove Translation"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1040
+#: tools/editor/project_settings.cpp
 msgid "Add Remapped Path"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1074
+#: tools/editor/project_settings.cpp
 msgid "Resource Remap Add Remap"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1129
+#: tools/editor/project_settings.cpp
 msgid "Change Resource Remap Language"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1161
+#: tools/editor/project_settings.cpp
 msgid "Remove Resource Remap"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1197
+#: tools/editor/project_settings.cpp
 msgid "Remove Resource Remap Option"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1354
+#: tools/editor/project_settings.cpp
 msgid "Enable"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1449
+#: tools/editor/project_settings.cpp
 msgid "Project Settings (engine.cfg)"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1488
+#: tools/editor/project_settings.cpp tools/editor/addon_editor_plugin.cpp
 msgid "Category:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1497
+#: tools/editor/project_settings.cpp tools/editor/property_editor.cpp
 msgid "Property:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1523
+#: tools/editor/project_settings.cpp
 msgid "Del"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1559
-msgid "Save"
-msgstr ""
-
-#:./tools/editor/project_settings.cpp:1567
+#: tools/editor/project_settings.cpp
 msgid "Copy To Platform.."
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1593
+#: tools/editor/project_settings.cpp
 msgid "Input Map"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1600
+#: tools/editor/project_settings.cpp
 msgid "Action:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1654
+#: tools/editor/project_settings.cpp
 msgid "Device:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1659
+#: tools/editor/project_settings.cpp
 msgid "Index:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1694
+#: tools/editor/project_settings.cpp
 msgid "Localization"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1701
+#: tools/editor/project_settings.cpp
 msgid "Translations"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1704
+#: tools/editor/project_settings.cpp
 msgid "Translations:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1706
+#: tools/editor/project_settings.cpp
 msgid "Add.."
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1726
+#: tools/editor/project_settings.cpp
 msgid "Remaps"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1729
+#: tools/editor/project_settings.cpp
 msgid "Resources:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1750
+#: tools/editor/project_settings.cpp
 msgid "Remaps by Locale:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1765
+#: tools/editor/project_settings.cpp
 msgid "Locale"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1784
+#: tools/editor/project_settings.cpp
 msgid "AutoLoad"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1809
+#: tools/editor/project_settings.cpp
 msgid "Node Name:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1818
+#: tools/editor/project_settings.cpp
 msgid "List:"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1827
+#: tools/editor/project_settings.cpp
 msgid "Name"
 msgstr ""
 
-#:./tools/editor/project_settings.cpp:1833
+#: tools/editor/project_settings.cpp
 msgid "Singleton"
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:171
-msgid "This item cannot be made visible because the parent is hidden. Unhide the parent first."
+#: tools/editor/scene_tree_editor.cpp
+msgid ""
+"This item cannot be made visible because the parent is hidden. Unhide the "
+"parent first."
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:177
+#: tools/editor/scene_tree_editor.cpp
 msgid "Toggle Spatial Visible"
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:190
+#: tools/editor/scene_tree_editor.cpp
 msgid "Toggle CanvasItem Visible"
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:281
-msgid "Inherits: "
+#: tools/editor/scene_tree_editor.cpp
+msgid "Instance:"
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:285
-msgid "Instance: "
+#: tools/editor/scene_tree_editor.cpp
+msgid "Invalid node name, the following characters are not allowed:"
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:682
+#: tools/editor/scene_tree_editor.cpp
 msgid "Rename Node"
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:1008
+#: tools/editor/scene_tree_editor.cpp
 msgid "Scene Tree (Nodes):"
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:1045
+#: tools/editor/scene_tree_editor.cpp
 msgid "Editable Children"
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:1046
+#: tools/editor/scene_tree_editor.cpp
 msgid "Load As Placeholder"
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:1048
+#: tools/editor/scene_tree_editor.cpp
 msgid "Open in Editor"
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:1053
+#: tools/editor/scene_tree_editor.cpp
 msgid "Clear Inheritance"
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:1061
+#: tools/editor/scene_tree_editor.cpp
 msgid "Clear Inheritance? (No Undo!)"
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:1062
+#: tools/editor/scene_tree_editor.cpp
 msgid "Clear!"
 msgstr ""
 
-#:./tools/editor/scene_tree_editor.cpp:1128
+#: tools/editor/scene_tree_editor.cpp
 msgid "Select a Node"
 msgstr ""
 
-#:./tools/editor/quick_open.cpp:219
-msgid "Search:"
-msgstr ""
-
-#:./tools/editor/quick_open.cpp:223
+#: tools/editor/quick_open.cpp tools/editor/editor_help.cpp
+#: tools/editor/create_dialog.cpp tools/editor/plugins/script_editor_plugin.cpp
 msgid "Matches:"
 msgstr ""
 
-#:./tools/editor/quick_open.cpp:224
+#: tools/editor/quick_open.cpp
 msgid "Open"
 msgstr ""
 
-#:./tools/editor/editor_reimport_dialog.cpp:35
-msgid "Please wait for scan to complete"
+#: tools/editor/editor_reimport_dialog.cpp
+msgid "Please wait for scan to complete."
 msgstr ""
 
-#:./tools/editor/editor_reimport_dialog.cpp:72
+#: tools/editor/editor_reimport_dialog.cpp
 msgid "Current scene must be saved to re-import."
 msgstr ""
 
-#:./tools/editor/editor_reimport_dialog.cpp:80
+#: tools/editor/editor_reimport_dialog.cpp tools/editor/editor_node.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Save & Re-Import"
 msgstr ""
 
-#:./tools/editor/editor_reimport_dialog.cpp:102
+#: tools/editor/editor_reimport_dialog.cpp
 msgid "Re-Importing"
 msgstr ""
 
-#:./tools/editor/editor_reimport_dialog.cpp:139
+#: tools/editor/editor_reimport_dialog.cpp
 msgid "Re-Import Changed Resources"
 msgstr ""
 
-#:./tools/editor/resources_dock.cpp:136
+#: tools/editor/resources_dock.cpp tools/editor/editor_node.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Error saving resource!"
 msgstr ""
 
-#:./tools/editor/resources_dock.cpp:354
+#: tools/editor/resources_dock.cpp
 msgid "Create New Resource"
 msgstr ""
 
-#:./tools/editor/resources_dock.cpp:360
+#: tools/editor/resources_dock.cpp
 msgid "Open Resource"
 msgstr ""
 
-#:./tools/editor/resources_dock.cpp:366
+#: tools/editor/resources_dock.cpp
 msgid "Save Resource"
 msgstr ""
 
-#:./tools/editor/resources_dock.cpp:368
+#: tools/editor/resources_dock.cpp tools/editor/editor_node.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Save Resource As.."
 msgstr ""
 
-#:./tools/editor/resources_dock.cpp:376
+#: tools/editor/resources_dock.cpp
 msgid "Resource Tools"
 msgstr ""
 
-#:./tools/editor/resources_dock.cpp:377
+#: tools/editor/resources_dock.cpp
 msgid "Make Local"
 msgstr ""
 
-#:./tools/editor/editor_run_script.cpp:12
-msgid "EditorScript::add_root_node : Write your logic in the _run() method."
+#: tools/editor/editor_run_script.cpp
+msgid "Write your logic in the _run() method."
 msgstr ""
 
-#:./tools/editor/editor_run_script.cpp:17
-msgid "EditorScript::add_root_node : There is an edited scene already."
+#: tools/editor/editor_run_script.cpp
+msgid "There is an edited scene already."
 msgstr ""
 
-#:./tools/editor/editor_run_script.cpp:27
-msgid "EditorScript::get_scene : Write your logic in the _run() method."
+#: tools/editor/editor_run_script.cpp
+msgid "Couldn't instance script:"
 msgstr ""
 
-#:./tools/editor/editor_data.cpp:572
+#: tools/editor/editor_run_script.cpp
+msgid "Did you forget the 'tool' keyword?"
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "Couldn't run script:"
+msgstr ""
+
+#: tools/editor/editor_run_script.cpp
+msgid "Did you forget the '_run' method?"
+msgstr ""
+
+#: tools/editor/editor_data.cpp
 msgid "Updating Scene"
 msgstr ""
 
-#:./tools/editor/editor_data.cpp:573
+#: tools/editor/editor_data.cpp
 msgid "Storing local changes.."
 msgstr ""
 
-#:./tools/editor/editor_data.cpp:577
+#: tools/editor/editor_data.cpp
 msgid "Updating scene.."
 msgstr ""
 
-#:./tools/editor/file_type_cache.cpp:88
+#: tools/editor/file_type_cache.cpp
 msgid "Can't open file_type_cache.cch for writing, not saving file type cache!"
 msgstr ""
 
-#:./tools/editor/reparent_dialog.cpp:87
+#: tools/editor/reparent_dialog.cpp tools/editor/scene_tree_dock.cpp
 msgid "Reparent Node"
 msgstr ""
 
-#:./tools/editor/reparent_dialog.cpp:96
+#: tools/editor/reparent_dialog.cpp
 msgid "Reparent Location (Select new Parent):"
 msgstr ""
 
-#:./tools/editor/reparent_dialog.cpp:105
+#: tools/editor/reparent_dialog.cpp
 msgid "Keep Global Transform"
 msgstr ""
 
-#:./tools/editor/reparent_dialog.cpp:110
-msgid "Options:"
-msgstr ""
-
-#:./tools/editor/reparent_dialog.cpp:114
+#: tools/editor/reparent_dialog.cpp
 msgid "Reparent"
 msgstr ""
 
-#:./tools/editor/editor_plugin_settings.cpp:155
+#: tools/editor/editor_plugin_settings.cpp tools/editor/editor_node.cpp
 msgid "Update"
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:126
+#: tools/editor/scenes_dock.cpp tools/editor/editor_file_dialog.cpp
 msgid "Favorites:"
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:805
+#: tools/editor/scenes_dock.cpp
 msgid "Same source and destination files, doing nothing."
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:852
+#: tools/editor/scenes_dock.cpp
 msgid "Same source and destination paths, doing nothing."
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:862
-msgid "Can't move directories to within themselves"
+#: tools/editor/scenes_dock.cpp
+msgid "Can't move directories to within themselves."
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1020
+#: tools/editor/scenes_dock.cpp
 msgid "Can't operate on '..'"
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1039
-msgid "Pick New Name and Location For: "
+#: tools/editor/scenes_dock.cpp
+msgid "Pick New Name and Location For:"
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1062
+#: tools/editor/scenes_dock.cpp
 msgid "No files selected!"
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1400
+#: tools/editor/scenes_dock.cpp
 msgid "Instance"
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1406
+#: tools/editor/scenes_dock.cpp
 msgid "Edit Dependencies.."
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1407
+#: tools/editor/scenes_dock.cpp tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "View Owners.."
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1412
+#: tools/editor/scenes_dock.cpp
 msgid "Rename or Move.."
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1414
+#: tools/editor/scenes_dock.cpp
 msgid "Move To.."
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1470
+#: tools/editor/scenes_dock.cpp
+msgid "Show In File Manager"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp
 msgid "Previous Directory"
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1477
+#: tools/editor/scenes_dock.cpp
 msgid "Next Directory"
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1484
+#: tools/editor/scenes_dock.cpp
 msgid "Re-Scan Filesystem"
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1493
+#: tools/editor/scenes_dock.cpp
 msgid "Move Favorite Up"
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1500
+#: tools/editor/scenes_dock.cpp
 msgid "Move Favorite Down"
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1507
+#: tools/editor/scenes_dock.cpp
 msgid "Toggle folder status as Favorite"
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1529
+#: tools/editor/scenes_dock.cpp
 msgid "Instance the selected scene(s) as child of the selected node."
 msgstr ""
 
-#:./tools/editor/scenes_dock.cpp:1615
+#: tools/editor/scenes_dock.cpp
 msgid "Move"
 msgstr ""
 
-#:./tools/editor/editor_import_export.cpp:243
-msgid "Added: "
+#: tools/editor/editor_import_export.cpp
+msgid "Added:"
 msgstr ""
 
-#:./tools/editor/editor_import_export.cpp:248
-msgid "Removed: "
+#: tools/editor/editor_import_export.cpp
+msgid "Removed:"
 msgstr ""
 
-#:./tools/editor/editor_import_export.cpp:919
-msgid "Could not save atlas subtexture: "
+#: tools/editor/editor_import_export.cpp
+msgid "Could not save atlas subtexture:"
 msgstr ""
 
-#:./tools/editor/editor_import_export.cpp:1160
-msgid "Storing File: "
+#: tools/editor/editor_import_export.cpp
+msgid "Storing File:"
 msgstr ""
 
-#:./tools/editor/editor_import_export.cpp:1206
+#: tools/editor/editor_import_export.cpp
 msgid "Packing"
 msgstr ""
 
-#:./tools/editor/editor_import_export.cpp:1312
-msgid "Exporting for "
+#: tools/editor/editor_import_export.cpp
+msgid "Exporting for %s"
 msgstr ""
 
-#:./tools/editor/editor_import_export.cpp:1318
+#: tools/editor/editor_import_export.cpp
 msgid "Setting Up.."
 msgstr ""
 
-#:./tools/editor/editor_settings.cpp:266
-msgid "EditorSettings"
-msgstr ""
-
-#:./tools/editor/editor_settings.cpp:472
+#: tools/editor/editor_settings.cpp
 msgid "Default (Same as Editor)"
 msgstr ""
 
-#:./tools/editor/editor_settings.cpp:508
-msgid "PVRTC/fast_conversion"
-msgstr ""
-
-#:./tools/editor/editor_file_dialog.cpp:356
+#: tools/editor/editor_file_dialog.cpp
 msgid "File Exists, Overwrite?"
 msgstr ""
 
-#:./tools/editor/editor_file_dialog.cpp:680
-msgid "All Recognized ( "
+#: tools/editor/editor_file_dialog.cpp
+msgid "All Recognized"
 msgstr ""
 
-#:./tools/editor/editor_file_dialog.cpp:692
+#: tools/editor/editor_file_dialog.cpp
 msgid "All Files (*)"
 msgstr ""
 
-#:./tools/editor/editor_file_dialog.cpp:1215
+#: tools/editor/editor_file_dialog.cpp
+msgid "Save"
+msgstr ""
+
+#: tools/editor/editor_file_dialog.cpp
 msgid "Save a File"
 msgstr ""
 
-#:./tools/editor/editor_file_dialog.cpp:1295
+#: tools/editor/editor_file_dialog.cpp
 msgid "Recent:"
 msgstr ""
 
-#:./tools/editor/editor_file_dialog.cpp:1304
+#: tools/editor/editor_file_dialog.cpp
 msgid "Directories & Files:"
 msgstr ""
 
-#:./tools/editor/editor_file_dialog.cpp:1316
+#: tools/editor/editor_file_dialog.cpp
 msgid "Preview:"
 msgstr ""
 
-#:./tools/editor/editor_file_dialog.cpp:1324
-msgid "File:"
-msgstr ""
-
-#:./tools/editor/editor_file_dialog.cpp:1329
+#: tools/editor/editor_file_dialog.cpp
 msgid "Filter:"
 msgstr ""
 
-#:./tools/editor/editor_file_dialog.cpp:1368
+#: tools/editor/editor_file_dialog.cpp
 msgid "Must use a valid extension."
 msgstr ""
 
-#:./tools/editor/groups_editor.cpp:46
+#: tools/editor/groups_editor.cpp
 msgid "Add to Group"
 msgstr ""
 
-#:./tools/editor/groups_editor.cpp:69
+#: tools/editor/groups_editor.cpp
 msgid "Remove from Group"
 msgstr ""
 
-#:./tools/editor/groups_editor.cpp:128
+#: tools/editor/groups_editor.cpp
 msgid "Group Editor"
 msgstr ""
 
-#:./tools/editor/groups_editor.cpp:150
+#: tools/editor/groups_editor.cpp
 msgid "Node Group(s)"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:355
+#: tools/editor/property_editor.cpp
 msgid "Preset.."
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:358
+#: tools/editor/property_editor.cpp
 msgid "Ease In"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:359
+#: tools/editor/property_editor.cpp
 msgid "Ease Out"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:361
+#: tools/editor/property_editor.cpp
 msgid "Zero"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:362
+#: tools/editor/property_editor.cpp
 msgid "Easing In-Out"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:363
+#: tools/editor/property_editor.cpp
 msgid "Easing Out-In"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:401
+#: tools/editor/property_editor.cpp
 msgid "File.."
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:408
+#: tools/editor/property_editor.cpp
 msgid "Dir.."
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:642
+#: tools/editor/property_editor.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "New"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:643
+#: tools/editor/property_editor.cpp
 msgid "Load"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:651
+#: tools/editor/property_editor.cpp
 msgid "Assign"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:697
-msgid "New "
-msgstr ""
-
-#:./tools/editor/property_editor.cpp:838
+#: tools/editor/property_editor.cpp
 msgid "Error loading file: Not a resource!"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:850
+#: tools/editor/property_editor.cpp
 msgid "Couldn't load image"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:939
-msgid "ArrayPropertyEdit"
+#: tools/editor/property_editor.cpp
+msgid "Bit %d, val %d."
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:1735
-msgid "Bit "
+#: tools/editor/property_editor.cpp tools/editor/editor_help.cpp
+msgid "Class:"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:2661
-msgid "Property"
-msgstr ""
-
-#:./tools/editor/property_editor.cpp:2770
-msgid "Class: "
-msgstr ""
-
-#:./tools/editor/property_editor.cpp:2867
-msgid "Property: "
-msgstr ""
-
-#:./tools/editor/property_editor.cpp:2898
+#: tools/editor/property_editor.cpp
 msgid "On"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:3436
-msgid "Set "
+#: tools/editor/property_editor.cpp
+msgid "Set"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:3952
+#: tools/editor/property_editor.cpp
 msgid "Properties:"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:4205
+#: tools/editor/property_editor.cpp
 msgid "Global"
 msgstr ""
 
-#:./tools/editor/property_editor.cpp:4228
+#: tools/editor/property_editor.cpp
 msgid "Sections:"
 msgstr ""
 
-#:./tools/editor/addon_editor_plugin.cpp:1100
+#: tools/editor/addon_editor_plugin.cpp
 msgid "Import"
 msgstr ""
 
-#:./tools/editor/addon_editor_plugin.cpp:1145
-msgid "Godot"
+#: tools/editor/addon_editor_plugin.cpp
+msgid "Sort:"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:435
-msgid "Node from scene"
+#: tools/editor/addon_editor_plugin.cpp
+msgid "Reverse"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:441
-msgid "Re-Import.."
+#: tools/editor/addon_editor_plugin.cpp
+msgid "All"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:603
-msgid "I see.."
+#: tools/editor/addon_editor_plugin.cpp
+msgid "Site:"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:609
-msgid "Can't open file for writing: "
+#: tools/editor/addon_editor_plugin.cpp
+msgid "Assets ZIP File"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:613
-msgid "File format requested unknown: "
+#: tools/editor/editor_node.cpp
+msgid "Node From Scene"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:617
-msgid "Error Saving."
+#: tools/editor/editor_node.cpp
+msgid "Re-Import.."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:913
-msgid "Saving Scene"
+#: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
+msgid "I see.."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:914
-msgid "Analyzing"
+#: tools/editor/editor_node.cpp
+msgid "Can't open file for writing:"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:927
-msgid "Creating Thumbnail"
+#: tools/editor/editor_node.cpp
+msgid "Requested file format unknown:"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1024
-msgid "Couldn't save scene. Likely dependencies (instances) couldn't be satisfied."
+#: tools/editor/editor_node.cpp
+msgid "Error while saving."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1074
-msgid "Ugh"
+#: tools/editor/editor_node.cpp
+msgid "Saving Scene"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1075
-msgid "Error importing scene."
+#: tools/editor/editor_node.cpp
+msgid "Analyzing"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1091
-msgid "Error load scene to update."
+#: tools/editor/editor_node.cpp
+msgid "Creating Thumbnail"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1173
+#: tools/editor/editor_node.cpp
+msgid ""
+"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
 msgid "Failed to load resource."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1254
-msgid "Can't load MeshLibrary for merging!."
+#: tools/editor/editor_node.cpp
+msgid "Can't load MeshLibrary for merging!"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1271
-msgid "Error saving MeshLibrary!."
+#: tools/editor/editor_node.cpp
+msgid "Error saving MeshLibrary!"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1289
-msgid "Can't load TileSet for merging!."
+#: tools/editor/editor_node.cpp
+msgid "Can't load TileSet for merging!"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1307
-msgid "Error saving TileSet!."
+#: tools/editor/editor_node.cpp
+msgid "Error saving TileSet!"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1324
+#: tools/editor/editor_node.cpp
 msgid "Can't open export templates zip."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1341
+#: tools/editor/editor_node.cpp
 msgid "Loading Export Templates"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1371
-msgid "Importing: "
+#: tools/editor/editor_node.cpp
+msgid "Importing:"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1414
+#: tools/editor/editor_node.cpp
 msgid "Error trying to save layout!"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1426
+#: tools/editor/editor_node.cpp
 msgid "Default editor layout overridden."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1440
+#: tools/editor/editor_node.cpp
 msgid "Layout name not found!"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1457
-msgid "Restored Default layout to base settings."
+#: tools/editor/editor_node.cpp
+msgid "Restored default layout to base settings."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1736
+#: tools/editor/editor_node.cpp
 msgid "Copy Params"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1737
+#: tools/editor/editor_node.cpp
 msgid "Set Params"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1739
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
 msgid "Paste Resource"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1741
+#: tools/editor/editor_node.cpp
 msgid "Copy Resource"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1742
+#: tools/editor/editor_node.cpp
 msgid "Make Built-In"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1745
+#: tools/editor/editor_node.cpp
 msgid "Make Sub-Resources Unique"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1772
-msgid "All Methods"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:1835
-msgid "No scene to run exists."
+#: tools/editor/editor_node.cpp
+msgid "There is no defined scene to run."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1899
-msgid "Current scene was never saved, please save scene before running."
+#: tools/editor/editor_node.cpp
+msgid "Current scene was never saved, please save it prior to running."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:1927
+#: tools/editor/editor_node.cpp
 msgid "Could not start subprocess!"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2003
-msgid "Yes"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:2005
-msgid "Start a New Scene? (Current will be lost)"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:2040
+#: tools/editor/editor_node.cpp
 msgid "Open Scene"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2040
+#: tools/editor/editor_node.cpp
 msgid "Open Base Scene"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2047
+#: tools/editor/editor_node.cpp
 msgid "Quick Open Scene.."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2054
+#: tools/editor/editor_node.cpp
 msgid "Quick Open Script.."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2061
-msgid "Quick Search File.."
+#: tools/editor/editor_node.cpp
+msgid "Yes"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2082
+#: tools/editor/editor_node.cpp
 msgid "Close scene? (Unsaved changes will be lost)"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2159
+#: tools/editor/editor_node.cpp
 msgid "Save Scene As.."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2166
+#: tools/editor/editor_node.cpp
 msgid "This scene has never been saved. Save before running?"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2202
+#: tools/editor/editor_node.cpp
 msgid "Please save the scene first."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2213
+#: tools/editor/editor_node.cpp
 msgid "Save Translatable Strings"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2299
+#: tools/editor/editor_node.cpp
 msgid "Export Mesh Library"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2313
+#: tools/editor/editor_node.cpp
 msgid "Export Tile Set"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2344
+#: tools/editor/editor_node.cpp
 msgid "Quit"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2346
-msgid "Exit the Editor?"
+#: tools/editor/editor_node.cpp
+msgid "Exit the editor?"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2362
+#: tools/editor/editor_node.cpp
 msgid "Current scene not saved. Open anyway?"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2414
-msgid "Can't reload a scene that was never saved.."
+#: tools/editor/editor_node.cpp
+msgid "Can't reload a scene that was never saved."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2419
+#: tools/editor/editor_node.cpp
 msgid "Revert"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2420
+#: tools/editor/editor_node.cpp
 msgid "This action cannot be undone. Revert anyway?"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2468
-msgid "Error loading scene from "
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:2476
-msgid "Instance Scene"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:2630
+#: tools/editor/editor_node.cpp
 msgid "Quick Run Scene.."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:2711
-msgid "Enable File Server"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:2715
-msgid "Disable File Server"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:2829
-msgid "Current scene changed, save and re-import ?"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:2843
-msgid "Can't import if edited scene was not saved."
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:3259
-msgid "No scene to optimize (loading failed?"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:3285
-msgid "Optimizer preset not found: "
+#: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
+msgid "Ugh"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:3354
-msgid "Error saving optimized scene: "
+#: tools/editor/editor_node.cpp
+msgid ""
+"Error loading scene, it must be inside the project path. Use 'Import' to open "
+"the scene, then save it inside the project path."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:3581
-msgid "Error loading scene, it must be inside the project path. Use 'Import' to open the scene, then save it inside the project path."
+#: tools/editor/editor_node.cpp
+msgid "Error loading scene."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:3610
-msgid "Error loading scene."
+#: tools/editor/editor_node.cpp
+msgid "Scene '%s' has broken dependencies:"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:4603
+#: tools/editor/editor_node.cpp
 msgid "Save Layout"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:4604
+#: tools/editor/editor_node.cpp
 msgid "Delete Layout"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:4716
+#: tools/editor/editor_node.cpp
 msgid "Switch Scene Tab"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:4957
-msgid "More File(s)"
+#: tools/editor/editor_node.cpp
+msgid "%d more file(s)"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:4988
-msgid "More File(s) and/or Directory(s)"
+#: tools/editor/editor_node.cpp
+msgid "%d more file(s) or folder(s)"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5159
-msgid "BodyVolumeConvexPolygon"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:5432
+#: tools/editor/editor_node.cpp
 msgid "Scene"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5438
+#: tools/editor/editor_node.cpp
 msgid "Go to previously opened scene."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5449
+#: tools/editor/editor_node.cpp
 msgid "Operations with scene files."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5451
+#: tools/editor/editor_node.cpp
 msgid "New Scene"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5452
+#: tools/editor/editor_node.cpp
 msgid "New Inherited Scene.."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5453
+#: tools/editor/editor_node.cpp
 msgid "Open Scene.."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5455
+#: tools/editor/editor_node.cpp
 msgid "Save Scene"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5458
+#: tools/editor/editor_node.cpp
 msgid "Close Scene"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5460
+#: tools/editor/editor_node.cpp
 msgid "Close Goto Prev. Scene"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5461
+#: tools/editor/editor_node.cpp
 msgid "Open Recent"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5471
+#: tools/editor/editor_node.cpp
+msgid "Quick Search File.."
+msgstr ""
+
+#: tools/editor/editor_node.cpp
 msgid "Convert To.."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5472
+#: tools/editor/editor_node.cpp
 msgid "Translatable Strings.."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5474
+#: tools/editor/editor_node.cpp
 msgid "MeshLibrary.."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5475
+#: tools/editor/editor_node.cpp
 msgid "TileSet.."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5480
+#: tools/editor/editor_node.cpp tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Redo"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5482
+#: tools/editor/editor_node.cpp
 msgid "Run Script"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5484
+#: tools/editor/editor_node.cpp
 msgid "Project Settings"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5486
+#: tools/editor/editor_node.cpp
 msgid "Revert Scene"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5489
+#: tools/editor/editor_node.cpp
 msgid "Quit to Project List"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5524
-msgid "Move Up"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:5525
-msgid "Move Down"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:5527
-msgid "Duplicate"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:5529
-msgid "Remove (Branch)"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:5530
-msgid "Remove (Element)"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:5532
-msgid "Edit Subscriptions.."
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:5533
-msgid "Edit Groups.."
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:5542
+#: tools/editor/editor_node.cpp
 msgid "Import assets to the project."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5551
-msgid "Miscelaneous project or scene wide tools."
+#: tools/editor/editor_node.cpp
+msgid "Miscellaneous project or scene-wide tools."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5552
+#: tools/editor/editor_node.cpp
 msgid "Tools"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5562
+#: tools/editor/editor_node.cpp
 msgid "Export the project to many platforms."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5596
+#: tools/editor/editor_node.cpp
 msgid "Play the project (F5)."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5606
-msgid "Pause the scene (F7)."
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:5614
+#: tools/editor/editor_node.cpp
 msgid "Stop the scene (F8)."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5634
+#: tools/editor/editor_node.cpp
 msgid "Play the edited scene (F6)."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5642
-msgid "Play custom scene ("
+#: tools/editor/editor_node.cpp
+msgid "Play custom scene"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5651
-msgid "Debug Options"
+#: tools/editor/editor_node.cpp
+msgid "Debug options"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5654
+#: tools/editor/editor_node.cpp
 msgid "Live Editing"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5655
+#: tools/editor/editor_node.cpp
 msgid "File Server"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5657
+#: tools/editor/editor_node.cpp
 msgid "Deploy Remote Debug"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5658
+#: tools/editor/editor_node.cpp
 msgid "Deploy File Server Clients"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5660
+#: tools/editor/editor_node.cpp
 msgid "Visible Collision Shapes"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5661
+#: tools/editor/editor_node.cpp
 msgid "Visible Navigation"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5724
+#: tools/editor/editor_node.cpp
 msgid "Settings"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5729
-msgid "Export Settings"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:5731
-msgid "Optimization Presets"
-msgstr ""
-
-#:./tools/editor/editor_node.cpp:5737
+#: tools/editor/editor_node.cpp
 msgid "Editor Layout"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5739
+#: tools/editor/editor_node.cpp
 msgid "Install Export Templates"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5741
+#: tools/editor/editor_node.cpp
 msgid "About"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5753
+#: tools/editor/editor_node.cpp
 msgid "Alerts when an external resource has changed."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5756
+#: tools/editor/editor_node.cpp
 msgid "Spins when the editor window repaints!"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5760
+#: tools/editor/editor_node.cpp
 msgid "Update Always"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5761
+#: tools/editor/editor_node.cpp
 msgid "Update Changes"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5815
+#: tools/editor/editor_node.cpp
 msgid "Inspector"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5823
-msgid "Create a new resource in memory and edit it"
+#: tools/editor/editor_node.cpp
+msgid "Create a new resource in memory and edit it."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5830
-msgid "Load an existing resource from disk and edit it"
+#: tools/editor/editor_node.cpp
+msgid "Load an existing resource from disk and edit it."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5837
-msgid "Save the currently edited resource"
+#: tools/editor/editor_node.cpp
+msgid "Save the currently edited resource."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5841
+#: tools/editor/editor_node.cpp
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Save As.."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5851
+#: tools/editor/editor_node.cpp
 msgid "Go to the previous edited object in history."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5859
+#: tools/editor/editor_node.cpp
 msgid "Go to the next edited object in history."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5866
-msgid "History of recently edited objects"
+#: tools/editor/editor_node.cpp
+msgid "History of recently edited objects."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5890
+#: tools/editor/editor_node.cpp
 msgid "Object properties."
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5928
+#: tools/editor/editor_node.cpp
 msgid "FileSystem"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:5966
+#: tools/editor/editor_node.cpp
 msgid "Output"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:6087
-msgid "Thanks so Much!"
+#: tools/editor/editor_node.cpp
+msgid "Thanks from the Godot community!"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:6089
+#: tools/editor/editor_node.cpp
 msgid "Thanks!"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:6107
-msgid "Import Templates from ZIP file"
+#: tools/editor/editor_node.cpp
+msgid "Import Templates From ZIP File"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:6127
+#: tools/editor/editor_node.cpp
 msgid "Export Library"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:6131
+#: tools/editor/editor_node.cpp
 msgid "Merge With Existing"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:6146
+#: tools/editor/editor_node.cpp
 msgid "Open & Run a Script"
 msgstr ""
 
-#:./tools/editor/editor_node.cpp:6343
+#: tools/editor/editor_node.cpp
 msgid "Load Errors"
 msgstr ""
 
-#:./tools/editor/call_dialog.cpp:242
-msgid "Method List For ' "
+#: tools/editor/call_dialog.cpp
+msgid "Method List For '%s':"
 msgstr ""
 
-#:./tools/editor/call_dialog.cpp:256
+#: tools/editor/call_dialog.cpp
 msgid "Call"
 msgstr ""
 
-#:./tools/editor/call_dialog.cpp:294
+#: tools/editor/call_dialog.cpp
 msgid "Method List:"
 msgstr ""
 
-#:./tools/editor/call_dialog.cpp:301
+#: tools/editor/call_dialog.cpp
 msgid "Arguments:"
 msgstr ""
 
-#:./tools/editor/call_dialog.cpp:308
+#: tools/editor/call_dialog.cpp
 msgid "Return:"
 msgstr ""
 
-#:./tools/editor/call_dialog.cpp:326
-msgid "Parameters:"
+#: tools/editor/pvrtc_compress.cpp
+msgid "Could not execute PVRTC tool:"
 msgstr ""
 
-#:./tools/editor/pvrtc_compress.cpp:96
-msgid "Could not execute PVRTC Tool: "
+#: tools/editor/pvrtc_compress.cpp
+msgid "Can't load back converted image using PVRTC tool:"
 msgstr ""
 
-#:./tools/editor/pvrtc_compress.cpp:102
-msgid "Can't load back converted image using PVRTC Tool: "
-msgstr ""
-
-#:./tools/editor/array_property_edit.cpp:67
+#: tools/editor/array_property_edit.cpp
 msgid "Resize Array"
 msgstr ""
 
-#:./tools/editor/array_property_edit.cpp:112
+#: tools/editor/array_property_edit.cpp
 msgid "Change Array Value Type"
 msgstr ""
 
-#:./tools/editor/array_property_edit.cpp:129
+#: tools/editor/array_property_edit.cpp
 msgid "Change Array Value"
 msgstr ""
 
-#:./tools/editor/editor_help.cpp:334
+#: tools/editor/editor_help.cpp
 msgid "Search Classes"
 msgstr ""
 
-#:./tools/editor/editor_help.cpp:522
-msgid "Class List: "
+#: tools/editor/editor_help.cpp
+msgid "Class List:"
+msgstr ""
+
+#: tools/editor/editor_help.cpp
+msgid "Inherited by:"
 msgstr ""
 
-#:./tools/editor/editor_help.cpp:790
+#: tools/editor/editor_help.cpp
 msgid "Brief Description:"
 msgstr ""
 
-#:./tools/editor/editor_help.cpp:813
+#: tools/editor/editor_help.cpp
 msgid "Public Methods:"
 msgstr ""
 
-#:./tools/editor/editor_help.cpp:898
+#: tools/editor/editor_help.cpp
 msgid "Members:"
 msgstr ""
 
-#:./tools/editor/editor_help.cpp:942
+#: tools/editor/editor_help.cpp
 msgid "GUI Theme Items:"
 msgstr ""
 
-#:./tools/editor/editor_help.cpp:984
+#: tools/editor/editor_help.cpp
 msgid "Signals:"
 msgstr ""
 
-#:./tools/editor/editor_help.cpp:1049
+#: tools/editor/editor_help.cpp
 msgid "Constants:"
 msgstr ""
 
-#:./tools/editor/editor_help.cpp:1094
-msgid "Description:"
-msgstr ""
-
-#:./tools/editor/editor_help.cpp:1115
+#: tools/editor/editor_help.cpp
 msgid "Method Description:"
 msgstr ""
 
-#:./tools/editor/editor_help.cpp:1653
+#: tools/editor/editor_help.cpp
 msgid "Search Text"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:69
-msgid "Invalid Path for Project, Path Must Exist!"
+#: tools/editor/project_manager.cpp
+msgid "Invalid project path, the path must exist!"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:78
-msgid "Invalid Project Path (engine.cfg must not exist)."
+#: tools/editor/project_manager.cpp
+msgid "Invalid project path, engine.cfg must not exist."
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:87
-msgid "Invalid Project Path (engine.cfg must exist)."
+#: tools/editor/project_manager.cpp
+msgid "Invalid project path, engine.cfg must exist."
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:112
+#: tools/editor/project_manager.cpp
 msgid "Imported Project"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:173
-msgid "Invalid Path for Project (changed anything?)"
+#: tools/editor/project_manager.cpp
+msgid "Invalid project path (changed anything?)."
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:183
-msgid "Couldn't create engine.cfg in project path"
+#: tools/editor/project_manager.cpp
+msgid "Couldn't create engine.cfg in project path."
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:248
+#: tools/editor/project_manager.cpp
 msgid "Import Existing Project"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:250
-msgid "Project Path: (Must exist)"
+#: tools/editor/project_manager.cpp
+msgid "Project Path (Must Exist):"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:251
+#: tools/editor/project_manager.cpp
 msgid "Project Name:"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:258
+#: tools/editor/project_manager.cpp
 msgid "Create New Project"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:260
+#: tools/editor/project_manager.cpp
 msgid "Project Path:"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:295
+#: tools/editor/project_manager.cpp
 msgid "Browse"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:308
+#: tools/editor/project_manager.cpp
 msgid "New Game Project"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:312
+#: tools/editor/project_manager.cpp
 msgid "That's a BINGO!"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:539
+#: tools/editor/project_manager.cpp
 msgid "Unnamed Project"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:651
+#: tools/editor/project_manager.cpp
 msgid "Are you sure to open more than one projects?"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:691
+#: tools/editor/project_manager.cpp
 msgid "Are you sure to run more than one projects?"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:791
-msgid "Remove project from list?? (Folder contents will not be modified)"
+#: tools/editor/project_manager.cpp
+msgid "Remove project from the list? (Folder contents will not be modified)"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:873
+#: tools/editor/project_manager.cpp
 msgid "Recent Projects:"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:906
+#: tools/editor/project_manager.cpp
 msgid "Edit"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:912
+#: tools/editor/project_manager.cpp
 msgid "Run"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:920
+#: tools/editor/project_manager.cpp
 msgid "Scan"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:935
+#: tools/editor/project_manager.cpp
 msgid "New Project"
 msgstr ""
 
-#:./tools/editor/project_manager.cpp:955
+#: tools/editor/project_manager.cpp
 msgid "Exit"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:69
-msgid "Ok :( "
+#: tools/editor/scene_tree_dock.cpp
+msgid "OK :("
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:70
+#: tools/editor/scene_tree_dock.cpp
 msgid "No parent to instance a child at."
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:113
-msgid "Error instancing scene from "
+#: tools/editor/scene_tree_dock.cpp
+msgid "Error loading scene from %s"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:124
-msgid "Ok"
+#: tools/editor/scene_tree_dock.cpp
+msgid "Error instancing scene from %s"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:125
-msgid "Cannot instance the scene '"
+#: tools/editor/scene_tree_dock.cpp
+msgid "Ok"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:125
-msgid "' because the current scene exists within one of its' nodes."
+#: tools/editor/scene_tree_dock.cpp
+msgid ""
+"Cannot instance the scene '%s' because the current scene exists within one of "
+"its nodes."
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:148
+#: tools/editor/scene_tree_dock.cpp
 msgid "Instance Scene(s)"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:344
+#: tools/editor/scene_tree_dock.cpp
+msgid "This operation can't be done on the tree root."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
 msgid "Move Node In Parent"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:345
+#: tools/editor/scene_tree_dock.cpp
 msgid "Move Nodes In Parent"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:391
+#: tools/editor/scene_tree_dock.cpp
 msgid "Duplicate Node(s)"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:540
+#: tools/editor/scene_tree_dock.cpp
 msgid "Delete Node(s)?"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:560
+#: tools/editor/scene_tree_dock.cpp
+msgid "This operation can't be done without a scene."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
 msgid "This operation requires a single selected node."
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:591
+#: tools/editor/scene_tree_dock.cpp
+msgid "This operation can't be done on instanced scenes."
+msgstr ""
+
+#: tools/editor/scene_tree_dock.cpp
 msgid "Save New Scene As.."
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:977
+#: tools/editor/scene_tree_dock.cpp
 msgid "Makes Sense!"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:978
+#: tools/editor/scene_tree_dock.cpp
 msgid "Can't operate on nodes from a foreign scene!"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:987
+#: tools/editor/scene_tree_dock.cpp
 msgid "Can't operate on nodes the current scene inherits from!"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1181
+#: tools/editor/scene_tree_dock.cpp
 msgid "Remove Node(s)"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1316
+#: tools/editor/scene_tree_dock.cpp
 msgid "Create Node"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1454
-msgid "Import Subscene"
+#: tools/editor/scene_tree_dock.cpp
+msgid ""
+"Couldn't save new scene. Likely dependencies (instances) couldn't be "
+"satisfied."
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1488
-msgid "Couldn't save new scene. Likely dependencies (instances) couldn't be satisfied."
-msgstr ""
-
-#:./tools/editor/scene_tree_dock.cpp:1503
+#: tools/editor/scene_tree_dock.cpp
 msgid "Error saving scene."
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1510
+#: tools/editor/scene_tree_dock.cpp
 msgid "Error duplicating scene to save it."
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1701
+#: tools/editor/scene_tree_dock.cpp
 msgid "New Scene Root"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1702
+#: tools/editor/scene_tree_dock.cpp
 msgid "Inherit Scene"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1719
+#: tools/editor/scene_tree_dock.cpp
 msgid "Add Child Node"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1720
+#: tools/editor/scene_tree_dock.cpp
 msgid "Instance Child Scene"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1722
+#: tools/editor/scene_tree_dock.cpp
 msgid "Change Type"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1724
+#: tools/editor/scene_tree_dock.cpp
 msgid "Edit Groups"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1725
+#: tools/editor/scene_tree_dock.cpp
 msgid "Edit Connections"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1727
+#: tools/editor/scene_tree_dock.cpp
 msgid "Add Script"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1738
-msgid "Save Branch as Scene"
-msgstr ""
-
-#:./tools/editor/scene_tree_dock.cpp:1742
-msgid "Delete Node(s)"
-msgstr ""
-
-#:./tools/editor/scene_tree_dock.cpp:1819
-msgid "Instance a scene file as a Node."
-msgstr ""
-
-#:./tools/editor/scene_tree_dock.cpp:1825
-msgid "Replace a Node by Another Node Type"
-msgstr ""
-
-#:./tools/editor/scene_tree_dock.cpp:1833
-msgid "Edit the Node Connections"
-msgstr ""
-
-#:./tools/editor/scene_tree_dock.cpp:1839
-msgid "Edit the Node Groups"
+#: tools/editor/scene_tree_dock.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Move Up"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1845
-msgid "Edit/Create the Node Script"
+#: tools/editor/scene_tree_dock.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Move Down"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1902
-msgid "Reparent Selected Node(s)"
+#: tools/editor/scene_tree_dock.cpp
+msgid "Duplicate"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1910
-msgid "Create New Scene From Node(s)"
+#: tools/editor/scene_tree_dock.cpp
+msgid "Save Branch as Scene"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1916
-msgid "Multi-Edit Selected Nodes"
+#: tools/editor/scene_tree_dock.cpp
+msgid "Delete Node(s)"
 msgstr ""
 
-#:./tools/editor/scene_tree_dock.cpp:1922
-msgid "Erase Selected Node(s)"
+#: tools/editor/scene_tree_dock.cpp
+msgid "Add/Create a New Node"
 msgstr ""
 
-#:./tools/editor/create_dialog.cpp:254
-msgid "Create New "
+#: tools/editor/scene_tree_dock.cpp
+msgid ""
+"Instance a scene file as a Node. Creates an inherited scene if no root node "
+"exists."
 msgstr ""
 
-#:./tools/editor/plugins/rich_text_editor_plugin.cpp:109
-msgid "RichText"
+#: tools/editor/create_dialog.cpp
+msgid "Create New"
 msgstr ""
 
-#:./tools/editor/plugins/rich_text_editor_plugin.cpp:110
-msgid "Parse BBCODE"
+#: tools/editor/plugins/rich_text_editor_plugin.cpp
+msgid "Parse BBCode"
 msgstr ""
 
-#:./tools/editor/plugins/sample_library_editor_plugin.cpp:56
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
 msgid "Open Sample File(s)"
 msgstr ""
 
-#:./tools/editor/plugins/sample_library_editor_plugin.cpp:77
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
 msgid "ERROR: Couldn't load sample!"
 msgstr ""
 
-#:./tools/editor/plugins/sample_library_editor_plugin.cpp:92
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
 msgid "Add Sample"
 msgstr ""
 
-#:./tools/editor/plugins/sample_library_editor_plugin.cpp:117
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
 msgid "Stop"
 msgstr ""
 
-#:./tools/editor/plugins/sample_library_editor_plugin.cpp:130
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
 msgid "Play"
 msgstr ""
 
-#:./tools/editor/plugins/sample_library_editor_plugin.cpp:172
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
 msgid "Rename Sample"
 msgstr ""
 
-#:./tools/editor/plugins/sample_library_editor_plugin.cpp:202
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
 msgid "Delete Sample"
 msgstr ""
 
-#:./tools/editor/plugins/sample_library_editor_plugin.cpp:251
-msgid "IMA-ADPCM,"
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/plugins/sample_editor_plugin.cpp
+msgid "16 Bits"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/plugins/sample_editor_plugin.cpp
+msgid "8 Bits"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/plugins/sample_editor_plugin.cpp
+msgid "Stereo"
+msgstr ""
+
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+#: tools/editor/plugins/sample_editor_plugin.cpp
+msgid "Mono"
 msgstr ""
 
-#:./tools/editor/plugins/sample_library_editor_plugin.cpp:457
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
 msgid "Preview"
 msgstr ""
 
-#:./tools/editor/plugins/collision_polygon_editor_plugin.cpp:95
+#: tools/editor/plugins/sample_library_editor_plugin.cpp
+msgid "Pitch"
+msgstr ""
+
+#: tools/editor/plugins/collision_polygon_editor_plugin.cpp
+#: tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
 msgid "Create Poly3D"
 msgstr ""
 
-#:./tools/editor/plugins/collision_polygon_editor_plugin.cpp:203
+#: tools/editor/plugins/collision_polygon_editor_plugin.cpp
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
 msgid "Edit Poly"
 msgstr ""
 
-#:./tools/editor/plugins/collision_polygon_editor_plugin.cpp:319
+#: tools/editor/plugins/collision_polygon_editor_plugin.cpp
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
 msgid "Edit Poly (Remove Point)"
 msgstr ""
 
-#:./tools/editor/plugins/collision_polygon_editor_plugin.cpp:562
-msgid "Polygon"
-msgstr ""
-
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:147
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Toggle Autoplay"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:320
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "New Animation Name:"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:323
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "New Anim"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:348
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Change Animation Name:"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:452
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Remove Animation"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:488
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "ERROR: Invalid animation name!"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:499
-msgid "ERROR: Animation Name Already Exists!"
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "ERROR: Animation name already exists!"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:508
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Rename Animation"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:524
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Add Animation"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:546
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Blend Next Changed"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:629
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Change Blend Time"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:741
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Load Animation"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:934
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Duplicate Animation"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1025
-msgid "Store anim in editor"
-msgstr ""
-
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1066
-msgid "Add Animation From Editor"
-msgstr ""
-
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1133
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "ERROR: No animation to copy!"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1148
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "ERROR: No animation resource on clipboard!"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1155
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Pasted Animation"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1166
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Paste Animation"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1180
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "ERROR: No animation to edit!"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1301
-msgid "Animation Player:"
-msgstr ""
-
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1309
-msgid "Play backwards selected animation from current pos. (A)"
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Play selected animation backwards from current pos. (A)"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1313
-msgid "Play backwards selected animation from end. (Shift+A)"
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Play selected animation backwards from end. (Shift+A)"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1319
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Stop animation playback. (S)"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1322
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Play selected animation from start. (Shift+D)"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1327
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Play selected animation from current pos. (D)"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1340
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Animation position (in seconds)."
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1348
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Scale animation playback globally for the node."
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1353
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Create new animation in player."
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1359
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Load an animation from disk."
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1363
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Save the current animation"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1390
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Display list of animations in player."
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1394
-msgid "Autoplay On Load"
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Autoplay on Load"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1400
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Edit Target Blend Times"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1404
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Animation Tools"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1405
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Copy Animation"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1408
-msgid "Edit Anim Resource"
-msgstr ""
-
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1428
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Create New Animation"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1439
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Animation Name:"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1462
-msgid "Blend Times: "
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
+msgid "Blend Times:"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1464
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Next (Auto Queue):"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.cpp:1465
+#: tools/editor/plugins/animation_player_editor_plugin.cpp
 msgid "Cross-Animation Blend Times"
 msgstr ""
 
-#:./tools/editor/plugins/light_occluder_2d_editor_plugin.cpp:60
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
 msgid "Create Poly"
 msgstr ""
 
-#:./tools/editor/plugins/light_occluder_2d_editor_plugin.cpp:396
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
 msgid "Create Occluder Polygon"
 msgstr ""
 
-#:./tools/editor/plugins/light_occluder_2d_editor_plugin.cpp:424
-msgid "Create a new polygon from scratch"
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/collision_polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "Create a new polygon from scratch."
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:65
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "Edit existing polygon:"
+msgstr ""
+
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "LMB: Move Point."
+msgstr ""
+
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "Ctrl+LMB: Split Segment."
+msgstr ""
+
+#: tools/editor/plugins/light_occluder_2d_editor_plugin.cpp
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
+msgid "RMB: Erase Point."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Configure Snap"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:77
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/sprite_region_editor_plugin.cpp
 msgid "Grid Offset:"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:94
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/sprite_region_editor_plugin.cpp
 msgid "Grid Step:"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:117
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Rotation Offset:"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:128
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Rotation Step:"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:161
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Move Pivot"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:650
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Move Action"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:1198
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Edit IK Chain"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:1214
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Edit CanvasItem"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:1909
-msgid "EditorFocus"
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Change Anchors"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:2232
-msgid "Align Top Left"
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Zoom (%):"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:2467
-msgid "Change Anchors"
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Paste Pose"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:2546
-msgid "Zoom (%):"
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Select Mode (Q)"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:2901
-msgid "Paste Pose"
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Drag: Rotate"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Alt+Drag: Move"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3295
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Press 'v' to Change Pivot, 'Shift+v' to Drag Pivot (while moving)."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Alt+RMB: Depth list selection"
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Move Mode (W)"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3301
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Rotate Mode (E)"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3315
-msgid "Click to change object's rotation pivot"
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid ""
+"Show a list of all objects at the position clicked\n"
+"(same as Alt+RMB in select mode)."
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3321
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Click to change object's rotation pivot."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Pan Mode"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3334
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Lock the selected object in place (can't be moved)."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Unlock the selected object (can be moved)."
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3355
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Makes sure the object's children are not selectable."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Restores the object's children's ability to be selected."
+msgstr ""
+
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Use Snap"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3356
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/sprite_region_editor_plugin.cpp
 msgid "Show Grid"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3357
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Use Rotation Snap"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3358
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/sprite_region_editor_plugin.cpp
 msgid "Snap Relative"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3359
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Configure Snap.."
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3361
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Use Pixel Snap"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3363
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Expand to Parent"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3365
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Skeleton.."
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3369
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Make Bones"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3370
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Clear Bones"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3372
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Make IK Chain"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3373
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Clear IK Chain"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3378
-msgid "Align Horizontal"
-msgstr ""
-
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3379
-msgid "Align Vertical"
-msgstr ""
-
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3380
-msgid "Space Horizontal"
-msgstr ""
-
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3381
-msgid "Space Vertical"
-msgstr ""
-
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3384
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "View"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3390
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Zoom In"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3391
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Zoom Out"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3392
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Zoom Reset"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3393
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Zoom Set.."
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3395
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Center Selection"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3396
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Frame Selection"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3399
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Anchor"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3439
-msgid "Insert Keys (Insert)"
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
+msgid "Insert Keys (Ins)"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3450
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Insert Key"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3451
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Insert Key (Existing Tracks)"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3453
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Copy Pose"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3455
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Clear Pose"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3462
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Set a Value"
 msgstr ""
 
-#:./tools/editor/plugins/canvas_item_editor_plugin.cpp:3467
+#: tools/editor/plugins/canvas_item_editor_plugin.cpp
 msgid "Snap (Pixels):"
 msgstr ""
 
-#:./tools/editor/plugins/tile_map_editor_plugin.cpp:584
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
 msgid "Paint TileMap"
 msgstr ""
 
-#:./tools/editor/plugins/tile_map_editor_plugin.cpp:728
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
 msgid "Erase TileMap"
 msgstr ""
 
-#:./tools/editor/plugins/tile_map_editor_plugin.cpp:1337
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Bucket"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Pick Tile"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Select"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
+msgid "Erase Selection"
+msgstr ""
+
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
 msgid "Transpose"
 msgstr ""
 
-#:./tools/editor/plugins/tile_map_editor_plugin.cpp:1343
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
 msgid "Mirror X (A)"
 msgstr ""
 
-#:./tools/editor/plugins/tile_map_editor_plugin.cpp:1349
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
 msgid "Mirror Y (S)"
 msgstr ""
 
-#:./tools/editor/plugins/tile_map_editor_plugin.cpp:1358
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
 msgid "Rotate 0 degrees"
 msgstr ""
 
-#:./tools/editor/plugins/tile_map_editor_plugin.cpp:1364
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
 msgid "Rotate 90 degrees"
 msgstr ""
 
-#:./tools/editor/plugins/tile_map_editor_plugin.cpp:1370
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
 msgid "Rotate 180 degrees"
 msgstr ""
 
-#:./tools/editor/plugins/tile_map_editor_plugin.cpp:1376
+#: tools/editor/plugins/tile_map_editor_plugin.cpp
 msgid "Rotate 270 degrees"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:277
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "New name:"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:317
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Scale:"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:326
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Fade In (s):"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:332
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Fade Out (s):"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:340
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Blend"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:341
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Mix"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:347
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Auto Restart:"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:352
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Restart (s):"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:358
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Random Restart (s):"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:369
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Start!"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:379
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Amount:"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:391
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Blend:"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:419
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Blend 0:"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:427
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Blend 1:"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:442
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "X-Fade Time (s):"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:449
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Current:"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:817
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Add Input"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:820
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Clear Auto-Advance"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:822
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Set Auto-Advance"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:823
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Delete Input"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:835
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Rename"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:993
-msgid "Animation Tree is Valid."
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Animation tree is valid."
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:998
-msgid "Animation Tree is Invalid."
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Animation tree is invalid."
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:1362
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Animation Node"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:1363
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "OneShot Node"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:1364
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Mix Node"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:1365
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Blend2 Node"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:1366
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Blend3 Node"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:1367
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Blend4 Node"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:1368
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "TimeScale Node"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:1369
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "TimeSeek Node"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:1370
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Transition Node"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:1372
-msgid "Import Animations..."
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
+msgid "Import Animations.."
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:1474
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Edit Node Filters"
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:1487
+#: tools/editor/plugins/animation_tree_editor_plugin.cpp
 msgid "Filters.."
 msgstr ""
 
-#:./tools/editor/plugins/animation_tree_editor_plugin.cpp:1527
-msgid "AnimationTree"
-msgstr ""
-
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:58
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "No mesh source specified (and no MultiMesh set in node)."
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:64
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "No mesh source specified (and MultiMesh contains no Mesh)."
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:76
-msgid "Mesh source is invalid (Invalid Path)."
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Mesh source is invalid (invalid path)."
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:85
-msgid "Mesh source is invalid (Not a MeshInstance)."
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Mesh source is invalid (not a MeshInstance)."
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:94
-msgid "Mesh source is invalid (Contains no Mesh resource)."
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Mesh source is invalid (contains no Mesh resource)."
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:103
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "No surface source specified."
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:112
-msgid "Surface source is invalid (Invalid Path)."
-msgstr ""
-
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:121
-msgid "Surface source is invalid (Not Geometry)."
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Surface source is invalid (invalid path)."
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:132
-msgid "Surface source is invalid (No Faces)."
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Surface source is invalid (no geometry)."
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:156
-msgid "Parent is not of type VisualInstance."
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Surface source is invalid (no faces)."
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:159
-msgid "Multimesh not present"
-msgstr ""
-
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:168
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Parent has no solid faces to populate."
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:187
-msgid "Couldn't map area"
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
+msgid "Couldn't map area."
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:311
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Select a Source Mesh:"
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:313
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Select a Target Surface:"
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:333
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Populate Surface"
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:337
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Populate MultiMesh"
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:354
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Target Surface:"
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:363
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Source Mesh:"
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:368
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "X-Axis"
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:369
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Y-Axis"
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:370
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Z-Axis"
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:372
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Mesh Up Axis:"
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:377
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Random Rotation:"
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:382
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Random Tilt:"
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:390
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Random Scale:"
 msgstr ""
 
-#:./tools/editor/plugins/multimesh_editor_plugin.cpp:409
+#: tools/editor/plugins/multimesh_editor_plugin.cpp
 msgid "Populate"
 msgstr ""
 
-#:./tools/editor/plugins/shader_editor_plugin.cpp:506
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Find.."
 msgstr ""
 
-#:./tools/editor/plugins/shader_editor_plugin.cpp:507
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Find Next"
 msgstr ""
 
-#:./tools/editor/plugins/shader_editor_plugin.cpp:508
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Replace.."
 msgstr ""
 
-#:./tools/editor/plugins/shader_editor_plugin.cpp:510
-msgid "Locate Symbol.."
-msgstr ""
-
-#:./tools/editor/plugins/shader_editor_plugin.cpp:511
+#: tools/editor/plugins/shader_editor_plugin.cpp
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Goto Line.."
 msgstr ""
 
-#:./tools/editor/plugins/shader_editor_plugin.cpp:530
+#: tools/editor/plugins/shader_editor_plugin.cpp
 msgid "Vertex"
 msgstr ""
 
-#:./tools/editor/plugins/shader_editor_plugin.cpp:534
+#: tools/editor/plugins/shader_editor_plugin.cpp
 msgid "Fragment"
 msgstr ""
 
-#:./tools/editor/plugins/shader_editor_plugin.cpp:538
+#: tools/editor/plugins/shader_editor_plugin.cpp
 msgid "Lighting"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:202
-msgid "Can't save theme to file: "
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Can't save theme to file:"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:476
+#: tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
 msgid "Add Item"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:484
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Add All Items"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:485
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Add All"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:498
+#: tools/editor/plugins/theme_editor_plugin.cpp
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
 msgid "Remove Item"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:600
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Add Class Items"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:604
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Remove Class Items"
+msgstr ""
+
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Create Template"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:643
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "CheckBox Radio1"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:647
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "CheckBox Radio2"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:654
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Item"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:656
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Check Item"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:657
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Checked Item"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:664
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Has"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:665
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Many"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:717
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Have,Many,Several,Options!"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:737
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Tab 1"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:740
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Tab 2"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:743
+#: tools/editor/plugins/theme_editor_plugin.cpp
 msgid "Tab 3"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:760
-msgid "Line Edit"
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Data Type:"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:794
-msgid "Open File Dialog"
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Icon"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:849
-msgid "Data Type:"
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Style"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:853
-msgid "Icon"
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Font"
 msgstr ""
 
-#:./tools/editor/plugins/theme_editor_plugin.cpp:854
-msgid "Style"
+#: tools/editor/plugins/theme_editor_plugin.cpp
+msgid "Color"
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_editor_plugin.cpp:182
+#: tools/editor/plugins/baked_light_editor_plugin.cpp
 msgid "BakedLightInstance does not contain a BakedLight resource."
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_editor_plugin.cpp:267
+#: tools/editor/plugins/baked_light_editor_plugin.cpp
 msgid "Bake!"
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_editor_plugin.cpp:292
+#: tools/editor/plugins/baked_light_editor_plugin.cpp
 msgid "Reset the lightmap octree baking process (start over)."
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_baker.cpp:731
-msgid "Parsing "
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Parsing %d Triangles:"
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_baker.cpp:738
-msgid "Triangle# "
+#: tools/editor/plugins/baked_light_baker.cpp
+msgid "Triangle #"
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_baker.cpp:1719
+#: tools/editor/plugins/baked_light_baker.cpp
 msgid "Light Baker Setup:"
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_baker.cpp:1746
+#: tools/editor/plugins/baked_light_baker.cpp
 msgid "Parsing Geometry"
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_baker.cpp:1751
+#: tools/editor/plugins/baked_light_baker.cpp
 msgid "Fixing Lights"
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_baker.cpp:1753
+#: tools/editor/plugins/baked_light_baker.cpp
 msgid "Making BVH"
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_baker.cpp:1755
+#: tools/editor/plugins/baked_light_baker.cpp
 msgid "Creating Light Octree"
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_baker.cpp:1757
+#: tools/editor/plugins/baked_light_baker.cpp
 msgid "Creating Octree Texture"
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_baker.cpp:2360
+#: tools/editor/plugins/baked_light_baker.cpp
 msgid "Transfer to Lightmaps:"
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_baker.cpp:2368
+#: tools/editor/plugins/baked_light_baker.cpp
 msgid "Allocating Texture #"
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_baker.cpp:2385
+#: tools/editor/plugins/baked_light_baker.cpp
 msgid "Baking Triangle #"
 msgstr ""
 
-#:./tools/editor/plugins/baked_light_baker.cpp:2508
+#: tools/editor/plugins/baked_light_baker.cpp
 msgid "Post-Processing Texture #"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:564
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Orthogonal"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:987
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Perspective"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Transform Aborted."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:999
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "View Plane Transform."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1006
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "X-Axis Transform."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1012
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Y-Axis Transform."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1018
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Z-Axis Transform."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1356
-msgid "Scaling to "
-msgstr ""
-
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1434
-msgid "Translating: "
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Scaling to %s%%."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1496
-msgid "Rotating "
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Rotating %s degrees."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1684
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Bottom View."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1685
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Bottom"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1690
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Top View."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1691
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Top"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1703
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Rear View."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1704
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Rear"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1709
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Front View."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1710
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Front"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1723
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Left View."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1724
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Left"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1728
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Right View."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1729
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Right"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1752
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Keying is disabled (no key inserted)."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:1768
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Animation Key Inserted."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2126
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Align with view"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2474
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Top (Num7)"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2475
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Bottom (Shift+Num7)"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2476
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Left (Num3)"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2477
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Right (Shift+Num3)"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2478
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Front (Num1)"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2479
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Rear (Shift+Num1)"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2481
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Perspective (Num5)"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2482
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Orthogonal (Num5)"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2488
+#: tools/editor/plugins/spatial_editor_plugin.cpp
+msgid "Environment"
+msgstr ""
+
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Audio Listener"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2490
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Gizmos"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2494
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Selection (F)"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2495
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Align with view (Ctrl+Shift+F)"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:2899
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "XForm Dialog"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3548
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "No scene selected to instance!"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3552
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Instance at Cursor"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3557
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Could not instance scene!"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3931
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Scale Mode (R)"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3964
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Local Coords"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3967
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Transform Dialog.."
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3978
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Use Default Light"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3979
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Use Default sRGB"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3990
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Display Normal"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3991
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Display Wireframe"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3992
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Display Overdraw"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3993
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Display Shadeless"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3995
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "View Origin"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:3996
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "View Grid"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4036
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Snap Settings"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4045
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Translate Snap:"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4049
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Rotate Snap (deg.):"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4053
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Scale Snap (%):"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4058
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Viewport Settings"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4070
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Default Light Normal:"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4095
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Ambient Light Color:"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4108
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Perspective FOV (deg.):"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4115
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "View Z-Near:"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4122
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "View Z-Far:"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4128
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Transform Change"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4131
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Translate:"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4144
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Rotate (deg.):"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4156
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Scale (ratio):"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4168
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Transform Type"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4176
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Pre"
 msgstr ""
 
-#:./tools/editor/plugins/spatial_editor_plugin.cpp:4177
+#: tools/editor/plugins/spatial_editor_plugin.cpp
 msgid "Post"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2412
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Save All"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2414
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "History Prev"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2415
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "History Next"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2434
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Indent Left"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2435
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Indent Right"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2436
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Toggle Comment"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2437
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Clone Down"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2440
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Complete Symbol"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2445
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Trim Trailing Whitespace"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Auto Indent"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2456
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Goto Function.."
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2471
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Debug"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2472
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Toggle Breakpoint"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2480
-msgid "Show Debugger"
-msgstr ""
-
-#:./tools/editor/plugins/script_editor_plugin.cpp:2481
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Keep Debugger Open"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2493
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Window"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2496
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Move Left"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2497
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Move Right"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2505
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Help"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2506
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Contextual"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2523
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Tutorials"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2526
-msgid "Open http://www.godotengine.org at tutorials section."
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid "Open https://godotengine.org at tutorials section."
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2529
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Classes"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2532
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Search the class hierarchy."
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2535
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Search Help"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2538
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Search the reference documentation."
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2546
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Go to previous edited document."
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2552
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Go to next edited document."
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2566
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Create Script"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2592
+#: tools/editor/plugins/script_editor_plugin.cpp
+msgid ""
+"The following files are newer on disk.\n"
+"What action should be taken?:"
+msgstr ""
+
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Reload"
 msgstr ""
 
-#:./tools/editor/plugins/script_editor_plugin.cpp:2594
+#: tools/editor/plugins/script_editor_plugin.cpp
 msgid "Resave"
 msgstr ""
 
-#:./tools/editor/plugins/style_box_editor_plugin.cpp:64
+#: tools/editor/plugins/style_box_editor_plugin.cpp
 msgid "StyleBox Preview:"
 msgstr ""
 
-#:./tools/editor/plugins/sample_editor_plugin.cpp:331
-msgid "Length: "
+#: tools/editor/plugins/sample_editor_plugin.cpp
+msgid "Length:"
+msgstr ""
+
+#: tools/editor/plugins/sample_editor_plugin.cpp
+msgid "%d frames"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:677
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change Scalar Constant"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:695
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change Vec Constant"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:708
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change RGB Constant"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:721
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change Scalar Operator"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:734
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change Vec Operator"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:746
-msgid "Change VecxScalar Operator"
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Vec Scalar Operator"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:759
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change RGB Operator"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:771
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Toggle Rot Only"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:784
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change Scalar Function"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:796
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change Vec Function"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:809
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change Scalar Uniform"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:827
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change Vec Uniform"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:865
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change RGB Uniform"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:905
-msgid "Change default value"
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Change Default Value"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:917
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change XForm Uniform"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:940
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change Texture Uniform"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:951
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change Cubemap Uniform"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:965
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change Comment"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1005
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Add/Remove to Color Ramp"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1007
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+#: tools/editor/plugins/color_ramp_editor_plugin.cpp
 msgid "Modify Color Ramp"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1041
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Add/Remove to Curve Map"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1043
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Modify Curve Map"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1061
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Change Input Name"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1113
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Connect Graph Nodes"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1155
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Disconnect Graph Nodes"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1173
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Remove Shader Graph Node"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1196
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Move Shader Graph Node"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1238
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Duplicate Graph Node(s)"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1275
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
 msgid "Delete Shader Graph Node(s)"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1430
-msgid "Scalar"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1443
-msgid "Vector"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1472
-msgid "RGB"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1476
-msgid "Alpha"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1485
-msgid "XForm"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1495
-msgid "Time"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1505
-msgid "ScreenTex"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1510
-msgid "UV: "
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1512
-msgid "UV"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1522
-msgid "ScalarOp"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1570
-msgid "VecOp"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1618
-msgid "VecScalarOp"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1660
-msgid "RGB Op"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1705
-msgid "XFMult"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1728
-msgid "XFVecMult"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1730
-msgid "RotOnly"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1761
-msgid "XFVecInvMult"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1796
-msgid "ScalarFunc"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1849
-msgid "VecFunc"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1885
-msgid "VecLength"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1902
-msgid "DotProduct"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1927
-msgid "Vec2Scalar"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1958
-msgid "Scalar2Vec"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:1989
-msgid "Vec2XForm"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2028
-msgid "XForm2Vec"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2060
-msgid "ScalarInterp"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2093
-msgid "VecInterp"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2177
-msgid "CurveMap"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2224
-msgid "ScalarUniform"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2241
-msgid "VectorUniform"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2268
-msgid "ColorUniform"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2292
-msgid "XFUniform"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2306
-msgid "TexUniform"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2381
-msgid "CanvasItemTex"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2415
-msgid "LightColor"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2417
-msgid "Diffuse"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2418
-msgid "Specular"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2419
-msgid "Emmision"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2422
-msgid "DiffuseAlpha"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2423
-msgid "NormalMapDepth"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2424
-msgid "SpecExp"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2425
-msgid "Glow"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2426
-msgid "ShadeParam"
-msgstr ""
-
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2427
-msgid "SpecularExp"
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Error: Cyclic Connection Link"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2428
-msgid "LightAlpha"
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Error: Missing Input Connections"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2429
-msgid "PointSize"
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp
+msgid "Add Shader Graph Node"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2430
-msgid "Discard"
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Create UV Map"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2451
-msgid "Comment"
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Transform UV Map"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2515
-msgid "Error: Cyclic Connection Link"
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Polygon 2D UV Editor"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2516
-msgid "Error: Missing Input Connections"
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Move Point"
 msgstr ""
 
-#:./tools/editor/plugins/shader_graph_editor_plugin.cpp:2576
-msgid "Add Shader Graph Node"
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Ctrl: Rotate"
 msgstr ""
 
-#:./tools/editor/plugins/polygon_2d_editor_plugin.cpp:108
-msgid "Create UV Map"
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Shift: Move All"
 msgstr ""
 
-#:./tools/editor/plugins/polygon_2d_editor_plugin.cpp:551
-msgid "Transform UV Map"
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+msgid "Shift+Ctrl: Scale"
 msgstr ""
 
-#:./tools/editor/plugins/polygon_2d_editor_plugin.cpp:854
-msgid "Polygon 2D UV Editor"
-msgstr ""
-
-#:./tools/editor/plugins/polygon_2d_editor_plugin.cpp:872
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
 msgid "Move Polygon"
 msgstr ""
 
-#:./tools/editor/plugins/polygon_2d_editor_plugin.cpp:873
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
 msgid "Rotate Polygon"
 msgstr ""
 
-#:./tools/editor/plugins/polygon_2d_editor_plugin.cpp:874
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
 msgid "Scale Polygon"
 msgstr ""
 
-#:./tools/editor/plugins/polygon_2d_editor_plugin.cpp:886
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
 msgid "Polygon->UV"
 msgstr ""
 
-#:./tools/editor/plugins/polygon_2d_editor_plugin.cpp:887
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
 msgid "UV->Polygon"
 msgstr ""
 
-#:./tools/editor/plugins/polygon_2d_editor_plugin.cpp:889
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
 msgid "Clear UV"
 msgstr ""
 
-#:./tools/editor/plugins/polygon_2d_editor_plugin.cpp:896
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
 msgid "Snap"
 msgstr ""
 
-#:./tools/editor/plugins/polygon_2d_editor_plugin.cpp:900
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
+#: tools/editor/plugins/sprite_region_editor_plugin.cpp
 msgid "Enable Snap"
 msgstr ""
 
-#:./tools/editor/plugins/polygon_2d_editor_plugin.cpp:905
+#: tools/editor/plugins/polygon_2d_editor_plugin.cpp
 msgid "Grid"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_region_editor_plugin.cpp:176
+#: tools/editor/plugins/sprite_region_editor_plugin.cpp
 msgid "Set region_rect"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_region_editor_plugin.cpp:423
+#: tools/editor/plugins/sprite_region_editor_plugin.cpp
 msgid "Sprite Region Editor"
 msgstr ""
 
-#:./tools/editor/plugins/resource_preloader_editor_plugin.cpp:73
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
 msgid "ERROR: Couldn't load resource!"
 msgstr ""
 
-#:./tools/editor/plugins/resource_preloader_editor_plugin.cpp:90
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
 msgid "Add Resource"
 msgstr ""
 
-#:./tools/editor/plugins/resource_preloader_editor_plugin.cpp:137
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
 msgid "Rename Resource"
 msgstr ""
 
-#:./tools/editor/plugins/resource_preloader_editor_plugin.cpp:157
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Delete Resource"
 msgstr ""
 
-#:./tools/editor/plugins/resource_preloader_editor_plugin.cpp:170
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
 msgid "Resource clipboard is empty!"
 msgstr ""
 
-#:./tools/editor/plugins/resource_preloader_editor_plugin.cpp:209
-msgid "Confirm..."
-msgstr ""
-
-#:./tools/editor/plugins/resource_preloader_editor_plugin.cpp:210
-msgid "Remove Resource '"
-msgstr ""
-
-#:./tools/editor/plugins/resource_preloader_editor_plugin.cpp:211
-msgid "Cancel"
-msgstr ""
-
-#:./tools/editor/plugins/resource_preloader_editor_plugin.cpp:412
+#: tools/editor/plugins/resource_preloader_editor_plugin.cpp
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Load Resource"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:79
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "ERROR: Couldn't load frame resource!"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:96
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Add Frame"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:199
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Resource clipboard is empty or not a texture!"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:208
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Paste Frame"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:236
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Add Empty"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:452
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Change Animation Loop"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:466
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Change Animation FPS"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:533
-msgid ": (empty)"
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+msgid "(empty)"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:736
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Animations"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:763
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Speed (FPS):"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:770
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Loop"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:779
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Animation Frames"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:797
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Insert Empty (Before)"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:801
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Insert Empty (After)"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:805
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Up"
 msgstr ""
 
-#:./tools/editor/plugins/sprite_frames_editor_plugin.cpp:809
+#: tools/editor/plugins/sprite_frames_editor_plugin.cpp
 msgid "Down"
 msgstr ""
 
-#:./tools/editor/plugins/navigation_polygon_editor_plugin.cpp:42
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
 msgid "Create Navigation Polygon"
 msgstr ""
 
-#:./tools/editor/plugins/navigation_polygon_editor_plugin.cpp:334
+#: tools/editor/plugins/navigation_polygon_editor_plugin.cpp
 msgid "Remove Poly And Point"
 msgstr ""
 
-#:./tools/editor/plugins/collision_shape_2d_editor_plugin.cpp:183
+#: tools/editor/plugins/collision_shape_2d_editor_plugin.cpp
 msgid "Set Handle"
 msgstr ""
 
-#:./tools/editor/plugins/particles_2d_editor_plugin.cpp:69
-msgid "Error loading image: "
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
+msgid "Error loading image:"
 msgstr ""
 
-#:./tools/editor/plugins/particles_2d_editor_plugin.cpp:95
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
 msgid "No pixels with transparency > 128 in image.."
 msgstr ""
 
-#:./tools/editor/plugins/particles_2d_editor_plugin.cpp:113
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
 msgid "Set Emission Mask"
 msgstr ""
 
-#:./tools/editor/plugins/particles_2d_editor_plugin.cpp:133
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
 msgid "Clear Emission Mask"
 msgstr ""
 
-#:./tools/editor/plugins/particles_2d_editor_plugin.cpp:174
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
 msgid "Load Emission Mask"
 msgstr ""
 
-#:./tools/editor/plugins/particles_2d_editor_plugin.cpp:193
+#: tools/editor/plugins/particles_2d_editor_plugin.cpp
 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
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
 msgid "Creating Mesh Library"
 msgstr ""
 
-#:./tools/editor/plugins/cube_grid_theme_editor_plugin.cpp:196
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
 msgid "Thumbnail.."
 msgstr ""
 
-#:./tools/editor/plugins/cube_grid_theme_editor_plugin.cpp:259
-msgid "Remove Item "
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+msgid "Remove item %d?"
 msgstr ""
 
-#:./tools/editor/plugins/cube_grid_theme_editor_plugin.cpp:291
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Import Scene"
 msgstr ""
 
-#:./tools/editor/plugins/cube_grid_theme_editor_plugin.cpp:307
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
 msgid "Remove Selected Item"
 msgstr ""
 
-#:./tools/editor/plugins/cube_grid_theme_editor_plugin.cpp:309
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
 msgid "Import from Scene"
 msgstr ""
 
-#:./tools/editor/plugins/cube_grid_theme_editor_plugin.cpp:310
+#: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp
 msgid "Update from Scene"
 msgstr ""
 
-#:./tools/editor/plugins/particles_editor_plugin.cpp:60
+#: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Node does not contain geometry."
 msgstr ""
 
-#:./tools/editor/plugins/particles_editor_plugin.cpp:69
+#: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Node does not contain geometry (faces)."
 msgstr ""
 
-#:./tools/editor/plugins/particles_editor_plugin.cpp:222
+#: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Faces contain no area!"
 msgstr ""
 
-#:./tools/editor/plugins/particles_editor_plugin.cpp:252
-msgid "No Faces!"
+#: tools/editor/plugins/particles_editor_plugin.cpp
+msgid "No faces!"
 msgstr ""
 
-#:./tools/editor/plugins/particles_editor_plugin.cpp:352
+#: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Generate AABB"
 msgstr ""
 
-#:./tools/editor/plugins/particles_editor_plugin.cpp:354
+#: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Create Emitter From Mesh"
 msgstr ""
 
-#:./tools/editor/plugins/particles_editor_plugin.cpp:355
+#: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Create Emitter From Node"
 msgstr ""
 
-#:./tools/editor/plugins/particles_editor_plugin.cpp:356
+#: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Clear Emitter"
 msgstr ""
 
-#:./tools/editor/plugins/particles_editor_plugin.cpp:361
+#: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Create Emitter"
 msgstr ""
 
-#:./tools/editor/plugins/particles_editor_plugin.cpp:365
+#: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Emission Positions:"
 msgstr ""
 
-#:./tools/editor/plugins/particles_editor_plugin.cpp:382
+#: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Emission Fill:"
 msgstr ""
 
-#:./tools/editor/plugins/particles_editor_plugin.cpp:389
+#: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Surface"
 msgstr ""
 
-#:./tools/editor/plugins/particles_editor_plugin.cpp:390
+#: tools/editor/plugins/particles_editor_plugin.cpp
 msgid "Volume"
 msgstr ""
 
-#:./tools/editor/plugins/item_list_editor_plugin.cpp:132
-msgid "Item "
+#: tools/editor/plugins/item_list_editor_plugin.cpp
+msgid "Item %d"
 msgstr ""
 
-#:./tools/editor/plugins/item_list_editor_plugin.cpp:302
+#: tools/editor/plugins/item_list_editor_plugin.cpp
 msgid "Items"
 msgstr ""
 
-#:./tools/editor/plugins/item_list_editor_plugin.cpp:307
+#: tools/editor/plugins/item_list_editor_plugin.cpp
 msgid "Item List Editor"
 msgstr ""
 
-#:./tools/editor/plugins/color_ramp_editor_plugin.cpp:66
+#: tools/editor/plugins/color_ramp_editor_plugin.cpp
 msgid "Add/Remove Color Ramp Point"
 msgstr ""
 
-#:./tools/editor/plugins/path_editor_plugin.cpp:42
+#: tools/editor/plugins/path_editor_plugin.cpp
 msgid "Curve Point #"
 msgstr ""
 
-#:./tools/editor/plugins/path_editor_plugin.cpp:151
+#: tools/editor/plugins/path_editor_plugin.cpp
 msgid "Set Curve Point Pos"
 msgstr ""
 
-#:./tools/editor/plugins/path_editor_plugin.cpp:182
+#: tools/editor/plugins/path_editor_plugin.cpp
 msgid "Set Curve In Pos"
 msgstr ""
 
-#:./tools/editor/plugins/path_editor_plugin.cpp:194
+#: tools/editor/plugins/path_editor_plugin.cpp
 msgid "Set Curve Out Pos"
 msgstr ""
 
-#:./tools/editor/plugins/path_editor_plugin.cpp:369
+#: tools/editor/plugins/path_editor_plugin.cpp
 msgid "Split Path"
 msgstr ""
 
-#:./tools/editor/plugins/path_editor_plugin.cpp:389
+#: tools/editor/plugins/path_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
 msgid "Add Point to Curve"
 msgstr ""
 
-#:./tools/editor/plugins/path_editor_plugin.cpp:414
+#: tools/editor/plugins/path_editor_plugin.cpp
 msgid "Remove Path Point"
 msgstr ""
 
-#:./tools/editor/plugins/path_editor_plugin.cpp:563
-msgid "Delete Point."
+#: tools/editor/plugins/path_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Select Points"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Shift+Drag: Select Control Points"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Click: Add Point"
 msgstr ""
 
-#:./tools/editor/plugins/path_editor_plugin.cpp:569
+#: tools/editor/plugins/path_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Right Click: Delete Point"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Add Point (in empty space)"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Split Segment (in curve)"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
+msgid "Delete Point"
+msgstr ""
+
+#: tools/editor/plugins/path_editor_plugin.cpp
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
 msgid "Close Curve"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:30
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Mesh is empty!"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:59
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Create Static Trimesh Body"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:61
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Create Static Convex Body"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:113
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "This doesn't work on scene root!"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:132
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Create Trimesh Shape"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:134
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Create Convex Shape"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:159
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Create Navigation Mesh"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:181
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "MeshInstance lacks a Mesh!"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:189
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Could not create outline!"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:203
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Create Outline"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:228
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Create Trimesh Static Body"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:229
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Create Convex Static Body"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:231
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Create Trimesh Collision Sibling"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:232
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Create Convex Collision Sibling"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:236
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Create Outline Mesh.."
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:241
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Create Outline Mesh"
 msgstr ""
 
-#:./tools/editor/plugins/mesh_editor_plugin.cpp:253
+#: tools/editor/plugins/mesh_editor_plugin.cpp
 msgid "Outline Size:"
 msgstr ""
 
-#:./tools/editor/plugins/tile_set_editor_plugin.cpp:178
-msgid "Could not find tile: "
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
+msgid "Could not find tile:"
 msgstr ""
 
-#:./tools/editor/plugins/tile_set_editor_plugin.cpp:197
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
 msgid "Item name or ID:"
 msgstr ""
 
-#:./tools/editor/plugins/tile_set_editor_plugin.cpp:202
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
 msgid "Create from scene?"
 msgstr ""
 
-#:./tools/editor/plugins/tile_set_editor_plugin.cpp:207
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
 msgid "Merge from scene?"
 msgstr ""
 
-#:./tools/editor/plugins/tile_set_editor_plugin.cpp:241
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
 msgid "Create from Scene"
 msgstr ""
 
-#:./tools/editor/plugins/tile_set_editor_plugin.cpp:242
+#: tools/editor/plugins/tile_set_editor_plugin.cpp
 msgid "Merge from Scene"
 msgstr ""
 
-#:./tools/editor/plugins/tile_set_editor_plugin.cpp:257
-msgid "Error"
-msgstr ""
-
-#:./tools/editor/plugins/path_2d_editor_plugin.cpp:116
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
 msgid "Remove Point from Curve"
 msgstr ""
 
-#:./tools/editor/plugins/path_2d_editor_plugin.cpp:193
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
 msgid "Move Point in Curve"
 msgstr ""
 
-#:./tools/editor/plugins/path_2d_editor_plugin.cpp:203
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
 msgid "Move In-Control in Curve"
 msgstr ""
 
-#:./tools/editor/plugins/path_2d_editor_plugin.cpp:213
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
 msgid "Move Out-Control in Curve"
 msgstr ""
 
-#:./tools/editor/plugins/path_2d_editor_plugin.cpp:646
+#: tools/editor/plugins/path_2d_editor_plugin.cpp
 msgid "Select Control Points (Shift+Drag)"
 msgstr ""
 
-#:./tools/editor/plugins/animation_player_editor_plugin.h:206
-msgid "Anim"
-msgstr ""
-
-#:./tools/editor/plugins/animation_tree_editor_plugin.h:183
-msgid "AnimTree"
-msgstr ""
-
-#:./tools/editor/plugins/sprite_region_editor_plugin.h:122
-msgid "SpriteRegion"
-msgstr ""
-
-#:./tools/editor/plugins/stream_editor_plugin.h:72
-msgid "Stream"
-msgstr ""
-
-#:./tools/editor/plugins/control_editor_plugin.h:128
-msgid "GUI"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:57
-msgid "FixBorder"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:58
-msgid "AlphBit"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:59
-msgid "ExtComp"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:60
-msgid "NoMipMap"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:61
-msgid "Repeat"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:62
-msgid "Filter"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:63
-msgid "PMAlpha"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:64
-msgid "ToLinear"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:65
-msgid "ToRG"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:66
-msgid "Anisoropic"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:176
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Uncompressed"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:177
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Compress Lossless (PNG)"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:178
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Compress Lossy (WebP)"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:179
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Compress (VRAM)"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:182
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Texture Format"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:202
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Texture Compression Quality (WebP):"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:224
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Texture Options"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:227
-msgid "NOTICE: You are not forced to import textures for 2D projects. Just copy your .jpg or .png files to your project, and change export options later. Atlases can be generated on export too."
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid ""
+"NOTICE: You are not forced to import textures for 2D projects. Just copy "
+"your .jpg or .png files to your project, and change export options later. "
+"Atlases can be generated on export too."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:332
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Please specify some files!"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:340
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
 msgid "Target path is empty."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:346
-msgid "Target path must be full resource path."
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+msgid "Target path must be a complete resource path."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:353
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
 msgid "Target path must exist."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:362
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "At least one file needed for Atlas."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:385
-msgid "Error importing: "
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Error importing:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:394
-msgid "Only one file is required for large texture"
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Only one file is required for large texture."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:502
-msgid "PackedTexture"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:539
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Import Textures"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:549
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Source Texture:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:551
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Source Texture(s):"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:562
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Crop empty space."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:574
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
 msgid "Target Path:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:582
-msgid "Max Texture size:"
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Max Texture Size:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:585
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Cell Size:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:635
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Large Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Base Atlas Texture"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
 msgid "Accept"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:650
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Import Textures for Atlas (2D)"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:657
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Import Large Textures (2D)"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:665
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Import Textures for 2D"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:672
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Import Textures for 3D"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1003
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Import Large Texture"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1005
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Load Source Image"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1012
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Slicing"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1041
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Inserting"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1056
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Saving"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1060
-msgid "Couldn't save large texture: "
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Couldn't save large texture:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1075
-msgid "Build Atlas For: "
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Build Atlas For:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1084
-msgid "Loading Image: "
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Loading Image:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1089
-msgid "Couldn't load image: "
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Couldn't load image:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1098
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Converting Images"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1157
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Cropping Images"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1181
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
 msgid "Blitting Images"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1294
-msgid "Couldn't save atlas image: "
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Couldn't save atlas image:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_texture_import_plugin.cpp:1436
-msgid "Couldn't save converted texture: "
+#: tools/editor/io_plugins/editor_texture_import_plugin.cpp
+msgid "Couldn't save converted texture:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_translation_import_plugin.cpp:67
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
 msgid "Invalid source!"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_translation_import_plugin.cpp:78
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
 msgid "Invalid translation source!"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_translation_import_plugin.cpp:89
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
 msgid "Column"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_translation_import_plugin.cpp:234
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
 msgid "No items to import!"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_translation_import_plugin.cpp:239
-msgid "No target path!!"
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "No target path!"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_translation_import_plugin.cpp:243
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
 msgid "Import Translations"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_translation_import_plugin.cpp:261
-msgid "Couldnt import!"
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
+msgid "Couldn't import!"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_translation_import_plugin.cpp:298
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
 msgid "Import Translation"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_translation_import_plugin.cpp:310
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
 msgid "Source CSV:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_translation_import_plugin.cpp:316
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
 msgid "Ignore First Row"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_translation_import_plugin.cpp:342
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
 msgid "Compress"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_translation_import_plugin.cpp:347
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
 msgid "Add to Project (engine.cfg)"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_translation_import_plugin.cpp:374
+#: tools/editor/io_plugins/editor_translation_import_plugin.cpp
 msgid "Import Languages:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:320
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "New Clip"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:444
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Animation Options"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:449
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Flags"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:469
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Bake FPS:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:480
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Optimizer"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:490
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Max Linear Error"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:497
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Max Angular Error"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:504
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Max Angle"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:513
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Clips"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:525
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Start(s)"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:526
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "End(s)"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:536
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Filters"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:677
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Source path is empty."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:724
-msgid "Couldn't load Post-Import Script."
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Couldn't load post-import script."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:733
-msgid "Invalid/Broken Script for Post-Import."
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Invalid/broken script for post-import."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Error importing scene."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1038
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Import 3D Scene"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1048
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Source Scene:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1074
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Same as Target Scene"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1075
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Shared"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1077
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Target Texture Folder:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1132
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+msgid "Options:"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Post-Process Script:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1166
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Overwrite Existing Scene"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1168
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Overwrite Existing, Keep Materials"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Keep Existing, Merge with New"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1169
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Keep Existing, Ignore New"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1170
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "This Time:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1177
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Next Time:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1214
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "The Following Files are Missing:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1216
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Import Anyway"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1222
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Cancel"
+msgstr ""
+
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Import & Open"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:1226
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Edited scene has not been saved, open imported scene anyway?"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:2343
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Importing Scene.."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:2729
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Running Custom Script.."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:2738
-msgid "Couldn't load post-import script: '"
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Couldn't load post-import script:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:2744
-msgid "Invalid/Broken Script for Post-Import: '"
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Invalid/broken script for post-import:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:2754
-msgid "Error running Post-Import script: '"
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Error running post-import script:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:2783
-msgid "Import Img: "
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Import Image:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:2789
-msgid "Can't import a file over itself: '"
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Can't import a file over itself:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:2794
-msgid "Couldn't localize path: '"
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
+msgid "Couldn't localize path: %s (already local)"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:2854
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Merging.."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_scene_import_plugin.cpp:2903
+#: tools/editor/io_plugins/editor_scene_import_plugin.cpp
 msgid "Saving.."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:512
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "No source font file!"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:518
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "No target font resource!"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:530
-msgid "Can't load/process source font"
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Can't load/process source font."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:538
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Couldn't save font."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:627
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Source Font:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:629
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Source Font Size:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:644
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Dest Resource:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:647
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "The quick brown fox jumps over the lazy dog."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:660
-msgid "Test: "
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Test:"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:685
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Font Import"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:890
-msgid "Path: "
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid ""
+"This file is already a Godot font file, please supply a BMFont type file "
+"instead."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:915
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Failed opening as BMFont file."
+msgstr ""
+
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Error initializing FreeType."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:922
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Unknown font format."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:926
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
 msgid "Error loading font."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:942
-msgid "Invalid font size. "
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Invalid font size."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_font_import_plugin.cpp:989
-msgid "Invalid font custom source. "
+#: tools/editor/io_plugins/editor_font_import_plugin.cpp
+msgid "Invalid font custom source."
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_sample_import_plugin.cpp:254
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
 msgid "No samples to import!"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_sample_import_plugin.cpp:295
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
 msgid "Save path is empty!"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_sample_import_plugin.cpp:334
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
 msgid "Import Audio Samples"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_sample_import_plugin.cpp:342
+#: tools/editor/io_plugins/editor_sample_import_plugin.cpp
 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
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
 msgid "No meshes to import!"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_mesh_import_plugin.cpp:264
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
 msgid "Single Mesh Import"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_mesh_import_plugin.cpp:272
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
 msgid "Source Mesh(es):"
 msgstr ""
 
-#:./tools/editor/io_plugins/editor_mesh_import_plugin.cpp:365
-msgid "Surface "
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:510
-msgid "DIFFUSE"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:512
-msgid "SPECULAR"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:514
-msgid "SHININESS"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:518
-msgid "EMISSIVE"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:573
-msgid "COLORPACKED"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:575
-msgid "TANGENT"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:579
-msgid "BINORMAL"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:590
-msgid "TEXCOORD"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:592
-msgid "BLENDWEIGHT"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:802
-msgid "LINES"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:804
-msgid "POINTS"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:806
-msgid "TRIANGLE_STRIP"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:808
-msgid "LINE_STRIP"
-msgstr ""
-
-#:./tools/editor/io_plugins/editor_scene_importer_fbxconv.cpp:1059
-msgid "G3DJ"
+#: tools/editor/io_plugins/editor_mesh_import_plugin.cpp
+msgid "Surface %d"
 msgstr ""