From 6d70e9b05f3d47217ac14cdcba4fe0fc3646dd78 Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Mon, 11 Dec 2023 00:23:03 +0100 Subject: [PATCH] UI: fix and improve a few messages - "Frame Step" -> "Number of frames to skip forward while baking each frame": expand description which was just copying the prop name. - "b-bone" -> "B-Bone": title case. - "Volumes Lighting" -> "Volume Lighting": typo. - "Volumes Shadows" -> "Volume Shadows": typo. - "Insert Blank Keyframe (All Layer)" -> "(All Layers)": typo. - "the an" -> "an", typo. - "Inverse" -> "Invert": use verb instead of noun for an action. - "Desination" -> "Destination": typo. - "Hides all other F-Curves other than the ones being framed": remove extra "other". - "Remove Bone from Bone collections" -> "Collection", singular because the operator is only applied to the active collection. Also title case on "Collection". - "Change Stroke material with selected material" -> "Assign the active material slot to the selected strokes": rephrase by reusing the message from the non-Grease Pencil materials. - "VisAction", "VisArea" -> "Visibility Action", "Visibility Area": expand abbreviation. This is not exposed in the UI right now but will show up in the API docs. - "Stop Mode Right / Global Down" -> "Stop Move" (typo). - "... for node input %s": remove extra space. - "Move along their normal" -> "Move shadows along their normal": rephrase unclear sentence. - "Stat Vis" -> "Mesh Analysis": stands for "Statistical visualization"? Unclear and not shown anywhere. Reuse the label specified in the UI code instead. - " Output data...": remove leading space. - "Attribute domain for the selection and group id inputs": title case on "Selection" and "Group ID" as that is how they appear in the UI. - "Ior" -> "IOR": uppercase acronym, for consistency. Pull Request: https://projects.blender.org/blender/blender/pulls/115964 --- scripts/startup/bl_operators/anim.py | 4 ++-- scripts/startup/bl_ui/properties_render.py | 4 ++-- scripts/startup/bl_ui/space_view3d.py | 4 ++-- scripts/templates_py/image_processing.py | 4 ++-- source/blender/blenkernel/intern/main.cc | 4 ++-- source/blender/editors/animation/anim_channels_edit.cc | 2 +- source/blender/editors/armature/bone_collections.cc | 2 +- .../editors/grease_pencil/intern/grease_pencil_edit.cc | 2 +- source/blender/editors/sculpt_paint/paint_hide.cc | 10 +++++++--- .../editors/space_view3d/view3d_navigate_walk.cc | 4 ++-- source/blender/io/usd/intern/usd_reader_material.cc | 2 +- source/blender/makesrna/intern/rna_scene.cc | 2 +- source/blender/makesrna/intern/rna_space.cc | 3 ++- source/blender/nodes/NOD_static_types.h | 2 +- .../geometry/nodes/node_geo_split_to_instances.cc | 2 +- .../nodes/shader/nodes/node_shader_vector_math.cc | 2 +- 16 files changed, 29 insertions(+), 24 deletions(-) diff --git a/scripts/startup/bl_operators/anim.py b/scripts/startup/bl_operators/anim.py index 8e2c4052b93..6156a96761b 100644 --- a/scripts/startup/bl_operators/anim.py +++ b/scripts/startup/bl_operators/anim.py @@ -201,7 +201,7 @@ class NLA_OT_bake(Operator): ) step: IntProperty( name="Frame Step", - description="Frame Step", + description="Number of frames to skip forward while baking each frame", min=1, max=120, default=1, ) @@ -254,7 +254,7 @@ class NLA_OT_bake(Operator): ('LOCATION', "Location", "Bake location channels"), ('ROTATION', "Rotation", "Bake rotation channels"), ('SCALE', "Scale", "Bake scale channels"), - ('BBONE', "B-Bone", "Bake b-bone channels"), + ('BBONE', "B-Bone", "Bake B-Bone channels"), ), default={'LOCATION', 'ROTATION', 'SCALE', 'BBONE'}, ) diff --git a/scripts/startup/bl_ui/properties_render.py b/scripts/startup/bl_ui/properties_render.py index 5bcb64f24ab..5ee75408540 100644 --- a/scripts/startup/bl_ui/properties_render.py +++ b/scripts/startup/bl_ui/properties_render.py @@ -467,7 +467,7 @@ class RENDER_PT_eevee_next_volumes(RenderButtonsPanel, Panel): class RENDER_PT_eevee_next_volumes_lighting(RenderButtonsPanel, Panel): - bl_label = "Volumes Lighting" + bl_label = "Volume Lighting" bl_parent_id = "RENDER_PT_eevee_next_volumes" COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} @@ -482,7 +482,7 @@ class RENDER_PT_eevee_next_volumes_lighting(RenderButtonsPanel, Panel): class RENDER_PT_eevee_next_volumes_shadows(RenderButtonsPanel, Panel): - bl_label = "Volumes Shadows" + bl_label = "Volume Shadows" bl_parent_id = "RENDER_PT_eevee_next_volumes" COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index 8220889a2fb..2c71f98e32b 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -5771,7 +5771,7 @@ class VIEW3D_MT_edit_greasepencil_animation(Menu): def draw(self, context): layout = self.layout layout.operator("grease_pencil.insert_blank_frame", text="Insert Blank Keyframe (Active Layer)") - layout.operator("grease_pencil.insert_blank_frame", text="Insert Blank Keyframe (All Layer)").all_layers = True + layout.operator("grease_pencil.insert_blank_frame", text="Insert Blank Keyframe (All Layers)").all_layers = True class VIEW3D_MT_edit_gpencil_transform(Menu): @@ -7157,7 +7157,7 @@ class VIEW3D_PT_overlay_edit_mesh_shading(Panel): statvis_active = not xray row = col.row() row.active = statvis_active - row.prop(overlay, "show_statvis", text="Mesh Analysis") + row.prop(overlay, "show_statvis") if overlay.show_statvis: col = col.column() col.active = statvis_active diff --git a/scripts/templates_py/image_processing.py b/scripts/templates_py/image_processing.py index ab14436ad8e..06a84085f12 100644 --- a/scripts/templates_py/image_processing.py +++ b/scripts/templates_py/image_processing.py @@ -1,4 +1,4 @@ -# This sample shows the an efficient way of doing image processing +# This sample shows an efficient way of doing image processing # over Blender's images using Python. import bpy @@ -19,7 +19,7 @@ pixel_data = np.zeros((w, h, 4), 'f') input_image.pixels.foreach_get(pixel_data.ravel()) # Do whatever image processing you want using numpy here: -# Example 1: Inverse red green and blue channels. +# Example 1: Invert red green and blue channels. pixel_data[:, :, :3] = 1.0 - pixel_data[:, :, :3] # Example 2: Change gamma on the red channel. pixel_data[:, :, 0] = np.power(pixel_data[:, :, 0], 1.5) diff --git a/source/blender/blenkernel/intern/main.cc b/source/blender/blenkernel/intern/main.cc index d609e862e1c..10550ab24e0 100644 --- a/source/blender/blenkernel/intern/main.cc +++ b/source/blender/blenkernel/intern/main.cc @@ -411,8 +411,8 @@ void BKE_main_merge(Main *bmain_dst, Main **r_bmain_src, MainMergeReport &report reports.reports, RPT_INFO, "Merged %d IDs from '%s' Main into '%s' Main; %d IDs and %d Libraries already existed as " - "part of the destination Main, and %d IDs missing from desination Main, were freed together " - "with the source Main", + "part of the destination Main, and %d IDs missing from destination Main, were freed " + "together with the source Main", reports.num_merged_ids, bmain_src->filepath, bmain_dst->filepath, diff --git a/source/blender/editors/animation/anim_channels_edit.cc b/source/blender/editors/animation/anim_channels_edit.cc index 0ecd140fc4f..808432ef985 100644 --- a/source/blender/editors/animation/anim_channels_edit.cc +++ b/source/blender/editors/animation/anim_channels_edit.cc @@ -4540,7 +4540,7 @@ static void ANIM_OT_view_curve_in_graph_editor(wmOperatorType *ot) "isolate", false, "Isolate", - "Hides all other F-Curves other than the ones being framed"); + "Hides all F-Curves other than the ones being framed"); } /** \} */ diff --git a/source/blender/editors/armature/bone_collections.cc b/source/blender/editors/armature/bone_collections.cc index efe93bd0d40..094bcd14db8 100644 --- a/source/blender/editors/armature/bone_collections.cc +++ b/source/blender/editors/armature/bone_collections.cc @@ -593,7 +593,7 @@ static int bone_collection_unassign_named_exec(bContext *C, wmOperator *op) void ARMATURE_OT_collection_unassign_named(wmOperatorType *ot) { /* identifiers */ - ot->name = "Remove Bone from Bone collections"; + ot->name = "Remove Bone from Bone Collection"; ot->idname = "ARMATURE_OT_collection_unassign_named"; ot->description = "Unassign the bone from this bone collection"; diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc index 7664719fdf3..773defb61e6 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc @@ -1010,7 +1010,7 @@ static void GREASE_PENCIL_OT_stroke_material_set(wmOperatorType *ot) { ot->name = "Assign Material"; ot->idname = "GREASE_PENCIL_OT_stroke_material_set"; - ot->description = "Change Stroke material with selected material"; + ot->description = "Assign the active material slot to the selected strokes"; ot->exec = grease_pencil_stroke_material_set_exec; ot->poll = editable_grease_pencil_poll; diff --git a/source/blender/editors/sculpt_paint/paint_hide.cc b/source/blender/editors/sculpt_paint/paint_hide.cc index 4df1a12304f..74ac58d386f 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.cc +++ b/source/blender/editors/sculpt_paint/paint_hide.cc @@ -659,10 +659,14 @@ void PAINT_OT_hide_show(wmOperatorType *ot) "action", action_items, int(VisAction::Hide), - "VisAction", + "Visibility Action", "Whether to hide or show vertices"); - RNA_def_enum( - ot->srna, "area", area_items, VisArea::Inside, "VisArea", "Which vertices to hide or show"); + RNA_def_enum(ot->srna, + "area", + area_items, + VisArea::Inside, + "Visibility Area", + "Which vertices to hide or show"); WM_operator_properties_border(ot); } diff --git a/source/blender/editors/space_view3d/view3d_navigate_walk.cc b/source/blender/editors/space_view3d/view3d_navigate_walk.cc index 2d710ef07a8..da9b9e4eef8 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_walk.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_walk.cc @@ -159,9 +159,9 @@ void walk_modal_keymap(wmKeyConfig *keyconf) {WALK_MODAL_DIR_FORWARD_STOP, "FORWARD_STOP", 0, "Stop Move Forward", ""}, {WALK_MODAL_DIR_BACKWARD_STOP, "BACKWARD_STOP", 0, "Stop Move Backward", ""}, {WALK_MODAL_DIR_LEFT_STOP, "LEFT_STOP", 0, "Stop Move Left", ""}, - {WALK_MODAL_DIR_RIGHT_STOP, "RIGHT_STOP", 0, "Stop Mode Right", ""}, + {WALK_MODAL_DIR_RIGHT_STOP, "RIGHT_STOP", 0, "Stop Move Right", ""}, {WALK_MODAL_DIR_UP_STOP, "UP_STOP", 0, "Stop Move Global Up", ""}, - {WALK_MODAL_DIR_DOWN_STOP, "DOWN_STOP", 0, "Stop Mode Global Down", ""}, + {WALK_MODAL_DIR_DOWN_STOP, "DOWN_STOP", 0, "Stop Move Global Down", ""}, {WALK_MODAL_DIR_LOCAL_UP_STOP, "LOCAL_UP_STOP", 0, "Stop Move Local Up", ""}, {WALK_MODAL_DIR_LOCAL_DOWN_STOP, "LOCAL_DOWN_STOP", 0, "Stop Move Local Down", ""}, diff --git a/source/blender/io/usd/intern/usd_reader_material.cc b/source/blender/io/usd/intern/usd_reader_material.cc index e3ef609594e..207e4cc71be 100644 --- a/source/blender/io/usd/intern/usd_reader_material.cc +++ b/source/blender/io/usd/intern/usd_reader_material.cc @@ -832,7 +832,7 @@ void USDMaterialReader::convert_usd_transform_2d(const pxr::UsdShadeShader &usd_ if (!mapping) { BKE_reportf(reports(), RPT_WARNING, - "%s: Couldn't create SH_NODE_MAPPING for node input %s", + "%s: Couldn't create SH_NODE_MAPPING for node input %s", __func__, dest_socket_name); return; diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc index 9027dd9b9b8..f30f45aaf59 100644 --- a/source/blender/makesrna/intern/rna_scene.cc +++ b/source/blender/makesrna/intern/rna_scene.cc @@ -8136,7 +8136,7 @@ static void rna_def_scene_eevee(BlenderRNA *brna) prop = RNA_def_property(srna, "shadow_normal_bias", PROP_FLOAT, PROP_FACTOR); RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_ui_range(prop, 0.001f, 0.1f, 0.001, 3); - RNA_def_property_ui_text(prop, "Shadow Normal Bias", "Move along their normal"); + RNA_def_property_ui_text(prop, "Shadow Normal Bias", "Move shadows along their normal"); RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, nullptr); diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc index e09c4329c54..c07537c6033 100644 --- a/source/blender/makesrna/intern/rna_space.cc +++ b/source/blender/makesrna/intern/rna_space.cc @@ -4664,7 +4664,8 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna) prop = RNA_def_property(srna, "show_statvis", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "overlay.edit_flag", V3D_OVERLAY_EDIT_STATVIS); - RNA_def_property_ui_text(prop, "Stat Vis", "Display statistical information about the mesh"); + RNA_def_property_ui_text( + prop, "Mesh Analysis", "Display statistical information about the mesh"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, nullptr); prop = RNA_def_property(srna, "show_extra_edge_length", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index 62499142c74..83bdd438918 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -434,7 +434,7 @@ DefNode(GeometryNode, GEO_NODE_SET_SHADE_SMOOTH, 0, "SET_SHADE_SMOOTH", SetShade DefNode(GeometryNode, GEO_NODE_SET_SPLINE_CYCLIC, 0, "SET_SPLINE_CYCLIC", SetSplineCyclic, "Set Spline Cyclic", "Control whether each spline loops back on itself by changing the \"cyclic\" attribute") DefNode(GeometryNode, GEO_NODE_SET_SPLINE_RESOLUTION, 0, "SET_SPLINE_RESOLUTION", SetSplineResolution, "Set Spline Resolution", "Control how many evaluated points should be generated on every curve segment") DefNode(GeometryNode, GEO_NODE_SIMULATION_INPUT, def_geo_simulation_input, "SIMULATION_INPUT", SimulationInput, "Simulation Input", "Input data for the simulation zone") -DefNode(GeometryNode, GEO_NODE_SIMULATION_OUTPUT, def_geo_simulation_output, "SIMULATION_OUTPUT", SimulationOutput, "Simulation Output", " Output data from the simulation zone") +DefNode(GeometryNode, GEO_NODE_SIMULATION_OUTPUT, def_geo_simulation_output, "SIMULATION_OUTPUT", SimulationOutput, "Simulation Output", "Output data from the simulation zone") DefNode(GeometryNode, GEO_NODE_SPLIT_TO_INSTANCES, 0, "Split to Instances", SplitToInstances, "Split to Instances", "Create separate geometries containing the elements from the same group") DefNode(GeometryNode, GEO_NODE_SPLIT_EDGES, 0, "SPLIT_EDGES", SplitEdges, "Split Edges", "Duplicate mesh edges and break connections with the surrounding faces") DefNode(GeometryNode, GEO_NODE_STORE_NAMED_ATTRIBUTE, 0, "STORE_NAMED_ATTRIBUTE", StoreNamedAttribute, "Store Named Attribute", "Store the result of a field on a geometry as an attribute with the specified name") diff --git a/source/blender/nodes/geometry/nodes/node_geo_split_to_instances.cc b/source/blender/nodes/geometry/nodes/node_geo_split_to_instances.cc index f3a755a7312..101c1a817f0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_split_to_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_split_to_instances.cc @@ -359,7 +359,7 @@ static void node_rna(StructRNA *srna) RNA_def_node_enum(srna, "domain", "Domain", - "Attribute domain for the selection and group id inputs", + "Attribute domain for the Selection and Group ID inputs", rna_enum_attribute_domain_without_corner_items, NOD_inline_enum_accessors(custom1), ATTR_DOMAIN_POINT, diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc index 68069f0df9f..6b92d7cd751 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc @@ -223,7 +223,7 @@ static void node_shader_update_vector_math(bNodeTree *ntree, bNode *node) node_sock_label(sockB, "Increment"); break; case NODE_VECTOR_MATH_REFRACT: - node_sock_label(sockScale, "Ior"); + node_sock_label(sockScale, "IOR"); break; case NODE_VECTOR_MATH_SCALE: node_sock_label(sockScale, "Scale");