[Bf-blender-cvs] [b358a92faf8] master: Various UI messages fixes...
Bastien Montagne
noreply at git.blender.org
Mon Jun 15 10:51:56 CEST 2020
Commit: b358a92faf87beff457c0db19e95ec35d376a036
Author: Bastien Montagne
Date: Mon Jun 15 10:51:26 2020 +0200
Branches: master
https://developer.blender.org/rBb358a92faf87beff457c0db19e95ec35d376a036
Various UI messages fixes...
===================================================================
M release/scripts/modules/bl_i18n_utils/utils_spell_check.py
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/object/object_collection.c
M source/blender/editors/space_sequencer/sequencer_edit.c
M source/blender/makesrna/intern/rna_collection.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_ui.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 b688b2cbc42..aa80611ac6b 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -69,6 +69,7 @@ class SpellChecker:
"spacings",
"teleport", "teleporting",
"vertices",
+ "wasn", # wasn't
# Merged words
"antialiasing",
@@ -178,7 +179,7 @@ class SpellChecker:
"reinject", "reinjected",
"rekey",
"remesh",
- "reprojection", "reproject",
+ "reprojection", "reproject", "reprojecting",
"resize",
"restpose",
"retarget", "retargets", "retargeting", "retargeted",
@@ -654,6 +655,7 @@ class SpellChecker:
"dx",
"eo",
"fh",
+ "fk",
"fov",
"fft",
"futura",
diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index 723c7d214e3..5c5adb32a97 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -2850,7 +2850,7 @@ void GPENCIL_OT_annotate(wmOperatorType *ot)
0,
200,
"Stabilizer Stroke Radius",
- "Minimun distance from last point before stroke continues",
+ "Minimum distance from last point before stroke continues",
1,
100);
RNA_def_property_subtype(prop, PROP_PIXEL);
diff --git a/source/blender/editors/object/object_collection.c b/source/blender/editors/object/object_collection.c
index 7a83d582299..24f6d8c79f9 100644
--- a/source/blender/editors/object/object_collection.c
+++ b/source/blender/editors/object/object_collection.c
@@ -483,13 +483,13 @@ static int collection_link_exec(bContext *C, wmOperator *op)
/* Currently this should not be allowed (might be supported in the future though...). */
if (ID_IS_OVERRIDE_LIBRARY(&collection->id)) {
- BKE_report(op->reports, RPT_ERROR, "Could not add the collection because it is overridden.");
+ BKE_report(op->reports, RPT_ERROR, "Could not add the collection because it is overridden");
return OPERATOR_CANCELLED;
}
/* Linked collections are already checked for by using RNA_collection_local_itemf
* but operator can be called without invoke */
if (ID_IS_LINKED(&collection->id)) {
- BKE_report(op->reports, RPT_ERROR, "Could not add the collection because it is linked.");
+ BKE_report(op->reports, RPT_ERROR, "Could not add the collection because it is linked");
return OPERATOR_CANCELLED;
}
diff --git a/source/blender/editors/space_sequencer/sequencer_edit.c b/source/blender/editors/space_sequencer/sequencer_edit.c
index aa2d5b2ae7d..9311cbed265 100644
--- a/source/blender/editors/space_sequencer/sequencer_edit.c
+++ b/source/blender/editors/space_sequencer/sequencer_edit.c
@@ -224,11 +224,11 @@ static void seq_proxy_build_job(const bContext *C, ReportList *reports)
selected = true;
if (!(seq->flag & SEQ_USE_PROXY)) {
- BKE_reportf(reports, RPT_WARNING, "Proxy is not enabled for %s, skipping.", seq->name);
+ BKE_reportf(reports, RPT_WARNING, "Proxy is not enabled for %s, skipping", seq->name);
continue;
}
else if (seq->strip->proxy->build_size_flags == 0) {
- BKE_reportf(reports, RPT_WARNING, "Resolution is not selected for %s, skipping.", seq->name);
+ BKE_reportf(reports, RPT_WARNING, "Resolution is not selected for %s, skipping", seq->name);
continue;
}
@@ -236,13 +236,13 @@ static void seq_proxy_build_job(const bContext *C, ReportList *reports)
pj->main, pj->depsgraph, pj->scene, seq, file_list, &pj->queue);
if (!success && (seq->strip->proxy->build_flags & SEQ_PROXY_SKIP_EXISTING) != 0) {
- BKE_reportf(reports, RPT_WARNING, "Overwrite is not checked for %s, skipping.", seq->name);
+ BKE_reportf(reports, RPT_WARNING, "Overwrite is not checked for %s, skipping", seq->name);
}
}
SEQ_END;
if (!selected) {
- BKE_reportf(reports, RPT_WARNING, "Select movie or image strips.");
+ BKE_reportf(reports, RPT_WARNING, "Select movie or image strips");
return;
}
diff --git a/source/blender/makesrna/intern/rna_collection.c b/source/blender/makesrna/intern/rna_collection.c
index fbc2b871026..9c6c95f2819 100644
--- a/source/blender/makesrna/intern/rna_collection.c
+++ b/source/blender/makesrna/intern/rna_collection.c
@@ -86,7 +86,7 @@ static void rna_Collection_objects_link(Collection *collection,
if (ID_IS_OVERRIDE_LIBRARY(&collection->id)) {
BKE_reportf(reports,
RPT_ERROR,
- "Could not link the object '%s' because the collection '%s' is overridden.",
+ "Could not link the object '%s' because the collection '%s' is overridden",
object->id.name + 2,
collection->id.name + 2);
return;
@@ -94,7 +94,7 @@ static void rna_Collection_objects_link(Collection *collection,
if (ID_IS_LINKED(&collection->id)) {
BKE_reportf(reports,
RPT_ERROR,
- "Could not link the object '%s' because the collection '%s' is linked.",
+ "Could not link the object '%s' because the collection '%s' is linked",
object->id.name + 2,
collection->id.name + 2);
return;
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 698cabff9e8..ffd9bb772cc 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -6158,7 +6158,8 @@ static void rna_def_modifier_wireframe(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_crease", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", MOD_WIREFRAME_CREASE);
- RNA_def_property_ui_text(prop, "Offset Relative", "Crease hub edges for improved subsurf");
+ RNA_def_property_ui_text(
+ prop, "Offset Relative", "Crease hub edges for improved subdivision surface");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "crease_weight", PROP_FLOAT, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c
index 73b3515030e..88bc9843bc0 100644
--- a/source/blender/makesrna/intern/rna_particle.c
+++ b/source/blender/makesrna/intern/rna_particle.c
@@ -3360,7 +3360,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
prop,
"Use Modifier Stack",
"Emit particles from mesh with modifiers applied "
- "(must use same subsurf level for viewport and render for correct results)");
+ "(must use same subdivision surface level for viewport and render for correct results)");
RNA_def_property_update(prop, 0, "rna_Particle_change_type");
/* draw objects & collections */
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 7e9753b090a..edbf4c90524 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -7236,7 +7236,7 @@ static void rna_def_scene_gpencil(BlenderRNA *brna)
RNA_def_property_ui_range(prop, 0.0f, 2.0f, 1, 3);
RNA_def_property_ui_text(prop,
"Anti-Aliasing Threshold",
- "Threshold for edge detection algorithm (higher values might overblur "
+ "Threshold for edge detection algorithm (higher values might over-blur "
"some part of the image)");
RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_LIBRARY);
RNA_def_property_update(prop, NC_SCENE | ND_RENDER_OPTIONS, NULL);
diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c
index 1449c410d18..9c9d10afa63 100644
--- a/source/blender/makesrna/intern/rna_ui.c
+++ b/source/blender/makesrna/intern/rna_ui.c
@@ -1290,7 +1290,7 @@ static void rna_def_panel(BlenderRNA *brna)
0,
"Instanced Panel",
"Multiple panels with this type can be used as part of a list depending on data external "
- "to the UI. Used to create panels for the modifiers and other stacks."},
+ "to the UI. Used to create panels for the modifiers and other stacks"},
{PNL_LAYOUT_HEADER_EXPAND,
"HEADER_LAYOUT_EXPAND",
0,
More information about the Bf-blender-cvs
mailing list