浏览代码

Merge pull request #34811 from timothyqiu/i18n

Makes more strings translatable
Rémi Verschelde 5 年之前
父节点
当前提交
118aaa55f9

+ 4 - 4
editor/editor_asset_installer.cpp

@@ -195,7 +195,7 @@ void EditorAssetInstaller::open(const String &p_path, int p_depth) {
 			String res_path = "res://" + path;
 			if (FileAccess::exists(res_path)) {
 				ti->set_custom_color(0, get_color("error_color", "Editor"));
-				ti->set_tooltip(0, res_path + " (Already Exists)");
+				ti->set_tooltip(0, vformat(TTR("%s (Already Exists)"), res_path));
 				ti->set_checked(0, false);
 			} else {
 				ti->set_tooltip(0, res_path);
@@ -288,11 +288,11 @@ void EditorAssetInstaller::ok_pressed() {
 	unzClose(pkg);
 
 	if (failed_files.size()) {
-		String msg = "The following files failed extraction from package:\n\n";
+		String msg = TTR("The following files failed extraction from package:") + "\n\n";
 		for (int i = 0; i < failed_files.size(); i++) {
 
 			if (i > 15) {
-				msg += "\nAnd " + itos(failed_files.size() - i) + " more files.";
+				msg += "\n" + vformat(TTR("And %s more files."), itos(failed_files.size() - i));
 				break;
 			}
 			msg += failed_files[i];
@@ -317,7 +317,7 @@ EditorAssetInstaller::EditorAssetInstaller() {
 	add_child(vb);
 
 	tree = memnew(Tree);
-	vb->add_margin_child("Package Contents:", tree, true);
+	vb->add_margin_child(TTR("Package Contents:"), tree, true);
 	tree->connect("item_edited", this, "_item_edited");
 
 	error = memnew(AcceptDialog);

+ 1 - 1
editor/editor_audio_buses.cpp

@@ -1290,7 +1290,7 @@ void EditorAudioBuses::_file_dialog_callback(const String &p_string) {
 		Error err = ResourceSaver::save(p_string, AudioServer::get_singleton()->generate_bus_layout());
 
 		if (err != OK) {
-			EditorNode::get_singleton()->show_warning("Error saving file: " + p_string);
+			EditorNode::get_singleton()->show_warning(vformat(TTR("Error saving file: %s"), p_string));
 			return;
 		}
 

+ 3 - 3
editor/plugins/cpu_particles_2d_editor_plugin.cpp

@@ -296,9 +296,9 @@ CPUParticles2DEditorPlugin::CPUParticles2DEditorPlugin(EditorNode *p_node) {
 	emission_mask->add_child(emvb);
 	emission_mask_mode = memnew(OptionButton);
 	emvb->add_margin_child(TTR("Emission Mask"), emission_mask_mode);
-	emission_mask_mode->add_item("Solid Pixels", EMISSION_MODE_SOLID);
-	emission_mask_mode->add_item("Border Pixels", EMISSION_MODE_BORDER);
-	emission_mask_mode->add_item("Directed Border Pixels", EMISSION_MODE_BORDER_DIRECTED);
+	emission_mask_mode->add_item(TTR("Solid Pixels"), EMISSION_MODE_SOLID);
+	emission_mask_mode->add_item(TTR("Border Pixels"), EMISSION_MODE_BORDER);
+	emission_mask_mode->add_item(TTR("Directed Border Pixels"), EMISSION_MODE_BORDER_DIRECTED);
 	emission_colors = memnew(CheckBox);
 	emission_colors->set_text(TTR("Capture from Pixel"));
 	emvb->add_margin_child(TTR("Emission Colors"), emission_colors);

+ 3 - 3
editor/plugins/particles_2d_editor_plugin.cpp

@@ -424,9 +424,9 @@ Particles2DEditorPlugin::Particles2DEditorPlugin(EditorNode *p_node) {
 	emission_mask->add_child(emvb);
 	emission_mask_mode = memnew(OptionButton);
 	emvb->add_margin_child(TTR("Emission Mask"), emission_mask_mode);
-	emission_mask_mode->add_item("Solid Pixels", EMISSION_MODE_SOLID);
-	emission_mask_mode->add_item("Border Pixels", EMISSION_MODE_BORDER);
-	emission_mask_mode->add_item("Directed Border Pixels", EMISSION_MODE_BORDER_DIRECTED);
+	emission_mask_mode->add_item(TTR("Solid Pixels"), EMISSION_MODE_SOLID);
+	emission_mask_mode->add_item(TTR("Border Pixels"), EMISSION_MODE_BORDER);
+	emission_mask_mode->add_item(TTR("Directed Border Pixels"), EMISSION_MODE_BORDER_DIRECTED);
 	emission_colors = memnew(CheckBox);
 	emission_colors->set_text(TTR("Capture from Pixel"));
 	emvb->add_margin_child(TTR("Emission Colors"), emission_colors);

+ 1 - 3
scene/gui/color_picker.cpp

@@ -573,9 +573,7 @@ void ColorPicker::_preset_input(const Ref<InputEvent> &p_event) {
 		}
 		if (index < 0 || index >= presets.size())
 			return;
-		preset->set_tooltip("Color: #" + presets[index].to_html(presets[index].a < 1) + "\n"
-																						"LMB: Set color\n"
-																						"RMB: Remove preset");
+		preset->set_tooltip(vformat(RTR("Color: #%s\nLMB: Set color\nRMB: Remove preset"), presets[index].to_html(presets[index].a < 1)));
 	}
 }