From 68ec019a4050ecda08e0f867c8f5ed8de10558d6 Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Wed, 5 Apr 2023 16:40:16 +0200 Subject: [PATCH] Fix: Typos, grammar, writing style in UI messages Issues reported by Joan Pujolar: See the pull request for a full list of reasoning. Pull Request: https://projects.blender.org/blender/blender/pulls/106580 --- intern/cycles/blender/addon/properties.py | 2 +- .../blender/editors/interface/interface_handlers.cc | 2 +- source/blender/editors/io/io_collada.c | 2 +- source/blender/editors/object/object_select.c | 2 +- .../editors/space_clip/tracking_ops_orient.cc | 6 +++--- source/blender/editors/space_image/image_ops.c | 2 +- .../blender/editors/space_sequencer/sequencer_add.c | 2 +- source/blender/editors/space_text/text_ops.c | 2 +- source/blender/makesrna/intern/rna_curve.c | 2 +- source/blender/makesrna/intern/rna_lightprobe.c | 6 +++--- source/blender/makesrna/intern/rna_rigidbody.c | 2 +- source/blender/makesrna/intern/rna_scene.c | 12 ++++++------ source/blender/makesrna/intern/rna_sculpt_paint.c | 2 +- source/blender/makesrna/intern/rna_sequencer.c | 6 +++--- source/blender/makesrna/intern/rna_space.c | 12 +++++++----- source/blender/makesrna/intern/rna_ui.c | 2 +- source/blender/makesrna/intern/rna_userdef.c | 4 ++-- source/blender/makesrna/intern/rna_wm_gizmo.c | 2 +- 18 files changed, 36 insertions(+), 34 deletions(-) diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 4f20d050666..25079b0c507 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -403,7 +403,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup): time_limit: FloatProperty( name="Time Limit", - description="Limit the render time (excluding synchronization time)." + description="Limit the render time (excluding synchronization time). " "Zero disables the limit", min=0.0, default=0.0, diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc index ba942d69f43..63a7af1e90a 100644 --- a/source/blender/editors/interface/interface_handlers.cc +++ b/source/blender/editors/interface/interface_handlers.cc @@ -8339,7 +8339,7 @@ static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState s */ if (state != BUTTON_STATE_TEXT_EDITING) { WM_report(RPT_INFO, - "Can't edit driven number value, see graph editor for the driver setup."); + "Can't edit driven number value, see driver editor for the driver setup."); } } diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 9e5d78ae73a..8bfa6ddb25e 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -465,7 +465,7 @@ void WM_OT_collada_export(wmOperatorType *ot) "apply_modifiers", 0, "Apply Modifiers", - "Apply modifiers to exported mesh (non destructive))"); + "Apply modifiers to exported mesh (non destructive)"); RNA_def_int(ot->srna, "export_mesh_type", diff --git a/source/blender/editors/object/object_select.c b/source/blender/editors/object/object_select.c index 540c1890b59..d99cf32f650 100644 --- a/source/blender/editors/object/object_select.c +++ b/source/blender/editors/object/object_select.c @@ -1461,7 +1461,7 @@ void OBJECT_OT_select_random(wmOperatorType *ot) { /* identifiers */ ot->name = "Select Random"; - ot->description = "Set select on random visible objects"; + ot->description = "Select or deselect random visible objects"; ot->idname = "OBJECT_OT_select_random"; /* api callbacks */ diff --git a/source/blender/editors/space_clip/tracking_ops_orient.cc b/source/blender/editors/space_clip/tracking_ops_orient.cc index d496a47b8d3..348f3594d45 100644 --- a/source/blender/editors/space_clip/tracking_ops_orient.cc +++ b/source/blender/editors/space_clip/tracking_ops_orient.cc @@ -568,9 +568,9 @@ void CLIP_OT_set_axis(wmOperatorType *ot) /* identifiers */ ot->name = "Set Axis"; ot->description = - "Set direction of scene axis rotating camera " - "(or its parent if present) and assume selected track " - "lies on real axis, joining it with the origin"; + "Set the direction of a scene axis by rotating the camera " + "(or its parent if present). This assumes that the selected " + "track lies on a real axis connecting it to the origin"; ot->idname = "CLIP_OT_set_axis"; /* api callbacks */ diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 31eea8c7558..1b3f302fac0 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -2073,7 +2073,7 @@ void IMAGE_OT_save_as(wmOperatorType *ot) "copy", 0, "Copy", - "Create a new image file without modifying the current image in blender"); + "Create a new image file without modifying the current image in Blender"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); image_operator_prop_allow_tokens(ot); diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c index 872a9afd89f..e20f2b63d53 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.c +++ b/source/blender/editors/space_sequencer/sequencer_add.c @@ -468,7 +468,7 @@ void SEQUENCER_OT_scene_strip_add(struct wmOperatorType *ot) /* Identifiers. */ ot->name = "Add Scene Strip"; ot->idname = "SEQUENCER_OT_scene_strip_add"; - ot->description = "Add a strip to the sequencer using a blender scene as a source"; + ot->description = "Add a strip to the sequencer using a Blender scene as a source"; /* Api callbacks. */ ot->invoke = sequencer_add_scene_strip_invoke; diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index 40d67df6164..7239d2b73b4 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -3334,7 +3334,7 @@ void TEXT_OT_selection_set(wmOperatorType *ot) /* identifiers */ ot->name = "Set Selection"; ot->idname = "TEXT_OT_selection_set"; - ot->description = "Set cursor selection"; + ot->description = "Set text selection"; /* api callbacks */ ot->invoke = text_selection_set_invoke; diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index a7c67128755..b11f1a3dd5d 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -2007,7 +2007,7 @@ static void rna_def_curve_nurb(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flagv", CU_NURB_ENDPOINT); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text( - prop, "Endpoint V", "Make this nurbs surface meet the endpoints in the V direction "); + prop, "Endpoint V", "Make this nurbs surface meet the endpoints in the V direction"); RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_v"); prop = RNA_def_property(srna, "use_bezier_u", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_lightprobe.c b/source/blender/makesrna/intern/rna_lightprobe.c index 51ec89f1e29..57fef44e021 100644 --- a/source/blender/makesrna/intern/rna_lightprobe.c +++ b/source/blender/makesrna/intern/rna_lightprobe.c @@ -139,19 +139,19 @@ static void rna_def_lightprobe(BlenderRNA *brna) prop = RNA_def_property(srna, "grid_resolution_x", PROP_INT, PROP_NONE); RNA_def_property_range(prop, 1, 256); RNA_def_property_ui_text( - prop, "Resolution X", "Number of sample along the x axis of the volume"); + prop, "Resolution X", "Number of samples along the x axis of the volume"); RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, "rna_LightProbe_recalc"); prop = RNA_def_property(srna, "grid_resolution_y", PROP_INT, PROP_NONE); RNA_def_property_range(prop, 1, 256); RNA_def_property_ui_text( - prop, "Resolution Y", "Number of sample along the y axis of the volume"); + prop, "Resolution Y", "Number of samples along the y axis of the volume"); RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, "rna_LightProbe_recalc"); prop = RNA_def_property(srna, "grid_resolution_z", PROP_INT, PROP_NONE); RNA_def_property_range(prop, 1, 256); RNA_def_property_ui_text( - prop, "Resolution Z", "Number of sample along the z axis of the volume"); + prop, "Resolution Z", "Number of samples along the z axis of the volume"); RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, "rna_LightProbe_recalc"); prop = RNA_def_property(srna, "visibility_buffer_bias", PROP_FLOAT, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c index 82d724878a7..3a12d871002 100644 --- a/source/blender/makesrna/intern/rna_rigidbody.c +++ b/source/blender/makesrna/intern/rna_rigidbody.c @@ -110,7 +110,7 @@ static const EnumPropertyItem rna_enum_rigidbody_constraint_spring_type_items[] "SPRING1", ICON_NONE, "Blender 2.7", - "Spring implementation used in blender 2.7. Damping is capped at 1.0"}, + "Spring implementation used in Blender 2.7. Damping is capped at 1.0"}, {RBC_SPRING_TYPE2, "SPRING2", ICON_NONE, diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 360851c4b02..9bf2cf21107 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -3784,7 +3784,7 @@ static void rna_def_sequencer_tool_settings(BlenderRNA *brna) }; static const EnumPropertyItem scale_overlap_modes[] = { - {SEQ_OVERLAP_EXPAND, "EXPAND", 0, "Expand", "Move strips so transformed strips fits"}, + {SEQ_OVERLAP_EXPAND, "EXPAND", 0, "Expand", "Move strips so transformed strips fit"}, {SEQ_OVERLAP_OVERWRITE, "OVERWRITE", 0, @@ -4223,7 +4223,7 @@ static void rna_def_unit_settings(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Unit Scale", - "Scale to use when converting between blender units and dimensions." + "Scale to use when converting between Blender units and dimensions." " When working at microscopic or astronomical scale, a small or large unit scale" " respectively can be used to avoid numerical precision problems"); RNA_def_property_range(prop, 1e-9f, 1e+9f); @@ -6644,7 +6644,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "bake_biasdist"); RNA_def_property_range(prop, 0.0, 1000.0); RNA_def_property_ui_text( - prop, "Bias", "Bias towards faces further away from the object (in blender units)"); + prop, "Bias", "Bias towards faces further away from the object (in Blender units)"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "use_bake_multires", PROP_BOOLEAN, PROP_NONE); @@ -7337,7 +7337,7 @@ static void rna_def_scene_eevee(BlenderRNA *brna) prop = RNA_def_property(srna, "gi_diffuse_bounces", PROP_INT, PROP_NONE); RNA_def_property_ui_text(prop, "Diffuse Bounces", - "Number of time the light is reinjected inside light grids, " + "Number of times the light is reinjected inside light grids, " "0 disable indirect diffuse light"); RNA_def_property_range(prop, 0, INT_MAX); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY); @@ -7801,8 +7801,8 @@ static void rna_def_scene_eevee(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Shadow Pool Size", "Size of the shadow pool, " - "bigger pool size allows for more shadows in the scene " - "but might not fits into GPU memory"); + "a bigger pool size allows for more shadows in the scene " + "but might not fit into GPU memory"); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 5d221c009a5..a468d2c5272 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -850,7 +850,7 @@ static void rna_def_sculpt(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Resolution", "Maximum edge length for dynamic topology sculpting (as divisor " - "of blender unit - higher value means smaller edge length)"); + "of Blender unit - higher value means smaller edge length)"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); prop = RNA_def_property(srna, "use_smooth_shading", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index df16982769d..d6e9a3a4f81 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -2751,7 +2751,7 @@ static void rna_def_scene(BlenderRNA *brna) srna = RNA_def_struct(brna, "SceneSequence", "Sequence"); RNA_def_struct_ui_text( - srna, "Scene Sequence", "Sequence strip to used the rendered image of a scene"); + srna, "Scene Sequence", "Sequence strip using the rendered image of a scene"); RNA_def_struct_sdna(srna, "Sequence"); prop = RNA_def_property(srna, "scene", PROP_POINTER, PROP_NONE); @@ -2762,7 +2762,7 @@ static void rna_def_scene(BlenderRNA *brna) prop = RNA_def_property(srna, "scene_camera", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL, "rna_Camera_object_poll"); - RNA_def_property_ui_text(prop, "Camera Override", "Override the scenes active camera"); + RNA_def_property_ui_text(prop, "Camera Override", "Override the scene's active camera"); RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_invalidate_raw_update"); prop = RNA_def_property(srna, "scene_input", PROP_ENUM, PROP_NONE); @@ -2819,7 +2819,7 @@ static void rna_def_movie(BlenderRNA *brna) prop = RNA_def_property(srna, "retiming_handles", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "retiming_handles", NULL); RNA_def_property_struct_type(prop, "RetimingHandle"); - RNA_def_property_ui_text(prop, "Retiming Hndles", ""); + RNA_def_property_ui_text(prop, "Retiming Handles", ""); RNA_def_property_collection_funcs(prop, "rna_SequenceEditor_retiming_handles_begin", "rna_iterator_array_next", diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 8c26502fddd..282a447f67d 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -5099,7 +5099,9 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_struct_type(prop, "RegionView3D"); RNA_def_property_pointer_funcs(prop, "rna_SpaceView3D_region_3d_get", NULL, NULL, NULL); RNA_def_property_ui_text( - prop, "3D Region", "3D region in this space, in case of quad view the camera region"); + prop, + "3D Region", + "3D region for this space. When the space is in quad view, the camera region"); prop = RNA_def_property(srna, "region_quadviews", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "RegionView3D"); @@ -5303,9 +5305,9 @@ static void rna_def_space_view3d(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Is Axis Aligned", - "Is current view aligned to an axis " - "(does not check the view is orthographic use \"is_perspective\" for that). " - "Assignment sets the \"view_rotation\" to the closest axis aligned view"); + "Whether the current view is aligned to an axis " + "(does not check whether the view is orthographic, use \"is_perspective\" for that). " + "Setting this will rotate the view to the closest axis"); /* This isn't directly accessible from the UI, only an operator. */ prop = RNA_def_property(srna, "use_clip_planes", PROP_BOOLEAN, PROP_NONE); @@ -6768,7 +6770,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna) prop = RNA_def_property(srna, "use_library_browsing", PROP_BOOLEAN, PROP_NONE); RNA_def_property_ui_text( - prop, "Library Browser", "Whether we may browse blender files' content or not"); + prop, "Library Browser", "Whether we may browse Blender files' content or not"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_boolean_funcs(prop, "rna_FileSelectParams_use_lib_get", NULL); diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index 935e442952e..743c6ca3f46 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -291,7 +291,7 @@ static StructRNA *rna_Panel_register(Main *bmain, if ((1 << dummy_pt.space_type) & WM_TOOLSYSTEM_SPACE_MASK) { BKE_reportf(reports, RPT_ERROR, - "%s '%s' has category '%s' ", + "%s '%s' has category '%s'", error_prefix, dummy_pt.idname, dummy_pt.category); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 0f59f94070f..e24c975bfa3 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -4872,8 +4872,8 @@ static void rna_def_userdef_view(BlenderRNA *brna) RNA_def_property_enum_funcs(prop, NULL, "rna_userdef_timecode_style_set", NULL); RNA_def_property_ui_text( prop, - "TimeCode Style", - "Format of Time Codes displayed when not displaying timing in terms of frames"); + "Timecode Style", + "Format of timecodes displayed when not displaying timing in terms of frames"); RNA_def_property_update(prop, 0, "rna_userdef_update"); prop = RNA_def_property(srna, "view_frame_type", PROP_ENUM, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.c b/source/blender/makesrna/intern/rna_wm_gizmo.c index e79ac954d69..f92da9d74c8 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo.c +++ b/source/blender/makesrna/intern/rna_wm_gizmo.c @@ -1333,7 +1333,7 @@ static void rna_def_gizmo(BlenderRNA *brna, PropertyRNA *cprop) RNA_api_gizmo(srna); srna = RNA_def_struct(brna, "GizmoProperties", NULL); - RNA_def_struct_ui_text(srna, "Gizmo Properties", "Input properties of an Gizmo"); + RNA_def_struct_ui_text(srna, "Gizmo Properties", "Input properties of a Gizmo"); RNA_def_struct_refine_func(srna, "rna_GizmoProperties_refine"); RNA_def_struct_idprops_func(srna, "rna_GizmoProperties_idprops"); RNA_def_struct_flag(srna, STRUCT_NO_DATABLOCK_IDPROPERTIES);