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:
-rw-r--r--release/scripts/modules/bl_i18n_utils/utils_spell_check.py7
-rw-r--r--release/scripts/startup/bl_ui/properties_constraint.py3
-rw-r--r--source/blender/makesrna/intern/rna_fcurve.c2
-rw-r--r--source/blender/makesrna/intern/rna_nodetree.c4
4 files changed, 11 insertions, 5 deletions
diff --git a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
index ec8c4fc81d0..cd117ef1f26 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -39,6 +39,7 @@ class SpellChecker():
"decrement",
"derivate",
"doesn", # doesn't
+ "equi", # equi-angular, etc.
"fader",
"globbing",
"hasn", # hasn't
@@ -321,6 +322,7 @@ class SpellChecker():
"bezier", "beziers",
"bicubic",
"bilinear",
+ "binormal",
"blackpoint", "whitepoint",
"blinn",
"bokeh",
@@ -362,6 +364,7 @@ class SpellChecker():
"specular", "specularity",
"spillmap",
"sobel",
+ "texel",
"tonemap",
"toon",
"timecode",
@@ -412,6 +415,7 @@ class SpellChecker():
"poselib",
"pushpull",
"pyconstraint", "pyconstraints",
+ "qe", # keys...
"shapekey", "shapekeys",
"shrinkfatten",
"shrinkwrap",
@@ -427,6 +431,7 @@ class SpellChecker():
"vcol", "vcols",
"vgroup", "vgroups",
"vinterlace",
+ "wasd", "wasdqe", # keys...
"wetmap", "wetmaps",
"wpaint",
"uvwarp",
@@ -489,7 +494,7 @@ class SpellChecker():
"hdc",
"hdr",
"hh", "mm", "ss", "ff", # hh:mm:ss:ff timecode
- "hsv", "hsva",
+ "hsv", "hsva", "hsl",
"id",
"ior",
"itu",
diff --git a/release/scripts/startup/bl_ui/properties_constraint.py b/release/scripts/startup/bl_ui/properties_constraint.py
index 60769892efa..91999e1f5ee 100644
--- a/release/scripts/startup/bl_ui/properties_constraint.py
+++ b/release/scripts/startup/bl_ui/properties_constraint.py
@@ -860,7 +860,8 @@ class OBJECT_PT_constraints(ConstraintButtonsPanel, Panel):
box = layout.box()
box.alert = True # XXX: this should apply to the box background
box.label(icon='INFO', text="Constraints for active bone do not live here")
- box.operator("wm.properties_context_change", icon='CONSTRAINT_BONE', text="Go to Bone Constraints tab..").context = 'BONE_CONSTRAINT'
+ box.operator("wm.properties_context_change", icon='CONSTRAINT_BONE',
+ text="Go to Bone Constraints tab...").context = 'BONE_CONSTRAINT'
else:
layout.operator_menu_enum("object.constraint_add", "type", text="Add Object Constraint")
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c
index c97cef289fa..aad8d6057ed 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -50,7 +50,7 @@
EnumPropertyItem fmodifier_type_items[] = {
{FMODIFIER_TYPE_NULL, "NULL", 0, "Invalid", ""},
{FMODIFIER_TYPE_GENERATOR, "GENERATOR", 0, "Generator",
- "Generate a curve using a factorised or expanded polynomial"},
+ "Generate a curve using a factorized or expanded polynomial"},
{FMODIFIER_TYPE_FN_GENERATOR, "FNGENERATOR", 0, "Built-In Function",
"Generate a curve using standard math functions such as sin and cos"},
{FMODIFIER_TYPE_ENVELOPE, "ENVELOPE", 0, "Envelope",
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 8fbb91560f1..c6fa87c7d96 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -3432,11 +3432,11 @@ static void def_sh_tex_image(StructRNA *srna)
{SHD_INTERP_LINEAR, "Linear", 0, "Linear",
"Linear interpolation"},
{SHD_INTERP_CLOSEST, "Closest", 0, "Closest",
- "No interpolation (sample closest texel"},
+ "No interpolation (sample closest texel)"},
{SHD_INTERP_CUBIC, "Cubic", 0, "Cubic",
"Cubic interpolation (OSL only)"},
{SHD_INTERP_SMART, "Smart", 0, "Smart",
- "Bicubic when maxifying, else bilinear (OSL only)"},
+ "Bicubic when magnifying, else bilinear (OSL only)"},
{0, NULL, 0, NULL, NULL}
};