diff options
40 files changed, 156 insertions, 116 deletions
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 = layout.split() split.enabled = domain.has_cache_baked_data and note_flag @@ -921,7 +921,7 @@ class PHYSICS_PT_particles(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 = ( diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 8dd0eaf5445..8ff85459d35 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -275,7 +275,7 @@ class FILEBROWSER_PT_bookmarks_recents(Panel): bl_space_type = 'FILE_BROWSER' bl_region_type = 'TOOLS' bl_category = "Bookmarks" - bl_label = "Recents" + bl_label = "Recent" @classmethod def poll(cls, context): diff --git a/release/scripts/startup/bl_ui/space_outliner.py b/release/scripts/startup/bl_ui/space_outliner.py index 11fb20d8b38..6ac31aeb3d0 100644 --- a/release/scripts/startup/bl_ui/space_outliner.py +++ b/release/scripts/startup/bl_ui/space_outliner.py @@ -19,6 +19,10 @@ # <pep8 compliant> import bpy from bpy.types import Header, Menu, Panel +from bpy.app.translations import ( + contexts as i18n_contexts, + pgettext_iface as iface_, +) class OUTLINER_HT_header(Header): @@ -279,8 +283,10 @@ class OUTLINER_MT_object(Menu): if object_mode in {'EDIT', 'POSE'}: name = bpy.types.Object.bl_rna.properties["mode"].enum_items[object_mode].name - layout.operator("outliner.object_operation", text=f"{name:s} Set").type = 'OBJECT_MODE_ENTER' - layout.operator("outliner.object_operation", text=f"{name:s} Clear").type = 'OBJECT_MODE_EXIT' + layout.operator("outliner.object_operation", + text=iface_("%s Set", i18n_contexts.operator_default) % name).type = 'OBJECT_MODE_ENTER' + layout.operator("outliner.object_operation", + text=iface_("%s Clear", i18n_contexts.operator_default) % name).type = 'OBJECT_MODE_EXIT' del name layout.separator() diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index 1cb3829708a..788350025b9 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -1115,11 +1115,11 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): if i == strip.multicam_source: sub = row.row(align=True) sub.enabled = False - sub.operator("sequencer.cut_multicam", text=f"{i:d}").camera = i + sub.operator("sequencer.cut_multicam", text="%d" % i).camera = i else: sub_1 = row.row(align=True) sub_1.enabled = True - sub_1.operator("sequencer.cut_multicam", text=f"{i:d}").camera = i + sub_1.operator("sequencer.cut_multicam", text="%d" % i).camera = i if strip.channel > BT_ROW and (strip_channel - 1) % BT_ROW: for i in range(strip.channel, strip_channel + ((BT_ROW + 1 - strip_channel) % BT_ROW)): diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index 16485833ab2..cd1fc49ac8b 100644 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@ -125,7 +125,7 @@ class _defs_view3d_generic: "\u2022 Drag ruler segment to measure an angle.\n" "\u2022 {} to remove the active ruler.\n" "\u2022 Ctrl while dragging to snap.\n" - "\u2022 Shift while dragging to measure surface thickness." + "\u2022 Shift while dragging to measure surface thickness" ).format( kmi_to_string_or_none(kmi_add), kmi_to_string_or_none(kmi_remove), diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index ad5e7b5442c..a4e8ce0f3e3 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1837,7 +1837,7 @@ class USERPREF_PT_addons(AddOnPanel, 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"]: diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index c074069af06..cf1b99cee89 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -706,7 +706,7 @@ class VIEW3D_PT_tools_brush_falloff(Panel, View3DPaintPanel, FalloffPanel): class VIEW3D_PT_tools_brush_falloff_frontface(View3DPaintPanel, Panel): bl_context = ".imagepaint" # dot on purpose (access from topbar) - bl_label = "Frontface Falloff" + bl_label = "Front-face Falloff" bl_parent_id = "VIEW3D_PT_tools_brush_falloff" bl_options = {'DEFAULT_CLOSED'} diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 48416736ce3..51e8f080b15 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5391,8 +5391,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb, Object *ob) blo_reportf_wrap( fd->reports, RPT_WARNING, - TIP_( - "Possible data loss when saving this file! %s modifier is deprecated (Object: %s)."), + TIP_("Possible data loss when saving this file! %s modifier is deprecated (Object: %s)"), md->name, ob->id.name + 2); md = modifier_replace_with_fluid(fd, ob, lb, md); @@ -5402,8 +5401,7 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb, Object *ob) blo_reportf_wrap( fd->reports, RPT_WARNING, - TIP_( - "Possible data loss when saving this file! %s modifier is deprecated (Object: %s)."), + TIP_("Possible data loss when saving this file! %s modifier is deprecated (Object: %s)"), md->name, ob->id.name + 2); md = modifier_replace_with_fluid(fd, ob, lb, md); diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index 41bf2dfe578..3e484281f3b 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -534,7 +534,7 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template) brush->sculpt_tool = SCULPT_TOOL_POSE; } - brush_name = "Multiplane Scrape"; + brush_name = "Multi-plane Scrape"; brush = BLI_findstring(&bmain->brushes, brush_name, offsetof(ID, name) + 2); if (!brush) { brush = BKE_brush_add(bmain, brush_name, OB_MODE_SCULPT); diff --git a/source/blender/editors/gpencil/gpencil_fill.c b/source/blender/editors/gpencil/gpencil_fill.c index d3811a61b2a..3feec7a5801 100644 --- a/source/blender/editors/gpencil/gpencil_fill.c +++ b/source/blender/editors/gpencil/gpencil_fill.c @@ -1372,7 +1372,7 @@ static int gpencil_fill_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSE } } if (!valid) { - BKE_report(op->reports, RPT_ERROR, "Fill tool needs active material."); + BKE_report(op->reports, RPT_ERROR, "Fill tool needs active material"); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index fcb51838d59..6feabd15daa 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -813,7 +813,7 @@ static void template_ID(bContext *C, } if (text) { - /* Add label resepecting the seperated layout property split state. */ + /* Add label resepecting the separated layout property split state. */ layout = uiItemL_respect_property_split(layout, text, ICON_NONE); } @@ -4607,7 +4607,7 @@ static uiBlock *CurveProfile_presets_func(bContext *C, ARegion *ar, CurveProfile UI_BTYPE_BUT_MENU, 1, ICON_BLANK1, - IFACE_("Cornice Moulding"), + IFACE_("Cornice Molding"), 0, yco -= UI_UNIT_Y, menuwidth, @@ -4622,7 +4622,7 @@ static uiBlock *CurveProfile_presets_func(bContext *C, ARegion *ar, CurveProfile UI_BTYPE_BUT_MENU, 1, ICON_BLANK1, - IFACE_("Crown Moulding"), + IFACE_("Crown Molding"), 0, yco -= UI_UNIT_Y, menuwidth, diff --git a/source/blender/editors/mesh/editmesh_mask_extract.c b/source/blender/editors/mesh/editmesh_mask_extract.c index cb67cb404e4..e604248874a 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.c +++ b/source/blender/editors/mesh/editmesh_mask_extract.c @@ -63,7 +63,7 @@ static bool paint_mask_extract_poll(bContext *C) Object *ob = CTX_data_active_object(C); if (ob != NULL && ob->mode == OB_MODE_SCULPT) { if (ob->sculpt->bm) { - CTX_wm_operator_poll_msg_set(C, "The mask can not be extracted with dyntopo activated."); + CTX_wm_operator_poll_msg_set(C, "The mask can not be extracted with dyntopo activated"); return false; } else { diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 5cc9f70b9af..e99c7543bf3 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2378,8 +2378,7 @@ static int convert_exec(bContext *C, wmOperator *op) else if (target == OB_GPENCIL) { if (ob->type != OB_CURVE) { ob->flag &= ~OB_DONE; - BKE_report( - op->reports, RPT_ERROR, "Convert Surfaces to Grease Pencil is not supported."); + BKE_report(op->reports, RPT_ERROR, "Convert Surfaces to Grease Pencil is not supported"); } else { /* Create a new grease pencil object and copy transformations. diff --git a/source/blender/editors/object/object_remesh.c b/source/blender/editors/object/object_remesh.c index 70e3c93cbd9..f6e80df7cd8 100644 --- a/source/blender/editors/object/object_remesh.c +++ b/source/blender/editors/object/object_remesh.c @@ -83,18 +83,18 @@ static bool object_remesh_poll(bContext *C) } if (BKE_object_is_in_editmode(ob)) { - CTX_wm_operator_poll_msg_set(C, "The remesher cannot run from edit mode."); + CTX_wm_operator_poll_msg_set(C, "The remesher cannot run from edit mode"); return false; } if (ob->mode == OB_MODE_SCULPT && ob->sculpt->bm) { - CTX_wm_operator_poll_msg_set(C, "The remesher cannot run with dyntopo activated."); + CTX_wm_operator_poll_msg_set(C, "The remesher cannot run with dyntopo activated"); return false; } if (modifiers_usesMultires(ob)) { CTX_wm_operator_poll_msg_set( - C, "The remesher cannot run with a Multires modifier in the modifier stack."); + C, "The remesher cannot run with a Multires modifier in the modifier stack"); return false; } @@ -109,7 +109,7 @@ static int voxel_remesh_exec(bContext *C, wmOperator *op) Mesh *new_mesh; if (mesh->remesh_voxel_size <= 0.0f) { - BKE_report(op->reports, RPT_ERROR, "Voxel remesher cannot run with a voxel size of 0.0."); + BKE_report(op->reports, RPT_ERROR, "Voxel remesher cannot run with a voxel size of 0.0"); return OPERATOR_CANCELLED; } @@ -122,7 +122,7 @@ static int voxel_remesh_exec(bContext *C, wmOperator *op) mesh, mesh->remesh_voxel_size, mesh->remesh_voxel_adaptivity, isovalue); if (!new_mesh) { - BKE_report(op->reports, RPT_ERROR, "Voxel remesher failed to create mesh."); + BKE_report(op->reports, RPT_ERROR, "Voxel remesher failed to create mesh"); return OPERATOR_CANCELLED; } @@ -461,18 +461,18 @@ static void quadriflow_end_job(void *customdata) switch (qj->success) { case 1: DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); - WM_reportf(RPT_INFO, "QuadriFlow: Completed remeshing!"); + WM_reportf(RPT_INFO, "QuadriFlow: Remeshing completed"); break; case 0: - WM_reportf(RPT_ERROR, "QuadriFlow: remeshing failed!"); + WM_reportf(RPT_ERROR, "QuadriFlow: Remeshing failed"); break; case -1: - WM_report(RPT_WARNING, "QuadriFlow: remeshing canceled!"); + WM_report(RPT_WARNING, "QuadriFlow: Remeshing cancelled"); break; case -2: WM_report(RPT_WARNING, "QuadriFlow: The mesh needs to be manifold and have face normals that point in a " - "consistent direction."); + "consistent direction"); break; } } @@ -640,7 +640,7 @@ void OBJECT_OT_quadriflow_remesh(wmOperatorType *ot) "use_paint_symmetry", true, "Use Paint Symmetry", - "Generates a symmetrycal mesh using the paint symmetry configuration"); + "Generates a symmetrical mesh using the paint symmetry configuration"); RNA_def_boolean(ot->srna, "use_preserve_sharp", diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 880ad147403..f03da21e02a 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -6864,7 +6864,7 @@ static const char *sculpt_tool_name(Sculpt *sd) case SCULPT_TOOL_POSE: return "Pose Brush"; case SCULPT_TOOL_MULTIPLANE_SCRAPE: - return "Multiplane Scrape Brush"; + return "Multi-plane Scrape Brush"; case SCULPT_TOOL_SLIDE_RELAX: return "Slide/Relax Brush"; } @@ -10458,7 +10458,7 @@ static int sculpt_mask_expand_invoke(bContext *C, wmOperator *op, const wmEvent BKE_pbvh_parallel_range(0, ss->filter_cache->totnode, &data, sculpt_expand_task_cb, &settings); const char *status_str = TIP_( - "Move the mouse to expand the mask from the active vertex. LBM: confirm mask, ESC/RMB: " + "Move the mouse to expand the mask from the active vertex. LMB: confirm mask, ESC/RMB: " "cancel"); ED_workspace_status_text(C, status_str); diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index eafd89620dc..3d7cf1037e1 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -2218,7 +2218,7 @@ static int outliner_orphans_purge_invoke(bContext *C, wmOperator *op, const wmEv RNA_int_set(op->ptr, "num_deleted", num_tagged[INDEX_ID_NULL]); if (num_tagged[INDEX_ID_NULL] == 0) { - BKE_report(op->reports, RPT_INFO, "No orphanned data-blocks to purge"); + BKE_report(op->reports, RPT_INFO, "No orphaned data-blocks to purge"); return OPERATOR_CANCELLED; } @@ -2265,7 +2265,7 @@ static int outliner_orphans_purge_exec(bContext *C, wmOperator *op) FOREACH_MAIN_ID_END; if (num_tagged[INDEX_ID_NULL] == 0) { - BKE_report(op->reports, RPT_INFO, "No orphanned data-blocks to purge"); + BKE_report(op->reports, RPT_INFO, "No orphaned data-blocks to purge"); return OPERATOR_CANCELLED; } } diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 9a8e74385bb..34c2a5d6831 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3632,7 +3632,7 @@ static int view3d_zoom_border_exec(bContext *C, wmOperator *op) /* ignore dist_range min */ dist_range[0] = v3d->clip_start * 1.5f; } - else { /* othographic */ + else { /* orthographic */ /* find the current window width and height */ vb[0] = ar->winx; vb[1] = ar->winy; diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp index 444a69adf30..661d9238edb 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp @@ -262,7 +262,7 @@ PyDoc_STRVAR(Stroke_stroke_vertices_begin_doc, ".. method:: stroke_vertices_begin(t=0.0)\n" "\n" " Returns a StrokeVertexIterator pointing on the first StrokeVertex of\n" - " the Stroke. One can specify a sampling value to resample the Stroke\n" + " the Stroke. One can specify a sampling value to re-sample the Stroke\n" " on the fly if needed.\n" "\n" " :arg t: The resampling value with which we want our Stroke to be\n" diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp index 2c014c86d36..d969e0e50a3 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp @@ -417,7 +417,7 @@ int BezierCurveShader::shade(Stroke &stroke) const } } - // Resample the Stroke depending on the number of vertices of the bezier curve: + // Re-sample the Stroke depending on the number of vertices of the bezier curve: int originalSize = CurveVertices.size(); #if 0 float sampling = stroke.ComputeSampling(originalSize); diff --git a/source/blender/freestyle/intern/stroke/Stroke.h b/source/blender/freestyle/intern/stroke/Stroke.h index 263b5429161..ffca8b92c6d 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.h +++ b/source/blender/freestyle/intern/stroke/Stroke.h @@ -841,7 +841,7 @@ class Stroke : public Interface1D { vertex_iterator vertices_end(); /*! Returns a StrokeVertexIterator pointing on the first StrokeVertex of the Stroke. One can - * specify a sampling value to resample the Stroke on the fly if needed. + * specify a sampling value to re-sample the Stroke on the fly if needed. * * \param t: The resampling value with which we want our Stroke to be resampled. * If 0 is specified, no resampling is done. diff --git a/source/blender/makesdna/DNA_curveprofile_types.h b/source/blender/makesdna/DNA_curveprofile_types.h index 18d170e7bd5..6614fdaf589 100644 --- a/source/blender/makesdna/DNA_curveprofile_types.h +++ b/source/blender/makesdna/DNA_curveprofile_types.h @@ -85,8 +85,8 @@ enum { typedef enum eCurveProfilePresets { PROF_PRESET_LINE = 0, /* Default simple line between end points. */ PROF_PRESET_SUPPORTS = 1, /* Support loops for a regular curved profile. */ - PROF_PRESET_CORNICE = 2, /* Moulding type example. */ - PROF_PRESET_CROWN = 3, /* Second moulding example. */ + PROF_PRESET_CORNICE = 2, /* Molding type example. */ + PROF_PRESET_CROWN = 3, /* Second molding example. */ PROF_PRESET_STEPS = 4, /* Dynamic number of steps defined by segments_len. */ } eCurveProfilePresets; diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index bd2e522c4b4..df9d9918192 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -3771,7 +3771,7 @@ void RNA_property_pointer_set(PointerRNA *ptr, if (ptr_value.type != NULL && !RNA_struct_is_a(ptr_value.type, pprop->type)) { BKE_reportf(reports, RPT_ERROR, - "%s: expected %s type, not %s.\n", + "%s: expected %s type, not %s", __func__, pprop->type->identifier, ptr_value.type->identifier); @@ -3783,7 +3783,7 @@ void RNA_property_pointer_set(PointerRNA *ptr, if (ptr_value.type != NULL && !RNA_struct_is_a(ptr_value.type, &RNA_ID)) { BKE_reportf(reports, RPT_ERROR, - "%s: expected ID type, not %s.\n", + "%s: expected ID type, not %s", __func__, ptr_value.type->identifier); return; diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index 42c4e249aae..02aec9527f0 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -84,7 +84,7 @@ const EnumPropertyItem rna_enum_brush_sculpt_tool_items[] = { {SCULPT_TOOL_FLATTEN, "FLATTEN", ICON_BRUSH_FLATTEN, "Flatten", ""}, {SCULPT_TOOL_FILL, "FILL", ICON_BRUSH_FILL, "Fill", ""}, {SCULPT_TOOL_SCRAPE, "SCRAPE", ICON_BRUSH_SCRAPE, "Scrape", ""}, - {SCULPT_TOOL_MULTIPLANE_SCRAPE, "MULTIPLANE_SCRAPE", ICON_BRUSH_SCRAPE, "Multiplane Scrape", ""}, + {SCULPT_TOOL_MULTIPLANE_SCRAPE, "MULTIPLANE_SCRAPE", ICON_BRUSH_SCRAPE, "Multi-plane Scrape", ""}, {SCULPT_TOOL_PINCH, "PINCH", ICON_BRUSH_PINCH, "Pinch", ""}, {0, "", 0, NULL, NULL}, {SCULPT_TOOL_GRAB, "GRAB", ICON_BRUSH_GRAB, "Grab", ""}, @@ -1603,8 +1603,8 @@ static void rna_def_brush(BlenderRNA *brna) }; static const EnumPropertyItem brush_jitter_unit_items[] = { - {BRUSH_ABSOLUTE_JITTER, "VIEW", 0, "View", "Jitterring happens in screen space, in pixels"}, - {0, "BRUSH", 0, "Brush", "Jitterring happens relative to the brush size"}, + {BRUSH_ABSOLUTE_JITTER, "VIEW", 0, "View", "Jittering happens in screen space, in pixels"}, + {0, "BRUSH", 0, "Brush", "Jittering happens relative to the brush size"}, {0, NULL, 0, NULL, NULL}, }; @@ -2078,7 +2078,7 @@ static void rna_def_brush(BlenderRNA *brna) prop = RNA_def_property(srna, "use_automasking_topology", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "automasking_flags", BRUSH_AUTOMASKING_TOPOLOGY); RNA_def_property_ui_text(prop, - "Topology Automasking", + "Topology Auto-masking", "Affect only vertices connected to the active vertex under the brush"); RNA_def_property_update(prop, 0, "rna_Brush_update"); @@ -2118,7 +2118,7 @@ static void rna_def_brush(BlenderRNA *brna) prop = RNA_def_property(srna, "use_pose_ik_anchored", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag2", BRUSH_POSE_IK_ANCHORED); RNA_def_property_ui_text( - prop, "Keep Anchor Point", "Keep the position of the last segmend in the IK chain fixed"); + prop, "Keep Anchor Point", "Keep the position of the last segment in the IK chain fixed"); RNA_def_property_update(prop, 0, "rna_Brush_update"); prop = RNA_def_property(srna, "invert_to_scrape_fill", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_curveprofile.c b/source/blender/makesrna/intern/rna_curveprofile.c index 71e1aac5aba..c9ba338b9d6 100644 --- a/source/blender/makesrna/intern/rna_curveprofile.c +++ b/source/blender/makesrna/intern/rna_curveprofile.c @@ -230,8 +230,8 @@ static void rna_def_curveprofile(BlenderRNA *brna) static const EnumPropertyItem rna_enum_curveprofile_preset_items[] = { {PROF_PRESET_LINE, "LINE", 0, "Line", "Default"}, {PROF_PRESET_SUPPORTS, "SUPPORTS", 0, "Support Loops", "Loops on each side of the profile"}, - {PROF_PRESET_CORNICE, "CORNICE", 0, "Cornice Moulding", ""}, - {PROF_PRESET_CROWN, "CROWN", 0, "Crown Moulding", ""}, + {PROF_PRESET_CORNICE, "CORNICE", 0, "Cornice Molding", ""}, + {PROF_PRESET_CROWN, "CROWN", 0, "Crown Molding", ""}, {PROF_PRESET_STEPS, "STEPS", 0, "Steps", "A number of steps defined by the segments"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_fluid.c b/source/blender/makesrna/intern/rna_fluid.c index 487ea852569..7405612d0f0 100644 --- a/source/blender/makesrna/intern/rna_fluid.c +++ b/source/blender/makesrna/intern/rna_fluid.c @@ -1004,13 +1004,13 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna) "IMPROVED", 0, "Final", - "Use improved particle levelset (slower but more precise and with mesh smoothening " + "Use improved particle level set (slower but more precise and with mesh smoothening " "options)"}, {FLUID_DOMAIN_MESH_UNION, "UNION", 0, "Preview", - "Use union particle levelset (faster but lower quality)"}, + "Use union particle level set (faster but lower quality)"}, {0, NULL, 0, NULL, NULL}, }; @@ -1102,7 +1102,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna) "OFF", 0, "Off", - "Create a seperate particle system for every secondary particle type"}, + "Create a separate particle system for every secondary particle type"}, {SNDPARTICLE_COMBINED_EXPORT_SPRAY_FOAM, "SPRAY_FOAM", 0, @@ -1286,32 +1286,32 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "use_collision_border_front", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "border_collisions", FLUID_DOMAIN_BORDER_FRONT); - RNA_def_property_ui_text(prop, "Front", "Enable collisons with front domain border"); + RNA_def_property_ui_text(prop, "Front", "Enable collisions with front domain border"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset"); prop = RNA_def_property(srna, "use_collision_border_back", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "border_collisions", FLUID_DOMAIN_BORDER_BACK); - RNA_def_property_ui_text(prop, "Back", "Enable collisons with back domain border"); + RNA_def_property_ui_text(prop, "Back", "Enable collisions with back domain border"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset"); prop = RNA_def_property(srna, "use_collision_border_right", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "border_collisions", FLUID_DOMAIN_BORDER_RIGHT); - RNA_def_property_ui_text(prop, "Right", "Enable collisons with right domain border"); + RNA_def_property_ui_text(prop, "Right", "Enable collisions with right domain border"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset"); prop = RNA_def_property(srna, "use_collision_border_left", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "border_collisions", FLUID_DOMAIN_BORDER_LEFT); - RNA_def_property_ui_text(prop, "Left", "Enable collisons with left domain border"); + RNA_def_property_ui_text(prop, "Left", "Enable collisions with left domain border"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset"); prop = RNA_def_property(srna, "use_collision_border_top", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "border_collisions", FLUID_DOMAIN_BORDER_TOP); - RNA_def_property_ui_text(prop, "Top", "Enable collisons with top domain border"); + RNA_def_property_ui_text(prop, "Top", "Enable collisions with top domain border"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset"); prop = RNA_def_property(srna, "use_collision_border_bottom", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "border_collisions", FLUID_DOMAIN_BORDER_BOTTOM); - RNA_def_property_ui_text(prop, "Bottom", "Enable collisons with bottom domain border"); + RNA_def_property_ui_text(prop, "Bottom", "Enable collisions with bottom domain border"); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset"); prop = RNA_def_property(srna, "gravity", PROP_FLOAT, PROP_ACCELERATION); @@ -1638,7 +1638,7 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna) prop = RNA_def_property(srna, "mesh_generator", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "mesh_generator"); RNA_def_property_enum_items(prop, fluid_mesh_quality_items); - RNA_def_property_ui_text(prop, "Mesh generator", "Which particle levelset generator to use"); + RNA_def_property_ui_text(prop, "Mesh generator", "Which particle level set generator to use"); RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Fluid_update"); prop = RNA_def_property(srna, "mesh_vertices", PROP_COLLECTION, PROP_NONE); @@ -2024,10 +2024,10 @@ static void rna_def_fluid_domain_settings(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flags", FLUID_DOMAIN_EXPORT_MANTA_SCRIPT); RNA_def_property_ui_text( prop, - "Export Fluidflow Script", - "Generate and export Fluidflow script from current domain settings during bake. This is " - "only needed if you plan to analyse the cache (e.g. view grids, velocity vectors, " - "particles) in Fluidflow directly (outside of Blender) after baking the simulation"); + "Export Mantaflow Script", + "Generate and export Mantaflow script from current domain settings during bake. This is " + "only needed if you plan to analyze the cache (e.g. view grids, velocity vectors, " + "particles) in Mantaflow directly (outside of Blender) after baking the simulation"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_Fluid_reset"); diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index 2f59cde7e94..53fa3f7459d 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -668,7 +668,7 @@ static void rna_def_modifier_gpencilsimplify(BlenderRNA *brna) "SAMPLE", ICON_IPO_EASE_IN_OUT, "Sample", - "Resample the stroke with segments of the specified length"}, + "Re-sample the stroke with segments of the specified length"}, {GP_SIMPLIFY_MERGE, "MERGE", ICON_IPO_EASE_IN_OUT, @@ -1952,7 +1952,7 @@ static void rna_def_modifier_gpencilmultiply(BlenderRNA *brna) prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE); RNA_def_property_ui_range(prop, -1, 1, 0.1, 3); - RNA_def_property_ui_text(prop, "Offset", "Offset of duplications. -1 to 1: inner to outer"); + RNA_def_property_ui_text(prop, "Offset", "Offset of duplicates. -1 to 1: inner to outer"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); prop = RNA_def_property(srna, "fading_thickness", PROP_FLOAT, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c index da882959ef2..721fc8dddff 100644 --- a/source/blender/makesrna/intern/rna_layer.c +++ b/source/blender/makesrna/intern/rna_layer.c @@ -434,7 +434,7 @@ static void rna_def_layer_collection(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Visible", - "Whether this collection is visible for the viewlayer, take into " + "Whether this collection is visible for the view layer, take into " "account the collection parent"); func = RNA_def_function(srna, "has_objects", "rna_LayerCollection_has_objects"); @@ -445,7 +445,7 @@ static void rna_def_layer_collection(BlenderRNA *brna) srna, "has_selected_objects", "rna_LayerCollection_has_selected_objects"); RNA_def_function_ui_description(func, ""); prop = RNA_def_pointer( - func, "view_layer", "ViewLayer", "", "ViewLayer the layer collection belongs to"); + func, "view_layer", "ViewLayer", "", "View layer the layer collection belongs to"); RNA_def_parameter_flags(prop, 0, PARM_REQUIRED); RNA_def_function_return(func, RNA_def_boolean(func, "result", 0, "", "")); } diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index ea0f917ca77..96c9242df12 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -164,7 +164,7 @@ const EnumPropertyItem rna_enum_object_modifier_type_items[] = { "SCREW", ICON_MOD_SCREW, "Screw", - "Lathe around an axis, treating the inout mesh as a profile"}, + "Lathe around an axis, treating the input mesh as a profile"}, {eModifierType_Skin, "SKIN", ICON_MOD_SKIN, @@ -3923,7 +3923,7 @@ static void rna_def_modifier_bevel(BlenderRNA *brna) prop = RNA_def_property(srna, "use_custom_profile", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_BEVEL_CUSTOM_PROFILE); RNA_def_property_ui_text( - prop, "Custom Profile", "Whether to use a user inputed curve for the bevel's profile"); + prop, "Custom Profile", "Whether to use a user inputted curve for the bevel's profile"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); prop = RNA_def_property(srna, "custom_profile", PROP_POINTER, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index bed00b588e8..cc833287aa7 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -170,7 +170,7 @@ const EnumPropertyItem rna_enum_node_math_items[] = { {NODE_MATH_PINGPONG, "PINGPONG", 0, - "Pingpong", + "Ping-pong", "Wraps a value and reverses every other cycle (A,B)"}, {0, "", 0, N_("Trigonometric"), ""}, {NODE_MATH_SINE, "SINE", 0, "Sine", "sin(A)"}, @@ -194,8 +194,8 @@ const EnumPropertyItem rna_enum_node_math_items[] = { const EnumPropertyItem rna_enum_node_vec_math_items[] = { {NODE_VECTOR_MATH_ADD, "ADD", 0, "Add", "A + B"}, {NODE_VECTOR_MATH_SUBTRACT, "SUBTRACT", 0, "Subtract", "A - B"}, - {NODE_VECTOR_MATH_MULTIPLY, "MULTIPLY", 0, "Multiply", "Entrywise multiply"}, - {NODE_VECTOR_MATH_DIVIDE, "DIVIDE", 0, "Divide", "Entrywise divide"}, + {NODE_VECTOR_MATH_MULTIPLY, "MULTIPLY", 0, "Multiply", "Entry-wise multiply"}, + {NODE_VECTOR_MATH_DIVIDE, "DIVIDE", 0, "Divide", "Entry-wise divide"}, {0, "", ICON_NONE, NULL, NULL}, {NODE_VECTOR_MATH_CROSS_PRODUCT, "CROSS_PRODUCT", 0, "Cross Product", "A cross B"}, {NODE_VECTOR_MATH_PROJECT, "PROJECT", 0, "Project", "Project A onto B"}, @@ -203,7 +203,7 @@ const EnumPropertyItem rna_enum_node_vec_math_items[] = { "REFLECT", 0, "Reflect", - "Reflect A around the normal B. B needn't be normalized"}, + "Reflect A around the normal B. B doesn't need to be normalized"}, {NODE_VECTOR_MATH_DOT_PRODUCT, "DOT_PRODUCT", 0, "Dot Product", "A dot B"}, {0, "", ICON_NONE, NULL, NULL}, {NODE_VECTOR_MATH_DISTANCE, "DISTANCE", 0, "Distance", "Distance between A and B"}, @@ -211,23 +211,23 @@ const EnumPropertyItem rna_enum_node_vec_math_items[] = { {NODE_VECTOR_MATH_SCALE, "SCALE", 0, "Scale", "A multiplied by Scale"}, {NODE_VECTOR_MATH_NORMALIZE, "NORMALIZE", 0, "Normalize", "Normalize A"}, {0, "", ICON_NONE, NULL, NULL}, - {NODE_VECTOR_MATH_ABSOLUTE, "ABSOLUTE", 0, "Absolute", "Entrywise absolute"}, - {NODE_VECTOR_MATH_MINIMUM, "MINIMUM", 0, "Minimum", "Entrywise minimum"}, - {NODE_VECTOR_MATH_MAXIMUM, "MAXIMUM", 0, "Maximum", "Entrywise maximum"}, - {NODE_VECTOR_MATH_FLOOR, "FLOOR", 0, "Floor", "Entrywise floor"}, - {NODE_VECTOR_MATH_CEIL, "CEIL", 0, "Ceil", "Entrywise ceil"}, - {NODE_VECTOR_MATH_FRACTION, "FRACTION", 0, "Fraction", "The fraction part of A entrywise"}, - {NODE_VECTOR_MATH_MODULO, "MODULO", 0, "Modulo", "Entrywise modulo using fmod(A,B)"}, - {NODE_VECTOR_MATH_WRAP, "WRAP", 0, "Wrap", "Entrywise wrap(A,B)"}, + {NODE_VECTOR_MATH_ABSOLUTE, "ABSOLUTE", 0, "Absolute", "Entry-wise absolute"}, + {NODE_VECTOR_MATH_MINIMUM, "MINIMUM", 0, "Minimum", "Entry-wise minimum"}, + {NODE_VECTOR_MATH_MAXIMUM, "MAXIMUM", 0, "Maximum", "Entry-wise maximum"}, + {NODE_VECTOR_MATH_FLOOR, "FLOOR", 0, "Floor", "Entry-wise floor"}, + {NODE_VECTOR_MATH_CEIL, "CEIL", 0, "Ceil", "Entry-wise ceil"}, + {NODE_VECTOR_MATH_FRACTION, "FRACTION", 0, "Fraction", "The fraction part of A entry-wise"}, + {NODE_VECTOR_MATH_MODULO, "MODULO", 0, "Modulo", "Entry-wise modulo using fmod(A,B)"}, + {NODE_VECTOR_MATH_WRAP, "WRAP", 0, "Wrap", "Entry-wise wrap(A,B)"}, {NODE_VECTOR_MATH_SNAP, "SNAP", 0, "Snap", "Round A to the largest integer multiple of B less than or equal A"}, {0, "", ICON_NONE, NULL, NULL}, - {NODE_VECTOR_MATH_SINE, "SINE", 0, "Sine", "Entrywise sin(A)"}, - {NODE_VECTOR_MATH_COSINE, "COSINE", 0, "Cosine", "Entrywise cos(A)"}, - {NODE_VECTOR_MATH_TANGENT, "TANGENT", 0, "Tangent", "Entrywise tan(A)"}, + {NODE_VECTOR_MATH_SINE, "SINE", 0, "Sine", "Entry-wise sin(A)"}, + {NODE_VECTOR_MATH_COSINE, "COSINE", 0, "Cosine", "Entry-wise cos(A)"}, + {NODE_VECTOR_MATH_TANGENT, "TANGENT", 0, "Tangent", "Entry-wise tan(A)"}, {0, NULL, 0, NULL, NULL}, }; @@ -245,13 +245,13 @@ const EnumPropertyItem rna_enum_node_map_range_items[] = { {NODE_MAP_RANGE_SMOOTHSTEP, "SMOOTHSTEP", 0, - "Smoothstep", - "Smooth hermite edge interpolation between From Min and From Max values"}, + "Smooth Step", + "Smooth Hermite edge interpolation between From Min and From Max values"}, {NODE_MAP_RANGE_SMOOTHERSTEP, "SMOOTHERSTEP", 0, - "Smootherstep", - "Smoother hermite edge interpolation between From Min and From Max values"}, + "Smoother Step", + "Smoother Hermite edge interpolation between From Min and From Max values"}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index 81f653e73be..d3c22098294 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -711,7 +711,7 @@ bool rna_Object_generate_gpencil_strokes(Object *ob, if (ob->type != OB_CURVE) { BKE_reportf(reports, RPT_ERROR, - "Object '%s' not valid for this operation! Only curves supported.", + "Object '%s' is not valid for this operation! Only curves are supported", ob->id.name + 2); return false; } diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 16dbe38f866..661f1007395 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -1788,8 +1788,8 @@ static void rna_def_sequence(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_STORE_PREPROCESSED); RNA_def_property_ui_text( prop, - "Cache Preprocessed", - "Cache preprocessed images, for faster tweaking of effects at the cost of memory usage"); + "Cache Pre-processed", + "Cache pre-processed images, for faster tweaking of effects at the cost of memory usage"); prop = RNA_def_property(srna, "use_cache_composite", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_STORE_COMPOSITE); @@ -1906,7 +1906,7 @@ static void rna_def_editor(BlenderRNA *brna) prop = RNA_def_property(srna, "show_cache_preprocessed", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_VIEW_PREPROCESSED); - RNA_def_property_ui_text(prop, "Preprocessed Images", "Visualize cached preprocessed images"); + RNA_def_property_ui_text(prop, "Pre-processed Images", "Visualize cached pre-processed images"); RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, NULL); prop = RNA_def_property(srna, "show_cache_composite", PROP_BOOLEAN, PROP_NONE); @@ -1925,8 +1925,8 @@ static void rna_def_editor(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_STORE_PREPROCESSED); RNA_def_property_ui_text( prop, - "Cache Preprocessed", - "Cache preprocessed images, for faster tweaking of effects at the cost of memory usage"); + "Cache Pre-processed", + "Cache pre-processed images, for faster tweaking of effects at the cost of memory usage"); prop = RNA_def_property(srna, "use_cache_composite", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "cache_flag", SEQ_CACHE_STORE_COMPOSITE); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 746f9042dd8..fdea081d8f1 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -2649,7 +2649,7 @@ static void rna_def_space(BlenderRNA *brna) RNA_def_property_boolean_funcs(prop, "rna_Space_view2d_sync_get", "rna_Space_view2d_sync_set"); RNA_def_property_ui_text(prop, "Sync Visible Range", - "Syncronize the visible timeline range with other time-based editors"); + "Synchronize the visible timeline range with other time-based editors"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TIME, "rna_Space_view2d_sync_update"); rna_def_space_generic_show_region_toggles(srna, (1 << RGN_TYPE_HEADER)); @@ -3350,7 +3350,7 @@ static void rna_def_space_view3d_overlay(BlenderRNA *brna) prop = RNA_def_property(srna, "show_ortho_grid", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gridflag", V3D_SHOW_ORTHO_GRID); - RNA_def_property_ui_text(prop, "Display Grid", "Show grid in othographic side view"); + RNA_def_property_ui_text(prop, "Display Grid", "Show grid in orthographic side view"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "show_floor", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 43a9bbd2e36..7d782efb7cf 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -2567,7 +2567,7 @@ static void rna_def_userdef_theme_space_info(BlenderRNA *brna) prop = RNA_def_property(srna, "info_property", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_array(prop, 4); - RNA_def_property_ui_text(prop, "Property Icon Background", "Backgrond color of Property icon"); + RNA_def_property_ui_text(prop, "Property Icon Background", "Background color of Property icon"); RNA_def_property_update(prop, 0, "rna_userdef_theme_update"); prop = RNA_def_property(srna, "info_property_text", PROP_FLOAT, PROP_COLOR_GAMMA); diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index 841d82adcb7..664c45df4dc 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -552,24 +552,24 @@ static wmEvent *rna_Window_event_add_simulate(wmWindow *win, } if (!ELEM(value, KM_PRESS, KM_RELEASE, KM_NOTHING)) { - BKE_report(reports, RPT_ERROR, "value: only 'PRESS/RELEASE/NOTHING' are supported"); + BKE_report(reports, RPT_ERROR, "Value: only 'PRESS/RELEASE/NOTHING' are supported"); return NULL; } if (ISKEYBOARD(type) || ISMOUSE_BUTTON(type)) { if (!ELEM(value, KM_PRESS, KM_RELEASE)) { - BKE_report(reports, RPT_ERROR, "value: must be 'PRESS/RELEASE' for keyboard/buttons"); + BKE_report(reports, RPT_ERROR, "Value: must be 'PRESS/RELEASE' for keyboard/buttons"); return NULL; } } if (ELEM(type, MOUSEMOVE, INBETWEEN_MOUSEMOVE)) { if (value != KM_NOTHING) { - BKE_report(reports, RPT_ERROR, "value: must be 'NOTHING' for motion"); + BKE_report(reports, RPT_ERROR, "Value: must be 'NOTHING' for motion"); return NULL; } } if (unicode != NULL) { if (value != KM_PRESS) { - BKE_report(reports, RPT_ERROR, "value: must be 'PRESS' when unicode is set"); + BKE_report(reports, RPT_ERROR, "Value: must be 'PRESS' when unicode is set"); return NULL; } } diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index d50bbf49dae..06bdba45ace 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3427,7 +3427,7 @@ static const EnumPropertyItem preview_id_type_items[] = { "SHADING", 0, "All Shading Types", - "Clear previews for materiasl, lights, worlds, textures and images"}, + "Clear previews for materials, lights, worlds, textures and images"}, {FILTER_ID_SCE, "SCENE", 0, "Scenes", ""}, {FILTER_ID_GR, "GROUP", 0, "Groups", ""}, {FILTER_ID_OB, "OBJECT", 0, "Objects", ""}, |