From 98d7cb57fae1f54d12f5845ae34900c4ee4b0002 Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Sun, 16 Apr 2023 16:16:20 +0200 Subject: [PATCH] UI: fix a few messages - The official spelling of FFMPEG is FFmpeg (upper, then lower case). - The normal vector copy and paste operators shoud be singular because they can only be used on a single element. - The "Parent File" file browser operator goes up one level in the file hierarchy. It should be called "Parent Directory", like the current description "Go to the parent directory". - "Mass Vertex Group" used to define the mass, but was reused at some point and now actually defines cloth pinning so it should be called "Pin Vertex Group", as in the UI. - The Transformation constraint's Map To Type suffered from a typo (probably of -> on). - "Fall-off" is more commonly spelled "Falloff". - "Effected" should really be "Affected" in this case. - Rephrase the descriptions for the curve painting tools drawing plane, which did not seem to match what the settings do. Namely, they allow selecting in which plane to draw curves using the Curve Draw tool. Reported by @Joan-Pujolar in #43295: - Force exporting animation on every objects [objects singular] - Color of the interface widgets text insertion cursor (caret) [delete interface widgets] - Index of active aov [AOV in uppercase everywhere else] - Does this tool use an painting canvas [an] - This script was written Blender version %d.%d.%d ["for" missing before "Blender"] - [fcurve -> F-curve] - unknown error stating file [statting] - Offset into each stroke before the beginning of the dashed segment generation [Two spaces between of and the] - Find the nearest element in the a group. [either "the" or "a"] --- scripts/startup/bl_ui/properties_output.py | 2 +- scripts/startup/bl_ui/space_view3d.py | 4 ++-- source/blender/blenkernel/intern/writeffmpeg.c | 5 +++-- source/blender/editors/animation/keyframing.c | 4 ++-- source/blender/editors/space_file/file_ops.c | 2 +- .../blender/editors/space_graph/graph_select.c | 2 +- source/blender/editors/space_text/text_ops.c | 2 +- source/blender/makesrna/intern/rna_cloth.c | 2 +- .../blender/makesrna/intern/rna_constraint.c | 2 +- .../blender/makesrna/intern/rna_fcurve_api.c | 8 ++++---- .../intern/rna_gpencil_legacy_modifier.c | 2 +- .../blender/makesrna/intern/rna_object_force.c | 14 +++++++------- source/blender/makesrna/intern/rna_scene.c | 18 +++++++++++------- source/blender/makesrna/intern/rna_userdef.c | 3 +-- source/blender/makesrna/intern/rna_workspace.c | 2 +- source/blender/nodes/NOD_static_types.h | 2 +- 16 files changed, 39 insertions(+), 35 deletions(-) diff --git a/scripts/startup/bl_ui/properties_output.py b/scripts/startup/bl_ui/properties_output.py index 519b685d6d9..0a303d67205 100644 --- a/scripts/startup/bl_ui/properties_output.py +++ b/scripts/startup/bl_ui/properties_output.py @@ -17,7 +17,7 @@ class RENDER_PT_format_presets(PresetPanel, Panel): class RENDER_PT_ffmpeg_presets(PresetPanel, Panel): - bl_label = "FFMPEG Presets" + bl_label = "FFmpeg Presets" preset_subdir = "ffmpeg" preset_operator = "script.python_file_run" diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index 7cef4f96a1f..bea148e6e8b 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -4509,8 +4509,8 @@ class VIEW3D_MT_edit_mesh_normals(Menu): layout.separator() - layout.operator("mesh.normals_tools", text="Copy Vectors").mode = 'COPY' - layout.operator("mesh.normals_tools", text="Paste Vectors").mode = 'PASTE' + layout.operator("mesh.normals_tools", text="Copy Vector").mode = 'COPY' + layout.operator("mesh.normals_tools", text="Paste Vector").mode = 'PASTE' layout.operator("mesh.smooth_normals", text="Smooth Vectors") layout.operator("mesh.normals_tools", text="Reset Vectors").mode = 'RESET' diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index c107c028985..d0dcba664cd 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -734,7 +734,8 @@ static AVStream *alloc_video_stream(FFMpegContext *context, if (c->time_base.num != 1) { AVRational new_time_base; if (av_reduce( - &new_time_base.num, &new_time_base.den, c->time_base.num, c->time_base.den, INT_MAX)) { + &new_time_base.num, &new_time_base.den, c->time_base.num, c->time_base.den, INT_MAX)) + { /* Exact reduction was possible. Use the new value. */ c->time_base = new_time_base; } @@ -1219,7 +1220,7 @@ static int start_ffmpeg_impl(FFMpegContext *context, if (context->ffmpeg_audio_codec != AV_CODEC_ID_NONE && rd->ffcodecdata.audio_mixrate != 48000 && rd->ffcodecdata.audio_channels != 2) { - BKE_report(reports, RPT_ERROR, "FFMPEG only supports 48khz / stereo audio for DV!"); + BKE_report(reports, RPT_ERROR, "FFmpeg only supports 48khz / stereo audio for DV!"); goto fail; } } diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index 7d27ca18176..9f2c11ff33d 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -277,7 +277,7 @@ void update_autoflags_fcurve(FCurve *fcu, bContext *C, ReportList *reports, Poin int old_flag = fcu->flag; if ((ptr->owner_id == NULL) && (ptr->data == NULL)) { - BKE_report(reports, RPT_ERROR, "No RNA pointer available to retrieve values for this fcurve"); + BKE_report(reports, RPT_ERROR, "No RNA pointer available to retrieve values for this F-curve"); return; } @@ -288,7 +288,7 @@ void update_autoflags_fcurve(FCurve *fcu, bContext *C, ReportList *reports, Poin BKE_reportf(reports, RPT_ERROR, - "Could not update flags for this fcurve, as RNA path is invalid for the given ID " + "Could not update flags for this F-curve, as RNA path is invalid for the given ID " "(ID = %s, path = %s)", idname, fcu->rna_path); diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c index f4568da8764..da66f37accc 100644 --- a/source/blender/editors/space_file/file_ops.c +++ b/source/blender/editors/space_file/file_ops.c @@ -2253,7 +2253,7 @@ static int file_parent_exec(bContext *C, wmOperator *UNUSED(unused)) void FILE_OT_parent(struct wmOperatorType *ot) { /* identifiers */ - ot->name = "Parent File"; + ot->name = "Parent Directory"; ot->description = "Move to parent directory"; ot->idname = "FILE_OT_parent"; diff --git a/source/blender/editors/space_graph/graph_select.c b/source/blender/editors/space_graph/graph_select.c index 4f1b6ccafc4..1793cfbf497 100644 --- a/source/blender/editors/space_graph/graph_select.c +++ b/source/blender/editors/space_graph/graph_select.c @@ -931,7 +931,7 @@ void GRAPH_OT_select_box(wmOperatorType *ot) "use_curve_selection", 1, "Select Curves", - "Allow selecting all the keyframes of a curve by selecting the calculated fcurve"); + "Allow selecting all the keyframes of a curve by selecting the calculated F-curve"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); WM_operator_properties_gesture_box(ot); diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index fa6a7469141..390a83314f0 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -648,7 +648,7 @@ static void txt_write_file(Main *bmain, Text *text, ReportList *reports) RPT_WARNING, "Unable to stat '%s': %s", filepath, - errno ? strerror(errno) : TIP_("unknown error stating file")); + errno ? strerror(errno) : TIP_("unknown error statting file")); } text->flags &= ~TXT_ISDIRTY; diff --git a/source/blender/makesrna/intern/rna_cloth.c b/source/blender/makesrna/intern/rna_cloth.c index e45a1a3cc33..b2474f2800d 100644 --- a/source/blender/makesrna/intern/rna_cloth.c +++ b/source/blender/makesrna/intern/rna_cloth.c @@ -648,7 +648,7 @@ static void rna_def_cloth_sim_settings(BlenderRNA *brna) "rna_ClothSettings_mass_vgroup_length", "rna_ClothSettings_mass_vgroup_set"); RNA_def_property_override_clear_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY); - RNA_def_property_ui_text(prop, "Mass Vertex Group", "Vertex Group for pinning of vertices"); + RNA_def_property_ui_text(prop, "Pin Vertex Group", "Vertex Group for pinning of vertices"); RNA_def_property_update(prop, 0, "rna_cloth_pinning_changed"); prop = RNA_def_property(srna, "gravity", PROP_FLOAT, PROP_ACCELERATION); diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 53e13c29852..7e883cabe92 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -2237,7 +2237,7 @@ static void rna_def_constraint_transform(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "to"); RNA_def_property_enum_items(prop, transform_items); RNA_def_property_ui_text( - prop, "Map To", "The transformation type to affect of the constrained object"); + prop, "Map To", "The transformation type to affect on the constrained object"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); prop = RNA_def_property(srna, "map_to_x_from", PROP_ENUM, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_fcurve_api.c b/source/blender/makesrna/intern/rna_fcurve_api.c index 504128aacf0..2f96d5347a6 100644 --- a/source/blender/makesrna/intern/rna_fcurve_api.c +++ b/source/blender/makesrna/intern/rna_fcurve_api.c @@ -37,10 +37,10 @@ static void rna_FCurve_convert_to_samples(FCurve *fcu, ReportList *reports, int BKE_reportf(reports, RPT_ERROR, "Invalid frame range (%d - %d)", start, end + 1); } else if (fcu->fpt) { - BKE_report(reports, RPT_WARNING, "FCurve has already sample points"); + BKE_report(reports, RPT_WARNING, "F-Curve already has sample points"); } else if (!fcu->bezt) { - BKE_report(reports, RPT_WARNING, "FCurve has no keyframes"); + BKE_report(reports, RPT_WARNING, "F-Curve has no keyframes"); } else { fcurve_store_samples(fcu, NULL, start, end, fcurve_samplingcb_evalcurve); @@ -54,10 +54,10 @@ static void rna_FCurve_convert_to_keyframes(FCurve *fcu, ReportList *reports, in BKE_reportf(reports, RPT_ERROR, "Invalid frame range (%d - %d)", start, end); } else if (fcu->bezt) { - BKE_report(reports, RPT_WARNING, "FCurve has already keyframes"); + BKE_report(reports, RPT_WARNING, "F-Curve already has keyframes"); } else if (!fcu->fpt) { - BKE_report(reports, RPT_WARNING, "FCurve has no sample points"); + BKE_report(reports, RPT_WARNING, "F-Curve has no sample points"); } else { fcurve_samples_to_keyframes(fcu, start, end); diff --git a/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.c b/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.c index f4154f149ab..24903f7c254 100644 --- a/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.c @@ -4274,7 +4274,7 @@ static void rna_def_modifier_gpencildash(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Offset", - "Offset into each stroke before the beginning of the dashed segment generation"); + "Offset into each stroke before the beginning of the dashed segment generation"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); /* Common properties. */ diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 59c0667ce02..6208f0984e7 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -1518,7 +1518,7 @@ static void rna_def_field(BlenderRNA *brna) prop = RNA_def_property(srna, "falloff_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "falloff"); RNA_def_property_enum_items(prop, falloff_items); - RNA_def_property_ui_text(prop, "Fall-Off", ""); + RNA_def_property_ui_text(prop, "Falloff", ""); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); prop = RNA_def_property(srna, "texture_mode", PROP_ENUM, PROP_NONE); @@ -1613,7 +1613,7 @@ static void rna_def_field(BlenderRNA *brna) prop = RNA_def_property(srna, "distance_min", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "mindist"); RNA_def_property_range(prop, 0.0f, 1000.0f); - RNA_def_property_ui_text(prop, "Minimum Distance", "Minimum distance for the field's fall-off"); + RNA_def_property_ui_text(prop, "Minimum Distance", "Minimum distance for the field's falloff"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); prop = RNA_def_property(srna, "distance_max", PROP_FLOAT, PROP_DISTANCE); @@ -1627,7 +1627,7 @@ static void rna_def_field(BlenderRNA *brna) RNA_def_property_float_sdna(prop, NULL, "minrad"); RNA_def_property_range(prop, 0.0f, 1000.0f); RNA_def_property_ui_text( - prop, "Minimum Radial Distance", "Minimum radial distance for the field's fall-off"); + prop, "Minimum Radial Distance", "Minimum radial distance for the field's falloff"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); prop = RNA_def_property(srna, "radial_max", PROP_FLOAT, PROP_NONE); @@ -1666,7 +1666,7 @@ static void rna_def_field(BlenderRNA *brna) prop = RNA_def_property(srna, "use_min_distance", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_USEMIN); - RNA_def_property_ui_text(prop, "Use Min", "Use a minimum distance for the field's fall-off"); + RNA_def_property_ui_text(prop, "Use Min", "Use a minimum distance for the field's falloff"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); prop = RNA_def_property(srna, "use_max_distance", PROP_BOOLEAN, PROP_NONE); @@ -1677,8 +1677,8 @@ static void rna_def_field(BlenderRNA *brna) prop = RNA_def_property(srna, "use_radial_min", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_USEMINR); RNA_def_property_ui_text( - prop, "Use Min", "Use a minimum radial distance for the field's fall-off"); - /* "Use a minimum angle for the field's fall-off" */ + prop, "Use Min", "Use a minimum radial distance for the field's falloff"); + /* "Use a minimum angle for the field's falloff" */ RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); prop = RNA_def_property(srna, "use_radial_max", PROP_BOOLEAN, PROP_NONE); @@ -1727,7 +1727,7 @@ static void rna_def_field(BlenderRNA *brna) prop = RNA_def_property(srna, "use_multiple_springs", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PFIELD_MULTIPLE_SPRINGS); RNA_def_property_ui_text( - prop, "Multiple Springs", "Every point is effected by multiple springs"); + prop, "Multiple Springs", "Every point is affected by multiple springs"); RNA_def_property_update(prop, 0, "rna_FieldSettings_update"); prop = RNA_def_property(srna, "use_smoke_density", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 989399162e9..a1ccc7a620c 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -3219,7 +3219,7 @@ static void rna_def_tool_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "use_proportional_fcurve", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "proportional_fcurve", 0); RNA_def_property_ui_text( - prop, "Proportional Editing FCurves", "Proportional editing in FCurve editor"); + prop, "Proportional Editing F-Curves", "Proportional editing in F-Curve editor"); RNA_def_property_ui_icon(prop, ICON_PROP_OFF, 1); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */ @@ -4058,14 +4058,18 @@ static void rna_def_curve_paint_settings(BlenderRNA *brna) {CURVE_PAINT_SURFACE_PLANE_NORMAL_VIEW, "NORMAL_VIEW", 0, - "Normal/View", - "Display perpendicular to the surface"}, + "Normal to Surface", + "Draw in a plane perpendicular to the surface"}, {CURVE_PAINT_SURFACE_PLANE_NORMAL_SURFACE, "NORMAL_SURFACE", 0, - "Normal/Surface", - "Display aligned to the surface"}, - {CURVE_PAINT_SURFACE_PLANE_VIEW, "VIEW", 0, "View", "Display aligned to the viewport"}, + "Tangent to Surface", + "Draw in the surface plane"}, + {CURVE_PAINT_SURFACE_PLANE_VIEW, + "VIEW", + 0, + "View", + "Draw in a plane aligned to the viewport"}, {0, NULL, 0, NULL, NULL}, }; @@ -4437,7 +4441,7 @@ void rna_def_view_layer_common(BlenderRNA *brna, StructRNA *srna, const bool sce "rna_ViewLayer_active_aov_index_get", "rna_ViewLayer_active_aov_index_set", "rna_ViewLayer_active_aov_index_range"); - RNA_def_property_ui_text(prop, "Active AOV Index", "Index of active aov"); + RNA_def_property_ui_text(prop, "Active AOV Index", "Index of active AOV"); RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL); prop = RNA_def_property(srna, "lightgroups", PROP_COLLECTION, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 7cc2803e9a0..fefccabd9a3 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -1608,8 +1608,7 @@ static void rna_def_userdef_theme_ui(BlenderRNA *brna) prop = RNA_def_property(srna, "widget_text_cursor", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "widget_text_cursor"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text( - prop, "Text Cursor", "Color of the interface widgets text insertion cursor (caret)"); + RNA_def_property_ui_text(prop, "Text Cursor", "Color of the text insertion cursor (caret)"); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); prop = RNA_def_property(srna, "panel_roundness", PROP_FLOAT, PROP_FACTOR); diff --git a/source/blender/makesrna/intern/rna_workspace.c b/source/blender/makesrna/intern/rna_workspace.c index 2294c2c2b2d..b72a4d56a03 100644 --- a/source/blender/makesrna/intern/rna_workspace.c +++ b/source/blender/makesrna/intern/rna_workspace.c @@ -302,7 +302,7 @@ static void rna_def_workspace_tool(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Index", ""); RNA_def_property_boolean_funcs(prop, "rna_WorkSpaceTool_use_paint_canvas_get", NULL); - RNA_def_property_ui_text(prop, "Use Paint Canvas", "Does this tool use an painting canvas"); + RNA_def_property_ui_text(prop, "Use Paint Canvas", "Does this tool use a painting canvas"); RNA_define_verify_sdna(0); prop = RNA_def_property(srna, "has_datablock", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index fc03ca39d6b..842d5ab646e 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -324,7 +324,7 @@ DefNode(GeometryNode, GEO_NODE_FLIP_FACES, 0, "FLIP_FACES", FlipFaces, "Flip Fac DefNode(GeometryNode, GEO_NODE_GEOMETRY_TO_INSTANCE, 0, "GEOMETRY_TO_INSTANCE", GeometryToInstance, "Geometry to Instance", "Convert each input geometry into an instance, which can be much faster than the Join Geometry node when the inputs are large") DefNode(GeometryNode, GEO_NODE_IMAGE_INFO, 0, "IMAGE_INFO", ImageInfo, "Image Info", "Retrieve information about an image") DefNode(GeometryNode, GEO_NODE_IMAGE_TEXTURE, def_geo_image_texture, "IMAGE_TEXTURE", ImageTexture, "Image Texture", "Sample values from an image texture") -DefNode(GeometryNode, GEO_NODE_INDEX_OF_NEAREST, 0, "INDEX_OF_NEAREST", IndexOfNearest, "Index of Nearest", "Find the nearest element in the a group. Similar to the \"Sample Nearest\" node") +DefNode(GeometryNode, GEO_NODE_INDEX_OF_NEAREST, 0, "INDEX_OF_NEAREST", IndexOfNearest, "Index of Nearest", "Find the nearest element in a group. Similar to the \"Sample Nearest\" node") DefNode(GeometryNode, GEO_NODE_IMAGE, def_geo_image, "IMAGE", InputImage, "Image", "Input image") DefNode(GeometryNode, GEO_NODE_INPUT_CURVE_HANDLES, 0, "INPUT_CURVE_HANDLES", InputCurveHandlePositions,"Curve Handle Positions", "Retrieve the position of each Bézier control point's handles") DefNode(GeometryNode, GEO_NODE_INPUT_CURVE_TILT, 0, "INPUT_CURVE_TILT", InputCurveTilt, "Curve Tilt", "Retrieve the angle at each control point used to twist the curve's normal around its tangent") -- 2.30.2