[Bf-blender-cvs] [1ac311cedc1] master: Fix/cleanup another bunch of UI messages issues.
Bastien Montagne
noreply at git.blender.org
Mon Dec 24 12:32:55 CET 2018
Commit: 1ac311cedc1a4694a3dd410776296747f8625e1d
Author: Bastien Montagne
Date: Mon Dec 24 12:31:39 2018 +0100
Branches: master
https://developer.blender.org/rB1ac311cedc1a4694a3dd410776296747f8625e1d
Fix/cleanup another bunch of UI messages issues.
Also (mostly in comments): behaviour -> behavior (we use American English).
===================================================================
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_view3d.py
M source/blender/alembic/intern/abc_customdata.cc
M source/blender/blenfont/intern/blf_font.c
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenlib/intern/list_sort_impl.h
M source/blender/blenlib/intern/path_util.c
M source/blender/blenloader/intern/versioning_270.c
M source/blender/compositor/intern/COM_NodeOperation.h
M source/blender/draw/engines/eevee/eevee_private.h
M source/blender/draw/intern/draw_manager_exec.c
M source/blender/editors/animation/anim_channels_edit.c
M source/blender/editors/animation/anim_filter.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/gpencil/gpencil_select.c
M source/blender/editors/io/io_collada.c
M source/blender/editors/space_action/action_data.c
M source/blender/editors/space_nla/nla_channels.c
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/undo/ed_undo.c
M source/blender/gpu/intern/gpu_codegen.c
M source/blender/makesdna/DNA_gpencil_modifier_types.h
M source/blender/makesrna/intern/rna_curve.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_object_force.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_ui.c
M source/blender/makesrna/intern/rna_wm_api.c
M source/blender/windowmanager/intern/wm_files.c
M tests/gtests/blenlib/BLI_string_utf8_test.cc
===================================================================
diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py
index 8a0170b86d4..9dc0a1ae89e 100644
--- a/release/scripts/modules/bl_i18n_utils/settings.py
+++ b/release/scripts/modules/bl_i18n_utils/settings.py
@@ -331,20 +331,27 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"brown fox",
"can't save image while rendering",
"constructive modifier",
+ "cursor",
+ "custom matrix",
+ "custom orientation",
"edge data",
"expected a timeline/animation area to be active",
"expected a view3d region",
"expected a view3d region & editcurve",
"expected a view3d region & editmesh",
"face data",
+ "gimbal",
+ "global",
"image file not found",
"image format is read-only",
"image path can't be written to",
"in memory to enable editing!",
"jumps over",
"left",
+ "local",
"multi-res modifier",
"non-triangle face",
+ "normal",
"right",
"the lazy dog",
"unable to load movie clip",
@@ -359,7 +366,9 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"unsupported movie clip format",
"vertex data",
"verts only",
+ "view",
"virtual parents",
+ "wmOwnerID '%s' not in workspace '%s'",
}
WARN_MSGID_NOT_CAPITALIZED_ALLOWED |= set(lng[2] for lng in LANGUAGES)
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 f8a23a7deba..87f4ad7f59e 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -32,6 +32,7 @@ class SpellChecker:
# These must be all lower case for comparisons
uimsgs = {
# OK words
+ "adaptively",
"aren", # aren't
"betweens", # yuck! in-betweens!
"boolean", "booleans",
@@ -45,6 +46,7 @@ class SpellChecker:
"hasn", # hasn't
"hetero",
"hoc", # ad-hoc
+ "incompressible",
"indices",
"instantiation",
"iridas",
@@ -56,6 +58,7 @@ class SpellChecker:
"mplayer",
"ons", # add-ons
"pong", # ping pong
+ "smoothen",
"teleport", "teleporting",
"vertices",
@@ -78,6 +81,7 @@ class SpellChecker:
"backscattered",
"bandnoise",
"bindcode",
+ "bitdepth",
"bitflag", "bitflags",
"bitrate",
"blackbody",
@@ -112,9 +116,11 @@ class SpellChecker:
"gridline",
"hardlight",
"hemi",
+ "hostname",
"inbetween",
"inscatter", "inscattering",
"libdata",
+ "lightprobe", "lightprobes",
"lightless",
"lineset",
"linestyle", "linestyles",
@@ -158,6 +164,7 @@ class SpellChecker:
"raytree",
"readonly",
"realtime",
+ "reinject", "reinjected",
"rekey",
"remesh",
"reprojection", "reproject",
@@ -205,11 +212,13 @@ class SpellChecker:
"unhide",
"unindent",
"unkeyed",
+ "unlink", "unlinked",
"unmute",
"unpremultiply",
"unprojected",
"unprotect",
"unreacted",
+ "unreferenced",
"unregister",
"unselected", "unselectable",
"unsubdivided", "unsubdivide",
@@ -233,8 +242,10 @@ class SpellChecker:
"determinator",
"editability",
"effectors",
+ "instancer",
"keyer",
"lacunarity",
+ "linkable",
"numerics",
"occluder", "occluders",
"passepartout",
@@ -244,14 +255,14 @@ class SpellChecker:
"polycount",
"polygonization", "polygonalization", # yuck!
"scalings",
- "selectability",
+ "selectable", "selectability",
"spherize", "spherized",
"stitchable",
"symmetrize",
"trackability",
"transmissivity",
"rasterized", "rasterization", "rasterizer",
- "renderer", "renderable", "renderability",
+ "renderer", "renderers", "renderable", "renderability",
# Really bad!!!
"convertor",
@@ -327,8 +338,10 @@ class SpellChecker:
"affine",
"albedo",
"anamorphic",
+ "anisotropic",
"bitangent",
"boid", "boids",
+ "ceil",
"curvilinear",
"equiangular",
"equisolid",
@@ -337,6 +350,7 @@ class SpellChecker:
"gettext",
"hashable",
"hotspot",
+ "interocular",
"intrinsics",
"irradiance",
"isosurface",
@@ -358,9 +372,11 @@ class SpellChecker:
"photoreceptor",
"poly",
"polyline", "polylines",
+ "probabilistically",
"pulldown", "pulldowns",
"quantized",
"quartic",
+ "quaternion", "quaternions",
"quintic",
"samplerate",
"sawtooth",
@@ -369,6 +385,7 @@ class SpellChecker:
"scroller",
"searchable",
"spacebar",
+ "subtractive",
"tooltip", "tooltips",
"trackpad",
"tuple",
@@ -398,7 +415,7 @@ class SpellChecker:
"collada",
"compositing",
"crossfade",
- "cubemap",
+ "cubemap", "cubemaps",
"cuda",
"deinterlace",
"dropoff",
@@ -463,6 +480,7 @@ class SpellChecker:
"colorband",
"datablock", "datablocks",
"despeckle",
+ "depsgraph",
"dopesheet",
"dupliface", "duplifaces",
"dupliframe", "dupliframes",
@@ -483,6 +501,7 @@ class SpellChecker:
"gpencil",
"idcol",
"keyframe", "keyframes", "keyframing", "keyframed",
+ "lookdev",
"luminocity",
"mathvis",
"metaball", "metaballs", "mball",
@@ -494,6 +513,7 @@ class SpellChecker:
"nabla",
"navmesh",
"outliner",
+ "overscan",
"paintmap", "paintmaps",
"polygroup", "polygroups",
"poselib",
@@ -532,11 +552,14 @@ class SpellChecker:
# Algorithm/library names
"ashikhmin", # Ashikhmin-Shirley
"beckmann",
+ "blackman", # Blackman-Harris
"blosc",
+ "burley", # Christensen-Burley
"catmull",
"catrom",
"chebychev",
"courant",
+ "cryptomatte", "crypto",
"hosek",
"kutta",
"lennard",
@@ -595,6 +618,7 @@ class SpellChecker:
"hh", "mm", "ss", "ff", # hh:mm:ss:ff timecode
"hsv", "hsva", "hsl",
"id",
+ "ies",
"ior",
"itu",
"lhs",
@@ -608,6 +632,7 @@ class SpellChecker:
"precisa",
"px",
"qmc",
+ "rdp",
"rgb", "rgba",
"rhs",
"rv",
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 11aeb741352..65d194e54d2 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -212,7 +212,7 @@ class GreasePencilStrokeEditPanel:
col.operator("gpencil.stroke_subdivide", text="Subdivide")
row = col.row(align=True)
row.operator("gpencil.stroke_simplify_fixed", text="Simplify")
- row.operator("gpencil.stroke_simplify", text="Adaptative")
+ row.operator("gpencil.stroke_simplify", text="Adaptive")
col.separator()
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index b4bf8dcbed0..93f772785a5 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3852,7 +3852,7 @@ class VIEW3D_MT_gpencil_simplify(Menu):
def draw(self, context):
layout = self.layout
layout.operator("gpencil.stroke_simplify_fixed", text="Fixed")
- layout.operator("gpencil.stroke_simplify", text="Adaptative")
+ layout.operator("gpencil.stroke_simplify", text="Adaptive")
class VIEW3D_MT_paint_gpencil(Menu):
@@ -5542,7 +5542,7 @@ class VIEW3D_MT_gpencil_edit_specials(Menu):
layout.operator("gpencil.stroke_smooth", text="Smooth")
layout.operator("gpencil.stroke_subdivide", text="Subdivide")
layout.operator("gpencil.stroke_simplify_fixed", text="Simplify")
- layout.operator("gpencil.stroke_simplify", text="Simplify Adaptative")
+ layout.operator("gpencil.stroke_simplify", text="Simplify Adaptive")
layout.separator()
layout.menu("GPENCIL_MT_separate", text="Separate")
@@ -5588,7 +5588,7 @@ class VIEW3D_MT_gpencil_sculpt_specials(Menu):
layout.operator("gpencil.stroke_subdivide", text="Subdivide")
layout.operator("gpencil.stroke_simplify_fixed", text="Simplify")
- layout.operator("gpencil.stroke_simplify", text="Simplify Adaptative")
+ layout.operator("gpencil.stroke_simplify", text="Simplify Adaptive")
if context.mode == 'WEIGHT_GPENCIL':
layout.separator()
diff --git a/source/blender/alembic/intern/abc_customdata.cc b/source/blender/alembic/intern/abc_customdata.cc
index 96685b6ac3a..da69938f34f 100644
--- a/source/blender/alembic/intern/abc_customdata.cc
+++ b/source/blender/alembic/intern/abc_customdata.cc
@@ -142,7 +142,7 @@ const char *get_uv_sample(UVSample &sample, const CDStreamConfig &config, Custom
/* Convention to write UVs:
* - V2fGeomParam on the arbGeomParam
* - set scope as face varying
- * - (optional due to its behaviour) tag as UV using Alembic::AbcGeom::SetIsUV
+ * - (optional due to its behavior) tag as UV using Alembic::AbcGeom::SetIsUV
*/
static void write_uv(const OCompoundProperty &prop, const CDStreamConfig &config, void *data, const char *name)
{
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index eaf45d91034..c5d39a05c5d 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -86,7 +86,7 @@ static SpinLock ft_lib_m
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list