2
0
Эх сурвалжийг харах

Merge pull request #5093 from DimOkGamer/more_translatable_strings

Fixed localization in file dialogs
Juan Linietsky 9 жил өмнө
parent
commit
040c87ea7b

+ 18 - 18
scene/gui/file_dialog.cpp

@@ -258,7 +258,7 @@ void FileDialog::_action_pressed() {
 		}
 
 		if (dir_access->file_exists(f)) {
-			confirm_save->set_text("File Exists, Overwrite?");
+			confirm_save->set_text(RTR("File Exists, Overwrite?"));
 			confirm_save->popup_centered(Size2(200,80));
 		} else {
 
@@ -463,7 +463,7 @@ void FileDialog::update_filters() {
 		if (max_filters<filters.size())
 			all_filters+=", ...";
 
-		filter->add_item("All Recognized ( "+all_filters+" )");
+		filter->add_item(RTR("All Recognized")+" ( "+all_filters+" )");
 	}
 	for(int i=0;i<filters.size();i++) {
 
@@ -475,7 +475,7 @@ void FileDialog::update_filters() {
 			filter->add_item("( "+flt+" )");
 	}
 
-	filter->add_item("All Files (*)");
+	filter->add_item(RTR("All Files (*)"));
 
 }
 
@@ -548,11 +548,11 @@ void FileDialog::set_mode(Mode p_mode) {
 	mode=p_mode;
 	switch(mode) {
 
-		case MODE_OPEN_FILE: get_ok()->set_text("Open"); set_title("Open a File"); makedir->hide(); break;
-		case MODE_OPEN_FILES: get_ok()->set_text("Open"); set_title("Open File(s)"); makedir->hide(); break;
-		case MODE_OPEN_DIR: get_ok()->set_text("Open"); set_title("Open a Directory"); makedir->show(); break;
-		case MODE_OPEN_ANY: get_ok()->set_text("Open"); set_title("Open a File or Directory"); makedir->show(); break;
-		case MODE_SAVE_FILE: get_ok()->set_text("Save"); set_title("Save a File"); makedir->show(); break;
+		case MODE_OPEN_FILE: get_ok()->set_text(RTR("Open")); set_title(RTR("Open a File")); makedir->hide(); break;
+		case MODE_OPEN_FILES: get_ok()->set_text(RTR("Open")); set_title(RTR("Open File(s)")); makedir->hide(); break;
+		case MODE_OPEN_DIR: get_ok()->set_text(RTR("Open")); set_title(RTR("Open a Directory")); makedir->show(); break;
+		case MODE_OPEN_ANY: get_ok()->set_text(RTR("Open")); set_title(RTR("Open a File or Directory")); makedir->show(); break;
+		case MODE_SAVE_FILE: get_ok()->set_text(RTR("Save")); set_title(RTR("Save a File")); makedir->show(); break;
 	}
 
 	if (mode==MODE_OPEN_FILES) {
@@ -742,7 +742,7 @@ FileDialog::FileDialog() {
 	set_child_rect(vbc);
 
 	mode=MODE_SAVE_FILE;
-	set_title("Save a File");
+	set_title(RTR("Save a File"));
 
 	dir = memnew(LineEdit);
 	HBoxContainer *pathhb = memnew( HBoxContainer );
@@ -758,24 +758,24 @@ FileDialog::FileDialog() {
 	drives->connect("item_selected",this,"_select_drive");
 
 	makedir = memnew( Button );
-	makedir->set_text("Create Folder");
+	makedir->set_text(RTR("Create Folder"));
 	makedir->connect("pressed",this,"_make_dir");
 	pathhb->add_child(makedir);
 
-	vbc->add_margin_child("Path:",pathhb);
+	vbc->add_margin_child(RTR("Path:"),pathhb);
 
 	tree = memnew(Tree);
 	tree->set_hide_root(true);
-	vbc->add_margin_child("Directories & Files:",tree,true);
+	vbc->add_margin_child(RTR("Directories & Files:"),tree,true);
 
 	file = memnew(LineEdit);
 	//add_child(file);
-	vbc->add_margin_child("File:",file);
+	vbc->add_margin_child(RTR("File:"),file);
 
 
 	filter = memnew( OptionButton );
 	//add_child(filter);
-	vbc->add_margin_child("Filter:",filter);
+	vbc->add_margin_child(RTR("Filter:"),filter);
 	filter->set_clip_text(true);//too many extensions overflow it
 
 	dir_access = DirAccess::create(DirAccess::ACCESS_RESOURCES);
@@ -800,21 +800,21 @@ FileDialog::FileDialog() {
 	confirm_save->connect("confirmed", this,"_save_confirm_pressed");
 
 	makedialog = memnew( ConfirmationDialog );
-	makedialog->set_title("Create Folder");
+	makedialog->set_title(RTR("Create Folder"));
 	VBoxContainer *makevb= memnew( VBoxContainer );
 	makedialog->add_child(makevb);
 	makedialog->set_child_rect(makevb);
 	makedirname = memnew( LineEdit );
-	makevb->add_margin_child("Name:",makedirname);
+	makevb->add_margin_child(RTR("Name:"),makedirname);
 	add_child(makedialog);
 	makedialog->register_text_enter(makedirname);
 	makedialog->connect("confirmed",this,"_make_dir_confirm");
 	mkdirerr = memnew( AcceptDialog );
-	mkdirerr->set_text("Could not create folder.");
+	mkdirerr->set_text(RTR("Could not create folder."));
 	add_child(mkdirerr);
 
 	exterr = memnew( AcceptDialog );
-	exterr->set_text("Must use a valid extension.");
+	exterr->set_text(RTR("Must use a valid extension."));
 	add_child(exterr);
 
 

+ 1 - 1
tools/editor/editor_log.cpp

@@ -174,7 +174,7 @@ EditorLog::EditorLog() {
 	HBoxContainer *hb = memnew( HBoxContainer );
 	vb->add_child(hb);
 	title = memnew( Label );
-	title->set_text(" Output:");
+	title->set_text(TTR(" Output:"));
 	title->set_h_size_flags(SIZE_EXPAND_FILL);
 	hb->add_child(title);
 

+ 1 - 1
tools/editor/editor_node.cpp

@@ -1937,7 +1937,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("No main scene has ever been defined.\nSelect one from \"Project Settings\" under the 'application' category.");
+			accept->set_text(TTR("No main scene has ever been defined.\nSelect one from \"Project Settings\" under the 'application' category."));
 			accept->popup_centered_minsize();
 			return;
 		}

+ 2 - 2
tools/editor/project_manager.cpp

@@ -866,10 +866,10 @@ ProjectManager::ProjectManager() {
 	panel->add_child(vb);
 	vb->set_area_as_parent_rect(20);
 
-	OS::get_singleton()->set_window_title(_MKSTR(VERSION_NAME)" - Project Manager");
+	OS::get_singleton()->set_window_title(_MKSTR(VERSION_NAME)+TTR(" - Project Manager"));
 
 	Label *l = memnew( Label );
-	l->set_text(_MKSTR(VERSION_NAME)" - Project Manager");
+	l->set_text(_MKSTR(VERSION_NAME)+TTR(" - Project Manager"));
 	l->add_font_override("font",get_font("large","Fonts"));
 	l->set_align(Label::ALIGN_CENTER);
 	vb->add_child(l);

+ 2 - 2
tools/translations/ru.po

@@ -227,7 +227,7 @@ msgstr "Ок"
 
 #: scene/gui/dialogs.cpp
 msgid "Alert!"
-msgstr "Тревога!"
+msgstr "Внимание!"
 
 #: scene/gui/dialogs.cpp
 msgid "Please Confirm..."
@@ -1225,7 +1225,7 @@ msgstr "Сохранить ресурс как.."
 
 #: tools/editor/editor_node.cpp tools/editor/scene_tree_dock.cpp
 msgid "I see.."
-msgstr "Понимаю.."
+msgstr "Ясно.."
 
 #: tools/editor/editor_node.cpp
 msgid "Can't open file for writing:"