Browse Source

i18n: Use %d instead of %i in vformat

Fixes #4742.
Rémi Verschelde 9 years ago
parent
commit
be053e6286

+ 1 - 1
tools/editor/animation_editor.cpp

@@ -3115,7 +3115,7 @@ void AnimationKeyEditor::_query_insert(const InsertData& p_id) {
 			if (insert_data.size()==1)
 				insert_confirm->set_text(vformat(TTR("Create NEW track for %s and insert key?"),p_id.query));
 			else
-				insert_confirm->set_text(vformat(TTR("Create %i NEW tracks and insert keys?"),insert_data.size()));
+				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();

+ 1 - 1
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(vformat(TTR("Replaced %i ocurrence(s)."),rc));
+		error_label->set_text(vformat(TTR("Replaced %d ocurrence(s)."),rc));
 
 
 		//hide();

+ 1 - 1
tools/editor/dependency_editor.cpp

@@ -523,7 +523,7 @@ void OrphanResourcesDialog::ok_pressed() {
 	if (paths.empty())
 		return;
 
-	delete_confirm->set_text(vformat(TTR("Permanently delete %i item(s)? (No undo!)"),paths.size()));
+	delete_confirm->set_text(vformat(TTR("Permanently delete %d item(s)? (No undo!)"),paths.size()));
 	delete_confirm->popup_centered_minsize();
 }
 

+ 2 - 2
tools/editor/editor_node.cpp

@@ -4955,7 +4955,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(vformat(TTR("%i more file(s)"), p_files.size()-max_files));
+		label->set_text(vformat(TTR("%d more file(s)"), p_files.size()-max_files));
 		files->add_child(label);
 
 	}
@@ -4986,7 +4986,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(vformat(TTR("%i more file(s) or folder(s)"), p_files.size()-max_files));
+		label->set_text(vformat(TTR("%d more file(s) or folder(s)"), p_files.size()-max_files));
 		files->add_child(label);
 
 	}

+ 2 - 2
tools/editor/io_plugins/editor_mesh_import_plugin.cpp

@@ -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=vformat(TTR("Surface %i"),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=vformat(TTR("Surface %i"),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();

+ 1 - 1
tools/editor/plugins/baked_light_baker.cpp

@@ -728,7 +728,7 @@ void BakedLightBaker::_make_octree() {
 	for(int i=0;i<8;i++)
 		root->children[i]=0;
 
-	EditorProgress ep("bake_octree",vformat(TTR("Parsing %i Triangles:"), triangles.size()),triangles.size());
+	EditorProgress ep("bake_octree",vformat(TTR("Parsing %d Triangles:"), triangles.size()),triangles.size());
 
 	for(int i=0;i<triangles.size();i++) {
 

+ 1 - 1
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(vformat(TTR("Remove item %i?"),to_erase));
+				cd->set_text(vformat(TTR("Remove item %d?"),to_erase));
 				cd->popup_centered(Size2(300,60));
 			}
 		} break;

+ 2 - 2
tools/editor/plugins/item_list_editor_plugin.cpp

@@ -129,7 +129,7 @@ int ItemListOptionButtonPlugin::get_flags() const {
 
 void ItemListOptionButtonPlugin::add_item() {
 
-	ob->add_item( vformat(TTR("Item %i"),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( vformat(TTR("Item %i"),pp->get_item_count()));
+	pp->add_item( vformat(TTR("Item %d"),pp->get_item_count()));
 	_change_notify();
 }
 

+ 1 - 1
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:")+" "+vformat(TTR("%i 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"))+".");
+	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);
 }

+ 1 - 1
tools/editor/plugins/spatial_editor_plugin.cpp

@@ -1353,7 +1353,7 @@ void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
 								scale = Math::stepify(scale,spatial_editor->get_scale_snap());
 							}
 
-							set_message(vformat(TTR("Scaling to %s\%."),String::num(scale,1)));
+							set_message(vformat(TTR("Scaling to %s%%."),String::num(scale,1)));
 							scale/=100.0;
 
 							Transform r;

+ 1 - 1
tools/editor/property_editor.cpp

@@ -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(vformat(TTR("Bit %i, val %i."), i, 1<<i));
+		checks20[i]->set_tooltip(vformat(TTR("Bit %d, val %i."), i, 1<<i));
 	}
 
 	text_edit = memnew( TextEdit );

+ 66 - 62
tools/translations/tools.pot

@@ -448,7 +448,7 @@ msgid "Next"
 msgstr ""
 
 #: tools/editor/code_editor.cpp:219
-msgid "Replaced %i ocurrence(s)."
+msgid "Replaced %d ocurrence(s)."
 msgstr ""
 
 #: tools/editor/code_editor.cpp:277
@@ -692,7 +692,7 @@ msgid "Errors loading!"
 msgstr ""
 
 #: tools/editor/dependency_editor.cpp:526
-msgid "Permanently delete %i item(s)? (No undo!)"
+msgid "Permanently delete %d item(s)? (No undo!)"
 msgstr ""
 
 #: tools/editor/dependency_editor.cpp:679
@@ -992,7 +992,7 @@ msgid "Create NEW track for %s and insert key?"
 msgstr ""
 
 #: tools/editor/animation_editor.cpp:3118
-msgid "Create %i NEW tracks and insert keys?"
+msgid "Create %d NEW tracks and insert keys?"
 msgstr ""
 
 #: tools/editor/animation_editor.cpp:3292
@@ -1799,67 +1799,71 @@ msgstr ""
 msgid "Can't move directories to within themselves."
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1020
+#: tools/editor/scenes_dock.cpp:1027
 msgid "Can't operate on '..'"
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1039
+#: tools/editor/scenes_dock.cpp:1046
 msgid "Pick New Name and Location For:"
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1062
+#: tools/editor/scenes_dock.cpp:1069
 msgid "No files selected!"
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1400
+#: tools/editor/scenes_dock.cpp:1407
 msgid "Instance"
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1406
+#: tools/editor/scenes_dock.cpp:1413
 msgid "Edit Dependencies.."
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1407
+#: tools/editor/scenes_dock.cpp:1414
 msgid "View Owners.."
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1412
+#: tools/editor/scenes_dock.cpp:1419
 msgid "Rename or Move.."
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1414
+#: tools/editor/scenes_dock.cpp:1421
 msgid "Move To.."
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1470
+#: tools/editor/scenes_dock.cpp:1428
+msgid "Show In File Manager"
+msgstr ""
+
+#: tools/editor/scenes_dock.cpp:1481
 msgid "Previous Directory"
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1477
+#: tools/editor/scenes_dock.cpp:1488
 msgid "Next Directory"
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1484
+#: tools/editor/scenes_dock.cpp:1495
 msgid "Re-Scan Filesystem"
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1493
+#: tools/editor/scenes_dock.cpp:1504
 msgid "Move Favorite Up"
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1500
+#: tools/editor/scenes_dock.cpp:1511
 msgid "Move Favorite Down"
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1507
+#: tools/editor/scenes_dock.cpp:1518
 msgid "Toggle folder status as Favorite"
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1529
+#: tools/editor/scenes_dock.cpp:1540
 msgid "Instance the selected scene(s) as child of the selected node."
 msgstr ""
 
-#: tools/editor/scenes_dock.cpp:1615
+#: tools/editor/scenes_dock.cpp:1626
 msgid "Move"
 msgstr ""
 
@@ -2004,7 +2008,7 @@ msgid "Couldn't load image"
 msgstr ""
 
 #: tools/editor/property_editor.cpp:1735
-msgid "Bit %i, val %i."
+msgid "Bit %d, val %i."
 msgstr ""
 
 #: tools/editor/property_editor.cpp:2770
@@ -2284,11 +2288,11 @@ msgid "Switch Scene Tab"
 msgstr ""
 
 #: tools/editor/editor_node.cpp:4958
-msgid "%i more file(s)"
+msgid "%d more file(s)"
 msgstr ""
 
 #: tools/editor/editor_node.cpp:4989
-msgid "%i more file(s) or folder(s)"
+msgid "%d more file(s) or folder(s)"
 msgstr ""
 
 #: tools/editor/editor_node.cpp:5433
@@ -3764,7 +3768,7 @@ msgid "Reset the lightmap octree baking process (start over)."
 msgstr ""
 
 #: tools/editor/plugins/baked_light_baker.cpp:731
-msgid "Parsing %i Triangles:"
+msgid "Parsing %d Triangles:"
 msgstr ""
 
 #: tools/editor/plugins/baked_light_baker.cpp:738
@@ -3840,7 +3844,7 @@ msgid "Z-Axis Transform."
 msgstr ""
 
 #: tools/editor/plugins/spatial_editor_plugin.cpp:1356
-msgid "Scaling to %s\%."
+msgid "Scaling to %s%%."
 msgstr ""
 
 #: tools/editor/plugins/spatial_editor_plugin.cpp:1496
@@ -4087,127 +4091,127 @@ msgstr ""
 msgid "Post"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2412
+#: tools/editor/plugins/script_editor_plugin.cpp:2431
 msgid "Save All"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2414
+#: tools/editor/plugins/script_editor_plugin.cpp:2433
 msgid "History Prev"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2415
+#: tools/editor/plugins/script_editor_plugin.cpp:2434
 msgid "History Next"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2434
+#: tools/editor/plugins/script_editor_plugin.cpp:2453
 msgid "Indent Left"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2435
+#: tools/editor/plugins/script_editor_plugin.cpp:2454
 msgid "Indent Right"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2436
+#: tools/editor/plugins/script_editor_plugin.cpp:2455
 msgid "Toggle Comment"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2437
+#: tools/editor/plugins/script_editor_plugin.cpp:2456
 msgid "Clone Down"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2440
+#: tools/editor/plugins/script_editor_plugin.cpp:2459
 msgid "Complete Symbol"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2444
+#: tools/editor/plugins/script_editor_plugin.cpp:2463
 msgid "Trim Trailing Whitespace"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2445
+#: tools/editor/plugins/script_editor_plugin.cpp:2464
 msgid "Auto Indent"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2456
+#: tools/editor/plugins/script_editor_plugin.cpp:2475
 msgid "Goto Function.."
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2471
+#: tools/editor/plugins/script_editor_plugin.cpp:2490
 msgid "Debug"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2472
+#: tools/editor/plugins/script_editor_plugin.cpp:2491
 msgid "Toggle Breakpoint"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2481
+#: tools/editor/plugins/script_editor_plugin.cpp:2500
 msgid "Keep Debugger Open"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2493
+#: tools/editor/plugins/script_editor_plugin.cpp:2512
 msgid "Window"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2496
+#: tools/editor/plugins/script_editor_plugin.cpp:2515
 msgid "Move Left"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2497
+#: tools/editor/plugins/script_editor_plugin.cpp:2516
 msgid "Move Right"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2505
+#: tools/editor/plugins/script_editor_plugin.cpp:2524
 msgid "Help"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2506
+#: tools/editor/plugins/script_editor_plugin.cpp:2525
 msgid "Contextual"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2523
+#: tools/editor/plugins/script_editor_plugin.cpp:2542
 msgid "Tutorials"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2526
+#: tools/editor/plugins/script_editor_plugin.cpp:2545
 msgid "Open https://godotengine.org at tutorials section."
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2529
+#: tools/editor/plugins/script_editor_plugin.cpp:2548
 msgid "Classes"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2532
+#: tools/editor/plugins/script_editor_plugin.cpp:2551
 msgid "Search the class hierarchy."
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2535
+#: tools/editor/plugins/script_editor_plugin.cpp:2554
 msgid "Search Help"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2538
+#: tools/editor/plugins/script_editor_plugin.cpp:2557
 msgid "Search the reference documentation."
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2546
+#: tools/editor/plugins/script_editor_plugin.cpp:2565
 msgid "Go to previous edited document."
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2552
+#: tools/editor/plugins/script_editor_plugin.cpp:2571
 msgid "Go to next edited document."
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2566
+#: tools/editor/plugins/script_editor_plugin.cpp:2585
 msgid "Create Script"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2584
+#: tools/editor/plugins/script_editor_plugin.cpp:2603
 msgid "The following files are newer on disk.\nWhat action should be taken?:"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2592
+#: tools/editor/plugins/script_editor_plugin.cpp:2611
 msgid "Reload"
 msgstr ""
 
-#: tools/editor/plugins/script_editor_plugin.cpp:2594
+#: tools/editor/plugins/script_editor_plugin.cpp:2613
 msgid "Resave"
 msgstr ""
 
@@ -4220,7 +4224,7 @@ msgid "Length:"
 msgstr ""
 
 #: tools/editor/plugins/sample_editor_plugin.cpp:331
-msgid "%i frames"
+msgid "%d frames"
 msgstr ""
 
 #: tools/editor/plugins/shader_graph_editor_plugin.cpp:677
@@ -4339,15 +4343,15 @@ msgstr ""
 msgid "Delete Shader Graph Node(s)"
 msgstr ""
 
-#: tools/editor/plugins/shader_graph_editor_plugin.cpp:2515
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp:2517
 msgid "Error: Cyclic Connection Link"
 msgstr ""
 
-#: tools/editor/plugins/shader_graph_editor_plugin.cpp:2516
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp:2518
 msgid "Error: Missing Input Connections"
 msgstr ""
 
-#: tools/editor/plugins/shader_graph_editor_plugin.cpp:2576
+#: tools/editor/plugins/shader_graph_editor_plugin.cpp:2677
 msgid "Add Shader Graph Node"
 msgstr ""
 
@@ -4556,7 +4560,7 @@ msgid "Thumbnail.."
 msgstr ""
 
 #: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp:259
-msgid "Remove item %i?"
+msgid "Remove item %d?"
 msgstr ""
 
 #: tools/editor/plugins/cube_grid_theme_editor_plugin.cpp:291
@@ -4628,7 +4632,7 @@ msgid "Volume"
 msgstr ""
 
 #: tools/editor/plugins/item_list_editor_plugin.cpp:132
-msgid "Item %i"
+msgid "Item %d"
 msgstr ""
 
 #: tools/editor/plugins/item_list_editor_plugin.cpp:302
@@ -5312,5 +5316,5 @@ msgid "Source Mesh(es):"
 msgstr ""
 
 #: tools/editor/io_plugins/editor_mesh_import_plugin.cpp:365
-msgid "Surface %i"
+msgid "Surface %d"
 msgstr ""