Fix/cleanup another bunch of UI messages issues.

Also (mostly in comments): behaviour -> behavior (we use American English).
This commit is contained in:
Bastien Montagne 2018-12-24 12:31:39 +01:00
parent 410142caff
commit 1ac311cedc
37 changed files with 86 additions and 48 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -86,7 +86,7 @@ static SpinLock ft_lib_mutex;
/**
* Drawcalls are precious! make them count!
* Since most of the Text elems are not covered by other UI elements, we can
* group some strings together and render them in one drawcall. This behaviour
* group some strings together and render them in one drawcall. This behavior
* is on demand only, between BLF_batch_start() and BLF_batch_end().
**/
static void blf_batch_draw_init(void)

View File

@ -364,7 +364,7 @@ bGPDlayer *BKE_gpencil_layer_addnew(bGPdata *gpd, const char *name, bool setacti
BLI_insertlinkafter(&gpd->layers, gpl_active, gpl);
}
/* annotation vs GP Object behaviour is slightly different */
/* annotation vs GP Object behavior is slightly different */
if (gpd->flag & GP_DATA_ANNOTATIONS) {
/* set default color of new strokes for this layer */
copy_v4_v4(gpl->color, U.gpencil_new_layer_col);

View File

@ -1997,7 +1997,7 @@ static void ob_parbone(Object *ob, Object *par, float mat[4][4])
/* get bone transform */
if (pchan->bone->flag & BONE_RELATIVE_PARENTING) {
/* the new option uses the root - expected behaviour, but differs from old... */
/* the new option uses the root - expected behavior, but differs from old... */
/* XXX check on version patching? */
copy_m4_m4(mat, pchan->chan_mat);
}

View File

@ -226,7 +226,7 @@ BLI_INLINE list_node *sweep_up(struct SortInfo *si, list_node *list, unsigned in
* When inserting higher-ranked lists, we choose to clear out the lower ranks
* in the interests of keeping the sort stable, but this makes analysis harder.
* Note that clearing the lower-ranked lists is `O(length(list))--` thus it
* shouldn't affect the `O(n log n)` behaviour.
* shouldn't affect the `O(n log n)` behavior.
* In other words, inserting one `rank-i` list is equivalent to inserting
* `2**i` `rank-0` lists, thus even if we do `i` additional merges
* in the clearing-out (taking at most `2**i` time) we are still fine.

View File

@ -243,7 +243,7 @@ void BLI_cleanup_path(const char *relabase, char *path)
/* Note: previous version of following call used an offset of 3 instead of 4,
* which meant that the "/../home/me" example actually became "home/me".
* Using offset of 3 gives behaviour consistent with the abovementioned
* Using offset of 3 gives behavior consistent with the abovementioned
* Python routine. */
memmove(path, path + 3, strlen(path + 3) + 1);
}

View File

@ -1515,7 +1515,7 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
if (!DNA_struct_elem_find(fd->filesdna, "FFMpegCodecData", "int", "constant_rate_factor")) {
for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
/* fall back to behaviour from before we introduced CRF for old files */
/* fall back to behavior from before we introduced CRF for old files */
scene->r.ffcodecdata.constant_rate_factor = FFM_CRF_NONE;
}
}

View File

@ -151,7 +151,7 @@ public:
/**
* \brief isOutputOperation determines whether this operation is an output of the ExecutionSystem during rendering or editing.
*
* Default behaviour if not overridden, this operation will not be evaluated as being an output of the ExecutionSystem.
* Default behavior if not overridden, this operation will not be evaluated as being an output of the ExecutionSystem.
*
* \see ExecutionSystem
* \group check

View File

@ -742,7 +742,7 @@ typedef struct EEVEE_LampEngineData {
DrawData dd;
bool need_update;
/* This needs to be out of the union to avoid undefined behaviour. */
/* This needs to be out of the union to avoid undefined behavior. */
short prev_cube_shadow_id;
union {
struct EEVEE_LightData ld;

View File

@ -927,7 +927,7 @@ static void bind_ubo(GPUUniformBuffer *ubo, char bind_type)
return;
}
}
/* printf so user can report bad behaviour */
/* printf so user can report bad behavior */
printf("Not enough ubo slots! This should not happen!\n");
/* This is not depending on user input.
* It is our responsibility to make sure there is enough slots. */

View File

@ -3058,7 +3058,7 @@ static void ANIM_OT_channels_click(wmOperatorType *ot)
ot->flag = OPTYPE_UNDO;
/* properties */
/* NOTE: don't save settings, otherwise, can end up with some weird behaviour (sticky extend) */
/* NOTE: don't save settings, otherwise, can end up with some weird behavior (sticky extend) */
prop = RNA_def_boolean(ot->srna, "extend", false, "Extend Select", ""); // SHIFTKEY
RNA_def_property_flag(prop, PROP_SKIP_SAVE);

View File

@ -2991,7 +2991,7 @@ static size_t animdata_filter_dopesheet(bAnimContext *ac, ListBase *anim_data, b
* to make it easier to predict where items are in the hierarchy
* - This order only really matters if we need to show all channels in the list (e.g. for drawing)
* (XXX: What about lingering "active" flags? The order may now become unpredictable)
* - Don't do this if this behaviour has been turned off (i.e. due to it being too slow)
* - Don't do this if this behavior has been turned off (i.e. due to it being too slow)
* - Don't do this if there's just a single object
*/
if ((filter_mode & ANIMFILTER_LIST_CHANNELS) && !(ads->flag & ADS_FLAG_NO_DB_SORT) &&

View File

@ -479,7 +479,7 @@ int insert_vert_fcurve(FCurve *fcu, float x, float y, eBezTriple_KeyframeType ke
/* set default handle types and interpolation mode */
if (flag & INSERTKEY_NO_USERPREF) {
/* for Py-API, we want scripts to have predictable behaviour,
/* for Py-API, we want scripts to have predictable behavior,
* hence the option to not depend on the userpref defaults
*/
beztr.h1 = beztr.h2 = HD_AUTO_ANIM;
@ -1007,7 +1007,7 @@ bool insert_keyframe_direct(Depsgraph *depsgraph, ReportList *reports, PointerRN
}
}
/* update F-Curve flags to ensure proper behaviour for property type */
/* update F-Curve flags to ensure proper behavior for property type */
update_autoflags_fcurve_direct(fcu, prop);
/* adjust frame on which to add keyframe */
@ -1949,9 +1949,9 @@ static int insert_key_button_exec(bContext *C, wmOperator *op)
/* Special exception for keyframing transforms:
* Set "group" for this manually, instead of having them appearing at the bottom (ungrouped)
* part of the channels list. Leaving these ungrouped is not a nice user behaviour in this case.
* part of the channels list. Leaving these ungrouped is not a nice user behavior in this case.
*
* TODO: Perhaps we can extend this behaviour in future for other properties...
* TODO: Perhaps we can extend this behavior in future for other properties...
*/
if (ptr.type == &RNA_PoseBone) {
bPoseChannel *pchan = (bPoseChannel *)ptr.data;

View File

@ -224,13 +224,13 @@ static GP_Sculpt_Data *gpsculpt_get_brush(Scene *scene, bool is_weight_mode)
/* Brush Operations ------------------------------- */
/* Invert behaviour of brush? */
/* Invert behavior of brush? */
static bool gp_brush_invert_check(tGP_BrushEditData *gso)
{
/* The basic setting is the brush's setting (from the panel) */
bool invert = ((gso->gp_brush->flag & GP_SCULPT_FLAG_INVERT) != 0);
/* During runtime, the user can hold down the Ctrl key to invert the basic behaviour */
/* During runtime, the user can hold down the Ctrl key to invert the basic behavior */
if (gso->flag & GP_SCULPT_FLAG_INVERT) {
invert ^= true;
}

View File

@ -1419,7 +1419,7 @@ static int gpencil_select_exec(bContext *C, wmOperator *op)
return OPERATOR_CANCELLED;
}
/* adjust selection behaviour - for toggle option */
/* adjust selection behavior - for toggle option */
if (toggle) {
deselect = (hit_point->flag & GP_SPOINT_SELECT) != 0;
}

View File

@ -456,7 +456,7 @@ void WM_OT_collada_export(wmOperatorType *ot)
WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA);
RNA_def_enum(func, "prop_bc_export_ui_section", prop_bc_export_ui_section, 0,
"Export Section", "Only for User Interface Organisation");
"Export Section", "Only for User Interface organization");
RNA_def_boolean(func,
"apply_modifiers", 0, "Apply Modifiers",
@ -501,7 +501,7 @@ void WM_OT_collada_export(wmOperatorType *ot)
"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_keyframes", 0,
"Keep Keyframes", "Use existing keyframes as additional sample points.\nThis helps when you want to keep manual tweeks");
"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");

View File

@ -647,7 +647,7 @@ static int action_unlink_exec(bContext *C, wmOperator *op)
static int action_unlink_invoke(bContext *C, wmOperator *op, const wmEvent *evt)
{
/* NOTE: this is hardcoded to match the behaviour for the unlink button (in interface_templates.c) */
/* NOTE: this is hardcoded to match the behavior for the unlink button (in interface_templates.c) */
RNA_boolean_set(op->ptr, "force_delete", evt->shift != 0);
return action_unlink_exec(C, op);
}

View File

@ -557,7 +557,7 @@ static int nla_action_unlink_exec(bContext *C, wmOperator *op)
static int nla_action_unlink_invoke(bContext *C, wmOperator *op, const wmEvent *evt)
{
/* NOTE: this is hardcoded to match the behaviour for the unlink button (in interface_templates.c) */
/* NOTE: this is hardcoded to match the behavior for the unlink button (in interface_templates.c) */
RNA_boolean_set(op->ptr, "force_delete", evt->shift != 0);
return nla_action_unlink_exec(C, op);
}

View File

@ -5059,7 +5059,7 @@ void flushTransGraphData(TransInfo *t)
break;
case SACTSNAP_TSTEP: /* second step */
/* XXX: the handle behaviour in this case is still not quite right... */
/* XXX: the handle behavior in this case is still not quite right... */
td2d->loc[0] = floor(((double)td2d->loc[0] / secf) + 0.5) * secf;
td->loc[0] = floor(((double)td->loc[0] / secf) + 0.5) * secf;
break;

View File

@ -206,7 +206,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 *AFTER* undo step.");
BKE_report(reports, RPT_INFO, "Checking sanity of current .blend file *AFTER* undo step");
BLO_main_validate_libraries(bmain, reports);
}
}

View File

@ -1972,7 +1972,7 @@ void GPU_pass_compile(GPUPass *pass, const char *shname)
shname);
/* NOTE: Some drivers / gpu allows more active samplers than the opengl limit.
* We need to make sure to count active samplers to avoid undefined behaviour. */
* We need to make sure to count active samplers to avoid undefined behavior. */
if (!gpu_pass_shader_validate(pass)) {
if (pass->shader != NULL) {
fprintf(stderr, "GPUShader: error: too many samplers in shader.\n");

View File

@ -280,7 +280,7 @@ typedef struct BuildGpencilModifierData {
float start_delay; /* For each pair of gp keys, number of frames before strokes start appearing */
float length; /* For each pair of gp keys, number of frames that build effect must be completed within */
short flag; /* (eGpencilBuild_Flag) Options for controlling modifier behaviour */
short flag; /* (eGpencilBuild_Flag) Options for controlling modifier behavior */
short mode; /* (eGpencilBuild_Mode) How are strokes ordered */
short transition; /* (eGpencilBuild_Transition) In what order do stroke points appear/disappear */

View File

@ -999,7 +999,7 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna)
RNA_def_property_enum_items(prop, prop_overflow_items);
RNA_def_property_enum_default(prop, CU_OVERFLOW_NONE);
RNA_def_property_ui_text(prop, "Textbox Overflow",
"Handle the text behaviour when it doesn't fit in the text boxes");
"Handle the text behavior when it doesn't fit in the text boxes");
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
/* number values */

View File

@ -1554,7 +1554,7 @@ static void rna_def_modifier_mirror(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_bisect_axis", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_MIR_BISECT_AXIS_X);
RNA_def_property_array(prop, 3);
RNA_def_property_ui_text(prop, "Bisect Axis", "Cuts the mesh across the mirrorplane");
RNA_def_property_ui_text(prop, "Bisect Axis", "Cuts the mesh across the mirror plane");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "use_bisect_flip_axis", PROP_BOOLEAN, PROP_NONE);

View File

@ -3333,9 +3333,13 @@ static const EnumPropertyItem node_hair_items[] = {
};
static const EnumPropertyItem node_principled_hair_items[] = {
{SHD_PRINCIPLED_HAIR_DIRECT_ABSORPTION, "ABSORPTION", 0, "Absorption coefficient", "Directly set the absorption coefficient sigma_a. This is not the most intuitive way to color hair."},
{SHD_PRINCIPLED_HAIR_PIGMENT_CONCENTRATION, "MELANIN", 0, "Melanin concentration", "Define the melanin concentrations below to get the most realistic-looking hair. You can get the concentrations for different types of hair online."},
{SHD_PRINCIPLED_HAIR_REFLECTANCE, "COLOR", 0, "Direct coloring", "Choose the color of your preference, and the shader will approximate the absorption coefficient to render lookalike hair."},
{SHD_PRINCIPLED_HAIR_DIRECT_ABSORPTION, "ABSORPTION", 0, "Absorption coefficient",
"Directly set the absorption coefficient sigma_a (this is not the most intuitive way to color hair)"},
{SHD_PRINCIPLED_HAIR_PIGMENT_CONCENTRATION, "MELANIN", 0, "Melanin concentration",
"Define the melanin concentrations below to get the most realistic-looking hair"
"(you can get the concentrations for different types of hair online)"},
{SHD_PRINCIPLED_HAIR_REFLECTANCE, "COLOR", 0, "Direct coloring",
"Choose the color of your preference, and the shader will approximate the absorption coefficient to render lookalike hair"},
{0, NULL, 0, NULL, NULL}
};

View File

@ -843,7 +843,7 @@ static void rna_def_ptcache_point_caches(BlenderRNA *brna, PropertyRNA *cprop)
/* And define another RNA type for those collection items. */
srna = RNA_def_struct(brna, "PointCacheItem", NULL);
RNA_def_struct_sdna(srna, "PointCache");
RNA_def_struct_ui_text(srna, "Point Cache", "point cache for physics simulations");
RNA_def_struct_ui_text(srna, "Point Cache", "Point cache for physics simulations");
RNA_def_struct_ui_icon(srna, ICON_PHYSICS);
rna_def_pointcache_common(srna);
@ -1603,7 +1603,7 @@ static void rna_def_softbody(BlenderRNA *brna)
prop = RNA_def_property(srna, "spring_length", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "springpreload");
RNA_def_property_range(prop, 0.0f, 200.0f);
RNA_def_property_ui_text(prop, "view_layer", "Alter spring length to shrink/blow up (unit %) 0 to disable");
RNA_def_property_ui_text(prop, "View Layer", "Alter spring length to shrink/blow up (unit %) 0 to disable");
RNA_def_property_update(prop, 0, "rna_softbody_update");
prop = RNA_def_property(srna, "aero", PROP_INT, PROP_NONE);

View File

@ -118,7 +118,7 @@ const EnumPropertyItem rna_enum_uv_sculpt_tool_items[] = {
const EnumPropertyItem rna_enum_snap_target_items[] = {
{SCE_SNAP_TARGET_CLOSEST, "CLOSEST", 0, "Closest", "Snap closest point onto target"},
{SCE_SNAP_TARGET_CENTER, "CENTER", 0, "Center", "Snap transormation center onto target"},
{SCE_SNAP_TARGET_CENTER, "CENTER", 0, "Center", "Snap transformation center onto target"},
{SCE_SNAP_TARGET_MEDIAN, "MEDIAN", 0, "Median", "Snap median onto target"},
{SCE_SNAP_TARGET_ACTIVE, "ACTIVE", 0, "Active", "Snap active onto target"},
{0, NULL, 0, NULL, NULL}

View File

@ -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 substration");
RNA_def_property_ui_text(prop, "Cursor Sub", "Color for the cursor for substraction");
RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0);
prop = RNA_def_property(srna, "use_cursor", PROP_BOOLEAN, PROP_NONE);

View File

@ -3328,7 +3328,7 @@ static void rna_def_space_view3d(BlenderRNA *brna)
prop = RNA_def_property(srna, "icon_from_show_object_viewport", PROP_INT, PROP_NONE);
RNA_def_property_int_funcs(prop, "rna_SpaceView3D_icon_from_show_object_viewport_get", NULL, NULL);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Visibility Iconm", "");
RNA_def_property_ui_text(prop, "Visibility Icon", "");
}
/* Nested Structs */

View File

@ -1234,7 +1234,7 @@ static void rna_def_panel(BlenderRNA *brna)
prop = RNA_def_property(srna, "bl_parent_id", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "type->parent_id");
RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL);
RNA_def_property_ui_text(prop, "Parent ID Name", "If this is set, the panel becomes a subpanel");
RNA_def_property_ui_text(prop, "Parent ID Name", "If this is set, the panel becomes a sub-panel");
prop = RNA_def_property(srna, "bl_ui_units_x", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "type->ui_units_x");

View File

@ -253,7 +253,7 @@ static wmKeyMapItem *rna_KeyMap_item_new_from_item(
/* wmWindowManager *wm = CTX_wm_manager(C); */
if ((km->flag & KEYMAP_MODAL) == (kmi_src->idname[0] != '\0')) {
BKE_report(reports, RPT_ERROR, "Can not mix mondal/non-modal items");
BKE_report(reports, RPT_ERROR, "Can not mix modal/non-modal items");
return NULL;
}

View File

@ -2419,7 +2419,7 @@ static uiBlock *block_create_autorun_warning(struct bContext *C, struct ARegion
uiLayout *sub = uiLayoutRow(col, true);
uiLayoutSetRedAlert(sub, true);
uiItemL(sub, G.autoexec_fail, ICON_BLANK1);
uiItemL(col, IFACE_("This may lead to unexpected behavior."), ICON_BLANK1);
uiItemL(col, IFACE_("This may lead to unexpected behavior"), ICON_BLANK1);
uiItemS(layout);

View File

@ -271,7 +271,7 @@ const char *utf8_invalid_tests[][3] = {
// (to convert between UTF-16LE and UTF-16BE).
// With such internal use of noncharacters, it may be desirable and safer to block those code points in
// UTF-8 decoders, as they should never occur legitimately in incoming UTF-8 data, and could trigger
// unsafe behaviour in subsequent processing.
// unsafe behavior in subsequent processing.
//
// Particularly problematic noncharacters in 16-bit applications:
{"5.3.1 U+FFFE = ef bf be = \"\xef\xbf\xbe\" |",