From 025df50f61b68a97fcc872cfd5e0e671b81cbeeb Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 12 Feb 2019 21:28:04 +0100 Subject: Fix T51771: UI Messages: Reserve 'Normal' to its geometric meaning. Using 'Regular' instead for the common meaning, this avoids having to add some i18n context disambiguation... --- source/blender/makesrna/intern/rna_gpencil.c | 2 +- source/blender/makesrna/intern/rna_gpencil_modifier.c | 2 +- source/blender/makesrna/intern/rna_mesh.c | 2 +- source/blender/makesrna/intern/rna_modifier.c | 2 +- source/blender/makesrna/intern/rna_shader_fx.c | 2 +- source/blender/makesrna/intern/rna_space.c | 2 +- source/blender/makesrna/intern/rna_ui.c | 2 +- source/blender/makesrna/intern/rna_userdef.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'source/blender/makesrna') diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index 92a2e333a36..e91c052832c 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -71,7 +71,7 @@ static const EnumPropertyItem rna_enum_gplayer_move_type_items[] = { }; static const EnumPropertyItem rna_enum_layer_blend_modes_items[] = { - {eGplBlendMode_Normal, "NORMAL", 0, "Normal", "" }, + {eGplBlendMode_Normal, "NORMAL", 0, "Regular", "" }, {eGplBlendMode_Overlay, "OVERLAY", 0, "Overlay", "" }, {eGplBlendMode_Add, "ADD", 0, "Add", "" }, {eGplBlendMode_Subtract, "SUBTRACT", 0, "Subtract", "" }, diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index 2bf9487641c..c198699f6c9 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -99,7 +99,7 @@ static const EnumPropertyItem modifier_gphook_falloff_items[] = { }; static const EnumPropertyItem rna_enum_time_mode_items[] = { - {GP_TIME_MODE_NORMAL, "NORMAL", 0, "Normal", "Apply offset in normal animation direction"}, + {GP_TIME_MODE_NORMAL, "NORMAL", 0, "Regular", "Apply offset in usual animation direction"}, {GP_TIME_MODE_REVERSE, "REVERSE", 0, "Reverse", "Apply offset in reverse animation direction"}, {GP_TIME_MODE_FIX, "FIX", 0, "Fixed Frame", "Keep frame and do not change with time"}, {0, NULL, 0, NULL, NULL}, diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 0333a549240..d5b5270b5f3 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -46,7 +46,7 @@ #include "WM_types.h" const EnumPropertyItem rna_enum_mesh_delimit_mode_items[] = { - {BMO_DELIM_NORMAL, "NORMAL", 0, "Normal", "Delimit by face directions"}, + {BMO_DELIM_NORMAL, "NORMAL", 0, "Regular", "Delimit by face directions"}, {BMO_DELIM_MATERIAL, "MATERIAL", 0, "Material", "Delimit by face material"}, {BMO_DELIM_SEAM, "SEAM", 0, "Seam", "Delimit by edge seams"}, {BMO_DELIM_SHARP, "SHARP", 0, "Sharp", "Delimit by sharp edges"}, diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 87283ef0f43..34c6bc80fb6 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -2748,7 +2748,7 @@ static void rna_def_modifier_particleinstance(BlenderRNA *brna) prop = RNA_def_property(srna, "use_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", eParticleInstanceFlag_Parents); - RNA_def_property_ui_text(prop, "Normal", "Create instances from normal particles"); + RNA_def_property_ui_text(prop, "Regular", "Create instances from normal particles"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); prop = RNA_def_property(srna, "use_children", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_shader_fx.c b/source/blender/makesrna/intern/rna_shader_fx.c index 664e17af375..62c1ea6d334 100644 --- a/source/blender/makesrna/intern/rna_shader_fx.c +++ b/source/blender/makesrna/intern/rna_shader_fx.c @@ -58,7 +58,7 @@ const EnumPropertyItem rna_enum_object_shaderfx_type_items[] = { }; static const EnumPropertyItem rna_enum_shaderfx_rim_modes_items[] = { - {eShaderFxRimMode_Normal, "NORMAL", 0, "Normal", "" }, + {eShaderFxRimMode_Normal, "NORMAL", 0, "Regular", "" }, {eShaderFxRimMode_Overlay, "OVERLAY", 0, "Overlay", "" }, {eShaderFxRimMode_Add, "ADD", 0, "Add", "" }, {eShaderFxRimMode_Subtract, "SUBTRACT", 0, "Subtract", "" }, diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index e9920f49dda..d36a27bcd4c 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -4347,7 +4347,7 @@ static void rna_def_fileselect_params(BlenderRNA *brna) static const EnumPropertyItem display_size_items[] = { {32, "TINY", 0, "Tiny", ""}, {64, "SMALL", 0, "Small", ""}, - {128, "NORMAL", 0, "Normal", ""}, + {128, "NORMAL", 0, "Regular", ""}, {256, "LARGE", 0, "Large", ""}, {0, NULL, 0, NULL, NULL}, }; diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index 6006bc8119d..e95f537e027 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -1039,7 +1039,7 @@ static void rna_def_ui_layout(BlenderRNA *brna) }; static const EnumPropertyItem emboss_items[] = { - {UI_EMBOSS, "NORMAL", 0, "Normal", "Draw standard button emboss style"}, + {UI_EMBOSS, "NORMAL", 0, "Regular", "Draw standard button emboss style"}, {UI_EMBOSS_NONE, "NONE", 0, "None", "Draw only text and icons"}, {UI_EMBOSS_PULLDOWN, "PULLDOWN_MENU", 0, "Pulldown Menu", "Draw pulldown menu style"}, {UI_EMBOSS_RADIAL, "RADIAL_MENU", 0, "Radial Menu", "Draw radial menu style"}, diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 8122ffee8a7..d3986dd91d0 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -3053,7 +3053,7 @@ static void rna_def_userdef_theme_colorset(BlenderRNA *brna) prop = RNA_def_property(srna, "normal", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "solid"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Normal", "Color used for the surface of bones"); + RNA_def_property_ui_text(prop, "Regular", "Color used for the surface of bones"); RNA_def_property_update(prop, 0, "rna_userdef_update"); prop = RNA_def_property(srna, "select", PROP_FLOAT, PROP_COLOR_GAMMA); -- cgit v1.2.3