Cleanup: First batch of UI messages fixes (typos, final points...).

Also contains some code typo fixes (mostly, adtaptative -> adaptive,
former is nearly innexistant in English, let's stick to simple valid
words ;) ).
This commit is contained in:
2018-12-23 21:58:59 +01:00
parent 064cbe9f3f
commit 1158b9f73a
21 changed files with 81 additions and 41 deletions

View File

@@ -46,6 +46,7 @@ class SpellChecker:
"hetero",
"hoc", # ad-hoc
"indices",
"instantiation",
"iridas",
"isn", # isn't
"iterable",
@@ -53,6 +54,7 @@ class SpellChecker:
"latin",
"merchantability",
"mplayer",
"ons", # add-ons
"pong", # ping pong
"teleport", "teleporting",
"vertices",
@@ -64,6 +66,7 @@ class SpellChecker:
"autocomplete",
"autoexec",
"autoexecution",
"autolock",
"autoname",
"autopack",
"autosave",
@@ -124,6 +127,8 @@ class SpellChecker:
"mixdown",
"multi",
"multifractal",
"multiframe",
"multilayer"
"multipaint",
"multires", "multiresolution",
"multisampling",
@@ -135,6 +140,7 @@ class SpellChecker:
"namespace",
"nodetree", "nodetrees",
"keyconfig",
"offscreen",
"online",
"playhead",
"popup", "popups",
@@ -172,10 +178,12 @@ class SpellChecker:
"startup",
"stateful",
"starfield",
"studiolight",
"subflare", "subflares",
"subframe", "subframes",
"subclass", "subclasses", "subclassing",
"subdirectory", "subdirectories", "subdir", "subdirs",
"subitem",
"submodule", "submodules",
"subpath",
"subsize",
@@ -192,7 +200,7 @@ class SpellChecker:
"uncomment",
"unculled",
"undeformed",
"undistort", "undistortion",
"undistort", "undistorted", "undistortion",
"ungroup", "ungrouped",
"unhide",
"unindent",
@@ -212,6 +220,7 @@ class SpellChecker:
"whitespace", "whitespaces",
"worldspace",
"workflow",
"workspace", "workspaces",
# Neologisms, slangs
"affectable",
@@ -223,6 +232,7 @@ class SpellChecker:
"deformer", "deformers",
"determinator",
"editability",
"effectors",
"keyer",
"lacunarity",
"numerics",
@@ -233,7 +243,9 @@ class SpellChecker:
"pointiness",
"polycount",
"polygonization", "polygonalization", # yuck!
"scalings",
"selectability",
"spherize", "spherized",
"stitchable",
"symmetrize",
"trackability",
@@ -243,6 +255,7 @@ class SpellChecker:
# Really bad!!!
"convertor",
"fullscr",
# Abbreviations
"aero",
@@ -311,8 +324,13 @@ class SpellChecker:
"xy", "xz", "yx", "yz", "zx", "zy",
# General computer/science terms
"affine",
"albedo",
"anamorphic",
"bitangent",
"boid", "boids",
"curvilinear",
"equiangular",
"equisolid",
"euler", "eulers",
"fribidi",
@@ -320,6 +338,7 @@ class SpellChecker:
"hashable",
"hotspot",
"intrinsics",
"irradiance",
"isosurface",
"jitter", "jittering", "jittered",
"keymap", "keymaps",
@@ -330,16 +349,21 @@ class SpellChecker:
"nand", "xnor",
"normals",
"numpad",
"octahedral",
"octree",
"omnidirectional",
"opengl",
"openmp",
"parametrization",
"photoreceptor",
"poly",
"polyline", "polylines",
"pulldown", "pulldowns",
"quantized",
"quartic",
"quintic",
"samplerate",
"sawtooth",
"scrollback",
"scrollbar",
"scroller",
@@ -351,6 +375,8 @@ class SpellChecker:
"unicode",
"viewport", "viewports",
"viscoelastic",
"vorticity",
"waveform", "waveforms",
"wildcard", "wildcards",
# General computer graphics terms
@@ -365,12 +391,14 @@ class SpellChecker:
"bokeh",
"catadioptric",
"centroid",
"chroma",
"chrominance",
"clearcoat",
"codec", "codecs",
"collada",
"compositing",
"crossfade",
"cubemap",
"cuda",
"deinterlace",
"dropoff",
@@ -383,9 +411,11 @@ class SpellChecker:
"grayscale",
"icosphere",
"inpaint",
"kerning",
"lightmap",
"linearlight",
"lossless", "lossy",
"luminance",
"matcap",
"midtones",
"mipmap", "mipmaps", "mip",
@@ -399,9 +429,11 @@ class SpellChecker:
"radiosity",
"raycasting",
"raytrace", "raytracing", "raytraced",
"refractions",
"renderfarm",
"scanfill",
"shader", "shaders",
"shadowmap", "shadowmaps",
"softlight",
"specular", "specularity",
"spillmap",
@@ -411,6 +443,7 @@ class SpellChecker:
"toon",
"timecode",
"vividlight",
"volumetrics",
"voronoi",
"voxel", "voxels",
"vsync",
@@ -420,6 +453,7 @@ class SpellChecker:
# Blender terms
"audaspace",
"azone", # action zone
"bbone",
"bendy", # bones
"bmesh",
@@ -438,12 +472,14 @@ class SpellChecker:
"dyntopo",
"editbone",
"editmode",
"eevee",
"fcurve", "fcurves",
"fedge", "fedges",
"filmic",
"fluidsim",
"freestyle",
"enum", "enums",
"gizmogroup",
"gpencil",
"idcol",
"keyframe", "keyframes", "keyframing", "keyframed",
@@ -464,6 +500,7 @@ class SpellChecker:
"pushpull",
"pyconstraint", "pyconstraints",
"qe", # keys...
"shaderfx",
"shapekey", "shapekeys",
"shrinkfatten",
"shrinkwrap",
@@ -554,7 +591,7 @@ class SpellChecker:
"gpu", "gpus",
"hc",
"hdc",
"hdr",
"hdr", "hdri", "hdris",
"hh", "mm", "ss", "ff", # hh:mm:ss:ff timecode
"hsv", "hsva", "hsl",
"id",
@@ -621,6 +658,7 @@ class SpellChecker:
"fbxnode",
"ffmpeg",
"flac",
"gltf",
"gzip",
"ico",
"jpg", "jpeg",

View File

@@ -106,10 +106,10 @@ class DATA_PT_lens(CameraButtonsPanel, Panel):
col.prop(ccam, "fisheye_fov")
elif ccam.panorama_type == 'EQUIRECTANGULAR':
sub = col.column(align=True)
sub.prop(ccam, "latitude_min", text="Latitute Min")
sub.prop(ccam, "latitude_min", text="Latitude Min")
sub.prop(ccam, "latitude_max", text="Max")
sub = col.column(align=True)
sub.prop(ccam, "longitude_min", text="Longiture Min")
sub.prop(ccam, "longitude_min", text="Longitude Min")
sub.prop(ccam, "longitude_max", text="Max")
elif engine in {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}:
if cam.lens_unit == 'MILLIMETERS':

View File

@@ -357,7 +357,7 @@ class DATA_PT_gpencil_display(DataButtonsPanel, Panel):
layout.prop(gpd, "show_stroke_direction", text="Show Stroke Directions")
layout.prop(gpd, "use_force_fill_recalc", text="Force Fill Update")
layout.prop(gpd, "use_adaptative_uv", text="Adaptative UVs")
layout.prop(gpd, "use_adaptive_uv", text="Adaptive UVs")
class DATA_PT_gpencil_canvas(DataButtonsPanel, Panel):

View File

@@ -264,7 +264,7 @@ def brush_texture_settings(layout, brush, sculpt):
if brush.sculpt_capabilities.has_random_texture_angle:
col.prop(tex_slot, "use_random", text="Random")
if tex_slot.use_random:
col.prop(tex_slot, "random_angle", text="Raandom Angle")
col.prop(tex_slot, "random_angle", text="Random Angle")
else:
col.prop(tex_slot, "use_random", text="Random")
if tex_slot.use_random:

View File

@@ -413,7 +413,7 @@ static void blf_texture5_draw(const unsigned char color_in[4], int tex_w, int te
float ofs[2] = { 2 / (float)tex_w, 2 / (float)tex_h };
float uv_flag[2][2];
copy_v4_v4((float *)uv_flag, (float *)uv);
/* flag the x and y component signs for 5x5 bluring */
/* flag the x and y component signs for 5x5 blurring */
uv_flag[0][0] = -(uv_flag[0][0] - ofs[0]);
uv_flag[0][1] = -(uv_flag[0][1] - ofs[1]);
uv_flag[1][0] = -(uv_flag[1][0] + ofs[0]);
@@ -428,7 +428,7 @@ static void blf_texture3_draw(const unsigned char color_in[4], int tex_w, int te
float ofs[2] = { 1 / (float)tex_w, 1 / (float)tex_h };
float uv_flag[2][2];
copy_v4_v4((float *)uv_flag, (float *)uv);
/* flag the x component sign for 3x3 bluring */
/* flag the x component sign for 3x3 blurring */
uv_flag[0][0] = -(uv_flag[0][0] - ofs[0]);
uv_flag[0][1] = (uv_flag[0][1] - ofs[1]);
uv_flag[1][0] = -(uv_flag[1][0] + ofs[0]);

View File

@@ -275,7 +275,7 @@ void BKE_gpencil_simplify_stroke(bGPDstroke *gps, float factor)
MEM_SAFE_FREE(points2d);
}
/* Simplify alternate vertex of stroke except extrems */
/* Simplify alternate vertex of stroke except extremes */
void BKE_gpencil_simplify_fixed(bGPDstroke *gps)
{
if (gps->totpoints < 5) {

View File

@@ -68,7 +68,7 @@ bool BLO_main_validate_libraries(struct Main *bmain, struct ReportList *reports)
if (id->lib != NULL) {
is_valid = false;
BKE_reportf(reports, RPT_ERROR,
"ID %s is in local database while being linked from library %s!\n", id->name, id->lib->name);
"ID %s is in local database while being linked from library %s!", id->name, id->lib->name);
}
}
}
@@ -77,7 +77,7 @@ bool BLO_main_validate_libraries(struct Main *bmain, struct ReportList *reports)
Library *curlib = curmain->curlib;
if (curlib == NULL) {
BKE_reportf(reports, RPT_ERROR,
"Library database with NULL library datablock!\n");
"Library database with NULL library datablock!");
continue;
}
@@ -86,7 +86,7 @@ bool BLO_main_validate_libraries(struct Main *bmain, struct ReportList *reports)
if (bh == NULL) {
BKE_reportf(reports, RPT_ERROR,
"Library ID %s not found at expected path %s!\n", curlib->id.name, curlib->filepath);
"Library ID %s not found at expected path %s!", curlib->id.name, curlib->filepath);
continue;
}
@@ -100,7 +100,7 @@ bool BLO_main_validate_libraries(struct Main *bmain, struct ReportList *reports)
if (GS(id->name) == ID_LI) {
is_valid = false;
BKE_reportf(reports, RPT_ERROR,
"Library ID %s in library %s, this should not happen!\n", id->name, curlib->name);
"Library ID %s in library %s, this should not happen!", id->name, curlib->name);
continue;
}
@@ -110,13 +110,13 @@ bool BLO_main_validate_libraries(struct Main *bmain, struct ReportList *reports)
if (id->lib == NULL) {
is_valid = false;
BKE_reportf(reports, RPT_ERROR,
"ID %s has NULL lib pointer while being in library %s!\n", id->name, curlib->name);
"ID %s has NULL lib pointer while being in library %s!", id->name, curlib->name);
continue;
}
if (id->lib != curlib) {
is_valid = false;
BKE_reportf(reports, RPT_ERROR,
"ID %s has mismatched lib pointer!\n", id->name);
"ID %s has mismatched lib pointer!", id->name);
continue;
}
@@ -131,7 +131,7 @@ bool BLO_main_validate_libraries(struct Main *bmain, struct ReportList *reports)
if (name == NULL) {
is_valid = false;
BKE_reportf(reports, RPT_ERROR,
"ID %s not found in library %s anymore!\n", id->name, id->lib->name);
"ID %s not found in library %s anymore!", id->name, id->lib->name);
continue;
}
}

View File

@@ -4128,7 +4128,7 @@ bool BLO_write_file(
const int path_list_flag = (BKE_BPATH_TRAVERSE_SKIP_LIBRARY | BKE_BPATH_TRAVERSE_SKIP_MULTIFILE);
if (G.debug & G_DEBUG_IO && mainvar->lock != NULL) {
BKE_report(reports, RPT_INFO, "Checking sanity of current .blend file *BEFORE* save to disk.");
BKE_report(reports, RPT_INFO, "Checking sanity of current .blend file *BEFORE* save to disk");
BLO_main_validate_libraries(mainvar, reports);
}

View File

@@ -184,7 +184,7 @@ void EEVEE_lightcache_info_update(SceneEEVEE *eevee)
if (lcache != NULL) {
if (lcache->flag & LIGHTCACHE_BAKING) {
BLI_strncpy(eevee->light_cache_info, IFACE_("Baking light cache."), sizeof(eevee->light_cache_info));
BLI_strncpy(eevee->light_cache_info, IFACE_("Baking light cache"), sizeof(eevee->light_cache_info));
return;
}
@@ -196,7 +196,7 @@ void EEVEE_lightcache_info_update(SceneEEVEE *eevee)
BLI_snprintf(eevee->light_cache_info, sizeof(eevee->light_cache_info), IFACE_("%d Ref. Cubemaps, %d Irr. Samples (%s in memory)"), lcache->cube_len - 1, irr_samples, formatted_mem);
}
else {
BLI_strncpy(eevee->light_cache_info, IFACE_("No light cache in this scene."), sizeof(eevee->light_cache_info));
BLI_strncpy(eevee->light_cache_info, IFACE_("No light cache in this scene"), sizeof(eevee->light_cache_info));
}
}

View File

@@ -1121,7 +1121,7 @@ void DRW_gpencil_triangulate_stroke_fill(Object *ob, bGPDstroke *gps)
float minv[2];
float maxv[2];
/* first needs bounding box data */
if (gpd->flag & GP_DATA_UV_ADAPTATIVE) {
if (gpd->flag & GP_DATA_UV_ADAPTIVE) {
gpencil_calc_2d_bounding_box(points2d, gps->totpoints, minv, maxv);
}
else {

View File

@@ -2101,7 +2101,8 @@ void GPENCIL_OT_dissolve(wmOperatorType *ot)
ot->flag = OPTYPE_UNDO | OPTYPE_REGISTER;
/* props */
ot->prop = RNA_def_enum(ot->srna, "type", prop_gpencil_dissolve_types, 0, "Type", "Method used for disolving Stroke points");
ot->prop = RNA_def_enum(ot->srna, "type", prop_gpencil_dissolve_types, 0,
"Type", "Method used for dissolving Stroke points");
}
/* ****************** Snapping - Strokes <-> Cursor ************************ */

View File

@@ -321,7 +321,7 @@ void UI_OT_eyedropper_colorband_point(wmOperatorType *ot)
/* identifiers */
ot->name = "Eyedropper colorband (points)";
ot->idname = "UI_OT_eyedropper_colorband_point";
ot->description = "Pointsample a color band";
ot->description = "Point-sample a color band";
/* api callbacks */
ot->invoke = eyedropper_colorband_invoke;

View File

@@ -264,8 +264,8 @@ static void screen_user_menu_draw(const bContext *C, Menu *menu)
MEM_freeN(um_array);
if (is_empty) {
uiItemL(menu->layout, IFACE_("No menu items found."), ICON_NONE);
uiItemL(menu->layout, IFACE_("Right click on buttons to add them to this menu."), ICON_NONE);
uiItemL(menu->layout, IFACE_("No menu items found"), ICON_NONE);
uiItemL(menu->layout, IFACE_("Right click on buttons to add them to this menu"), ICON_NONE);
}
}

View File

@@ -425,7 +425,7 @@ typedef enum eSimplifyGpencil_Mode {
/* Keep only one vertex every n vertices */
GP_SIMPLIFY_FIXED = 0,
/* Use RDP algorithm */
GP_SIMPLIFY_ADAPTATIVE = 1,
GP_SIMPLIFY_ADAPTIVE = 1,
} eSimplifyGpencil_Mode;
typedef struct OffsetGpencilModifierData {

View File

@@ -477,8 +477,8 @@ typedef enum eGPdata_Flag {
GP_DATA_STROKE_FORCE_RECALC = (1 << 17),
/* Special mode drawing polygons */
GP_DATA_STROKE_POLYGON = (1 << 18),
/* Use adaptative UV scales */
GP_DATA_UV_ADAPTATIVE = (1 << 19),
/* Use adaptive UV scales */
GP_DATA_UV_ADAPTIVE = (1 << 19),
/* Autolock not active layers */
GP_DATA_AUTOLOCK_LAYERS = (1 << 20),
/* Internal flag for python update */

View File

@@ -1474,7 +1474,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
prop = RNA_def_property(srna, "xray_mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "xray_mode");
RNA_def_property_enum_items(prop, rna_enum_gpencil_xraymodes_items);
RNA_def_property_ui_text(prop, "Xray", "");
RNA_def_property_ui_text(prop, "X-Ray", "");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
/* Flags */
@@ -1535,9 +1535,9 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Force Fill Update", "Force recalc of fill data after use deformation modifiers (reduce FPS)");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
prop = RNA_def_property(srna, "use_adaptative_uv", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_UV_ADAPTATIVE);
RNA_def_property_ui_text(prop, "Adaptative UV", "Automatic UVs are calculated depending of the stroke size");
prop = RNA_def_property(srna, "use_adaptive_uv", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_UV_ADAPTIVE);
RNA_def_property_ui_text(prop, "Adaptive UV", "Automatic UVs are calculated depending of the stroke size");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
prop = RNA_def_property(srna, "use_autolock_layers", PROP_BOOLEAN, PROP_NONE);

View File

@@ -544,9 +544,9 @@ static void rna_def_modifier_gpencilsimplify(BlenderRNA *brna)
static EnumPropertyItem prop_gpencil_simplify_mode_items[] = {
{GP_SIMPLIFY_FIXED, "FIXED", ICON_IPO_CONSTANT, "Fixed",
"Delete alternative vertices in the stroke, except extrems"},
{GP_SIMPLIFY_ADAPTATIVE, "ADAPTATIVE", ICON_IPO_EASE_IN_OUT, "Adaptative",
"Use a RDP algorithm to simplify" },
"Delete alternative vertices in the stroke, except extremes"},
{GP_SIMPLIFY_ADAPTIVE, "ADAPTIVE", ICON_IPO_EASE_IN_OUT, "Adaptive",
"Use a RDP algorithm to simplify" },
{0, NULL, 0, NULL, NULL}
};

View File

@@ -3157,7 +3157,8 @@ static void rna_def_modifier_bevel(BlenderRNA *brna)
prop = RNA_def_property(srna, "set_wn_strength", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_BEVEL_SET_WN_STR);
RNA_def_property_ui_text(prop, "Face Strength", "Set face strength of beveled faces for use in WN Modifier");
RNA_def_property_ui_text(prop, "Face Strength",
"Set face strength of beveled faces for use in Weighted Normal modifier");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
}

View File

@@ -6238,7 +6238,7 @@ static void rna_def_scene_eevee(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_EEVEE_OVERSCAN);
RNA_def_property_boolean_default(prop, 0);
RNA_def_property_ui_text(prop, "Overscan", "Internally render past the image border to avoid "
"screen-space effects disapearing");
"screen-space effects disappearing");
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
prop = RNA_def_property(srna, "overscan_size", PROP_FLOAT, PROP_PERCENTAGE);

View File

@@ -371,7 +371,7 @@ static void rna_def_shader_fx_rim(BlenderRNA *brna)
RNA_def_property_range(prop, 0.0, 1.0);
RNA_def_property_float_sdna(prop, NULL, "mask_rgb");
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Mask Color", "Color that must be keept");
RNA_def_property_ui_text(prop, "Mask Color", "Color that must be kept");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_ShaderFx_update");
prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
@@ -383,7 +383,7 @@ static void rna_def_shader_fx_rim(BlenderRNA *brna)
prop = RNA_def_property(srna, "blur", PROP_INT, PROP_PIXEL);
RNA_def_property_int_sdna(prop, NULL, "blur");
RNA_def_property_range(prop, 0, INT_MAX);
RNA_def_property_ui_text(prop, "Blur", "Number of pixels for bluring rim (set to 0 to disable)");
RNA_def_property_ui_text(prop, "Blur", "Number of pixels for blurring rim (set to 0 to disable)");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_ShaderFx_update");
prop = RNA_def_property(srna, "samples", PROP_INT, PROP_NONE);
@@ -470,7 +470,7 @@ static void rna_def_shader_fx_shadow(BlenderRNA *brna)
prop = RNA_def_property(srna, "blur", PROP_INT, PROP_PIXEL);
RNA_def_property_int_sdna(prop, NULL, "blur");
RNA_def_property_range(prop, 0, INT_MAX);
RNA_def_property_ui_text(prop, "Blur", "Number of pixels for bluring shadow (set to 0 to disable)");
RNA_def_property_ui_text(prop, "Blur", "Number of pixels for blurring shadow (set to 0 to disable)");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_ShaderFx_update");
prop = RNA_def_property(srna, "samples", PROP_INT, PROP_NONE);
@@ -533,7 +533,7 @@ static void rna_def_shader_fx_glow(BlenderRNA *brna)
prop = RNA_def_property(srna, "radius", PROP_INT, PROP_PIXEL);
RNA_def_property_int_sdna(prop, NULL, "blur[0]");
RNA_def_property_range(prop, 0, INT_MAX);
RNA_def_property_ui_text(prop, "Radius", "Number of pixels for bluring glow (set to 0 to disable)");
RNA_def_property_ui_text(prop, "Radius", "Number of pixels for blurring glow (set to 0 to disable)");
RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_ShaderFx_update");
prop = RNA_def_property(srna, "samples", PROP_INT, PROP_NONE);

View File

@@ -853,7 +853,7 @@ void wm_homefile_read(
app_template, app_template_system, sizeof(app_template_system)))
{
/* Can safely continue with code below, just warn it's not found. */
BKE_reportf(reports, RPT_WARNING, "Application Template '%s' not found.", app_template);
BKE_reportf(reports, RPT_WARNING, "Application Template '%s' not found", app_template);
}
/* Insert template name into startup file. */