diff options
9 files changed, 22 insertions, 19 deletions
diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 4b841466df7..64541b86a9e 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -58,7 +58,7 @@ enum_filter_types = ( enum_aperture_types = ( ('RADIUS', "Radius", "Directly change the size of the aperture"), - ('FSTOP', "F/stop", "Change the size of the aperture by f/stops"), + ('FSTOP', "F-stop", "Change the size of the aperture by f-stop"), ) enum_panorama_types = ( @@ -522,13 +522,13 @@ class CyclesCameraSettings(bpy.types.PropertyGroup): cls.aperture_type = EnumProperty( name="Aperture Type", - description="Use F/stop number or aperture radius", + description="Use f-stop number or aperture radius", items=enum_aperture_types, default='RADIUS', ) cls.aperture_fstop = FloatProperty( - name="Aperture F/stop", - description="F/stop ratio (lower numbers give more defocus, higher numbers give a sharper image)", + name="Aperture f-stop", + description="F-stop ratio (lower numbers give more defocus, higher numbers give a sharper image)", min=0.0, soft_min=0.1, soft_max=64.0, default=5.6, step=10, diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py index 0e08731c658..3ec464613c0 100644 --- a/release/scripts/modules/bl_i18n_utils/settings.py +++ b/release/scripts/modules/bl_i18n_utils/settings.py @@ -290,7 +290,6 @@ WARN_MSGID_NOT_CAPITALIZED_ALLOWED = { "flac", "fps: %.2f", "fps: %i", - "fStop", "gimbal", "global", "iScale", 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 ee83c6cc3c9..4126dde1225 100644 --- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py +++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py @@ -217,6 +217,7 @@ class SpellChecker: "passepartout", "perspectively", "pixelate", + "pointiness", "polycount", "polygonization", "polygonalization", # yuck! "selectability", @@ -510,6 +511,7 @@ class SpellChecker: "fov", "fft", "futura", + "fx", "gfx", "gl", "glsl", @@ -540,6 +542,7 @@ class SpellChecker: "sdl", "sl", "smpte", + "ssao", "svn", "ui", "unix", diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py index a61791fe19c..7e4e0ea9246 100644 --- a/release/scripts/startup/bl_operators/clip.py +++ b/release/scripts/startup/bl_operators/clip.py @@ -132,7 +132,7 @@ class CLIP_OT_filter_tracks(bpy.types.Operator): track_threshold = FloatProperty( name="Track Threshold", - description="Filter Threshold to select problematic track", + description="Filter Threshold to select problematic tracks", default=5.0, ) diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 9fd763dda0d..be108432f0f 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -850,10 +850,11 @@ static void outliner_draw_userbuts(uiBlock *block, ARegion *ar, SpaceOops *soops UI_but_flag_enable(bt, but_flag); - bt = uiDefButBitS(block, UI_BTYPE_TOGGLE, LIB_FAKEUSER, 1, (id->flag & LIB_FAKEUSER) ? "F" : " ", - (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_RENDERX), te->ys, UI_UNIT_X, UI_UNIT_Y, - &id->flag, 0, 0, 0, 0, - TIP_("Datablock has a 'fake' user which will keep it in the flie even if nothing else uses it")); + bt = uiDefButBitS(block, UI_BTYPE_TOGGLE, LIB_FAKEUSER, 1, (id->flag & LIB_FAKEUSER) ? "F" : " ", + (int)(ar->v2d.cur.xmax - OL_TOG_RESTRICT_RENDERX), te->ys, UI_UNIT_X, UI_UNIT_Y, + &id->flag, 0, 0, 0, 0, + TIP_("Datablock has a 'fake' user which will keep it in the file " + "even if nothing else uses it")); UI_but_func_set(bt, restrictbutton_id_user_toggle, id, NULL); UI_but_flag_enable(bt, but_flag); diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 020bd480954..798dae2cef3 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -1500,7 +1500,7 @@ void OUTLINER_OT_orphans_purge(wmOperatorType *ot) /* identifiers */ ot->idname = "OUTLINER_OT_orphans_purge"; ot->name = "Purge All"; - ot->description = "Clears all orphaned datablocks without any users from the file (cannot be undone)"; + ot->description = "Clear all orphaned datablocks without any users from the file (cannot be undone)"; /* callbacks */ ot->invoke = outliner_orphans_purge_invoke; diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 42fefd16090..d6c3a851801 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -1393,7 +1393,7 @@ void OUTLINER_OT_constraint_operation(wmOperatorType *ot) /* identifiers */ ot->name = "Outliner Constraint Operation"; ot->idname = "OUTLINER_OT_constraint_operation"; - ot->description = "Outliner ContextMenu Constraint Operation"; + ot->description = ""; /* callbacks */ ot->invoke = WM_menu_invoke; @@ -1439,7 +1439,7 @@ void OUTLINER_OT_modifier_operation(wmOperatorType *ot) /* identifiers */ ot->name = "Outliner Modifier Operation"; ot->idname = "OUTLINER_OT_modifier_operation"; - ot->description = "Outliner ContextMenu Modifier Operation"; + ot->description = ""; /* callbacks */ ot->invoke = WM_menu_invoke; diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 8d2a44136e8..eb2cb9e9312 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -4987,7 +4987,7 @@ static void def_cmp_defocus(StructRNA *srna) prop = RNA_def_property(srna, "f_stop", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "fstop"); RNA_def_property_range(prop, 0.0f, 128.0f); - RNA_def_property_ui_text(prop, "fStop", + RNA_def_property_ui_text(prop, "F-stop", "Amount of focal blur, 128=infinity=perfect focus, half the value doubles " "the blur radius"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); @@ -5744,7 +5744,7 @@ static void def_cmp_bokehblur(StructRNA *srna) prop = RNA_def_property(srna, "f_stop", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "custom3"); RNA_def_property_range(prop, 0.0f, 128.0f); - RNA_def_property_ui_text(prop, "fStop", + RNA_def_property_ui_text(prop, "F-stop", "Amount of focal blur, 128=infinity=perfect focus, half the value doubles " "the blur radius"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index a74c5beb5ab..205cd0c1ed6 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -3861,7 +3861,7 @@ static void rna_def_gpu_dof_fx(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "focal_length", PROP_FLOAT, PROP_DISTANCE_CAMERA); - RNA_def_property_ui_text(prop, "Focal Length", "Foca Length for dof effect"); + RNA_def_property_ui_text(prop, "Focal Length", "Focal length for dof effect"); RNA_def_property_range(prop, 1.0f, FLT_MAX); RNA_def_property_ui_range(prop, 1.0f, 5000.0f, 1, 2); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); @@ -3873,7 +3873,7 @@ static void rna_def_gpu_dof_fx(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "fstop", PROP_FLOAT, PROP_NONE); - RNA_def_property_ui_text(prop, "Viewport f-stop", "FStop for dof effect"); + RNA_def_property_ui_text(prop, "Viewport F-stop", "F-stop for dof effect"); RNA_def_property_range(prop, 0.0f, FLT_MAX); RNA_def_property_ui_range(prop, 0.1f, 128.0f, 10, 1); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); @@ -3889,7 +3889,7 @@ static void rna_def_gpu_ssao_fx(BlenderRNA *brna) RNA_def_struct_ui_icon(srna, ICON_RENDERLAYERS); prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE); - RNA_def_property_ui_text(prop, "Strength", "Strength of the ssao effect"); + RNA_def_property_ui_text(prop, "Strength", "Strength of the SSAO effect"); RNA_def_property_range(prop, 0.0f, 250.0f); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); @@ -3906,7 +3906,7 @@ static void rna_def_gpu_ssao_fx(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "samples", PROP_INT, PROP_NONE); - RNA_def_property_ui_text(prop, "Samples", "Number of samples. Final number is squared"); + RNA_def_property_ui_text(prop, "Samples", "Number of samples (final number is squared)"); RNA_def_property_range(prop, 1, 30); /* 0 is needed for compression. */ RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); |