Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYevgeny Makarov <jenkm>2020-12-11 05:22:16 +0300
committerHarley Acheson <harley.acheson@gmail.com>2020-12-11 05:22:16 +0300
commita4a42f3171c021f2f7eb28e1ed10873b3314587b (patch)
treeef630fa1f97418556ee901e7d1f2be6a52b6c82e /source/blender/editors
parentcaed4849d0903c09c63ef5b80e506aa4bdfcb994 (diff)
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
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/armature/armature_edit.c2
-rw-r--r--source/blender/editors/mesh/editmesh_tools.c6
-rw-r--r--source/blender/editors/screen/screen_ops.c2
-rw-r--r--source/blender/editors/transform/transform_ops.c2
4 files changed, 6 insertions, 6 deletions
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);
}
}