diff --git a/scripts/modules/bl_i18n_utils/settings.py b/scripts/modules/bl_i18n_utils/settings.py index 0ffa27c53f6..ce3e21a51ac 100644 --- a/scripts/modules/bl_i18n_utils/settings.py +++ b/scripts/modules/bl_i18n_utils/settings.py @@ -346,6 +346,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "color_index is invalid", "cos(A)", "cosh(A)", + "dB", # dB audio power unit. "dbl-", # Compacted for 'double', for keymap items. "description", # Addons' field. :/ "dx", @@ -403,6 +404,45 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "wmOwnerID '%s' not in workspace '%s'", "y", "y = (Ax + B)", + # ID plural names, defined in IDTypeInfo. + "armatures", + "brushes", + "cache_files", + "cameras", + "collections", + "curves", + "fonts", + "grease_pencils", + "grease_pencils_v3", + "hair_curves", + "ipos", + "lattices", + "libraries", + "lightprobes", + "lights", + "linestyles", + "link_placeholders", + "masks", + "metaballs", + "materials", + "meshes", + "movieclips", + "node_groups", + "objects", + "paint_curves", + "palettes", + "particles", + "pointclouds", + "screens", + "shape_keys", + "sounds", + "speakers", + "texts", + "textures", + "volumes", + "window_managers", + "workspaces", + "worlds", # Sub-strings. "all", "all and invert unselected", @@ -490,6 +530,7 @@ WARN_MSGID_END_POINT_ALLOWED = { "Float Neg. Exp.", "Max Ext.", "Newer graphics drivers may be available to improve Blender support.", + "Not assigned to any bone collection.", "Numpad .", "Pad.", " RNA Path: bpy.types.", diff --git a/scripts/modules/bl_i18n_utils/utils_spell_check.py b/scripts/modules/bl_i18n_utils/utils_spell_check.py index da256ad05ea..01874439d30 100644 --- a/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -16,6 +16,7 @@ class SpellChecker: # These must be all lower case for comparisons uimsgs = { # OK words + "accessor", "accessors", "adaptively", "adaptivity", "al", # et al. "aren", # aren't @@ -241,6 +242,7 @@ class SpellChecker: "tradeoff", "un", "unadjust", "unadjusted", + "unassign", "unassociate", "unassociated", "unbake", "uncheck", @@ -249,6 +251,7 @@ class SpellChecker: "unculled", "undeformed", "undistort", "undistorted", "undistortion", + "uneditable", "ungroup", "ungrouped", "unhandled", "unhide", @@ -557,6 +560,7 @@ class SpellChecker: "spillmap", "sobel", "stereoscopy", + "subpixel", "surfel", "surfels", # Surface Element "texel", "timecode", @@ -564,6 +568,7 @@ class SpellChecker: "toon", "transmissive", "uvproject", + "uvtile", # Form UDIM "vividlight", "volumetrics", "voronoi", @@ -611,6 +616,7 @@ class SpellChecker: "gon", "gons", # N-GON(s) "gpencil", "idcol", + "ipos", "keyframe", "keyframes", "keyframing", "keyframed", "lookdev", "luminocity", @@ -618,7 +624,7 @@ class SpellChecker: "metaball", "metaballs", "mball", "metaelement", "metaelements", "metastrip", "metastrips", - "movieclip", + "movieclip", "movieclips", "mpoly", "mtex", "nabla", @@ -626,6 +632,7 @@ class SpellChecker: "outliner", "overscan", "paintmap", "paintmaps", + "pointclouds", "polygroup", "polygroups", "poselib", "pushpull", @@ -636,6 +643,7 @@ class SpellChecker: "shrinkfatten", "shrinkwrap", "softbody", + "srna", "stucci", "subdiv", "subtype", diff --git a/scripts/startup/bl_operators/anim.py b/scripts/startup/bl_operators/anim.py index c522709fa58..8e2c4052b93 100644 --- a/scripts/startup/bl_operators/anim.py +++ b/scripts/startup/bl_operators/anim.py @@ -487,11 +487,11 @@ class ARMATURE_OT_copy_bone_color_to_selected(Operator): return {'CANCELLED'} if not bone_source: - self.report({'ERROR'}, "No active bone to copy from.") + self.report({'ERROR'}, "No active bone to copy from") return {'CANCELLED'} if not bones_dest: - self.report({'ERROR'}, "No selected bones to copy to.") + self.report({'ERROR'}, "No selected bones to copy to") return {'CANCELLED'} num_pose_color_overrides = 0 diff --git a/scripts/startup/bl_ui/space_userpref.py b/scripts/startup/bl_ui/space_userpref.py index 2292c6dd9c9..e1bd7aff13c 100644 --- a/scripts/startup/bl_ui/space_userpref.py +++ b/scripts/startup/bl_ui/space_userpref.py @@ -2008,7 +2008,7 @@ class USERPREF_PT_extensions(ExtensionsPanel, Panel): row = layout.row() row.label(text="The add-on to use extensions is disabled! See:") row.operator( - "wm.url_open", text="Extension Add-on Repo", icon='URL', + "wm.url_open", text="Extension Add-on Repository", icon='URL', ).url = "https://projects.blender.org/ideasman42/bl_ext" diff --git a/source/blender/makesrna/intern/rna_ID.cc b/source/blender/makesrna/intern/rna_ID.cc index eb6b3101104..33fd9b4a379 100644 --- a/source/blender/makesrna/intern/rna_ID.cc +++ b/source/blender/makesrna/intern/rna_ID.cc @@ -916,10 +916,11 @@ static bool rna_ID_override_library_resync(ID *id, if (!override_library->hierarchy_root || (override_library->flag & LIBOVERRIDE_FLAG_NO_HIERARCHY) != 0) { - BKE_reportf(reports, - RPT_ERROR_INVALID_INPUT, - "Data-block '%s' is not a liboverride, or not part of a liboverride hierarchy", - id->name); + BKE_reportf( + reports, + RPT_ERROR_INVALID_INPUT, + "Data-block '%s' is not a library override, or not part of a library override hierarchy", + id->name); return false; } diff --git a/source/blender/makesrna/intern/rna_armature.cc b/source/blender/makesrna/intern/rna_armature.cc index e32369dea5d..30edf0fce62 100644 --- a/source/blender/makesrna/intern/rna_armature.cc +++ b/source/blender/makesrna/intern/rna_armature.cc @@ -282,7 +282,7 @@ static void rna_BoneCollection_bones_begin(CollectionPropertyIterator *iter, Poi bArmature *arm = (bArmature *)ptr->owner_id; if (arm->edbo) { iter->valid = false; - BKE_reportf(nullptr, RPT_WARNING, "collection.bones is not available in armature edit mode"); + BKE_reportf(nullptr, RPT_WARNING, "`Collection.bones` is not available in armature edit mode"); return; } @@ -2097,7 +2097,7 @@ static void rna_def_bonecollection(BlenderRNA *brna) "Bones", "Bones assigned to this bone collection. In armature edit mode this " "will always return an empty list of bones, as the bone collection " - "memberships are only synchronised when exiting edit mode"); + "memberships are only synchronized when exiting edit mode"); RNA_api_bonecollection(srna); } diff --git a/source/blender/makesrna/intern/rna_material.cc b/source/blender/makesrna/intern/rna_material.cc index 91525b77648..3f70cab8e0d 100644 --- a/source/blender/makesrna/intern/rna_material.cc +++ b/source/blender/makesrna/intern/rna_material.cc @@ -930,7 +930,7 @@ void RNA_def_material(BlenderRNA *brna) prop, "Light Probe Volume Single Sided", "Consider material single sided for light probe volume capture. " - "Additionnaly helps rejecting probes inside the object to avoid light leaks"); + "Additionally helps rejecting probes inside the object to avoid light leaks"); RNA_def_property_update(prop, 0, "rna_Material_draw_update"); /* TODO(fclem): Should be renamed to use_raytraced_refraction. */ diff --git a/source/blender/makesrna/intern/rna_wm_gizmo_api.cc b/source/blender/makesrna/intern/rna_wm_gizmo_api.cc index e0a108ebc43..4be6183bc48 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo_api.cc +++ b/source/blender/makesrna/intern/rna_wm_gizmo_api.cc @@ -156,7 +156,7 @@ static PointerRNA rna_gizmo_target_set_operator(wmGizmo *gz, BKE_reportf(reports, RPT_ERROR, "%s '%s'", - ot ? TIP_("unknown operator") : TIP_("operator missing srna"), + ot ? TIP_("Unknown operator") : TIP_("Operator missing srna"), opname); return PointerRNA_NULL; }