From 5ba692898e63787a7f394351593d2bc76b97ec5d Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 28 Aug 2023 18:02:03 +0200 Subject: [PATCH] I18N/UI messages fixes. --- scripts/modules/bl_i18n_utils/settings.py | 4 +++ .../bl_i18n_utils/utils_spell_check.py | 26 +++++++++++++++++-- .../blenkernel/intern/particle_system.cc | 2 +- source/blender/editors/screen/screen_edit.cc | 4 +-- .../editors/space_graph/graph_slider_ops.cc | 4 +-- .../blender/io/usd/intern/usd_writer_mesh.cc | 6 ++--- .../blender/makesrna/intern/rna_nodetree.cc | 4 +-- source/blender/makesrna/intern/rna_space.cc | 2 +- .../blender/makesrna/intern/rna_tracking.cc | 2 +- source/blender/makesrna/intern/rna_userdef.cc | 19 ++++++++------ .../nodes/node_shader_bsdf_hair_principled.cc | 8 +++--- .../intern/wm_platform_support.cc | 2 +- 12 files changed, 56 insertions(+), 27 deletions(-) diff --git a/scripts/modules/bl_i18n_utils/settings.py b/scripts/modules/bl_i18n_utils/settings.py index 774a71029da..4c44fa8c79b 100644 --- a/scripts/modules/bl_i18n_utils/settings.py +++ b/scripts/modules/bl_i18n_utils/settings.py @@ -373,6 +373,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "sRGB", "sRGB display space", "sRGB display space with Filmic view transform", + "sRGB IEC 61966-2-1 compound (piece-wise) encoding", "tan(A)", "tanh(A)", "utf-8", @@ -418,6 +419,7 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "in %i hours", "in %i minutes", "in memory to enable editing!", + "in the asset shelf.", "insufficient content", "into", "jumps over", @@ -479,6 +481,8 @@ WARN_MSGID_END_POINT_ALLOWED = { "Your graphics card or driver has limited support. It may work, but with issues.", "Your graphics card or driver is not supported.", "Invalid surface UVs on %d curves.", + "The pose library moved.", + "in the asset shelf.", } PARSER_CACHE_HASH = 'sha1' diff --git a/scripts/modules/bl_i18n_utils/utils_spell_check.py b/scripts/modules/bl_i18n_utils/utils_spell_check.py index d5d1c9bc2e0..9dc08ce5b8f 100644 --- a/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -17,6 +17,7 @@ class SpellChecker: uimsgs = { # OK words "adaptively", "adaptivity", + "al", # et al. "aren", # aren't "betweens", # yuck! in-betweens! "boolean", "booleans", @@ -30,6 +31,7 @@ class SpellChecker: "duplications", "effector", "equi", # equi-angular, etc. + "et", # et al. "fader", "globbing", "gridded", @@ -87,7 +89,7 @@ class SpellChecker: "autoscale", "autosmooth", "autosplit", - "backend", + "backend", "backends", "backface", "backfacing", "backimage", "backscattered", @@ -415,6 +417,7 @@ class SpellChecker: "equiangular", "equisolid", "euler", "eulers", + "eumelanin", "fribidi", "gettext", "hashable", @@ -430,6 +433,7 @@ class SpellChecker: "laplacian", "metadata", "microwatt", "microwatts", + "microflake", "milliwatt", "milliwatts", "msgfmt", "nand", "xnor", @@ -442,6 +446,7 @@ class SpellChecker: "opengl", "openmp", "parametrization", + "pheomelanin", "photoreceptor", "poly", "polyline", "polylines", @@ -484,6 +489,7 @@ class SpellChecker: "bindpose", "binormal", "blackpoint", "whitepoint", + "blendshape", "blendshapes", # USD slang :( "blinn", "bokeh", "catadioptric", @@ -505,6 +511,7 @@ class SpellChecker: "eigenvectors", "emissive", "equirectangular", + "fader", "filmlike", "fisheye", "framerate", @@ -512,6 +519,7 @@ class SpellChecker: "grayscale", "icosahedron", "icosphere", + "illuminant", # CIE illuminant D65 "inpaint", "kerning", "lightmap", @@ -531,9 +539,11 @@ class SpellChecker: "photorealistic", "pinlight", "posterize", + "primvar", "primvars", # USD slang :( "qi", "radiosity", "raycast", "raycasting", + "raymarching", "raytrace", "raytracing", "raytraced", "refractions", "remesher", "remeshing", "remesh", @@ -560,7 +570,8 @@ class SpellChecker: "voxel", "voxels", "vsync", "vulkan", - "wireframe", + "wireframe", "wireframes", + "xforms", # USD slang :( "zmask", "ztransp", @@ -569,6 +580,7 @@ class SpellChecker: "azone", # action zone "backwire", "bbone", + "bdata", "bendy", # bones "bmesh", "breakdowner", @@ -657,12 +669,15 @@ class SpellChecker: "blackman", # Blackman-Harris "blosc", "burley", # Christensen-Burley + "butterworth", "catmull", "catrom", + "chiang", "chebychev", "conrady", # Brown-Conrady "courant", "cryptomatte", "crypto", + "devlin", "embree", "gmp", "hosek", @@ -686,6 +701,7 @@ class SpellChecker: "preetham", "prewitt", "ramer", # Ramer-Douglas-Peucker + "reinhard", "runge", "sobol", "verlet", @@ -706,13 +722,16 @@ class SpellChecker: "avx", "bsdf", "bsdfs", "bssrdf", + "bt", #BT.1886 2.4 Exponent EOTF "bw", "ccd", + "cie", # CIE XYZ color space "cmd", "cmos", "cpus", "ctrl", "cw", "ccw", + "dci", # DCI-P3 D65 "dev", "dls", "djv", @@ -720,6 +739,7 @@ class SpellChecker: "dvar", "dx", "eo", + "eotf", #BT.1886 2.4 Exponent EOTF "ewa", "fh", "fk", @@ -740,6 +760,7 @@ class SpellChecker: "hpg", # Intel Xe-HPG architecture "hsv", "hsva", "hsl", "id", + "iec", # sRGB IEC 61966-2-1 "ies", "ior", "itu", @@ -765,6 +786,7 @@ class SpellChecker: "rgb", "rgba", "ris", "rhs", + "rpp", # Eevee ray-tracing? "rv", "sdf", "sdl", diff --git a/source/blender/blenkernel/intern/particle_system.cc b/source/blender/blenkernel/intern/particle_system.cc index 48442c6f40d..6c48757a167 100644 --- a/source/blender/blenkernel/intern/particle_system.cc +++ b/source/blender/blenkernel/intern/particle_system.cc @@ -4031,7 +4031,7 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra) if (part->fluid->solver == SPH_SOLVER_DDR) { /* Apply SPH forces using double-density relaxation algorithm - * (Clavat et. al.) */ + * (Clavat et al.) */ TaskParallelSettings settings; BLI_parallel_range_settings_defaults(&settings); diff --git a/source/blender/editors/screen/screen_edit.cc b/source/blender/editors/screen/screen_edit.cc index adfb3e91188..c1239458d9a 100644 --- a/source/blender/editors/screen/screen_edit.cc +++ b/source/blender/editors/screen/screen_edit.cc @@ -390,7 +390,7 @@ static bool screen_areas_can_align(bScreen *screen, ScrArea *sa1, ScrArea *sa2, if (area->v3->vec.x - area->v1->vec.x < tolerance && (area->v1->vec.x == xmin || area->v3->vec.x == xmax)) { - WM_report(RPT_ERROR, "A narrow vertical area interferes with this operation."); + WM_report(RPT_ERROR, "A narrow vertical area interferes with this operation"); return false; } } @@ -405,7 +405,7 @@ static bool screen_areas_can_align(bScreen *screen, ScrArea *sa1, ScrArea *sa2, if (area->v3->vec.y - area->v1->vec.y < tolerance && (area->v1->vec.y == ymin || area->v3->vec.y == ymax)) { - WM_report(RPT_ERROR, "A narrow horizontal area interferes with this operation."); + WM_report(RPT_ERROR, "A narrow horizontal area interferes with this operation"); return false; } } diff --git a/source/blender/editors/space_graph/graph_slider_ops.cc b/source/blender/editors/space_graph/graph_slider_ops.cc index d139752949e..9958c580905 100644 --- a/source/blender/editors/space_graph/graph_slider_ops.cc +++ b/source/blender/editors/space_graph/graph_slider_ops.cc @@ -1196,10 +1196,10 @@ static void match_slope_graph_keys(bAnimContext *ac, const float factor) if (!all_segments_valid) { if (factor >= 0) { - WM_report(RPT_WARNING, "You need at least 2 keys to the right side of the selection."); + WM_report(RPT_WARNING, "You need at least 2 keys to the right side of the selection"); } else { - WM_report(RPT_WARNING, "You need at least 2 keys to the left side of the selection."); + WM_report(RPT_WARNING, "You need at least 2 keys to the left side of the selection"); } } diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc index d923b657908..7e5968de5ba 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.cc +++ b/source/blender/io/usd/intern/usd_writer_mesh.cc @@ -147,7 +147,7 @@ static std::optional convert_blender_type_to_usd( case CD_PROP_QUATERNION: return pxr::SdfValueTypeNames->QuatfArray; default: - WM_reportf(RPT_WARNING, "Unsupported type for mesh data."); + WM_reportf(RPT_WARNING, "Unsupported type for mesh data"); return std::nullopt; } } @@ -165,7 +165,7 @@ static const std::optional convert_blender_domain_to_usd( /* Notice: Edge types are not supported in USD! */ default: - WM_reportf(RPT_WARNING, "Unsupported type for mesh data."); + WM_reportf(RPT_WARNING, "Unsupported type for mesh data"); return std::nullopt; } } @@ -243,7 +243,7 @@ void USDGenericMeshWriter::write_generic_data(const Mesh *mesh, if (!prim_varying || !prim_attr_type) { WM_reportf(RPT_WARNING, - "Mesh %s, Attribute %s cannot be converted to USD.", + "Mesh %s, Attribute %s cannot be converted to USD", &mesh->id.name[2], attribute_id.name().data()); return; diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index db3f5da7c7c..0c8213f2483 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -4291,13 +4291,13 @@ static const EnumPropertyItem node_principled_hair_model_items[] = { "CHIANG", 0, "Chiang", - "Near-field hair scattering model by Chiang et. al 2016, suitable for close-up looks, but is " + "Near-field hair scattering model by Chiang et al. 2016, suitable for close-up looks, but is " "more noisy when viewing from a distance"}, {SHD_PRINCIPLED_HAIR_HUANG, "HUANG", 0, "Huang", - "Far-field hair scattering model by Huang et. al 2022, suitable for viewing from a distance, " + "Far-field hair scattering model by Huang et al. 2022, suitable for viewing from a distance, " "supports elliptical cross-sections and has more precise highlight in forward scattering " "directions"}, {0, nullptr, 0, nullptr, nullptr}, diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc index 08f6a6f6410..5f6aea6e555 100644 --- a/source/blender/makesrna/intern/rna_space.cc +++ b/source/blender/makesrna/intern/rna_space.cc @@ -7915,7 +7915,7 @@ static void rna_def_space_clip(BlenderRNA *brna) prop = RNA_def_property(srna, "show_graph_hidden", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "flag", SC_SHOW_GRAPH_HIDDEN); RNA_def_property_ui_text( - prop, "Display Hidden", "Include channels from objects/bone that aren't visible"); + prop, "Display Hidden", "Include channels from objects/bone that are not visible"); RNA_def_property_ui_icon(prop, ICON_GHOST_ENABLED, 0); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, nullptr); diff --git a/source/blender/makesrna/intern/rna_tracking.cc b/source/blender/makesrna/intern/rna_tracking.cc index bf858ccbeb9..8501e12cca2 100644 --- a/source/blender/makesrna/intern/rna_tracking.cc +++ b/source/blender/makesrna/intern/rna_tracking.cc @@ -2534,7 +2534,7 @@ static void rna_def_trackingDopesheet(BlenderRNA *brna) prop = RNA_def_property(srna, "show_hidden", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "flag", TRACKING_DOPE_SHOW_HIDDEN); RNA_def_property_ui_text( - prop, "Display Hidden", "Include channels from objects/bone that aren't visible"); + prop, "Display Hidden", "Include channels from objects/bone that are not visible"); RNA_def_property_ui_icon(prop, ICON_GHOST_ENABLED, 0); RNA_def_property_update(prop, NC_MOVIECLIP | NA_EDITED, "rna_trackingDopesheet_tagUpdate"); } diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index e26a41cc21d..a7ffc0bc842 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -6488,7 +6488,8 @@ static void rna_def_userdef_filepaths_extension_repo(BlenderRNA *brna) srna = RNA_def_struct(brna, "UserExtensionRepo", nullptr); RNA_def_struct_sdna(srna, "bUserExtensionRepo"); RNA_def_struct_clear_flag(srna, STRUCT_UNDO); - RNA_def_struct_ui_text(srna, "Extension Repo", "Settings to define an extension repository"); + RNA_def_struct_ui_text( + srna, "Extension Repository", "Settings to define an extension repository"); prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_property_ui_text(prop, "Name", "Unique repository name"); @@ -6601,7 +6602,8 @@ static void rna_def_userdef_extension_repos_collection(BlenderRNA *brna, Propert RNA_def_property_srna(cprop, "UserExtensionRepoCollection"); srna = RNA_def_struct(brna, "UserExtensionRepoCollection", nullptr); RNA_def_struct_clear_flag(srna, STRUCT_UNDO); - RNA_def_struct_ui_text(srna, "User Extension Repos", "Collection of user extension repos"); + RNA_def_struct_ui_text( + srna, "User Extension Repositories", "Collection of user extension repositories"); func = RNA_def_function(srna, "new", "rna_userdef_extension_repo_new"); RNA_def_function_flag(func, FUNC_NO_SELF); @@ -6615,13 +6617,13 @@ static void rna_def_userdef_extension_repos_collection(BlenderRNA *brna, Propert func, "remote_path", nullptr, sizeof(bUserExtensionRepo::remote_path), "Remote Path", ""); /* return type */ - parm = RNA_def_pointer(func, "repo", "UserExtensionRepo", "", "Newly added repo"); + parm = RNA_def_pointer(func, "repo", "UserExtensionRepo", "", "Newly added repository"); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_userdef_extension_repo_remove"); RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_REPORTS); RNA_def_function_ui_description(func, "Remove repos"); - parm = RNA_def_pointer(func, "repo", "UserExtensionRepo", "", "Repo to remove"); + parm = RNA_def_pointer(func, "repo", "UserExtensionRepo", "", "Repository to remove"); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR); RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, ParameterFlag(0)); } @@ -6842,13 +6844,14 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna) prop = RNA_def_property(srna, "extension_repos", PROP_COLLECTION, PROP_NONE); RNA_def_property_struct_type(prop, "UserExtensionRepo"); - RNA_def_property_ui_text(prop, "Extension Repos", ""); + RNA_def_property_ui_text(prop, "Extension Repositories", ""); rna_def_userdef_extension_repos_collection(brna, prop); prop = RNA_def_property(srna, "active_extension_repo", PROP_INT, PROP_NONE); - RNA_def_property_ui_text(prop, - "Active Extension Repo", - "Index of the extensions repo being edited in the Preferences UI"); + RNA_def_property_ui_text( + prop, + "Active Extension Repository", + "Index of the extensions repository being edited in the Preferences UI"); /* Tag for UI-only update, meaning preferences will not be tagged as changed. */ RNA_def_property_update(prop, 0, "rna_userdef_ui_update"); diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc index 764e8f4039a..7c3ed358330 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc @@ -32,14 +32,14 @@ static void node_declare(NodeDeclarationBuilder &b) "the brownish to black color of eumelanin"); b.add_input("Tint") .default_value({1.0f, 1.0f, 1.0f, 1.0f}) - .description("Additional color used for dyeing the hair."); + .description("Additional color used for dyeing the hair"); b.add_input("Absorption Coefficient") .default_value({0.245531f, 0.52f, 1.365f}) .min(0.0f) .max(1000.0f) .description( "Specifies energy absorption per unit length as light passes through the hair. A higher " - "value leads to a darker color."); + "value leads to a darker color"); b.add_input("Aspect Ratio") .default_value(0.85f) .min(0.0f) @@ -55,7 +55,7 @@ static void node_declare(NodeDeclarationBuilder &b) .min(0.0f) .max(1.0f) .subtype(PROP_FACTOR) - .description("Hair roughness. A low value leads to a metallic look."); + .description("Hair roughness. A low value leads to a metallic look"); b.add_input("Radial Roughness") .default_value(0.3f) .min(0.0f) @@ -69,7 +69,7 @@ static void node_declare(NodeDeclarationBuilder &b) .description( "Simulate a shiny coat by reducing the roughness to the given factor only for the first " "light bounce (diffuse). Range [0, 1] is equivalent to a reduction of [0%, 100%] of the " - "original roughness."); + "original roughness"); b.add_input("IOR").default_value(1.55f).min(0.0f).max(1000.0f).description( "Index of refraction determines how much the ray is bent. At 1.0 rays pass straight through " "like in a transparent material; higher values cause larger deflection in angle. Default " diff --git a/source/blender/windowmanager/intern/wm_platform_support.cc b/source/blender/windowmanager/intern/wm_platform_support.cc index 21d76f8efa7..32c2e98b2fe 100644 --- a/source/blender/windowmanager/intern/wm_platform_support.cc +++ b/source/blender/windowmanager/intern/wm_platform_support.cc @@ -164,7 +164,7 @@ bool WM_platform_support_perform_checks() STR_CONCAT(message, slen, CTX_IFACE_(BLT_I18NCONTEXT_ID_WINDOWMANAGER, - "Your graphics card or macOS version is not supported.")); + "Your graphics card or macOS version is not supported")); STR_CONCAT(message, slen, "\n \n"); STR_CONCAT(message, slen,