blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 762 Projects 19 Wiki Activity

Cleanup/fixes in UI messages.

This commit is contained in:
Bastien Montagne 2021-08-09 14:41:30 +02:00
parent 3886ab05b4
commit e2a411570e
14 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
release/scripts/modules/bl_i18n_utils/utils_spell_check.py
View File

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

2
release/scripts/startup/bl_operators/assets.py
View File

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

2
release/scripts/startup/bl_ui/space_spreadsheet.py
View File

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

2
source/blender/blenkernel/intern/lib_override.c
View File

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

2
source/blender/blenkernel/intern/object.c
View File

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

2
source/blender/editors/armature/pose_lib_2.c
View File

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

2
source/blender/editors/object/object_modes.c
View File

@ -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");
}
/** \} */

4
source/blender/editors/object/object_relations.c
View File

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

2
source/blender/editors/screen/screen_ops.c
View File

@ -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;
}

2
source/blender/editors/space_sequencer/sequencer_add.c
View File

@ -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");
}
}

2
source/blender/makesrna/intern/rna_asset.c
View File

@ -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");
}
/**

2
source/blender/makesrna/intern/rna_gpencil.c
View File

@ -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 */

2
source/blender/makesrna/intern/rna_userdef.c
View File

@ -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 should reset sys.path! */
prop = RNA_def_property(srna, "i18n_branches_directory", PROP_STRING, PROP_DIRPATH);

4
source/blender/windowmanager/intern/wm_files.c
View File

@ -803,7 +803,7 @@ static void file_read_reports_finalize(BlendFileReadReport *bf_reports)
node_lib = node_lib->next) {
Library *library = node_lib->link;
BKE_reportf(
bf_reports->reports, RPT_INFO, "Library %s needs overrides resync.", library->filepath);
bf_reports->reports, RPT_INFO, "Library %s needs overrides resync", library->filepath);
}
}
@ -3443,7 +3443,7 @@ static uiBlock *block_create__close_file_dialog(struct bContext *C,
BLI_split_file_part(blendfile_pathpath, filename, sizeof(filename));
}
else {
STRNCPY(filename, IFACE_("untitled.blend"));
STRNCPY(filename, "untitled.blend");
}
uiItemL(layout, filename, ICON_NONE);