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 /release
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 'release')
-rw-r--r--release/scripts/startup/bl_operators/anim.py2
-rw-r--r--release/scripts/startup/bl_operators/object_quick_effects.py2
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_toolbar.py4
3 files changed, 4 insertions, 4 deletions
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",