[Bf-blender-cvs] [e2a411570e5] master: Cleanup/fixes in UI messages.
Bastien Montagne
noreply at git.blender.org
Mon Aug 9 14:43:07 CEST 2021
Commit: e2a411570e5597eb5d84743a2b658b75fe1c37e9
Author: Bastien Montagne
Date: Mon Aug 9 14:41:30 2021 +0200
Branches: master
https://developer.blender.org/rBe2a411570e5597eb5d84743a2b658b75fe1c37e9
Cleanup/fixes in UI messages.
===================================================================
M release/scripts/modules/bl_i18n_utils/utils_spell_check.py
M release/scripts/startup/bl_operators/assets.py
M release/scripts/startup/bl_ui/space_spreadsheet.py
M source/blender/blenkernel/intern/lib_override.c
M source/blender/blenkernel/intern/object.c
M source/blender/editors/armature/pose_lib_2.c
M source/blender/editors/object/object_modes.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/space_sequencer/sequencer_add.c
M source/blender/makesrna/intern/rna_asset.c
M source/blender/makesrna/intern/rna_gpencil.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/windowmanager/intern/wm_files.c
===================================================================
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 c310eee0b14..14fc81821c4 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -48,6 +48,7 @@ class SpellChecker:
"equi", # equi-angular, etc.
"fader",
"globbing",
+ "haptics",
"hasn", # hasn't
"hetero",
"hoc", # ad-hoc
@@ -188,7 +189,7 @@ class SpellChecker:
"reprojection", "reproject", "reprojecting",
"resize",
"restpose",
- "resync",
+ "resync", "resynced",
"retarget", "retargets", "retargeting", "retargeted",
"retiming",
"rigidbody",
@@ -227,6 +228,7 @@ class SpellChecker:
"un",
"unassociate", "unassociated",
"unbake",
+ "uncheck",
"unclosed",
"uncomment",
"unculled",
@@ -381,6 +383,7 @@ class SpellChecker:
"albedo",
"anamorphic",
"anisotropic", "anisotropy",
+ "bimanual", # OpenXR?
"bitangent",
"boid", "boids",
"ceil",
@@ -430,6 +433,7 @@ class SpellChecker:
"spacebar",
"subtractive",
"superellipse",
+ "thumbstick",
"tooltip", "tooltips",
"trackpad",
"tuple",
@@ -493,7 +497,7 @@ class SpellChecker:
"pinlight",
"qi",
"radiosity",
- "raycasting",
+ "raycast", "raycasting",
"raytrace", "raytracing", "raytraced",
"refractions",
"remesher", "remeshing", "remesh",
@@ -698,6 +702,7 @@ class SpellChecker:
"msgid", "msgids",
"mux",
"ndof",
+ "pbr", # Physically Based Rendering
"ppc",
"precisa",
"px",
diff --git a/release/scripts/startup/bl_operators/assets.py b/release/scripts/startup/bl_operators/assets.py
index c782cd0646e..8c76018b7a1 100644
--- a/release/scripts/startup/bl_operators/assets.py
+++ b/release/scripts/startup/bl_operators/assets.py
@@ -130,7 +130,7 @@ class ASSET_OT_open_containing_blend_file(Operator):
return {'RUNNING_MODAL'}
if returncode:
- self.report({'WARNING'}, "Blender subprocess exited with error code %d" % returncode)
+ self.report({'WARNING'}, "Blender sub-process exited with error code %d" % returncode)
# TODO(Sybren): Replace this with a generic "reload assets" operator
# that can run outside of the Asset Browser context.
diff --git a/release/scripts/startup/bl_ui/space_spreadsheet.py b/release/scripts/startup/bl_ui/space_spreadsheet.py
index afdbfea5091..51f8841419b 100644
--- a/release/scripts/startup/bl_ui/space_spreadsheet.py
+++ b/release/scripts/startup/bl_ui/space_spreadsheet.py
@@ -55,7 +55,7 @@ class SPREADSHEET_HT_header(bpy.types.Header):
layout.operator("spreadsheet.toggle_pin", text="", icon=pin_icon, emboss=False)
if space.object_eval_state == 'VIEWER_NODE' and len(context_path) < 3:
- layout.label(text="No active viewer node.", icon='INFO')
+ layout.label(text="No active viewer node", icon='INFO')
layout.separator_spacer()
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index 67ed7d1b394..bebc49e090d 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -1020,7 +1020,7 @@ bool BKE_lib_override_library_resync(Main *bmain,
if (id_root_reference->tag & LIB_TAG_MISSING) {
BKE_reportf(reports != NULL ? reports->reports : NULL,
RPT_ERROR,
- "impossible to resync data-block %s and its dependencies, as its linked reference "
+ "Impossible to resync data-block %s and its dependencies, as its linked reference "
"is missing",
id_root->name + 2);
return false;
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 2e69782f6c0..23b9dca8371 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -914,7 +914,7 @@ static void object_blend_read_lib(BlendLibReader *reader, ID *id)
if (ob->id.lib) {
BLO_reportf_wrap(reports,
RPT_INFO,
- TIP_("Can't find obdata of %s lib %s\n"),
+ TIP_("Can't find object data of %s lib %s\n"),
ob->id.name + 2,
ob->id.lib->filepath);
}
diff --git a/source/blender/editors/armature/pose_lib_2.c b/source/blender/editors/armature/pose_lib_2.c
index 5b6100c9785..91a5dc67a21 100644
--- a/source/blender/editors/armature/pose_lib_2.c
+++ b/source/blender/editors/armature/pose_lib_2.c
@@ -423,7 +423,7 @@ static void poselib_blend_cleanup(bContext *C, wmOperator *op)
case POSE_BLEND_ORIGINAL:
/* Cleanup should not be called directly from these states. */
BLI_assert_msg(0, "poselib_blend_cleanup: unexpected pose blend state");
- BKE_report(op->reports, RPT_ERROR, "Internal pose library error, cancelling operator");
+ BKE_report(op->reports, RPT_ERROR, "Internal pose library error, canceling operator");
ATTR_FALLTHROUGH;
case POSE_BLEND_CANCEL:
ED_pose_backup_restore(pbd->pose_backup);
diff --git a/source/blender/editors/object/object_modes.c b/source/blender/editors/object/object_modes.c
index 36a4f002978..2c58ef02486 100644
--- a/source/blender/editors/object/object_modes.c
+++ b/source/blender/editors/object/object_modes.c
@@ -585,7 +585,7 @@ void OBJECT_OT_transfer_mode(wmOperatorType *ot)
"use_flash_on_transfer",
true,
"Flash On Transfer",
- "Flash the target object when transfering the mode");
+ "Flash the target object when transferring the mode");
}
/** \} */
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 92d0deb49d0..a9a439c5084 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -2742,11 +2742,11 @@ char *ED_object_ot_drop_named_material_tooltip(bContext *C,
char *result;
if (prev_mat) {
- const char *tooltip = TIP_("Drop %s on %s (slot %d, replacing %s).");
+ const char *tooltip = TIP_("Drop %s on %s (slot %d, replacing %s)");
result = BLI_sprintfN(tooltip, name, ob->id.name + 2, active_mat_slot, prev_mat->id.name + 2);
}
else {
- const char *tooltip = TIP_("Drop %s on %s (slot %d).");
+ const char *tooltip = TIP_("Drop %s on %s (slot %d)");
result = BLI_sprintfN(tooltip, name, ob->id.name + 2, active_mat_slot);
}
return result;
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 6af18104336..cff3ecfbbd3 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -403,7 +403,7 @@ bool ED_operator_object_active_editable_ex(bContext *C, const Object *ob)
}
if (ed_object_hidden(ob)) {
- CTX_wm_operator_poll_msg_set(C, "Cannot edit hidden obect");
+ CTX_wm_operator_poll_msg_set(C, "Cannot edit hidden object");
return false;
}
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index c4575b3403e..265a52ed1a6 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -159,7 +159,7 @@ static void sequencer_generic_props__internal(wmOperatorType *ot, int flag)
"set_view_transform",
true,
"Set View Transform",
- "Set appropriate view transform based on media colorspace");
+ "Set appropriate view transform based on media color space");
}
}
diff --git a/source/blender/makesrna/intern/rna_asset.c b/source/blender/makesrna/intern/rna_asset.c
index 3b3a04e1128..1e583f4ca52 100644
--- a/source/blender/makesrna/intern/rna_asset.c
+++ b/source/blender/makesrna/intern/rna_asset.c
@@ -319,7 +319,7 @@ static void rna_def_asset_library_reference(BlenderRNA *brna)
{
StructRNA *srna = RNA_def_struct(brna, "AssetLibraryReference", NULL);
RNA_def_struct_ui_text(
- srna, "Asset Library Reference", "Identifier to refere to the asset library");
+ srna, "Asset Library Reference", "Identifier to refer to the asset library");
}
/**
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index aad6f1231dd..3e5dce64c7b 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -2117,7 +2117,7 @@ static void rna_def_gpencil_layer(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_viewlayer_masks", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", GP_LAYER_DISABLE_MASKS_IN_VIEWLAYER);
RNA_def_property_ui_text(
- prop, "Use Masks in Render", "Include the mask layers when rendering the viewlayer");
+ prop, "Use Masks in Render", "Include the mask layers when rendering the view-layer");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
/* blend mode */
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index d29a90a1886..2d93715a438 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -6155,7 +6155,7 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
prop,
"Python Scripts Directory",
"Alternate script path, matching the default layout with subdirectories: "
- "startup, addons, modules, and presets (requires restart)");
+ "startup, add-ons, modules, and presets (requires restart)");
/* TODO: editing sho
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list