[Bf-blender-cvs] [d119e163d0a] master: Fix many typos and other issues in UI messages.
Bastien Montagne
noreply at git.blender.org
Mon Feb 17 13:01:29 CET 2020
Commit: d119e163d0a867fe0263d751231b838c57b95b31
Author: Bastien Montagne
Date: Mon Feb 17 13:00:01 2020 +0100
Branches: master
https://developer.blender.org/rBd119e163d0a867fe0263d751231b838c57b95b31
Fix many typos and other issues in UI messages.
===================================================================
M intern/cycles/blender/addon/operators.py
M intern/ghost/intern/GHOST_SystemX11.cpp
M release/scripts/modules/bl_i18n_utils/bl_extract_messages.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_physics_fluid.py
M release/scripts/startup/bl_ui/space_filebrowser.py
M release/scripts/startup/bl_ui/space_outliner.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_defaults.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/mesh/editmesh_mask_extract.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_remesh.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
M source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp
M source/blender/freestyle/intern/stroke/Stroke.h
M source/blender/makesdna/DNA_curveprofile_types.h
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_curveprofile.c
M source/blender/makesrna/intern/rna_fluid.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_layer.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_object_api.c
M source/blender/makesrna/intern/rna_sequencer.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/makesrna/intern/rna_wm_api.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/intern/cycles/blender/addon/operators.py b/intern/cycles/blender/addon/operators.py
index 80bb663330b..3c8e79eaba5 100644
--- a/intern/cycles/blender/addon/operators.py
+++ b/intern/cycles/blender/addon/operators.py
@@ -153,12 +153,12 @@ class CYCLES_OT_denoise_animation(Operator):
self.report({'ERROR'}, str(e))
return {'FINISHED'}
- self.report({'INFO'}, "Denoising completed.")
+ self.report({'INFO'}, "Denoising completed")
return {'FINISHED'}
class CYCLES_OT_merge_images(Operator):
- "Combine OpenEXR multilayer images rendered with different sample" \
+ "Combine OpenEXR multilayer images rendered with different sample " \
"ranges into one image with reduced noise"
bl_idname = "cycles.merge_images"
bl_label = "Merge Images"
diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp
index 2cc515ca3d7..89a2578bd5a 100644
--- a/intern/ghost/intern/GHOST_SystemX11.cpp
+++ b/intern/ghost/intern/GHOST_SystemX11.cpp
@@ -1496,7 +1496,7 @@ void GHOST_SystemX11::processEvent(XEvent *xe)
GHOST_TSuccess GHOST_SystemX11::getModifierKeys(GHOST_ModifierKeys &keys) const
{
- /* analyse the masks retuned from XQueryPointer. */
+ /* Analyze the masks retuned from XQueryPointer. */
memset((void *)m_keyboard_vector, 0, sizeof(m_keyboard_vector));
diff --git a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
index 2034b2ac55c..61c3a8dd52c 100644
--- a/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
+++ b/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
@@ -166,7 +166,8 @@ def print_info(reports, pot):
spell_errors = check_ctxt.get("spell_errors")
# XXX Temp, no multi_rnatip nor py_in_rna, see below.
- keys = multi_lines | not_capitalized | end_point | undoc_ops | spell_errors.keys()
+ # Also, multi-lines tooltips are valid now.
+ keys = not_capitalized | end_point | undoc_ops | spell_errors.keys()
if keys:
_print("WARNINGS:")
for key in keys:
diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py
index c81558db587..e96c94d4f4e 100644
--- a/release/scripts/modules/bl_i18n_utils/settings.py
+++ b/release/scripts/modules/bl_i18n_utils/settings.py
@@ -288,9 +288,14 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"along %s Y",
"along %s Z",
"along local Z",
+ "arccos(A)",
+ "arcsin(A)",
+ "arctan(A)",
"ascii",
"author", # Addons' field. :/
"bItasc",
+ "cos(A)",
+ "cosh(A)",
"dbl-", # Compacted for 'double', for keymap items.
"description", # Addons' field. :/
"dx",
@@ -326,10 +331,15 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"re",
"res",
"rv",
+ "sin(A)",
"sin(x) / x",
+ "sinh(A)",
"sqrt(x*x+y*y+z*z)",
"sRGB",
+ "tan(A)",
+ "tanh(A)",
"utf-8",
+ "uv_on_emitter() requires a modifier from an evaluated object",
"var",
"vBVH",
"view",
@@ -346,6 +356,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"custom matrix",
"custom orientation",
"edge data",
+ "exp(A)",
"expected a timeline/animation area to be active",
"expected a view3d region",
"expected a view3d region & editcurve",
@@ -357,6 +368,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"image format is read-only",
"image path can't be written to",
"in memory to enable editing!",
+ "insufficient content",
"jumps over",
"left",
"local",
@@ -365,6 +377,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = {
"normal",
"right",
"the lazy dog",
+ "trunc(A)",
"unable to load movie clip",
"unable to load text",
"unable to open the file",
@@ -386,11 +399,15 @@ WARN_MSGID_END_POINT_ALLOWED = {
"Circle|Alt .",
"Float Neg. Exp.",
"Max Ext.",
+ "Newer graphics drivers may be available to improve Blender support.",
"Numpad .",
"Pad.",
" RNA Path: bpy.types.",
"Temp. Diff.",
"Temperature Diff.",
+ "The program will now close.",
+ "Your graphics card or driver has limited support. It may work, but with issues.",
+ "Your graphics card or driver is not supported.",
}
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 3418b4af769..052b3de0d7c 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -32,15 +32,18 @@ class SpellChecker:
# These must be all lower case for comparisons
uimsgs = {
# OK words
- "adaptively",
+ "adaptively", "adaptivity",
"aren", # aren't
"betweens", # yuck! in-betweens!
"boolean", "booleans",
+ "chamfer",
"couldn", # couldn't
"decrement",
"derivate",
"deterministically",
"doesn", # doesn't
+ "duplications",
+ "effector",
"equi", # equi-angular, etc.
"fader",
"globbing",
@@ -105,7 +108,7 @@ class SpellChecker:
"deadzone",
"deconstruct",
"defocus",
- "denoise", "denoising",
+ "denoise", "denoised", "denoising", "denoiser",
"deselect", "deselecting", "deselection",
"despill", "despilling",
"dirtree",
@@ -211,7 +214,9 @@ class SpellChecker:
"todo",
"tradeoff",
"un",
+ "unassociate", "unassociated",
"unbake",
+ "unclosed",
"uncomment",
"unculled",
"undeformed",
@@ -230,10 +235,11 @@ class SpellChecker:
"unreferenced",
"unregister",
"unselect", "unselected", "unselectable",
- "unsubdivided", "unsubdivide",
+ "unsets",
"unshadowed",
"unspill",
"unstitchable",
+ "unsubdivided", "unsubdivide",
"untrusted",
"vectorscope",
"whitespace", "whitespaces",
@@ -269,6 +275,7 @@ class SpellChecker:
"scalings",
"selectable", "selectability",
"shaper",
+ "smoothen", "smoothening",
"spherize", "spherized",
"stitchable",
"symmetrize",
@@ -285,10 +292,13 @@ class SpellChecker:
"aero",
"amb",
"anim",
+ "aov",
"app",
"bbox", "bboxes",
+ "bksp", # Backspace
"bool",
"calc",
+ "cfl",
"config", "configs",
"const",
"coord", "coords",
@@ -338,8 +348,12 @@ class SpellChecker:
"subdiv",
"sys",
"tex",
+ "texcoord",
"tmr", # timer
"tri", "tris",
+ "udim", "udims",
+ "upres", # Upresolution
+ "usd",
"uv", "uvs", "uvw", "uw", "uvmap",
"ve",
"vec",
@@ -413,6 +427,7 @@ class SpellChecker:
"vorticity",
"waveform", "waveforms",
"wildcard", "wildcards",
+ "wintab", # Some Windows tablet API
# General computer graphics terms
"anaglyph",
@@ -437,6 +452,7 @@ class SpellChecker:
"cuda",
"deinterlace",
"dropoff",
+ "duotone",
"dv",
"eigenvectors",
"emissive",
@@ -452,6 +468,7 @@ class SpellChecker:
"linearlight",
"lossless", "lossy",
"luminance",
+ "mantaflow",
"matcap",
"midtones",
"mipmap", "mipmaps", "mip",
@@ -466,6 +483,7 @@ class SpellChecker:
"raycasting",
"raytrace", "raytracing", "raytraced",
"refractions",
+ "remesher", "remeshing", "remesh",
"renderfarm",
"scanfill",
"shader", "shaders",
@@ -549,8 +567,9 @@ class SpellChecker:
"shrinkwrap",
"softbody",
"stucci",
- "sunsky",
"subsurf",
+ "subtype",
+ "sunsky",
"tessface", "tessfaces",
"texface",
"timeline", "timelines",
@@ -712,7 +731,7 @@ class SpellChecker:
"gltf",
"gzip",
"ico",
- "jpg", "jpeg",
+ "jpg", "jpeg", "jpegs",
"json",
"matroska",
"mdd",
@@ -724,7 +743,7 @@ class SpellChecker:
"osl",
"oso",
"piz",
- "png",
+ "png", "pngs",
"po",
"quicktime",
"rle",
diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py
index 1eaaeb81772..310f1d6f8dc 100644
--- a/release/scripts/startup/bl_ui/properties_physics_fluid.py
+++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py
@@ -207,7 +207,7 @@ class PHYSICS_PT_settings(PhysicButtonsPanel, Panel):
note = layout.split()
note_flag = False
note.enabled = note_flag
- note.label(icon='INFO', text="Unbaked Guides: Bake Guides or disable them.")
+ note.label(icon='INFO', text="Unbaked Guides: Bake Guides or disable them")
split = layout.split()
split.enabled = note_flag
@@ -724,7 +724,7 @@ class PHYSICS_PT_noise(PhysicButtonsPanel, Panel):
note = layout.split()
note_flag = False
note.enabled = note_flag
- note.label(icon='INFO', text="Unbaked Data: Bake Data first.")
+ note.label(icon='INFO', text="Unbaked Data: Bake Data first")
split = layout.split()
split.enabled = domain.has_cache_baked_data and note_flag
@@ -809,7 +809,7 @@ class PHYSICS_PT_mesh(PhysicButtonsPanel, Panel):
note = layout.split()
note_flag = False
note.enabled = note_flag
- note.label(icon='INFO', text="Unbaked Data: Bake Data first.")
+ note.label(icon='INFO', text="Unbaked Data: Bake Data first")
split = layo
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list