[Bf-blender-cvs] [ef17fb2715a] master: UI: Don't use abbreviations in label text
Yevgeny Makarov
noreply at git.blender.org
Fri Dec 18 02:09:58 CET 2020
Commit: ef17fb2715a3f24cd5cddd6725bfef4858f87617
Author: Yevgeny Makarov
Date: Thu Dec 17 19:06:21 2020 -0600
Branches: master
https://developer.blender.org/rBef17fb2715a3f24cd5cddd6725bfef4858f87617
UI: Don't use abbreviations in label text
Expand abbreviations for words like "Bright" (instead of "Brightness"),
"Premul", "Lib", "Dir", etc.
Differential Revision: https://developer.blender.org/D9862
===================================================================
M release/scripts/startup/bl_operators/anim.py
M release/scripts/startup/bl_operators/userpref.py
M release/scripts/startup/bl_ui/properties_data_gpencil.py
M source/blender/editors/gpencil/gpencil_vertex_ops.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/sculpt_paint/paint_vertex_color_ops.c
M source/blender/editors/space_file/file_ops.c
M source/blender/editors/space_userpref/userpref_ops.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/windowmanager/intern/wm_operator_props.c
===================================================================
diff --git a/release/scripts/startup/bl_operators/anim.py b/release/scripts/startup/bl_operators/anim.py
index e1d7f2057d2..6ab7c082cf1 100644
--- a/release/scripts/startup/bl_operators/anim.py
+++ b/release/scripts/startup/bl_operators/anim.py
@@ -198,7 +198,7 @@ class ANIM_OT_keying_set_export(Operator):
class NLA_OT_bake(Operator):
- """Bake all selected objects loc/scale/rotation animation to an action"""
+ """Bake all selected objects location/scale/rotation animation to an action"""
bl_idname = "nla.bake"
bl_label = "Bake Action"
bl_options = {'REGISTER', 'UNDO'}
diff --git a/release/scripts/startup/bl_operators/userpref.py b/release/scripts/startup/bl_operators/userpref.py
index 07dba491dbd..38d0f8ba667 100644
--- a/release/scripts/startup/bl_operators/userpref.py
+++ b/release/scripts/startup/bl_operators/userpref.py
@@ -187,7 +187,7 @@ class PREFERENCES_OT_copy_prev(Operator):
class PREFERENCES_OT_keyconfig_test(Operator):
- """Test key-config for conflicts"""
+ """Test key configuration for conflicts"""
bl_idname = "preferences.keyconfig_test"
bl_label = "Test Key Configuration for Conflicts"
diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 398bf60c493..351d4928ddf 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -273,7 +273,7 @@ class DATA_PT_gpencil_onion_skinning_display(DataButtonsPanel, Panel):
class GPENCIL_MT_gpencil_vertex_group(Menu):
- bl_label = "GP Vertex Groups"
+ bl_label = "Grease Pencil Vertex Groups"
def draw(self, context):
layout = self.layout
diff --git a/source/blender/editors/gpencil/gpencil_vertex_ops.c b/source/blender/editors/gpencil/gpencil_vertex_ops.c
index 90b2c1c3895..b212872b607 100644
--- a/source/blender/editors/gpencil/gpencil_vertex_ops.c
+++ b/source/blender/editors/gpencil/gpencil_vertex_ops.c
@@ -237,7 +237,7 @@ void GPENCIL_OT_vertex_color_brightness_contrast(wmOperatorType *ot)
PropertyRNA *prop;
/* identifiers */
- ot->name = "Vertex Paint Bright/Contrast";
+ ot->name = "Vertex Paint Brightness/Contrast";
ot->idname = "GPENCIL_OT_vertex_color_brightness_contrast";
ot->description = "Adjust vertex color brightness/contrast";
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 5caa7c71e83..ee9ef192d18 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -484,7 +484,7 @@ void OBJECT_OT_proxy_make(wmOperatorType *ot)
DummyRNA_DEFAULT_items,
0,
"Proxy Object",
- "Name of lib-linked/collection object to make a proxy for");
+ "Name of library-linked/collection object to make a proxy for");
RNA_def_enum_funcs(prop, proxy_collection_object_itemf);
RNA_def_property_flag(prop, PROP_ENUM_NO_TRANSLATE);
ot->prop = prop;
diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c
index b831687ca67..96d22fe4a21 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.c
@@ -401,7 +401,7 @@ void PAINT_OT_vertex_color_brightness_contrast(wmOperatorType *ot)
PropertyRNA *prop;
/* identifiers */
- ot->name = "Vertex Paint Bright/Contrast";
+ ot->name = "Vertex Paint Brightness/Contrast";
ot->idname = "PAINT_OT_vertex_color_brightness_contrast";
ot->description = "Adjust vertex color brightness/contrast";
diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index 3730174a6c7..88dd82bb9ea 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -967,7 +967,7 @@ void FILE_OT_select_bookmark(wmOperatorType *ot)
ot->poll = ED_operator_file_active;
/* properties */
- prop = RNA_def_string(ot->srna, "dir", NULL, FILE_MAXDIR, "Dir", "");
+ prop = RNA_def_string(ot->srna, "dir", NULL, FILE_MAXDIR, "Directory", "");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}
diff --git a/source/blender/editors/space_userpref/userpref_ops.c b/source/blender/editors/space_userpref/userpref_ops.c
index ee23cde78c2..f05d6df9944 100644
--- a/source/blender/editors/space_userpref/userpref_ops.c
+++ b/source/blender/editors/space_userpref/userpref_ops.c
@@ -93,7 +93,7 @@ static int preferences_autoexec_add_exec(bContext *UNUSED(C), wmOperator *UNUSED
static void PREFERENCES_OT_autoexec_path_add(wmOperatorType *ot)
{
- ot->name = "Add Autoexec Path";
+ ot->name = "Add Auto-Execution Path";
ot->idname = "PREFERENCES_OT_autoexec_path_add";
ot->description = "Add path to exclude from auto-execution";
@@ -121,7 +121,7 @@ static int preferences_autoexec_remove_exec(bContext *UNUSED(C), wmOperator *op)
static void PREFERENCES_OT_autoexec_path_remove(wmOperatorType *ot)
{
- ot->name = "Remove Autoexec Path";
+ ot->name = "Remove Auto-Execution Path";
ot->idname = "PREFERENCES_OT_autoexec_path_remove";
ot->description = "Remove path to exclude from auto-execution";
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 9429da342a6..ebfa4f6d9af 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -4708,7 +4708,7 @@ static int viewpersportho_exec(bContext *C, wmOperator *UNUSED(op))
void VIEW3D_OT_view_persportho(wmOperatorType *ot)
{
/* identifiers */
- ot->name = "View Persp/Ortho";
+ ot->name = "View Perspective/Orthographic";
ot->description = "Switch the current view from perspective/orthographic projection";
ot->idname = "VIEW3D_OT_view_persportho";
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index e474c610bf7..d624154ddc7 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -5798,7 +5798,7 @@ static void def_cmp_alpha_over(StructRNA *srna)
/* XXX: Tooltip */
prop = RNA_def_property(srna, "use_premultiply", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1);
- RNA_def_property_ui_text(prop, "Convert Premul", "");
+ RNA_def_property_ui_text(prop, "Convert Premultiplied", "");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
RNA_def_struct_sdna_from(srna, "NodeTwoFloats", "storage");
@@ -5806,7 +5806,7 @@ static void def_cmp_alpha_over(StructRNA *srna)
prop = RNA_def_property(srna, "premul", PROP_FLOAT, PROP_FACTOR);
RNA_def_property_float_sdna(prop, NULL, "x");
RNA_def_property_range(prop, 0.0f, 1.0f);
- RNA_def_property_ui_text(prop, "Premul", "Mix Factor");
+ RNA_def_property_ui_text(prop, "Premultiplied", "Mix Factor");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}
@@ -6622,7 +6622,7 @@ static void def_cmp_brightcontrast(StructRNA *srna)
prop = RNA_def_property(srna, "use_premultiply", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "custom1", 1);
- RNA_def_property_ui_text(prop, "Convert Premul", "Keep output image premultiplied alpha");
+ RNA_def_property_ui_text(prop, "Convert Premultiplied", "Keep output image premultiplied alpha");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}
@@ -6682,7 +6682,7 @@ static void def_cmp_channel_matte(StructRNA *srna)
static const EnumPropertyItem algorithm_items[] = {
{0, "SINGLE", 0, "Single", "Limit by single channel"},
- {1, "MAX", 0, "Max", "Limit by max of other channels"},
+ {1, "MAX", 0, "Max", "Limit by maximum of other channels"},
{0, NULL, 0, NULL, NULL},
};
@@ -7077,8 +7077,8 @@ static void def_cmp_premul_key(StructRNA *srna)
PropertyRNA *prop;
static const EnumPropertyItem type_items[] = {
- {0, "STRAIGHT_TO_PREMUL", 0, "Straight to Premul", ""},
- {1, "PREMUL_TO_STRAIGHT", 0, "Premul to Straight", ""},
+ {0, "STRAIGHT_TO_PREMUL", 0, "To Premultiplied", "Convert straight to premultiplied"},
+ {1, "PREMUL_TO_STRAIGHT", 0, "To Straight", "Convert premultiplied to straight"},
{0, NULL, 0, NULL, NULL},
};
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 5fa93ec3f04..3e40d382237 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -3298,48 +3298,48 @@ static void rna_def_particle_settings(BlenderRNA *brna)
RNA_def_property_float_sdna(prop, NULL, "rough1");
RNA_def_property_range(prop, 0.0f, 100000.0f);
RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1, 3);
- RNA_def_property_ui_text(prop, "Rough1", "Amount of location dependent rough");
+ RNA_def_property_ui_text(prop, "Roughness 1", "Amount of location dependent roughness");
RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
prop = RNA_def_property(srna, "roughness_1_size", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "rough1_size");
RNA_def_property_range(prop, 0.01f, 100000.0f);
RNA_def_property_ui_range(prop, 0.01f, 10.0f, 0.1, 3);
- RNA_def_property_ui_text(prop, "Size1", "Size of location dependent rough");
+ RNA_def_property_ui_text(prop, "Size 1", "Size of location dependent roughness");
RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
prop = RNA_def_property(srna, "roughness_2", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "rough2");
RNA_def_property_range(prop, 0.0f, 100000.0f);
RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1, 3);
- RNA_def_property_ui_text(prop, "Rough2", "Amount of random rough");
+ RNA_def_property_ui_text(prop, "Roughness 2", "Amount of random roughness");
RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
prop = RNA_def_prope
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list