Commit: af316d276144b905cf6cf5a1b1d7ae727d545e2f Author: Yevgeny Makarov Date: Thu Dec 24 13:11:22 2020 -0600 Branches: master https://developer.blender.org/rBaf316d276144b905cf6cf5a1b1d7ae727d545e2f
UI: Cleanup spelling of compound words Approximately 138 changes in the spelling of compound words and proper names like "Light Probe", "Shrink/Fatten", "Face Map". In many cases, hyphens were used where they aren't correct, like "re-fit". Other common changes include: - "Datablock" -> "data-block" - "Floating point" -> "floating-point" - "Ngons" -> "n-gons" These changes help give the language used in the interface a consistent, more professional feel. Differential Revision: https://developer.blender.org/D9923 =================================================================== M release/scripts/presets/keyconfig/blender.py M release/scripts/startup/bl_operators/anim.py M release/scripts/startup/bl_operators/sequencer.py M release/scripts/startup/bl_operators/userpref.py M release/scripts/startup/bl_operators/uvcalc_lightmap.py M release/scripts/startup/bl_operators/wm.py M release/scripts/startup/bl_ui/space_userpref.py M release/scripts/startup/bl_ui/space_view3d.py M source/blender/editors/animation/anim_channels_edit.c M source/blender/editors/armature/armature_add.c M source/blender/editors/armature/armature_edit.c M source/blender/editors/armature/armature_relations.c M source/blender/editors/curve/editfont.c M source/blender/editors/io/io_alembic.c M source/blender/editors/io/io_collada.c M source/blender/editors/mesh/editmesh_add.c M source/blender/editors/mesh/editmesh_bevel.c M source/blender/editors/mesh/editmesh_select.c M source/blender/editors/mesh/editmesh_select_similar.c M source/blender/editors/mesh/editmesh_tools.c M source/blender/editors/mesh/mesh_data.c M source/blender/editors/object/object_add.c M source/blender/editors/object/object_constraint.c M source/blender/editors/object/object_edit.c M source/blender/editors/object/object_transform.c M source/blender/editors/render/render_shading.c M source/blender/editors/screen/screen_ops.c M source/blender/editors/sculpt_paint/paint_image_proj.c M source/blender/editors/sculpt_paint/sculpt_cloth.c M source/blender/editors/space_action/action_edit.c M source/blender/editors/space_clip/clip_ops.c M source/blender/editors/space_clip/tracking_ops.c M source/blender/editors/space_file/file_ops.c M source/blender/editors/space_graph/graph_edit.c M source/blender/editors/space_image/image_ops.c M source/blender/editors/space_nla/nla_channels.c M source/blender/editors/space_node/node_edit.c M source/blender/editors/space_sequencer/sequencer_view.c M source/blender/editors/space_view3d/view3d_select.c M source/blender/editors/transform/transform_ops.c M source/blender/makesrna/intern/rna_action.c M source/blender/makesrna/intern/rna_armature.c M source/blender/makesrna/intern/rna_attribute.c M source/blender/makesrna/intern/rna_brush.c M source/blender/makesrna/intern/rna_depsgraph.c M source/blender/makesrna/intern/rna_fcurve.c M source/blender/makesrna/intern/rna_gpencil.c M source/blender/makesrna/intern/rna_image.c M source/blender/makesrna/intern/rna_image_api.c M source/blender/makesrna/intern/rna_main.c M source/blender/makesrna/intern/rna_main_api.c M source/blender/makesrna/intern/rna_mesh.c M source/blender/makesrna/intern/rna_nodetree.c M source/blender/makesrna/intern/rna_object.c M source/blender/makesrna/intern/rna_particle.c M source/blender/makesrna/intern/rna_render.c M source/blender/makesrna/intern/rna_rna.c M source/blender/makesrna/intern/rna_scene.c M source/blender/makesrna/intern/rna_scene_api.c M source/blender/makesrna/intern/rna_sequencer.c M source/blender/makesrna/intern/rna_space.c M source/blender/makesrna/intern/rna_ui.c M source/blender/makesrna/intern/rna_userdef.c M source/blender/makesrna/intern/rna_wm.c M source/blender/makesrna/intern/rna_wm_gizmo.c M source/blender/makesrna/intern/rna_workspace.c M source/blender/windowmanager/intern/wm_operators.c M source/creator/creator_args.c =================================================================== diff --git a/release/scripts/presets/keyconfig/blender.py b/release/scripts/presets/keyconfig/blender.py index 113e99fed42..eb66c961472 100644 --- a/release/scripts/presets/keyconfig/blender.py +++ b/release/scripts/presets/keyconfig/blender.py @@ -130,7 +130,7 @@ class Prefs(bpy.types.KeyConfigPreferences): description=( "The action when Middle-Mouse dragging in the viewport. " "Shift-Middle-Mouse is used for the other action. " - "This applies to Track-Pad as well" + "This applies to trackpad as well" ), update=update_fn, ) diff --git a/release/scripts/startup/bl_operators/anim.py b/release/scripts/startup/bl_operators/anim.py index 6ab7c082cf1..279b66a0833 100644 --- a/release/scripts/startup/bl_operators/anim.py +++ b/release/scripts/startup/bl_operators/anim.py @@ -347,7 +347,7 @@ class ClearUselessActions(Operator): class UpdateAnimatedTransformConstraint(Operator): - """Update fcurves/drivers affecting Transform constraints (use it with files from 2.70 and earlier)""" + """Update f-curves/drivers affecting Transform constraints (use it with files from 2.70 and earlier)""" bl_idname = "anim.update_animated_transform_constraints" bl_label = "Update Animated Transform Constraints" bl_options = {'REGISTER', 'UNDO'} diff --git a/release/scripts/startup/bl_operators/sequencer.py b/release/scripts/startup/bl_operators/sequencer.py index e97ce25e758..48a02a4c5c6 100644 --- a/release/scripts/startup/bl_operators/sequencer.py +++ b/release/scripts/startup/bl_operators/sequencer.py @@ -80,7 +80,7 @@ class SequencerCrossfadeSounds(Operator): class SequencerSplitMulticam(Operator): - """Split multi-cam strip and select camera""" + """Split multicam strip and select camera""" bl_idname = "sequencer.split_multicam" bl_label = "Split Multicam" diff --git a/release/scripts/startup/bl_operators/userpref.py b/release/scripts/startup/bl_operators/userpref.py index 38d0f8ba667..9adb518ff55 100644 --- a/release/scripts/startup/bl_operators/userpref.py +++ b/release/scripts/startup/bl_operators/userpref.py @@ -868,7 +868,7 @@ class PREFERENCES_OT_addon_show(Operator): # Note: shares some logic with PREFERENCES_OT_addon_install # but not enough to de-duplicate. Fixes here may apply to both. class PREFERENCES_OT_app_template_install(Operator): - """Install an application-template""" + """Install an application template""" bl_idname = "preferences.app_template_install" bl_label = "Install Template from File..." diff --git a/release/scripts/startup/bl_operators/uvcalc_lightmap.py b/release/scripts/startup/bl_operators/uvcalc_lightmap.py index 3b936b2f93b..d13e98b96e9 100644 --- a/release/scripts/startup/bl_operators/uvcalc_lightmap.py +++ b/release/scripts/startup/bl_operators/uvcalc_lightmap.py @@ -642,7 +642,7 @@ class LightMapPack(Operator): # UV Packing... PREF_BOX_DIV: IntProperty( name="Pack Quality", - description="Pre Packing before the complex boxpack", + description="Pre-packing before the complex boxpack", min=1, max=48, default=12, ) diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index e47a27cf6e5..350d9391acf 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -834,7 +834,7 @@ class WM_OT_context_modal_mouse(Operator): class WM_OT_url_open(Operator): - """Open a website in the web-browser""" + """Open a website in the web browser""" bl_idname = "wm.url_open" bl_label = "" bl_options = {'INTERNAL'} @@ -851,7 +851,7 @@ class WM_OT_url_open(Operator): class WM_OT_url_open_preset(Operator): - """Open a preset website in the web-browser""" + """Open a preset website in the web browser""" bl_idname = "wm.url_open_preset" bl_label = "Open Preset Website" bl_options = {'INTERNAL'} @@ -1737,7 +1737,7 @@ class WM_OT_tool_set_by_index(Operator): ) expand: BoolProperty( - description="Include tool sub-groups", + description="Include tool subgroups", default=True, ) @@ -2169,7 +2169,7 @@ class WM_OT_batch_rename(Operator): 'GPENCIL': ("grease_pencils", "Grease Pencil(s)"), 'CAMERA': ("cameras", "Camera(s)"), 'SPEAKER': ("speakers", "Speaker(s)"), - 'LIGHT_PROBE': ("light_probes", "LightProbe(s)"), + 'LIGHT_PROBE': ("light_probes", "Light Probe(s)"), } # Finish with space types. diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 0167f0b1e20..31b0b915855 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1437,7 +1437,7 @@ class USERPREF_PT_saveload_file_browser(SaveLoadPanel, CenterAlignMixIn, Panel): col.prop(paths, "use_filter_files") col = layout.column(heading="Hide") - col.prop(paths, "show_hidden_files_datablocks", text="Dot File & Datablocks") + col.prop(paths, "show_hidden_files_datablocks", text="Dot File & Data-Blocks") col.prop(paths, "hide_recent_locations", text="Recent Locations") col.prop(paths, "hide_system_bookmarks", text="System Bookmarks") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 8b5183faf62..eb8d6a63436 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -957,7 +957,7 @@ class VIEW3D_MT_transform(VIEW3D_MT_transform_base, Menu): # generic... layout = self.layout if context.mode == 'EDIT_MESH': - layout.operator("transform.shrink_fatten", text="Shrink Fatten") + layout.operator("transform.shrink_fatten", text="Shrink/Fatten") layout.operator("transform.skin_resize") elif context.mode == 'EDIT_CURVE': layout.operator("transform.transform", text="Radius").mode = 'CURVE_SHRINKFATTEN' @@ -5091,7 +5091,7 @@ class VIEW3D_MT_edit_gpencil_transform(Menu): layout.operator("transform.bend", text="Bend") layout.operator("transform.shear", text="Shear") layout.operator("transform.tosphere", text="To Sphere") - layout.operator("transform.transform", text="Shrink Fatten").mode = 'GPENCIL_SHRINKFATTEN' + layout.operator("transform.transform", text="Shrink/Fatten").mode = 'GPENCIL_SHRINKFATTEN' class VIEW3D_MT_edit_gpencil_showhide(Menu): @@ -7044,7 +7044,7 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu): col.operator("transform.bend", text="Bend") col.operator("transform.shear", text="Shear") col.operator("transform.tosphere", text="To Sphere") - col.operator("transform.transform", text="Shrink Fatten").mode = 'GPENCIL_SHRINKFATTEN' + col.operator("transform.transform", text="Shrink/Fatten").mode = 'GPENCIL_SHRINKFATTEN' col.separator() @@ -7088,7 +7088,7 @@ class VIEW3D_MT_gpencil_edit_context_menu(Menu): col.separator() col.operator("gpencil.stroke_smooth", text="Smooth Stroke").only_selected = False - col.operator("transform.transform", text="Shrink Fatten").mode = 'GPENCIL_SHRINKFATTEN' + col.operator("transform.transform", text="Shrink/Fatten").mode = 'GPENCIL_SHRINKFATTEN' col.separator() diff --git a/source/blender/editors/animation/anim_channels_edit.c b/source/blender/editors/animation/anim_channels_edit.c index 124992bed71..ac226b36e21 100644 --- a/source/blender/editors/animation/anim_channels_edit.c +++ b/source/blender/editors/animation/anim_channels_edit.c @@ -3422,7 +3422,7 @@ static void ANIM_OT_channels_click(wmOperatorType *ot) /* identifiers */ ot->name = "Mouse Click on Channels"; ot->idname = "ANIM_OT_channels_click"; - ot->description = "Handle mouse-clicks over animation channels"; + ot->description = "Handle mouse clicks over animation channels"; /* api callbacks */ ot->invoke = animchannels_mouseclick_invoke; diff --git a/source/blender/editors/armature/armature_add.c b/source/blender/editors/armature/armature_add.c index af323bf91e4..f32d28c4a15 100644 --- a/source/blender/editors/armature/armature_add.c +++ b/source/blender/editors/armature/armature_add.c @@ -1617,7 +1617,7 @@ void ARMATURE_OT_bone_primitive_add(wmOperatorType *ot) /* identifiers */ ot->name = "Add Bone"; ot->idname = "ARMATURE_OT_bone_primitive_add"; - ot->description = "Add a new bone located at the 3D-Cursor"; + ot->description = "Add a new bone located at the 3D cursor"; /* api callbacks */ ot->exec = armature_bone_primitive_add_exec; diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index f2cb00f67f0..a07e73d6266 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -876,7 +876,7 @@ void ARMATURE_OT_fill(wmOperatorType *ot) /* identifiers */ ot->name = "Fill Between Joints"; ot->idname = "ARMATURE_OT_fill"; - ot->description = "Add bone between selected joint(s) and/or 3D-Cursor"; + ot->description = "Add bone between selected joint(s) and/or 3D cursor"; /* callbacks */ ot->exec = armature_fill_bones_exec; diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index 14d64d2d808..bb5bcd4083e 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -948,7 +948,7 @@ void ARMATURE_OT_parent_set(wmOperatorType *ot) ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO; RNA_def_enum( - ot->srna, "type", prop_editarm_make_parent_types, 0, "ParentType", "Type of parenting"); + ot->srna, "type", prop_editarm_make_parent_types, 0, "Parent Type", "Type of parenting"); } static const EnumPropertyItem prop_editarm_clear_parent_types[] = { @@ -1029,7 +1029,7 @@ void ARMATURE_OT_parent_ @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs