From fa77e9142d3465d397ff3a93d0747b4332687a42 Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Mon, 5 Feb 2024 17:08:17 +0100 Subject: [PATCH] UI: fix and improve a few messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - "can not" -> "cannot" in many places (ambiguous, also see Writing Style guide). - "Bezier" -> "Bézier": proper spelling of the eponym. - Tool keymaps: make "Uv" all caps. - "FFMPEG" -> "FFmpeg" (official spelling) - Use MULTIPLICATION SIGN U+00D7 instead of MULTIPLICATION X U+2715. - "LClick" -> "LMB", "RClick" -> "RMB": this convention is used everywhere else. - "Save rendered the image..." -> "Save the rendered image...": typo. - "Preserve Current retiming": title case for property. - Bend status message: punctuation. - "... class used to define the panel" -> "header": copy-paste error. - "... class used to define the menu" -> "asset": copy-paste error. - "Lights user to display objects..." -> "Lights used...": typo. - "-setaudio require one argument" -> "requires": typo. Some issues reported by Joan Pujolar and Tamar Mebonia. Pull Request: https://projects.blender.org/blender/blender/pulls/117856 --- .../examples/bpy.types.Depsgraph.4.py | 4 +-- .../examples/bpy.types.Depsgraph.5.py | 2 +- .../examples/bpy.types.Depsgraph.7.py | 4 +-- .../simple_pipeline/reconstruction_scale.cc | 2 +- .../bl_i18n_utils/bl_extract_messages.py | 2 +- .../keyconfig/keymap_data/blender_default.py | 20 +++++++------- .../keymap_data/industry_compatible_data.py | 2 +- scripts/startup/bl_operators/wm.py | 4 +-- .../startup/bl_ui/properties_data_curve.py | 2 +- .../startup/bl_ui/space_toolsystem_toolbar.py | 8 +++--- scripts/startup/bl_ui/space_view3d.py | 2 +- source/blender/blenkernel/intern/attribute.cc | 2 +- .../blenkernel/intern/attribute_access.cc | 2 +- source/blender/blenkernel/intern/curve.cc | 4 +-- source/blender/blenkernel/intern/linestyle.cc | 2 +- .../blender/blenkernel/intern/writeffmpeg.cc | 4 +-- .../editors/animation/anim_channels_edit.cc | 2 +- .../blender/editors/animation/fmodifier_ui.cc | 4 +-- source/blender/editors/curve/editcurve.cc | 6 ++--- source/blender/editors/curve/editcurve_add.cc | 12 ++++----- .../editors/gpencil_legacy/gpencil_convert.cc | 4 +-- .../editors/gpencil_legacy/gpencil_edit.cc | 2 +- .../editors/gpencil_legacy/gpencil_uv.cc | 2 +- source/blender/editors/mesh/editmesh_inset.cc | 2 +- .../editors/mesh/editmesh_mask_extract.cc | 2 +- .../editors/object/object_bake_simulation.cc | 2 +- .../blender/editors/render/render_internal.cc | 2 +- .../blender/editors/render/render_opengl.cc | 2 +- .../blender/editors/space_graph/graph_edit.cc | 4 +-- .../editors/space_graph/graph_slider_ops.cc | 2 +- source/blender/editors/space_node/node_add.cc | 4 +-- .../blender/editors/space_node/node_group.cc | 10 +++---- .../space_sequencer/sequencer_retiming.cc | 16 ++++++------ .../editors/transform/transform_mode_bend.cc | 4 +-- .../blender/makesrna/intern/rna_armature.cc | 4 +-- source/blender/makesrna/intern/rna_brush.cc | 6 ++--- source/blender/makesrna/intern/rna_color.cc | 2 +- .../blender/makesrna/intern/rna_constraint.cc | 2 +- source/blender/makesrna/intern/rna_curve.cc | 26 +++++++++---------- source/blender/makesrna/intern/rna_curves.cc | 2 +- source/blender/makesrna/intern/rna_fcurve.cc | 2 +- .../makesrna/intern/rna_gpencil_legacy.cc | 2 +- source/blender/makesrna/intern/rna_key.cc | 2 +- .../blender/makesrna/intern/rna_linestyle.cc | 8 +++--- .../blender/makesrna/intern/rna_main_api.cc | 4 +-- .../blender/makesrna/intern/rna_modifier.cc | 2 +- .../blender/makesrna/intern/rna_nodetree.cc | 2 +- .../blender/makesrna/intern/rna_object_api.cc | 4 +-- source/blender/makesrna/intern/rna_scene.cc | 2 +- .../blender/makesrna/intern/rna_sequencer.cc | 2 +- source/blender/makesrna/intern/rna_space.cc | 4 +-- source/blender/makesrna/intern/rna_ui.cc | 4 +-- source/blender/makesrna/intern/rna_userdef.cc | 4 +-- source/blender/makesrna/intern/rna_wm_api.cc | 2 +- source/blender/modifiers/intern/MOD_nodes.cc | 2 +- source/blender/nodes/NOD_static_types.h | 4 +-- .../nodes/node_geo_attribute_capture.cc | 2 +- .../geometry/nodes/node_geo_curve_fillet.cc | 6 ++--- ...node_geo_curve_primitive_bezier_segment.cc | 2 +- ...de_geo_curve_primitive_quadratic_bezier.cc | 2 +- .../geometry/nodes/node_geo_curve_resample.cc | 2 +- .../nodes/node_geo_curve_set_handle_type.cc | 2 +- .../nodes/node_geo_curve_to_points.cc | 2 +- .../nodes/node_geo_set_curve_handles.cc | 2 +- .../geometry/nodes/node_geo_set_material.cc | 6 ++--- source/blender/python/intern/bpy_props.cc | 2 +- source/blender/render/intern/engine.cc | 2 +- source/blender/sequencer/intern/strip_edit.cc | 6 ++--- source/creator/creator_args.cc | 2 +- tests/python/ui_simulate/test_undo.py | 2 +- 70 files changed, 140 insertions(+), 140 deletions(-) diff --git a/doc/python_api/examples/bpy.types.Depsgraph.4.py b/doc/python_api/examples/bpy.types.Depsgraph.4.py index 468f9610ca2..451f501061e 100644 --- a/doc/python_api/examples/bpy.types.Depsgraph.4.py +++ b/doc/python_api/examples/bpy.types.Depsgraph.4.py @@ -19,7 +19,7 @@ When is used on evaluated object all modifiers are taken into account. .. note:: The result mesh is owned by the object. It can be freed by calling `object.to_mesh_clear()`. .. note:: - The result mesh must be treated as temporary, and can not be referenced from objects in the main + The result mesh must be treated as temporary, and cannot be referenced from objects in the main database. If the mesh intended to be used in a persistent manner use bpy.data.meshes.new_from_object() instead. .. note:: If object does not have geometry (i.e. camera) the functions returns None. @@ -40,7 +40,7 @@ class OBJECT_OT_object_to_mesh(bpy.types.Operator): return {'CANCELLED'} # Avoid annoying None checks later on. if obj.type not in {'MESH', 'CURVE', 'SURFACE', 'FONT', 'META'}: - self.report({'INFO'}, "Object can not be converted to mesh") + self.report({'INFO'}, "Object cannot be converted to mesh") return {'CANCELLED'} depsgraph = context.evaluated_depsgraph_get() # Invoke to_mesh() for original object. diff --git a/doc/python_api/examples/bpy.types.Depsgraph.5.py b/doc/python_api/examples/bpy.types.Depsgraph.5.py index 0f578b37d47..4811f77bbdf 100644 --- a/doc/python_api/examples/bpy.types.Depsgraph.5.py +++ b/doc/python_api/examples/bpy.types.Depsgraph.5.py @@ -36,7 +36,7 @@ class OBJECT_OT_mesh_from_object(bpy.types.Operator): return {'CANCELLED'} # Avoid annoying None checks later on. if obj.type not in {'MESH', 'CURVE', 'SURFACE', 'FONT', 'META'}: - self.report({'INFO'}, "Object can not be converted to mesh") + self.report({'INFO'}, "Object cannot be converted to mesh") return {'CANCELLED'} depsgraph = context.evaluated_depsgraph_get() object_eval = obj.evaluated_get(depsgraph) diff --git a/doc/python_api/examples/bpy.types.Depsgraph.7.py b/doc/python_api/examples/bpy.types.Depsgraph.7.py index afea8dfd618..cbd19d60c93 100644 --- a/doc/python_api/examples/bpy.types.Depsgraph.7.py +++ b/doc/python_api/examples/bpy.types.Depsgraph.7.py @@ -17,7 +17,7 @@ a text object, an error will be reported. .. note:: The resulting curve is owned by the object. It can be freed by calling `object.to_curve_clear()`. .. note:: - The resulting curve must be treated as temporary, and can not be referenced from objects in the main + The resulting curve must be treated as temporary, and cannot be referenced from objects in the main database. """ import bpy @@ -35,7 +35,7 @@ class OBJECT_OT_object_to_curve(bpy.types.Operator): self.report({'INFO'}, "No active object to convert to curve") return {'CANCELLED'} if obj.type not in {'CURVE', 'FONT'}: - self.report({'INFO'}, "Object can not be converted to curve") + self.report({'INFO'}, "Object cannot be converted to curve") return {'CANCELLED'} depsgraph = context.evaluated_depsgraph_get() # Invoke to_curve() without applying modifiers. diff --git a/intern/libmv/libmv/simple_pipeline/reconstruction_scale.cc b/intern/libmv/libmv/simple_pipeline/reconstruction_scale.cc index 04fbb536d31..4e29574e6b0 100644 --- a/intern/libmv/libmv/simple_pipeline/reconstruction_scale.cc +++ b/intern/libmv/libmv/simple_pipeline/reconstruction_scale.cc @@ -44,7 +44,7 @@ void EuclideanScaleToUnity(EuclideanReconstruction* reconstruction) { } if (max_distance == 0.0) { - LG << "Cameras position variance is too small, can not rescale"; + LG << "Cameras position variance is too small, cannot rescale"; return; } diff --git a/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/scripts/modules/bl_i18n_utils/bl_extract_messages.py index f7c44f54aa0..8621f1f3996 100644 --- a/scripts/modules/bl_i18n_utils/bl_extract_messages.py +++ b/scripts/modules/bl_i18n_utils/bl_extract_messages.py @@ -778,7 +778,7 @@ def dump_src_messages(msgs, reports, settings): def clean_str(s): # The encode/decode to/from 'raw_unicode_escape' allows to transform the C-type unicode hexadecimal escapes - # (like '\u2715' for the '×' symbol) back into a proper unicode character. + # (like '\u00d7' for the '×' symbol) back into a proper unicode character. return "".join( m.group("clean") for m in _clean_str(s) ).encode('raw_unicode_escape').decode('raw_unicode_escape') diff --git a/scripts/presets/keyconfig/keymap_data/blender_default.py b/scripts/presets/keyconfig/keymap_data/blender_default.py index 030ca30f4c7..8c9f2fee40f 100644 --- a/scripts/presets/keyconfig/keymap_data/blender_default.py +++ b/scripts/presets/keyconfig/keymap_data/blender_default.py @@ -6963,7 +6963,7 @@ def km_image_editor_tool_generic_sample(params): def km_image_editor_tool_uv_cursor(params): return ( - "Image Editor Tool: Uv, Cursor", + "Image Editor Tool: UV, Cursor", {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'}, {"items": [ ("uv.cursor_set", {"type": params.tool_mouse, "value": 'PRESS'}, None), @@ -6976,7 +6976,7 @@ def km_image_editor_tool_uv_cursor(params): def km_image_editor_tool_uv_select(params, *, fallback): return ( - _fallback_id("Image Editor Tool: Uv, Tweak", fallback), + _fallback_id("Image Editor Tool: UV, Tweak", fallback), {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'}, {"items": [ *([] if (fallback and (params.select_mouse == 'RIGHTMOUSE')) else _template_items_tool_select( @@ -6994,7 +6994,7 @@ def km_image_editor_tool_uv_select(params, *, fallback): def km_image_editor_tool_uv_select_box(params, *, fallback): return ( - _fallback_id("Image Editor Tool: Uv, Select Box", fallback), + _fallback_id("Image Editor Tool: UV, Select Box", fallback), {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'}, {"items": [ *([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions_simple( @@ -7008,7 +7008,7 @@ def km_image_editor_tool_uv_select_box(params, *, fallback): def km_image_editor_tool_uv_select_circle(params, *, fallback): return ( - _fallback_id("Image Editor Tool: Uv, Select Circle", fallback), + _fallback_id("Image Editor Tool: UV, Select Circle", fallback), {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'}, {"items": [ *([] if (fallback and not params.use_fallback_tool) else _template_items_tool_select_actions_simple( @@ -7023,7 +7023,7 @@ def km_image_editor_tool_uv_select_circle(params, *, fallback): def km_image_editor_tool_uv_select_lasso(params, *, fallback): return ( - _fallback_id("Image Editor Tool: Uv, Select Lasso", fallback), + _fallback_id("Image Editor Tool: UV, Select Lasso", fallback), {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'}, {"items": [ @@ -7037,7 +7037,7 @@ def km_image_editor_tool_uv_select_lasso(params, *, fallback): def km_image_editor_tool_uv_rip_region(params): return ( - "Image Editor Tool: Uv, Rip Region", + "Image Editor Tool: UV, Rip Region", {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'}, {"items": [ ("uv.rip_move", {**params.tool_maybe_tweak_event, **params.tool_modifier}, @@ -7048,7 +7048,7 @@ def km_image_editor_tool_uv_rip_region(params): def km_image_editor_tool_uv_sculpt_stroke(params): return ( - "Image Editor Tool: Uv, Sculpt Stroke", + "Image Editor Tool: UV, Sculpt Stroke", {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'}, {"items": [ ("sculpt.uv_sculpt_stroke", {"type": params.tool_mouse, "value": 'PRESS'}, None), @@ -7067,7 +7067,7 @@ def km_image_editor_tool_uv_sculpt_stroke(params): def km_image_editor_tool_uv_move(params): return ( - "Image Editor Tool: Uv, Move", + "Image Editor Tool: UV, Move", {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'}, {"items": [ ("transform.translate", {**params.tool_maybe_tweak_event, **params.tool_modifier}, @@ -7078,7 +7078,7 @@ def km_image_editor_tool_uv_move(params): def km_image_editor_tool_uv_rotate(params): return ( - "Image Editor Tool: Uv, Rotate", + "Image Editor Tool: UV, Rotate", {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'}, {"items": [ ("transform.rotate", {**params.tool_maybe_tweak_event, **params.tool_modifier}, @@ -7089,7 +7089,7 @@ def km_image_editor_tool_uv_rotate(params): def km_image_editor_tool_uv_scale(params): return ( - "Image Editor Tool: Uv, Scale", + "Image Editor Tool: UV, Scale", {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'}, {"items": [ ("transform.resize", {**params.tool_maybe_tweak_event, **params.tool_modifier}, diff --git a/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py b/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py index 9ccfd81d2fb..b66cf68aa24 100644 --- a/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py +++ b/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py @@ -4373,7 +4373,7 @@ def km_3d_view_tool_select(params): def km_image_editor_tool_uv_select(params): return ( - "Image Editor Tool: Uv, Tweak", + "Image Editor Tool: UV, Tweak", {"space_type": 'IMAGE_EDITOR', "region_type": 'WINDOW'}, {"items": _template_items_tool_select(params, "uv.select", extend="extend")}, ) diff --git a/scripts/startup/bl_operators/wm.py b/scripts/startup/bl_operators/wm.py index 2a98c1e1fec..4532e37dcdc 100644 --- a/scripts/startup/bl_operators/wm.py +++ b/scripts/startup/bl_operators/wm.py @@ -1240,7 +1240,7 @@ def _wm_doc_get_id(doc_id, *, do_url=True, url_prefix="", report=None): if rna_class is None: if report is not None: - report({'ERROR'}, rpt_("Type \"%s\" can not be found") % class_name) + report({'ERROR'}, rpt_("Type \"%s\" cannot be found") % class_name) return None # Detect if this is a inherited member and use that name instead. @@ -1907,7 +1907,7 @@ class WM_OT_properties_edit(Operator): item = eval("context.%s" % data_path) if (item.id_data and item.id_data.override_library and item.id_data.override_library.reference): - self.report({'ERROR'}, "Properties from override data can not be edited") + self.report({'ERROR'}, "Properties from override data cannot be edited") return {'CANCELLED'} # Set operator's property type with the type of the existing property, to display the right settings. diff --git a/scripts/startup/bl_ui/properties_data_curve.py b/scripts/startup/bl_ui/properties_data_curve.py index 3db97b704b3..1ac2148b3c9 100644 --- a/scripts/startup/bl_ui/properties_data_curve.py +++ b/scripts/startup/bl_ui/properties_data_curve.py @@ -289,7 +289,7 @@ class DATA_PT_active_spline(CurveButtonsPanelActive, Panel): sub.prop(act_spline, "use_cyclic_v", text="V") if act_spline.type == 'NURBS': - sub = col.column(heading="Bezier", align=True) + sub = col.column(heading="Bézier", align=True) # sub.active = (not act_spline.use_cyclic_u) sub.prop(act_spline, "use_bezier_u", text="U") diff --git a/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 4a97fa13400..4539c40895f 100644 --- a/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -1858,7 +1858,7 @@ class _defs_image_uv_transform: icon="ops.transform.translate", widget="IMAGE_GGT_gizmo2d_translate", operator="transform.translate", - keymap="Image Editor Tool: Uv, Move", + keymap="Image Editor Tool: UV, Move", ) @ToolDef.from_fn @@ -1869,7 +1869,7 @@ class _defs_image_uv_transform: icon="ops.transform.rotate", widget="IMAGE_GGT_gizmo2d_rotate", operator="transform.rotate", - keymap="Image Editor Tool: Uv, Rotate", + keymap="Image Editor Tool: UV, Rotate", ) @ToolDef.from_fn @@ -1880,7 +1880,7 @@ class _defs_image_uv_transform: icon="ops.transform.resize", widget="IMAGE_GGT_gizmo2d_resize", operator="transform.resize", - keymap="Image Editor Tool: Uv, Scale", + keymap="Image Editor Tool: UV, Scale", ) @ToolDef.from_fn @@ -2010,7 +2010,7 @@ class _defs_image_uv_sculpt: attr="uv_sculpt_tool", tooldef_keywords=dict( operator="sculpt.uv_sculpt_stroke", - keymap="Image Editor Tool: Uv, Sculpt Stroke", + keymap="Image Editor Tool: UV, Sculpt Stroke", draw_cursor=draw_cursor, options={'KEYMAP_FALLBACK'}, ), diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index 474ce48bebd..f3d4a01c089 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -2403,7 +2403,7 @@ class VIEW3D_MT_curve_add(Menu): layout.operator_context = 'INVOKE_REGION_WIN' - layout.operator("curve.primitive_bezier_curve_add", text="Bezier", icon='CURVE_BEZCURVE') + layout.operator("curve.primitive_bezier_curve_add", text="Bézier", icon='CURVE_BEZCURVE') layout.operator("curve.primitive_bezier_circle_add", text="Circle", icon='CURVE_BEZCIRCLE') layout.separator() diff --git a/source/blender/blenkernel/intern/attribute.cc b/source/blender/blenkernel/intern/attribute.cc index 3df78a68dac..b9837058413 100644 --- a/source/blender/blenkernel/intern/attribute.cc +++ b/source/blender/blenkernel/intern/attribute.cc @@ -176,7 +176,7 @@ bool BKE_id_attribute_rename(ID *id, return false; } if (STREQ(new_name, "")) { - BKE_report(reports, RPT_ERROR, "Attribute name can not be empty"); + BKE_report(reports, RPT_ERROR, "Attribute name cannot be empty"); return false; } diff --git a/source/blender/blenkernel/intern/attribute_access.cc b/source/blender/blenkernel/intern/attribute_access.cc index db9ad7e4b45..163e20708df 100644 --- a/source/blender/blenkernel/intern/attribute_access.cc +++ b/source/blender/blenkernel/intern/attribute_access.cc @@ -107,7 +107,7 @@ std::ostream &operator<<(std::ostream &stream, const AttributeIDRef &attribute_i } const char *no_procedural_access_message = N_( - "This attribute can not be accessed in a procedural context"); + "This attribute cannot be accessed in a procedural context"); bool allow_procedural_attribute_access(StringRef attribute_name) { diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc index 585d9255e08..391ace21270 100644 --- a/source/blender/blenkernel/intern/curve.cc +++ b/source/blender/blenkernel/intern/curve.cc @@ -4767,10 +4767,10 @@ bool BKE_nurb_valid_message(const int pnts, msg_template = RPT_("Must have more control points than Order"); break; case NURBSValidationStatus::MoreRowsForBezierRequired: - msg_template = RPT_("%d more %s row(s) needed for Bezier"); + msg_template = RPT_("%d more %s row(s) needed for Bézier"); break; case NURBSValidationStatus::MorePointsForBezierRequired: - msg_template = RPT_("%d more point(s) needed for Bezier"); + msg_template = RPT_("%d more point(s) needed for Bézier"); break; } diff --git a/source/blender/blenkernel/intern/linestyle.cc b/source/blender/blenkernel/intern/linestyle.cc index 15c42719caf..7eb4e081232 100644 --- a/source/blender/blenkernel/intern/linestyle.cc +++ b/source/blender/blenkernel/intern/linestyle.cc @@ -673,7 +673,7 @@ IDTypeInfo IDType_ID_LS = { static const char *modifier_name[LS_MODIFIER_NUM] = { nullptr, "Along Stroke", "Distance from Camera", "Distance from Object", - "Material", "Sampling", "Bezier Curve", "Sinus Displacement", + "Material", "Sampling", "Bézier Curve", "Sinus Displacement", "Spatial Noise", "Perlin Noise 1D", "Perlin Noise 2D", "Backbone Stretcher", "Tip Remover", "Calligraphy", "Polygonalization", "Guiding Lines", "Blueprint", "2D Offset", "2D Transform", "Tangent", diff --git a/source/blender/blenkernel/intern/writeffmpeg.cc b/source/blender/blenkernel/intern/writeffmpeg.cc index e6cf9ef96d9..6c524182640 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.cc +++ b/source/blender/blenkernel/intern/writeffmpeg.cc @@ -1195,7 +1195,7 @@ static int start_ffmpeg_impl(FFMpegContext *context, of = avformat_alloc_context(); if (!of) { - BKE_report(reports, RPT_ERROR, "Can't allocate FFMPEG format context"); + BKE_report(reports, RPT_ERROR, "Can't allocate FFmpeg format context"); return 0; } @@ -1266,7 +1266,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/anim_channels_edit.cc b/source/blender/editors/animation/anim_channels_edit.cc index ddb3617f4a9..551adc084e6 100644 --- a/source/blender/editors/animation/anim_channels_edit.cc +++ b/source/blender/editors/animation/anim_channels_edit.cc @@ -4312,7 +4312,7 @@ static void ANIM_OT_channel_view_pick(wmOperatorType *ot) } static const EnumPropertyItem channel_bake_key_options[] = { - {BEZT_IPO_BEZ, "BEZIER", 0, "Bezier", "New keys will be beziers"}, + {BEZT_IPO_BEZ, "BEZIER", 0, "Bézier", "New keys will be Bézier"}, {BEZT_IPO_LIN, "LIN", 0, "Linear", "New keys will be linear"}, {BEZT_IPO_CONST, "CONST", 0, "Constant", "New keys will be constant"}, {0, nullptr, 0, nullptr, nullptr}, diff --git a/source/blender/editors/animation/fmodifier_ui.cc b/source/blender/editors/animation/fmodifier_ui.cc index 1511081e99b..f7826409744 100644 --- a/source/blender/editors/animation/fmodifier_ui.cc +++ b/source/blender/editors/animation/fmodifier_ui.cc @@ -407,9 +407,9 @@ static void generator_panel_draw(const bContext *C, Panel *panel) uiItemFullR(first_row, ptr, prop, 0, 0, UI_ITEM_NONE, IFACE_("y = (Ax + B)"), ICON_NONE); uiItemFullR(first_row, ptr, prop, 1, 0, UI_ITEM_NONE, "", ICON_NONE); for (int i = 2; i < data->arraysize - 1; i += 2) { - /* \u2715 is the multiplication symbol. */ + /* \u00d7 is the multiplication symbol. */ uiLayout *row = uiLayoutRow(col, true); - uiItemFullR(row, ptr, prop, i, 0, UI_ITEM_NONE, IFACE_("\u2715 (Ax + B)"), ICON_NONE); + uiItemFullR(row, ptr, prop, i, 0, UI_ITEM_NONE, IFACE_("\u00d7 (Ax + B)"), ICON_NONE); uiItemFullR(row, ptr, prop, i + 1, 0, UI_ITEM_NONE, "", ICON_NONE); } break; diff --git a/source/blender/editors/curve/editcurve.cc b/source/blender/editors/curve/editcurve.cc index b346ce67328..ca9136712d4 100644 --- a/source/blender/editors/curve/editcurve.cc +++ b/source/blender/editors/curve/editcurve.cc @@ -3937,7 +3937,7 @@ void CURVE_OT_spline_type_set(wmOperatorType *ot) { static const EnumPropertyItem type_items[] = { {CU_POLY, "POLY", 0, "Poly", ""}, - {CU_BEZIER, "BEZIER", 0, "Bezier", ""}, + {CU_BEZIER, "BEZIER", 0, "Bézier", ""}, {CU_NURBS, "NURBS", 0, "NURBS", ""}, {0, nullptr, 0, nullptr, nullptr}, }; @@ -3961,7 +3961,7 @@ void CURVE_OT_spline_type_set(wmOperatorType *ot) "use_handles", false, "Handles", - "Use handles when converting bezier curves into polygons"); + "Use handles when converting Bézier curves into polygons"); } /** \} */ @@ -6789,7 +6789,7 @@ static int curve_decimate_exec(bContext *C, wmOperator *op) } if (all_supported_multi == false) { - BKE_report(op->reports, RPT_WARNING, "Only bezier curves are supported"); + BKE_report(op->reports, RPT_WARNING, "Only Bézier curves are supported"); } return OPERATOR_FINISHED; diff --git a/source/blender/editors/curve/editcurve_add.cc b/source/blender/editors/curve/editcurve_add.cc index 2feeeb7d0e2..e18710c5135 100644 --- a/source/blender/editors/curve/editcurve_add.cc +++ b/source/blender/editors/curve/editcurve_add.cc @@ -56,9 +56,9 @@ static const char *get_curve_defname(int type) if ((type & CU_TYPE) == CU_BEZIER) { switch (stype) { case CU_PRIM_CURVE: - return CTX_DATA_(BLT_I18NCONTEXT_ID_CURVE_LEGACY, "BezierCurve"); + return CTX_DATA_(BLT_I18NCONTEXT_ID_CURVE_LEGACY, "BézierCurve"); case CU_PRIM_CIRCLE: - return CTX_DATA_(BLT_I18NCONTEXT_ID_CURVE_LEGACY, "BezierCircle"); + return CTX_DATA_(BLT_I18NCONTEXT_ID_CURVE_LEGACY, "BézierCircle"); case CU_PRIM_PATH: return CTX_DATA_(BLT_I18NCONTEXT_ID_CURVE_LEGACY, "CurvePath"); default: @@ -584,8 +584,8 @@ static int add_primitive_bezier_exec(bContext *C, wmOperator *op) void CURVE_OT_primitive_bezier_curve_add(wmOperatorType *ot) { /* identifiers */ - ot->name = "Add Bezier"; - ot->description = "Construct a Bezier Curve"; + ot->name = "Add Bézier"; + ot->description = "Construct a Bézier Curve"; ot->idname = "CURVE_OT_primitive_bezier_curve_add"; /* api callbacks */ @@ -607,8 +607,8 @@ static int add_primitive_bezier_circle_exec(bContext *C, wmOperator *op) void CURVE_OT_primitive_bezier_circle_add(wmOperatorType *ot) { /* identifiers */ - ot->name = "Add Bezier Circle"; - ot->description = "Construct a Bezier Circle"; + ot->name = "Add Bézier Circle"; + ot->description = "Construct a Bézier Circle"; ot->idname = "CURVE_OT_primitive_bezier_circle_add"; /* api callbacks */ diff --git a/source/blender/editors/gpencil_legacy/gpencil_convert.cc b/source/blender/editors/gpencil_legacy/gpencil_convert.cc index 9ae1c9cf23b..bf5704057b6 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_convert.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_convert.cc @@ -99,12 +99,12 @@ enum { /* RNA enum define */ static const EnumPropertyItem prop_gpencil_convertmodes[] = { {GP_STROKECONVERT_PATH, "PATH", ICON_CURVE_PATH, "Path", "Animation path"}, - {GP_STROKECONVERT_CURVE, "CURVE", ICON_CURVE_BEZCURVE, "Bezier Curve", "Smooth Bezier curve"}, + {GP_STROKECONVERT_CURVE, "CURVE", ICON_CURVE_BEZCURVE, "Bézier Curve", "Smooth Bézier curve"}, {GP_STROKECONVERT_POLY, "POLY", ICON_MESH_DATA, "Polygon Curve", - "Bezier curve with straight-line segments (vector handles)"}, + "Bézier curve with straight-line segments (vector handles)"}, {0, nullptr, 0, nullptr, nullptr}, }; diff --git a/source/blender/editors/gpencil_legacy/gpencil_edit.cc b/source/blender/editors/gpencil_legacy/gpencil_edit.cc index 46fbcc8f4d4..d2bb28d8088 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_edit.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_edit.cc @@ -1666,7 +1666,7 @@ static int gpencil_strokes_paste_exec(bContext *C, wmOperator *op) } else if ((BKE_gpencil_layer_is_editable(gpl) == false) && (type == GP_COPY_TO_ACTIVE)) { BKE_report( - op->reports, RPT_ERROR, "Can not paste strokes when active layer is hidden or locked"); + op->reports, RPT_ERROR, "Cannot paste strokes when active layer is hidden or locked"); return OPERATOR_CANCELLED; } else { diff --git a/source/blender/editors/gpencil_legacy/gpencil_uv.cc b/source/blender/editors/gpencil_legacy/gpencil_uv.cc index 0052d0639e4..daac9219fbb 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_uv.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_uv.cc @@ -79,7 +79,7 @@ enum { static void gpencil_uv_transform_update_header(wmOperator *op, bContext *C) { const int mode = RNA_enum_get(op->ptr, "mode"); - const char *str = RPT_("Confirm: Enter/LClick, Cancel: (Esc/RClick) %s"); + const char *str = RPT_("Confirm: Enter/LMB, Cancel: (Esc/RMB) %s"); char msg[UI_MAX_DRAW_STR]; ScrArea *area = CTX_wm_area(C); diff --git a/source/blender/editors/mesh/editmesh_inset.cc b/source/blender/editors/mesh/editmesh_inset.cc index 9b313f646c6..23e8f2fd08e 100644 --- a/source/blender/editors/mesh/editmesh_inset.cc +++ b/source/blender/editors/mesh/editmesh_inset.cc @@ -74,7 +74,7 @@ static void edbm_inset_update_header(wmOperator *op, bContext *C) InsetData *opdata = static_cast(op->customdata); const char *str = RPT_( - "Confirm: Enter/LClick, Cancel: (Esc/RClick), Thickness: %s, " + "Confirm: Enter/LMB, Cancel: (Esc/RMB), Thickness: %s, " "Depth (Ctrl to tweak): %s (%s), Outset (O): (%s), Boundary (B): (%s), Individual (I): " "(%s)"); diff --git a/source/blender/editors/mesh/editmesh_mask_extract.cc b/source/blender/editors/mesh/editmesh_mask_extract.cc index 10617720e19..3527d1cb8fb 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.cc +++ b/source/blender/editors/mesh/editmesh_mask_extract.cc @@ -54,7 +54,7 @@ static bool geometry_extract_poll(bContext *C) Object *ob = CTX_data_active_object(C); if (ob != nullptr && ob->mode == OB_MODE_SCULPT) { if (ob->sculpt->bm) { - CTX_wm_operator_poll_msg_set(C, "The geometry can not be extracted with dyntopo activated"); + CTX_wm_operator_poll_msg_set(C, "The geometry cannot be extracted with dyntopo activated"); return false; } return ED_operator_object_active_editable_mesh(C); diff --git a/source/blender/editors/object/object_bake_simulation.cc b/source/blender/editors/object/object_bake_simulation.cc index 1aff69f7fc2..feaead2faf7 100644 --- a/source/blender/editors/object/object_bake_simulation.cc +++ b/source/blender/editors/object/object_bake_simulation.cc @@ -835,7 +835,7 @@ static Vector bake_single_node_gather_bake_request(bContext *C, const std::optional bake_path = bake::get_node_bake_path( *bmain, *object, nmd, bake_id); if (!bake_path.has_value()) { - BKE_report(op->reports, RPT_ERROR, "Can not determine bake location on disk"); + BKE_report(op->reports, RPT_ERROR, "Cannot determine bake location on disk"); return {}; } request.path = std::move(*bake_path); diff --git a/source/blender/editors/render/render_internal.cc b/source/blender/editors/render/render_internal.cc index 3db800d0b47..63febd665e7 100644 --- a/source/blender/editors/render/render_internal.cc +++ b/source/blender/editors/render/render_internal.cc @@ -1184,7 +1184,7 @@ void RENDER_OT_render(wmOperatorType *ot) "write_still", false, "Write Image", - "Save rendered the image to the output path (used only when animation is disabled)"); + "Save the rendered image to the output path (used only when animation is disabled)"); prop = RNA_def_boolean(ot->srna, "use_viewport", false, diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc index ff3d040a5f9..5b439f65d91 100644 --- a/source/blender/editors/render/render_opengl.cc +++ b/source/blender/editors/render/render_opengl.cc @@ -1372,7 +1372,7 @@ void RENDER_OT_opengl(wmOperatorType *ot) "write_still", false, "Write Image", - "Save rendered the image to the output path (used only when animation is disabled)"); + "Save the rendered image to the output path (used only when animation is disabled)"); RNA_def_property_flag(prop, PROP_SKIP_SAVE); prop = RNA_def_boolean(ot->srna, "view_context", diff --git a/source/blender/editors/space_graph/graph_edit.cc b/source/blender/editors/space_graph/graph_edit.cc index dea2b636a1b..a16a3f2a382 100644 --- a/source/blender/editors/space_graph/graph_edit.cc +++ b/source/blender/editors/space_graph/graph_edit.cc @@ -2646,14 +2646,14 @@ void GRAPH_OT_equalize_handles(wmOperatorType *ot) prop_graphkeys_equalize_handles_sides, 0, "Side", - "Side of the keyframes' bezier handles to affect"); + "Side of the keyframes' Bézier handles to affect"); RNA_def_float(ot->srna, "handle_length", 5.0f, 0.1f, FLT_MAX, "Handle Length", - "Length to make selected keyframes' bezier handles", + "Length to make selected keyframes' Bézier handles", 1.0f, 50.0f); RNA_def_boolean( diff --git a/source/blender/editors/space_graph/graph_slider_ops.cc b/source/blender/editors/space_graph/graph_slider_ops.cc index fb746eb34c8..aa5dfb4eeb4 100644 --- a/source/blender/editors/space_graph/graph_slider_ops.cc +++ b/source/blender/editors/space_graph/graph_slider_ops.cc @@ -432,7 +432,7 @@ static void decimate_graph_keys(bAnimContext *ac, float factor, float error_sq_m LISTBASE_FOREACH (bAnimListElem *, ale, &anim_data) { if (!decimate_fcurve(ale, factor, error_sq_max)) { /* The selection contains unsupported keyframe types! */ - WM_report(RPT_WARNING, "Decimate: Skipping non linear/bezier keyframes!"); + WM_report(RPT_WARNING, "Decimate: Skipping non linear/Bézier keyframes!"); } ale->update |= ANIM_UPDATE_DEFAULT; diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc index 9355480e466..df4267ea3ec 100644 --- a/source/blender/editors/space_node/node_add.cc +++ b/source/blender/editors/space_node/node_add.cc @@ -266,7 +266,7 @@ static bool node_group_add_poll(const bNodeTree &node_tree, if (disabled_hint) { BKE_reportf(&reports, RPT_ERROR, - "Can not add node group '%s' to '%s':\n %s", + "Cannot add node group '%s' to '%s':\n %s", node_group.id.name + 2, node_tree.id.name + 2, disabled_hint); @@ -274,7 +274,7 @@ static bool node_group_add_poll(const bNodeTree &node_tree, else { BKE_reportf(&reports, RPT_ERROR, - "Can not add node group '%s' to '%s'", + "Cannot add node group '%s' to '%s'", node_group.id.name + 2, node_tree.id.name + 2); } diff --git a/source/blender/editors/space_node/node_group.cc b/source/blender/editors/space_node/node_group.cc index 727667b736c..f97870b9427 100644 --- a/source/blender/editors/space_node/node_group.cc +++ b/source/blender/editors/space_node/node_group.cc @@ -737,12 +737,12 @@ static bool node_group_make_test_selected(bNodeTree &ntree, if (disabled_hint) { BKE_reportf(&reports, RPT_WARNING, - "Can not add node '%s' in a group:\n %s", + "Cannot add node '%s' in a group:\n %s", node->name, disabled_hint); } else { - BKE_reportf(&reports, RPT_WARNING, "Can not add node '%s' in a group", node->name); + BKE_reportf(&reports, RPT_WARNING, "Cannot add node '%s' in a group", node->name); } return false; } @@ -781,7 +781,7 @@ static bool node_group_make_test_selected(bNodeTree &ntree, if (input_selected && !output_selected) { BKE_reportf(&reports, RPT_WARNING, - "Can not add zone input node '%s' to a group without its paired output '%s'", + "Cannot add zone input node '%s' to a group without its paired output '%s'", input_node->name, output_node->name); return false; @@ -789,7 +789,7 @@ static bool node_group_make_test_selected(bNodeTree &ntree, if (output_selected && !input_selected) { BKE_reportf(&reports, RPT_WARNING, - "Can not add zone output node '%s' to a group without its paired input '%s'", + "Cannot add zone output node '%s' to a group without its paired input '%s'", output_node->name, input_node->name); return false; @@ -1306,7 +1306,7 @@ static int node_group_insert_exec(bContext *C, wmOperator *op) } if (ntreeContainsTree(reinterpret_cast(group->id), ngroup)) { BKE_reportf( - op->reports, RPT_WARNING, "Can not insert group '%s' in '%s'", group->name, gnode->name); + op->reports, RPT_WARNING, "Cannot insert group '%s' in '%s'", group->name, gnode->name); return OPERATOR_CANCELLED; } } diff --git a/source/blender/editors/space_sequencer/sequencer_retiming.cc b/source/blender/editors/space_sequencer/sequencer_retiming.cc index b4905103df8..2f39fd3092f 100644 --- a/source/blender/editors/space_sequencer/sequencer_retiming.cc +++ b/source/blender/editors/space_sequencer/sequencer_retiming.cc @@ -139,7 +139,7 @@ static bool retiming_poll(bContext *C) return false; } if (!SEQ_retiming_is_allowed(seq)) { - CTX_wm_operator_poll_msg_set(C, "This strip type can not be retimed"); + CTX_wm_operator_poll_msg_set(C, "This strip type cannot be retimed"); return false; } return true; @@ -205,7 +205,7 @@ static bool retiming_key_add_new_for_seq(bContext *C, const SeqRetimingKey *key = SEQ_retiming_find_segment_start_key(seq, frame_index); if (key != nullptr && SEQ_retiming_key_is_transition_start(key)) { - BKE_report(op->reports, RPT_WARNING, "Can not create key inside of speed transition"); + BKE_report(op->reports, RPT_WARNING, "Cannot create key inside of speed transition"); return false; } @@ -325,18 +325,18 @@ static bool freeze_frame_add_new_for_seq(const bContext *C, } if (SEQ_retiming_key_is_transition_start(key)) { - BKE_report(op->reports, RPT_WARNING, "Can not create key inside of speed transition"); + BKE_report(op->reports, RPT_WARNING, "Cannot create key inside of speed transition"); return false; } if (key == nullptr) { - BKE_report(op->reports, RPT_WARNING, "Can not create freeze frame"); + BKE_report(op->reports, RPT_WARNING, "Cannot create freeze frame"); return false; } SeqRetimingKey *freeze = SEQ_retiming_add_freeze_frame(scene, seq, key, duration); if (freeze == nullptr) { - BKE_report(op->reports, RPT_WARNING, "Can not create freeze frame"); + BKE_report(op->reports, RPT_WARNING, "Cannot create freeze frame"); return false; } @@ -449,14 +449,14 @@ static bool transition_add_new_for_seq(const bContext *C, } if (SEQ_retiming_is_last_key(seq, key) || key->strip_frame_index == 0) { - BKE_report(op->reports, RPT_WARNING, "Can not create transition from first or last key"); + BKE_report(op->reports, RPT_WARNING, "Cannot create transition from first or last key"); return false; } SeqRetimingKey *transition = SEQ_retiming_add_transition(scene, seq, key, duration); if (transition == nullptr) { - BKE_report(op->reports, RPT_WARNING, "Can not create transition"); + BKE_report(op->reports, RPT_WARNING, "Cannot create transition"); return false; } @@ -676,7 +676,7 @@ void SEQUENCER_OT_retiming_segment_speed_set(wmOperatorType *ot) RNA_def_boolean(ot->srna, "keep_retiming", true, - "Preserve Current retiming", + "Preserve Current Retiming", "Keep speed of other segments unchanged, change strip length instead"); } diff --git a/source/blender/editors/transform/transform_mode_bend.cc b/source/blender/editors/transform/transform_mode_bend.cc index 61ab53374be..80a08500651 100644 --- a/source/blender/editors/transform/transform_mode_bend.cc +++ b/source/blender/editors/transform/transform_mode_bend.cc @@ -229,7 +229,7 @@ static void Bend(TransInfo *t) outputNumInput(&(t->num), c, &t->scene->unit); SNPRINTF(str, - RPT_("Bend Angle: %s Radius: %s Alt, Clamp %s"), + RPT_("Bend Angle: %s, Radius: %s, Alt: Clamp %s"), &c[0], &c[NUM_STR_REP_LEN], WM_bool_as_string(is_clamp)); @@ -237,7 +237,7 @@ static void Bend(TransInfo *t) else { /* default header print */ SNPRINTF(str, - RPT_("Bend Angle: %.3f Radius: %.4f, Alt, Clamp %s"), + RPT_("Bend Angle: %.3f, Radius: %.4f, Alt: Clamp %s"), RAD2DEGF(values.angle), values.scale * bend_data->warp_init_dist, WM_bool_as_string(is_clamp)); diff --git a/source/blender/makesrna/intern/rna_armature.cc b/source/blender/makesrna/intern/rna_armature.cc index 50e91ca364d..53ad6539220 100644 --- a/source/blender/makesrna/intern/rna_armature.cc +++ b/source/blender/makesrna/intern/rna_armature.cc @@ -1225,7 +1225,7 @@ void rna_def_bone_curved_common(StructRNA *srna, bool is_posebone, bool is_editb RNA_def_property_float_sdna(prop, nullptr, "ease1"); RNA_def_property_ui_range(prop, -5.0f, 5.0f, 1, 3); RNA_def_property_float_default(prop, 1.0f); - RNA_def_property_ui_text(prop, "Ease In", "Length of first Bezier Handle (for B-Bones only)"); + RNA_def_property_ui_text(prop, "Ease In", "Length of first Bézier Handle (for B-Bones only)"); RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_ARMATURE); RNA_DEF_CURVEBONE_UPDATE(prop, is_posebone, is_editbone); @@ -1233,7 +1233,7 @@ void rna_def_bone_curved_common(StructRNA *srna, bool is_posebone, bool is_editb RNA_def_property_float_sdna(prop, nullptr, "ease2"); RNA_def_property_ui_range(prop, -5.0f, 5.0f, 1, 3); RNA_def_property_float_default(prop, 1.0f); - RNA_def_property_ui_text(prop, "Ease Out", "Length of second Bezier Handle (for B-Bones only)"); + RNA_def_property_ui_text(prop, "Ease Out", "Length of second Bézier Handle (for B-Bones only)"); RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_ARMATURE); RNA_DEF_CURVEBONE_UPDATE(prop, is_posebone, is_editbone); diff --git a/source/blender/makesrna/intern/rna_brush.cc b/source/blender/makesrna/intern/rna_brush.cc index ccc06e7bd31..22a1d676bc5 100644 --- a/source/blender/makesrna/intern/rna_brush.cc +++ b/source/blender/makesrna/intern/rna_brush.cc @@ -69,7 +69,7 @@ static const EnumPropertyItem sculpt_stroke_method_items[] = { "CURVE", 0, "Curve", - "Define the stroke curve with a bezier curve (dabs are separated according to spacing)"}, + "Define the stroke curve with a Bézier curve (dabs are separated according to spacing)"}, {0, nullptr, 0, nullptr, nullptr}, }; @@ -1029,7 +1029,7 @@ static const EnumPropertyItem *rna_Brush_stroke_itemf(bContext *C, "CURVE", 0, "Curve", - "Define the stroke curve with a bezier curve. Dabs are separated according to spacing"}, + "Define the stroke curve with a Bézier curve. Dabs are separated according to spacing"}, {0, nullptr, 0, nullptr, nullptr}, }; @@ -3612,7 +3612,7 @@ static void rna_def_brush(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Curve", - "Define the stroke curve with a bezier curve. Dabs are separated according to spacing"); + "Define the stroke curve with a Bézier curve. Dabs are separated according to spacing"); RNA_def_property_update(prop, 0, "rna_Brush_update"); prop = RNA_def_property(srna, "use_smooth_stroke", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_color.cc b/source/blender/makesrna/intern/rna_color.cc index d75be9f1fc5..94de4220d12 100644 --- a/source/blender/makesrna/intern/rna_color.cc +++ b/source/blender/makesrna/intern/rna_color.cc @@ -750,7 +750,7 @@ static void rna_def_curvemappoint(BlenderRNA *brna) RNA_def_property_enum_bitflag_sdna(prop, nullptr, "flag"); RNA_def_property_enum_items(prop, prop_handle_type_items); RNA_def_property_ui_text( - prop, "Handle Type", "Curve interpolation at this point: Bezier or vector"); + prop, "Handle Type", "Curve interpolation at this point: Bézier or vector"); prop = RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "flag", CUMA_SELECT); diff --git a/source/blender/makesrna/intern/rna_constraint.cc b/source/blender/makesrna/intern/rna_constraint.cc index ed8ec7ffb9e..1fa71c16dce 100644 --- a/source/blender/makesrna/intern/rna_constraint.cc +++ b/source/blender/makesrna/intern/rna_constraint.cc @@ -153,7 +153,7 @@ const EnumPropertyItem rna_enum_constraint_type_items[] = { ICON_CON_FLOOR, "Floor", "Use position (and optionally rotation) of target to define a 'wall' or 'floor' that the " - "owner can not cross"}, + "owner cannot cross"}, {CONSTRAINT_TYPE_FOLLOWPATH, "FOLLOW_PATH", ICON_CON_FOLLOWPATH, diff --git a/source/blender/makesrna/intern/rna_curve.cc b/source/blender/makesrna/intern/rna_curve.cc index f29b2968b15..1c0e5ee4aab 100644 --- a/source/blender/makesrna/intern/rna_curve.cc +++ b/source/blender/makesrna/intern/rna_curve.cc @@ -81,7 +81,7 @@ const EnumPropertyItem rna_enum_beztriple_interpolation_mode_items[] = { {BEZT_IPO_BEZ, "BEZIER", ICON_IPO_BEZIER, - "Bezier", + "Bézier", "Smooth interpolation between A and B, with some control over curve shape"}, /* Easing. */ @@ -124,7 +124,7 @@ const EnumPropertyItem rna_enum_beztriple_interpolation_mode_items[] = { #ifndef RNA_RUNTIME static const EnumPropertyItem curve_type_items[] = { {CU_POLY, "POLY", 0, "Poly", ""}, - {CU_BEZIER, "BEZIER", 0, "Bezier", ""}, + {CU_BEZIER, "BEZIER", 0, "Bézier", ""}, {CU_NURBS, "NURBS", 0, "Ease", ""}, {0, nullptr, 0, nullptr, nullptr}, }; @@ -648,7 +648,7 @@ static void rna_Nurb_update_knot_v(Main *bmain, Scene *scene, PointerRNA *ptr) static void rna_Curve_spline_points_add(ID *id, Nurb *nu, ReportList *reports, int number) { if (nu->type == CU_BEZIER) { - BKE_report(reports, RPT_ERROR, "Bezier spline cannot have points added"); + BKE_report(reports, RPT_ERROR, "Bézier spline cannot have points added"); } else if (number == 0) { /* do nothing */ @@ -667,7 +667,7 @@ static void rna_Curve_spline_points_add(ID *id, Nurb *nu, ReportList *reports, i static void rna_Curve_spline_bezpoints_add(ID *id, Nurb *nu, ReportList *reports, int number) { if (nu->type != CU_BEZIER) { - BKE_report(reports, RPT_ERROR, "Only Bezier splines can be added"); + BKE_report(reports, RPT_ERROR, "Only Bézier splines can be added"); } else if (number == 0) { /* do nothing */ @@ -945,7 +945,7 @@ static void rna_def_beztriple(BlenderRNA *brna) srna = RNA_def_struct(brna, "BezierSplinePoint", nullptr); RNA_def_struct_sdna(srna, "BezTriple"); - RNA_def_struct_ui_text(srna, "Bezier Curve Point", "Bezier curve point with two handles"); + RNA_def_struct_ui_text(srna, "Bézier Curve Point", "Bézier curve point with two handles"); /* Boolean values */ prop = RNA_def_property(srna, "select_left_handle", PROP_BOOLEAN, PROP_NONE); @@ -1505,7 +1505,7 @@ static void rna_def_curve_spline_bezpoints(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_srna(cprop, "SplineBezierPoints"); srna = RNA_def_struct(brna, "SplineBezierPoints", nullptr); RNA_def_struct_sdna(srna, "Nurb"); - RNA_def_struct_ui_text(srna, "Spline Bezier Points", "Collection of spline Bezier points"); + RNA_def_struct_ui_text(srna, "Spline Bézier Points", "Collection of spline Bézier points"); func = RNA_def_function(srna, "add", "rna_Curve_spline_bezpoints_add"); RNA_def_function_ui_description(func, "Add a number of points to this spline"); @@ -1959,7 +1959,7 @@ static void rna_def_curve_nurb(BlenderRNA *brna) RNA_def_struct_ui_text( srna, "Spline", - "Element of a curve, either NURBS, Bezier or Polyline or a character with text objects"); + "Element of a curve, either NURBS, Bézier or Polyline or a character with text objects"); prop = RNA_def_property(srna, "points", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, nullptr, "bp", nullptr); @@ -1980,21 +1980,21 @@ static void rna_def_curve_nurb(BlenderRNA *brna) prop = RNA_def_property(srna, "bezier_points", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "BezierSplinePoint"); RNA_def_property_collection_sdna(prop, nullptr, "bezt", "pntsu"); - RNA_def_property_ui_text(prop, "Bezier Points", "Collection of points for Bezier curves only"); + RNA_def_property_ui_text(prop, "Bézier Points", "Collection of points for Bézier curves only"); rna_def_curve_spline_bezpoints(brna, prop); prop = RNA_def_property(srna, "tilt_interpolation", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, nullptr, "tilt_interp"); RNA_def_property_enum_items(prop, spline_interpolation_items); RNA_def_property_ui_text( - prop, "Tilt Interpolation", "The type of tilt interpolation for 3D, Bezier curves"); + prop, "Tilt Interpolation", "The type of tilt interpolation for 3D, Bézier curves"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop = RNA_def_property(srna, "radius_interpolation", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, nullptr, "radius_interp"); RNA_def_property_enum_items(prop, spline_interpolation_items); RNA_def_property_ui_text( - prop, "Radius Interpolation", "The type of radius interpolation for Bezier curves"); + prop, "Radius Interpolation", "The type of radius interpolation for Bézier curves"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); @@ -2089,15 +2089,15 @@ static void rna_def_curve_nurb(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text( prop, - "Bezier U", - "Make this nurbs curve or surface act like a Bezier spline in the U direction"); + "Bézier U", + "Make this nurbs curve or surface act like a Bézier spline in the U direction"); RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_u"); prop = RNA_def_property(srna, "use_bezier_v", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "flagv", CU_NURB_BEZIER); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text( - prop, "Bezier V", "Make this nurbs surface act like a Bezier spline in the V direction"); + prop, "Bézier V", "Make this nurbs surface act like a Bézier spline in the V direction"); RNA_def_property_update(prop, 0, "rna_Nurb_update_knot_v"); prop = RNA_def_property(srna, "use_smooth", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_curves.cc b/source/blender/makesrna/intern/rna_curves.cc index d0aca3da0d3..a7ceef96b1b 100644 --- a/source/blender/makesrna/intern/rna_curves.cc +++ b/source/blender/makesrna/intern/rna_curves.cc @@ -20,7 +20,7 @@ const EnumPropertyItem rna_enum_curves_type_items[] = { {CURVE_TYPE_CATMULL_ROM, "CATMULL_ROM", 0, "Catmull Rom", ""}, {CURVE_TYPE_POLY, "POLY", 0, "Poly", ""}, - {CURVE_TYPE_BEZIER, "BEZIER", 0, "Bezier", ""}, + {CURVE_TYPE_BEZIER, "BEZIER", 0, "Bézier", ""}, {CURVE_TYPE_NURBS, "NURBS", 0, "NURBS", ""}, {0, nullptr, 0, nullptr, nullptr}, }; diff --git a/source/blender/makesrna/intern/rna_fcurve.cc b/source/blender/makesrna/intern/rna_fcurve.cc index 1bd44c70210..8534b0c9a01 100644 --- a/source/blender/makesrna/intern/rna_fcurve.cc +++ b/source/blender/makesrna/intern/rna_fcurve.cc @@ -2209,7 +2209,7 @@ static void rna_def_fkeyframe(BlenderRNA *brna) srna = RNA_def_struct(brna, "Keyframe", nullptr); RNA_def_struct_sdna(srna, "BezTriple"); RNA_def_struct_ui_text( - srna, "Keyframe", "Bezier curve point with two handles defining a Keyframe on an F-Curve"); + srna, "Keyframe", "Bézier curve point with two handles defining a Keyframe on an F-Curve"); /* Boolean values */ prop = RNA_def_property(srna, "select_left_handle", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_gpencil_legacy.cc b/source/blender/makesrna/intern/rna_gpencil_legacy.cc index 67c37e3de6f..e453b3dc4fb 100644 --- a/source/blender/makesrna/intern/rna_gpencil_legacy.cc +++ b/source/blender/makesrna/intern/rna_gpencil_legacy.cc @@ -1438,7 +1438,7 @@ static void rna_def_gpencil_curve_point(BlenderRNA *brna) srna = RNA_def_struct(brna, "GPencilEditCurvePoint", nullptr); RNA_def_struct_sdna(srna, "bGPDcurve_point"); - RNA_def_struct_ui_text(srna, "Bezier Curve Point", "Bezier curve point with two handles"); + RNA_def_struct_ui_text(srna, "Bézier Curve Point", "Bézier curve point with two handles"); /* Boolean values */ prop = RNA_def_property(srna, "select_left_handle", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_key.cc b/source/blender/makesrna/intern/rna_key.cc index 7fe82debe6f..4b512c98937 100644 --- a/source/blender/makesrna/intern/rna_key.cc +++ b/source/blender/makesrna/intern/rna_key.cc @@ -897,7 +897,7 @@ static void rna_def_keydata(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Key_update_data"); srna = RNA_def_struct(brna, "ShapeKeyBezierPoint", nullptr); - RNA_def_struct_ui_text(srna, "Shape Key Bezier Point", "Point in a shape key for Bezier curves"); + RNA_def_struct_ui_text(srna, "Shape Key Bézier Point", "Point in a shape key for Bézier curves"); /* there's nothing type specific here, so this is fine for now */ RNA_def_struct_path_func(srna, "rna_ShapeKeyPoint_path"); diff --git a/source/blender/makesrna/intern/rna_linestyle.cc b/source/blender/makesrna/intern/rna_linestyle.cc index c772c1882bf..24a64a172cf 100644 --- a/source/blender/makesrna/intern/rna_linestyle.cc +++ b/source/blender/makesrna/intern/rna_linestyle.cc @@ -95,7 +95,7 @@ const EnumPropertyItem rna_enum_linestyle_geometry_modifier_type_items[] = { ICON_MODIFIER, "Backbone Stretcher", ""}, - {LS_MODIFIER_BEZIER_CURVE, "BEZIER_CURVE", ICON_MODIFIER, "Bezier Curve", ""}, + {LS_MODIFIER_BEZIER_CURVE, "BEZIER_CURVE", ICON_MODIFIER, "Bézier Curve", ""}, {LS_MODIFIER_BLUEPRINT, "BLUEPRINT", ICON_MODIFIER, "Blueprint", ""}, {LS_MODIFIER_GUIDING_LINES, "GUIDING_LINES", ICON_MODIFIER, "Guiding Lines", ""}, {LS_MODIFIER_PERLIN_NOISE_1D, "PERLIN_NOISE_1D", ICON_MODIFIER, "Perlin Noise 1D", ""}, @@ -1288,8 +1288,8 @@ static void rna_def_linestyle_modifiers(BlenderRNA *brna) srna = RNA_def_struct( brna, "LineStyleGeometryModifier_BezierCurve", "LineStyleGeometryModifier"); RNA_def_struct_ui_text(srna, - "Bezier Curve", - "Replace stroke backbone geometry by a Bezier curve approximation of the " + "Bézier Curve", + "Replace stroke backbone geometry by a Bézier curve approximation of the " "original backbone geometry"); rna_def_geometry_modifier(srna); @@ -1297,7 +1297,7 @@ static void rna_def_linestyle_modifiers(BlenderRNA *brna) RNA_def_property_float_sdna(prop, nullptr, "error"); RNA_def_property_ui_text(prop, "Error", - "Maximum distance allowed between the new Bezier curve and the " + "Maximum distance allowed between the new Bézier curve and the " "original backbone geometry"); RNA_def_property_update(prop, NC_LINESTYLE, "rna_LineStyle_update"); diff --git a/source/blender/makesrna/intern/rna_main_api.cc b/source/blender/makesrna/intern/rna_main_api.cc index d37c34eb60b..9c3cccb1dee 100644 --- a/source/blender/makesrna/intern/rna_main_api.cc +++ b/source/blender/makesrna/intern/rna_main_api.cc @@ -120,7 +120,7 @@ static void rna_Main_ID_remove(Main *bmain, if (id->tag & LIB_TAG_NO_MAIN) { BKE_reportf(reports, RPT_ERROR, - "%s '%s' is outside of main database and can not be removed from it", + "%s '%s' is outside of main database and cannot be removed from it", BKE_idtype_idcode_to_name(GS(id->name)), id->name + 2); return; @@ -212,7 +212,7 @@ static Object *rna_Main_objects_new(Main *bmain, ReportList *reports, const char if (data != nullptr && (data->tag & LIB_TAG_NO_MAIN)) { BKE_report(reports, RPT_ERROR, - "Can not create object in main database with an evaluated data data-block"); + "Cannot create object in main database with an evaluated data data-block"); return nullptr; } diff --git a/source/blender/makesrna/intern/rna_modifier.cc b/source/blender/makesrna/intern/rna_modifier.cc index bf73298d827..b2bc816124e 100644 --- a/source/blender/makesrna/intern/rna_modifier.cc +++ b/source/blender/makesrna/intern/rna_modifier.cc @@ -2909,7 +2909,7 @@ static void rna_def_modifier_hook(BlenderRNA *brna) RNA_def_property_int_funcs(prop, "rna_HookModifier_vertex_indices_get", nullptr, nullptr); RNA_def_property_ui_text(prop, "Vertex Indices", - "Indices of vertices bound to the modifier. For bezier curves, " + "Indices of vertices bound to the modifier. For Bézier curves, " "handles count as additional vertices"); func = RNA_def_function(srna, "vertex_indices_set", "rna_HookModifier_vertex_indices_set"); diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index f18d1849f5b..263c03150bb 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -6200,7 +6200,7 @@ static void def_cmp_vector_blur(StructRNA *srna) prop = RNA_def_property(srna, "use_curved", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "curved", 1); RNA_def_property_ui_text( - prop, "Curved", "Interpolate between frames in a Bezier curve, rather than linearly"); + prop, "Curved", "Interpolate between frames in a Bézier curve, rather than linearly"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); } diff --git a/source/blender/makesrna/intern/rna_object_api.cc b/source/blender/makesrna/intern/rna_object_api.cc index df7f508beba..30b1f342908 100644 --- a/source/blender/makesrna/intern/rna_object_api.cc +++ b/source/blender/makesrna/intern/rna_object_api.cc @@ -1077,7 +1077,7 @@ void RNA_api_object(StructRNA *srna) func, "Create a Mesh data-block from the current state of the object. The object owns the " "data-block. To force free it use to_mesh_clear(). " - "The result is temporary and can not be used by objects from the main database"); + "The result is temporary and cannot be used by objects from the main database"); RNA_def_function_flag(func, FUNC_USE_REPORTS); RNA_def_boolean(func, "preserve_all_data_layers", @@ -1104,7 +1104,7 @@ void RNA_api_object(StructRNA *srna) func, "Create a Curve data-block from the current state of the object. This only works for curve " "and text objects. The object owns the data-block. To force free it, use to_curve_clear(). " - "The result is temporary and can not be used by objects from the main database"); + "The result is temporary and cannot be used by objects from the main database"); RNA_def_function_flag(func, FUNC_USE_REPORTS); parm = RNA_def_pointer( func, "depsgraph", "Depsgraph", "Dependency Graph", "Evaluated dependency graph"); diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc index 68a8172ddcd..e34f34527d0 100644 --- a/source/blender/makesrna/intern/rna_scene.cc +++ b/source/blender/makesrna/intern/rna_scene.cc @@ -4270,7 +4270,7 @@ static void rna_def_curve_paint_settings(BlenderRNA *brna) static const EnumPropertyItem curve_type_items[] = { {CU_POLY, "POLY", 0, "Poly", ""}, - {CU_BEZIER, "BEZIER", 0, "Bezier", ""}, + {CU_BEZIER, "BEZIER", 0, "Bézier", ""}, {0, nullptr, 0, nullptr, nullptr}, }; diff --git a/source/blender/makesrna/intern/rna_sequencer.cc b/source/blender/makesrna/intern/rna_sequencer.cc index 490ae5f7561..938881519d9 100644 --- a/source/blender/makesrna/intern/rna_sequencer.cc +++ b/source/blender/makesrna/intern/rna_sequencer.cc @@ -1471,7 +1471,7 @@ static void rna_SequenceModifier_strip_set(PointerRNA *ptr, PointerRNA value, Re Sequence *target = (Sequence *)value.data; if (target != nullptr && SEQ_relations_render_loop_check(target, seq)) { - BKE_report(reports, RPT_ERROR, "Recursion detected, can not use this strip"); + BKE_report(reports, RPT_ERROR, "Recursion detected, cannot use this strip"); return; } diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc index 9feed634863..b5db3085864 100644 --- a/source/blender/makesrna/intern/rna_space.cc +++ b/source/blender/makesrna/intern/rna_space.cc @@ -6281,7 +6281,7 @@ static void rna_def_space_dopesheet(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, nullptr, "flag", SACTION_SHOW_INTERPOLATION); RNA_def_property_ui_text(prop, "Show Handles and Interpolation", - "Display keyframe handle types and non-bezier interpolation modes"); + "Display keyframe handle types and non-Bézier interpolation modes"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_DOPESHEET, nullptr); prop = RNA_def_property(srna, "show_extremes", PROP_BOOLEAN, PROP_NONE); @@ -6419,7 +6419,7 @@ static void rna_def_space_graph(BlenderRNA *brna) prop = RNA_def_property(srna, "show_handles", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, nullptr, "flag", SIPO_NOHANDLES); - RNA_def_property_ui_text(prop, "Show Handles", "Show handles of Bezier control points"); + RNA_def_property_ui_text(prop, "Show Handles", "Show handles of Bézier control points"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_GRAPH, nullptr); prop = RNA_def_property(srna, "use_only_selected_keyframe_handles", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_ui.cc b/source/blender/makesrna/intern/rna_ui.cc index ca87872468e..085b4773937 100644 --- a/source/blender/makesrna/intern/rna_ui.cc +++ b/source/blender/makesrna/intern/rna_ui.cc @@ -2136,7 +2136,7 @@ static void rna_def_header(BlenderRNA *brna) RNA_def_property_ui_text(prop, "ID Name", "If this is set, the header gets a custom ID, otherwise it takes the " - "name of the class used to define the panel; for example, if the " + "name of the class used to define the header; for example, if the " "class name is \"OBJECT_HT_hello\", and bl_idname is not set by the " "script, then bl_idname = \"OBJECT_HT_hello\""); @@ -2280,7 +2280,7 @@ static void rna_def_asset_shelf(BlenderRNA *brna) RNA_def_property_ui_text(prop, "ID Name", "If this is set, the asset gets a custom ID, otherwise it takes the " - "name of the class used to define the menu (for example, if the " + "name of the class used to define the asset (for example, if the " "class name is \"OBJECT_AST_hello\", and bl_idname is not set by the " "script, then bl_idname = \"OBJECT_AST_hello\")"); diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index 44f4f336c94..19c8cd7433c 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -3830,7 +3830,7 @@ static void rna_def_userdef_theme_space_action(BlenderRNA *brna) RNA_def_property_float_sdna(prop, nullptr, "ds_ipoline"); RNA_def_property_array(prop, 4); RNA_def_property_ui_text( - prop, "Interpolation Line", "Color of lines showing non-bezier interpolation modes"); + prop, "Interpolation Line", "Color of lines showing non-Bézier interpolation modes"); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); prop = RNA_def_property(srna, "simulated_frames", PROP_FLOAT, PROP_COLOR_GAMMA); @@ -4562,7 +4562,7 @@ static void rna_def_userdef_studiolight(BlenderRNA *brna) nullptr, nullptr); RNA_def_property_ui_text( - prop, "Solid Lights", "Lights user to display objects in solid draw mode"); + prop, "Solid Lights", "Lights used to display objects in solid draw mode"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop = RNA_def_property(srna, "light_ambient", PROP_FLOAT, PROP_COLOR); diff --git a/source/blender/makesrna/intern/rna_wm_api.cc b/source/blender/makesrna/intern/rna_wm_api.cc index 13a837887f5..8b25313aad5 100644 --- a/source/blender/makesrna/intern/rna_wm_api.cc +++ b/source/blender/makesrna/intern/rna_wm_api.cc @@ -342,7 +342,7 @@ static wmKeyMapItem *rna_KeyMap_item_new_from_item(wmKeyMap *km, // wmWindowManager *wm = CTX_wm_manager(C); if ((km->flag & KEYMAP_MODAL) == (kmi_src->idname[0] != '\0')) { - BKE_report(reports, RPT_ERROR, "Can not mix modal/non-modal items"); + BKE_report(reports, RPT_ERROR, "Cannot mix modal/non-modal items"); return nullptr; } diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index f6713b56f6a..3ac4f652acd 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -1469,7 +1469,7 @@ class NodesModifierBakeParams : public nodes::GeoNodesBakeParams { { if (frame_cache.meta_path && frame_cache.state.items_by_id.is_empty()) { auto &read_error_info = behavior.behavior.emplace(); - read_error_info.message = RPT_("Can not load the baked data"); + read_error_info.message = RPT_("Cannot load the baked data"); return true; } return false; diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index 3e83b86e2de..7bbdd2dbad1 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -303,10 +303,10 @@ DefNode(GeometryNode, GEO_NODE_CURVE_ENDPOINT_SELECTION, 0, "CURVE_ENDPOINT_SELE DefNode(GeometryNode, GEO_NODE_CURVE_HANDLE_TYPE_SELECTION, def_geo_curve_handle_type_selection, "CURVE_HANDLE_TYPE_SELECTION", CurveHandleTypeSelection, "Handle Type Selection", "Provide a selection based on the handle types of Bézier control points") DefNode(GeometryNode, GEO_NODE_CURVE_LENGTH, 0, "CURVE_LENGTH", CurveLength, "Curve Length", "Retrieve the length of all splines added together") DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_ARC, 0, "CURVE_PRIMITIVE_ARC",CurveArc, "Arc", "Generate a poly spline arc") -DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT, 0, "CURVE_PRIMITIVE_BEZIER_SEGMENT", CurvePrimitiveBezierSegment, "Bezier Segment", "Generate a 2D Bézier spline from the given control points and handles") +DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT, 0, "CURVE_PRIMITIVE_BEZIER_SEGMENT", CurvePrimitiveBezierSegment, "Bézier Segment", "Generate a 2D Bézier spline from the given control points and handles") DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_CIRCLE,0, "CURVE_PRIMITIVE_CIRCLE", CurvePrimitiveCircle, "Curve Circle", "Generate a poly spline circle") DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_LINE, 0, "CURVE_PRIMITIVE_LINE", CurvePrimitiveLine, "Curve Line", "Generate a poly spline line with two points") -DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_QUADRATIC_BEZIER, 0, "CURVE_PRIMITIVE_QUADRATIC_BEZIER", CurveQuadraticBezier, "Quadratic Bezier", "Generate a poly spline in a parabola shape with control points positions") +DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_QUADRATIC_BEZIER, 0, "CURVE_PRIMITIVE_QUADRATIC_BEZIER", CurveQuadraticBezier, "Quadratic Bézier", "Generate a poly spline in a parabola shape with control points positions") DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL, 0, "CURVE_PRIMITIVE_QUADRILATERAL", CurvePrimitiveQuadrilateral, "Quadrilateral", "Generate a polygon with four points") DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_SPIRAL,0, "CURVE_PRIMITIVE_SPIRAL", CurveSpiral, "Curve Spiral", "Generate a poly spline in a spiral shape") DefNode(GeometryNode, GEO_NODE_CURVE_PRIMITIVE_STAR, 0, "CURVE_PRIMITIVE_STAR", CurveStar, "Star", "Generate a poly spline in a star pattern by connecting alternating points of two circles") diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc index 1b9ec7f014b..1b5a8b4d453 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc @@ -116,7 +116,7 @@ static void node_geo_exec(GeoNodeExecParams params) if (!params.output_is_required("Geometry")) { params.error_message_add( NodeWarningType::Info, - TIP_("The attribute output can not be used without the geometry output")); + TIP_("The attribute output cannot be used without the geometry output")); params.set_default_remaining_outputs(); return; } diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc index 8ef0fb8b9bb..6585d229640 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc @@ -171,13 +171,13 @@ static void node_rna(StructRNA *srna) {GEO_NODE_CURVE_FILLET_BEZIER, "BEZIER", 0, - "Bezier", - "Align Bezier handles to create circular arcs at each control point"}, + "Bézier", + "Align Bézier handles to create circular arcs at each control point"}, {GEO_NODE_CURVE_FILLET_POLY, "POLY", 0, "Poly", - "Add control points along a circular arc (handle type is vector if Bezier Spline)"}, + "Add control points along a circular arc (handle type is vector if Bézier Spline)"}, {0, nullptr, 0, nullptr, nullptr}, }; diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc index 8dcd30dddb2..a7c9e00b410 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc @@ -144,7 +144,7 @@ static void node_register() { static bNodeType ntype; geo_node_type_base( - &ntype, GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT, "Bezier Segment", NODE_CLASS_GEOMETRY); + &ntype, GEO_NODE_CURVE_PRIMITIVE_BEZIER_SEGMENT, "Bézier Segment", NODE_CLASS_GEOMETRY); ntype.initfunc = node_init; node_type_storage(&ntype, "NodeGeometryCurvePrimitiveBezierSegment", diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadratic_bezier.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadratic_bezier.cc index d0389b3655f..0bb6bb798cf 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadratic_bezier.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadratic_bezier.cc @@ -65,7 +65,7 @@ static void node_register() { static bNodeType ntype; geo_node_type_base( - &ntype, GEO_NODE_CURVE_PRIMITIVE_QUADRATIC_BEZIER, "Quadratic Bezier", NODE_CLASS_GEOMETRY); + &ntype, GEO_NODE_CURVE_PRIMITIVE_QUADRATIC_BEZIER, "Quadratic Bézier", NODE_CLASS_GEOMETRY); ntype.declare = node_declare; ntype.geometry_node_execute = node_geo_exec; nodeRegisterType(&ntype); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc index d94ce60ee34..8efdd6eba71 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc @@ -179,7 +179,7 @@ static void node_rna(StructRNA *srna) 0, "Evaluated", "Output the input spline's evaluated points, based on the resolution attribute for NURBS " - "and Bezier splines. Poly splines are unchanged"}, + "and Bézier splines. Poly splines are unchanged"}, {GEO_NODE_CURVE_RESAMPLE_COUNT, "COUNT", 0, diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc index bcb866c408e..ba5ce442729 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc @@ -110,7 +110,7 @@ static void node_geo_exec(GeoNodeExecParams params) }); if (has_curves && !has_bezier) { - params.error_message_add(NodeWarningType::Info, TIP_("Input curves do not have Bezier type")); + params.error_message_add(NodeWarningType::Info, TIP_("Input curves do not have Bézier type")); } params.set_output("Curve", std::move(geometry_set)); diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc index 1c7635a896b..88d0a2cbe98 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc @@ -344,7 +344,7 @@ static void node_rna(StructRNA *srna) 0, "Evaluated", "Create points from the curve's evaluated points, based on the resolution attribute for " - "NURBS and Bezier splines"}, + "NURBS and Bézier splines"}, {GEO_NODE_CURVE_RESAMPLE_COUNT, "COUNT", 0, diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc b/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc index bc3a25e972f..0b18cdbfe17 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc @@ -162,7 +162,7 @@ static void node_geo_exec(GeoNodeExecParams params) }); if (has_curves && !has_bezier) { - params.error_message_add(NodeWarningType::Info, TIP_("Input curves do not have Bezier type")); + params.error_message_add(NodeWarningType::Info, TIP_("Input curves do not have Bézier type")); } params.set_output("Curve", std::move(geometry_set)); diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_material.cc b/source/blender/nodes/geometry/nodes/node_geo_set_material.cc index a840cfa181f..832015953d5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_material.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_material.cc @@ -147,17 +147,17 @@ static void node_geo_exec(GeoNodeExecParams params) if (volume_selection_warning) { params.error_message_add( NodeWarningType::Info, - TIP_("Volumes only support a single material; selection input can not be a field")); + TIP_("Volumes only support a single material; selection input cannot be a field")); } if (point_selection_warning) { params.error_message_add( NodeWarningType::Info, - TIP_("Point clouds only support a single material; selection input can not be a field")); + TIP_("Point clouds only support a single material; selection input cannot be a field")); } if (curves_selection_warning) { params.error_message_add( NodeWarningType::Info, - TIP_("Curves only support a single material; selection input can not be a field")); + TIP_("Curves only support a single material; selection input cannot be a field")); } params.set_output("Geometry", std::move(geometry_set)); diff --git a/source/blender/python/intern/bpy_props.cc b/source/blender/python/intern/bpy_props.cc index 98a350656fd..f758051469e 100644 --- a/source/blender/python/intern/bpy_props.cc +++ b/source/blender/python/intern/bpy_props.cc @@ -4125,7 +4125,7 @@ PyDoc_STRVAR( "*items*, or integer matching an item number.\n" " If the *ENUM_FLAG* option is used this must be a set of such string identifiers " "instead.\n" - " WARNING: Strings can not be specified for dynamic enums\n" + " WARNING: Strings cannot be specified for dynamic enums\n" " (i.e. if a callback function is given as *items* parameter).\n" " :type default: string, integer or set\n" BPY_PROPDEF_OPTIONS_ENUM_DOC BPY_PROPDEF_OPTIONS_OVERRIDE_DOC BPY_PROPDEF_TAGS_DOC BPY_PROPDEF_UPDATE_DOC diff --git a/source/blender/render/intern/engine.cc b/source/blender/render/intern/engine.cc index 7904da7b0bf..aa0ee392248 100644 --- a/source/blender/render/intern/engine.cc +++ b/source/blender/render/intern/engine.cc @@ -960,7 +960,7 @@ bool RE_engine_render(Render *re, bool do_all) if ((type->flag & RE_USE_GPU_CONTEXT) && !GPU_backend_supported()) { /* Clear UI drawing locks. */ re->draw_unlock(); - BKE_report(re->reports, RPT_ERROR, "Can not initialize the GPU"); + BKE_report(re->reports, RPT_ERROR, "Cannot initialize the GPU"); G.is_break = true; return true; } diff --git a/source/blender/sequencer/intern/strip_edit.cc b/source/blender/sequencer/intern/strip_edit.cc index e222983787d..c352c9e413d 100644 --- a/source/blender/sequencer/intern/strip_edit.cc +++ b/source/blender/sequencer/intern/strip_edit.cc @@ -220,12 +220,12 @@ bool SEQ_edit_move_strip_to_meta(Scene *scene, ListBase *seqbase = SEQ_get_seqbase_by_seq(scene, src_seq); if (dst_seqm->type != SEQ_TYPE_META) { - *error_str = N_("Can not move strip to non-meta strip"); + *error_str = N_("Cannot move strip to non-meta strip"); return false; } if (src_seq == dst_seqm) { - *error_str = N_("Strip can not be moved into itself"); + *error_str = N_("Strip cannot be moved into itself"); return false; } @@ -240,7 +240,7 @@ bool SEQ_edit_move_strip_to_meta(Scene *scene, } if (!SEQ_exists_in_seqbase(dst_seqm, &ed->seqbase)) { - *error_str = N_("Can not move strip to different scene"); + *error_str = N_("Cannot move strip to different scene"); return false; } diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc index 43d89cdf32b..c6f2903823b 100644 --- a/source/creator/creator_args.cc +++ b/source/creator/creator_args.cc @@ -1550,7 +1550,7 @@ static const char arg_handle_audio_set_doc[] = static int arg_handle_audio_set(int argc, const char **argv, void * /*data*/) { if (argc < 1) { - fprintf(stderr, "-setaudio require one argument\n"); + fprintf(stderr, "-setaudio requires one argument\n"); exit(1); } diff --git a/tests/python/ui_simulate/test_undo.py b/tests/python/ui_simulate/test_undo.py index c88362de377..a0c5c570df1 100644 --- a/tests/python/ui_simulate/test_undo.py +++ b/tests/python/ui_simulate/test_undo.py @@ -588,7 +588,7 @@ def view3d_multi_mode_select(): ("Add -> Armature", "Armature"), ("Add -> Text", "Text"), ("Add -> Mesh -> Cube", "Cube"), - ("Add -> Curve -> Bezier", "Curve"), + ("Add -> Curve -> Bézier", "Curve"), ("Add -> Volume -> Empty", "Volume Empty"), ("Add -> Metaball -> Ball", "Metaball"), ("Add -> Lattice", "Lattice"),