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
This commit is contained in:
Yevgeny Makarov 2020-12-10 18:22:16 -08:00 committed by Harley Acheson
parent caed4849d0
commit a4a42f3171
13 changed files with 20 additions and 20 deletions

View File

@ -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"

View File

@ -337,7 +337,7 @@ class QuickSmoke(ObjectModeOperator, Operator):
items=(
('SMOKE', "Smoke", ""),
('FIRE', "Fire", ""),
('BOTH', "Smoke + Fire", ""),
('BOTH', "Smoke & Fire", ""),
),
default='SMOKE',
)

View File

@ -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",

View File

@ -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;

View File

@ -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},
};

View File

@ -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 */

View File

@ -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);
}
}

View File

@ -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;
}

View File

@ -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");

View File

@ -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);

View File

@ -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");

View File

@ -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);

View File

@ -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,7 +5984,7 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
{2, "DJV", 0, "DJV", "Open source frame player: http://djv.sourceforge.net"},
{3, "FRAMECYCLER", 0, "FrameCycler", "Frame player from IRIDAS"},
{4, "RV", 0, "RV", "Frame player from Tweak Software"},
{5, "MPLAYER", 0, "MPlayer", "Media player for video & png/jpeg/sgi image sequences"},
{5, "MPLAYER", 0, "MPlayer", "Media player for video and PNG/JPEG/SGI image sequences"},
{50, "CUSTOM", 0, "Custom", "Custom animation player executable path"},
{0, NULL, 0, NULL, NULL},
};
@ -6069,8 +6069,8 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
RNA_def_property_string_sdna(prop, NULL, "pythondir");
RNA_def_property_ui_text(prop,
"Python Scripts Directory",
"Alternate script path, matching the default layout with subdirs: "
"startup, add-ons & modules (requires restart)");
"Alternate script path, matching the default layout with subdirectories: "
"startup, add-ons and modules (requires restart)");
/* TODO, editing should reset sys.path! */
prop = RNA_def_property(srna, "i18n_branches_directory", PROP_STRING, PROP_DIRPATH);
@ -6125,7 +6125,7 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
RNA_def_property_ui_text(prop,
"Auto Save Temporary Files",
"Automatic saving of temporary files in temp directory, "
"uses process ID (sculpt & edit-mode data won't be saved!)");
"uses process ID (sculpt and edit mode data won't be saved)");
RNA_def_property_update(prop, 0, "rna_userdef_autosave_update");
prop = RNA_def_property(srna, "auto_save_time", PROP_INT, PROP_NONE);