[Bf-blender-cvs] [6d89337257b] master: Fix/cleanup typos and such in UI messages (and some comments).
Bastien Montagne
noreply at git.blender.org
Mon Dec 24 15:04:13 CET 2018
Commit: 6d89337257b6f3ec0b300e13c1322f5171d966af
Author: Bastien Montagne
Date: Mon Dec 24 15:02:20 2018 +0100
Branches: master
https://developer.blender.org/rB6d89337257b6f3ec0b300e13c1322f5171d966af
Fix/cleanup typos and such in UI messages (and some comments).
===================================================================
M intern/cycles/blender/addon/properties.py
M release/scripts/modules/bl_i18n_utils/settings.py
M release/scripts/modules/bl_i18n_utils/utils_spell_check.py
M release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M release/scripts/startup/bl_ui/space_userpref.py
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/io/io_collada.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/sculpt_paint/paint_cursor.c
M source/blender/editors/space_node/node_edit.c
M source/blender/editors/undo/ed_undo.c
M source/blender/editors/uvedit/uvedit_smart_stitch.c
M source/blender/freestyle/intern/python/BPy_MediumType.cpp
M source/blender/freestyle/intern/stroke/Stroke.h
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_lightprobe.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/makesrna/intern/rna_shader_fx.c
M tests/gtests/blenlib/BLI_math_base_test.cc
===================================================================
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 6ffe651d90e..243e0571a97 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -1144,7 +1144,7 @@ class CyclesObjectSettings(bpy.types.PropertyGroup):
name="Holdout",
description="Render objects as a holdout or matte, creating a "
"hole in the image with zero alpha, to fill out in "
- "compositing with real footange or another render",
+ "compositing with real footage or another render",
default=False,
)
diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py
index 9dc0a1ae89e..12bef06f022 100644
--- a/release/scripts/modules/bl_i18n_utils/settings.py
+++ b/release/scripts/modules/bl_i18n_utils/settings.py
@@ -296,6 +296,11 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"fps: %i",
"gimbal",
"global",
+ "glTF 2.0 (.glb/.gltf)",
+ "glTF Binary (.glb)",
+ "glTF Embedded (.gltf)",
+ "glTF Separate (.gltf + .bin + textures)",
+ "invoke() needs to be called before execute()",
"iScale",
"iso-8859-15",
"iTaSC",
@@ -325,6 +330,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"vBVH",
"view",
"wav",
+ "wmOwnerID '%s' not in workspace '%s'",
"y",
# Sub-strings.
"available with",
@@ -332,6 +338,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"can't save image while rendering",
"constructive modifier",
"cursor",
+ "custom",
"custom matrix",
"custom orientation",
"edge data",
@@ -368,7 +375,6 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"verts only",
"view",
"virtual parents",
- "wmOwnerID '%s' not in workspace '%s'",
}
WARN_MSGID_NOT_CAPITALIZED_ALLOWED |= set(lng[2] for lng in LANGUAGES)
@@ -380,6 +386,7 @@ WARN_MSGID_END_POINT_ALLOWED = {
"Pad.",
" RNA Path: bpy.types.",
"Temp. Diff.",
+ "Temperature Diff.",
}
PARSER_CACHE_HASH = 'sha1'
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 87f4ad7f59e..3418b4af769 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:
"couldn", # couldn't
"decrement",
"derivate",
+ "deterministically",
"doesn", # doesn't
"equi", # equi-angular, etc.
"fader",
@@ -58,7 +59,10 @@ class SpellChecker:
"mplayer",
"ons", # add-ons
"pong", # ping pong
+ "scalable",
+ "shadeless",
"smoothen",
+ "spacings",
"teleport", "teleporting",
"vertices",
@@ -69,6 +73,7 @@ class SpellChecker:
"autocomplete",
"autoexec",
"autoexecution",
+ "autogenerated",
"autolock",
"autoname",
"autopack",
@@ -134,7 +139,7 @@ class SpellChecker:
"multi",
"multifractal",
"multiframe",
- "multilayer"
+ "multilayer",
"multipaint",
"multires", "multiresolution",
"multisampling",
@@ -153,6 +158,7 @@ class SpellChecker:
"pre",
"precache", "precaching",
"precalculate",
+ "precomputing",
"prefetch",
"premultiply", "premultiplied",
"prepass",
@@ -171,6 +177,7 @@ class SpellChecker:
"resize",
"restpose",
"retarget", "retargets", "retargeting", "retargeted",
+ "retiming",
"rigidbody",
"ringnoise",
"rolloff",
@@ -191,6 +198,7 @@ class SpellChecker:
"subclass", "subclasses", "subclassing",
"subdirectory", "subdirectories", "subdir", "subdirs",
"subitem",
+ "submode",
"submodule", "submodules",
"subpath",
"subsize",
@@ -214,17 +222,19 @@ class SpellChecker:
"unkeyed",
"unlink", "unlinked",
"unmute",
+ "unphysical",
"unpremultiply",
"unprojected",
"unprotect",
"unreacted",
"unreferenced",
"unregister",
- "unselected", "unselectable",
+ "unselect", "unselected", "unselectable",
"unsubdivided", "unsubdivide",
"unshadowed",
"unspill",
"unstitchable",
+ "untrusted",
"vectorscope",
"whitespace", "whitespaces",
"worldspace",
@@ -242,12 +252,14 @@ class SpellChecker:
"determinator",
"editability",
"effectors",
+ "expander",
"instancer",
"keyer",
"lacunarity",
"linkable",
"numerics",
"occluder", "occluders",
+ "overridable",
"passepartout",
"perspectively",
"pixelate",
@@ -256,6 +268,7 @@ class SpellChecker:
"polygonization", "polygonalization", # yuck!
"scalings",
"selectable", "selectability",
+ "shaper",
"spherize", "spherized",
"stitchable",
"symmetrize",
@@ -288,10 +301,12 @@ class SpellChecker:
"expr",
"fac",
"fra",
+ "fract",
"frs",
"grless",
"http",
"init",
+ "irr", # Irradiance
"kbit", "kb",
"lang", "langs",
"lclick", "rclick",
@@ -320,6 +335,7 @@ class SpellChecker:
"sel",
"spec",
"struct", "structs",
+ "subdiv",
"sys",
"tex",
"tmr", # timer
@@ -330,6 +346,7 @@ class SpellChecker:
"vel", # velocity!
"vert", "verts",
"vis",
+ "vram",
"xor",
"xyz", "xzy", "yxz", "yzx", "zxy", "zyx",
"xy", "xz", "yx", "yz", "zx", "zy",
@@ -338,10 +355,11 @@ class SpellChecker:
"affine",
"albedo",
"anamorphic",
- "anisotropic",
+ "anisotropic", "anisotropy",
"bitangent",
"boid", "boids",
"ceil",
+ "compressibility",
"curvilinear",
"equiangular",
"equisolid",
@@ -421,6 +439,7 @@ class SpellChecker:
"dropoff",
"dv",
"eigenvectors",
+ "emissive",
"equirectangular",
"fisheye",
"framerate",
@@ -455,10 +474,12 @@ class SpellChecker:
"specular", "specularity",
"spillmap",
"sobel",
+ "stereoscopy",
"texel",
+ "timecode",
"tonemap",
"toon",
- "timecode",
+ "transmissive",
"vividlight",
"volumetrics",
"voronoi",
@@ -471,6 +492,7 @@ class SpellChecker:
# Blender terms
"audaspace",
"azone", # action zone
+ "backwire",
"bbone",
"bendy", # bones
"bmesh",
@@ -498,6 +520,7 @@ class SpellChecker:
"freestyle",
"enum", "enums",
"gizmogroup",
+ "gons", # N-Gons
"gpencil",
"idcol",
"keyframe", "keyframes", "keyframing", "keyframed",
@@ -520,7 +543,7 @@ class SpellChecker:
"pushpull",
"pyconstraint", "pyconstraints",
"qe", # keys...
- "shaderfx",
+ "shaderfx", "shaderfxs",
"shapekey", "shapekeys",
"shrinkfatten",
"shrinkwrap",
@@ -560,6 +583,7 @@ class SpellChecker:
"chebychev",
"courant",
"cryptomatte", "crypto",
+ "embree",
"hosek",
"kutta",
"lennard",
@@ -592,6 +616,7 @@ class SpellChecker:
"bw",
"ccd",
"cmd",
+ "cmos",
"cpus",
"ctrl",
"cw", "ccw",
@@ -640,6 +665,7 @@ class SpellChecker:
"sl",
"smpte",
"ssao",
+ "ssr",
"svn",
"ui",
"unix",
@@ -709,7 +735,9 @@ class SpellChecker:
"tiff",
"theora",
"vorbis",
+ "vp9",
"wav",
+ "webm",
"xiph",
"xml",
"xna",
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 65d194e54d2..be335469418 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -359,7 +359,7 @@ class GreasePencilAppearancePanel:
if tool in {'THICKNESS', 'STRENGTH'}:
col.prop(brush, "cursor_color_add", text="Add")
- col.prop(brush, "cursor_color_sub", text="Substract")
+ col.prop(brush, "cursor_color_sub", text="Subtract")
elif tool == 'PINCH':
col.prop(brush, "cursor_color_add", text="Pinch")
col.prop(brush, "cursor_color_sub", text="Inflate")
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index c4198e02187..73d34fdb380 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -207,7 +207,7 @@ class USERPREF_PT_interface(Panel):
col.separator()
col.label(text="App Template:")
- col.label(text="Options intended for use with app-templates only.")
+ col.label(text="Options intended for use with app-templates only")
col.prop(view, "show_layout_ui")
@@ -1380,7 +1380,7 @@ class USERPREF_PT_addons(Panel):
# WARNING: 2.8x exception, may be removed
# use disabled state for old add-ons, chances are they are broken.
if is_addon_27x:
- sub.label(text="upgrade to 2.8x required")
+ sub.label(text="Upgrade to 2.8x required")
sub.label(icon='ERROR')
# Remove code above after 2.8x migration is complete.
elif info["warning"]:
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index d806a9f9bd8..fcd19c2ca0f 100644
--- a/sour
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list