Fix/cleanup typos and such in UI messages (and some comments).

This commit is contained in:
Bastien Montagne 2018-12-24 15:02:20 +01:00
parent 64671e53d2
commit 6d89337257
22 changed files with 90 additions and 55 deletions

@ -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,
)

@ -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'

@ -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",

@ -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")

@ -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"]:

@ -4217,7 +4217,7 @@ bool BLO_write_file(
}
if (G.debug & G_DEBUG_IO && mainvar->lock != NULL) {
BKE_report(reports, RPT_INFO, "Checking sanity of current .blend file *AFTER* save to disk.");
BKE_report(reports, RPT_INFO, "Checking sanity of current .blend file *AFTER* save to disk");
BLO_main_validate_libraries(mainvar, reports);
}

@ -424,7 +424,7 @@ void WM_OT_collada_export(wmOperatorType *ot)
static const EnumPropertyItem prop_bc_export_animation_type[] = {
{ BC_ANIMATION_EXPORT_SAMPLES, "sample", 0, "Samples", "Export Sampled points guided by sampling rate" },
{ BC_ANIMATION_EXPORT_KEYS, "keys", 0, "Curves", "Export Curves\n Note: guided by curve keys" },
{ BC_ANIMATION_EXPORT_KEYS, "keys", 0, "Curves", "Export Curves (note: guided by curve keys)" },
{ 0, NULL, 0, NULL, NULL }
};
@ -458,8 +458,7 @@ void WM_OT_collada_export(wmOperatorType *ot)
RNA_def_enum(func, "prop_bc_export_ui_section", prop_bc_export_ui_section, 0,
"Export Section", "Only for User Interface organization");
RNA_def_boolean(func,
"apply_modifiers", 0, "Apply Modifiers",
RNA_def_boolean(func, "apply_modifiers", 0, "Apply Modifiers",
"Apply modifiers to exported mesh (non destructive))");
RNA_def_int(func, "export_mesh_type", 0, INT_MIN, INT_MAX,
@ -485,23 +484,25 @@ void WM_OT_collada_export(wmOperatorType *ot)
RNA_def_boolean(func, "include_animations", true,
"Include Animations", "Export Animations if available.\nExporting Animations will enforce the decomposition of node transforms\ninto <translation> <rotation> and <scale> components");
RNA_def_boolean(func, "include_animations", true, "Include Animations",
"Export animations if available (exporting animations will enforce the decomposition of "
"node transforms into <translation> <rotation> and <scale> components)");
RNA_def_boolean(func, "include_all_actions", true,
"Include all Actions", "Export also unassigned actions.\nThis allows you to export entire animation libraries for your charater(s)");
RNA_def_boolean(func, "include_all_actions", true, "Include all Actions",
"Export also unassigned actions (this allows you to export entire animation libraries for your character(s))");
RNA_def_enum(func, "export_animation_type_selection", prop_bc_export_animation_type, 0,
"Key Type", "Type for exported animations (use sample keys or Curve keys)");
RNA_def_enum(func, "export_animation_type_selection", prop_bc_export_animation_type, 0, "Key Type",
"Type for exported animations (use sample keys or Curve keys)");
RNA_def_int(func, "sampling_rate", 1, 1, INT_MAX,
"Sampling Rate", "The distance between 2 keyframes. 1 means: Every frame is keyed", 1, INT_MAX);
RNA_def_int(func, "sampling_rate", 1, 1, INT_MAX, "Sampling Rate",
"The distance between 2 keyframes (1 to key every frame)", 1, INT_MAX);
RNA_def_boolean(func, "keep_smooth_curves", 0,
"Keep Smooth curves", "Export also the curve handles (if available).\nThis does only work when the inverse parent matrix is the Unity matrix\nOtherwise you may end up with odd results\n");
RNA_def_boolean(func, "keep_smooth_curves", 0, "Keep Smooth curves",
"Export also the curve handles (if available) (this does only work when the inverse parent matrix "
"is the unity matrix, otherwise you may end up with odd results)");
RNA_def_boolean(func, "keep_keyframes", 0,
"Keep Keyframes", "Use existing keyframes as additional sample points (this helps when you want to keep manual tweaks)");
RNA_def_boolean(func, "keep_keyframes", 0, "Keep Keyframes",
"Use existing keyframes as additional sample points (this helps when you want to keep manual tweaks)");
RNA_def_boolean(func, "active_uv_only", 0, "Only Selected UV Map",
"Export only the selected UV Map");
@ -522,21 +523,20 @@ void WM_OT_collada_export(wmOperatorType *ot)
RNA_def_boolean(func, "sort_by_name", 0, "Sort by Object name",
"Sort exported data by Object name");
RNA_def_int(func, "export_transformation_type", 0, INT_MIN, INT_MAX,
"Transform", "Transformation type for translation, scale and rotation", INT_MIN, INT_MAX);
RNA_def_int(func, "export_transformation_type", 0, INT_MIN, INT_MAX, "Transform",
"Transformation type for translation, scale and rotation", INT_MIN, INT_MAX);
RNA_def_enum(func, "export_transformation_type_selection", prop_bc_export_transformation_type, 0,
"Transform", "Transformation type for translation, scale and rotation");
RNA_def_enum(func, "export_transformation_type_selection", prop_bc_export_transformation_type, 0, "Transform",
"Transformation type for translation, scale and rotation");
RNA_def_boolean(func, "open_sim", 0, "Export to SL/OpenSim",
"Compatibility mode for SL, OpenSim and other compatible online worlds");
RNA_def_boolean(func, "limit_precision", 0,
"Limit Precision", "Reduce the precision of the exported data to 6 digits");
RNA_def_boolean(func, "keep_bind_info", 0,
"Keep Bind Info", "Store Bindpose information in custom bone properties for later use during Collada export");
RNA_def_boolean(func, "limit_precision", 0, "Limit Precision",
"Reduce the precision of the exported data to 6 digits");
RNA_def_boolean(func, "keep_bind_info", 0, "Keep Bind Info",
"Store Bindpose information in custom bone properties for later use during Collada export");
}

@ -4703,7 +4703,7 @@ static void SCREEN_OT_space_type_set_or_cycle(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Cycle Space Type Set";
ot->description = "Set the space type or cycle subtype";
ot->description = "Set the space type or cycle sub-type";
ot->idname = "SCREEN_OT_space_type_set_or_cycle";
/* api callbacks */

@ -527,7 +527,7 @@ static int project_brush_radius(
cross_v3_v3v3(ortho, nonortho, view);
normalize_v3(ortho);
/* make a point on the surface of the brush tagent to the view */
/* make a point on the surface of the brush tangent to the view */
mul_v3_fl(ortho, radius);
add_v3_v3v3(offset, location, ortho);

@ -2629,7 +2629,7 @@ void NODE_OT_cryptomatte_layer_remove(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Remove Cryptomatte Socket";
ot->description = "Remove layer from a Crytpomatte node";
ot->description = "Remove layer from a Cryptomatte node";
ot->idname = "NODE_OT_cryptomatte_layer_remove";
/* callbacks */

@ -125,7 +125,7 @@ static int ed_undo_step(bContext *C, int step, const char *undoname, ReportList
if (G.debug & G_DEBUG_IO) {
Main *bmain = CTX_data_main(C);
if (bmain->lock != NULL) {
BKE_report(reports, RPT_INFO, "Checking sanity of current .blend file *BEFORE* undo step.");
BKE_report(reports, RPT_INFO, "Checking sanity of current .blend file *BEFORE* undo step");
BLO_main_validate_libraries(bmain, reports);
}
}

@ -2743,8 +2743,8 @@ void UV_OT_stitch(wmOperatorType *ot)
RNA_def_property_flag(prop, PROP_HIDDEN);
/* test should not be editable or viewed in toolbar */
prop = RNA_def_int_array(ot->srna, "objects_selection_count", 1, NULL, 0, INT_MAX, "objects_selection_count",
"objects_selection_count", 0, INT_MAX);
prop = RNA_def_int_array(ot->srna, "objects_selection_count", 1, NULL, 0, INT_MAX, "Objects Selection Count",
"", 0, INT_MAX);
RNA_def_property_array(prop, 6);
RNA_def_property_flag(prop, PROP_HIDDEN);
}

@ -41,7 +41,7 @@ PyDoc_STRVAR(MediumType_doc,
"media-medium:\n"
"\n"
"* Stroke.DRY_MEDIUM: To simulate a dry medium such as Pencil or Charcoal.\n"
"* Stroke.HUMID_MEDIUM: To simulate ink painting (color substraction blending).\n"
"* Stroke.HUMID_MEDIUM: To simulate ink painting (color subtraction blending).\n"
"* Stroke.OPAQUE_MEDIUM: To simulate an opaque medium (oil, spray...).");
PyTypeObject MediumType_Type = {

@ -522,7 +522,7 @@ public: // Implementation of Interface1D
/*! The different blending modes available to similate the interaction media-medium. */
typedef enum {
DRY_MEDIUM, /*!< To simulate a dry medium such as Pencil or Charcoal.*/
HUMID_MEDIUM, /*!< To simulate ink painting (color substraction blending).*/
HUMID_MEDIUM, /*!< To simulate ink painting (color subtraction blending).*/
OPAQUE_MEDIUM, /*!< To simulate an opaque medium (oil, spray...).*/
} MediumType;

@ -1986,13 +1986,13 @@ bool RNA_property_editable_info(PointerRNA *ptr, PropertyRNA *prop, const char *
if (id) {
if (ID_IS_LINKED(id) && (prop->flag & PROP_LIB_EXCEPTION) == 0) {
if (!(*r_info)[0]) {
*r_info = N_("Can't edit this property from a linked data-block.");
*r_info = N_("Can't edit this property from a linked data-block");
}
return false;
}
if (id->override_static != NULL && !RNA_property_overridable_get(ptr, prop)) {
if (!(*r_info)[0]) {
*r_info = N_("Can't edit this property from an override data-block.");
*r_info = N_("Can't edit this property from an override data-block");
}
return false;
}

@ -1089,7 +1089,7 @@ static void rna_def_modifier_gpencilinstance(BlenderRNA *brna)
prop = RNA_def_property(srna, "shift", PROP_FLOAT, PROP_TRANSLATION);
RNA_def_property_float_sdna(prop, NULL, "shift");
RNA_def_property_ui_text(prop, "Shift", "Shiftness value");
RNA_def_property_ui_text(prop, "Shift", "Shiftiness value");
RNA_def_property_ui_range(prop, -FLT_MAX, FLT_MAX, 1, RNA_TRANSLATION_PREC_DEFAULT);
RNA_def_property_update(prop, 0, "rna_GpencilModifier_update");

@ -188,7 +188,7 @@ static void rna_def_lightprobe(BlenderRNA *brna)
RNA_def_property_float_sdna(prop, NULL, "vis_blur");
RNA_def_property_float_default(prop, 0.2f);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Visibility Blur", "Filter size of the visibilty blur");
RNA_def_property_ui_text(prop, "Visibility Blur", "Filter size of the visibility blur");
RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING, "rna_LightProbe_recalc");
prop = RNA_def_property(srna, "intensity", PROP_FLOAT, PROP_NONE);

@ -4433,7 +4433,7 @@ static void def_sh_displacement(StructRNA *srna)
static void def_sh_vector_displacement(StructRNA *srna)
{
static const EnumPropertyItem prop_space_items[] = {
{SHD_SPACE_TANGENT, "TANGENT", 0, "Tangent Space", "Tagent space vector displacement mapping"},
{SHD_SPACE_TANGENT, "TANGENT", 0, "Tangent Space", "Tangent space vector displacement mapping"},
{SHD_SPACE_OBJECT, "OBJECT", 0, "Object Space", "Object space vector displacement mapping"},
{SHD_SPACE_WORLD, "WORLD", 0, "World Space", "World space vector displacement mapping"},
{0, NULL, 0, NULL, NULL}

@ -3170,7 +3170,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
prop = RNA_def_property(srna, "twist", PROP_FLOAT, PROP_NONE);
RNA_def_property_range(prop, -100000.0f, 100000.0f);
RNA_def_property_ui_range(prop, -10.0f, 10.0f, 0.1, 3);
RNA_def_property_ui_text(prop, "Twist", "Number of turns around parent allong the strand");
RNA_def_property_ui_text(prop, "Twist", "Number of turns around parent along the strand");
RNA_def_property_update(prop, 0, "rna_Particle_redo_child");
prop = RNA_def_property(srna, "use_twist_curve", PROP_BOOLEAN, PROP_NONE);

@ -1360,7 +1360,7 @@ static void rna_def_gpencil_sculpt(BlenderRNA *brna)
RNA_def_property_array(prop, 3);
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_float_array_default(prop, default_2);
RNA_def_property_ui_text(prop, "Cursor Sub", "Color for the cursor for substraction");
RNA_def_property_ui_text(prop, "Cursor Sub", "Color for the cursor for subtraction");
RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0);
prop = RNA_def_property(srna, "use_cursor", PROP_BOOLEAN, PROP_NONE);

@ -53,7 +53,7 @@ const EnumPropertyItem rna_enum_object_shaderfx_type_items[] = {
{eShaderFxType_Colorize, "FX_COLORIZE", ICON_SHADERFX, "Colorize", "Apply different tint effects" },
{eShaderFxType_Flip, "FX_FLIP", ICON_SHADERFX, "Flip", "Flip image" },
{eShaderFxType_Glow, "FX_GLOW", ICON_SHADERFX, "Glow", "Create a glow effect" },
{eShaderFxType_Light, "FX_LIGHT", ICON_SHADERFX, "Light", "Simulate ilumination" },
{eShaderFxType_Light, "FX_LIGHT", ICON_SHADERFX, "Light", "Simulate illumination" },
{eShaderFxType_Pixel, "FX_PIXEL", ICON_SHADERFX, "Pixelate", "Pixelate image"},
{eShaderFxType_Rim, "FX_RIM", ICON_SHADERFX, "Rim", "Add a rim to the image" },
{eShaderFxType_Shadow, "FX_SHADOW", ICON_SHADERFX, "Shadow", "Create a shadow effect"},

@ -76,7 +76,7 @@ TEST(math_base, CompareFFRelativeZero)
/* Note: in theory, this should return false, since 0.0f and -0.0f have 0x80000000 diff,
* but overflow in substraction seems to break something here
* but overflow in subtraction seems to break something here
* (abs(*(int *)&fn0 - *(int *)&f0) == 0x80000000 == fn0), probably because int32 cannot hold this abs value.
* this is yet another illustration of why one shall never use (near-)zero floats in pure-ULP comparison. */
// EXPECT_FALSE(compare_ff_relative(fn0, f0, -1.0f, 1024));