From 5998795aa64a99892895e784945f7dc763aeaa05 Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Tue, 5 Aug 2025 11:16:22 +0200 Subject: [PATCH] UI: Replace contractions with long-form text Avoid using contractions for can't, aren't, doesn't, and shouldn't. Following the writing style guide in the Human Interface Guidelines. Pull Request: https://projects.blender.org/blender/blender/pulls/143852 --- intern/cycles/blender/addon/osl.py | 2 +- intern/cycles/scene/colorspace.cpp | 2 +- intern/cycles/scene/image_oiio.cpp | 2 +- scripts/addons_core/rigify/utils/bones.py | 2 +- scripts/freestyle/modules/parameter_editor.py | 6 ++-- scripts/modules/addon_utils.py | 2 +- scripts/modules/bl_keymap_utils/io.py | 2 +- scripts/modules/bpy/utils/__init__.py | 2 +- scripts/modules/bpy_extras/io_utils.py | 2 +- scripts/startup/bl_operators/assets.py | 2 +- scripts/startup/bl_operators/presets.py | 2 +- .../bl_ui/properties_physics_rigidbody.py | 2 +- source/blender/blenkernel/intern/attribute.cc | 2 +- source/blender/blenkernel/intern/cloth.cc | 2 +- .../blender/blenkernel/intern/collection.cc | 2 +- source/blender/blenkernel/intern/object.cc | 2 +- source/blender/blenkernel/intern/rigidbody.cc | 4 +-- source/blender/blenlib/intern/winstuff.cc | 2 +- source/blender/blenloader/intern/writefile.cc | 2 +- .../animation/anim_channels_defines.cc | 2 +- .../blender/editors/animation/keyframing.cc | 2 +- source/blender/editors/interface/interface.cc | 2 +- .../editors/interface/interface_anim.cc | 2 +- .../templates/interface_templates_intern.hh | 2 +- .../interface/views/abstract_view_item.cc | 4 +-- .../editors/interface/views/tree_view.cc | 6 ++-- .../blender/editors/object/object_bake_api.cc | 2 +- .../editors/object/object_bake_simulation.cc | 2 +- source/blender/editors/object/object_edit.cc | 2 +- .../editors/object/object_relations.cc | 4 +-- .../editors/object/object_transform.cc | 2 +- .../editors/physics/particle_object.cc | 2 +- .../blender/editors/render/render_shading.cc | 2 +- .../editors/space_action/action_edit.cc | 2 +- .../editors/space_graph/graph_buttons.cc | 2 +- .../blender/editors/space_graph/graph_edit.cc | 2 +- .../editors/space_image/image_buttons.cc | 2 +- .../blender/editors/space_image/image_ops.cc | 10 +++---- .../space_outliner/outliner_collections.cc | 4 +-- .../space_outliner/outliner_dragdrop.cc | 2 +- .../editors/space_outliner/outliner_draw.cc | 2 +- .../space_outliner/tree/tree_element.cc | 2 +- .../editors/space_script/script_edit.cc | 2 +- .../editors/space_sequencer/sequencer_edit.cc | 8 +++--- .../editors/space_view3d/view3d_buttons.cc | 2 +- .../transform/transform_convert_cursor.cc | 2 +- .../transform_convert_object_texspace.cc | 2 +- .../transform/transform_convert_sculpt.cc | 2 +- source/blender/editors/util/ed_util_ops.cc | 4 +-- source/blender/imbuf/intern/format_jpeg.cc | 2 +- .../imbuf/intern/openexr/openexr_api.cpp | 2 +- .../blender/imbuf/movie/intern/movie_write.cc | 2 +- .../blender/io/usd/intern/usd_asset_utils.cc | 27 +++++++++--------- .../blender/io/usd/intern/usd_skel_convert.cc | 28 ++++++++++--------- .../usd/intern/usd_writer_pointinstancer.cc | 2 +- source/blender/makesrna/intern/makesrna.cc | 2 +- source/blender/makesrna/intern/rna_access.cc | 12 ++++---- source/blender/makesrna/intern/rna_action.cc | 10 +++---- .../blender/makesrna/intern/rna_armature.cc | 5 ++-- source/blender/makesrna/intern/rna_asset.cc | 2 +- .../blender/makesrna/intern/rna_attribute.cc | 4 +-- .../blender/makesrna/intern/rna_constraint.cc | 2 +- source/blender/makesrna/intern/rna_curve.cc | 4 +-- source/blender/makesrna/intern/rna_curves.cc | 2 +- .../blender/makesrna/intern/rna_curves_api.cc | 2 +- source/blender/makesrna/intern/rna_fcurve.cc | 6 ++-- .../makesrna/intern/rna_grease_pencil_api.cc | 8 +++--- source/blender/makesrna/intern/rna_image.cc | 4 +-- .../blender/makesrna/intern/rna_modifier.cc | 4 +-- .../blender/makesrna/intern/rna_movieclip.cc | 2 +- .../blender/makesrna/intern/rna_nodetree.cc | 8 +++--- source/blender/makesrna/intern/rna_object.cc | 2 +- .../blender/makesrna/intern/rna_object_api.cc | 4 +-- source/blender/makesrna/intern/rna_pose.cc | 2 +- source/blender/makesrna/intern/rna_rna.cc | 2 +- source/blender/makesrna/intern/rna_scene.cc | 2 +- source/blender/makesrna/intern/rna_screen.cc | 2 +- source/blender/makesrna/intern/rna_userdef.cc | 2 +- source/blender/makesrna/intern/rna_wm.cc | 2 +- source/blender/makesrna/intern/rna_wm_api.cc | 6 ++-- .../function/nodes/node_fn_format_string.cc | 10 +++---- .../nodes/geometry/nodes/node_geo_bake.cc | 2 +- .../nodes/node_geo_collection_info.cc | 2 +- .../nodes/node_geo_input_named_attribute.cc | 2 +- .../geometry/nodes/node_geo_object_info.cc | 11 ++++---- .../geometry/nodes/node_geo_simulation.cc | 2 +- .../nodes/node_geo_store_named_attribute.cc | 2 +- source/blender/python/bmesh/bmesh_py_types.cc | 5 ++-- .../python/bmesh/bmesh_py_types_meshdata.cc | 2 +- source/blender/python/bmesh/bmesh_py_utils.cc | 4 +-- source/blender/python/intern/bpy_operator.cc | 8 +++--- source/blender/python/intern/bpy_rna.cc | 18 ++++++------ source/blender/python/intern/bpy_rna_anim.cc | 2 +- source/blender/render/intern/pipeline.cc | 2 +- .../blender/windowmanager/intern/wm_files.cc | 2 +- .../windowmanager/intern/wm_files_link.cc | 4 +-- .../blender/windowmanager/intern/wm_keymap.cc | 2 +- tools/modules/blendfile.py | 2 +- tools/utils/blender_merge_format_changes.py | 2 +- 99 files changed, 191 insertions(+), 187 deletions(-) diff --git a/intern/cycles/blender/addon/osl.py b/intern/cycles/blender/addon/osl.py index 1e95fcc39fc..bcc22cc5460 100644 --- a/intern/cycles/blender/addon/osl.py +++ b/intern/cycles/blender/addon/osl.py @@ -232,7 +232,7 @@ def update_internal_script(report, script): import traceback traceback.print_exc() - report({'ERROR'}, "Can't read OSO bytecode to store in node at %r" % oso_path) + report({'ERROR'}, "Cannot read OSO bytecode to store in node at %r" % oso_path) ok = False return ok, oso_path, bytecode, bytecode_hash diff --git a/intern/cycles/scene/colorspace.cpp b/intern/cycles/scene/colorspace.cpp index 9f914b1f09c..596ebadd7be 100644 --- a/intern/cycles/scene/colorspace.cpp +++ b/intern/cycles/scene/colorspace.cpp @@ -65,7 +65,7 @@ ColorSpaceProcessor *ColorSpaceManager::get_processor(ustring colorspace) catch (const OCIO::Exception &exception) { cached_processors[colorspace] = OCIO::ConstProcessorRcPtr(); LOG_WARNING << "Colorspace " << colorspace.c_str() - << " can't be converted to scene_linear: " << exception.what(); + << " cannot be converted to scene_linear: " << exception.what(); } } diff --git a/intern/cycles/scene/image_oiio.cpp b/intern/cycles/scene/image_oiio.cpp index 18d97f086f3..b58f4c31646 100644 --- a/intern/cycles/scene/image_oiio.cpp +++ b/intern/cycles/scene/image_oiio.cpp @@ -24,7 +24,7 @@ bool OIIOImageLoader::load_metadata(const ImageDeviceFeatures & /*features*/, return false; } if (path_is_directory(filepath.string())) { - LOG_WARNING << "File '" << filepath.string() << "' is a directory, can't use as image."; + LOG_WARNING << "File '" << filepath.string() << "' is a directory, cannot use as image."; return false; } diff --git a/scripts/addons_core/rigify/utils/bones.py b/scripts/addons_core/rigify/utils/bones.py index e5add05afd2..7e7a9b77223 100644 --- a/scripts/addons_core/rigify/utils/bones.py +++ b/scripts/addons_core/rigify/utils/bones.py @@ -118,7 +118,7 @@ def new_bone(obj: ArmatureObject, bone_name: str): edit_bone.roll = 0 return name else: - raise MetarigError("Can't add new bone '%s' outside of edit mode" % bone_name) + raise MetarigError("Cannot add new bone '%s' outside of edit mode" % bone_name) def copy_bone(obj: ArmatureObject, bone_name: str, assign_name='', *, diff --git a/scripts/freestyle/modules/parameter_editor.py b/scripts/freestyle/modules/parameter_editor.py index 53c0e07d408..3cd5568421b 100644 --- a/scripts/freestyle/modules/parameter_editor.py +++ b/scripts/freestyle/modules/parameter_editor.py @@ -379,7 +379,7 @@ class ColorDistanceFromObjectShader(ColorRampModifier): def __init__(self, blend, influence, ramp, target, range_min, range_max): ColorRampModifier.__init__(self, blend, influence, ramp) if target is None: - raise ValueError("ColorDistanceFromObjectShader: target can't be None ") + raise ValueError("ColorDistanceFromObjectShader: target cannot be None ") self.range = BoundedProperty(range_min, range_max) # construct a model-view matrix matrix = getCurrentScene().camera.matrix_world.inverted() @@ -400,7 +400,7 @@ class AlphaDistanceFromObjectShader(CurveMappingModifier): def __init__(self, blend, influence, mapping, invert, curve, target, range_min, range_max): CurveMappingModifier.__init__(self, blend, influence, mapping, invert, curve) if target is None: - raise ValueError("AlphaDistanceFromObjectShader: target can't be None ") + raise ValueError("AlphaDistanceFromObjectShader: target cannot be None ") self.range = BoundedProperty(range_min, range_max) # construct a model-view matrix matrix = getCurrentScene().camera.matrix_world.inverted() @@ -423,7 +423,7 @@ class ThicknessDistanceFromObjectShader(ThicknessBlenderMixIn, CurveMappingModif ThicknessBlenderMixIn.__init__(self, thickness_position, thickness_ratio) CurveMappingModifier.__init__(self, blend, influence, mapping, invert, curve) if target is None: - raise ValueError("ThicknessDistanceFromObjectShader: target can't be None ") + raise ValueError("ThicknessDistanceFromObjectShader: target cannot be None ") self.range = BoundedProperty(range_min, range_max) self.value = BoundedProperty(value_min, value_max) # construct a model-view matrix diff --git a/scripts/modules/addon_utils.py b/scripts/modules/addon_utils.py index e7d1f80cd5c..4c6cfc49657 100644 --- a/scripts/modules/addon_utils.py +++ b/scripts/modules/addon_utils.py @@ -150,7 +150,7 @@ def _fake_module(mod_name, mod_path, speedy=True): try: ast_data = ast.parse(data, filename=mod_path) except Exception: - print("Syntax error 'ast.parse' can't read:", repr(mod_path)) + print("Syntax error 'ast.parse' cannot read:", repr(mod_path)) import traceback traceback.print_exc() ast_data = None diff --git a/scripts/modules/bl_keymap_utils/io.py b/scripts/modules/bl_keymap_utils/io.py index 22c5e147194..e1229c6048d 100644 --- a/scripts/modules/bl_keymap_utils/io.py +++ b/scripts/modules/bl_keymap_utils/io.py @@ -75,7 +75,7 @@ def _kmi_properties_to_lines_recursive(level, properties, lines): return repr_f32(value) elif getattr(value, '__len__', False): return repr(tuple(value)) - raise Exception(f"Export key configuration: can't write {value!r}") + raise Exception(f"Export key configuration: cannot write {value!r}") for pname in properties.bl_rna.properties.keys(): if pname != "rna_type": diff --git a/scripts/modules/bpy/utils/__init__.py b/scripts/modules/bpy/utils/__init__.py index f0981e183b6..336b8b64d3f 100644 --- a/scripts/modules/bpy/utils/__init__.py +++ b/scripts/modules/bpy/utils/__init__.py @@ -131,7 +131,7 @@ def _test_import(module_name, loaded_modules): if module_name in loaded_modules: return None if "." in module_name: - print("Ignoring '{:s}', can't import files containing multiple periods".format(module_name)) + print("Ignoring '{:s}', cannot import files containing multiple periods".format(module_name)) return None if use_time: diff --git a/scripts/modules/bpy_extras/io_utils.py b/scripts/modules/bpy_extras/io_utils.py index ecce500e806..1f1f078d5c5 100644 --- a/scripts/modules/bpy_extras/io_utils.py +++ b/scripts/modules/bpy_extras/io_utils.py @@ -309,7 +309,7 @@ def axis_conversion(from_forward='Y', from_up='Z', to_forward='Y', to_up='Z'): if from_forward[-1] == from_up[-1] or to_forward[-1] == to_up[-1]: raise Exception("Invalid axis arguments passed, " - "can't use up/forward on the same axis") + "cannot use up/forward on the same axis") value = reduce( int.__or__, diff --git a/scripts/startup/bl_operators/assets.py b/scripts/startup/bl_operators/assets.py index bcf4d106255..a5c8d323e87 100644 --- a/scripts/startup/bl_operators/assets.py +++ b/scripts/startup/bl_operators/assets.py @@ -25,7 +25,7 @@ class AssetBrowserMetadataOperator: if not context.asset.local_id: Operator.poll_message_set( - "Asset metadata from external asset libraries can't be " + "Asset metadata from external asset libraries cannot be " "edited, only assets stored in the current file can" ) return False diff --git a/scripts/startup/bl_operators/presets.py b/scripts/startup/bl_operators/presets.py index 29f5bc5aa4a..4bebe6083ab 100644 --- a/scripts/startup/bl_operators/presets.py +++ b/scripts/startup/bl_operators/presets.py @@ -153,7 +153,7 @@ class AddPresetBase: return {'CANCELLED'} if _is_path_readonly(target_path): - self.report({'WARNING'}, "Can't create presets with built-in names") + self.report({'WARNING'}, "Cannot create presets with built-in names") return {'CANCELLED'} filepath = os.path.join(target_path, filename) + ext diff --git a/scripts/startup/bl_ui/properties_physics_rigidbody.py b/scripts/startup/bl_ui/properties_physics_rigidbody.py index b4d468c6df1..964ff03a801 100644 --- a/scripts/startup/bl_ui/properties_physics_rigidbody.py +++ b/scripts/startup/bl_ui/properties_physics_rigidbody.py @@ -50,7 +50,7 @@ class PHYSICS_PT_rigid_body(PHYSICS_PT_rigidbody_panel, Panel): row.alignment = 'RIGHT' row.label(text="This object is part of a compound shape", icon='INFO') else: - rigid_body_warning(layout, "Rigid Body can't be child of a non compound Rigid Body") + rigid_body_warning(layout, "Rigid Body cannot be child of a non compound Rigid Body") return if parent is None or parent.rigid_body is None: diff --git a/source/blender/blenkernel/intern/attribute.cc b/source/blender/blenkernel/intern/attribute.cc index 565be56c84d..506bd89d73d 100644 --- a/source/blender/blenkernel/intern/attribute.cc +++ b/source/blender/blenkernel/intern/attribute.cc @@ -533,7 +533,7 @@ bool BKE_attribute_remove(AttributeOwner &owner, const StringRef name, ReportLis return false; } if (BKE_attribute_required(owner, name)) { - BKE_report(reports, RPT_ERROR, "Attribute is required and can't be removed"); + BKE_report(reports, RPT_ERROR, "Attribute is required and cannot be removed"); return false; } diff --git a/source/blender/blenkernel/intern/cloth.cc b/source/blender/blenkernel/intern/cloth.cc index 11457184783..199e9ebb3a7 100644 --- a/source/blender/blenkernel/intern/cloth.cc +++ b/source/blender/blenkernel/intern/cloth.cc @@ -222,7 +222,7 @@ static bool do_init_cloth(Object *ob, ClothModifierData *clmd, Mesh *result, int if (clmd->clothObject == nullptr) { if (!cloth_from_object(ob, clmd, result, framenr, 1)) { BKE_ptcache_invalidate(cache); - BKE_modifier_set_error(ob, &(clmd->modifier), "Can't initialize cloth"); + BKE_modifier_set_error(ob, &(clmd->modifier), "Cannot initialize cloth"); return false; } diff --git a/source/blender/blenkernel/intern/collection.cc b/source/blender/blenkernel/intern/collection.cc index b48ceecf6b6..447aa1c72c4 100644 --- a/source/blender/blenkernel/intern/collection.cc +++ b/source/blender/blenkernel/intern/collection.cc @@ -545,7 +545,7 @@ bool BKE_collection_delete(Main *bmain, Collection *collection, bool hierarchy) { /* Master collection is not real datablock, can't be removed. */ if (collection->flag & COLLECTION_IS_MASTER) { - BLI_assert_msg(0, "Scene master collection can't be deleted"); + BLI_assert_msg(0, "Scene master collection cannot be deleted"); return false; } diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index a613c99295e..afdec910556 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -939,7 +939,7 @@ static void object_blend_read_after_liblink(BlendLibReader *reader, ID *id) if (ob->id.lib) { BLO_reportf_wrap(reports, RPT_INFO, - RPT_("Can't find object data of %s lib %s"), + RPT_("Cannot find object data of %s lib %s"), ob->id.name + 2, ob->id.lib->filepath); } diff --git a/source/blender/blenkernel/intern/rigidbody.cc b/source/blender/blenkernel/intern/rigidbody.cc index 06250345c37..dae25b398be 100644 --- a/source/blender/blenkernel/intern/rigidbody.cc +++ b/source/blender/blenkernel/intern/rigidbody.cc @@ -1481,13 +1481,13 @@ void BKE_rigidbody_ensure_local_object(Main *bmain, Object *ob) bool BKE_rigidbody_add_object(Main *bmain, Scene *scene, Object *ob, int type, ReportList *reports) { if (ob->type != OB_MESH) { - BKE_report(reports, RPT_ERROR, "Can't add Rigid Body to non mesh object"); + BKE_report(reports, RPT_ERROR, "Cannot add Rigid Body to non mesh object"); return false; } /* Add object to rigid body world in scene. */ if (!rigidbody_add_object_to_scene(bmain, scene, ob)) { - BKE_report(reports, RPT_ERROR, "Can't create Rigid Body world"); + BKE_report(reports, RPT_ERROR, "Cannot create Rigid Body world"); return false; } diff --git a/source/blender/blenlib/intern/winstuff.cc b/source/blender/blenlib/intern/winstuff.cc index cdd9ba162e8..7e419fda9dc 100644 --- a/source/blender/blenlib/intern/winstuff.cc +++ b/source/blender/blenlib/intern/winstuff.cc @@ -477,7 +477,7 @@ void BLI_windows_get_default_root_dir(char root[4]) } } if (0 == rc) { - printf("ERROR in 'BLI_windows_get_default_root_dir': can't find a valid drive!\n"); + printf("ERROR in 'BLI_windows_get_default_root_dir': cannot find a valid drive!\n"); root[0] = 'C'; root[1] = ':'; root[2] = '\\'; diff --git a/source/blender/blenloader/intern/writefile.cc b/source/blender/blenloader/intern/writefile.cc index 523e69dc8da..daa05b17120 100644 --- a/source/blender/blenloader/intern/writefile.cc +++ b/source/blender/blenloader/intern/writefile.cc @@ -905,7 +905,7 @@ static void writelist_id(WriteData *wd, const int filecode, const char *structna const int struct_nr = DNA_struct_find_with_alias(wd->sdna, structname); if (struct_nr == -1) { - printf("error: can't find SDNA code <%s>\n", structname); + printf("error: cannot find SDNA code <%s>\n", structname); return; } diff --git a/source/blender/editors/animation/anim_channels_defines.cc b/source/blender/editors/animation/anim_channels_defines.cc index 314866c557e..a90aadb7f13 100644 --- a/source/blender/editors/animation/anim_channels_defines.cc +++ b/source/blender/editors/animation/anim_channels_defines.cc @@ -5973,7 +5973,7 @@ static void draw_setting_widget(bAnimContext *ac, !BKE_id_is_editable(ac->bmain, ale->id))) { if (setting != ACHANNEL_SETTING_EXPAND) { - UI_but_disable(but, "Can't edit this property from a linked data-block"); + UI_but_disable(but, "Cannot edit this property from a linked data-block"); } } diff --git a/source/blender/editors/animation/keyframing.cc b/source/blender/editors/animation/keyframing.cc index 25cdf1d148b..58d13e7577a 100644 --- a/source/blender/editors/animation/keyframing.cc +++ b/source/blender/editors/animation/keyframing.cc @@ -1293,7 +1293,7 @@ static wmOperatorStatus insert_key_button_exec(bContext *C, wmOperator *op) else { BKE_reportf(op->reports, RPT_WARNING, - "Button doesn't appear to have any property information attached (ptr.data = " + "Button does not appear to have any property information attached (ptr.data = " "%p, prop = %p)", ptr.data, (void *)prop); diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index 4561a9ea0f5..bcc53ffcd79 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -2508,7 +2508,7 @@ void ui_but_v3_get(uiBut *but, float vec[3]) } else { if (but->editvec == nullptr) { - fprintf(stderr, "%s: can't get color, should never happen\n", __func__); + fprintf(stderr, "%s: cannot get color, should never happen\n", __func__); zero_v3(vec); } } diff --git a/source/blender/editors/interface/interface_anim.cc b/source/blender/editors/interface/interface_anim.cc index b3e369d1563..ecf2db8bdd5 100644 --- a/source/blender/editors/interface/interface_anim.cc +++ b/source/blender/editors/interface/interface_anim.cc @@ -260,7 +260,7 @@ bool ui_but_anim_expression_create(uiBut *but, const char *str) if (RNA_property_array_check(but->rnaprop) != 0) { if (but->rnaindex == -1) { if (G.debug & G_DEBUG) { - printf("ERROR: create expression failed - can't create expression for entire array\n"); + printf("ERROR: create expression failed - cannot create expression for entire array\n"); } return false; } diff --git a/source/blender/editors/interface/templates/interface_templates_intern.hh b/source/blender/editors/interface/templates/interface_templates_intern.hh index 0d02b633890..6b5d99a51e7 100644 --- a/source/blender/editors/interface/templates/interface_templates_intern.hh +++ b/source/blender/editors/interface/templates/interface_templates_intern.hh @@ -20,7 +20,7 @@ struct bContext; #define CURVE_ZOOM_MAX (1.0f / 25.0f) -#define ERROR_LIBDATA_MESSAGE N_("Can't edit external library data") +#define ERROR_LIBDATA_MESSAGE N_("Cannot edit external library data") /* Defines for templateID/TemplateSearch. */ #define TEMPLATE_SEARCH_TEXTBUT_MIN_WIDTH (UI_UNIT_X * 4) diff --git a/source/blender/editors/interface/views/abstract_view_item.cc b/source/blender/editors/interface/views/abstract_view_item.cc index c8512327e63..4c295f65162 100644 --- a/source/blender/editors/interface/views/abstract_view_item.cc +++ b/source/blender/editors/interface/views/abstract_view_item.cc @@ -52,7 +52,7 @@ std::optional AbstractViewItem::should_be_active() const bool AbstractViewItem::set_state_active() { BLI_assert_msg(get_view().is_reconstructed(), - "Item activation can't be done until reconstruction is completed"); + "Item activation cannot be done until reconstruction is completed"); if (!is_activatable_) { return false; @@ -336,7 +336,7 @@ bool AbstractViewItem::is_interactive() const bool AbstractViewItem::is_active() const { BLI_assert_msg(this->get_view().is_reconstructed(), - "State can't be queried until reconstruction is completed"); + "State cannot be queried until reconstruction is completed"); return is_active_; } diff --git a/source/blender/editors/interface/views/tree_view.cc b/source/blender/editors/interface/views/tree_view.cc index 1b365941520..60294644daf 100644 --- a/source/blender/editors/interface/views/tree_view.cc +++ b/source/blender/editors/interface/views/tree_view.cc @@ -643,9 +643,9 @@ bool AbstractTreeViewItem::set_state_active() bool AbstractTreeViewItem::is_hovered() const { BLI_assert_msg(get_tree_view().is_reconstructed(), - "State can't be queried until reconstruction is completed"); + "State cannot be queried until reconstruction is completed"); BLI_assert_msg(view_item_but_ != nullptr, - "Hovered state can't be queried before the tree row is being built"); + "Hovered state cannot be queried before the tree row is being built"); /* The new layout hasn't finished construction yet, so the final state of the button is unknown. * Get the matching button from the previous redraw instead. */ @@ -657,7 +657,7 @@ bool AbstractTreeViewItem::is_hovered() const bool AbstractTreeViewItem::is_collapsed() const { BLI_assert_msg(get_tree_view().is_reconstructed(), - "State can't be queried until reconstruction is completed"); + "State cannot be queried until reconstruction is completed"); return this->is_collapsible() && !is_open_; } diff --git a/source/blender/editors/object/object_bake_api.cc b/source/blender/editors/object/object_bake_api.cc index c987cf8c3e0..310e64d12fe 100644 --- a/source/blender/editors/object/object_bake_api.cc +++ b/source/blender/editors/object/object_bake_api.cc @@ -668,7 +668,7 @@ static bool bake_objects_check(Main *bmain, if (ELEM(ob_iter->type, OB_MESH, OB_FONT, OB_CURVES_LEGACY, OB_SURF, OB_MBALL) == false) { BKE_reportf(reports, RPT_ERROR, - "Object \"%s\" is not a mesh or can't be converted to a mesh (Curve, Text, " + "Object \"%s\" is not a mesh or cannot be converted to a mesh (Curve, Text, " "Surface or Metaball)", ob_iter->id.name + 2); return false; diff --git a/source/blender/editors/object/object_bake_simulation.cc b/source/blender/editors/object/object_bake_simulation.cc index 186eb3e0d8c..af26e7c728a 100644 --- a/source/blender/editors/object/object_bake_simulation.cc +++ b/source/blender/editors/object/object_bake_simulation.cc @@ -961,7 +961,7 @@ static Vector bake_single_node_gather_bake_request(bContext *C, if (!request.path) { BKE_report(op->reports, RPT_INFO, - "Can't determine bake location on disk. Falling back to packed bake."); + "Cannot determine bake location on disk. Falling back to packed bake."); } } diff --git a/source/blender/editors/object/object_edit.cc b/source/blender/editors/object/object_edit.cc index e2862bec923..012e0431d5a 100644 --- a/source/blender/editors/object/object_edit.cc +++ b/source/blender/editors/object/object_edit.cc @@ -1705,7 +1705,7 @@ static wmOperatorStatus shade_smooth_exec(bContext *C, wmOperator *op) } if (has_linked_data) { - BKE_report(op->reports, RPT_WARNING, "Can't edit linked mesh or curve data"); + BKE_report(op->reports, RPT_WARNING, "Cannot edit linked mesh or curve data"); } return (changed_multi) ? OPERATOR_FINISHED : OPERATOR_CANCELLED; diff --git a/source/blender/editors/object/object_relations.cc b/source/blender/editors/object/object_relations.cc index 5b33163c19f..0a019127d78 100644 --- a/source/blender/editors/object/object_relations.cc +++ b/source/blender/editors/object/object_relations.cc @@ -2001,7 +2001,7 @@ static void single_obdata_users( LIB_ID_COPY_DEFAULT | LIB_ID_COPY_ACTIONS)); break; default: - printf("ERROR %s: can't copy %s\n", __func__, id->name); + printf("ERROR %s: cannot copy %s\n", __func__, id->name); BLI_assert_msg(0, "This should never happen."); /* We need to end the FOREACH_OBJECT_FLAG_BEGIN iterator to prevent memory leak. */ @@ -3181,7 +3181,7 @@ static wmOperatorStatus object_unlink_data_exec(bContext *C, wmOperator *op) ob->data = nullptr; } else { - BKE_report(op->reports, RPT_ERROR, "Can't unlink this object data"); + BKE_report(op->reports, RPT_ERROR, "Cannot unlink this object data"); return OPERATOR_CANCELLED; } } diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index d57af101882..7b15e958073 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -752,7 +752,7 @@ static wmOperatorStatus apply_objects_internal(bContext *C, BKE_reportf( reports, RPT_ERROR, - R"(Rotation/Location can't apply to a 2D curve: Object "%s", %s "%s", aborting)", + R"(Rotation/Location cannot apply to a 2D curve: Object "%s", %s "%s", aborting)", ob->id.name + 2, BKE_idtype_idcode_to_name(GS(obdata->name)), obdata->name + 2); diff --git a/source/blender/editors/physics/particle_object.cc b/source/blender/editors/physics/particle_object.cc index 1f2971b749b..305d85359f6 100644 --- a/source/blender/editors/physics/particle_object.cc +++ b/source/blender/editors/physics/particle_object.cc @@ -958,7 +958,7 @@ static wmOperatorStatus connect_hair_exec(bContext *C, wmOperator *op) if (!any_connected) { BKE_report(op->reports, RPT_WARNING, - "No hair connected (can't connect hair if particle system modifier is disabled)"); + "No hair connected (cannot connect hair if particle system modifier is disabled)"); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/render/render_shading.cc b/source/blender/editors/render/render_shading.cc index 36031b5c56e..e602a8ec05c 100644 --- a/source/blender/editors/render/render_shading.cc +++ b/source/blender/editors/render/render_shading.cc @@ -1538,7 +1538,7 @@ static wmOperatorStatus lightprobe_cache_bake_invoke(bContext *C, wm, win, bmain, view_layer, scene, probes, data->report, scene->r.cfra, 0); if (wm_job == nullptr) { MEM_delete(data); - BKE_report(op->reports, RPT_WARNING, "Can't bake light probe while rendering"); + BKE_report(op->reports, RPT_WARNING, "Cannot bake light probe while rendering"); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/space_action/action_edit.cc b/source/blender/editors/space_action/action_edit.cc index 45e5f797830..9509e5951fe 100644 --- a/source/blender/editors/space_action/action_edit.cc +++ b/source/blender/editors/space_action/action_edit.cc @@ -1404,7 +1404,7 @@ static const EnumPropertyItem prop_actkeys_expo_types[] = { "MAKE_CYCLIC", 0, "Make Cyclic (F-Modifier)", - "Add Cycles F-Modifier if one doesn't exist already"}, + "Add Cycles F-Modifier if one does not exist already"}, {CLEAR_CYCLIC_EXPO, "CLEAR_CYCLIC", 0, diff --git a/source/blender/editors/space_graph/graph_buttons.cc b/source/blender/editors/space_graph/graph_buttons.cc index a00591eb52e..e07ad27f6f8 100644 --- a/source/blender/editors/space_graph/graph_buttons.cc +++ b/source/blender/editors/space_graph/graph_buttons.cc @@ -584,7 +584,7 @@ static void graph_panel_key_properties(const bContext *C, Panel *panel) } else if (fcu->fpt) { /* samples only */ - layout->label(RPT_("F-Curve doesn't have any keyframes as it only contains sampled points"), + layout->label(RPT_("F-Curve does not have any keyframes as it only contains sampled points"), ICON_NONE); } else { diff --git a/source/blender/editors/space_graph/graph_edit.cc b/source/blender/editors/space_graph/graph_edit.cc index 9e111af29ef..40701036a04 100644 --- a/source/blender/editors/space_graph/graph_edit.cc +++ b/source/blender/editors/space_graph/graph_edit.cc @@ -1423,7 +1423,7 @@ static const EnumPropertyItem prop_graphkeys_expo_types[] = { "MAKE_CYCLIC", 0, "Make Cyclic (F-Modifier)", - "Add Cycles F-Modifier if one doesn't exist already"}, + "Add Cycles F-Modifier if one does not exist already"}, {CLEAR_CYCLIC_EXPO, "CLEAR_CYCLIC", 0, diff --git a/source/blender/editors/space_image/image_buttons.cc b/source/blender/editors/space_image/image_buttons.cc index 70170b8b170..1664d165aac 100644 --- a/source/blender/editors/space_image/image_buttons.cc +++ b/source/blender/editors/space_image/image_buttons.cc @@ -1222,7 +1222,7 @@ void uiTemplateImageInfo(uiLayout *layout, bContext *C, Image *ima, ImageUser *i col->alignment_set(blender::ui::LayoutAlign::Right); if (ibuf == nullptr) { - col->label(RPT_("Can't Load Image"), ICON_NONE); + col->label(RPT_("Cannot Load Image"), ICON_NONE); } else { char str[MAX_IMAGE_INFO_LEN] = {0}; diff --git a/source/blender/editors/space_image/image_ops.cc b/source/blender/editors/space_image/image_ops.cc index da5dfef7008..f34fd1c7988 100644 --- a/source/blender/editors/space_image/image_ops.cc +++ b/source/blender/editors/space_image/image_ops.cc @@ -2088,7 +2088,7 @@ static bool image_save_as_poll(bContext *C) Image *ima = image_from_context(C); if (ima->source == IMA_SRC_VIEWER) { - CTX_wm_operator_poll_msg_set(C, "can't save image while rendering"); + CTX_wm_operator_poll_msg_set(C, "cannot save image while rendering"); return false; } } @@ -2411,7 +2411,7 @@ int ED_image_save_all_modified_info(const Main *bmain, ReportList *reports) else { BKE_reportf(reports, RPT_WARNING, - "Packed library image can't be saved: \"%s\" from \"%s\"", + "Packed library image cannot be saved: \"%s\" from \"%s\"", ima->id.name + 2, ima->id.lib->filepath); } @@ -2419,7 +2419,7 @@ int ED_image_save_all_modified_info(const Main *bmain, ReportList *reports) else if (!is_format_writable) { BKE_reportf(reports, RPT_WARNING, - "Image can't be saved, use a different file format: \"%s\"", + "Image cannot be saved, use a different file format: \"%s\"", ima->id.name + 2); } else { @@ -2428,7 +2428,7 @@ int ED_image_save_all_modified_info(const Main *bmain, ReportList *reports) if (unique_paths.contains_as(ima->filepath)) { BKE_reportf(reports, RPT_WARNING, - "Multiple images can't be saved to an identical path: \"%s\"", + "Multiple images cannot be saved to an identical path: \"%s\"", ima->filepath); } else { @@ -2438,7 +2438,7 @@ int ED_image_save_all_modified_info(const Main *bmain, ReportList *reports) else { BKE_reportf(reports, RPT_WARNING, - "Image can't be saved, no valid file path: \"%s\"", + "Image cannot be saved, no valid file path: \"%s\"", ima->filepath); } } diff --git a/source/blender/editors/space_outliner/outliner_collections.cc b/source/blender/editors/space_outliner/outliner_collections.cc index ff94fa521d5..68328e6df8b 100644 --- a/source/blender/editors/space_outliner/outliner_collections.cc +++ b/source/blender/editors/space_outliner/outliner_collections.cc @@ -273,7 +273,7 @@ static wmOperatorStatus collection_new_exec(bContext *C, wmOperator *op) } if (!ID_IS_EDITABLE(scene) || ID_IS_OVERRIDE_LIBRARY(scene)) { - BKE_report(op->reports, RPT_ERROR, "Can't add a new collection to linked/override scene"); + BKE_report(op->reports, RPT_ERROR, "Cannot add a new collection to linked/override scene"); return OPERATOR_CANCELLED; } @@ -1628,7 +1628,7 @@ static wmOperatorStatus outliner_color_tag_set_exec(bContext *C, wmOperator *op) continue; } if (!BKE_id_is_editable(CTX_data_main(C), &collection->id)) { - BKE_report(op->reports, RPT_WARNING, "Can't add a color tag to a linked collection"); + BKE_report(op->reports, RPT_WARNING, "Cannot add a color tag to a linked collection"); continue; } diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.cc b/source/blender/editors/space_outliner/outliner_dragdrop.cc index 7e325a89033..33b3ab1aac2 100644 --- a/source/blender/editors/space_outliner/outliner_dragdrop.cc +++ b/source/blender/editors/space_outliner/outliner_dragdrop.cc @@ -395,7 +395,7 @@ static void parent_drop_set_parents(bContext *C, } if (linked_objects) { - BKE_report(reports, RPT_INFO, "Can't edit library linked or non-editable override object(s)"); + BKE_report(reports, RPT_INFO, "Cannot edit library linked or non-editable override object(s)"); } if (parent_set) { diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc index e58200263c5..da78b7412be 100644 --- a/source/blender/editors/space_outliner/outliner_draw.cc +++ b/source/blender/editors/space_outliner/outliner_draw.cc @@ -2319,7 +2319,7 @@ static void outliner_draw_mode_column_toggle(uiBlock *block, (ID_IS_OVERRIDE_LIBRARY_REAL(ob) && (ob->id.override_library->flag & LIBOVERRIDE_FLAG_SYSTEM_DEFINED) != 0)) { - UI_but_disable(but, "Can't edit library or non-editable override data"); + UI_but_disable(but, "Cannot edit library or non-editable override data"); } } diff --git a/source/blender/editors/space_outliner/tree/tree_element.cc b/source/blender/editors/space_outliner/tree/tree_element.cc index 6930d649a1f..9fdf11dcd38 100644 --- a/source/blender/editors/space_outliner/tree/tree_element.cc +++ b/source/blender/editors/space_outliner/tree/tree_element.cc @@ -251,7 +251,7 @@ TreeElement *AbstractTreeElement::add_element(ListBase *lb, if (!display_) { BLI_assert_msg(false, "Element not registered properly through AbstractTreeDisplay::add_element(), " - "can't expand the tree further"); + "cannot expand the tree further"); return nullptr; } diff --git a/source/blender/editors/space_script/script_edit.cc b/source/blender/editors/space_script/script_edit.cc index 2d9039ce387..f178bc9e718 100644 --- a/source/blender/editors/space_script/script_edit.cc +++ b/source/blender/editors/space_script/script_edit.cc @@ -96,7 +96,7 @@ static wmOperatorStatus script_reload_exec(bContext *C, wmOperator *op) /* clear running operators */ if (script_test_modal_operators(C)) { - BKE_report(op->reports, RPT_ERROR, "Can't reload with running modal operators"); + BKE_report(op->reports, RPT_ERROR, "Cannot reload with running modal operators"); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/space_sequencer/sequencer_edit.cc b/source/blender/editors/space_sequencer/sequencer_edit.cc index b4d2778582b..f6971ad900e 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.cc +++ b/source/blender/editors/space_sequencer/sequencer_edit.cc @@ -1087,7 +1087,7 @@ void SEQUENCER_OT_lock(wmOperatorType *ot) /* Identifiers. */ ot->name = "Lock Strips"; ot->idname = "SEQUENCER_OT_lock"; - ot->description = "Lock strips so they can't be transformed"; + ot->description = "Lock strips so they cannot be transformed"; /* API callbacks. */ ot->exec = sequencer_lock_exec; @@ -3112,12 +3112,12 @@ static wmOperatorStatus sequencer_export_subtitles_exec(bContext *C, wmOperator if (!BLI_exists(filepath)) { BLI_file_ensure_parent_dir_exists(filepath); if (!BLI_file_touch(filepath)) { - BKE_report(op->reports, RPT_ERROR, "Can't create subtitle file"); + BKE_report(op->reports, RPT_ERROR, "Cannot create subtitle file"); return OPERATOR_CANCELLED; } } else if (!BLI_file_is_writable(filepath)) { - BKE_report(op->reports, RPT_ERROR, "Can't overwrite export file"); + BKE_report(op->reports, RPT_ERROR, "Cannot overwrite export file"); return OPERATOR_CANCELLED; } @@ -3237,7 +3237,7 @@ static wmOperatorStatus sequencer_set_range_to_strips_exec(bContext *C, wmOperat return OPERATOR_CANCELLED; } if (efra < 0) { - BKE_report(op->reports, RPT_ERROR, "Can't set a negative range"); + BKE_report(op->reports, RPT_ERROR, "Cannot set a negative range"); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/space_view3d/view3d_buttons.cc b/source/blender/editors/space_view3d/view3d_buttons.cc index a83af735016..fa6588079a0 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.cc +++ b/source/blender/editors/space_view3d/view3d_buttons.cc @@ -1535,7 +1535,7 @@ static void v3d_object_dimension_buts(bContext *C, uiLayout *layout, View3D *v3d UI_but_number_precision_set(but, 3); UI_but_unit_type_set(but, PROP_UNIT_LENGTH); if (!is_editable) { - UI_but_disable(but, "Can't edit this property from a linked data-block"); + UI_but_disable(but, "Cannot edit this property from a linked data-block"); } } UI_block_align_end(block); diff --git a/source/blender/editors/transform/transform_convert_cursor.cc b/source/blender/editors/transform/transform_convert_cursor.cc index 9d5a57ee20b..6092ef03fcc 100644 --- a/source/blender/editors/transform/transform_convert_cursor.cc +++ b/source/blender/editors/transform/transform_convert_cursor.cc @@ -128,7 +128,7 @@ static void createTransCursor_view3d(bContext * /*C*/, TransInfo *t) Scene *scene = t->scene; if (!ID_IS_EDITABLE(scene)) { - BKE_report(t->reports, RPT_ERROR, "Linked data can't text-space transform"); + BKE_report(t->reports, RPT_ERROR, "Linked data cannot text-space transform"); return; } diff --git a/source/blender/editors/transform/transform_convert_object_texspace.cc b/source/blender/editors/transform/transform_convert_object_texspace.cc index 041c07dfb78..dc3f4db1a85 100644 --- a/source/blender/editors/transform/transform_convert_object_texspace.cc +++ b/source/blender/editors/transform/transform_convert_object_texspace.cc @@ -55,7 +55,7 @@ static void createTransTexspace(bContext * /*C*/, TransInfo *t) } if (BKE_object_obdata_is_libdata(ob)) { - BKE_report(t->reports, RPT_ERROR, "Linked data can't text-space transform"); + BKE_report(t->reports, RPT_ERROR, "Linked data cannot text-space transform"); return; } diff --git a/source/blender/editors/transform/transform_convert_sculpt.cc b/source/blender/editors/transform/transform_convert_sculpt.cc index 9f9fb89fe53..229c2678b08 100644 --- a/source/blender/editors/transform/transform_convert_sculpt.cc +++ b/source/blender/editors/transform/transform_convert_sculpt.cc @@ -36,7 +36,7 @@ static void createTransSculpt(bContext *C, TransInfo *t) Scene *scene = t->scene; if (!BKE_id_is_editable(CTX_data_main(C), &scene->id)) { - BKE_report(t->reports, RPT_ERROR, "Linked data can't text-space transform"); + BKE_report(t->reports, RPT_ERROR, "Linked data cannot text-space transform"); return; } diff --git a/source/blender/editors/util/ed_util_ops.cc b/source/blender/editors/util/ed_util_ops.cc index 088914b6338..bcb38a7c1a1 100644 --- a/source/blender/editors/util/ed_util_ops.cc +++ b/source/blender/editors/util/ed_util_ops.cc @@ -78,13 +78,13 @@ static bool lib_id_preview_editing_poll_ex(const ID *id, const char **r_disabled } if (!ID_IS_EDITABLE(id)) { if (r_disabled_hint) { - *r_disabled_hint = "Can't edit external library data"; + *r_disabled_hint = "Cannot edit external library data"; } return false; } if (ID_IS_OVERRIDE_LIBRARY(id)) { if (r_disabled_hint) { - *r_disabled_hint = "Can't edit previews of overridden library data"; + *r_disabled_hint = "Cannot edit previews of overridden library data"; } return false; } diff --git a/source/blender/imbuf/intern/format_jpeg.cc b/source/blender/imbuf/intern/format_jpeg.cc index f739e8dd51d..063d0a0c8e9 100644 --- a/source/blender/imbuf/intern/format_jpeg.cc +++ b/source/blender/imbuf/intern/format_jpeg.cc @@ -502,7 +502,7 @@ ImBuf *imb_thumbnail_jpeg(const char *filepath, } if ((infile = BLI_fopen(filepath, "rb")) == nullptr) { - fprintf(stderr, "can't open %s\n", filepath); + fprintf(stderr, "cannot open %s\n", filepath); return nullptr; } diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index c8941e548e9..26482e04652 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -2093,7 +2093,7 @@ ImBuf *imb_load_openexr(const uchar *mem, size_t size, int flags, ImFileColorSpa /* do not make an ibuf when */ if (is_multi && !(flags & IB_test) && !(flags & IB_multilayer)) { - printf("Error: can't process EXR multilayer file\n"); + printf("Error: cannot process EXR multilayer file\n"); } else { const bool is_alpha = exr_has_alpha(*file); diff --git a/source/blender/imbuf/movie/intern/movie_write.cc b/source/blender/imbuf/movie/intern/movie_write.cc index d46d11da3b1..79a90489338 100644 --- a/source/blender/imbuf/movie/intern/movie_write.cc +++ b/source/blender/imbuf/movie/intern/movie_write.cc @@ -1269,7 +1269,7 @@ static bool start_ffmpeg_impl(MovieWriter *context, of = avformat_alloc_context(); if (!of) { - BKE_report(reports, RPT_ERROR, "Can't allocate FFmpeg format context"); + BKE_report(reports, RPT_ERROR, "Cannot allocate FFmpeg format context"); return false; } diff --git a/source/blender/io/usd/intern/usd_asset_utils.cc b/source/blender/io/usd/intern/usd_asset_utils.cc index 20ebcb19b04..18e6bff635a 100644 --- a/source/blender/io/usd/intern/usd_asset_utils.cc +++ b/source/blender/io/usd/intern/usd_asset_utils.cc @@ -173,7 +173,7 @@ bool copy_asset(const std::string &src, pxr::ArResolvedPath src_path = ar.Resolve(src); if (src_path.IsEmpty()) { - BKE_reportf(reports, RPT_ERROR, "%s: Can't resolve path %s", __func__, src.c_str()); + BKE_reportf(reports, RPT_ERROR, "%s: Cannot resolve path %s", __func__, src.c_str()); return false; } @@ -181,14 +181,14 @@ bool copy_asset(const std::string &src, if (dst_path.IsEmpty()) { BKE_reportf( - reports, RPT_ERROR, "%s: Can't resolve path %s for writing", __func__, dst.c_str()); + reports, RPT_ERROR, "%s: Cannot resolve path %s for writing", __func__, dst.c_str()); return false; } if (src_path == dst_path) { BKE_reportf(reports, RPT_ERROR, - "%s: Can't copy %s. The source and destination paths are the same", + "%s: Cannot copy %s. The source and destination paths are the same", __func__, src_path.GetPathString().c_str()); return false; @@ -198,7 +198,7 @@ bool copy_asset(const std::string &src, if (!ar.CanWriteAssetToPath(dst_path, &why_not)) { BKE_reportf(reports, RPT_ERROR, - "%s: Can't write to asset %s: %s", + "%s: Cannot write to asset %s: %s", __func__, dst_path.GetPathString().c_str(), why_not.c_str()); @@ -209,7 +209,7 @@ bool copy_asset(const std::string &src, if (!src_asset) { BKE_reportf(reports, RPT_ERROR, - "%s: Can't open source asset %s", + "%s: Cannot open source asset %s", __func__, src_path.GetPathString().c_str()); return false; @@ -242,7 +242,7 @@ bool copy_asset(const std::string &src, if (!dst_asset) { BKE_reportf(reports, RPT_ERROR, - "%s: Can't open destination asset %s for writing", + "%s: Cannot open destination asset %s for writing", __func__, src_path.GetPathString().c_str()); return false; @@ -301,7 +301,7 @@ std::string import_asset(const std::string &src, "but the blend file path is empty. " "Please save the blend file before importing the USD " "or provide an absolute import directory path. " - "Can't import %s", + "Cannot import %s", __func__, src.c_str()); return src; @@ -355,15 +355,16 @@ std::string get_export_textures_dir(const pxr::UsdStageRefPtr stage) pxr::SdfLayerHandle layer = stage->GetRootLayer(); if (layer->IsAnonymous()) { - WM_global_reportf( - RPT_WARNING, "%s: Can't generate a textures directory path for anonymous stage", __func__); + WM_global_reportf(RPT_WARNING, + "%s: Cannot generate a textures directory path for anonymous stage", + __func__); return ""; } const pxr::ArResolvedPath &stage_path = layer->GetResolvedPath(); if (stage_path.empty()) { - WM_global_reportf(RPT_WARNING, "%s: Can't get resolved path for stage", __func__); + WM_global_reportf(RPT_WARNING, "%s: Cannot get resolved path for stage", __func__); return ""; } @@ -436,7 +437,7 @@ bool write_to_path(const void *data, size_t size, const std::string &path, Repor pxr::ArResolvedPath resolved_path = ar.ResolveForNewAsset(path); if (resolved_path.IsEmpty()) { - BKE_reportf(reports, RPT_ERROR, "Can't resolve path %s for writing", path.c_str()); + BKE_reportf(reports, RPT_ERROR, "Cannot resolve path %s for writing", path.c_str()); return false; } @@ -444,7 +445,7 @@ bool write_to_path(const void *data, size_t size, const std::string &path, Repor if (!ar.CanWriteAssetToPath(resolved_path, &why_not)) { BKE_reportf(reports, RPT_ERROR, - "Can't write to asset %s: %s", + "Cannot write to asset %s: %s", resolved_path.GetPathString().c_str(), why_not.c_str()); return false; @@ -455,7 +456,7 @@ bool write_to_path(const void *data, size_t size, const std::string &path, Repor if (!dst_asset) { BKE_reportf(reports, RPT_ERROR, - "Can't open destination asset %s for writing", + "Cannot open destination asset %s for writing", resolved_path.GetPathString().c_str()); return false; } diff --git a/source/blender/io/usd/intern/usd_skel_convert.cc b/source/blender/io/usd/intern/usd_skel_convert.cc index 8958baff7f9..c79d2115687 100644 --- a/source/blender/io/usd/intern/usd_skel_convert.cc +++ b/source/blender/io/usd/intern/usd_skel_convert.cc @@ -195,11 +195,12 @@ void import_skeleton_curves(Main *bmain, } if (usd_bind_xforms.size() != joint_order.size()) { - BKE_reportf(reports, - RPT_WARNING, - "%s: Number of bind transforms doesn't match the number of joints for skeleton %s", - __func__, - skel_query.GetSkeleton().GetPrim().GetPath().GetAsString().c_str()); + BKE_reportf( + reports, + RPT_WARNING, + "%s: Number of bind transforms does not match the number of joints for skeleton %s", + __func__, + skel_query.GetSkeleton().GetPrim().GetPath().GetAsString().c_str()); return; } @@ -234,7 +235,7 @@ void import_skeleton_curves(Main *bmain, if (joint_local_xforms.size() != joint_order.size()) { CLOG_WARN( &LOG, - "Number of joint local transform entries %zu doesn't match the number of joints %zu", + "Number of joint local transform entries %zu does not match the number of joints %zu", joint_local_xforms.size(), joint_order.size()); continue; @@ -411,11 +412,12 @@ void import_blendshapes(Main *bmain, /* Sanity check. */ if (targets.size() != usd_blendshapes.size()) { - BKE_reportf(reports, - RPT_WARNING, - "%s: Number of blendshapes doesn't match number of blendshape targets for prim %s", - __func__, - prim.GetPath().GetAsString().c_str()); + BKE_reportf( + reports, + RPT_WARNING, + "%s: Number of blendshapes does not match number of blendshape targets for prim %s", + __func__, + prim.GetPath().GetAsString().c_str()); return; } @@ -642,7 +644,7 @@ void import_blendshapes(Main *bmain, if (usd_weights.size() != curves.size()) { CLOG_WARN( &LOG, - "Number of weight samples doesn't match number of shapekey curve entries for frame %f", + "Number of weight samples does not match number of shapekey curve entries for frame %f", frame); continue; } @@ -869,7 +871,7 @@ void import_skeleton(Main *bmain, RPT_WARNING, "USD Skeleton Import: bone matrices with negative determinants detected in prim %s. " "Such matrices may indicate negative scales, possibly due to mirroring operations, " - "and can't currently be converted to Blender's bone representation. " + "and cannot currently be converted to Blender's bone representation. " "The skeletal animation won't be imported", skel.GetPath().GetAsString().c_str()); } diff --git a/source/blender/io/usd/intern/usd_writer_pointinstancer.cc b/source/blender/io/usd/intern/usd_writer_pointinstancer.cc index 1c216200f8e..2d3ffe1fad9 100644 --- a/source/blender/io/usd/intern/usd_writer_pointinstancer.cc +++ b/source/blender/io/usd/intern/usd_writer_pointinstancer.cc @@ -77,7 +77,7 @@ void USDPointInstancerWriter::do_write(HierarchyContext &context) if (transforms.size() != instance_num) { BKE_reportf(this->reports(), RPT_ERROR, - "Instances number '%d' doesn't match transforms size '%d'", + "Instances number '%d' does not match transforms size '%d'", instance_num, int(transforms.size())); return; diff --git a/source/blender/makesrna/intern/makesrna.cc b/source/blender/makesrna/intern/makesrna.cc index 867de67a807..0e9fa84de4f 100644 --- a/source/blender/makesrna/intern/makesrna.cc +++ b/source/blender/makesrna/intern/makesrna.cc @@ -5664,7 +5664,7 @@ static void make_bad_file(const char *file, int line) { FILE *fp = fopen(file, "w"); fprintf(fp, - "#error \"Error! can't make correct RNA file from %s:%d, " + "#error \"Error! cannot make correct RNA file from %s:%d, " "check DNA properties.\"\n", __FILE__, line); diff --git a/source/blender/makesrna/intern/rna_access.cc b/source/blender/makesrna/intern/rna_access.cc index b20f7167887..1284f8c4d3f 100644 --- a/source/blender/makesrna/intern/rna_access.cc +++ b/source/blender/makesrna/intern/rna_access.cc @@ -1202,7 +1202,7 @@ bool RNA_struct_bl_idname_ok_or_report(ReportList *reports, { BKE_reportf(reports, eReportType(report_level), - "'%s' doesn't have upper case alpha-numeric prefix", + "'%s' does not have upper case alpha-numeric prefix", identifier); return failure; } @@ -1217,7 +1217,7 @@ bool RNA_struct_bl_idname_ok_or_report(ReportList *reports, { BKE_reportf(reports, eReportType(report_level), - "'%s' doesn't have an alpha-numeric suffix", + "'%s' does not have an alpha-numeric suffix", identifier); return failure; } @@ -2255,7 +2255,7 @@ static bool rna_property_editable_do(const PointerRNA *ptr, * because regular properties may not be editable and still be displayed. */ if (flag & PROP_REGISTER) { if (r_info != nullptr && (*r_info)[0] == '\0') { - *r_info = N_("This property is for internal use only and can't be edited"); + *r_info = N_("This property is for internal use only and cannot be edited"); } return false; } @@ -2272,7 +2272,7 @@ static bool rna_property_editable_do(const PointerRNA *ptr, return true; } if (r_info != nullptr && (*r_info)[0] == '\0') { - *r_info = N_("Can't edit this property from a linked data-block"); + *r_info = N_("Cannot edit this property from a linked data-block"); } return false; } @@ -2280,13 +2280,13 @@ static bool rna_property_editable_do(const PointerRNA *ptr, const bool is_liboverride_system = BKE_lib_override_library_is_system_defined(G_MAIN, id); if (!RNA_property_overridable_get(ptr, prop_orig)) { if (r_info != nullptr && (*r_info)[0] == '\0') { - *r_info = N_("Can't edit this property from an override data-block"); + *r_info = N_("Cannot edit this property from an override data-block"); } return false; } if (is_liboverride_system && !is_linked_prop_exception) { if (r_info != nullptr && (*r_info)[0] == '\0') { - *r_info = N_("Can't edit this property from a system override data-block"); + *r_info = N_("Cannot edit this property from a system override data-block"); } return false; } diff --git a/source/blender/makesrna/intern/rna_action.cc b/source/blender/makesrna/intern/rna_action.cc index b3343624ec1..2eedf711a1e 100644 --- a/source/blender/makesrna/intern/rna_action.cc +++ b/source/blender/makesrna/intern/rna_action.cc @@ -360,7 +360,7 @@ static void rna_ActionSlot_identifier_set(PointerRNA *ptr, const char *identifie if (identifier_with_correct_prefix != identifier_ref) { WM_global_reportf( RPT_WARNING, - "Attempted to set slot identifier to \"%s\", but the type prefix doesn't match the " + "Attempted to set slot identifier to \"%s\", but the type prefix does not match the " "slot's 'target_id_type' \"%s\". Setting to \"%s\" instead.\n", identifier, slot.idtype_string().c_str(), @@ -734,7 +734,7 @@ static void rna_Channelbag_group_remove(ActionChannelbag *dna_channelbag, if (!self.channel_group_remove(*agrp)) { BKE_report(reports, RPT_ERROR, - "Could not remove the F-Curve Group from the collection because it doesn't exist " + "Could not remove the F-Curve Group from the collection because it does not exist " "in the collection"); return; } @@ -2529,7 +2529,7 @@ static void rna_def_channelbag_fcurves(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED); RNA_def_int(func, "index", 0, 0, INT_MAX, "Index", "Array index", 0, INT_MAX); parm = RNA_def_pointer( - func, "fcurve", "FCurve", "", "The found F-Curve, or None if it doesn't exist"); + func, "fcurve", "FCurve", "", "The found F-Curve, or None if it does not exist"); RNA_def_function_return(func, parm); /* Channelbag.fcurves.remove(...) */ @@ -2795,7 +2795,7 @@ static void rna_def_action_fcurves(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_parameter_flags(parm, PropertyFlag(0), PARM_REQUIRED); RNA_def_int(func, "index", 0, 0, INT_MAX, "Index", "Array index", 0, INT_MAX); parm = RNA_def_pointer( - func, "fcurve", "FCurve", "", "The found F-Curve, or None if it doesn't exist"); + func, "fcurve", "FCurve", "", "The found F-Curve, or None if it does not exist"); RNA_def_function_return(func, parm); /* Action.fcurves.remove(...) */ @@ -3004,7 +3004,7 @@ static void rna_def_action(BlenderRNA *brna) prop, "Cyclic Animation", "The action is intended to be used as a cycle looping over its manually set " - "playback frame range (enabling this doesn't automatically make it loop)"); + "playback frame range (enabling this does not automatically make it loop)"); RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, nullptr); prop = RNA_def_property(srna, "frame_start", PROP_FLOAT, PROP_TIME); diff --git a/source/blender/makesrna/intern/rna_armature.cc b/source/blender/makesrna/intern/rna_armature.cc index 62a5c1f5d2e..dcf1758a7b9 100644 --- a/source/blender/makesrna/intern/rna_armature.cc +++ b/source/blender/makesrna/intern/rna_armature.cc @@ -119,7 +119,7 @@ static void rna_Armature_act_bone_set(PointerRNA *ptr, PointerRNA value, ReportL Object *ob = (Object *)value.owner_id; if (GS(ob->id.name) != ID_OB || (ob->data != arm)) { - printf("ERROR: armature set active bone - new active doesn't come from this armature\n"); + printf("ERROR: armature set active bone - new active does not come from this armature\n"); return; } } @@ -1512,8 +1512,7 @@ static void rna_def_bone_common(StructRNA *srna, int editbone) RNA_def_property_ui_text( prop, "Cyclic Offset", - "When bone doesn't have a parent, it receives cyclic offset effects (Deprecated)"); - // "When bone doesn't have a parent, it receives cyclic offset effects"); + "When bone does not have a parent, it receives cyclic offset effects (Deprecated)"); RNA_def_property_update(prop, 0, "rna_Armature_update_data"); prop = RNA_def_property(srna, "hide_select", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_asset.cc b/source/blender/makesrna/intern/rna_asset.cc index d26db529255..f92fe552203 100644 --- a/source/blender/makesrna/intern/rna_asset.cc +++ b/source/blender/makesrna/intern/rna_asset.cc @@ -80,7 +80,7 @@ static bool rna_AssetMetaData_editable_from_owner_id(const ID *owner_id, if (r_info) { *r_info = N_( - "Asset metadata from external asset libraries can't be edited, only assets stored in the " + "Asset metadata from external asset libraries cannot be edited, only assets stored in the " "current file can"); } return false; diff --git a/source/blender/makesrna/intern/rna_attribute.cc b/source/blender/makesrna/intern/rna_attribute.cc index 5781a995d9b..b781650529d 100644 --- a/source/blender/makesrna/intern/rna_attribute.cc +++ b/source/blender/makesrna/intern/rna_attribute.cc @@ -701,7 +701,7 @@ static void rna_AttributeGroupID_remove(ID *id, ReportList *reports, PointerRNA if (owner.type() != AttributeOwnerType::Mesh) { const bke::Attribute *attr = static_cast(attribute_ptr->data); if (BKE_attribute_required(owner, attr->name())) { - BKE_report(reports, RPT_ERROR, "Attribute is required and can't be removed"); + BKE_report(reports, RPT_ERROR, "Attribute is required and cannot be removed"); return; } @@ -1222,7 +1222,7 @@ static void rna_AttributeGroupGreasePencilDrawing_remove(ID *grease_pencil_id, AttributeOwner owner = AttributeOwner(AttributeOwnerType::GreasePencilDrawing, drawing); const bke::Attribute *attr = static_cast(attribute_ptr->data); if (BKE_attribute_required(owner, attr->name())) { - BKE_report(reports, RPT_ERROR, "Attribute is required and can't be removed"); + BKE_report(reports, RPT_ERROR, "Attribute is required and cannot be removed"); return; } diff --git a/source/blender/makesrna/intern/rna_constraint.cc b/source/blender/makesrna/intern/rna_constraint.cc index d8876b38ba7..5d2a379836d 100644 --- a/source/blender/makesrna/intern/rna_constraint.cc +++ b/source/blender/makesrna/intern/rna_constraint.cc @@ -2836,7 +2836,7 @@ static void rna_def_constraint_rotation_limit(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Legacy Behavior", - "Use the old semi-broken behavior that doesn't understand that rotations loop around"); + "Use the old semi-broken behavior that does not understand that rotations loop around"); RNA_def_property_update(prop, NC_OBJECT | ND_CONSTRAINT, "rna_Constraint_update"); RNA_define_lib_overridable(false); diff --git a/source/blender/makesrna/intern/rna_curve.cc b/source/blender/makesrna/intern/rna_curve.cc index d2bedef6171..529b73a84ee 100644 --- a/source/blender/makesrna/intern/rna_curve.cc +++ b/source/blender/makesrna/intern/rna_curve.cc @@ -1056,7 +1056,7 @@ static void rna_def_path(BlenderRNA * /*brna*/, StructRNA *srna) RNA_def_property_ui_text( prop, "Clamp", - "Clamp the curve path children so they can't travel past the start/end point of the curve"); + "Clamp the curve path children so they cannot travel past the start/end point of the curve"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop = RNA_def_property(srna, "use_stretch", PROP_BOOLEAN, PROP_NONE); @@ -1164,7 +1164,7 @@ static void rna_def_font(BlenderRNA * /*brna*/, StructRNA *srna) RNA_def_property_enum_items(prop, prop_overflow_items); RNA_def_property_enum_default(prop, CU_OVERFLOW_NONE); RNA_def_property_ui_text( - prop, "Textbox Overflow", "Handle the text behavior when it doesn't fit in the text boxes"); + prop, "Textbox Overflow", "Handle the text behavior when it does not fit in the text boxes"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); /* number values */ diff --git a/source/blender/makesrna/intern/rna_curves.cc b/source/blender/makesrna/intern/rna_curves.cc index 81335339922..8665d08a7f3 100644 --- a/source/blender/makesrna/intern/rna_curves.cc +++ b/source/blender/makesrna/intern/rna_curves.cc @@ -32,7 +32,7 @@ const EnumPropertyItem rna_enum_curves_handle_type_items[] = { "FREE", 0, "Free", - "The handle can be moved anywhere, and doesn't influence the point's other handle"}, + "The handle can be moved anywhere, and does not influence the point's other handle"}, {BEZIER_HANDLE_AUTO, "AUTO", 0, diff --git a/source/blender/makesrna/intern/rna_curves_api.cc b/source/blender/makesrna/intern/rna_curves_api.cc index de68af8d61b..c812fe8ea10 100644 --- a/source/blender/makesrna/intern/rna_curves_api.cc +++ b/source/blender/makesrna/intern/rna_curves_api.cc @@ -77,7 +77,7 @@ static std::optional rna_indices_to_mask(const IndexRange universe, } if (std::adjacent_find(indices.begin(), indices.end(), std::greater_equal<>()) != indices.end()) { - BKE_report(&reports, RPT_ERROR, "Indices can't have duplicates"); + BKE_report(&reports, RPT_ERROR, "Indices cannot have duplicates"); return std::nullopt; } return IndexMask::from_indices(indices, memory); diff --git a/source/blender/makesrna/intern/rna_fcurve.cc b/source/blender/makesrna/intern/rna_fcurve.cc index d08bf60fb23..2f03bdb60f7 100644 --- a/source/blender/makesrna/intern/rna_fcurve.cc +++ b/source/blender/makesrna/intern/rna_fcurve.cc @@ -2033,14 +2033,14 @@ static void rna_def_drivertarget(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, nullptr, "options", DTAR_OPTION_USE_FALLBACK); RNA_def_property_ui_text(prop, "Use Fallback", - "Use the fallback value if the data path can't be resolved, instead of " - "failing to evaluate the driver"); + "Use the fallback value if the data path cannot be resolved, instead " + "of failing to evaluate the driver"); RNA_def_property_update(prop, 0, "rna_DriverTarget_update_data"); prop = RNA_def_property(srna, "fallback_value", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, nullptr, "fallback_value"); RNA_def_property_ui_text( - prop, "Fallback", "The value to use if the data path can't be resolved"); + prop, "Fallback", "The value to use if the data path cannot be resolved"); RNA_def_property_update(prop, 0, "rna_DriverTarget_update_data"); prop = RNA_def_property(srna, "is_fallback_used", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_grease_pencil_api.cc b/source/blender/makesrna/intern/rna_grease_pencil_api.cc index c4d8429e420..0fe63024917 100644 --- a/source/blender/makesrna/intern/rna_grease_pencil_api.cc +++ b/source/blender/makesrna/intern/rna_grease_pencil_api.cc @@ -268,7 +268,7 @@ static void rna_GreasePencilDrawing_set_vertex_weights(ID *grease_pencil_id, } if (std::adjacent_find(indices.begin(), indices.end(), std::greater_equal<>()) != indices.end()) { - BKE_report(reports, RPT_ERROR, "Indices can't have duplicates"); + BKE_report(reports, RPT_ERROR, "Indices cannot have duplicates"); return; } @@ -372,7 +372,7 @@ static void rna_Frames_frame_remove(ID *id, Layer &layer = layer_in->wrap(); if (!layer.frames().contains(frame_number)) { - BKE_reportf(reports, RPT_ERROR, "Frame doesn't exists on frame number %d", frame_number); + BKE_reportf(reports, RPT_ERROR, "Frame does not exist on frame number %d", frame_number); return; } @@ -397,7 +397,7 @@ static GreasePencilFrame *rna_Frames_frame_copy(ID *id, Layer &layer = layer_in->wrap(); if (!layer.frames().contains(from_frame_number)) { - BKE_reportf(reports, RPT_ERROR, "Frame doesn't exists on frame number %d", from_frame_number); + BKE_reportf(reports, RPT_ERROR, "Frame does not exist on frame number %d", from_frame_number); return nullptr; } if (layer.frames().contains(to_frame_number)) { @@ -423,7 +423,7 @@ static GreasePencilFrame *rna_Frames_frame_move(ID *id, Layer &layer = layer_in->wrap(); if (!layer.frames().contains(from_frame_number)) { - BKE_reportf(reports, RPT_ERROR, "Frame doesn't exists on frame number %d", from_frame_number); + BKE_reportf(reports, RPT_ERROR, "Frame does not exist on frame number %d", from_frame_number); return nullptr; } if (layer.frames().contains(to_frame_number)) { diff --git a/source/blender/makesrna/intern/rna_image.cc b/source/blender/makesrna/intern/rna_image.cc index 9650d24f4e4..814e6c9946c 100644 --- a/source/blender/makesrna/intern/rna_image.cc +++ b/source/blender/makesrna/intern/rna_image.cc @@ -998,7 +998,7 @@ static void rna_def_udim_tile(BlenderRNA *brna) 0, 0, "Size", - "Width and height of the tile buffer in pixels, zero when image data can't be loaded", + "Width and height of the tile buffer in pixels, zero when image data cannot be loaded", 0, 0); RNA_def_property_subtype(prop, PROP_PIXEL); @@ -1319,7 +1319,7 @@ static void rna_def_image(BlenderRNA *brna) 0, 0, "Size", - "Width and height of the image buffer in pixels, zero when image data can't be loaded", + "Width and height of the image buffer in pixels, zero when image data cannot be loaded", 0, 0); RNA_def_property_subtype(prop, PROP_PIXEL); diff --git a/source/blender/makesrna/intern/rna_modifier.cc b/source/blender/makesrna/intern/rna_modifier.cc index 40f2a495de9..063879b8e5e 100644 --- a/source/blender/makesrna/intern/rna_modifier.cc +++ b/source/blender/makesrna/intern/rna_modifier.cc @@ -3509,8 +3509,8 @@ static void rna_def_modifier_boolean(BlenderRNA *brna) 0, "Index Based", "Set the material on new faces based on the order of the material slot lists. If a " - "material doesn't exist on the modifier object, the face will use the same material slot " - "or the first if the object doesn't have enough slots."}, + "material does not exist on the modifier object, the face will use the same material slot " + "or the first if the object does not have enough slots."}, {eBooleanModifierMaterialMode_Transfer, "TRANSFER", 0, diff --git a/source/blender/makesrna/intern/rna_movieclip.cc b/source/blender/makesrna/intern/rna_movieclip.cc index d00539742af..3386911bb73 100644 --- a/source/blender/makesrna/intern/rna_movieclip.cc +++ b/source/blender/makesrna/intern/rna_movieclip.cc @@ -344,7 +344,7 @@ static void rna_def_movieclip(BlenderRNA *brna) 0, 0, "Size", - "Width and height in pixels, zero when image data can't be loaded", + "Width and height in pixels, zero when image data cannot be loaded", 0, 0); RNA_def_property_int_funcs(prop, "rna_MovieClip_size_get", nullptr, nullptr); diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index 68c0ecb2ec3..8994e355a75 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -213,7 +213,7 @@ const EnumPropertyItem rna_enum_node_vec_math_items[] = { "REFLECT", 0, "Reflect", - "Reflect A around the normal B. B doesn't need to be normalized."}, + "Reflect A around the normal B. B does not need to be normalized."}, {NODE_VECTOR_MATH_REFRACT, "REFRACT", 0, @@ -497,7 +497,7 @@ static const EnumPropertyItem rna_node_geometry_curve_handle_type_items[] = { "FREE", ICON_HANDLE_FREE, "Free", - "The handle can be moved anywhere, and doesn't influence the point's other handle"}, + "The handle can be moved anywhere, and does not influence the point's other handle"}, {GEO_NODE_CURVE_HANDLE_AUTO, "AUTO", ICON_HANDLE_AUTO, @@ -3786,7 +3786,7 @@ static bool rna_Node_pair_with_output( BKE_reportf( reports, RPT_ERROR, - "Can't pair zone input node %s with %s because it does not have the same zone type", + "Cannot pair zone input node %s with %s because it does not have the same zone type", node->name, output_node->name); return false; @@ -9262,7 +9262,7 @@ static void def_geo_string_to_curves(BlenderRNA * /*brna*/, StructRNA *srna) RNA_def_property_enum_items(prop, rna_node_geometry_string_to_curves_overflow_items); RNA_def_property_enum_default(prop, GEO_NODE_STRING_TO_CURVES_MODE_OVERFLOW); RNA_def_property_ui_text( - prop, "Textbox Overflow", "Handle the text behavior when it doesn't fit in the text boxes"); + prop, "Textbox Overflow", "Handle the text behavior when it does not fit in the text boxes"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); prop = RNA_def_property(srna, "align_x", PROP_ENUM, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc index 2feffe05da9..a27d3a49c6e 100644 --- a/source/blender/makesrna/intern/rna_object.cc +++ b/source/blender/makesrna/intern/rna_object.cc @@ -3076,7 +3076,7 @@ static void rna_def_object(BlenderRNA *brna) prop, "Rotation Mode", /* This description is shared by other "rotation_mode" properties. */ - "The kind of rotation to apply, values from other rotation modes aren't used"); + "The kind of rotation to apply, values from other rotation modes are not used"); RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update"); prop = RNA_def_property(srna, "scale", PROP_FLOAT, PROP_XYZ); diff --git a/source/blender/makesrna/intern/rna_object_api.cc b/source/blender/makesrna/intern/rna_object_api.cc index f94870e4830..cef2d084851 100644 --- a/source/blender/makesrna/intern/rna_object_api.cc +++ b/source/blender/makesrna/intern/rna_object_api.cc @@ -106,7 +106,7 @@ static void rna_Object_select_set( if (select) { BKE_reportf(reports, RPT_ERROR, - "Object '%s' can't be selected because it is not in View Layer '%s'!", + "Object '%s' cannot be selected because it is not in View Layer '%s'!", ob->id.name + 2, view_layer->name); } @@ -141,7 +141,7 @@ static void rna_Object_hide_set( if (hide) { BKE_reportf(reports, RPT_ERROR, - "Object '%s' can't be hidden because it is not in View Layer '%s'!", + "Object '%s' cannot be hidden because it is not in View Layer '%s'!", ob->id.name + 2, view_layer->name); } diff --git a/source/blender/makesrna/intern/rna_pose.cc b/source/blender/makesrna/intern/rna_pose.cc index 03e0e8240b3..53b32e208b1 100644 --- a/source/blender/makesrna/intern/rna_pose.cc +++ b/source/blender/makesrna/intern/rna_pose.cc @@ -905,7 +905,7 @@ static void rna_def_pose_channel(BlenderRNA *brna) prop, "Rotation Mode", /* This description is shared by other "rotation_mode" properties. */ - "The kind of rotation to apply, values from other rotation modes aren't used"); + "The kind of rotation to apply, values from other rotation modes are not used"); RNA_def_property_update(prop, NC_OBJECT | ND_POSE, "rna_Pose_update"); /* Curved bones settings - Applied on top of rest-pose values. */ diff --git a/source/blender/makesrna/intern/rna_rna.cc b/source/blender/makesrna/intern/rna_rna.cc index 6de4760de6f..ac6ed499916 100644 --- a/source/blender/makesrna/intern/rna_rna.cc +++ b/source/blender/makesrna/intern/rna_rna.cc @@ -3309,7 +3309,7 @@ static void rna_def_property(BlenderRNA *brna) prop = RNA_def_property(srna, "is_never_none", PROP_BOOLEAN, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_boolean_funcs(prop, "rna_Property_is_never_none_get", nullptr); - RNA_def_property_ui_text(prop, "Never None", "True when this value can't be set to None"); + RNA_def_property_ui_text(prop, "Never None", "True when this value cannot be set to None"); prop = RNA_def_property(srna, "is_hidden", PROP_BOOLEAN, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc index 52fec3903c3..8d86fba634f 100644 --- a/source/blender/makesrna/intern/rna_scene.cc +++ b/source/blender/makesrna/intern/rna_scene.cc @@ -3170,7 +3170,7 @@ static void rna_def_view3d_cursor(BlenderRNA *brna) prop, "Rotation Mode", /* This description is shared by other "rotation_mode" properties. */ - "The kind of rotation to apply, values from other rotation modes aren't used"); + "The kind of rotation to apply, values from other rotation modes are not used"); RNA_def_property_update(prop, NC_WINDOW, nullptr); /* Matrix access to avoid having to check current rotation mode. */ diff --git a/source/blender/makesrna/intern/rna_screen.cc b/source/blender/makesrna/intern/rna_screen.cc index 7a612313a5e..bc7756b8f9f 100644 --- a/source/blender/makesrna/intern/rna_screen.cc +++ b/source/blender/makesrna/intern/rna_screen.cc @@ -594,7 +594,7 @@ static void rna_def_region(BlenderRNA *brna) "FLOAT", 0, "Float", - "Region floats on screen, doesn't use any fixed alignment"}, + "Region floats on screen, does not use any fixed alignment"}, {RGN_ALIGN_QSPLIT, "QUAD_SPLIT", 0, diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index a8b4918372b..1360bd544bd 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -4143,7 +4143,7 @@ static void rna_def_userdef_theme_space_nla(BlenderRNA *brna) RNA_def_property_float_sdna(prop, nullptr, "anim_non_active"); RNA_def_property_array(prop, 4); RNA_def_property_ui_text( - prop, "No Active Action", "Animation data-block doesn't have active action"); + prop, "No Active Action", "Animation data-block does not have active action"); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); prop = RNA_def_property(srna, "strips", PROP_FLOAT, PROP_COLOR_GAMMA); diff --git a/source/blender/makesrna/intern/rna_wm.cc b/source/blender/makesrna/intern/rna_wm.cc index 99d95595c01..5e48f4adbea 100644 --- a/source/blender/makesrna/intern/rna_wm.cc +++ b/source/blender/makesrna/intern/rna_wm.cc @@ -3226,7 +3226,7 @@ static void rna_def_keyconfig(BlenderRNA *brna) RNA_def_property_ui_text( prop, "User Defined", - "Is this keymap item user defined (doesn't just replace a builtin item)"); + "Is this keymap item user defined (does not just replace a builtin item)"); RNA_def_property_boolean_funcs(prop, "rna_KeyMapItem_userdefined_get", nullptr); RNA_api_keymapitem(srna); diff --git a/source/blender/makesrna/intern/rna_wm_api.cc b/source/blender/makesrna/intern/rna_wm_api.cc index 3cc23e57478..28b7c13ea79 100644 --- a/source/blender/makesrna/intern/rna_wm_api.cc +++ b/source/blender/makesrna/intern/rna_wm_api.cc @@ -1092,9 +1092,9 @@ void RNA_api_wm(StructRNA *srna) RNA_def_property_ui_text( parm, "Is Interface Locked", - "If true, the interface is currently locked by a running job and data shouldn't be modified " - "from application timers. Otherwise, the running job might conflict with the handler " - "causing unexpected results or even crashes."); + "If true, the interface is currently locked by a running job and data should not be " + "modified from application timers. Otherwise, the running job might conflict with the " + "handler causing unexpected results or even crashes."); RNA_def_property_clear_flag(parm, PROP_EDITABLE); } diff --git a/source/blender/nodes/function/nodes/node_fn_format_string.cc b/source/blender/nodes/function/nodes/node_fn_format_string.cc index 13f0f3ee941..392d3b2dca1 100644 --- a/source/blender/nodes/function/nodes/node_fn_format_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_format_string.cc @@ -274,7 +274,7 @@ class FormatInputsLookup { * anymore. Only other explicit identifiers are allowed. */ if (!r_error) { r_error = TIP_( - "Empty identifier can't be used when explicit identifier was used before. For " + "Empty identifier cannot be used when explicit identifier was used before. For " "example, \"{} {x}\" is ok but \"{x} {}\" is not."); } return std::nullopt; @@ -302,7 +302,7 @@ class FormatInputsLookup { /* There are other characters after the number. */ if (!r_error) { r_error = fmt::format( - fmt::runtime(TIP_("An input name can't start with a digit: \"{}\"")), identifier); + fmt::runtime(TIP_("An input name cannot start with a digit: \"{}\"")), identifier); } return std::nullopt; } @@ -372,7 +372,7 @@ static std::optional preprocess_python_compatib /* The type can't be formatted. The user shouldn't be able to trigger this error but nice to * handle it anyway. */ if (!r_error) { - r_error = fmt::format(fmt::runtime(TIP_("Type \"{}\" can't be formatted")), type.name()); + r_error = fmt::format(fmt::runtime(TIP_("Type \"{}\" cannot be formatted")), type.name()); } return std::nullopt; } @@ -571,7 +571,7 @@ static void format_with_hash_syntax(const StringRef format_pattern, } } else if (!r_error) { - r_error = fmt::format(fmt::runtime(TIP_("Type \"{}\" can't be formatted")), type.name()); + r_error = fmt::format(fmt::runtime(TIP_("Type \"{}\" cannot be formatted")), type.name()); } } @@ -608,7 +608,7 @@ static void format_without_format_specifier(const GVArray &input, }); } else if (!r_error) { - r_error = fmt::format(fmt::runtime(TIP_("Type \"{}\" can't be formatted")), type.name()); + r_error = fmt::format(fmt::runtime(TIP_("Type \"{}\" cannot be formatted")), type.name()); } } diff --git a/source/blender/nodes/geometry/nodes/node_geo_bake.cc b/source/blender/nodes/geometry/nodes/node_geo_bake.cc index 14aecc03b59..ca23687788e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_bake.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_bake.cc @@ -495,7 +495,7 @@ static void node_extra_info(NodeExtraInfoParams ¶ms) } if (!ctx.is_bakeable_in_current_context) { NodeExtraInfoRow row; - row.text = TIP_("Can't bake in zone"); + row.text = TIP_("Cannot bake in zone"); row.icon = ICON_ERROR; params.rows.append(std::move(row)); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc index 5184c2df712..23bf00f3c39 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc @@ -76,7 +76,7 @@ static void node_geo_exec(GeoNodeExecParams params) } if (!DEG_collection_geometry_is_evaluated(*collection)) { params.error_message_add(NodeWarningType::Error, - TIP_("Can't access collections geometry because it's not evaluated " + TIP_("Cannot access collections geometry because it's not evaluated " "yet. This can happen when there is a dependency cycle")); params.set_default_remaining_outputs(); return; diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc index b1b6ea6c541..59a8d7ba0ff 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc @@ -92,7 +92,7 @@ static void node_geo_exec(GeoNodeExecParams params) } if (bke::attribute_name_is_anonymous(name)) { params.error_message_add(NodeWarningType::Info, - TIP_("Anonymous attributes can't be accessed by name")); + TIP_("Anonymous attributes cannot be accessed by name")); params.set_default_remaining_outputs(); return; } diff --git a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc index a85416b4a70..94dafa3a2da 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc @@ -87,7 +87,7 @@ static void node_geo_exec(GeoNodeExecParams params) if (show_transform_error) { params.error_message_add( NodeWarningType::Error, - TIP_("Can't access object's transforms because it's not evaluated yet. " + TIP_("Cannot access object's transforms because it's not evaluated yet. " "This can happen when there is a dependency cycle")); } float3 location, scale; @@ -115,9 +115,10 @@ static void node_geo_exec(GeoNodeExecParams params) BLI_assert(object != self_object); if (!object_geometry_evaluated) { - params.error_message_add(NodeWarningType::Error, - TIP_("Can't access object's geometry because it's not evaluated yet. " - "This can happen when there is a dependency cycle")); + params.error_message_add( + NodeWarningType::Error, + TIP_("Cannot access object's geometry because it's not evaluated yet. " + "This can happen when there is a dependency cycle")); params.set_default_remaining_outputs(); return; } @@ -127,7 +128,7 @@ static void node_geo_exec(GeoNodeExecParams params) if (!self_transform_evaluated || !object_transform_evaluated) { params.error_message_add( NodeWarningType::Error, - TIP_("Can't access object's transforms because it's not evaluated yet. " + TIP_("Cannot access object's transforms because it's not evaluated yet. " "This can happen when there is a dependency cycle")); params.set_default_remaining_outputs(); return; diff --git a/source/blender/nodes/geometry/nodes/node_geo_simulation.cc b/source/blender/nodes/geometry/nodes/node_geo_simulation.cc index 1ed0f720960..3de8cb657ab 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_simulation.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_simulation.cc @@ -868,7 +868,7 @@ static void node_extra_info(NodeExtraInfoParams ¶ms) } if (!ctx.is_bakeable_in_current_context) { NodeExtraInfoRow row; - row.text = TIP_("Can't bake in zone"); + row.text = TIP_("Cannot bake in zone"); row.icon = ICON_ERROR; params.rows.append(std::move(row)); } diff --git a/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc index 29dc4f8c314..51980ac6a53 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc @@ -100,7 +100,7 @@ static void node_geo_exec(GeoNodeExecParams params) } if (bke::attribute_name_is_anonymous(name)) { params.error_message_add(NodeWarningType::Info, - TIP_("Anonymous attributes can't be created here")); + TIP_("Anonymous attributes cannot be created here")); params.set_output("Geometry", std::move(geometry_set)); return; } diff --git a/source/blender/python/bmesh/bmesh_py_types.cc b/source/blender/python/bmesh/bmesh_py_types.cc index 7de30705028..b17ad9c5868 100644 --- a/source/blender/python/bmesh/bmesh_py_types.cc +++ b/source/blender/python/bmesh/bmesh_py_types.cc @@ -336,7 +336,8 @@ static PyObject *bpy_bmesh_is_wrapped_get(BPy_BMesh *self, void * /*closure*/) PyDoc_STRVAR( /* Wrap. */ bpy_bmesh_select_mode_doc, - "The selection mode, values can be {'VERT', 'EDGE', 'FACE'}, can't be assigned an empty set.\n" + "The selection mode, values can be {'VERT', 'EDGE', 'FACE'}, cannot be assigned an empty " + "set.\n" "\n" ":type: set"); static PyObject *bpy_bmesh_select_mode_get(BPy_BMesh *self, void * /*closure*/) @@ -357,7 +358,7 @@ static int bpy_bmesh_select_mode_set(BPy_BMesh *self, PyObject *value, void * /* return -1; } if (flag == 0) { - PyErr_SetString(PyExc_TypeError, "bm.select_mode: can't assign an empty value"); + PyErr_SetString(PyExc_TypeError, "bm.select_mode: cannot assign an empty value"); return -1; } diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.cc b/source/blender/python/bmesh/bmesh_py_types_meshdata.cc index 6def92c00d3..9855a01016b 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.cc +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.cc @@ -556,7 +556,7 @@ static int bpy_bmdeformvert_ass_subscript(BPy_BMDeformVert *self, PyObject *key, if (i < 0) { PyErr_SetString(PyExc_KeyError, "BMDeformVert[key] = x: " - "weight keys can't be negative"); + "weight keys cannot be negative"); return -1; } diff --git a/source/blender/python/bmesh/bmesh_py_utils.cc b/source/blender/python/bmesh/bmesh_py_utils.cc index f878ec7577b..62f905908e6 100644 --- a/source/blender/python/bmesh/bmesh_py_utils.cc +++ b/source/blender/python/bmesh/bmesh_py_utils.cc @@ -221,12 +221,12 @@ static PyObject *bpy_bm_utils_vert_splice(PyObject * /*self*/, PyObject *args) } if (BM_edge_exists(py_vert->v, py_vert_target->v)) { - PyErr_SetString(PyExc_ValueError, "vert_splice(...): verts can't share an edge"); + PyErr_SetString(PyExc_ValueError, "vert_splice(...): verts cannot share an edge"); return nullptr; } if (BM_vert_pair_share_face_check(py_vert->v, py_vert_target->v)) { - PyErr_SetString(PyExc_ValueError, "vert_splice(...): verts can't share a face"); + PyErr_SetString(PyExc_ValueError, "vert_splice(...): verts cannot share a face"); return nullptr; } diff --git a/source/blender/python/intern/bpy_operator.cc b/source/blender/python/intern/bpy_operator.cc index 01e6ae4bb61..7d5144c390d 100644 --- a/source/blender/python/intern/bpy_operator.cc +++ b/source/blender/python/intern/bpy_operator.cc @@ -76,7 +76,7 @@ static PyObject *pyop_poll(PyObject * /*self*/, PyObject *args) bContext *C = BPY_context_get(); if (C == nullptr) { - PyErr_SetString(PyExc_RuntimeError, "Context is None, can't poll any operators"); + PyErr_SetString(PyExc_RuntimeError, "Context is None, cannot poll any operators"); return nullptr; } @@ -147,7 +147,7 @@ static PyObject *pyop_call(PyObject * /*self*/, PyObject *args) bContext *C = BPY_context_get(); if (C == nullptr) { - PyErr_SetString(PyExc_RuntimeError, "Context is None, can't poll any operators"); + PyErr_SetString(PyExc_RuntimeError, "Context is None, cannot poll any operators"); return nullptr; } @@ -183,7 +183,7 @@ static PyObject *pyop_call(PyObject * /*self*/, PyObject *args) if (!pyrna_write_check()) { PyErr_Format(PyExc_RuntimeError, "Calling operator \"bpy.ops.%s\" error, " - "can't modify blend data in this state (drawing/rendering)", + "cannot modify blend data in this state (drawing/rendering)", opname); return nullptr; } @@ -319,7 +319,7 @@ static PyObject *pyop_as_string(PyObject * /*self*/, PyObject *args) if (C == nullptr) { PyErr_SetString(PyExc_RuntimeError, - "Context is None, can't get the string representation of this object."); + "Context is None, cannot get the string representation of this object."); return nullptr; } diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc index 8a7a0e87e43..f82d16fd50c 100644 --- a/source/blender/python/intern/bpy_rna.cc +++ b/source/blender/python/intern/bpy_rna.cc @@ -1966,7 +1966,7 @@ static int pyrna_py_to_prop( else { PyErr_Format(PyExc_TypeError, "%.200s %.200s.%.200s collection has no type, " - "can't be used as a %.200s type", + "cannot be used as a %.200s type", error_prefix, RNA_struct_identifier(ptr->type), RNA_property_identifier(prop), @@ -2019,7 +2019,7 @@ static int pyrna_py_to_prop( /* Allow passing temporary ID's to functions, but not attribute assignment. */ if (ptr->type != &RNA_Function) { PyErr_Format(PyExc_TypeError, - "%.200s %.200s.%.200s ID type assignment is temporary, can't assign", + "%.200s %.200s.%.200s ID type assignment is temporary, cannot assign", error_prefix, RNA_struct_identifier(ptr->type), RNA_property_identifier(prop)); @@ -4573,7 +4573,7 @@ static PyObject *pyrna_struct_getattro(BPy_StructRNA *self, PyObject *pyname) bContext *C = static_cast(self->ptr->data); if (C == nullptr) { PyErr_Format(PyExc_AttributeError, - "bpy_struct: Context is 'nullptr', can't get \"%.200s\" from context", + "bpy_struct: Context is 'nullptr', cannot get \"%.200s\" from context", name); ret = nullptr; } @@ -4677,7 +4677,7 @@ static PyObject *pyrna_struct_getattro(BPy_StructRNA *self, PyObject *pyname) BLI_assert_msg(0, "Invalid context type"); PyErr_Format(PyExc_AttributeError, - "bpy_struct: Context type invalid %d, can't get \"%.200s\" from context", + "bpy_struct: Context type invalid %d, cannot get \"%.200s\" from context", newtype, name); ret = nullptr; @@ -4774,7 +4774,7 @@ static int pyrna_struct_meta_idprop_setattro(PyObject *cls, PyObject *attr, PyOb { PyErr_Format(PyExc_AttributeError, "pyrna_struct_meta_idprop_setattro() " - "can't set in readonly state '%.200s.%S'", + "cannot set in readonly state '%.200s.%S'", ((PyTypeObject *)cls)->tp_name, attr); return -1; @@ -4859,7 +4859,7 @@ static int pyrna_struct_setattro(BPy_StructRNA *self, PyObject *pyname, PyObject bContext *C = static_cast(self->ptr->data); if (C == nullptr) { PyErr_Format(PyExc_AttributeError, - "bpy_struct: Context is 'nullptr', can't set \"%.200s\" from context", + "bpy_struct: Context is 'nullptr', cannot set \"%.200s\" from context", name); return -1; } @@ -10096,7 +10096,7 @@ static PyObject *pyrna_register_class(PyObject * /*self*/, PyObject *py_class) if (!pyrna_write_check()) { PyErr_Format(PyExc_RuntimeError, - "%s can't run in readonly state '%.200s'", + "%s cannot run in readonly state '%.200s'", error_prefix, ((PyTypeObject *)py_class)->tp_name); return nullptr; @@ -10327,7 +10327,7 @@ static PyObject *pyrna_unregister_class(PyObject * /*self*/, PyObject *py_class) if (!pyrna_write_check()) { PyErr_Format(PyExc_RuntimeError, - "%s can't run in readonly state '%.200s'", + "%s cannot run in readonly state '%.200s'", error_prefix, ((PyTypeObject *)py_class)->tp_name); return nullptr; @@ -10398,7 +10398,7 @@ static PyObject *pyrna_unregister_class(PyObject * /*self*/, PyObject *py_class) if (prop_identifier) { PyErr_Format(PyExc_RuntimeError, - "%s can't unregister %s because %s.%s pointer property is using this", + "%s cannot unregister %s because %s.%s pointer property is using this", error_prefix, RNA_struct_identifier(srna), RNA_struct_identifier(srna_iter), diff --git a/source/blender/python/intern/bpy_rna_anim.cc b/source/blender/python/intern/bpy_rna_anim.cc index 9faae19e76c..f6fa9db319a 100644 --- a/source/blender/python/intern/bpy_rna_anim.cc +++ b/source/blender/python/intern/bpy_rna_anim.cc @@ -66,7 +66,7 @@ static int pyrna_struct_anim_args_parse_ex(PointerRNA *ptr, if (ptr->data == nullptr) { PyErr_Format( - PyExc_TypeError, "%.200s this struct has no data, can't be animated", error_prefix); + PyExc_TypeError, "%.200s this struct has no data, cannot be animated", error_prefix); return -1; } diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc index c723513ee26..6284f643931 100644 --- a/source/blender/render/intern/pipeline.cc +++ b/source/blender/render/intern/pipeline.cc @@ -2073,7 +2073,7 @@ void RE_RenderFrame(Render *re, if (should_write && !G.is_break) { if (BKE_imtype_is_movie(rd.im_format.imtype)) { /* operator checks this but in case its called from elsewhere */ - printf("Error: can't write single images with a movie format!\n"); + printf("Error: cannot write single images with a movie format!\n"); } else { char filepath_override[FILE_MAX]; diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc index a79d9e669e6..5e395cb0d02 100644 --- a/source/blender/windowmanager/intern/wm_files.cc +++ b/source/blender/windowmanager/intern/wm_files.cc @@ -2855,7 +2855,7 @@ static wmOperatorStatus wm_homefile_read_exec(bContext *C, wmOperator *op) filepath = filepath_buf; if (BLI_access(filepath, R_OK)) { BKE_reportf( - op->reports, RPT_ERROR, "Can't read alternative start-up file: \"%s\"", filepath); + op->reports, RPT_ERROR, "Cannot read alternative start-up file: \"%s\"", filepath); return OPERATOR_CANCELLED; } } diff --git a/source/blender/windowmanager/intern/wm_files_link.cc b/source/blender/windowmanager/intern/wm_files_link.cc index bc063a9b23a..108cf1d05d1 100644 --- a/source/blender/windowmanager/intern/wm_files_link.cc +++ b/source/blender/windowmanager/intern/wm_files_link.cc @@ -180,14 +180,14 @@ static bool wm_link_append_item_poll(ReportList *reports, if (do_append) { BKE_reportf(reports, RPT_ERROR_INVALID_INPUT, - "Can't append data-block '%s' of type '%s'", + "Cannot append data-block '%s' of type '%s'", name, group); } else { BKE_reportf(reports, RPT_ERROR_INVALID_INPUT, - "Can't link data-block '%s' of type '%s'", + "Cannot link data-block '%s' of type '%s'", name, group); } diff --git a/source/blender/windowmanager/intern/wm_keymap.cc b/source/blender/windowmanager/intern/wm_keymap.cc index 217dd97a8e3..6b9fbee2b03 100644 --- a/source/blender/windowmanager/intern/wm_keymap.cc +++ b/source/blender/windowmanager/intern/wm_keymap.cc @@ -2172,7 +2172,7 @@ wmKeyMapItem *WM_keymap_item_find_match(wmKeyMap *km_base, if (!wm_keymap_is_match(km_base, km_match)) { BKE_reportf( - reports, RPT_ERROR, "KeyMap \"%s\" doesn't match \"%s\"", idname, km_match->idname); + reports, RPT_ERROR, "KeyMap \"%s\" does not match \"%s\"", idname, km_match->idname); return nullptr; } diff --git a/tools/modules/blendfile.py b/tools/modules/blendfile.py index d84018ed48b..67cedf1c47d 100644 --- a/tools/modules/blendfile.py +++ b/tools/modules/blendfile.py @@ -851,7 +851,7 @@ class DNAStruct: use_str_nil=use_nil, ) except NotImplementedError: - raise NotImplementedError("%r exists, but can't resolve field %r" % + raise NotImplementedError("%r exists, but cannot resolve field %r" % (path, dna_name.name_only), dna_name, dna_type) def field_set(self, header, handle, path, value): diff --git a/tools/utils/blender_merge_format_changes.py b/tools/utils/blender_merge_format_changes.py index 801bd8ea61d..1912b43c6f9 100755 --- a/tools/utils/blender_merge_format_changes.py +++ b/tools/utils/blender_merge_format_changes.py @@ -76,7 +76,7 @@ def main() -> int: # Abort if uncommitted changes. changes = get_string(['git', 'status', '--porcelain', '--untracked-files=no']) if len(changes) != 0: - print("BLENDER MERGE: detected uncommitted changes, can't run") + print("BLENDER MERGE: detected uncommitted changes, cannot run") return 1 # Setup command, with commit message for merge commits.