Commit: 494ffd2f9551b756e782e07d17748063eea04c45 Author: Yevgeny Makarov Date: Wed Oct 7 08:04:53 2020 -0500 Branches: master https://developer.blender.org/rB494ffd2f9551b756e782e07d17748063eea04c45
UI: Fix capitalization in various places Follow the MLA style, agreed upon in T79589. This means "from" within UI labels should be lowercase. Differential Revision: https://developer.blender.org/D8345 =================================================================== M release/scripts/startup/bl_operators/object.py M release/scripts/startup/bl_operators/sequencer.py M release/scripts/startup/bl_operators/userpref.py M release/scripts/startup/bl_operators/view3d.py M release/scripts/startup/bl_ui/properties_data_mesh.py M release/scripts/startup/bl_ui/space_clip.py M release/scripts/startup/bl_ui/space_text.py M release/scripts/startup/bl_ui/space_view3d.py M release/scripts/startup/keyingsets_builtins.py M source/blender/editors/curve/editfont.c M source/blender/editors/mesh/editmesh_select_similar.c M source/blender/editors/mesh/editmesh_tools.c M source/blender/editors/object/object_add.c M source/blender/editors/object/object_facemap_ops.c M source/blender/editors/physics/physics_pointcache.c M source/blender/editors/sculpt_paint/sculpt_face_set.c M source/blender/editors/space_view3d/view3d_edit.c M source/blender/editors/transform/transform_ops.c M source/blender/editors/uvedit/uvedit_ops.c M source/blender/editors/uvedit/uvedit_unwrap_ops.c =================================================================== diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py index 73212d6641a..87973ac2c45 100644 --- a/release/scripts/startup/bl_operators/object.py +++ b/release/scripts/startup/bl_operators/object.py @@ -861,7 +861,7 @@ class TransformsToDeltasAnim(Operator): class DupliOffsetFromCursor(Operator): """Set offset used for collection instances based on cursor position""" bl_idname = "object.instance_offset_from_cursor" - bl_label = "Set Offset From Cursor" + bl_label = "Set Offset from Cursor" bl_options = {'INTERNAL', 'UNDO'} @classmethod diff --git a/release/scripts/startup/bl_operators/sequencer.py b/release/scripts/startup/bl_operators/sequencer.py index 9b15ccf167b..6b420d20e14 100644 --- a/release/scripts/startup/bl_operators/sequencer.py +++ b/release/scripts/startup/bl_operators/sequencer.py @@ -188,7 +188,7 @@ class SequencerFadesAdd(Operator): min=0.01) type: EnumProperty( items=( - ('IN_OUT', 'Fade In And Out', 'Fade selected strips in and out'), + ('IN_OUT', 'Fade In and Out', 'Fade selected strips in and out'), ('IN', 'Fade In', 'Fade in selected strips'), ('OUT', 'Fade Out', 'Fade out selected strips'), ('CURSOR_FROM', 'From Current Frame', @@ -196,7 +196,7 @@ class SequencerFadesAdd(Operator): ('CURSOR_TO', 'To Current Frame', 'Fade from the start of sequences under the time cursor to the current frame'), ), - name="Fade type", + name="Fade Type", description="Fade in, out, both in and out, to, or from the current frame. Default is both in and out", default='IN_OUT') diff --git a/release/scripts/startup/bl_operators/userpref.py b/release/scripts/startup/bl_operators/userpref.py index 113e6b06153..31d601debba 100644 --- a/release/scripts/startup/bl_operators/userpref.py +++ b/release/scripts/startup/bl_operators/userpref.py @@ -228,7 +228,7 @@ class PREFERENCES_OT_keyconfig_import(Operator): options={'HIDDEN'}, ) keep_original: BoolProperty( - name="Keep original", + name="Keep Original", description="Keep original file after copying to configuration folder", default=True, ) diff --git a/release/scripts/startup/bl_operators/view3d.py b/release/scripts/startup/bl_operators/view3d.py index 968dc8e5dba..3442e189d14 100644 --- a/release/scripts/startup/bl_operators/view3d.py +++ b/release/scripts/startup/bl_operators/view3d.py @@ -193,9 +193,11 @@ class VIEW3D_OT_transform_gizmo_set(Operator): bl_idname = "view3d.transform_gizmo_set" extend: BoolProperty( + name="Extend", default=False, ) type: EnumProperty( + name="Type", items=( ('TRANSLATE', "Move", ""), ('ROTATE', "Rotate", ""), diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index ee41cfc28a5..2ea439a7e89 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -69,7 +69,7 @@ class MESH_MT_shape_key_context_menu(Menu): def draw(self, _context): layout = self.layout - layout.operator("object.shape_key_add", icon='ADD', text="New Shape From Mix").from_mix = True + layout.operator("object.shape_key_add", icon='ADD', text="New Shape from Mix").from_mix = True layout.separator() layout.operator("object.shape_key_mirror", icon='ARROW_LEFTRIGHT').use_topology = False layout.operator("object.shape_key_mirror", text="Mirror Shape Key (Topology)").use_topology = True diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 59588124bf1..93bc0c7b535 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -423,7 +423,7 @@ class CLIP_PT_tracking_settings(CLIP_PT_tracking_panel, Panel): col.separator() col.operator("clip.track_settings_as_default", - text="Copy From Active Track") + text="Copy from Active Track") class CLIP_PT_tracking_settings_extras(CLIP_PT_tracking_panel, Panel): diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py index 9e588acd50f..8a45069470b 100644 --- a/release/scripts/startup/bl_ui/space_text.py +++ b/release/scripts/startup/bl_ui/space_text.py @@ -362,7 +362,7 @@ class TEXT_MT_format(Menu): class TEXT_MT_edit_to3d(Menu): - bl_label = "Text To 3D Object" + bl_label = "Text to 3D Object" def draw(self, _context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 6612572f987..24a74390773 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -2916,8 +2916,8 @@ class VIEW3D_MT_paint_weight(Menu): if not is_editmode: - layout.operator("paint.weight_from_bones", text="Assign Automatic From Bones").type = 'AUTOMATIC' - layout.operator("paint.weight_from_bones", text="Assign From Bone Envelopes").type = 'ENVELOPES' + layout.operator("paint.weight_from_bones", text="Assign Automatic from Bones").type = 'AUTOMATIC' + layout.operator("paint.weight_from_bones", text="Assign from Bone Envelopes").type = 'ENVELOPES' layout.separator() @@ -3072,13 +3072,13 @@ class VIEW3D_MT_face_sets(Menu): def draw(self, _context): layout = self.layout - op = layout.operator("sculpt.face_sets_create", text='Face Set From Masked') + op = layout.operator("sculpt.face_sets_create", text='Face Set from Masked') op.mode = 'MASKED' - op = layout.operator("sculpt.face_sets_create", text='Face Set From Visible') + op = layout.operator("sculpt.face_sets_create", text='Face Set from Visible') op.mode = 'VISIBLE' - op = layout.operator("sculpt.face_sets_create", text='Face Set From Edit Mode Selection') + op = layout.operator("sculpt.face_sets_create", text='Face Set from Edit Mode Selection') op.mode = 'SELECTION' layout.separator() @@ -4150,7 +4150,7 @@ class VIEW3D_MT_edit_mesh_normals(Menu): layout.separator() - layout.operator("mesh.set_normals_from_faces", text="Set From Faces") + layout.operator("mesh.set_normals_from_faces", text="Set from Faces") layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("transform.rotate_normal", text="Rotate...") @@ -5293,10 +5293,10 @@ class VIEW3D_MT_sculpt_face_sets_edit_pie(Menu): layout = self.layout pie = layout.menu_pie() - op = pie.operator("sculpt.face_sets_create", text='Face Set From Masked') + op = pie.operator("sculpt.face_sets_create", text='Face Set from Masked') op.mode = 'MASKED' - op = pie.operator("sculpt.face_sets_create", text='Face Set From Visible') + op = pie.operator("sculpt.face_sets_create", text='Face Set from Visible') op.mode = 'VISIBLE' op = pie.operator("sculpt.face_set_change_visibility", text='Invert Visible') diff --git a/release/scripts/startup/keyingsets_builtins.py b/release/scripts/startup/keyingsets_builtins.py index 19d565d10b6..6dffeac35ce 100644 --- a/release/scripts/startup/keyingsets_builtins.py +++ b/release/scripts/startup/keyingsets_builtins.py @@ -539,7 +539,7 @@ class BUILTIN_KSI_WholeCharacterSelected(KeyingSetInfo): """Insert a keyframe for all properties that are likely to get animated in a character rig """ \ """(only selected bones)""" bl_idname = ANIM_KS_WHOLE_CHARACTER_SELECTED_ID - bl_label = "Whole Character (Selected bones only)" + bl_label = "Whole Character (Selected Bones Only)" # iterator - all bones regardless of selection def iterator(ksi, context, ks): diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 551916ec57d..2a880c11afb 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -1766,7 +1766,7 @@ void FONT_OT_text_insert(wmOperatorType *ot) ot->srna, "accent", 0, - "Accent mode", + "Accent Mode", "Next typed character will strike through previous, for special character input"); } diff --git a/source/blender/editors/mesh/editmesh_select_similar.c b/source/blender/editors/mesh/editmesh_select_similar.c index b3fb9747070..f94d3ba5a70 100644 --- a/source/blender/editors/mesh/editmesh_select_similar.c +++ b/source/blender/editors/mesh/editmesh_select_similar.c @@ -64,7 +64,7 @@ static const EnumPropertyItem prop_similar_types[] = { {SIMVERT_NORMAL, "NORMAL", 0, "Normal", ""}, {SIMVERT_FACE, "FACE", 0, "Amount of Adjacent Faces", ""}, {SIMVERT_VGROUP, "VGROUP", 0, "Vertex Groups", ""}, - {SIMVERT_EDGE, "EDGE", 0, "Amount of connecting edges", ""}, + {SIMVERT_EDGE, "EDGE", 0, "Amount of Connecting Edges", ""}, {SIMEDGE_LENGTH, "LENGTH", 0, "Length", ""}, {SIMEDGE_DIR, "DIR", 0, "Direction", ""}, diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index 6f4320df365..01e25d5281c 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -3700,7 +3700,7 @@ void MESH_OT_blend_from_shape(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name = "Blend From Shape"; + ot->name = "Blend from Shape"; ot->description = "Blend in shape from a shape key"; ot->idname = "MESH_OT_blend_from_shape"; @@ -7254,7 +7254,7 @@ void MESH_OT_wireframe(wmOperatorType *ot) "Crease", "Crease hub edges for an improved subdivision surface"); prop = RNA_def_float( - ot->srna, "crease_weight", 0.01f, 0.0f, 1e3f, "Crease weight", "", 0.0f, 1.0f); + ot->srna, "crease_weight", 0.01f, 0.0f, 1e3f, "Crease Weigh @@ 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
