[Bf-blender-cvs] [a4a42f3171c] master: UI: Use 'and' Instead of '&' in Descriptions
Yevgeny Makarov
noreply at git.blender.org
Fri Dec 11 03:36:37 CET 2020
Commit: a4a42f3171c021f2f7eb28e1ed10873b3314587b
Author: Yevgeny Makarov
Date: Thu Dec 10 18:22:16 2020 -0800
Branches: master
https://developer.blender.org/rBa4a42f3171c021f2f7eb28e1ed10873b3314587b
UI: Use 'and' Instead of '&' in Descriptions
Use 'and' instead of ampersand in descriptions and comments.
Differential Revision: https://developer.blender.org/D9797
Reviewed by Aaron Carlisle
===================================================================
M release/scripts/startup/bl_operators/anim.py
M release/scripts/startup/bl_operators/object_quick_effects.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M source/blender/editors/armature/armature_edit.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/transform/transform_ops.c
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_nla.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_object_force.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/release/scripts/startup/bl_operators/anim.py b/release/scripts/startup/bl_operators/anim.py
index bb414b5ff89..e1d7f2057d2 100644
--- a/release/scripts/startup/bl_operators/anim.py
+++ b/release/scripts/startup/bl_operators/anim.py
@@ -307,7 +307,7 @@ class NLA_OT_bake(Operator):
class ClearUselessActions(Operator):
- """Mark actions with no F-Curves for deletion after save & reload of """ \
+ """Mark actions with no F-Curves for deletion after save and reload of """ \
"""file preserving \"action libraries\""""
bl_idname = "anim.clear_useless_actions"
bl_label = "Clear Useless Actions"
diff --git a/release/scripts/startup/bl_operators/object_quick_effects.py b/release/scripts/startup/bl_operators/object_quick_effects.py
index 0f4eb8a8507..688f9d65814 100644
--- a/release/scripts/startup/bl_operators/object_quick_effects.py
+++ b/release/scripts/startup/bl_operators/object_quick_effects.py
@@ -337,7 +337,7 @@ class QuickSmoke(ObjectModeOperator, Operator):
items=(
('SMOKE', "Smoke", ""),
('FIRE', "Fire", ""),
- ('BOTH', "Smoke + Fire", ""),
+ ('BOTH', "Smoke & Fire", ""),
),
default='SMOKE',
)
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index ca5e6404159..a69e3974193 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -360,7 +360,7 @@ class _defs_transform:
idname="builtin.transform",
label="Transform",
description=(
- "Supports any combination of grab, rotate & scale at once"
+ "Supports any combination of grab, rotate, and scale at once"
),
icon="ops.transform.transform",
widget="VIEW3D_GGT_xform_gizmo",
@@ -1654,7 +1654,7 @@ class _defs_image_uv_transform:
idname="builtin.transform",
label="Transform",
description=(
- "Supports any combination of grab, rotate & scale at once"
+ "Supports any combination of grab, rotate, and scale at once"
),
icon="ops.transform.transform",
widget="IMAGE_GGT_gizmo2d",
diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c
index b20d2738bda..f2cb00f67f0 100644
--- a/source/blender/editors/armature/armature_edit.c
+++ b/source/blender/editors/armature/armature_edit.c
@@ -1014,7 +1014,7 @@ void ARMATURE_OT_switch_direction(wmOperatorType *ot)
/* identifiers */
ot->name = "Switch Direction";
ot->idname = "ARMATURE_OT_switch_direction";
- ot->description = "Change the direction that a chain of bones points in (head <-> tail swap)";
+ ot->description = "Change the direction that a chain of bones points in (head and tail swap)";
/* api callbacks */
ot->exec = armature_switch_direction_exec;
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index b961f81e16a..ccc27ec19b6 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -395,7 +395,7 @@ void MESH_OT_unsubdivide(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Un-Subdivide";
- ot->description = "UnSubdivide selected edges & faces";
+ ot->description = "Un-subdivide selected edges and faces";
ot->idname = "MESH_OT_unsubdivide";
/* api callbacks */
@@ -698,7 +698,7 @@ void MESH_OT_edge_collapse(wmOperatorType *ot)
/* identifiers */
ot->name = "Collapse Edges & Faces";
ot->description =
- "Collapse isolated edges & faces regions, merging data such as UV's and vertex colors. "
+ "Collapse isolated edge and face regions, merging data such as UV's and vertex colors. "
"This can collapse edge-rings as well as regions of connected faces into vertices";
ot->idname = "MESH_OT_edge_collapse";
@@ -1904,7 +1904,7 @@ void MESH_OT_edge_split(wmOperatorType *ot)
"VERT",
0,
"Faces & Edges by Vertices",
- "Split faces & edges connected to selected vertices"},
+ "Split faces and edges connected to selected vertices"},
{0, NULL, 0, NULL, NULL},
};
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 72b3b344813..649279f8e08 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -3918,7 +3918,7 @@ static void SCREEN_OT_region_quadview(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Toggle Quad View";
- ot->description = "Split selected area into camera, front, right & top views";
+ ot->description = "Split selected area into camera, front, right, and top views";
ot->idname = "SCREEN_OT_region_quadview";
/* api callbacks */
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index 5153fdedcae..5d758a6c6c6 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -717,7 +717,7 @@ void Transform_Properties(struct wmOperatorType *ot, int flags)
"use_automerge_and_split",
0,
"Auto Merge & Split",
- "Forces the use of Auto Merge & Split");
+ "Forces the use of Auto Merge and Split");
RNA_def_property_flag(prop, PROP_HIDDEN);
}
}
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 6586cfc7969..25fe37c2d02 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -1106,7 +1106,7 @@ bool RNA_struct_bl_idname_ok_or_report(ReportList *reports,
#endif
if (p == NULL || p == identifier || p + len_sep >= identifier + len_id) {
BKE_reportf(
- reports, report_level, "'%s' doesn't contain '%s' with prefix & suffix", identifier, sep);
+ reports, report_level, "'%s' does not contain '%s' with prefix and suffix", identifier, sep);
return failure;
}
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c
index f8a342e7f7e..2642ba82bc0 100644
--- a/source/blender/makesrna/intern/rna_nla.c
+++ b/source/blender/makesrna/intern/rna_nla.c
@@ -784,7 +784,7 @@ static void rna_def_nlastrip(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_animated_time_cyclic", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", NLASTRIP_FLAG_USR_TIME_CYCLIC);
RNA_def_property_ui_text(
- prop, "Cyclic Strip Time", "Cycle the animated time within the action start & end");
+ prop, "Cyclic Strip Time", "Cycle the animated time within the action start and end");
RNA_def_property_update(
prop, NC_ANIMATION | ND_NLA | NA_EDITED, "rna_NlaStrip_transform_update");
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index b3f48b17ce0..23092fbae28 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -8178,7 +8178,7 @@ static void def_cmp_sunbeams(StructRNA *srna)
RNA_def_property_range(prop, -100.0f, 100.0f);
RNA_def_property_ui_range(prop, -10.0f, 10.0f, 10, 3);
RNA_def_property_ui_text(
- prop, "Source", "Source point of rays as a factor of the image width & height");
+ prop, "Source", "Source point of rays as a factor of the image width and height");
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
prop = RNA_def_property(srna, "ray_length", PROP_FLOAT, PROP_UNSIGNED);
diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c
index db4f3754b25..106de759cfc 100644
--- a/source/blender/makesrna/intern/rna_object_force.c
+++ b/source/blender/makesrna/intern/rna_object_force.c
@@ -1488,7 +1488,7 @@ static void rna_def_field(BlenderRNA *brna)
RNA_def_property_enum_items(prop, texture_items);
RNA_def_property_ui_text(prop,
"Texture Mode",
- "How the texture effect is calculated (RGB & Curl need a RGB texture, "
+ "How the texture effect is calculated (RGB and Curl need a RGB texture, "
"else Gradient will be used instead)");
RNA_def_property_update(prop, 0, "rna_FieldSettings_update");
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 65ea155ffba..4e60db95e5b 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -4281,7 +4281,7 @@ static void rna_def_space_view3d(BlenderRNA *brna)
/* Camera Object Data. */
prop = RNA_def_property(srna, "show_gizmo_camera_lens", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "gizmo_show_camera", V3D_GIZMO_SHOW_CAMERA_LENS);
- RNA_def_property_ui_text(prop, "Show Camera Lens", "Gizmo to adjust camera lens & ortho size");
+ RNA_def_property_ui_text(prop, "Show Camera Lens", "Gizmo to adjust camera focal length or orthographic scale");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "show_gizmo_camera_dof_distance", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index f1f7810bcf0..918bcb01170 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -4575,7 +4575,7 @@ static void rna_def_userdef_view(BlenderRNA *brna)
RNA_def_property_ui_text(
prop,
"Navigation Controls",
- "Show navigation controls in 2D & 3D views which do not have scroll bars");
+ "Show navigation controls in 2D and 3D views which do not have scroll bars");
RNA_def_property_update(prop, 0, "rna_userdef_gizmo_update");
/* menus */
@@ -5984,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list