From d76b8840fca250f5e315f269c94f914267357ce6 Mon Sep 17 00:00:00 2001 From: Damien Picard Date: Tue, 9 May 2023 01:03:34 +0200 Subject: [PATCH] UI: Capitalize "Python" in UI messages, and improve a few others - "... (matches pythons ...)": capitalize and use possessive ('s). - "Layer Proxy Protection": replace proxy by override, following 2.80. - "Enable Plane Trim": expand description. - "Make curve path children to rotate along the path": remove "to". - "Option for curve-deform: make deformed child to stretch along entire path": remove "to". - "... apply the curve radius with path following it and deforming": rephrase unclear description. - "Custom light falloff curve" : unrelated to lights, used in Grease Pencil modifiers. - "Grease Pencil layer assigned to the generated strokes": rephrase because a GP stroke is assigned to a layer, not the other way around. - "Attribute domain where the attribute domain is stored in the simulation state": remove first "domain" (typo). --- scripts/startup/bl_operators/anim.py | 4 ++-- scripts/startup/bl_operators/console.py | 2 +- scripts/startup/bl_operators/file.py | 4 ++-- scripts/startup/bl_operators/userpref.py | 10 +++++----- scripts/startup/bl_operators/wm.py | 4 ++-- scripts/startup/bl_ui/properties_constraint.py | 2 +- source/blender/makesrna/intern/rna_armature.c | 6 +++--- source/blender/makesrna/intern/rna_brush.c | 5 ++++- source/blender/makesrna/intern/rna_curve.c | 7 ++++--- source/blender/makesrna/intern/rna_define.c | 6 +++--- source/blender/makesrna/intern/rna_fcurve.c | 2 +- .../makesrna/intern/rna_gpencil_legacy_modifier.c | 5 +++-- source/blender/makesrna/intern/rna_nodetree.c | 2 +- source/blender/makesrna/intern/rna_render.c | 2 +- source/blender/makesrna/intern/rna_rna.c | 4 ++-- source/blender/makesrna/intern/rna_scene.c | 2 +- source/blender/makesrna/intern/rna_space.c | 4 ++-- source/blender/makesrna/intern/rna_ui.c | 6 +++--- source/blender/makesrna/intern/rna_userdef.c | 6 +++--- source/blender/makesrna/rna_cleanup/rna_cleaner.py | 2 +- .../blender/python/bmesh/bmesh_py_types_customdata.c | 10 +++++----- source/blender/python/bmesh/bmesh_py_types_meshdata.c | 8 ++++---- source/blender/python/generic/idprop_py_api.c | 2 +- source/blender/python/generic/py_capi_utils.c | 4 ++-- source/blender/python/intern/bpy_interface.c | 4 ++-- source/blender/python/intern/bpy_utils_units.c | 4 ++-- source/blender/python/mathutils/mathutils_Vector.c | 8 ++++---- .../blender/windowmanager/intern/wm_operator_props.c | 2 +- 28 files changed, 66 insertions(+), 61 deletions(-) diff --git a/scripts/startup/bl_operators/anim.py b/scripts/startup/bl_operators/anim.py index cb301b4bece..a67e6a08674 100644 --- a/scripts/startup/bl_operators/anim.py +++ b/scripts/startup/bl_operators/anim.py @@ -20,7 +20,7 @@ from bpy.app.translations import pgettext_tip as tip_ class ANIM_OT_keying_set_export(Operator): - """Export Keying Set to a python script""" + """Export Keying Set to a Python script""" bl_idname = "anim.keying_set_export" bl_label = "Export Keying Set..." @@ -38,7 +38,7 @@ class ANIM_OT_keying_set_export(Operator): options={'HIDDEN'}, ) filter_python: BoolProperty( - name="Filter python", + name="Filter Python", default=True, options={'HIDDEN'}, ) diff --git a/scripts/startup/bl_operators/console.py b/scripts/startup/bl_operators/console.py index eb8c4c371c5..1fff30af752 100644 --- a/scripts/startup/bl_operators/console.py +++ b/scripts/startup/bl_operators/console.py @@ -16,7 +16,7 @@ def _lang_module_get(sc): class ConsoleExec(Operator): - """Execute the current console line as a python expression""" + """Execute the current console line as a Python expression""" bl_idname = "console.execute" bl_label = "Console Execute" bl_options = {'UNDO_GROUPED'} diff --git a/scripts/startup/bl_operators/file.py b/scripts/startup/bl_operators/file.py index 32cc50cc3f3..63f32e143a5 100644 --- a/scripts/startup/bl_operators/file.py +++ b/scripts/startup/bl_operators/file.py @@ -78,7 +78,7 @@ class WM_OT_previews_batch_generate(Operator): use_trusted: BoolProperty( default=False, name="Trusted Blend Files", - description="Enable python evaluation for selected files", + description="Enable Python evaluation for selected files", ) use_backups: BoolProperty( default=True, @@ -188,7 +188,7 @@ class WM_OT_previews_batch_clear(Operator): use_trusted: BoolProperty( default=False, name="Trusted Blend Files", - description="Enable python evaluation for selected files", + description="Enable Python evaluation for selected files", ) use_backups: BoolProperty( default=True, diff --git a/scripts/startup/bl_operators/userpref.py b/scripts/startup/bl_operators/userpref.py index 03f9aa46527..4040eefe9b7 100644 --- a/scripts/startup/bl_operators/userpref.py +++ b/scripts/startup/bl_operators/userpref.py @@ -173,7 +173,7 @@ class PREFERENCES_OT_keyconfig_test(Operator): class PREFERENCES_OT_keyconfig_import(Operator): - """Import key configuration from a python script""" + """Import key configuration from a Python script""" bl_idname = "preferences.keyconfig_import" bl_label = "Import Key Configuration..." @@ -192,7 +192,7 @@ class PREFERENCES_OT_keyconfig_import(Operator): options={'HIDDEN'}, ) filter_python: BoolProperty( - name="Filter python", + name="Filter Python", default=True, options={'HIDDEN'}, ) @@ -244,7 +244,7 @@ class PREFERENCES_OT_keyconfig_import(Operator): class PREFERENCES_OT_keyconfig_export(Operator): - """Export key configuration to a python script""" + """Export key configuration to a Python script""" bl_idname = "preferences.keyconfig_export" bl_label = "Export Key Configuration..." @@ -268,7 +268,7 @@ class PREFERENCES_OT_keyconfig_export(Operator): options={'HIDDEN'}, ) filter_python: BoolProperty( - name="Filter python", + name="Filter Python", default=True, options={'HIDDEN'}, ) @@ -610,7 +610,7 @@ class PREFERENCES_OT_addon_install(Operator): options={'HIDDEN'}, ) filter_python: BoolProperty( - name="Filter python", + name="Filter Python", default=True, options={'HIDDEN'}, ) diff --git a/scripts/startup/bl_operators/wm.py b/scripts/startup/bl_operators/wm.py index 76b64496750..ba6734d77ae 100644 --- a/scripts/startup/bl_operators/wm.py +++ b/scripts/startup/bl_operators/wm.py @@ -746,7 +746,7 @@ class WM_OT_operator_pie_enum(Operator): data_path: StringProperty( name="Operator", - description="Operator name (in python as string)", + description="Operator name (in Python as string)", maxlen=1024, ) prop_string: StringProperty( @@ -1381,7 +1381,7 @@ rna_custom_property_type_items = ( ('BOOL', "Boolean", "A true or false value"), ('BOOL_ARRAY', "Boolean Array", "An array of true or false values"), ('STRING', "String", "A string value"), - ('PYTHON', "Python", "Edit a python value directly, for unsupported property types"), + ('PYTHON', "Python", "Edit a Python value directly, for unsupported property types"), ) rna_custom_property_subtype_none_item = ('NONE', "Plain Data", "Data values without special behavior") diff --git a/scripts/startup/bl_ui/properties_constraint.py b/scripts/startup/bl_ui/properties_constraint.py index 64dc64cd525..a121c4ce176 100644 --- a/scripts/startup/bl_ui/properties_constraint.py +++ b/scripts/startup/bl_ui/properties_constraint.py @@ -831,7 +831,7 @@ class ConstraintButtonsPanel: def draw_python_constraint(self, _context): layout = self.layout - layout.label(text="Blender 2.6 doesn't support python constraints yet") + layout.label(text="Blender 2.6 doesn't support Python constraints yet") def draw_armature(self, context): layout = self.layout diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index 2f015a5b862..5dfb1923bc3 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -1561,9 +1561,9 @@ static void rna_def_armature(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "layer_protected", 1); RNA_def_property_array(prop, 32); RNA_def_property_ui_text(prop, - "Layer Proxy Protection", - "Protected layers in Proxy Instances are restored to Proxy settings " - "on file reload and undo"); + "Layer Override Protection", + "Protected layers in overridden instances are restored to " + "their original settings on file reload and undo"); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); /* flag */ diff --git a/source/blender/makesrna/intern/rna_brush.c b/source/blender/makesrna/intern/rna_brush.c index f5b156962b8..102b43b8387 100644 --- a/source/blender/makesrna/intern/rna_brush.c +++ b/source/blender/makesrna/intern/rna_brush.c @@ -3484,7 +3484,10 @@ static void rna_def_brush(BlenderRNA *brna) prop = RNA_def_property(srna, "use_plane_trim", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", BRUSH_PLANE_TRIM); - RNA_def_property_ui_text(prop, "Use Plane Trim", "Enable Plane Trim"); + RNA_def_property_ui_text( + prop, + "Use Plane Trim", + "Limit the distance from the offset plane that a vertex can be affected"); RNA_def_property_update(prop, 0, "rna_Brush_update"); prop = RNA_def_property(srna, "use_frontface", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 61f7da5d417..d40a883e490 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -1018,7 +1018,7 @@ static void rna_def_path(BlenderRNA *UNUSED(brna), StructRNA *srna) prop = RNA_def_property(srna, "use_path_follow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_FOLLOW); - RNA_def_property_ui_text(prop, "Follow", "Make curve path children to rotate along the path"); + RNA_def_property_ui_text(prop, "Follow", "Make curve path children rotate along the path"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop = RNA_def_property(srna, "use_path_clamp", PROP_BOOLEAN, PROP_NONE); @@ -1034,7 +1034,7 @@ static void rna_def_path(BlenderRNA *UNUSED(brna), StructRNA *srna) RNA_def_property_ui_text(prop, "Stretch", "Option for curve-deform: " - "make deformed child to stretch along entire path"); + "make deformed child stretch along entire path"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop = RNA_def_property(srna, "use_deform_bounds", PROP_BOOLEAN, PROP_NONE); @@ -1050,7 +1050,8 @@ static void rna_def_path(BlenderRNA *UNUSED(brna), StructRNA *srna) RNA_def_property_ui_text(prop, "Radius", "Option for paths and curve-deform: " - "apply the curve radius with path following it and deforming"); + "apply the curve radius to objects following it " + "and to deformed objects"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); } diff --git a/source/blender/makesrna/intern/rna_define.c b/source/blender/makesrna/intern/rna_define.c index 3c02d480f78..622d16121b6 100644 --- a/source/blender/makesrna/intern/rna_define.c +++ b/source/blender/makesrna/intern/rna_define.c @@ -574,7 +574,7 @@ static int rna_validate_identifier(const char *identifier, char *error, bool pro for (a = 0; kwlist[a]; a++) { if (STREQ(identifier, kwlist[a])) { - strcpy(error, "this keyword is reserved by python"); + strcpy(error, "this keyword is reserved by Python"); return 0; } } @@ -591,7 +591,7 @@ static int rna_validate_identifier(const char *identifier, char *error, bool pro for (a = 0; kwlist_prop[a]; a++) { if (STREQ(identifier, kwlist_prop[a])) { - strcpy(error, "this keyword is reserved by python"); + strcpy(error, "this keyword is reserved by Python"); return 0; } } @@ -784,7 +784,7 @@ void RNA_struct_free(BlenderRNA *brna, StructRNA *srna) # if 0 if (srna->flag & STRUCT_RUNTIME) { if (RNA_struct_py_type_get(srna)) { - fprintf(stderr, "%s '%s' freed while holding a python reference.", srna->identifier); + fprintf(stderr, "%s '%s' freed while holding a Python reference.", srna->identifier); } } # endif diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 46a422c0644..ead766caff3 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -2148,7 +2148,7 @@ static void rna_def_channeldriver(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Simple Expression", - "The scripted expression can be evaluated without using the full python interpreter"); + "The scripted expression can be evaluated without using the full Python interpreter"); /* Functions */ RNA_api_drivers(srna); diff --git a/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.c b/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.c index fff69389d02..e42988daafc 100644 --- a/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_legacy_modifier.c @@ -2957,7 +2957,7 @@ static void rna_def_modifier_gpencilhook(BlenderRNA *brna) prop = RNA_def_property(srna, "falloff_curve", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "curfalloff"); - RNA_def_property_ui_text(prop, "Falloff Curve", "Custom light falloff curve"); + RNA_def_property_ui_text(prop, "Falloff Curve", "Custom falloff curve"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); prop = RNA_def_property(srna, "center", PROP_FLOAT, PROP_NONE); @@ -3870,7 +3870,8 @@ static void rna_def_modifier_gpencillineart(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); prop = RNA_def_property(srna, "target_layer", PROP_STRING, PROP_NONE); - RNA_def_property_ui_text(prop, "Layer", "Grease Pencil layer assigned to the generated strokes"); + RNA_def_property_ui_text( + prop, "Layer", "Grease Pencil layer to which assign the generated strokes"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); prop = RNA_def_property(srna, "source_vertex_group", PROP_STRING, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 2f97663771d..02bfa1f5f07 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -9958,7 +9958,7 @@ static void rna_def_simulation_state_item(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Attribute Domain", - "Attribute domain where the attribute domain is stored in the simulation state"); + "Attribute domain where the attribute is stored in the simulation state"); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_SimulationStateItem_update"); diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c index 5c0b9671682..c384cdfb8e7 100644 --- a/source/blender/makesrna/intern/rna_render.c +++ b/source/blender/makesrna/intern/rna_render.c @@ -376,7 +376,7 @@ static StructRNA *rna_RenderEngine_register(Main *bmain, } /* create a new engine type */ - et = MEM_mallocN(sizeof(RenderEngineType), "python render engine"); + et = MEM_mallocN(sizeof(RenderEngineType), "Python render engine"); memcpy(et, &dummy_et, sizeof(dummy_et)); et->rna_ext.srna = RNA_def_struct_ptr(&BLENDER_RNA, et->idname, &RNA_RenderEngine); diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index f116126cc97..f0374567a7f 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -3159,7 +3159,7 @@ static void rna_def_function(BlenderRNA *brna) RNA_def_property_ui_text( prop, "No Self", - "Function does not pass itself as an argument (becomes a static method in python)"); + "Function does not pass itself as an argument (becomes a static method in Python)"); prop = RNA_def_property(srna, "use_self_type", PROP_BOOLEAN, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -3167,7 +3167,7 @@ static void rna_def_function(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Self Type", "Function passes itself type as an argument (becomes a class method " - "in python if use_self is false)"); + "in Python if use_self is false)"); } static void rna_def_number_property(StructRNA *srna, PropertyType type) diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index f5f7717c962..53e492b7d03 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -7956,7 +7956,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Current Frame", - "Current frame, to update animation data from python frame_set() instead"); + "Current frame, to update animation data from Python frame_set() instead"); RNA_def_property_update(prop, NC_SCENE | ND_FRAME, "rna_Scene_frame_update"); prop = RNA_def_property(srna, "frame_subframe", PROP_FLOAT, PROP_TIME); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index dc89b6e3174..b6d57587d40 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -6112,7 +6112,7 @@ static void rna_def_space_text(BlenderRNA *brna) prop = RNA_def_property(srna, "use_live_edit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "live_edit", 1); - RNA_def_property_ui_text(prop, "Live Edit", "Run python while editing"); + RNA_def_property_ui_text(prop, "Live Edit", "Run Python while editing"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_TEXT, NULL); /* find */ @@ -6558,7 +6558,7 @@ static void rna_def_space_console(BlenderRNA *brna) srna = RNA_def_struct(brna, "SpaceConsole", "Space"); RNA_def_struct_sdna(srna, "SpaceConsole"); - RNA_def_struct_ui_text(srna, "Space Console", "Interactive python console"); + RNA_def_struct_ui_text(srna, "Space Console", "Interactive Python console"); /* display */ prop = RNA_def_property(srna, "font_size", PROP_INT, PROP_NONE); /* copied from text editor */ diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index 0c116847be1..c20a741a36c 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -362,7 +362,7 @@ static StructRNA *rna_Panel_register(Main *bmain, description_size = strlen(_panel_descr) + 1; over_alloc += description_size; } - pt = MEM_callocN(sizeof(PanelType) + over_alloc, "python buttons panel"); + pt = MEM_callocN(sizeof(PanelType) + over_alloc, "Python buttons panel"); memcpy(pt, &dummy_pt, sizeof(dummy_pt)); if (_panel_descr[0]) { @@ -867,7 +867,7 @@ static StructRNA *rna_Header_register(Main *bmain, } /* create a new header type */ - ht = MEM_mallocN(sizeof(HeaderType), "python buttons header"); + ht = MEM_mallocN(sizeof(HeaderType), "Python buttons header"); memcpy(ht, &dummy_ht, sizeof(dummy_ht)); ht->rna_ext.srna = RNA_def_struct_ptr(&BLENDER_RNA, ht->idname, &RNA_Header); @@ -1024,7 +1024,7 @@ static StructRNA *rna_Menu_register(Main *bmain, over_alloc += description_size; } - mt = MEM_callocN(sizeof(MenuType) + over_alloc, "python buttons menu"); + mt = MEM_callocN(sizeof(MenuType) + over_alloc, "Python buttons menu"); memcpy(mt, &dummy_mt, sizeof(dummy_mt)); if (_menu_descr[0]) { diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 2437b4c61a4..b9b7de25b34 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -6315,14 +6315,14 @@ static void rna_def_userdef_script_directory_collection(BlenderRNA *brna, Proper func = RNA_def_function(srna, "new", "rna_userdef_script_directory_new"); RNA_def_function_flag(func, FUNC_NO_SELF); - RNA_def_function_ui_description(func, "Add a new python script directory"); + RNA_def_function_ui_description(func, "Add a new Python script directory"); /* return type */ parm = RNA_def_pointer(func, "script_directory", "ScriptDirectory", "", ""); RNA_def_function_return(func, parm); func = RNA_def_function(srna, "remove", "rna_userdef_script_directory_remove"); RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_REPORTS); - RNA_def_function_ui_description(func, "Remove a python script directory"); + RNA_def_function_ui_description(func, "Remove a Python script directory"); parm = RNA_def_pointer(func, "script_directory", "ScriptDirectory", "", ""); RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_REQUIRED | PARM_RNAPTR); RNA_def_parameter_clear_flags(parm, PROP_THICK_WRAP, 0); @@ -6631,7 +6631,7 @@ static void rna_def_userdef_experimental(BlenderRNA *brna) prop = RNA_def_property(srna, "use_override_templates", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "use_override_templates", 1); RNA_def_property_ui_text( - prop, "Override Templates", "Enable library override template in the python API"); + prop, "Override Templates", "Enable library override template in the Python API"); prop = RNA_def_property(srna, "enable_eevee_next", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "enable_eevee_next", 1); diff --git a/source/blender/makesrna/rna_cleanup/rna_cleaner.py b/source/blender/makesrna/rna_cleanup/rna_cleaner.py index 5fe98df337c..eaab2409a23 100755 --- a/source/blender/makesrna/rna_cleanup/rna_cleaner.py +++ b/source/blender/makesrna/rna_cleanup/rna_cleaner.py @@ -324,6 +324,6 @@ def main(): if __name__ == '__main__': import sys if sys.version_info.major < 3: - print("Incorrect python version, use Python 3 or newer!") + print("Incorrect Python version, use Python 3 or newer!") else: main() diff --git a/source/blender/python/bmesh/bmesh_py_types_customdata.c b/source/blender/python/bmesh/bmesh_py_types_customdata.c index 667251f166c..4544ace2435 100644 --- a/source/blender/python/bmesh/bmesh_py_types_customdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_customdata.c @@ -558,7 +558,7 @@ PyDoc_STRVAR(bpy_bmlayercollection_keys_doc, ".. method:: keys()\n" "\n" " Return the identifiers of collection members\n" - " (matching pythons dict.keys() functionality).\n" + " (matching Python's dict.keys() functionality).\n" "\n" " :return: the identifiers for each member of this collection.\n" " :rtype: list of strings\n"); @@ -593,7 +593,7 @@ PyDoc_STRVAR(bpy_bmlayercollection_items_doc, ".. method:: items()\n" "\n" " Return the identifiers of collection members\n" - " (matching pythons dict.items() functionality).\n" + " (matching Python's dict.items() functionality).\n" "\n" " :return: (key, value) pairs for each member of this collection.\n" " :rtype: list of tuples\n"); @@ -628,7 +628,7 @@ PyDoc_STRVAR(bpy_bmlayercollection_values_doc, ".. method:: values()\n" "\n" " Return the values of collection\n" - " (matching pythons dict.values() functionality).\n" + " (matching Python's dict.values() functionality).\n" "\n" " :return: the members of this collection.\n" " :rtype: list\n"); @@ -660,7 +660,7 @@ PyDoc_STRVAR(bpy_bmlayercollection_get_doc, ".. method:: get(key, default=None)\n" "\n" " Returns the value of the layer matching the key or default\n" - " when not found (matches pythons dictionary function of the same name).\n" + " when not found (matches Python's dictionary function of the same name).\n" "\n" " :arg key: The key associated with the layer.\n" " :type key: string\n" @@ -929,7 +929,7 @@ PyDoc_STRVAR(bpy_bmlayeraccess_type_doc, "Exposes custom-data layer attributes." PyDoc_STRVAR(bpy_bmlayercollection_type_doc, "Gives access to a collection of custom-data layers of the same type and behaves " - "like python dictionaries, " + "like Python dictionaries, " "except for the ability to do list like index access."); PyDoc_STRVAR(bpy_bmlayeritem_type_doc, diff --git a/source/blender/python/bmesh/bmesh_py_types_meshdata.c b/source/blender/python/bmesh/bmesh_py_types_meshdata.c index 0d07dd6bfb8..eb93ef02c6e 100644 --- a/source/blender/python/bmesh/bmesh_py_types_meshdata.c +++ b/source/blender/python/bmesh/bmesh_py_types_meshdata.c @@ -600,7 +600,7 @@ PyDoc_STRVAR(bpy_bmdeformvert_keys_doc, ".. method:: keys()\n" "\n" " Return the group indices used by this vertex\n" - " (matching pythons dict.keys() functionality).\n" + " (matching Python's dict.keys() functionality).\n" "\n" " :return: the deform group this vertex uses\n" " :rtype: list of ints\n"); @@ -622,7 +622,7 @@ PyDoc_STRVAR(bpy_bmdeformvert_values_doc, ".. method:: values()\n" "\n" " Return the weights of the deform vertex\n" - " (matching pythons dict.values() functionality).\n" + " (matching Python's dict.values() functionality).\n" "\n" " :return: The weights that influence this vertex\n" " :rtype: list of floats\n"); @@ -644,7 +644,7 @@ PyDoc_STRVAR(bpy_bmdeformvert_items_doc, ".. method:: items()\n" "\n" " Return (group, weight) pairs for this vertex\n" - " (matching pythons dict.items() functionality).\n" + " (matching Python's dict.items() functionality).\n" "\n" " :return: (key, value) pairs for each deform weight of this vertex.\n" " :rtype: list of tuples\n"); @@ -669,7 +669,7 @@ PyDoc_STRVAR(bpy_bmdeformvert_get_doc, ".. method:: get(key, default=None)\n" "\n" " Returns the deform weight matching the key or default\n" - " when not found (matches pythons dictionary function of the same name).\n" + " when not found (matches Python's dictionary function of the same name).\n" "\n" " :arg key: The key associated with deform weight.\n" " :type key: int\n" diff --git a/source/blender/python/generic/idprop_py_api.c b/source/blender/python/generic/idprop_py_api.c index f2fe31d973e..9542a00283f 100644 --- a/source/blender/python/generic/idprop_py_api.c +++ b/source/blender/python/generic/idprop_py_api.c @@ -1553,7 +1553,7 @@ static PyObject *BPy_IDGroup_update(BPy_IDProperty *self, PyObject *value) PyDoc_STRVAR(BPy_IDGroup_to_dict_doc, ".. method:: to_dict()\n" "\n" - " Return a purely python version of the group.\n"); + " Return a purely Python version of the group.\n"); static PyObject *BPy_IDGroup_to_dict(BPy_IDProperty *self) { return BPy_IDGroup_MapDataToPy(self->prop); diff --git a/source/blender/python/generic/py_capi_utils.c b/source/blender/python/generic/py_capi_utils.c index 3bc1b286587..e0dc9402e26 100644 --- a/source/blender/python/generic/py_capi_utils.c +++ b/source/blender/python/generic/py_capi_utils.c @@ -607,7 +607,7 @@ void PyC_LineSpit(void) /* NOTE: allow calling from outside python (RNA). */ if (!PyC_IsInterpreterActive()) { - fprintf(stderr, "python line lookup failed, interpreter inactive\n"); + fprintf(stderr, "Python line lookup failed, interpreter inactive\n"); return; } @@ -621,7 +621,7 @@ void PyC_StackSpit(void) { /* NOTE: allow calling from outside python (RNA). */ if (!PyC_IsInterpreterActive()) { - fprintf(stderr, "python line lookup failed, interpreter inactive\n"); + fprintf(stderr, "Python line lookup failed, interpreter inactive\n"); return; } diff --git a/source/blender/python/intern/bpy_interface.c b/source/blender/python/intern/bpy_interface.c index 0822aab738d..5ceadcea887 100644 --- a/source/blender/python/intern/bpy_interface.c +++ b/source/blender/python/intern/bpy_interface.c @@ -410,7 +410,7 @@ void BPY_python_start(bContext *C, int argc, const char **argv) else { /* Set to `sys.executable = None` below (we can't do before Python is initialized). */ fprintf(stderr, - "Unable to find the python binary, " + "Unable to find the Python binary, " "the multiprocessing module may not be functional!\n"); } } @@ -427,7 +427,7 @@ void BPY_python_start(bContext *C, int argc, const char **argv) if (strchr(py_path_bundle, ':')) { fprintf(stderr, "Warning! Blender application is located in a path containing ':' or '/' chars\n" - "This may make python import function fail\n"); + "This may make Python import function fail\n"); } # endif /* __APPLE__ */ diff --git a/source/blender/python/intern/bpy_utils_units.c b/source/blender/python/intern/bpy_utils_units.c index 49ed09a1806..c50872ef426 100644 --- a/source/blender/python/intern/bpy_utils_units.c +++ b/source/blender/python/intern/bpy_utils_units.c @@ -156,7 +156,7 @@ PyDoc_STRVAR( " :type str_ref_unit: string or None\n" " :return: The converted/interpreted value.\n" " :rtype: float\n" - " :raises ValueError: if conversion fails to generate a valid python float value.\n"); + " :raises ValueError: if conversion fails to generate a valid Python float value.\n"); static PyObject *bpyunits_to_value(PyObject *UNUSED(self), PyObject *args, PyObject *kw) { char *usys_str = NULL, *ucat_str = NULL, *inpt = NULL, *uref = NULL; @@ -243,7 +243,7 @@ PyDoc_STRVAR(bpyunits_to_string_doc, " :type compatible_unit: bool\n" " :return: The converted string.\n" " :rtype: str\n" - " :raises ValueError: if conversion fails to generate a valid python string.\n"); + " :raises ValueError: if conversion fails to generate a valid Python string.\n"); static PyObject *bpyunits_to_string(PyObject *UNUSED(self), PyObject *args, PyObject *kw) { char *usys_str = NULL, *ucat_str = NULL; diff --git a/source/blender/python/mathutils/mathutils_Vector.c b/source/blender/python/mathutils/mathutils_Vector.c index ceb8bc78804..f40d5e0fb7d 100644 --- a/source/blender/python/mathutils/mathutils_Vector.c +++ b/source/blender/python/mathutils/mathutils_Vector.c @@ -475,7 +475,7 @@ static PyObject *Vector_resize(VectorObject *self, PyObject *value) if (self->flag & BASE_MATH_FLAG_IS_WRAP) { PyErr_SetString(PyExc_TypeError, "Vector.resize(): " - "cannot resize wrapped data - only python vectors"); + "cannot resize wrapped data - only Python vectors"); return NULL; } if (self->cb_user) { @@ -559,7 +559,7 @@ static PyObject *Vector_resize_2d(VectorObject *self) if (self->flag & BASE_MATH_FLAG_IS_WRAP) { PyErr_SetString(PyExc_TypeError, "Vector.resize_2d(): " - "cannot resize wrapped data - only python vectors"); + "cannot resize wrapped data - only Python vectors"); return NULL; } if (self->cb_user) { @@ -590,7 +590,7 @@ static PyObject *Vector_resize_3d(VectorObject *self) if (self->flag & BASE_MATH_FLAG_IS_WRAP) { PyErr_SetString(PyExc_TypeError, "Vector.resize_3d(): " - "cannot resize wrapped data - only python vectors"); + "cannot resize wrapped data - only Python vectors"); return NULL; } if (self->cb_user) { @@ -625,7 +625,7 @@ static PyObject *Vector_resize_4d(VectorObject *self) if (self->flag & BASE_MATH_FLAG_IS_WRAP) { PyErr_SetString(PyExc_TypeError, "Vector.resize_4d(): " - "cannot resize wrapped data - only python vectors"); + "cannot resize wrapped data - only Python vectors"); return NULL; } if (self->cb_user) { diff --git a/source/blender/windowmanager/intern/wm_operator_props.c b/source/blender/windowmanager/intern/wm_operator_props.c index b2ad48b9cab..eb130941195 100644 --- a/source/blender/windowmanager/intern/wm_operator_props.c +++ b/source/blender/windowmanager/intern/wm_operator_props.c @@ -145,7 +145,7 @@ void WM_operator_properties_filesel(wmOperatorType *ot, ot->srna, "filter_movie", (filter & FILE_TYPE_MOVIE) != 0, "Filter movie files", ""); RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE); prop = RNA_def_boolean( - ot->srna, "filter_python", (filter & FILE_TYPE_PYSCRIPT) != 0, "Filter python files", ""); + ot->srna, "filter_python", (filter & FILE_TYPE_PYSCRIPT) != 0, "Filter Python files", ""); RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE); prop = RNA_def_boolean( ot->srna, "filter_font", (filter & FILE_TYPE_FTFONT) != 0, "Filter font files", ""); -- 2.30.2