Merge remote-tracking branch 'origin/master'

1 files changed, 13 insertions, 13 deletions

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");