diff options
23 files changed, 471 insertions, 432 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 833d53ca79d..8c7c2f41110 100755 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -86,6 +86,7 @@ source/blender/editors/mesh/editmesh_loop.c source/blender/editors/mesh/editmesh_mods.c source/blender/editors/mesh/editmesh_tools.c source/blender/editors/mesh/loopcut.c +source/blender/editors/mesh/mesh_data.c source/blender/editors/mesh/mesh_ops.c source/blender/editors/metaball/mball_edit.c @@ -95,11 +96,13 @@ source/blender/editors/object/object_constraint.c source/blender/editors/object/object_edit.c source/blender/editors/object/object_group.c source/blender/editors/object/object_lattice.c +source/blender/editors/object/object_modifier.c source/blender/editors/object/object_ops.c source/blender/editors/object/object_relations.c source/blender/editors/object/object_select.c source/blender/editors/object/object_shapekey.c source/blender/editors/object/object_transform.c +source/blender/editors/object/object_vgroup.c source/blender/editors/physics/particle_edit.c source/blender/editors/physics/particle_object.c @@ -126,7 +129,9 @@ source/blender/editors/space_action/action_edit.c source/blender/editors/space_action/action_ops.c source/blender/editors/space_action/action_select.c +source/blender/editors/space_buttons/buttons_header.c source/blender/editors/space_buttons/buttons_ops.c + source/blender/editors/space_console/console_ops.c source/blender/editors/space_file/file_draw.c @@ -192,18 +197,24 @@ source/blender/editors/uvedit/uvedit_unwrap_ops.c source/blender/makesrna/intern/rna_ID.c source/blender/makesrna/intern/rna_action.c source/blender/makesrna/intern/rna_color.c +source/blender/makesrna/intern/rna_constraint.c source/blender/makesrna/intern/rna_curve.c source/blender/makesrna/intern/rna_fcurve.c source/blender/makesrna/intern/rna_material.c +source/blender/makesrna/intern/rna_mesh.c +source/blender/makesrna/intern/rna_modifier.c source/blender/makesrna/intern/rna_object.c source/blender/makesrna/intern/rna_object_force.c +source/blender/makesrna/intern/rna_particle.c source/blender/makesrna/intern/rna_render.c source/blender/makesrna/intern/rna_scene.c source/blender/makesrna/intern/rna_space.c +source/blender/makesrna/intern/rna_texture.c source/blender/makesrna/intern/rna_ui_api.c source/blender/makesrna/intern/rna_userdef.c source/blender/makesrna/intern/rna_wm.c source/blender/makesrna/intern/rna_wm_api.c +source/blender/makesrna/intern/rna_world.c source/blender/windowmanager/intern/wm_files.c source/blender/windowmanager/intern/wm_operators.c diff --git a/release/scripts/startup/bl_operators/presets.py b/release/scripts/startup/bl_operators/presets.py index 31a6f421768..9abb6cdf0c6 100644 --- a/release/scripts/startup/bl_operators/presets.py +++ b/release/scripts/startup/bl_operators/presets.py @@ -145,6 +145,7 @@ class ExecutePreset(bpy.types.Operator): ''' Executes a preset ''' bl_idname = "script.execute_preset" bl_label = _("Execute a Python Preset") + __doc__ = _(" Executes a preset ") filepath = bpy.props.StringProperty( name=_("Path"), @@ -200,6 +201,7 @@ class AddPresetSSS(AddPresetBase, bpy.types.Operator): bl_idname = "material.sss_preset_add" bl_label = _("Add SSS Preset") preset_menu = "MATERIAL_MT_sss_presets" + __doc__ = _("Add a Subsurface Scattering Preset") preset_defines = [ ("material = " diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py index d544928c3fc..b5ad1615194 100644 --- a/release/scripts/startup/bl_ui/properties_physics_common.py +++ b/release/scripts/startup/bl_ui/properties_physics_common.py @@ -62,17 +62,17 @@ class PHYSICS_PT_add(PhysicButtonsPanel, bpy.types.Panel): col.operator("object.forcefield_toggle", text=_("Force Field"), icon='X') if(ob.type == 'MESH'): - physics_add(self, col, context.collision, "Collision", 'COLLISION', 'MOD_PHYSICS', False) - physics_add(self, col, context.cloth, "Cloth", 'CLOTH', 'MOD_CLOTH', True) + physics_add(self, col, context.collision, _("Collision"), 'COLLISION', 'MOD_PHYSICS', False) + physics_add(self, col, context.cloth, _("Cloth"), 'CLOTH', 'MOD_CLOTH', True) col = split.column() if(ob.type == 'MESH' or ob.type == 'LATTICE'or ob.type == 'CURVE'): - physics_add(self, col, context.soft_body, "Soft Body", 'SOFT_BODY', 'MOD_SOFT', True) + physics_add(self, col, context.soft_body, _("Soft Body"), 'SOFT_BODY', 'MOD_SOFT', True) if(ob.type == 'MESH'): - physics_add(self, col, context.fluid, "Fluid", 'FLUID_SIMULATION', 'MOD_FLUIDSIM', True) - physics_add(self, col, context.smoke, "Smoke", 'SMOKE', 'MOD_SMOKE', True) + physics_add(self, col, context.fluid, _("Fluid"), 'FLUID_SIMULATION', 'MOD_FLUIDSIM', True) + physics_add(self, col, context.smoke, _("Smoke"), 'SMOKE', 'MOD_SMOKE', True) #cachetype can be 'PSYS' 'HAIR' 'SMOKE' etc diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index 6b253b6ab2a..899b7ff457a 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -897,31 +897,31 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel): col = split.column() col.label(text=_("Diffuse:")) - factor_but(col, "use_map_diffuse", "diffuse_factor", "Intensity") - factor_but(col, "use_map_color_diffuse", "diffuse_color_factor", "Color") - factor_but(col, "use_map_alpha", "alpha_factor", "Alpha") - factor_but(col, "use_map_translucency", "translucency_factor", "Translucency") + factor_but(col, "use_map_diffuse", "diffuse_factor", _("Intensity")) + factor_but(col, "use_map_color_diffuse", "diffuse_color_factor", _("Color")) + factor_but(col, "use_map_alpha", "alpha_factor", _("Alpha")) + factor_but(col, "use_map_translucency", "translucency_factor", _("Translucency")) col.label(text=_("Specular:")) - factor_but(col, "use_map_specular", "specular_factor", "Intensity") - factor_but(col, "use_map_color_spec", "specular_color_factor", "Color") - factor_but(col, "use_map_hardness", "hardness_factor", "Hardness") + factor_but(col, "use_map_specular", "specular_factor", _("Intensity")) + factor_but(col, "use_map_color_spec", "specular_color_factor", _("Color")) + factor_but(col, "use_map_hardness", "hardness_factor", _("Hardness")) col = split.column() col.label(text=_("Shading:")) - factor_but(col, "use_map_ambient", "ambient_factor", "Ambient") - factor_but(col, "use_map_emit", "emit_factor", "Emit") - factor_but(col, "use_map_mirror", "mirror_factor", "Mirror") - factor_but(col, "use_map_raymir", "raymir_factor", "Ray Mirror") + factor_but(col, "use_map_ambient", "ambient_factor", _("Ambient")) + factor_but(col, "use_map_emit", "emit_factor", _("Emit")) + factor_but(col, "use_map_mirror", "mirror_factor", _("Mirror")) + factor_but(col, "use_map_raymir", "raymir_factor", _("Ray Mirror")) col.label(text=_("Geometry:")) # XXX replace 'or' when displacement is fixed to not rely on normal influence value. - sub_tmp = factor_but(col, "use_map_normal", "normal_factor", "Normal") + sub_tmp = factor_but(col, "use_map_normal", "normal_factor", _("Normal")) sub_tmp.active = (tex.use_map_normal or tex.use_map_displacement) # END XXX - factor_but(col, "use_map_warp", "warp_factor", "Warp") - factor_but(col, "use_map_displacement", "displacement_factor", "Displace") + factor_but(col, "use_map_warp", "warp_factor", _("Warp")) + factor_but(col, "use_map_displacement", "displacement_factor", _("Displace")) #sub = col.column() #sub.active = tex.use_map_translucency or tex.map_emit or tex.map_alpha or tex.map_raymir or tex.map_hardness or tex.map_ambient or tex.map_specularity or tex.map_reflection or tex.map_mirror @@ -932,75 +932,75 @@ class TEXTURE_PT_influence(TextureSlotPanel, bpy.types.Panel): split = layout.split() col = split.column() - factor_but(col, "use_map_color_diffuse", "diffuse_color_factor", "Color") - factor_but(col, "use_map_alpha", "alpha_factor", "Alpha") + factor_but(col, "use_map_color_diffuse", "diffuse_color_factor", _("Color")) + factor_but(col, "use_map_alpha", "alpha_factor", _("Alpha")) col = split.column() - factor_but(col, "use_map_raymir", "raymir_factor", "Size") - factor_but(col, "use_map_hardness", "hardness_factor", "Hardness") - factor_but(col, "use_map_translucency", "translucency_factor", "Add") + factor_but(col, "use_map_raymir", "raymir_factor", _("Size")) + factor_but(col, "use_map_hardness", "hardness_factor", _("Hardness")) + factor_but(col, "use_map_translucency", "translucency_factor", _("Add")) elif idblock.type == 'VOLUME': split = layout.split() col = split.column() - factor_but(col, "use_map_density", "density_factor", "Density") - factor_but(col, "use_map_emission", "emission_factor", "Emission") - factor_but(col, "use_map_scatter", "scattering_factor", "Scattering") - factor_but(col, "use_map_reflect", "reflection_factor", "Reflection") + factor_but(col, "use_map_density", "density_factor", _("Density")) + factor_but(col, "use_map_emission", "emission_factor", _("Emission")) + factor_but(col, "use_map_scatter", "scattering_factor", _("Scattering")) + factor_but(col, "use_map_reflect", "reflection_factor", _("Reflection")) col = split.column() col.label(text=" ") - factor_but(col, "use_map_color_emission", "emission_color_factor", "Emission Color") - factor_but(col, "use_map_color_transmission", "transmission_color_factor", "Transmission Color") - factor_but(col, "use_map_color_reflection", "reflection_color_factor", "Reflection Color") + factor_but(col, "use_map_color_emission", "emission_color_factor", _("Emission Color")) + factor_but(col, "use_map_color_transmission", "transmission_color_factor", _("Transmission Color")) + factor_but(col, "use_map_color_reflection", "reflection_color_factor", _("Reflection Color")) elif isinstance(idblock, bpy.types.Lamp): split = layout.split() col = split.column() - factor_but(col, "use_map_color", "color_factor", "Color") + factor_but(col, "use_map_color", "color_factor", _("Color")) col = split.column() - factor_but(col, "use_map_shadow", "shadow_factor", "Shadow") + factor_but(col, "use_map_shadow", "shadow_factor", _("Shadow")) elif isinstance(idblock, bpy.types.World): split = layout.split() col = split.column() - factor_but(col, "use_map_blend", "blend_factor", "Blend") - factor_but(col, "use_map_horizon", "horizon_factor", "Horizon") + factor_but(col, "use_map_blend", "blend_factor", _("Blend")) + factor_but(col, "use_map_horizon", "horizon_factor", _("Horizon")) col = split.column() - factor_but(col, "use_map_zenith_up", "zenith_up_factor", "Zenith Up") - factor_but(col, "use_map_zenith_down", "zenith_down_factor", "Zenith Down") + factor_but(col, "use_map_zenith_up", "zenith_up_factor", _("Zenith Up")) + factor_but(col, "use_map_zenith_down", "zenith_down_factor", _("Zenith Down")) elif isinstance(idblock, bpy.types.ParticleSettings): split = layout.split() col = split.column() col.label(text=_("General:")) - factor_but(col, "use_map_time", "time_factor", "Time") - factor_but(col, "use_map_life", "life_factor", "Lifetime") - factor_but(col, "use_map_density", "density_factor", "Density") - factor_but(col, "use_map_size", "size_factor", "Size") + factor_but(col, "use_map_time", "time_factor", _("Time")) + factor_but(col, "use_map_life", "life_factor", _("Lifetime")) + factor_but(col, "use_map_density", "density_factor", _("Density")) + factor_but(col, "use_map_size", "size_factor", _("Size")) col = split.column() col.label(text=_("Physics:")) - factor_but(col, "use_map_velocity", "velocity_factor", "Velocity") - factor_but(col, "use_map_damp", "damp_factor", "Damp") - factor_but(col, "use_map_gravity", "gravity_factor", "Gravity") - factor_but(col, "use_map_field", "field_factor", "Force Fields") + factor_but(col, "use_map_velocity", "velocity_factor", _("Velocity")) + factor_but(col, "use_map_damp", "damp_factor", _("Damp")) + factor_but(col, "use_map_gravity", "gravity_factor", _("Gravity")) + factor_but(col, "use_map_field", "field_factor", _("Force Fields")) layout.label(text=_("Hair:")) split = layout.split() col = split.column() - factor_but(col, "use_map_length", "length_factor", "Length") - factor_but(col, "use_map_clump", "clump_factor", "Clump") + factor_but(col, "use_map_length", "length_factor", _("Length")) + factor_but(col, "use_map_clump", "clump_factor", _("Clump")) col = split.column() - factor_but(col, "use_map_kink", "kink_factor", "Kink") - factor_but(col, "use_map_rough", "rough_factor", "Rough") + factor_but(col, "use_map_kink", "kink_factor", _("Kink")) + factor_but(col, "use_map_rough", "rough_factor", _("Rough")) layout.separator() diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index c4a302d4d18..73c9f817497 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -48,6 +48,8 @@ #include "BLI_edgehash.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "BKE_context.h" #include "BKE_depsgraph.h" #include "BKE_displist.h" @@ -322,8 +324,8 @@ static int uv_texture_add_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_uv_texture_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add UV Texture"; - ot->description= "Add UV texture layer"; + ot->name= _("Add UV Texture"); + ot->description= _("Add UV texture layer"); ot->idname= "MESH_OT_uv_texture_add"; /* api callbacks */ @@ -401,8 +403,8 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, wmEvent *event) void MESH_OT_drop_named_image(wmOperatorType *ot) { /* identifiers */ - ot->name= "Assign Image to UV Texture"; - ot->description= "Assigns Image to active UV layer, or creates a UV layer"; + ot->name= _("Assign Image to UV Texture"); + ot->description= _("Assigns Image to active UV layer, or creates a UV layer"); ot->idname= "MESH_OT_drop_named_image"; /* api callbacks */ @@ -413,8 +415,8 @@ void MESH_OT_drop_named_image(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* properties */ - RNA_def_string(ot->srna, "name", "Image", 24, "Name", "Image name to assign."); - RNA_def_string(ot->srna, "filepath", "Path", FILE_MAX, "Filepath", "Path to image file"); + RNA_def_string(ot->srna, "name", "Image", 24, _("Name"), _("Image name to assign.")); + RNA_def_string(ot->srna, "filepath", "Path", FILE_MAX, _("Filepath"), _("Path to image file")); } static int uv_texture_remove_exec(bContext *C, wmOperator *UNUSED(op)) @@ -431,8 +433,8 @@ static int uv_texture_remove_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_uv_texture_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove UV Texture"; - ot->description= "Remove UV texture layer"; + ot->name= _("Remove UV Texture"); + ot->description= _("Remove UV texture layer"); ot->idname= "MESH_OT_uv_texture_remove"; /* api callbacks */ @@ -460,8 +462,8 @@ static int vertex_color_add_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_vertex_color_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Vertex Color"; - ot->description= "Add vertex color layer"; + ot->name= _("Add Vertex Color"); + ot->description= _("Add vertex color layer"); ot->idname= "MESH_OT_vertex_color_add"; /* api callbacks */ @@ -486,8 +488,8 @@ static int vertex_color_remove_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_vertex_color_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Vertex Color"; - ot->description= "Remove vertex color layer"; + ot->name= _("Remove Vertex Color"); + ot->description= _("Remove vertex color layer"); ot->idname= "MESH_OT_vertex_color_remove"; /* api callbacks */ @@ -521,8 +523,8 @@ static int sticky_add_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_sticky_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Sticky"; - ot->description= "Add sticky UV texture layer"; + ot->name= _("Add Sticky"); + ot->description= _("Add sticky UV texture layer"); ot->idname= "MESH_OT_sticky_add"; /* api callbacks */ @@ -553,8 +555,8 @@ static int sticky_remove_exec(bContext *C, wmOperator *UNUSED(op)) void MESH_OT_sticky_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Sticky"; - ot->description= "Remove sticky UV texture layer"; + ot->name= _("Remove Sticky"); + ot->description= _("Remove sticky UV texture layer"); ot->idname= "MESH_OT_sticky_remove"; /* api callbacks */ diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c index 6cd49ac3861..7ff882d9eb0 100644 --- a/source/blender/editors/object/object_constraint.c +++ b/source/blender/editors/object/object_constraint.c @@ -1455,7 +1455,7 @@ void OBJECT_OT_constraint_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - ot->prop= RNA_def_enum(ot->srna, "type", constraint_type_items, 0, _("Type"), ""); + ot->prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(constraint_type_items), 0, _("Type"), ""); } void OBJECT_OT_constraint_add_with_targets(wmOperatorType *ot) diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index 2ac9161ffa3..47a9bf86567 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -50,6 +50,8 @@ #include "BLI_editVert.h" #include "BLI_utildefines.h" +#include "BLF_api.h" + #include "BKE_curve.h" #include "BKE_context.h" #include "BKE_depsgraph.h" @@ -643,8 +645,8 @@ void OBJECT_OT_modifier_add(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Add Modifier"; - ot->description = "Add a modifier to the active object"; + ot->name= _("Add Modifier"); + ot->description = _("Add a modifier to the active object"); ot->idname= "OBJECT_OT_modifier_add"; /* api callbacks */ @@ -656,7 +658,7 @@ void OBJECT_OT_modifier_add(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "type", modifier_type_items, eModifierType_Subsurf, "Type", ""); + prop= RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(modifier_type_items), eModifierType_Subsurf, "Type", ""); RNA_def_enum_funcs(prop, modifier_add_itemf); ot->prop= prop; } @@ -750,8 +752,8 @@ static int modifier_remove_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void OBJECT_OT_modifier_remove(wmOperatorType *ot) { - ot->name= "Remove Modifier"; - ot->description= "Remove a modifier from the active object"; + ot->name= _("Remove Modifier"); + ot->description= _("Remove a modifier from the active object"); ot->idname= "OBJECT_OT_modifier_remove"; ot->invoke= modifier_remove_invoke; @@ -789,8 +791,8 @@ static int modifier_move_up_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( void OBJECT_OT_modifier_move_up(wmOperatorType *ot) { - ot->name= "Move Up Modifier"; - ot->description= "Move modifier up in the stack"; + ot->name= _("Move Up Modifier"); + ot->description= _("Move modifier up in the stack"); ot->idname= "OBJECT_OT_modifier_move_up"; ot->invoke= modifier_move_up_invoke; @@ -828,8 +830,8 @@ static int modifier_move_down_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void OBJECT_OT_modifier_move_down(wmOperatorType *ot) { - ot->name= "Move Down Modifier"; - ot->description= "Move modifier down in the stack"; + ot->name= _("Move Down Modifier"); + ot->description= _("Move modifier down in the stack"); ot->idname= "OBJECT_OT_modifier_move_down"; ot->invoke= modifier_move_down_invoke; @@ -869,14 +871,14 @@ static int modifier_apply_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(ev } static EnumPropertyItem modifier_apply_as_items[] = { - {MODIFIER_APPLY_DATA, "DATA", 0, "Object Data", "Apply modifier to the object's data"}, - {MODIFIER_APPLY_SHAPE, "SHAPE", 0, "New Shape", "Apply deform-only modifier to a new shape on this object"}, + {MODIFIER_APPLY_DATA, "DATA", 0, N_("Object Data"), N_("Apply modifier to the object's data")}, + {MODIFIER_APPLY_SHAPE, "SHAPE", 0, N_("New Shape"), N_("Apply deform-only modifier to a new shape on this object")}, {0, NULL, 0, NULL, NULL}}; void OBJECT_OT_modifier_apply(wmOperatorType *ot) { - ot->name= "Apply Modifier"; - ot->description= "Apply modifier and remove from the stack"; + ot->name= _("Apply Modifier"); + ot->description= _("Apply modifier and remove from the stack"); ot->idname= "OBJECT_OT_modifier_apply"; ot->invoke= modifier_apply_invoke; @@ -886,7 +888,7 @@ void OBJECT_OT_modifier_apply(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "apply_as", modifier_apply_as_items, MODIFIER_APPLY_DATA, "Apply as", "How to apply the modifier to the geometry"); + RNA_def_enum(ot->srna, "apply_as", RNA_enum_items_gettexted(modifier_apply_as_items), MODIFIER_APPLY_DATA, _("Apply as"), _("How to apply the modifier to the geometry")); edit_modifier_properties(ot); } @@ -918,8 +920,8 @@ static int modifier_convert_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( void OBJECT_OT_modifier_convert(wmOperatorType *ot) { - ot->name= "Convert Modifier"; - ot->description= "Convert particles to a mesh object"; + ot->name= _("Convert Modifier"); + ot->description= _("Convert particles to a mesh object"); ot->idname= "OBJECT_OT_modifier_convert"; ot->invoke= modifier_convert_invoke; @@ -957,8 +959,8 @@ static int modifier_copy_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve void OBJECT_OT_modifier_copy(wmOperatorType *ot) { - ot->name= "Copy Modifier"; - ot->description= "Duplicate modifier at the same position in the stack"; + ot->name= _("Copy Modifier"); + ot->description= _("Duplicate modifier at the same position in the stack"); ot->idname= "OBJECT_OT_modifier_copy"; ot->invoke= modifier_copy_invoke; @@ -1002,8 +1004,8 @@ static int multires_higher_levels_delete_invoke(bContext *C, wmOperator *op, wmE void OBJECT_OT_multires_higher_levels_delete(wmOperatorType *ot) { - ot->name= "Delete Higher Levels"; - ot->description= "Deletes the higher resolution mesh, potential loss of detail"; + ot->name= _("Delete Higher Levels"); + ot->description= _("Deletes the higher resolution mesh, potential loss of detail"); ot->idname= "OBJECT_OT_multires_higher_levels_delete"; ot->poll= multires_poll; @@ -1043,8 +1045,8 @@ static int multires_subdivide_invoke(bContext *C, wmOperator *op, wmEvent *UNUSE void OBJECT_OT_multires_subdivide(wmOperatorType *ot) { - ot->name= "Multires Subdivide"; - ot->description= "Add a new level of subdivision"; + ot->name= _("Multires Subdivide"); + ot->description= _("Add a new level of subdivision"); ot->idname= "OBJECT_OT_multires_subdivide"; ot->poll= multires_poll; @@ -1101,8 +1103,8 @@ static int multires_reshape_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED( void OBJECT_OT_multires_reshape(wmOperatorType *ot) { - ot->name= "Multires Reshape"; - ot->description= "Copy vertex coordinates from other object"; + ot->name= _("Multires Reshape"); + ot->description= _("Copy vertex coordinates from other object"); ot->idname= "OBJECT_OT_multires_reshape"; ot->poll= multires_poll; @@ -1176,8 +1178,8 @@ static int multires_external_save_invoke(bContext *C, wmOperator *op, wmEvent *U void OBJECT_OT_multires_external_save(wmOperatorType *ot) { - ot->name= "Multires Save External"; - ot->description= "Save displacements to an external file"; + ot->name= _("Multires Save External"); + ot->description= _("Save displacements to an external file"); ot->idname= "OBJECT_OT_multires_external_save"; // XXX modifier no longer in context after file browser .. ot->poll= multires_poll; @@ -1210,8 +1212,8 @@ static int multires_external_pack_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_multires_external_pack(wmOperatorType *ot) { - ot->name= "Multires Pack External"; - ot->description= "Pack displacements from an external file"; + ot->name= _("Multires Pack External"); + ot->description= _("Pack displacements from an external file"); ot->idname= "OBJECT_OT_multires_external_pack"; ot->poll= multires_poll; @@ -1249,8 +1251,8 @@ static int multires_base_apply_invoke(bContext *C, wmOperator *op, wmEvent *UNUS void OBJECT_OT_multires_base_apply(wmOperatorType *ot) { - ot->name= "Multires Apply Base"; - ot->description= "Modify the base mesh to conform to the displaced mesh"; + ot->name= _("Multires Apply Base"); + ot->description= _("Modify the base mesh to conform to the displaced mesh"); ot->idname= "OBJECT_OT_multires_base_apply"; ot->poll= multires_poll; @@ -1343,8 +1345,8 @@ static int meshdeform_bind_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void OBJECT_OT_meshdeform_bind(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mesh Deform Bind"; - ot->description = "Bind mesh to cage in mesh deform modifier"; + ot->name= _("Mesh Deform Bind"); + ot->description = _("Bind mesh to cage in mesh deform modifier"); ot->idname= "OBJECT_OT_meshdeform_bind"; /* api callbacks */ @@ -1391,8 +1393,8 @@ static int explode_refresh_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(e void OBJECT_OT_explode_refresh(wmOperatorType *ot) { - ot->name= "Explode Refresh"; - ot->description= "Refresh data in the Explode modifier"; + ot->name= _("Explode Refresh"); + ot->description= _("Refresh data in the Explode modifier"); ot->idname= "OBJECT_OT_explode_refresh"; ot->poll= explode_poll; diff --git a/source/blender/editors/object/object_shapekey.c b/source/blender/editors/object/object_shapekey.c index e62fa403518..96988d15ab2 100644 --- a/source/blender/editors/object/object_shapekey.c +++ b/source/blender/editors/object/object_shapekey.c @@ -327,9 +327,9 @@ static int shape_key_remove_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_shape_key_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Shape Key"; + ot->name= _("Remove Shape Key"); ot->idname= "OBJECT_OT_shape_key_remove"; - ot->description= "Remove shape key from the object"; + ot->description= _("Remove shape key from the object"); /* api callbacks */ ot->poll= shape_key_mode_poll; @@ -360,8 +360,8 @@ static int shape_key_clear_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_shape_key_clear(wmOperatorType *ot) { /* identifiers */ - ot->name= "Clear Shape Keys"; - ot->description= "Clear weights for all shape keys"; + ot->name= _("Clear Shape Keys"); + ot->description= _("Clear weights for all shape keys"); ot->idname= "OBJECT_OT_shape_key_clear"; /* api callbacks */ @@ -385,7 +385,7 @@ static int shape_key_mirror_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_shape_key_mirror(wmOperatorType *ot) { /* identifiers */ - ot->name= "Mirror Shape Key"; + ot->name= _("Mirror Shape Key"); ot->idname= "OBJECT_OT_shape_key_mirror"; /* api callbacks */ @@ -448,13 +448,13 @@ static int shape_key_move_exec(bContext *C, wmOperator *op) void OBJECT_OT_shape_key_move(wmOperatorType *ot) { static EnumPropertyItem slot_move[] = { - {-1, "UP", 0, "Up", ""}, - {1, "DOWN", 0, "Down", ""}, + {-1, "UP", 0, N_("Up"), ""}, + {1, "DOWN", 0, N_("Down"), ""}, {0, NULL, 0, NULL, NULL} }; /* identifiers */ - ot->name= "Move Shape Key"; + ot->name= _("Move Shape Key"); ot->idname= "OBJECT_OT_shape_key_move"; /* api callbacks */ @@ -464,6 +464,6 @@ void OBJECT_OT_shape_key_move(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "type", slot_move, 0, "Type", ""); + RNA_def_enum(ot->srna, "type", RNA_enum_items_gettexted(slot_move), 0, _("Type"), ""); } diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index eed92549652..04390612dd0 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -1552,7 +1552,7 @@ static int vertex_group_add_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Vertex Group"; + ot->name= _("Add Vertex Group"); ot->idname= "OBJECT_OT_vertex_group_add"; /* api callbacks */ @@ -1683,7 +1683,7 @@ static int vertex_group_select_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_select(wmOperatorType *ot) { /* identifiers */ - ot->name= "Select Vertex Group"; + ot->name= _("Select Vertex Group"); ot->idname= "OBJECT_OT_vertex_group_select"; /* api callbacks */ @@ -1707,7 +1707,7 @@ static int vertex_group_deselect_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_deselect(wmOperatorType *ot) { /* identifiers */ - ot->name= "Deselect Vertex Group"; + ot->name= _("Deselect Vertex Group"); ot->idname= "OBJECT_OT_vertex_group_deselect"; /* api callbacks */ @@ -1733,7 +1733,7 @@ static int vertex_group_copy_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Vertex Group"; + ot->name= _("Copy Vertex Group"); ot->idname= "OBJECT_OT_vertex_group_copy"; /* api callbacks */ @@ -1763,7 +1763,7 @@ static int vertex_group_levels_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_levels(wmOperatorType *ot) { /* identifiers */ - ot->name= "Vertex Group Levels"; + ot->name= _("Vertex Group Levels"); ot->idname= "OBJECT_OT_vertex_group_levels"; /* api callbacks */ @@ -1773,8 +1773,8 @@ void OBJECT_OT_vertex_group_levels(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_float(ot->srna, "offset", 0.f, -1.0, 1.0, "Offset", "Value to add to weights.", -1.0f, 1.f); - RNA_def_float(ot->srna, "gain", 1.f, 0.f, FLT_MAX, "Gain", "Value to multiply weights by.", 0.0f, 10.f); + RNA_def_float(ot->srna, "offset", 0.f, -1.0, 1.0, N_("Offset"), N_("Value to add to weights."), -1.0f, 1.f); + RNA_def_float(ot->srna, "gain", 1.f, 0.f, FLT_MAX, N_("Gain"), N_("Value to multiply weights by."), 0.0f, 10.f); } static int vertex_group_normalize_exec(bContext *C, wmOperator *UNUSED(op)) @@ -1793,7 +1793,7 @@ static int vertex_group_normalize_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_normalize(wmOperatorType *ot) { /* identifiers */ - ot->name= "Normalize Vertex Group"; + ot->name= _("Normalize Vertex Group"); ot->idname= "OBJECT_OT_vertex_group_normalize"; /* api callbacks */ @@ -1882,7 +1882,7 @@ static int vertex_group_blend_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_blend(wmOperatorType *ot) { /* identifiers */ - ot->name= "Blend Vertex Group"; + ot->name= _("Blend Vertex Group"); ot->idname= "OBJECT_OT_vertex_group_blend"; ot->description= ""; @@ -1995,9 +1995,9 @@ static int vertex_group_copy_to_linked_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_vertex_group_copy_to_linked(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Vertex Groups to Linked"; + ot->name= _("Copy Vertex Groups to Linked"); ot->idname= "OBJECT_OT_vertex_group_copy_to_linked"; - ot->description= "Copy Vertex Groups to all users of the same Geometry data"; + ot->description= _("Copy Vertex Groups to all users of the same Geometry data"); /* api callbacks */ ot->poll= vertex_group_poll; @@ -2033,9 +2033,9 @@ static int vertex_group_copy_to_selected_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_copy_to_selected(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Vertex Group to Selected"; + ot->name= _("Copy Vertex Group to Selected"); ot->idname= "OBJECT_OT_vertex_group_copy_to_selected"; - ot->description= "Copy Vertex Groups to other selected objects with matching indices"; + ot->description= _("Copy Vertex Groups to other selected objects with matching indices"); /* api callbacks */ ot->poll= vertex_group_poll; @@ -2091,9 +2091,9 @@ void OBJECT_OT_vertex_group_set_active(wmOperatorType *ot) PropertyRNA *prop; /* identifiers */ - ot->name= "Set Active Vertex Group"; + ot->name= _("Set Active Vertex Group"); ot->idname= "OBJECT_OT_vertex_group_set_active"; - ot->description= "Set the active vertex group"; + ot->description= _("Set the active vertex group"); /* api callbacks */ ot->poll= vertex_group_poll; @@ -2104,7 +2104,7 @@ void OBJECT_OT_vertex_group_set_active(wmOperatorType *ot) ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* properties */ - prop= RNA_def_enum(ot->srna, "group", vgroup_items, 0, "Group", "Vertex group to set as active."); + prop= RNA_def_enum(ot->srna, "group", vgroup_items, 0, _("Group"), _("Vertex group to set as active.")); RNA_def_enum_funcs(prop, vgroup_itemf); ot->prop= prop; } @@ -2223,9 +2223,9 @@ static int vertex_group_sort_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_sort(wmOperatorType *ot) { - ot->name= "Sort Vertex Groups"; + ot->name= _("Sort Vertex Groups"); ot->idname= "OBJECT_OT_vertex_group_sort"; - ot->description= "Sorts vertex groups alphabetically"; + ot->description= _("Sorts vertex groups alphabetically"); /* api callbacks */ ot->poll= vertex_group_poll; @@ -2276,13 +2276,13 @@ static int vgroup_move_exec(bContext *C, wmOperator *op) void OBJECT_OT_vertex_group_move(wmOperatorType *ot) { static EnumPropertyItem vgroup_slot_move[] = { - {1, "UP", 0, "Up", ""}, - {-1, "DOWN", 0, "Down", ""}, + {1, "UP", 0, N_("Up"), ""}, + {-1, "DOWN", 0, N_("Down"), ""}, {0, NULL, 0, NULL, NULL} }; /* identifiers */ - ot->name= "Move Vertex Group"; + ot->name= _("Move Vertex Group"); ot->idname= "OBJECT_OT_vertex_group_move"; /* api callbacks */ @@ -2292,5 +2292,5 @@ void OBJECT_OT_vertex_group_move(wmOperatorType *ot) /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - RNA_def_enum(ot->srna, "direction", vgroup_slot_move, 0, "Direction", "Direction to move, UP or DOWN"); + RNA_def_enum(ot->srna, "direction", RNA_enum_items_gettexted(vgroup_slot_move), 0, _("Direction"), _("Direction to move, UP or DOWN")); } diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 7f0cedb71c9..8392c25f46e 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -87,9 +87,9 @@ static int particle_system_add_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_particle_system_add(wmOperatorType *ot) { /* identifiers */ - ot->name= "Add Particle System Slot"; + ot->name= _("Add Particle System Slot"); ot->idname= "OBJECT_OT_particle_system_add"; - ot->description="Add a particle system"; + ot->description=_("Add a particle system"); /* api callbacks */ ot->poll= ED_operator_object_active_editable; @@ -126,9 +126,9 @@ static int particle_system_remove_exec(bContext *C, wmOperator *UNUSED(op)) void OBJECT_OT_particle_system_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Particle System Slot"; + ot->name= _("Remove Particle System Slot"); ot->idname= "OBJECT_OT_particle_system_remove"; - ot->description="Remove the selected particle system"; + ot->description=_("Remove the selected particle system"); /* api callbacks */ ot->poll= ED_operator_object_active_editable; @@ -185,9 +185,9 @@ static int new_particle_settings_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_new(wmOperatorType *ot) { /* identifiers */ - ot->name= "New Particle Settings"; + ot->name= _("New Particle Settings"); ot->idname= "PARTICLE_OT_new"; - ot->description="Add new particle settings"; + ot->description=_("Add new particle settings"); /* api callbacks */ ot->exec= new_particle_settings_exec; @@ -234,9 +234,9 @@ static int new_particle_target_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_new_target(wmOperatorType *ot) { /* identifiers */ - ot->name= "New Particle Target"; + ot->name= _("New Particle Target"); ot->idname= "PARTICLE_OT_new_target"; - ot->description="Add a new particle target"; + ot->description=_("Add a new particle target"); /* api callbacks */ ot->exec= new_particle_target_exec; @@ -283,9 +283,9 @@ static int remove_particle_target_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_target_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Particle Target"; + ot->name= _("Remove Particle Target"); ot->idname= "PARTICLE_OT_target_remove"; - ot->description="Remove the selected particle target"; + ot->description=_("Remove the selected particle target"); /* api callbacks */ ot->exec= remove_particle_target_exec; @@ -323,9 +323,9 @@ static int target_move_up_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_target_move_up(wmOperatorType *ot) { - ot->name= "Move Up Target"; + ot->name= _("Move Up Target"); ot->idname= "PARTICLE_OT_target_move_up"; - ot->description= "Move particle target up in the list"; + ot->description= _("Move particle target up in the list"); ot->exec= target_move_up_exec; @@ -361,9 +361,9 @@ static int target_move_down_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_target_move_down(wmOperatorType *ot) { - ot->name= "Move Down Target"; + ot->name= _("Move Down Target"); ot->idname= "PARTICLE_OT_target_move_down"; - ot->description= "Move particle target down in the list"; + ot->description= _("Move particle target down in the list"); ot->exec= target_move_down_exec; @@ -399,9 +399,9 @@ static int dupliob_move_up_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_dupliob_move_up(wmOperatorType *ot) { - ot->name= "Move Up Dupli Object"; + ot->name= _("Move Up Dupli Object"); ot->idname= "PARTICLE_OT_dupliob_move_up"; - ot->description= "Move dupli object up in the list"; + ot->description= _("Move dupli object up in the list"); ot->exec= dupliob_move_up_exec; @@ -439,9 +439,9 @@ static int copy_particle_dupliob_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_dupliob_copy(wmOperatorType *ot) { /* identifiers */ - ot->name= "Copy Particle Dupliob"; + ot->name= _("Copy Particle Dupliob"); ot->idname= "PARTICLE_OT_dupliob_copy"; - ot->description="Duplicate the current dupliobject"; + ot->description=_("Duplicate the current dupliobject"); /* api callbacks */ ot->exec= copy_particle_dupliob_exec; @@ -482,9 +482,9 @@ static int remove_particle_dupliob_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_dupliob_remove(wmOperatorType *ot) { /* identifiers */ - ot->name= "Remove Particle Dupliobject"; + ot->name= _("Remove Particle Dupliobject"); ot->idname= "PARTICLE_OT_dupliob_remove"; - ot->description="Remove the selected dupliobject"; + ot->description=_("Remove the selected dupliobject"); /* api callbacks */ ot->exec= remove_particle_dupliob_exec; @@ -521,9 +521,9 @@ static int dupliob_move_down_exec(bContext *C, wmOperator *UNUSED(op)) void PARTICLE_OT_dupliob_move_down(wmOperatorType *ot) { - ot->name= "Move Down Dupli Object"; + ot->name= _("Move Down Dupli Object"); ot->idname= "PARTICLE_OT_dupliob_move_down"; - ot->description= "Move dupli object down in the list"; + ot->description= _("Move dupli object down in the list"); ot->exec= dupliob_move_down_exec; diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 19c600be937..3d2ae6dca3d 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -37,6 +37,7 @@ #include "BLI_blenlib.h" #include "BLI_utildefines.h" +#include "BLF_api.h" #include "BKE_context.h" @@ -120,31 +121,31 @@ void buttons_header_buttons(const bContext *C, ARegion *ar) // Default panels uiBlockBeginAlign(block); if(sbuts->pathflag & (1<<BCONTEXT_RENDER)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_SCENE, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_RENDER, 0, 0, "Render"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_SCENE, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_RENDER, 0, 0, _("Render")); if(sbuts->pathflag & (1<<BCONTEXT_SCENE)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_SCENE_DATA, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_SCENE, 0, 0, "Scene"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_SCENE_DATA, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_SCENE, 0, 0, _("Scene")); if(sbuts->pathflag & (1<<BCONTEXT_WORLD)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_WORLD, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_WORLD, 0, 0, "World"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_WORLD, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_WORLD, 0, 0, _("World")); if(sbuts->pathflag & (1<<BCONTEXT_OBJECT)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_OBJECT_DATA, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_OBJECT, 0, 0, "Object"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_OBJECT_DATA, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_OBJECT, 0, 0, _("Object")); if(sbuts->pathflag & (1<<BCONTEXT_CONSTRAINT)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_CONSTRAINT, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_CONSTRAINT, 0, 0, "Object Constraints"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_CONSTRAINT, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_CONSTRAINT, 0, 0, _("Object Constraints")); if(sbuts->pathflag & (1<<BCONTEXT_MODIFIER)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_MODIFIER, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_MODIFIER, 0, 0, "Modifiers"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_MODIFIER, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_MODIFIER, 0, 0, _("Modifiers")); if(sbuts->pathflag & (1<<BCONTEXT_DATA)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, sbuts->dataicon, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_DATA, 0, 0, "Object Data"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, sbuts->dataicon, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_DATA, 0, 0, _("Object Data")); if(sbuts->pathflag & (1<<BCONTEXT_BONE)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_BONE_DATA, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_BONE, 0, 0, "Bone"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_BONE_DATA, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_BONE, 0, 0, _("Bone")); if(sbuts->pathflag & (1<<BCONTEXT_BONE_CONSTRAINT)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_CONSTRAINT_BONE, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_BONE_CONSTRAINT, 0, 0, "Bone Constraints"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_CONSTRAINT_BONE, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_BONE_CONSTRAINT, 0, 0, _("Bone Constraints")); if(sbuts->pathflag & (1<<BCONTEXT_MATERIAL)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_MATERIAL, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_MATERIAL, 0, 0, "Material"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_MATERIAL, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_MATERIAL, 0, 0, _("Material")); if(sbuts->pathflag & (1<<BCONTEXT_TEXTURE)) - uiDefIconButS(block, ROW, B_BUTSPREVIEW, ICON_TEXTURE, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_TEXTURE, 0, 0, "Texture"); + uiDefIconButS(block, ROW, B_BUTSPREVIEW, ICON_TEXTURE, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_TEXTURE, 0, 0, _("Texture")); if(sbuts->pathflag & (1<<BCONTEXT_PARTICLE)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_PARTICLES, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_PARTICLE, 0, 0, "Particles"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_PARTICLES, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_PARTICLE, 0, 0, _("Particles")); if(sbuts->pathflag & (1<<BCONTEXT_PHYSICS)) - uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_PHYSICS, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_PHYSICS, 0, 0, "Physics"); + uiDefIconButS(block, ROW, B_CONTEXT_SWITCH, ICON_PHYSICS, xco+=BUT_UNIT_X, yco, BUT_UNIT_X, UI_UNIT_Y, &(sbuts->mainb), 0.0, (float)BCONTEXT_PHYSICS, 0, 0, _("Physics")); xco+= BUT_UNIT_X; uiBlockEndAlign(block); diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index f11f530be9e..54e2df45cff 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -688,7 +688,7 @@ static void graph_panel_modifiers(const bContext *C, Panel *pa) block= uiLayoutGetBlock(row); // XXX for now, this will be a operator button which calls a 'add modifier' operator - uiDefButO(block, BUT, "GRAPH_OT_fmodifier_add", WM_OP_INVOKE_REGION_WIN, "Add Modifier", 10, 0, 150, 20, "Adds a new F-Curve Modifier for the active F-Curve"); + uiDefButO(block, BUT, "GRAPH_OT_fmodifier_add", WM_OP_INVOKE_REGION_WIN, _("Add Modifier"), 10, 0, 150, 20, _("Adds a new F-Curve Modifier for the active F-Curve")); /* copy/paste (as sub-row)*/ row= uiLayoutRow(row, 1); diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index c431f5455ed..4a311d9113f 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -420,7 +420,7 @@ static void nla_panel_modifiers(const bContext *C, Panel *pa) // XXX for now, this will be a operator button which calls a temporary 'add modifier' operator // FIXME: we need to set the only-active property so that this will only add modifiers for the active strip (not all selected) - uiDefButO(block, BUT, "NLA_OT_fmodifier_add", WM_OP_INVOKE_REGION_WIN, "Add Modifier", 10, 0, 150, 20, "Adds a new F-Modifier for the active NLA Strip"); + uiDefButO(block, BUT, "NLA_OT_fmodifier_add", WM_OP_INVOKE_REGION_WIN, _("Add Modifier"), 10, 0, 150, 20, _("Adds a new F-Modifier for the active NLA Strip")); /* copy/paste (as sub-row)*/ row= uiLayoutRow(row, 1); diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h index fa490eaafb1..9a818a6b7f3 100644 --- a/source/blender/makesrna/RNA_access.h +++ b/source/blender/makesrna/RNA_access.h @@ -576,6 +576,7 @@ extern StructRNA RNA_WipeSequence; extern StructRNA RNA_WoodTexture; extern StructRNA RNA_World; extern StructRNA RNA_WorldAmbientOcclusion; +extern StructRNA RNA_WorldLighting; extern StructRNA RNA_WorldMistSettings; extern StructRNA RNA_WorldStarsSettings; extern StructRNA RNA_WorldTextureSlot; diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index df821ac4a87..0d7a34b17ff 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -147,6 +147,7 @@ void RNA_types_init_gettext(void) &RNA_Action, &RNA_ActionFCurves, &RNA_ActionGroup, &RNA_ActionGroups, &RNA_ActionPoseMarkers, &RNA_BackgroundImage, &RNA_ConsoleLine, + &RNA_Constraint, &RNA_DopeSheet, &RNA_Event, &RNA_FileSelectParams, @@ -154,11 +155,19 @@ void RNA_types_init_gettext(void) &RNA_KeyMap, &RNA_KeyMapItem, &RNA_KeyMapItems, &RNA_KeyboardSensor, &RNA_KeyingSetsAll, + &RNA_Macro, + + &RNA_Material, &RNA_MaterialHalo, &RNA_MaterialRaytraceMirror, &RNA_MaterialRaytraceTransparency, + &RNA_MaterialSlot, &RNA_MaterialStrand, &RNA_MaterialSubsurfaceScattering, + &RNA_MaterialTextureSlot, &RNA_MaterialVolume, + &RNA_Mesh, + &RNA_Modifier, + &RNA_Object, + &RNA_ParticleSettingsTextureSlot, &RNA_RenderLayer, &RNA_RenderSettings, - &RNA_Macro, - &RNA_Material, - &RNA_Scene, + + &RNA_Scene, &RNA_SceneRenderLayer, &RNA_Scopes, &RNA_Space, @@ -180,10 +189,13 @@ void RNA_types_init_gettext(void) &RNA_SpaceUVEditor, &RNA_SpaceUserPreferences, + &RNA_Texture, &RNA_TextureSlot, &RNA_Theme, &RNA_ThemeBoneColorSet, &RNA_ThemeWidgetColors, &RNA_ToolSettings, &RNA_UserPreferences, &RNA_UserPreferencesEdit, &RNA_UserPreferencesFilePaths, &RNA_UserPreferencesInput, &RNA_UserPreferencesSystem, &RNA_UserPreferencesView, + &RNA_UnitSettings, + &RNA_World, &RNA_WorldLighting, /* for test */ NULL }; diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 0163dd5db32..bc1dede6445 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -34,6 +34,7 @@ #include "rna_internal.h" #include "BLI_math.h" +#include "BLF_api.h" #include "DNA_action_types.h" #include "DNA_constraint_types.h" @@ -45,34 +46,34 @@ #include "WM_types.h" EnumPropertyItem constraint_type_items[] ={ - {0, "", 0, "Transform", ""}, - {CONSTRAINT_TYPE_LOCLIKE, "COPY_LOCATION", ICON_CONSTRAINT_DATA, "Copy Location", ""}, - {CONSTRAINT_TYPE_ROTLIKE, "COPY_ROTATION", ICON_CONSTRAINT_DATA, "Copy Rotation", ""}, - {CONSTRAINT_TYPE_SIZELIKE, "COPY_SCALE", ICON_CONSTRAINT_DATA, "Copy Scale", ""}, - {CONSTRAINT_TYPE_TRANSLIKE, "COPY_TRANSFORMS", ICON_CONSTRAINT_DATA, "Copy Transforms", ""}, - {CONSTRAINT_TYPE_DISTLIMIT, "LIMIT_DISTANCE", ICON_CONSTRAINT_DATA, "Limit Distance", ""}, - {CONSTRAINT_TYPE_LOCLIMIT, "LIMIT_LOCATION", ICON_CONSTRAINT_DATA, "Limit Location", ""}, - {CONSTRAINT_TYPE_ROTLIMIT, "LIMIT_ROTATION", ICON_CONSTRAINT_DATA, "Limit Rotation", ""}, - {CONSTRAINT_TYPE_SIZELIMIT, "LIMIT_SCALE", ICON_CONSTRAINT_DATA, "Limit Scale", ""}, - {CONSTRAINT_TYPE_SAMEVOL, "MAINTAIN_VOLUME", ICON_CONSTRAINT_DATA, "Maintain Volume", ""}, - {CONSTRAINT_TYPE_TRANSFORM, "TRANSFORM", ICON_CONSTRAINT_DATA, "Transformation", ""}, - {0, "", 0, "Tracking", ""}, - {CONSTRAINT_TYPE_CLAMPTO, "CLAMP_TO", ICON_CONSTRAINT_DATA, "Clamp To", ""}, - {CONSTRAINT_TYPE_DAMPTRACK, "DAMPED_TRACK", ICON_CONSTRAINT_DATA, "Damped Track", "Tracking by taking the shortest path"}, - {CONSTRAINT_TYPE_KINEMATIC, "IK", ICON_CONSTRAINT_DATA, "Inverse Kinematics", ""}, - {CONSTRAINT_TYPE_LOCKTRACK, "LOCKED_TRACK", ICON_CONSTRAINT_DATA, "Locked Track", "Tracking along a single axis"}, - {CONSTRAINT_TYPE_SPLINEIK, "SPLINE_IK", ICON_CONSTRAINT_DATA, "Spline IK", ""}, - {CONSTRAINT_TYPE_STRETCHTO, "STRETCH_TO",ICON_CONSTRAINT_DATA, "Stretch To", ""}, - {CONSTRAINT_TYPE_TRACKTO, "TRACK_TO", ICON_CONSTRAINT_DATA, "Track To", "Legacy tracking constraint prone to twisting artifacts"}, - {0, "", 0, "Relationship", ""}, - {CONSTRAINT_TYPE_ACTION, "ACTION", ICON_CONSTRAINT_DATA, "Action", ""}, - {CONSTRAINT_TYPE_CHILDOF, "CHILD_OF", ICON_CONSTRAINT_DATA, "Child Of", ""}, - {CONSTRAINT_TYPE_MINMAX, "FLOOR", ICON_CONSTRAINT_DATA, "Floor", ""}, - {CONSTRAINT_TYPE_FOLLOWPATH, "FOLLOW_PATH", ICON_CONSTRAINT_DATA, "Follow Path", ""}, - {CONSTRAINT_TYPE_PIVOT, "PIVOT", ICON_CONSTRAINT_DATA, "Pivot", ""}, - {CONSTRAINT_TYPE_RIGIDBODYJOINT, "RIGID_BODY_JOINT", ICON_CONSTRAINT_DATA, "Rigid Body Joint", ""}, - {CONSTRAINT_TYPE_PYTHON, "SCRIPT", ICON_CONSTRAINT_DATA, "Script", ""}, - {CONSTRAINT_TYPE_SHRINKWRAP, "SHRINKWRAP", ICON_CONSTRAINT_DATA, "Shrinkwrap", ""}, + {0, "", 0, N_("Transform"), ""}, + {CONSTRAINT_TYPE_LOCLIKE, "COPY_LOCATION", ICON_CONSTRAINT_DATA, N_("Copy Location"), ""}, + {CONSTRAINT_TYPE_ROTLIKE, "COPY_ROTATION", ICON_CONSTRAINT_DATA, N_("Copy Rotation"), ""}, + {CONSTRAINT_TYPE_SIZELIKE, "COPY_SCALE", ICON_CONSTRAINT_DATA, N_("Copy Scale"), ""}, + {CONSTRAINT_TYPE_TRANSLIKE, "COPY_TRANSFORMS", ICON_CONSTRAINT_DATA, N_("Copy Transforms"), ""}, + {CONSTRAINT_TYPE_DISTLIMIT, "LIMIT_DISTANCE", ICON_CONSTRAINT_DATA, N_("Limit Distance"), ""}, + {CONSTRAINT_TYPE_LOCLIMIT, "LIMIT_LOCATION", ICON_CONSTRAINT_DATA, N_("Limit Location"), ""}, + {CONSTRAINT_TYPE_ROTLIMIT, "LIMIT_ROTATION", ICON_CONSTRAINT_DATA, N_("Limit Rotation"), ""}, + {CONSTRAINT_TYPE_SIZELIMIT, "LIMIT_SCALE", ICON_CONSTRAINT_DATA, N_("Limit Scale"), ""}, + {CONSTRAINT_TYPE_SAMEVOL, "MAINTAIN_VOLUME", ICON_CONSTRAINT_DATA, N_("Maintain Volume"), ""}, + {CONSTRAINT_TYPE_TRANSFORM, "TRANSFORM", ICON_CONSTRAINT_DATA, N_("Transformation"), ""}, + {0, "", 0, N_("Tracking"), ""}, + {CONSTRAINT_TYPE_CLAMPTO, "CLAMP_TO", ICON_CONSTRAINT_DATA, N_("Clamp To"), ""}, + {CONSTRAINT_TYPE_DAMPTRACK, "DAMPED_TRACK", ICON_CONSTRAINT_DATA, N_("Damped Track"), N_("Tracking by taking the shortest path")}, + {CONSTRAINT_TYPE_KINEMATIC, "IK", ICON_CONSTRAINT_DATA, N_("Inverse Kinematics"), ""}, + {CONSTRAINT_TYPE_LOCKTRACK, "LOCKED_TRACK", ICON_CONSTRAINT_DATA, N_("Locked Track"), N_("Tracking along a single axis")}, + {CONSTRAINT_TYPE_SPLINEIK, "SPLINE_IK", ICON_CONSTRAINT_DATA, N_("Spline IK"), ""}, + {CONSTRAINT_TYPE_STRETCHTO, "STRETCH_TO",ICON_CONSTRAINT_DATA, N_("Stretch To"), ""}, + {CONSTRAINT_TYPE_TRACKTO, "TRACK_TO", ICON_CONSTRAINT_DATA, N_("Track To"), N_("Legacy tracking constraint prone to twisting artifacts")}, + {0, "", 0, N_("Relationship"), ""}, + {CONSTRAINT_TYPE_ACTION, "ACTION", ICON_CONSTRAINT_DATA, N_("Action"), ""}, + {CONSTRAINT_TYPE_CHILDOF, "CHILD_OF", ICON_CONSTRAINT_DATA, N_("Child Of"), ""}, + {CONSTRAINT_TYPE_MINMAX, "FLOOR", ICON_CONSTRAINT_DATA, N_("Floor"), ""}, + {CONSTRAINT_TYPE_FOLLOWPATH, "FOLLOW_PATH", ICON_CONSTRAINT_DATA, N_("Follow Path"), ""}, + {CONSTRAINT_TYPE_PIVOT, "PIVOT", ICON_CONSTRAINT_DATA, N_("Pivot"), ""}, + {CONSTRAINT_TYPE_RIGIDBODYJOINT, "RIGID_BODY_JOINT", ICON_CONSTRAINT_DATA, N_("Rigid Body Joint"), ""}, + {CONSTRAINT_TYPE_PYTHON, "SCRIPT", ICON_CONSTRAINT_DATA, N_("Script"), ""}, + {CONSTRAINT_TYPE_SHRINKWRAP, "SHRINKWRAP", ICON_CONSTRAINT_DATA, N_("Shrinkwrap"), ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem target_space_pchan_items[] = { diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 80c98e8c428..c375aa427a6 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -43,6 +43,8 @@ #include "BLI_math_base.h" #include "BLI_math_rotation.h" +#include "BLF_api.h" + #ifdef RNA_RUNTIME #include "DNA_scene_types.h" @@ -1840,65 +1842,65 @@ static void rna_def_mesh(BlenderRNA *brna) PropertyRNA *prop; srna= RNA_def_struct(brna, "Mesh", "ID"); - RNA_def_struct_ui_text(srna, "Mesh", "Mesh datablock defining geometric surfaces"); + RNA_def_struct_ui_text(srna, N_("Mesh"), N_("Mesh datablock defining geometric surfaces")); RNA_def_struct_ui_icon(srna, ICON_MESH_DATA); prop= RNA_def_property(srna, "vertices", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "mvert", "totvert"); RNA_def_property_struct_type(prop, "MeshVertex"); - RNA_def_property_ui_text(prop, "Vertices", "Vertices of the mesh"); + RNA_def_property_ui_text(prop, N_("Vertices"), N_("Vertices of the mesh")); rna_def_mesh_vertices(brna, prop); prop= RNA_def_property(srna, "edges", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "medge", "totedge"); RNA_def_property_struct_type(prop, "MeshEdge"); - RNA_def_property_ui_text(prop, "Edges", "Edges of the mesh"); + RNA_def_property_ui_text(prop, N_("Edges"), N_("Edges of the mesh")); rna_def_mesh_edges(brna, prop); prop= RNA_def_property(srna, "faces", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "mface", "totface"); RNA_def_property_struct_type(prop, "MeshFace"); - RNA_def_property_ui_text(prop, "Faces", "Faces of the mesh"); + RNA_def_property_ui_text(prop, N_("Faces"), N_("Faces of the mesh")); rna_def_mesh_faces(brna, prop); prop= RNA_def_property(srna, "sticky", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "msticky", "totvert"); RNA_def_property_struct_type(prop, "MeshSticky"); - RNA_def_property_ui_text(prop, "Sticky", "Sticky texture coordinates"); + RNA_def_property_ui_text(prop, N_("Sticky"), N_("Sticky texture coordinates")); /* TODO, should this be allowed to be its self? */ prop= RNA_def_property(srna, "texture_mesh", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "texcomesh"); RNA_def_property_flag(prop, PROP_EDITABLE|PROP_ID_SELF_CHECK); - RNA_def_property_ui_text(prop, "Texture Mesh", "Use another mesh for texture indices (vertex indices must be aligned)"); + RNA_def_property_ui_text(prop, N_("Texture Mesh"), N_("Use another mesh for texture indices (vertex indices must be aligned)")); /* UV textures */ prop= RNA_def_property(srna, "uv_textures", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_uv_textures_begin", 0, 0, 0, "rna_Mesh_uv_textures_length", 0, 0); RNA_def_property_struct_type(prop, "MeshTextureFaceLayer"); - RNA_def_property_ui_text(prop, "UV Textures", ""); + RNA_def_property_ui_text(prop, N_("UV Textures"), ""); rna_def_uv_textures(brna, prop); prop= RNA_def_property(srna, "uv_texture_clone", PROP_POINTER, PROP_UNSIGNED); RNA_def_property_struct_type(prop, "MeshTextureFaceLayer"); RNA_def_property_pointer_funcs(prop, "rna_Mesh_uv_texture_clone_get", "rna_Mesh_uv_texture_clone_set", NULL, NULL); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Clone UV Texture", "UV texture to be used as cloning source"); + RNA_def_property_ui_text(prop, N_("Clone UV Texture"), N_("UV texture to be used as cloning source")); prop= RNA_def_property(srna, "uv_texture_clone_index", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_Mesh_uv_texture_clone_index_get", "rna_Mesh_uv_texture_clone_index_set", "rna_Mesh_active_uv_texture_index_range"); - RNA_def_property_ui_text(prop, "Clone UV Texture Index", "Clone UV texture index"); + RNA_def_property_ui_text(prop, N_("Clone UV Texture Index"), N_("Clone UV texture index")); prop= RNA_def_property(srna, "uv_texture_stencil", PROP_POINTER, PROP_UNSIGNED); RNA_def_property_struct_type(prop, "MeshTextureFaceLayer"); RNA_def_property_pointer_funcs(prop, "rna_Mesh_uv_texture_stencil_get", "rna_Mesh_uv_texture_stencil_set", NULL, NULL); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Mask UV Texture", "UV texture to mask the painted area"); + RNA_def_property_ui_text(prop, N_("Mask UV Texture"), N_("UV texture to mask the painted area")); prop= RNA_def_property(srna, "uv_texture_stencil_index", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_Mesh_uv_texture_stencil_index_get", "rna_Mesh_uv_texture_stencil_index_set", "rna_Mesh_active_uv_texture_index_range"); - RNA_def_property_ui_text(prop, "Mask UV Texture Index", "Mask UV texture index"); + RNA_def_property_ui_text(prop, N_("Mask UV Texture Index"), N_("Mask UV texture index")); /* Vertex colors */ @@ -1906,30 +1908,30 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_vertex_colors_begin", 0, 0, 0, "rna_Mesh_vertex_colors_length", 0, 0); RNA_def_property_struct_type(prop, "MeshColorLayer"); - RNA_def_property_ui_text(prop, "Vertex Colors", ""); + RNA_def_property_ui_text(prop, N_("Vertex Colors"), ""); rna_def_vertex_colors(brna, prop); prop= RNA_def_property(srna, "layers_float", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_float_layers_begin", 0, 0, 0, "rna_Mesh_float_layers_length", 0, 0); RNA_def_property_struct_type(prop, "MeshFloatPropertyLayer"); - RNA_def_property_ui_text(prop, "Float Property Layers", ""); + RNA_def_property_ui_text(prop, N_("Float Property Layers"), ""); prop= RNA_def_property(srna, "layers_int", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_int_layers_begin", 0, 0, 0, "rna_Mesh_int_layers_length", 0, 0); RNA_def_property_struct_type(prop, "MeshIntPropertyLayer"); - RNA_def_property_ui_text(prop, "Int Property Layers", ""); + RNA_def_property_ui_text(prop, N_("Int Property Layers"), ""); prop= RNA_def_property(srna, "layers_string", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_string_layers_begin", 0, 0, 0, "rna_Mesh_string_layers_length", 0, 0); RNA_def_property_struct_type(prop, "MeshStringPropertyLayer"); - RNA_def_property_ui_text(prop, "String Property Layers", ""); + RNA_def_property_ui_text(prop, N_("String Property Layers"), ""); prop= RNA_def_property(srna, "use_auto_smooth", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_AUTOSMOOTH); - RNA_def_property_ui_text(prop, "Auto Smooth", "Treats all set-smoothed faces with angles less than the specified angle as 'smooth' during render"); + RNA_def_property_ui_text(prop, N_("Auto Smooth"), N_("Treats all set-smoothed faces with angles less than the specified angle as 'smooth' during render")); #if 1 /* expose as radians */ prop= RNA_def_property(srna, "auto_smooth_angle", PROP_FLOAT, PROP_ANGLE); @@ -1940,38 +1942,38 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_int_sdna(prop, NULL, "smoothresh"); RNA_def_property_range(prop, 1, 80); #endif - RNA_def_property_ui_text(prop, "Auto Smooth Angle", "Defines maximum angle between face normals that 'Auto Smooth' will operate on"); + RNA_def_property_ui_text(prop, N_("Auto Smooth Angle"), N_("Defines maximum angle between face normals that 'Auto Smooth' will operate on")); prop= RNA_def_property(srna, "show_double_sided", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_TWOSIDED); - RNA_def_property_ui_text(prop, "Double Sided", "Render/display the mesh with double or single sided lighting"); + RNA_def_property_ui_text(prop, N_("Double Sided"), N_("Render/display the mesh with double or single sided lighting")); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); prop= RNA_def_property(srna, "texco_mesh", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "texcomesh"); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Texture Space Mesh", "Derive texture coordinates from another mesh"); + RNA_def_property_ui_text(prop, N_("Texture Space Mesh"), N_("Derive texture coordinates from another mesh")); prop= RNA_def_property(srna, "shape_keys", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "key"); - RNA_def_property_ui_text(prop, "Shape Keys", ""); + RNA_def_property_ui_text(prop, N_("Shape Keys"), ""); /* texture space */ prop= RNA_def_property(srna, "use_auto_texspace", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", AUTOSPACE); - RNA_def_property_ui_text(prop, "Auto Texture Space", "Adjusts active object's texture space automatically when transforming object"); + RNA_def_property_ui_text(prop, N_("Auto Texture Space"), N_("Adjusts active object's texture space automatically when transforming object")); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Mesh_texspace_set"); prop= RNA_def_property(srna, "texspace_location", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Texture Space Location", "Texture space location"); + RNA_def_property_ui_text(prop, N_("Texture Space Location"), N_("Texture space location")); RNA_def_property_editable_func(prop, "rna_Mesh_texspace_editable"); RNA_def_property_float_funcs(prop, "rna_Mesh_texspace_loc_get", "rna_Mesh_texspace_loc_set", NULL); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "texspace_size", PROP_FLOAT, PROP_XYZ); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Texture Space Size", "Texture space size"); + RNA_def_property_ui_text(prop, N_("Texture Space Size"), N_("Texture space size")); RNA_def_property_editable_func(prop, "rna_Mesh_texspace_editable"); RNA_def_property_float_funcs(prop, "rna_Mesh_texspace_size_get", "rna_Mesh_texspace_size_set", NULL); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); @@ -1987,75 +1989,75 @@ static void rna_def_mesh(BlenderRNA *brna) prop= RNA_def_property(srna, "materials", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "mat", "totcol"); RNA_def_property_struct_type(prop, "Material"); - RNA_def_property_ui_text(prop, "Materials", ""); + RNA_def_property_ui_text(prop, N_("Materials"), ""); RNA_def_property_srna(prop, "IDMaterials"); /* see rna_ID.c */ /* Mesh Draw Options for Edit Mode*/ prop= RNA_def_property(srna, "show_edges", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEDGES); - RNA_def_property_ui_text(prop, "Draw Edges", "Displays selected edges using highlights in the 3D view and UV editor"); + RNA_def_property_ui_text(prop, N_("Draw Edges"), N_("Displays selected edges using highlights in the 3D view and UV editor")); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_all_edges", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_ALLEDGES); - RNA_def_property_ui_text(prop, "All Edges", "Displays all edges for wireframe in all view modes in the 3D view"); + RNA_def_property_ui_text(prop, N_("All Edges"), N_("Displays all edges for wireframe in all view modes in the 3D view")); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); prop= RNA_def_property(srna, "show_faces", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWFACES); - RNA_def_property_ui_text(prop, "Draw Faces", "Displays all faces as shades in the 3D view and UV editor"); + RNA_def_property_ui_text(prop, N_("Draw Faces"), N_("Displays all faces as shades in the 3D view and UV editor")); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_normal_face", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWNORMALS); - RNA_def_property_ui_text(prop, "Draw Normals", "Displays face normals as lines"); + RNA_def_property_ui_text(prop, N_("Draw Normals"), N_("Displays face normals as lines")); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_normal_vertex", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAW_VNORMALS); - RNA_def_property_ui_text(prop, "Draw Vertex Normals", "Displays vertex normals as lines"); + RNA_def_property_ui_text(prop, N_("Draw Vertex Normals"), N_("Displays vertex normals as lines")); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_edge_crease", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWCREASES); - RNA_def_property_ui_text(prop, "Draw Creases", "Displays creases created for subsurf weighting"); + RNA_def_property_ui_text(prop, N_("Draw Creases"), N_("Displays creases created for subsurf weighting")); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_edge_bevel_weight", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWBWEIGHTS); - RNA_def_property_ui_text(prop, "Draw Bevel Weights", "Displays weights created for the Bevel modifier"); + RNA_def_property_ui_text(prop, N_("Draw Bevel Weights"), N_("Displays weights created for the Bevel modifier")); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_edge_seams", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWSEAMS); - RNA_def_property_ui_text(prop, "Draw Seams", "Displays UV unwrapping seams"); + RNA_def_property_ui_text(prop, N_("Draw Seams"), N_("Displays UV unwrapping seams")); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_edge_sharp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWSHARP); - RNA_def_property_ui_text(prop, "Draw Sharp", "Displays sharp edges, used with the EdgeSplit modifier"); + RNA_def_property_ui_text(prop, N_("Draw Sharp"), N_("Displays sharp edges, used with the EdgeSplit modifier")); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_extra_edge_length", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEXTRA_EDGELEN); - RNA_def_property_ui_text(prop, "Edge Length", "Displays selected edge lengths, Using global values when set in the transform panel"); + RNA_def_property_ui_text(prop, N_("Edge Length"), N_("Displays selected edge lengths, Using global values when set in the transform panel")); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_extra_face_angle", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEXTRA_FACEANG); - RNA_def_property_ui_text(prop, "Faces Angles", "Displays the angles in the selected edges in degrees, Using global values when set in the transform panel"); + RNA_def_property_ui_text(prop, N_("Faces Angles"), N_("Displays the angles in the selected edges in degrees, Using global values when set in the transform panel")); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); prop= RNA_def_property(srna, "show_extra_face_area", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "drawflag", ME_DRAWEXTRA_FACEAREA); - RNA_def_property_ui_text(prop, "Face Area", "Displays the area of selected faces, Using global values when set in the transform panel"); + RNA_def_property_ui_text(prop, N_("Face Area"), N_("Displays the area of selected faces, Using global values when set in the transform panel")); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); /* editflag */ prop= RNA_def_property(srna, "use_mirror_x", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "editflag", ME_EDIT_MIRROR_X); - RNA_def_property_ui_text(prop, "X Mirror", "X Axis mirror editing"); + RNA_def_property_ui_text(prop, N_("X Mirror"), N_("X Axis mirror editing")); /* prop= RNA_def_property(srna, "use_mirror_y", PROP_BOOLEAN, PROP_NONE); @@ -2069,11 +2071,11 @@ static void rna_def_mesh(BlenderRNA *brna) prop= RNA_def_property(srna, "use_mirror_topology", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "editflag", ME_EDIT_MIRROR_TOPO); - RNA_def_property_ui_text(prop, "Topology Mirror", "Use topology based mirroring. For when both sides of mesh have matching, unique topology"); + RNA_def_property_ui_text(prop, N_("Topology Mirror"), N_("Use topology based mirroring. For when both sides of mesh have matching, unique topology")); prop= RNA_def_property(srna, "use_paint_mask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "editflag", ME_EDIT_PAINT_MASK); - RNA_def_property_ui_text(prop, "Paint Mask", "Face selection masking for painting"); + RNA_def_property_ui_text(prop, N_("Paint Mask"), N_("Face selection masking for painting")); RNA_def_property_ui_icon(prop, ICON_FACESEL_HLT, 0); RNA_def_property_update(prop, 0, "rna_Mesh_update_draw"); @@ -2081,17 +2083,17 @@ static void rna_def_mesh(BlenderRNA *brna) /* readonly editmesh info - use for extrude menu */ prop= RNA_def_property(srna, "total_vert_sel", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_Mesh_tot_vert_get", NULL, NULL); - RNA_def_property_ui_text(prop, "Selected Vert Total", "Selected vertex count in editmode"); + RNA_def_property_ui_text(prop, N_("Selected Vert Total"), N_("Selected vertex count in editmode")); RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "total_edge_sel", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_Mesh_tot_edge_get", NULL, NULL); - RNA_def_property_ui_text(prop, "Selected Edge Total", "Selected edge count in editmode"); + RNA_def_property_ui_text(prop, N_("Selected Edge Total"), N_("Selected edge count in editmode")); RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "total_face_sel", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_funcs(prop, "rna_Mesh_tot_face_get", NULL, NULL); - RNA_def_property_ui_text(prop, "Selected Face Total", "Selected face count in editmode"); + RNA_def_property_ui_text(prop, N_("Selected Face Total"), N_("Selected face count in editmode")); RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* pointers */ diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index ba655915fb6..af9e433cfad 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -44,6 +44,7 @@ #include "MEM_guardedalloc.h" #include "BLI_math.h" +#include "BLF_api.h" #include "BKE_animsys.h" #include "BKE_bmesh.h" /* For BevelModifierData */ @@ -54,43 +55,43 @@ #include "WM_types.h" EnumPropertyItem modifier_type_items[] ={ - {0, "", 0, "Generate", ""}, - {eModifierType_Array, "ARRAY", ICON_MOD_ARRAY, "Array", ""}, - {eModifierType_Bevel, "BEVEL", ICON_MOD_BEVEL, "Bevel", ""}, - {eModifierType_Boolean, "BOOLEAN", ICON_MOD_BOOLEAN, "Boolean", ""}, - {eModifierType_Build, "BUILD", ICON_MOD_BUILD, "Build", ""}, - {eModifierType_Decimate, "DECIMATE", ICON_MOD_DECIM, "Decimate", ""}, - {eModifierType_EdgeSplit, "EDGE_SPLIT", ICON_MOD_EDGESPLIT, "Edge Split", ""}, - {eModifierType_Mask, "MASK", ICON_MOD_MASK, "Mask", ""}, - {eModifierType_Mirror, "MIRROR", ICON_MOD_MIRROR, "Mirror", ""}, - {eModifierType_Multires, "MULTIRES", ICON_MOD_MULTIRES, "Multiresolution", ""}, - {eModifierType_Screw, "SCREW", ICON_MOD_SCREW, "Screw", ""}, - {eModifierType_Solidify, "SOLIDIFY", ICON_MOD_SOLIDIFY, "Solidify", ""}, - {eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, "Subdivision Surface", ""}, - {eModifierType_UVProject, "UV_PROJECT", ICON_MOD_UVPROJECT, "UV Project", ""}, - {0, "", 0, "Deform", ""}, - {eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, "Armature", ""}, - {eModifierType_Cast, "CAST", ICON_MOD_CAST, "Cast", ""}, - {eModifierType_Curve, "CURVE", ICON_MOD_CURVE, "Curve", ""}, - {eModifierType_Displace, "DISPLACE", ICON_MOD_DISPLACE, "Displace", ""}, - {eModifierType_Hook, "HOOK", ICON_HOOK, "Hook", ""}, - {eModifierType_Lattice, "LATTICE", ICON_MOD_LATTICE, "Lattice", ""}, - {eModifierType_MeshDeform, "MESH_DEFORM", ICON_MOD_MESHDEFORM, "Mesh Deform", ""}, - {eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MOD_SHRINKWRAP, "Shrinkwrap", ""}, - {eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MOD_SIMPLEDEFORM, "Simple Deform", ""}, - {eModifierType_Smooth, "SMOOTH", ICON_MOD_SMOOTH, "Smooth", ""}, - {eModifierType_Warp, "WARP", ICON_MOD_SUBSURF, "Warp", ""}, - {eModifierType_Wave, "WAVE", ICON_MOD_WAVE, "Wave", ""}, - {0, "", 0, "Simulate", ""}, - {eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, "Cloth", ""}, - {eModifierType_Collision, "COLLISION", ICON_MOD_PHYSICS, "Collision", ""}, - {eModifierType_Explode, "EXPLODE", ICON_MOD_EXPLODE, "Explode", ""}, - {eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, "Fluid Simulation", ""}, - {eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, "Particle Instance", ""}, - {eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, "Particle System", ""}, - {eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, "Smoke", ""}, - {eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, "Soft Body", ""}, - {eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, "Surface", ""}, + {0, "", 0, N_("Generate"), ""}, + {eModifierType_Array, "ARRAY", ICON_MOD_ARRAY, N_("Array"), ""}, + {eModifierType_Bevel, "BEVEL", ICON_MOD_BEVEL, N_("Bevel"), ""}, + {eModifierType_Boolean, "BOOLEAN", ICON_MOD_BOOLEAN, N_("Boolean"), ""}, + {eModifierType_Build, "BUILD", ICON_MOD_BUILD, N_("Build"), ""}, + {eModifierType_Decimate, "DECIMATE", ICON_MOD_DECIM, N_("Decimate"), ""}, + {eModifierType_EdgeSplit, "EDGE_SPLIT", ICON_MOD_EDGESPLIT, N_("Edge Split"), ""}, + {eModifierType_Mask, "MASK", ICON_MOD_MASK, N_("Mask"), ""}, + {eModifierType_Mirror, "MIRROR", ICON_MOD_MIRROR, N_("Mirror"), ""}, + {eModifierType_Multires, "MULTIRES", ICON_MOD_MULTIRES, N_("Multiresolution"), ""}, + {eModifierType_Screw, "SCREW", ICON_MOD_SCREW, N_("Screw"), ""}, + {eModifierType_Solidify, "SOLIDIFY", ICON_MOD_SOLIDIFY, N_("Solidify"), ""}, + {eModifierType_Subsurf, "SUBSURF", ICON_MOD_SUBSURF, N_("Subdivision Surface"), ""}, + {eModifierType_UVProject, "UV_PROJECT", ICON_MOD_UVPROJECT, N_("UV Project"), ""}, + {0, "", 0, N_("Deform"), ""}, + {eModifierType_Armature, "ARMATURE", ICON_MOD_ARMATURE, N_("Armature"), ""}, + {eModifierType_Cast, "CAST", ICON_MOD_CAST, N_("Cast"), ""}, + {eModifierType_Curve, "CURVE", ICON_MOD_CURVE, N_("Curve"), ""}, + {eModifierType_Displace, "DISPLACE", ICON_MOD_DISPLACE, N_("Displace"), ""}, + {eModifierType_Hook, "HOOK", ICON_HOOK, N_("Hook"), ""}, + {eModifierType_Lattice, "LATTICE", ICON_MOD_LATTICE, N_("Lattice"), ""}, + {eModifierType_MeshDeform, "MESH_DEFORM", ICON_MOD_MESHDEFORM, N_("Mesh Deform"), ""}, + {eModifierType_Shrinkwrap, "SHRINKWRAP", ICON_MOD_SHRINKWRAP, N_("Shrinkwrap"), ""}, + {eModifierType_SimpleDeform, "SIMPLE_DEFORM", ICON_MOD_SIMPLEDEFORM, N_("Simple Deform"), ""}, + {eModifierType_Smooth, "SMOOTH", ICON_MOD_SMOOTH, N_("Smooth"), ""}, + {eModifierType_Warp, "WARP", ICON_MOD_SUBSURF, N_("Warp"), ""}, + {eModifierType_Wave, "WAVE", ICON_MOD_WAVE, N_("Wave"), ""}, + {0, "", 0, N_("Simulate"), ""}, + {eModifierType_Cloth, "CLOTH", ICON_MOD_CLOTH, N_("Cloth"), ""}, + {eModifierType_Collision, "COLLISION", ICON_MOD_PHYSICS, N_("Collision"), ""}, + {eModifierType_Explode, "EXPLODE", ICON_MOD_EXPLODE, N_("Explode"), ""}, + {eModifierType_Fluidsim, "FLUID_SIMULATION", ICON_MOD_FLUIDSIM, N_("Fluid Simulation"), ""}, + {eModifierType_ParticleInstance, "PARTICLE_INSTANCE", ICON_MOD_PARTICLES, N_("Particle Instance"), ""}, + {eModifierType_ParticleSystem, "PARTICLE_SYSTEM", ICON_MOD_PARTICLES, N_("Particle System"), ""}, + {eModifierType_Smoke, "SMOKE", ICON_MOD_SMOKE, N_("Smoke"), ""}, + {eModifierType_Softbody, "SOFT_BODY", ICON_MOD_SOFT, N_("Soft Body"), ""}, + {eModifierType_Surface, "SURFACE", ICON_MOD_PHYSICS, N_("Surface"), ""}, {0, NULL, 0, NULL, NULL}}; #ifdef RNA_RUNTIME diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index e2794baad34..10a728c077b 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1296,8 +1296,8 @@ static void rna_def_material_slot(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem link_items[] = { - {1, "OBJECT", 0, "Object", ""}, - {0, "DATA", 0, "Data", ""}, + {1, "OBJECT", 0, N_("Object"), ""}, + {0, "DATA", 0, N_("Data"), ""}, {0, NULL, 0, NULL, NULL}}; /* NOTE: there is no MaterialSlot equivalent in DNA, so the internal @@ -1305,25 +1305,25 @@ static void rna_def_material_slot(BlenderRNA *brna) * get/set for the properties. */ srna= RNA_def_struct(brna, "MaterialSlot", NULL); - RNA_def_struct_ui_text(srna, "Material Slot", "Material slot in an object"); + RNA_def_struct_ui_text(srna, N_("Material Slot"), N_("Material slot in an object")); RNA_def_struct_ui_icon(srna, ICON_MATERIAL_DATA); prop= RNA_def_property(srna, "material", PROP_POINTER, PROP_NONE); RNA_def_property_struct_type(prop, "Material"); RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_pointer_funcs(prop, "rna_MaterialSlot_material_get", "rna_MaterialSlot_material_set", NULL, NULL); - RNA_def_property_ui_text(prop, "Material", "Material datablock used by this material slot"); + RNA_def_property_ui_text(prop, N_("Material"), N_("Material datablock used by this material slot")); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_MaterialSlot_update"); prop= RNA_def_property(srna, "link", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, link_items); RNA_def_property_enum_funcs(prop, "rna_MaterialSlot_link_get", "rna_MaterialSlot_link_set", NULL); - RNA_def_property_ui_text(prop, "Link", "Link material to object or the object's data"); + RNA_def_property_ui_text(prop, N_("Link"), N_("Link material to object or the object's data")); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_MaterialSlot_update"); prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_property_string_funcs(prop, "rna_MaterialSlot_name_get", "rna_MaterialSlot_name_length", NULL); - RNA_def_property_ui_text(prop, "Name", "Material slot name"); + RNA_def_property_ui_text(prop, N_("Name"), N_("Material slot name")); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_struct_name_property(srna, prop); } @@ -1334,13 +1334,13 @@ static void rna_def_object_game_settings(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem body_type_items[] = { - {OB_BODY_TYPE_NO_COLLISION, "NO_COLLISION", 0, "No Collision", "Disable collision for this object"}, - {OB_BODY_TYPE_STATIC, "STATIC", 0, "Static", "Stationary object"}, - {OB_BODY_TYPE_DYNAMIC, "DYNAMIC", 0, "Dynamic", "Linear physics"}, - {OB_BODY_TYPE_RIGID, "RIGID_BODY", 0, "Rigid Body", "Linear and angular physics"}, - {OB_BODY_TYPE_SOFT, "SOFT_BODY", 0, "Soft Body", "Soft body"}, - {OB_BODY_TYPE_OCCLUDER, "OCCLUDE", 0, "Occlude", "Occluder for optimizing scene rendering"}, - {OB_BODY_TYPE_SENSOR, "SENSOR", 0, "Sensor", "Collision Sensor, detects static and dynamic objects but not the other collision sensor objects"}, + {OB_BODY_TYPE_NO_COLLISION, "NO_COLLISION", 0, N_("No Collision"), N_("Disable collision for this object")}, + {OB_BODY_TYPE_STATIC, "STATIC", 0, N_("Static"), N_("Stationary object")}, + {OB_BODY_TYPE_DYNAMIC, "DYNAMIC", 0, N_("Dynamic"), N_("Linear physics")}, + {OB_BODY_TYPE_RIGID, "RIGID_BODY", 0, N_("Rigid Body"), N_("Linear and angular physics")}, + {OB_BODY_TYPE_SOFT, "SOFT_BODY", 0, N_("Soft Body"), N_("Soft body")}, + {OB_BODY_TYPE_OCCLUDER, "OCCLUDE", 0, N_("Occlude"), N_("Occluder for optimizing scene rendering")}, + {OB_BODY_TYPE_SENSOR, "SENSOR", 0, N_("Sensor"), N_("Collision Sensor, detects static and dynamic objects but not the other collision sensor objects")}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "GameObjectSettings", NULL); diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 30fce5716a9..c80e15b6210 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -36,6 +36,8 @@ #include "rna_internal.h" +#include "BLF_api.h" + #include "DNA_material_types.h" #include "DNA_meshdata_types.h" #include "DNA_modifier_types.h" @@ -1217,11 +1219,11 @@ static void rna_def_particle_settings_mtex(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem texco_items[] = { - {TEXCO_GLOB, "GLOBAL", 0, "Global", "Uses global coordinates for the texture coordinates"}, - {TEXCO_OBJECT, "OBJECT", 0, "Object", "Uses linked object's coordinates for texture coordinates"}, - {TEXCO_UV, "UV", 0, "UV", "Uses UV coordinates for texture coordinates"}, - {TEXCO_ORCO, "ORCO", 0, "Generated", "Uses the original undeformed coordinates of the object"}, - {TEXCO_STRAND, "STRAND", 0, "Strand / Particle", "Uses normalized strand texture coordinate (1D) or particle age (X) and trail position (Y)"}, + {TEXCO_GLOB, "GLOBAL", 0, N_("Global"), N_("Uses global coordinates for the texture coordinates")}, + {TEXCO_OBJECT, "OBJECT", 0, N_("Object"), N_("Uses linked object's coordinates for texture coordinates")}, + {TEXCO_UV, "UV", 0, "UV", N_("Uses UV coordinates for texture coordinates")}, + {TEXCO_ORCO, "ORCO", 0, N_("Generated"), N_("Uses the original undeformed coordinates of the object")}, + {TEXCO_STRAND, "STRAND", 0, N_("Strand / Particle"), N_("Uses normalized strand texture coordinate (1D) or particle age (X) and trail position (Y)")}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem prop_mapping_items[] = { diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 4776c84689b..9ffe7c0360a 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1333,39 +1333,39 @@ static void rna_def_unit_settings(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem unit_systems[] = { - {USER_UNIT_NONE, "NONE", 0, "None", ""}, - {USER_UNIT_METRIC, "METRIC", 0, "Metric", ""}, - {USER_UNIT_IMPERIAL, "IMPERIAL", 0, "Imperial", ""}, + {USER_UNIT_NONE, "NONE", 0, N_("None"), ""}, + {USER_UNIT_METRIC, "METRIC", 0, N_("Metric"), ""}, + {USER_UNIT_IMPERIAL, "IMPERIAL", 0, N_("Imperial"), ""}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem rotation_units[] = { - {0, "DEGREES", 0, "Degrees", "Use degrees for measuring rotation"}, - {USER_UNIT_ROT_RADIANS, "RADIANS", 0, "Radians", ""}, + {0, "DEGREES", 0, N_("Degrees"), N_("Use degrees for measuring rotation")}, + {USER_UNIT_ROT_RADIANS, "RADIANS", 0, N_("Radians"), ""}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "UnitSettings", NULL); - RNA_def_struct_ui_text(srna, "Unit Settings", ""); + RNA_def_struct_ui_text(srna, N_("Unit Settings"), ""); /* Units */ prop= RNA_def_property(srna, "system", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, unit_systems); - RNA_def_property_ui_text(prop, "Unit System", "The unit system to use for button display"); + RNA_def_property_ui_text(prop, N_("Unit System"), N_("The unit system to use for button display")); RNA_def_property_update(prop, NC_WINDOW, NULL); prop= RNA_def_property(srna, "system_rotation", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, rotation_units); - RNA_def_property_ui_text(prop, "Rotation Units", "Unit to use for displaying/editing rotation values"); + RNA_def_property_ui_text(prop, N_("Rotation Units"), N_("Unit to use for displaying/editing rotation values")); RNA_def_property_update(prop, NC_WINDOW, NULL); prop= RNA_def_property(srna, "scale_length", PROP_FLOAT, PROP_UNSIGNED); - RNA_def_property_ui_text(prop, "Unit Scale", "Scale to use when converting between blender units and dimensions"); + RNA_def_property_ui_text(prop, N_("Unit Scale"), N_("Scale to use when converting between blender units and dimensions")); RNA_def_property_range(prop, 0.00001, 100000.0); RNA_def_property_ui_range(prop, 0.001, 100.0, 0.1, 3); RNA_def_property_update(prop, NC_WINDOW, NULL); prop= RNA_def_property(srna, "use_separate", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_UNIT_OPT_SPLIT); - RNA_def_property_ui_text(prop, "Separate Units", "Display units in pairs"); + RNA_def_property_ui_text(prop, N_("Separate Units"), N_("Display units in pairs")); RNA_def_property_update(prop, NC_WINDOW, NULL); } @@ -1376,7 +1376,7 @@ void rna_def_render_layer_common(StructRNA *srna, int scene) prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); if(scene) RNA_def_property_string_funcs(prop, NULL, NULL, "rna_SceneRenderLayer_name_set"); else RNA_def_property_string_sdna(prop, NULL, "name"); - RNA_def_property_ui_text(prop, "Name", "Render layer name"); + RNA_def_property_ui_text(prop, N_("Name"), N_("Render layer name")); RNA_def_struct_name_property(srna, prop); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -1385,7 +1385,7 @@ void rna_def_render_layer_common(StructRNA *srna, int scene) RNA_def_property_pointer_sdna(prop, NULL, "mat_override"); RNA_def_property_struct_type(prop, "Material"); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Material Override", "Material to override all other materials in this render layer"); + RNA_def_property_ui_text(prop, N_("Material Override"), N_("Material to override all other materials in this render layer")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -1393,7 +1393,7 @@ void rna_def_render_layer_common(StructRNA *srna, int scene) RNA_def_property_pointer_sdna(prop, NULL, "light_override"); RNA_def_property_struct_type(prop, "Group"); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Light Override", "Group to override all other lights in this render layer"); + RNA_def_property_ui_text(prop, N_("Light Override"), N_("Group to override all other lights in this render layer")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -1401,7 +1401,7 @@ void rna_def_render_layer_common(StructRNA *srna, int scene) prop= RNA_def_property(srna, "layers", PROP_BOOLEAN, PROP_LAYER_MEMBER); RNA_def_property_boolean_sdna(prop, NULL, "lay", 1); RNA_def_property_array(prop, 20); - RNA_def_property_ui_text(prop, "Visible Layers", "Scene layers included in this render layer"); + RNA_def_property_ui_text(prop, N_("Visible Layers"), N_("Scene layers included in this render layer")); if(scene) RNA_def_property_boolean_funcs(prop, NULL, "rna_SceneRenderLayer_layer_set"); else RNA_def_property_boolean_funcs(prop, NULL, "rna_RenderLayer_layer_set"); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); @@ -1410,232 +1410,232 @@ void rna_def_render_layer_common(StructRNA *srna, int scene) prop= RNA_def_property(srna, "layers_zmask", PROP_BOOLEAN, PROP_LAYER); RNA_def_property_boolean_sdna(prop, NULL, "lay_zmask", 1); RNA_def_property_array(prop, 20); - RNA_def_property_ui_text(prop, "Zmask Layers", "Zmask scene layers for solid faces"); + RNA_def_property_ui_text(prop, N_("Zmask Layers"), N_("Zmask scene layers for solid faces")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* layer options */ prop= RNA_def_property(srna, "use", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "layflag", SCE_LAY_DISABLE); - RNA_def_property_ui_text(prop, "Enabled", "Disable or enable the render layer"); + RNA_def_property_ui_text(prop, N_("Enabled"), N_("Disable or enable the render layer")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_zmask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_ZMASK); - RNA_def_property_ui_text(prop, "Zmask", "Only render what's in front of the solid z values"); + RNA_def_property_ui_text(prop, N_("Zmask"), N_("Only render what's in front of the solid z values")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "invert_zmask", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_NEG_ZMASK); - RNA_def_property_ui_text(prop, "Zmask Negate", "For Zmask, only render what is behind solid z values instead of in front"); + RNA_def_property_ui_text(prop, N_("Zmask Negate"), N_("For Zmask, only render what is behind solid z values instead of in front")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_all_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_ALL_Z); - RNA_def_property_ui_text(prop, "All Z", "Fill in Z values for solid faces in invisible layers, for masking"); + RNA_def_property_ui_text(prop, N_("All Z"), N_("Fill in Z values for solid faces in invisible layers, for masking")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_solid", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_SOLID); - RNA_def_property_ui_text(prop, "Solid", "Render Solid faces in this Layer"); + RNA_def_property_ui_text(prop, N_("Solid"), N_("Render Solid faces in this Layer")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_halo", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_HALO); - RNA_def_property_ui_text(prop, "Halo", "Render Halos in this Layer (on top of Solid)"); + RNA_def_property_ui_text(prop, N_("Halo"), N_("Render Halos in this Layer (on top of Solid)")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_ztransp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_ZTRA); - RNA_def_property_ui_text(prop, "ZTransp", "Render Z-Transparent faces in this Layer (On top of Solid and Halos)"); + RNA_def_property_ui_text(prop, N_("ZTransp"), N_("Render Z-Transparent faces in this Layer (On top of Solid and Halos)")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_sky", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_SKY); - RNA_def_property_ui_text(prop, "Sky", "Render Sky in this Layer"); + RNA_def_property_ui_text(prop, N_("Sky"), N_("Render Sky in this Layer")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_edge_enhance", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_EDGE); - RNA_def_property_ui_text(prop, "Edge", "Render Edge-enhance in this Layer (only works for Solid faces)"); + RNA_def_property_ui_text(prop, N_("Edge"), N_("Render Edge-enhance in this Layer (only works for Solid faces)")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_strand", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "layflag", SCE_LAY_STRAND); - RNA_def_property_ui_text(prop, "Strand", "Render Strands in this Layer"); + RNA_def_property_ui_text(prop, N_("Strand"), N_("Render Strands in this Layer")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* passes */ prop= RNA_def_property(srna, "use_pass_combined", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_COMBINED); - RNA_def_property_ui_text(prop, "Combined", "Deliver full combined RGBA buffer"); + RNA_def_property_ui_text(prop, N_("Combined"), N_("Deliver full combined RGBA buffer")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_z", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_Z); - RNA_def_property_ui_text(prop, "Z", "Deliver Z values pass"); + RNA_def_property_ui_text(prop, "Z", N_("Deliver Z values pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_vector", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_VECTOR); - RNA_def_property_ui_text(prop, "Vector", "Deliver speed vector pass"); + RNA_def_property_ui_text(prop, N_("Vector"), N_("Deliver speed vector pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_normal", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_NORMAL); - RNA_def_property_ui_text(prop, "Normal", "Deliver normal pass"); + RNA_def_property_ui_text(prop, N_("Normal"), N_("Deliver normal pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_uv", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_UV); - RNA_def_property_ui_text(prop, "UV", "Deliver texture UV pass"); + RNA_def_property_ui_text(prop, "UV", N_("Deliver texture UV pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_mist", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_MIST); - RNA_def_property_ui_text(prop, "Mist", "Deliver mist factor pass (0.0-1.0)"); + RNA_def_property_ui_text(prop, N_("Mist"), N_("Deliver mist factor pass (0.0-1.0)")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_object_index", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_INDEXOB); - RNA_def_property_ui_text(prop, "Object Index", "Deliver object index pass"); + RNA_def_property_ui_text(prop, N_("Object Index"), N_("Deliver object index pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_material_index", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_INDEXMA); - RNA_def_property_ui_text(prop, "Material Index", "Deliver material index pass"); + RNA_def_property_ui_text(prop, N_("Material Index"), N_("Deliver material index pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_RGBA); - RNA_def_property_ui_text(prop, "Color", "Deliver shade-less color pass"); + RNA_def_property_ui_text(prop, N_("Color"), N_("Deliver shade-less color pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_diffuse", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_DIFFUSE); - RNA_def_property_ui_text(prop, "Diffuse", "Deliver diffuse pass"); + RNA_def_property_ui_text(prop, N_("Diffuse"), N_("Deliver diffuse pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_specular", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_SPEC); - RNA_def_property_ui_text(prop, "Specular", "Deliver specular pass"); + RNA_def_property_ui_text(prop, N_("Specular"), N_("Deliver specular pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_shadow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_SHADOW); - RNA_def_property_ui_text(prop, "Shadow", "Deliver shadow pass"); + RNA_def_property_ui_text(prop, N_("Shadow"), N_("Deliver shadow pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_ambient_occlusion", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_AO); - RNA_def_property_ui_text(prop, "AO", "Deliver AO pass"); + RNA_def_property_ui_text(prop, "AO", N_("Deliver AO pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_reflection", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_REFLECT); - RNA_def_property_ui_text(prop, "Reflection", "Deliver raytraced reflection pass"); + RNA_def_property_ui_text(prop, N_("Reflection"), N_("Deliver raytraced reflection pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_refraction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_REFRACT); - RNA_def_property_ui_text(prop, "Refraction", "Deliver raytraced refraction pass"); + RNA_def_property_ui_text(prop, N_("Refraction"), N_("Deliver raytraced refraction pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_emit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_EMIT); - RNA_def_property_ui_text(prop, "Emit", "Deliver emission pass"); + RNA_def_property_ui_text(prop, N_("Emit"), N_("Deliver emission pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_environment", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_ENVIRONMENT); - RNA_def_property_ui_text(prop, "Environment", "Deliver environment lighting pass"); + RNA_def_property_ui_text(prop, N_("Environment"), N_("Deliver environment lighting pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "use_pass_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "passflag", SCE_PASS_INDIRECT); - RNA_def_property_ui_text(prop, "Indirect", "Deliver indirect lighting pass"); + RNA_def_property_ui_text(prop, N_("Indirect"), N_("Deliver indirect lighting pass")); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_specular", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_SPEC); - RNA_def_property_ui_text(prop, "Specular Exclude", "Exclude specular pass from combined"); + RNA_def_property_ui_text(prop, N_("Specular Exclude"), N_("Exclude specular pass from combined")); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_shadow", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_SHADOW); - RNA_def_property_ui_text(prop, "Shadow Exclude", "Exclude shadow pass from combined"); + RNA_def_property_ui_text(prop, N_("Shadow Exclude"), N_("Exclude shadow pass from combined")); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_ambient_occlusion", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_AO); - RNA_def_property_ui_text(prop, "AO Exclude", "Exclude AO pass from combined"); + RNA_def_property_ui_text(prop, N_("AO Exclude"), N_("Exclude AO pass from combined")); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_reflection", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_REFLECT); - RNA_def_property_ui_text(prop, "Reflection Exclude", "Exclude raytraced reflection pass from combined"); + RNA_def_property_ui_text(prop, N_("Reflection Exclude"), N_("Exclude raytraced reflection pass from combined")); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_refraction", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_REFRACT); - RNA_def_property_ui_text(prop, "Refraction Exclude", "Exclude raytraced refraction pass from combined"); + RNA_def_property_ui_text(prop, N_("Refraction Exclude"), N_("Exclude raytraced refraction pass from combined")); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_emit", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_EMIT); - RNA_def_property_ui_text(prop, "Emit Exclude", "Exclude emission pass from combined"); + RNA_def_property_ui_text(prop, N_("Emit Exclude"), N_("Exclude emission pass from combined")); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_environment", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_ENVIRONMENT); - RNA_def_property_ui_text(prop, "Environment Exclude", "Exclude environment pass from combined"); + RNA_def_property_ui_text(prop, N_("Environment Exclude"), N_("Exclude environment pass from combined")); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); prop= RNA_def_property(srna, "exclude_indirect", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "pass_xor", SCE_PASS_INDIRECT); - RNA_def_property_ui_text(prop, "Indirect Exclude", "Exclude indirect pass from combined"); + RNA_def_property_ui_text(prop, N_("Indirect Exclude"), N_("Exclude indirect pass from combined")); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); if(scene) RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, "rna_SceneRenderLayer_pass_update"); else RNA_def_property_clear_flag(prop, PROP_EDITABLE); diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 9e3a31ddb2e..ade64ce5021 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -34,6 +34,7 @@ #include "RNA_define.h" #include "rna_internal.h" +#include "BLF_api.h" #include "DNA_brush_types.h" #include "DNA_lamp_types.h" @@ -55,22 +56,22 @@ EnumPropertyItem texture_filter_items[] = { {0, NULL, 0, NULL, NULL}}; EnumPropertyItem texture_type_items[] = { - {0, "NONE", 0, "None", ""}, - {TEX_BLEND, "BLEND", ICON_TEXTURE, "Blend", "Procedural - Creates a ramp texture"}, - {TEX_CLOUDS, "CLOUDS", ICON_TEXTURE, "Clouds", "Procedural - Creates a cloud-like fractal noise texture"}, - {TEX_DISTNOISE, "DISTORTED_NOISE", ICON_TEXTURE, "Distorted Noise", "Procedural - Noise texture distorted by two noise algorithms"}, - {TEX_ENVMAP, "ENVIRONMENT_MAP", ICON_IMAGE_DATA, "Environment Map", "Creates a render of the environment mapped to a texture"}, - {TEX_IMAGE, "IMAGE", ICON_IMAGE_DATA, "Image or Movie", "Allows for images or movies to be used as textures"}, - {TEX_MAGIC, "MAGIC", ICON_TEXTURE, "Magic", "Procedural - Color texture based on trigonometric functions"}, - {TEX_MARBLE, "MARBLE", ICON_TEXTURE, "Marble", "Procedural - Marble-like noise texture with wave generated bands"}, - {TEX_MUSGRAVE, "MUSGRAVE", ICON_TEXTURE, "Musgrave", "Procedural - Highly flexible fractal noise texture"}, - {TEX_NOISE, "NOISE", ICON_TEXTURE, "Noise", "Procedural - Random noise, gives a different result every time, for every frame, for every pixel"}, + {0, "NONE", 0, N_("None"), ""}, + {TEX_BLEND, "BLEND", ICON_TEXTURE, N_("Blend"), N_("Procedural - Creates a ramp texture")}, + {TEX_CLOUDS, "CLOUDS", ICON_TEXTURE, N_("Clouds"), N_("Procedural - Creates a cloud-like fractal noise texture")}, + {TEX_DISTNOISE, "DISTORTED_NOISE", ICON_TEXTURE, N_("Distorted Noise"), N_("Procedural - Noise texture distorted by two noise algorithms")}, + {TEX_ENVMAP, "ENVIRONMENT_MAP", ICON_IMAGE_DATA, N_("Environment Map"), N_("Creates a render of the environment mapped to a texture")}, + {TEX_IMAGE, "IMAGE", ICON_IMAGE_DATA, N_("Image or Movie"), N_("Allows for images or movies to be used as textures")}, + {TEX_MAGIC, "MAGIC", ICON_TEXTURE, N_("Magic"), N_("Procedural - Color texture based on trigonometric functions")}, + {TEX_MARBLE, "MARBLE", ICON_TEXTURE, N_("Marble"), N_("Procedural - Marble-like noise texture with wave generated bands")}, + {TEX_MUSGRAVE, "MUSGRAVE", ICON_TEXTURE, N_("Musgrave"), N_("Procedural - Highly flexible fractal noise texture")}, + {TEX_NOISE, "NOISE", ICON_TEXTURE, N_("Noise"), N_("Procedural - Random noise, gives a different result every time, for every frame, for every pixel")}, //{TEX_PLUGIN, "PLUGIN", ICON_PLUGIN, "Plugin", ""}, /* Nothing yet */ - {TEX_POINTDENSITY, "POINT_DENSITY", ICON_TEXTURE, "Point Density", ""}, - {TEX_STUCCI, "STUCCI", ICON_TEXTURE, "Stucci", "Procedural - Creates a fractal noise texture"}, - {TEX_VORONOI, "VORONOI", ICON_TEXTURE, "Voronoi", "Procedural - Creates cell-like patterns based on Worley noise"}, - {TEX_VOXELDATA, "VOXEL_DATA", ICON_TEXTURE, "Voxel Data", "Creates a 3d texture based on volumetric data"}, - {TEX_WOOD, "WOOD", ICON_TEXTURE, "Wood", "Procedural - Wave generated bands or rings, with optional noise"}, + {TEX_POINTDENSITY, "POINT_DENSITY", ICON_TEXTURE, N_("Point Density"), ""}, + {TEX_STUCCI, "STUCCI", ICON_TEXTURE, N_("Stucci"), N_("Procedural - Creates a fractal noise texture")}, + {TEX_VORONOI, "VORONOI", ICON_TEXTURE, N_("Voronoi"), N_("Procedural - Creates cell-like patterns based on Worley noise")}, + {TEX_VOXELDATA, "VOXEL_DATA", ICON_TEXTURE, N_("Voxel Data"), N_("Creates a 3d texture based on volumetric data")}, + {TEX_WOOD, "WOOD", ICON_TEXTURE, N_("Wood"), N_("Procedural - Wave generated bands or rings, with optional noise")}, {0, NULL, 0, NULL, NULL}}; #ifdef RNA_RUNTIME @@ -470,7 +471,7 @@ static void rna_def_mtex(BlenderRNA *brna) srna= RNA_def_struct(brna, "TextureSlot", NULL); RNA_def_struct_sdna(srna, "MTex"); - RNA_def_struct_ui_text(srna, "Texture Slot", "Texture slot defining the mapping and influence of a texture"); + RNA_def_struct_ui_text(srna, N_("Texture Slot"), N_("Texture slot defining the mapping and influence of a texture")); RNA_def_struct_path_func(srna, "rna_TextureSlot_path"); RNA_def_struct_ui_icon(srna, ICON_TEXTURE_DATA); @@ -478,12 +479,12 @@ static void rna_def_mtex(BlenderRNA *brna) RNA_def_property_pointer_sdna(prop, NULL, "tex"); RNA_def_property_struct_type(prop, "Texture"); RNA_def_property_flag(prop, PROP_EDITABLE); - RNA_def_property_ui_text(prop, "Texture", "Texture datablock used by this texture slot"); + RNA_def_property_ui_text(prop, N_("Texture"), N_("Texture datablock used by this texture slot")); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_property_string_funcs(prop, "rna_TextureSlot_name_get", "rna_TextureSlot_name_length", NULL); - RNA_def_property_ui_text(prop, "Name", "Texture slot name"); + RNA_def_property_ui_text(prop, N_("Name"), N_("Texture slot name")); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_struct_name_property(srna, prop); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); @@ -492,53 +493,53 @@ static void rna_def_mtex(BlenderRNA *brna) prop= RNA_def_property(srna, "offset", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_float_sdna(prop, NULL, "ofs"); RNA_def_property_ui_range(prop, -10, 10, 10, 2); - RNA_def_property_ui_text(prop, "Offset", "Fine tunes texture mapping X, Y and Z locations"); + RNA_def_property_ui_text(prop, N_("Offset"), N_("Fine tunes texture mapping X, Y and Z locations")); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); prop= RNA_def_property(srna, "scale", PROP_FLOAT, PROP_XYZ); RNA_def_property_float_sdna(prop, NULL, "size"); RNA_def_property_ui_range(prop, -100, 100, 10, 2); - RNA_def_property_ui_text(prop, "Size", "Sets scaling for the texture's X, Y and Z sizes"); + RNA_def_property_ui_text(prop, N_("Size"), N_("Sets scaling for the texture's X, Y and Z sizes")); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); prop= RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "r"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Color", "The default color for textures that don't return RGB or when RGB to intensity is enabled"); + RNA_def_property_ui_text(prop, N_("Color"), N_("The default color for textures that don't return RGB or when RGB to intensity is enabled")); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); prop= RNA_def_property(srna, "blend_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "blendtype"); RNA_def_property_enum_items(prop, prop_blend_type_items); - RNA_def_property_ui_text(prop, "Blend Type", "The mode used to apply the texture"); + RNA_def_property_ui_text(prop, N_("Blend Type"), N_("The mode used to apply the texture")); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); prop= RNA_def_property(srna, "use_stencil", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", MTEX_STENCIL); - RNA_def_property_ui_text(prop, "Stencil", "Use this texture as a blending value on the next texture"); + RNA_def_property_ui_text(prop, N_("Stencil"), N_("Use this texture as a blending value on the next texture")); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); prop= RNA_def_property(srna, "invert", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", MTEX_NEGATIVE); - RNA_def_property_ui_text(prop, "Negate", "Inverts the values of the texture to reverse its effect"); + RNA_def_property_ui_text(prop, N_("Negate"), N_("Inverts the values of the texture to reverse its effect")); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); prop= RNA_def_property(srna, "use_rgb_to_intensity", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "texflag", MTEX_RGBTOINT); - RNA_def_property_ui_text(prop, "RGB to Intensity", "Converts texture RGB values to intensity (gray) values"); + RNA_def_property_ui_text(prop, N_("RGB to Intensity"), N_("Converts texture RGB values to intensity (gray) values")); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); prop= RNA_def_property(srna, "default_value", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "def_var"); RNA_def_property_ui_range(prop, 0, 1, 10, 3); - RNA_def_property_ui_text(prop, "Default Value", "Value to use for Ref, Spec, Amb, Emit, Alpha, RayMir, TransLu and Hard"); + RNA_def_property_ui_text(prop, N_("Default Value"), N_("Value to use for Ref, Spec, Amb, Emit, Alpha, RayMir, TransLu and Hard")); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); prop= RNA_def_property(srna, "output_node", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "which_output"); RNA_def_property_enum_items(prop, output_node_items); RNA_def_property_enum_funcs(prop, "rna_TextureSlot_output_node_get", NULL, "rna_TextureSlot_output_node_itemf"); - RNA_def_property_ui_text(prop, "Output Node", "Which output node to use, for node-based textures"); + RNA_def_property_ui_text(prop, N_("Output Node"), N_("Which output node to use, for node-based textures")); RNA_def_property_update(prop, 0, "rna_TextureSlot_update"); } @@ -1710,7 +1711,7 @@ static void rna_def_texture(BlenderRNA *brna) srna= RNA_def_struct(brna, "Texture", "ID"); RNA_def_struct_sdna(srna, "Tex"); - RNA_def_struct_ui_text(srna, "Texture", "Texture datablock used by materials, lamps, worlds and brushes"); + RNA_def_struct_ui_text(srna, N_("Texture"), N_("Texture datablock used by materials, lamps, worlds and brushes")); RNA_def_struct_ui_icon(srna, ICON_TEXTURE_DATA); RNA_def_struct_refine_func(srna, "rna_Texture_refine"); @@ -1719,72 +1720,72 @@ static void rna_def_texture(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "type"); RNA_def_property_enum_items(prop, texture_type_items); RNA_def_property_enum_funcs(prop, NULL, "rna_Texture_type_set", NULL); - RNA_def_property_ui_text(prop, "Type", ""); + RNA_def_property_ui_text(prop, N_("Type"), ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); prop= RNA_def_property(srna, "use_color_ramp", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_COLORBAND); RNA_def_property_boolean_funcs(prop, NULL, "rna_Texture_use_color_ramp_set"); - RNA_def_property_ui_text(prop, "Use Color Ramp", "Toggle color ramp operations"); + RNA_def_property_ui_text(prop, N_("Use Color Ramp"), N_("Toggle color ramp operations")); RNA_def_property_update(prop, 0, "rna_Texture_update"); prop= RNA_def_property(srna, "color_ramp", PROP_POINTER, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "coba"); RNA_def_property_struct_type(prop, "ColorRamp"); - RNA_def_property_ui_text(prop, "Color Ramp", ""); + RNA_def_property_ui_text(prop, N_("Color Ramp"), ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); prop= RNA_def_property(srna, "intensity", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "bright"); RNA_def_property_range(prop, 0, 2); - RNA_def_property_ui_text(prop, "Brightness", "Adjusts the brightness of the texture"); + RNA_def_property_ui_text(prop, N_("Brightness"), N_("Adjusts the brightness of the texture")); RNA_def_property_update(prop, 0, "rna_Texture_update"); prop= RNA_def_property(srna, "contrast", PROP_FLOAT, PROP_NONE); RNA_def_property_range(prop, 0.01, 5); - RNA_def_property_ui_text(prop, "Contrast", "Adjusts the contrast of the texture"); + RNA_def_property_ui_text(prop, N_("Contrast"), N_("Adjusts the contrast of the texture")); RNA_def_property_update(prop, 0, "rna_Texture_update"); prop= RNA_def_property(srna, "saturation", PROP_FLOAT, PROP_NONE); RNA_def_property_range(prop, 0, 2); - RNA_def_property_ui_text(prop, "Saturation", "Adjusts the saturation of colors in the texture"); + RNA_def_property_ui_text(prop, N_("Saturation"), N_("Adjusts the saturation of colors in the texture")); RNA_def_property_update(prop, 0, "rna_Texture_update"); /* RGB Factor */ prop= RNA_def_property(srna, "factor_red", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "rfac"); RNA_def_property_range(prop, 0, 2); - RNA_def_property_ui_text(prop, "Factor Red", ""); + RNA_def_property_ui_text(prop, N_("Factor Red"), ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); prop= RNA_def_property(srna, "factor_green", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "gfac"); RNA_def_property_range(prop, 0, 2); - RNA_def_property_ui_text(prop, "Factor Green", ""); + RNA_def_property_ui_text(prop, N_("Factor Green"), ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); prop= RNA_def_property(srna, "factor_blue", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "bfac"); RNA_def_property_range(prop, 0, 2); - RNA_def_property_ui_text(prop, "Factor Blue", ""); + RNA_def_property_ui_text(prop, N_("Factor Blue"), ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); /* Alpha for preview render */ prop= RNA_def_property(srna, "use_preview_alpha", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_PRV_ALPHA); - RNA_def_property_ui_text(prop, "Show Alpha", "Show Alpha in Preview Render"); + RNA_def_property_ui_text(prop, N_("Show Alpha"), N_("Show Alpha in Preview Render")); RNA_def_property_update(prop, 0, "rna_Texture_update"); /* nodetree */ prop= RNA_def_property(srna, "use_nodes", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "use_nodes", 1); RNA_def_property_boolean_funcs(prop, NULL, "rna_Texture_use_nodes_set"); - RNA_def_property_ui_text(prop, "Use Nodes", "Make this a node-based texture"); + RNA_def_property_ui_text(prop, N_("Use Nodes"), N_("Make this a node-based texture")); RNA_def_property_update(prop, 0, "rna_Texture_nodes_update"); prop= RNA_def_property(srna, "node_tree", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "nodetree"); - RNA_def_property_ui_text(prop, "Node Tree", "Node tree for node-based textures"); + RNA_def_property_ui_text(prop, N_("Node Tree"), N_("Node tree for node-based textures")); RNA_def_property_update(prop, 0, "rna_Texture_nodes_update"); rna_def_animdata_common(srna); diff --git a/source/blender/makesrna/intern/rna_world.c b/source/blender/makesrna/intern/rna_world.c index 72b54dce473..eafc78099f6 100644 --- a/source/blender/makesrna/intern/rna_world.c +++ b/source/blender/makesrna/intern/rna_world.c @@ -33,6 +33,7 @@ #include "RNA_define.h" #include "rna_internal.h" +#include "BLF_api.h" #include "DNA_material_types.h" #include "DNA_texture_types.h" @@ -212,162 +213,162 @@ static void rna_def_lighting(BlenderRNA *brna) PropertyRNA *prop; static EnumPropertyItem blend_mode_items[] = { - {WO_AOMUL, "MULTIPLY", 0, "Multiply", "Multiply direct lighting with ambient occlusion, darkening the result"}, - {WO_AOADD, "ADD", 0, "Add", "Add light and shadow"}, + {WO_AOMUL, "MULTIPLY", 0, N_("Multiply"), N_("Multiply direct lighting with ambient occlusion, darkening the result")}, + {WO_AOADD, "ADD", 0, N_("Add"), N_("Add light and shadow")}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem prop_color_items[] = { - {WO_AOPLAIN, "PLAIN", 0, "White", "Plain diffuse energy (white.)"}, - {WO_AOSKYCOL, "SKY_COLOR", 0, "Sky Color", "Use horizon and zenith color for diffuse energy"}, - {WO_AOSKYTEX, "SKY_TEXTURE", 0, "Sky Texture", "Does full Sky texture render for diffuse energy"}, + {WO_AOPLAIN, "PLAIN", 0, N_("White"), N_("Plain diffuse energy (white.)")}, + {WO_AOSKYCOL, "SKY_COLOR", 0, N_("Sky Color"), N_("Use horizon and zenith color for diffuse energy")}, + {WO_AOSKYTEX, "SKY_TEXTURE", 0, N_("Sky Texture"), N_("Does full Sky texture render for diffuse energy")}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem prop_sample_method_items[] = { - {WO_AOSAMP_CONSTANT, "CONSTANT_JITTERED", 0, "Constant Jittered", "Fastest and gives the most noise"}, - {WO_AOSAMP_HALTON, "ADAPTIVE_QMC", 0, "Adaptive QMC", "Fast in high-contrast areas"}, - {WO_AOSAMP_HAMMERSLEY, "CONSTANT_QMC", 0, "Constant QMC", "Best quality"}, + {WO_AOSAMP_CONSTANT, "CONSTANT_JITTERED", 0, N_("Constant Jittered"), N_("Fastest and gives the most noise")}, + {WO_AOSAMP_HALTON, "ADAPTIVE_QMC", 0, N_("Adaptive QMC"), N_("Fast in high-contrast areas")}, + {WO_AOSAMP_HAMMERSLEY, "CONSTANT_QMC", 0, N_("Constant QMC"), N_("Best quality")}, {0, NULL, 0, NULL, NULL}}; static EnumPropertyItem prop_gather_method_items[] = { - {WO_AOGATHER_RAYTRACE, "RAYTRACE", 0, "Raytrace", "Accurate, but slow when noise-free results are required"}, - {WO_AOGATHER_APPROX, "APPROXIMATE", 0, "Approximate", "Inaccurate, but faster and without noise"}, + {WO_AOGATHER_RAYTRACE, "RAYTRACE", 0, N_("Raytrace"), N_("Accurate, but slow when noise-free results are required")}, + {WO_AOGATHER_APPROX, "APPROXIMATE", 0, N_("Approximate"), N_("Inaccurate, but faster and without noise")}, {0, NULL, 0, NULL, NULL}}; srna= RNA_def_struct(brna, "WorldLighting", NULL); RNA_def_struct_sdna(srna, "World"); RNA_def_struct_nested(brna, srna, "World"); - RNA_def_struct_ui_text(srna, "Lighting", "Lighting for a World datablock"); + RNA_def_struct_ui_text(srna, N_("Lighting"), N_("Lighting for a World datablock")); /* ambient occlusion */ prop= RNA_def_property(srna, "use_ambient_occlusion", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", WO_AMB_OCC); - RNA_def_property_ui_text(prop, "Use Ambient Occlusion", "Use Ambient Occlusion to add shadowing based on distance between objects"); + RNA_def_property_ui_text(prop, N_("Use Ambient Occlusion"), N_("Use Ambient Occlusion to add shadowing based on distance between objects")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "ao_factor", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "aoenergy"); RNA_def_property_range(prop, 0, INT_MAX); RNA_def_property_ui_range(prop, 0, 1, 0.1, 2); - RNA_def_property_ui_text(prop, "Factor", "Factor for ambient occlusion blending"); + RNA_def_property_ui_text(prop, N_("Factor"), N_("Factor for ambient occlusion blending")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "ao_blend_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "aomix"); RNA_def_property_enum_items(prop, blend_mode_items); - RNA_def_property_ui_text(prop, "Blend Mode", "Defines how AO mixes with material shading"); + RNA_def_property_ui_text(prop, N_("Blend Mode"), N_("Defines how AO mixes with material shading")); RNA_def_property_update(prop, 0, "rna_World_update"); /* environment lighting */ prop= RNA_def_property(srna, "use_environment_light", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", WO_ENV_LIGHT); - RNA_def_property_ui_text(prop, "Use Environment Lighting", "Add light coming from the environment"); + RNA_def_property_ui_text(prop, N_("Use Environment Lighting"), N_("Add light coming from the environment")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "environment_energy", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ao_env_energy"); RNA_def_property_ui_range(prop, 0, FLT_MAX, 1, 3); - RNA_def_property_ui_text(prop, "Environment Color", "Defines the strength of environment light"); + RNA_def_property_ui_text(prop, N_("Environment Color"), N_("Defines the strength of environment light")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "environment_color", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "aocolor"); RNA_def_property_enum_items(prop, prop_color_items); - RNA_def_property_ui_text(prop, "Environment Color", "Defines where the color of the environment light comes from"); + RNA_def_property_ui_text(prop, N_("Environment Color"), N_("Defines where the color of the environment light comes from")); RNA_def_property_update(prop, 0, "rna_World_update"); /* indirect lighting */ prop= RNA_def_property(srna, "use_indirect_light", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", WO_INDIRECT_LIGHT); - RNA_def_property_ui_text(prop, "Use Indirect Lighting", "Add indirect light bouncing of surrounding objects"); + RNA_def_property_ui_text(prop, N_("Use Indirect Lighting"), N_("Add indirect light bouncing of surrounding objects")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "indirect_factor", PROP_FLOAT, PROP_FACTOR); RNA_def_property_float_sdna(prop, NULL, "ao_indirect_energy"); RNA_def_property_range(prop, 0, INT_MAX); RNA_def_property_ui_range(prop, 0, 1, 0.1, 2); - RNA_def_property_ui_text(prop, "Indirect Factor", "Factor for how much surrounding objects contribute to light"); + RNA_def_property_ui_text(prop, N_("Indirect Factor"), N_("Factor for how much surrounding objects contribute to light")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "indirect_bounces", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "ao_indirect_bounces"); RNA_def_property_range(prop, 1, SHRT_MAX); - RNA_def_property_ui_text(prop, "Bounces", "Number of indirect diffuse light bounces"); + RNA_def_property_ui_text(prop, N_("Bounces"), N_("Number of indirect diffuse light bounces")); RNA_def_property_update(prop, 0, "rna_World_update"); /* gathering parameters */ prop= RNA_def_property(srna, "gather_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "ao_gather_method"); RNA_def_property_enum_items(prop, prop_gather_method_items); - RNA_def_property_ui_text(prop, "Gather Method", ""); + RNA_def_property_ui_text(prop, N_("Gather Method"), ""); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "passes", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "ao_approx_passes"); RNA_def_property_range(prop, 0, 10); - RNA_def_property_ui_text(prop, "Passes", "Number of preprocessing passes to reduce overocclusion"); + RNA_def_property_ui_text(prop, N_("Passes"), N_("Number of preprocessing passes to reduce overocclusion")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "distance", PROP_FLOAT, PROP_DISTANCE); RNA_def_property_float_sdna(prop, NULL, "aodist"); - RNA_def_property_ui_text(prop, "Distance", "Length of rays, defines how far away other faces give occlusion effect"); + RNA_def_property_ui_text(prop, N_("Distance"), N_("Length of rays, defines how far away other faces give occlusion effect")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "falloff_strength", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "aodistfac"); - RNA_def_property_ui_text(prop, "Strength", "Attenuation falloff strength, the higher, the less influence distant objects have"); + RNA_def_property_ui_text(prop, N_("Strength"), N_("Attenuation falloff strength, the higher, the less influence distant objects have")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "bias", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "aobias"); RNA_def_property_range(prop, 0, 0.5); - RNA_def_property_ui_text(prop, "Bias", "Bias (in radians) to prevent smoothed faces from showing banding (for Raytrace Constant Jittered)"); + RNA_def_property_ui_text(prop, N_("Bias"), N_("Bias (in radians) to prevent smoothed faces from showing banding (for Raytrace Constant Jittered)")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "threshold", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ao_adapt_thresh"); RNA_def_property_range(prop, 0, 1); - RNA_def_property_ui_text(prop, "Threshold", "Samples below this threshold will be considered fully shadowed/unshadowed and skipped (for Raytrace Adaptive QMC)"); + RNA_def_property_ui_text(prop, N_("Threshold"), N_("Samples below this threshold will be considered fully shadowed/unshadowed and skipped (for Raytrace Adaptive QMC)")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "adapt_to_speed", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ao_adapt_speed_fac"); RNA_def_property_range(prop, 0, 1); - RNA_def_property_ui_text(prop, "Adapt To Speed", "Use the speed vector pass to reduce AO samples in fast moving pixels. Higher values result in more aggressive sample reduction. Requires Vec pass enabled (for Raytrace Adaptive QMC)"); + RNA_def_property_ui_text(prop, N_("Adapt To Speed"), N_("Use the speed vector pass to reduce AO samples in fast moving pixels. Higher values result in more aggressive sample reduction. Requires Vec pass enabled (for Raytrace Adaptive QMC)")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "error_threshold", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ao_approx_error"); RNA_def_property_range(prop, 0.0001, 10); - RNA_def_property_ui_text(prop, "Error Tolerance", "Low values are slower and higher quality"); + RNA_def_property_ui_text(prop, N_("Error Tolerance"), N_("Low values are slower and higher quality")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "correction", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "ao_approx_correction"); RNA_def_property_range(prop, 0, 1); RNA_def_property_ui_range(prop, 0, 1, 0.1, 2); - RNA_def_property_ui_text(prop, "Correction", "Ad-hoc correction for over-occlusion due to the approximation"); + RNA_def_property_ui_text(prop, N_("Correction"), N_("Ad-hoc correction for over-occlusion due to the approximation")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "use_falloff", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "aomode", WO_AODIST); - RNA_def_property_ui_text(prop, "Falloff", "Distance will be used to attenuate shadows"); + RNA_def_property_ui_text(prop, N_("Falloff"), N_("Distance will be used to attenuate shadows")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "use_cache", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "aomode", WO_AOCACHE); - RNA_def_property_ui_text(prop, "Pixel Cache", "Cache AO results in pixels and interpolate over neighbouring pixels for speedup"); + RNA_def_property_ui_text(prop, N_("Pixel Cache"), N_("Cache AO results in pixels and interpolate over neighbouring pixels for speedup")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "samples", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "aosamp"); RNA_def_property_range(prop, 1, 32); - RNA_def_property_ui_text(prop, "Samples", "Amount of ray samples. Higher values give smoother results and longer rendering times"); + RNA_def_property_ui_text(prop, N_("Samples"), N_("Amount of ray samples. Higher values give smoother results and longer rendering times")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "sample_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "ao_samp_method"); RNA_def_property_enum_items(prop, prop_sample_method_items); - RNA_def_property_ui_text(prop, "Sample Method", "Method for generating shadow samples (for Raytrace)"); + RNA_def_property_ui_text(prop, N_("Sample Method"), N_("Method for generating shadow samples (for Raytrace)")); RNA_def_property_update(prop, 0, "rna_World_update"); } @@ -489,7 +490,7 @@ void RNA_def_world(BlenderRNA *brna) */ srna= RNA_def_struct(brna, "World", "ID"); - RNA_def_struct_ui_text(srna, "World", "World datablock describing the environment and ambient lighting of a scene"); + RNA_def_struct_ui_text(srna, N_("World"), N_("World datablock describing the environment and ambient lighting of a scene")); RNA_def_struct_ui_icon(srna, ICON_WORLD_DATA); rna_def_animdata_common(srna); @@ -500,7 +501,7 @@ void RNA_def_world(BlenderRNA *brna) prop= RNA_def_property(srna, "horizon_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "horr"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Horizon Color", "Color at the horizon"); + RNA_def_property_ui_text(prop, N_("Horizon Color"), N_("Color at the horizon")); /* RNA_def_property_update(prop, 0, "rna_World_update"); */ /* render-only uses this */ RNA_def_property_update(prop, NC_WORLD|ND_WORLD_DRAW, "rna_World_update"); @@ -509,42 +510,42 @@ void RNA_def_world(BlenderRNA *brna) prop= RNA_def_property(srna, "zenith_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "zenr"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Zenith Color", "Color at the zenith"); + RNA_def_property_ui_text(prop, N_("Zenith Color"), N_("Color at the zenith")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "ambient_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "ambr"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Ambient Color", "Ambient color of the world"); + RNA_def_property_ui_text(prop, N_("Ambient Color"), N_("Ambient color of the world")); RNA_def_property_update(prop, 0, "rna_World_update"); /* exp, range */ prop= RNA_def_property(srna, "exposure", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "exp"); RNA_def_property_range(prop, 0.0, 1.0); - RNA_def_property_ui_text(prop, "Exposure", "Amount of exponential color correction for light"); + RNA_def_property_ui_text(prop, N_("Exposure"), N_("Amount of exponential color correction for light")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "color_range", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "range"); RNA_def_property_range(prop, 0.2, 5.0); - RNA_def_property_ui_text(prop, "Range", "The color range that will be mapped to 0-1"); + RNA_def_property_ui_text(prop, N_("Range"), N_("The color range that will be mapped to 0-1")); RNA_def_property_update(prop, 0, "rna_World_update"); /* sky type */ prop= RNA_def_property(srna, "use_sky_blend", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "skytype", WO_SKYBLEND); - RNA_def_property_ui_text(prop, "Blend Sky", "Render background with natural progression from horizon to zenith"); + RNA_def_property_ui_text(prop, N_("Blend Sky"), N_("Render background with natural progression from horizon to zenith")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "use_sky_paper", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "skytype", WO_SKYPAPER); - RNA_def_property_ui_text(prop, "Paper Sky", "Flatten blend or texture coordinates"); + RNA_def_property_ui_text(prop, N_("Paper Sky"), N_("Flatten blend or texture coordinates")); RNA_def_property_update(prop, 0, "rna_World_update"); prop= RNA_def_property(srna, "use_sky_real", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "skytype", WO_SKYREAL); - RNA_def_property_ui_text(prop, "Real Sky", "Render background with a real horizon, relative to the camera angle"); + RNA_def_property_ui_text(prop, N_("Real Sky"), N_("Render background with a real horizon, relative to the camera angle")); RNA_def_property_update(prop, 0, "rna_World_update"); /* nested structs */ @@ -552,19 +553,19 @@ void RNA_def_world(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "WorldLighting"); RNA_def_property_pointer_funcs(prop, "rna_World_lighting_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, "Lighting", "World lighting settings"); + RNA_def_property_ui_text(prop, N_("Lighting"), N_("World lighting settings")); prop= RNA_def_property(srna, "mist_settings", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "WorldMistSettings"); RNA_def_property_pointer_funcs(prop, "rna_World_mist_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, "Mist", "World mist settings"); + RNA_def_property_ui_text(prop, N_("Mist"), N_("World mist settings")); prop= RNA_def_property(srna, "star_settings", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "WorldStarsSettings"); RNA_def_property_pointer_funcs(prop, "rna_World_stars_get", NULL, NULL, NULL); - RNA_def_property_ui_text(prop, "Stars", "World stars settings"); + RNA_def_property_ui_text(prop, N_("Stars"), N_("World stars settings")); rna_def_lighting(brna); rna_def_world_mist(brna); |