A bunch of fixes and tweaks in RNA messages, found while translating them in french...

1 files changed, 93 insertions, 104 deletions

diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c
index e2c105e9ba8..ba8460e5477 100644
--- a/source/blender/makesrna/intern/rna_texture.c
+++ b/source/blender/makesrna/intern/rna_texture.c
@@ -58,22 +58,22 @@ EnumPropertyItem texture_type_items[] = {
 	{TEX_BLEND, "BLEND", ICON_TEXTURE, "Blend", "Procedural - create a ramp texture"},
 	{TEX_CLOUDS, "CLOUDS", ICON_TEXTURE, "Clouds", "Procedural - create a cloud-like fractal noise texture"},
 	{TEX_DISTNOISE, "DISTORTED_NOISE", ICON_TEXTURE,
-	                "Distorted Noise", "Procedural - Noise texture distorted by two noise algorithms"},
+	                "Distorted Noise", "Procedural - noise texture distorted by two noise algorithms"},
 	{TEX_ENVMAP, "ENVIRONMENT_MAP", ICON_IMAGE_DATA,
 	             "Environment Map", "Create a render of the environment mapped to a texture"},
 	{TEX_IMAGE, "IMAGE", ICON_IMAGE_DATA, "Image or Movie", "Allow 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_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"},
+	            "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 - Create a fractal noise texture"},
-	{TEX_VORONOI, "VORONOI", ICON_TEXTURE, "Voronoi", "Procedural - Create cell-like patterns based on Worley noise"},
+	{TEX_STUCCI, "STUCCI", ICON_TEXTURE, "Stucci", "Procedural - create a fractal noise texture"},
+	{TEX_VORONOI, "VORONOI", ICON_TEXTURE, "Voronoi", "Procedural - create cell-like patterns based on Worley noise"},
 	{TEX_VOXELDATA, "VOXEL_DATA", ICON_TEXTURE, "Voxel Data", "Create a 3d texture based on volumetric data"},
-	{TEX_WOOD, "WOOD", ICON_TEXTURE, "Wood", "Procedural - Wave generated bands or rings, with optional noise"},
-	{TEX_OCEAN, "OCEAN", ICON_TEXTURE, "Ocean", ""},
+	{TEX_WOOD, "WOOD", ICON_TEXTURE, "Wood", "Procedural - wave generated bands or rings, with optional noise"},
+	{TEX_OCEAN, "OCEAN", ICON_TEXTURE, "Ocean", "Use a texture generated by an Ocean modifier"},
 	{0, NULL, 0, NULL, NULL}};
 
 EnumPropertyItem blend_type_items[] = {
@@ -667,7 +667,7 @@ static void rna_def_filter_common(StructRNA *srna)
 	prop= RNA_def_property(srna, "use_mipmap", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_MIPMAP);
 	RNA_def_property_boolean_funcs(prop, NULL, "rna_ImageTexture_mipmap_set");
-	RNA_def_property_ui_text(prop, "MIP Map", "Uses auto-generated MIP maps for the image");
+	RNA_def_property_ui_text(prop, "MIP Map", "Use auto-generated MIP maps for the image");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 	
 	prop= RNA_def_property(srna, "use_mipmap_gauss", PROP_BOOLEAN, PROP_NONE);
@@ -685,14 +685,14 @@ static void rna_def_filter_common(StructRNA *srna)
 	RNA_def_property_int_sdna(prop, NULL, "afmax");
 	RNA_def_property_range(prop, 1, 256);
 	RNA_def_property_ui_text(prop, "Filter Probes",
-	                         "Maximum number of samples. Higher gives less blur at distant/oblique angles, but is also slower");
+	                         "Maximum number of samples (higher gives less blur at distant/oblique angles, but is also slower)");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 	
 	prop= RNA_def_property(srna, "filter_eccentricity", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "afmax");
 	RNA_def_property_range(prop, 1, 256);
 	RNA_def_property_ui_text(prop, "Filter Eccentricity",
-	                         "Maximum eccentricity. Higher gives less blur at distant/oblique angles, but is also slower");
+	                         "Maximum eccentricity (higher gives less blur at distant/oblique angles, but is also slower)");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "use_filter_size_min", PROP_BOOLEAN, PROP_NONE);
@@ -838,20 +838,20 @@ static void rna_def_texture_clouds(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "noisesize");
 	RNA_def_property_range(prop, 0.0001, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2);
-	RNA_def_property_ui_text(prop, "Noise Size", "Sets scaling for noise input");
+	RNA_def_property_ui_text(prop, "Noise Size", "Scaling for noise input");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "noise_depth", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "noisedepth");
 	RNA_def_property_range(prop, 0, 30);
 	RNA_def_property_ui_range(prop, 0, 24, 0, 2);
-	RNA_def_property_ui_text(prop, "Noise Depth", "Sets the depth of the cloud calculation");
+	RNA_def_property_ui_text(prop, "Noise Depth", "Depth of the cloud calculation");
 	RNA_def_property_update(prop, 0, "rna_Texture_nodes_update");
 
 	prop= RNA_def_property(srna, "noise_basis", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "noisebasis");
 	RNA_def_property_enum_items(prop, prop_noise_basis_items);
-	RNA_def_property_ui_text(prop, "Noise Basis", "Sets the noise basis used for turbulence");
+	RNA_def_property_ui_text(prop, "Noise Basis", "Noise basis used for turbulence");
 	RNA_def_property_update(prop, 0, "rna_Texture_nodes_update");
 
 	prop= RNA_def_property(srna, "noise_type", PROP_ENUM, PROP_NONE);
@@ -863,7 +863,7 @@ static void rna_def_texture_clouds(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "cloud_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "stype");
 	RNA_def_property_enum_items(prop, prop_clouds_stype);
-	RNA_def_property_ui_text(prop, "Color", "Determines whether Noise returns grayscale or RGB values");
+	RNA_def_property_ui_text(prop, "Color", "Determine whether Noise returns grayscale or RGB values");
 	RNA_def_property_update(prop, 0, "rna_Texture_nodes_update");
 
 	prop= RNA_def_property(srna, "nabla", PROP_FLOAT, PROP_NONE);
@@ -879,16 +879,16 @@ static void rna_def_texture_wood(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem prop_wood_stype[] = {
-	{TEX_BAND, "BANDS", 0, "Bands", "Uses standard wood texture in bands"},
-	{TEX_RING, "RINGS", 0, "Rings", "Uses wood texture in rings"},
-	{TEX_BANDNOISE, "BANDNOISE", 0, "Band Noise", "Adds noise to standard wood"},
-	{TEX_RINGNOISE, "RINGNOISE", 0, "Ring Noise", "Adds noise to rings"},
+	{TEX_BAND, "BANDS", 0, "Bands", "Use standard wood texture in bands"},
+	{TEX_RING, "RINGS", 0, "Rings", "Use wood texture in rings"},
+	{TEX_BANDNOISE, "BANDNOISE", 0, "Band Noise", "Add noise to standard wood"},
+	{TEX_RINGNOISE, "RINGNOISE", 0, "Ring Noise", "Add noise to rings"},
 	{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem prop_wood_noisebasis2[] = {
-	{TEX_SIN, "SIN", 0, "Sine", "Uses a sine wave to produce bands"},
-	{TEX_SAW, "SAW", 0, "Saw", "Uses a saw wave to produce bands"},
-	{TEX_TRI, "TRI", 0, "Tri", "Uses a triangle wave to produce bands"},
+	{TEX_SIN, "SIN", 0, "Sine", "Use a sine wave to produce bands"},
+	{TEX_SAW, "SAW", 0, "Saw", "Use a saw wave to produce bands"},
+	{TEX_TRI, "TRI", 0, "Tri", "Use a triangle wave to produce bands"},
 	{0, NULL, 0, NULL, NULL}};
 
 	srna= RNA_def_struct(brna, "WoodTexture", "Texture");
@@ -899,20 +899,20 @@ static void rna_def_texture_wood(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "noisesize");
 	RNA_def_property_range(prop, 0.0001, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2);
-	RNA_def_property_ui_text(prop, "Noise Size", "Sets scaling for noise input");
+	RNA_def_property_ui_text(prop, "Noise Size", "Scaling for noise input");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "turbulence", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "turbul");
 	RNA_def_property_range(prop, 0.0001, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0001, 200, 10, 2);
-	RNA_def_property_ui_text(prop, "Turbulence", "Sets the turbulence of the bandnoise and ringnoise types");
+	RNA_def_property_ui_text(prop, "Turbulence", "Turbulence of the bandnoise and ringnoise types");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "noise_basis", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "noisebasis");
 	RNA_def_property_enum_items(prop, prop_noise_basis_items);
-	RNA_def_property_ui_text(prop, "Noise Basis", "Sets the noise basis used for turbulence");
+	RNA_def_property_ui_text(prop, "Noise Basis", "Noise basis used for turbulence");
 	RNA_def_property_update(prop, 0, "rna_Texture_nodes_update");
 
 	prop= RNA_def_property(srna, "noise_type", PROP_ENUM, PROP_NONE);
@@ -947,15 +947,15 @@ static void rna_def_texture_marble(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem prop_marble_stype[] = {
-	{TEX_SOFT, "SOFT", 0, "Soft", "Uses soft marble"},
-	{TEX_SHARP, "SHARP", 0, "Sharp", "Uses more clearly defined marble"},
-	{TEX_SHARPER, "SHARPER", 0, "Sharper", "Uses very clearly defined marble"},
+	{TEX_SOFT, "SOFT", 0, "Soft", "Use soft marble"},
+	{TEX_SHARP, "SHARP", 0, "Sharp", "Use more clearly defined marble"},
+	{TEX_SHARPER, "SHARPER", 0, "Sharper", "Use very clearly defined marble"},
 	{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem prop_marble_noisebasis2[] = {
-	{TEX_SIN, "SIN", 0, "Sin", "Uses a sine wave to produce bands"},
-	{TEX_SAW, "SAW", 0, "Saw", "Uses a saw wave to produce bands"},
-	{TEX_TRI, "TRI", 0, "Tri", "Uses a triangle wave to produce bands"},
+	{TEX_SIN, "SIN", 0, "Sin", "Use a sine wave to produce bands"},
+	{TEX_SAW, "SAW", 0, "Saw", "Use a saw wave to produce bands"},
+	{TEX_TRI, "TRI", 0, "Tri", "Use a triangle wave to produce bands"},
 	{0, NULL, 0, NULL, NULL}};
 
 	srna= RNA_def_struct(brna, "MarbleTexture", "Texture");
@@ -966,21 +966,21 @@ static void rna_def_texture_marble(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "noisesize");
 	RNA_def_property_range(prop, 0.0001, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2);
-	RNA_def_property_ui_text(prop, "Noise Size", "Sets scaling for noise input");
+	RNA_def_property_ui_text(prop, "Noise Size", "Scaling for noise input");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "turbulence", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "turbul");
 	RNA_def_property_range(prop, 0.0001, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0001, 200, 10, 2);
-	RNA_def_property_ui_text(prop, "Turbulence", "Sets the turbulence of the bandnoise and ringnoise types");
+	RNA_def_property_ui_text(prop, "Turbulence", "Turbulence of the bandnoise and ringnoise types");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "noise_depth", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "noisedepth");
 	RNA_def_property_range(prop, 0, 30);
 	RNA_def_property_ui_range(prop, 0, 24, 0, 2);
-	RNA_def_property_ui_text(prop, "Noise Depth", "Sets the depth of the cloud calculation");
+	RNA_def_property_ui_text(prop, "Noise Depth", "Depth of the cloud calculation");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "noise_type", PROP_ENUM, PROP_NONE);
@@ -998,7 +998,7 @@ static void rna_def_texture_marble(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "noise_basis", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "noisebasis");
 	RNA_def_property_enum_items(prop, prop_noise_basis_items);
-	RNA_def_property_ui_text(prop, "Noise Basis", "Sets the noise basis used for turbulence");
+	RNA_def_property_ui_text(prop, "Noise Basis", "Noise basis used for turbulence");
 	RNA_def_property_update(prop, 0, "rna_Texture_nodes_update");
 
 	prop= RNA_def_property(srna, "noise_basis_2", PROP_ENUM, PROP_NONE);
@@ -1028,14 +1028,14 @@ static void rna_def_texture_magic(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "turbul");
 	RNA_def_property_range(prop, 0.0001, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0001, 200, 10, 2);
-	RNA_def_property_ui_text(prop, "Turbulence", "Sets the turbulence of the bandnoise and ringnoise types");
+	RNA_def_property_ui_text(prop, "Turbulence", "Turbulence of the noise");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "noise_depth", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "noisedepth");
 	RNA_def_property_range(prop, 0, 30);
 	RNA_def_property_ui_range(prop, 0, 24, 0, 2);
-	RNA_def_property_ui_text(prop, "Noise Depth", "Sets the depth of the cloud calculation");
+	RNA_def_property_ui_text(prop, "Noise Depth", "Depth of the noise");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 }
 
@@ -1055,8 +1055,8 @@ static void rna_def_texture_blend(BlenderRNA *brna)
 		{0, NULL, 0, NULL, NULL}};
 
 	static const EnumPropertyItem prop_flip_axis_items[]= {
-		{0, "HORIZONTAL", 0, "Horizontal", "Flips the texture's X and Y axis"},
-		{TEX_FLIPBLEND, "VERTICAL", 0, "Vertical", "Flips the texture's X and Y axis"},
+		{0, "HORIZONTAL", 0, "Horizontal", "No flipping"},
+		{TEX_FLIPBLEND, "VERTICAL", 0, "Vertical", "Flip the texture's X and Y axis"},
 		{0, NULL, 0, NULL, NULL}};
 
 	srna= RNA_def_struct(brna, "BlendTexture", "Texture");
@@ -1066,13 +1066,13 @@ static void rna_def_texture_blend(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "progression", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "stype");
 	RNA_def_property_enum_items(prop, prop_blend_progression);
-	RNA_def_property_ui_text(prop, "Progression", "Sets the style of the color blending");
+	RNA_def_property_ui_text(prop, "Progression", "Style of the color blending");
 	RNA_def_property_update(prop, 0, "rna_Texture_nodes_update");
 
 	prop= RNA_def_property(srna, "use_flip_axis", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
 	RNA_def_property_enum_items(prop, prop_flip_axis_items);
-	RNA_def_property_ui_text(prop, "Flip Axis", "Flips the texture's X and Y axis");
+	RNA_def_property_ui_text(prop, "Flip Axis", "Flip the texture's X and Y axis");
 	RNA_def_property_update(prop, 0, "rna_Texture_nodes_update");
 
 }
@@ -1083,9 +1083,9 @@ static void rna_def_texture_stucci(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem prop_stucci_stype[] = {
-	{TEX_PLASTIC, "PLASTIC", 0, "Plastic", "Uses standard stucci"},
-	{TEX_WALLIN, "WALL_IN", 0, "Wall in", "Creates Dimples"},
-	{TEX_WALLOUT, "WALL_OUT", 0, "Wall out", "Creates Ridges"},
+	{TEX_PLASTIC, "PLASTIC", 0, "Plastic", "Use standard stucci"},
+	{TEX_WALLIN, "WALL_IN", 0, "Wall in", "Create Dimples"},
+	{TEX_WALLOUT, "WALL_OUT", 0, "Wall out", "Create Ridges"},
 	{0, NULL, 0, NULL, NULL}};
 
 	srna= RNA_def_struct(brna, "StucciTexture", "Texture");
@@ -1096,20 +1096,20 @@ static void rna_def_texture_stucci(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "turbul");
 	RNA_def_property_range(prop, 0.0001, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0001, 200, 10, 2);
-	RNA_def_property_ui_text(prop, "Turbulence", "Sets the turbulence of the bandnoise and ringnoise types");
+	RNA_def_property_ui_text(prop, "Turbulence", "Turbulence of the noise");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 	
 	prop= RNA_def_property(srna, "noise_basis", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "noisebasis");
 	RNA_def_property_enum_items(prop, prop_noise_basis_items);
-	RNA_def_property_ui_text(prop, "Noise Basis", "Sets the noise basis used for turbulence");
+	RNA_def_property_ui_text(prop, "Noise Basis", "Noise basis used for turbulence");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "noise_scale", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "noisesize");
 	RNA_def_property_range(prop, 0.0001, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2);
-	RNA_def_property_ui_text(prop, "Noise Size", "Sets scaling for noise input");
+	RNA_def_property_ui_text(prop, "Noise Size", "Scaling for noise input");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "noise_type", PROP_ENUM, PROP_NONE);
@@ -1141,9 +1141,9 @@ static void rna_def_texture_image(BlenderRNA *brna)
 
 	static EnumPropertyItem prop_image_extension[] = {
 		{TEX_EXTEND, "EXTEND", 0, "Extend", "Extend by repeating edge pixels of the image"},
-		{TEX_CLIP, "CLIP", 0, "Clip", "Clip to image size and sets exterior pixels as transparent"},
+		{TEX_CLIP, "CLIP", 0, "Clip", "Clip to image size and set exterior pixels as transparent"},
 		{TEX_CLIPCUBE, "CLIP_CUBE", 0, "Clip Cube",
-		               "Clip to cubic-shaped area around the image and sets exterior pixels as transparent"},
+		               "Clip to cubic-shaped area around the image and set exterior pixels as transparent"},
 		{TEX_REPEAT, "REPEAT", 0, "Repeat", "Cause the image to repeat horizontally and vertically"},
 		{TEX_CHECKER, "CHECKER", 0, "Checker", "Cause the image to repeat in checker board pattern"},
 		{0, NULL, 0, NULL, NULL}};
@@ -1154,28 +1154,28 @@ static void rna_def_texture_image(BlenderRNA *brna)
 
 	prop= RNA_def_property(srna, "use_interpolation", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_INTERPOL);
-	RNA_def_property_ui_text(prop, "Interpolation", "Interpolates pixels using selected filter");
+	RNA_def_property_ui_text(prop, "Interpolation", "Interpolate pixels using selected filter");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	/* XXX: I think flip_axis should be a generic Texture property, enabled for all the texture types */
 	prop= RNA_def_property(srna, "use_flip_axis", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_IMAROT);
-	RNA_def_property_ui_text(prop, "Flip Axis", "Flips the texture's X and Y axis");
+	RNA_def_property_ui_text(prop, "Flip Axis", "Flip the texture's X and Y axis");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "use_alpha", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_USEALPHA);
-	RNA_def_property_ui_text(prop, "Use Alpha", "Uses the alpha channel information in the image");
+	RNA_def_property_ui_text(prop, "Use Alpha", "Use the alpha channel information in the image");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "use_calculate_alpha", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_CALCALPHA);
-	RNA_def_property_ui_text(prop, "Calculate Alpha", "Calculates an alpha channel based on RGB values in the image");
+	RNA_def_property_ui_text(prop, "Calculate Alpha", "Calculate an alpha channel based on RGB values in the image");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "invert_alpha", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_NEGALPHA);
-	RNA_def_property_ui_text(prop, "Invert Alpha", "Inverts all the alpha values in the image");
+	RNA_def_property_ui_text(prop, "Invert Alpha", "Invert all the alpha values in the image");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	rna_def_filter_common(srna);
@@ -1183,46 +1183,46 @@ static void rna_def_texture_image(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "extension", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "extend");
 	RNA_def_property_enum_items(prop, prop_image_extension);
-	RNA_def_property_ui_text(prop, "Extension", "Sets how the image is extrapolated past its original bounds");
+	RNA_def_property_ui_text(prop, "Extension", "How the image is extrapolated past its original bounds");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "repeat_x", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "xrepeat");
 	RNA_def_property_range(prop, 1, 512);
-	RNA_def_property_ui_text(prop, "Repeat X", "Sets a repetition multiplier in the X direction");
+	RNA_def_property_ui_text(prop, "Repeat X", "Repetition multiplier in the X direction");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "repeat_y", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "yrepeat");
 	RNA_def_property_range(prop, 1, 512);
-	RNA_def_property_ui_text(prop, "Repeat Y", "Sets a repetition multiplier in the Y direction");
+	RNA_def_property_ui_text(prop, "Repeat Y", "Repetition multiplier in the Y direction");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "use_mirror_x", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_REPEAT_XMIR);
-	RNA_def_property_ui_text(prop, "Mirror X", "Mirrors the image repetition on the X direction");
+	RNA_def_property_ui_text(prop, "Mirror X", "Mirror the image repetition on the X direction");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "use_mirror_y", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_REPEAT_YMIR);
-	RNA_def_property_ui_text(prop, "Mirror Y", "Mirrors the image repetition on the Y direction");
+	RNA_def_property_ui_text(prop, "Mirror Y", "Mirror the image repetition on the Y direction");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "use_checker_odd", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_CHECKER_ODD);
-	RNA_def_property_ui_text(prop, "Checker Odd", "Sets odd checker tiles");
+	RNA_def_property_ui_text(prop, "Checker Odd", "Odd checker tiles");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "use_checker_even", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_CHECKER_EVEN);
-	RNA_def_property_ui_text(prop, "Checker Even", "Sets even checker tiles");
+	RNA_def_property_ui_text(prop, "Checker Even", "Even checker tiles");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "checker_distance", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "checkerdist");
 	RNA_def_property_range(prop, 0.0, 0.99);
 	RNA_def_property_ui_range(prop, 0.0, 0.99, 0.1, 0.01);
-	RNA_def_property_ui_text(prop, "Checker Distance", "Sets distance between checker tiles");
+	RNA_def_property_ui_text(prop, "Checker Distance", "Distance between checker tiles");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 #if 0
@@ -1243,28 +1243,28 @@ static void rna_def_texture_image(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "cropxmin");
 	RNA_def_property_range(prop, -10.0, 10.0);
 	RNA_def_property_ui_range(prop, -10.0, 10.0, 1, 0.2);
-	RNA_def_property_ui_text(prop, "Crop Minimum X", "Sets minimum X value to crop the image");
+	RNA_def_property_ui_text(prop, "Crop Minimum X", "Minimum X value to crop the image");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "crop_min_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "cropymin");
 	RNA_def_property_range(prop, -10.0, 10.0);
 	RNA_def_property_ui_range(prop, -10.0, 10.0, 1, 0.2);
-	RNA_def_property_ui_text(prop, "Crop Minimum Y", "Sets minimum Y value to crop the image");
+	RNA_def_property_ui_text(prop, "Crop Minimum Y", "Minimum Y value to crop the image");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "crop_max_x", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "cropxmax");
 	RNA_def_property_range(prop, -10.0, 10.0);
 	RNA_def_property_ui_range(prop, -10.0, 10.0, 1, 0.2);
-	RNA_def_property_ui_text(prop, "Crop Maximum X", "Sets maximum X value to crop the image");
+	RNA_def_property_ui_text(prop, "Crop Maximum X", "Maximum X value to crop the image");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "crop_max_y", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "cropymax");
 	RNA_def_property_range(prop, -10.0, 10.0);
 	RNA_def_property_ui_range(prop, -10.0, 10.0, 1, 0.2);
-	RNA_def_property_ui_text(prop, "Crop Maximum Y", "Sets maximum Y value to crop the image");
+	RNA_def_property_ui_text(prop, "Crop Maximum Y", "Maximum Y value to crop the image");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "image", PROP_POINTER, PROP_NONE);
@@ -1282,13 +1282,13 @@ static void rna_def_texture_image(BlenderRNA *brna)
 	/* Normal Map */
 	prop= RNA_def_property(srna, "use_normal_map", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_NORMALMAP);
-	RNA_def_property_ui_text(prop, "Normal Map", "Uses image RGB values for normal mapping");
+	RNA_def_property_ui_text(prop, "Normal Map", "Use image RGB values for normal mapping");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	/* Derivative Map */
 	prop= RNA_def_property(srna, "use_derivative_map", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "imaflag", TEX_DERIVATIVEMAP);
-	RNA_def_property_ui_text(prop, "Derivative Map", "Uses red and green as derivative values");
+	RNA_def_property_ui_text(prop, "Derivative Map", "Use red and green as derivative values");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 }
 
@@ -1329,7 +1329,7 @@ static void rna_def_texture_environment_map(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "environment_map", PROP_POINTER, PROP_NONE);
 	RNA_def_property_pointer_sdna(prop, NULL, "env");
 	RNA_def_property_struct_type(prop, "EnvironmentMap");
-	RNA_def_property_ui_text(prop, "Environment Map", "Gets the environment map associated with this texture");
+	RNA_def_property_ui_text(prop, "Environment Map", "Get the environment map associated with this texture");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 }
 
@@ -1339,15 +1339,13 @@ static void rna_def_texture_musgrave(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem prop_musgrave_type[] = {
-		{TEX_MFRACTAL, "MULTIFRACTAL", 0, "Multifractal",
-		               "Fractal noise algorithm. Multifractal: Uses Perlin noise as a basis"},
+		{TEX_MFRACTAL, "MULTIFRACTAL", 0, "Multifractal", "Use Perlin noise as a basis"},
 		{TEX_RIDGEDMF, "RIDGED_MULTIFRACTAL", 0, "Ridged Multifractal",
-		               "Fractal noise algorithm. Ridged Multifractal: Uses Perlin noise with inflection as a basis"},
+		               "Use Perlin noise with inflection as a basis"},
 		{TEX_HYBRIDMF, "HYBRID_MULTIFRACTAL", 0, "Hybrid Multifractal",
-		               "Fractal noise algorithm.Hybrid Multifractal: Uses Perlin noise as a basis, with extended controls"},
-		{TEX_FBM, "FBM", 0, "fBM", "Fractal noise algorithm. Fractal Brownian Motion: Uses Brownian noise as a basis"},
-		{TEX_HTERRAIN, "HETERO_TERRAIN", 0, "Hetero Terrain",
-		               "Fractal noise algorithm. Hetero Terrain: similar to multifractal"},
+		               "Use Perlin noise as a basis, with extended controls"},
+		{TEX_FBM, "FBM", 0, "fBM", "Fractal Brownian Motion, use Brownian noise as a basis"},
+		{TEX_HTERRAIN, "HETERO_TERRAIN", 0, "Hetero Terrain", "Similar to multifractal"},
 		{0, NULL, 0, NULL, NULL}};
 
 	srna= RNA_def_struct(brna, "MusgraveTexture", "Texture");
@@ -1357,7 +1355,7 @@ static void rna_def_texture_musgrave(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "musgrave_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "stype");
 	RNA_def_property_enum_items(prop, prop_musgrave_type);
-	RNA_def_property_ui_text(prop, "Type", "");
+	RNA_def_property_ui_text(prop, "Type", "Fractal noise algorithm");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "dimension_max", PROP_FLOAT, PROP_NONE);
@@ -1393,20 +1391,20 @@ static void rna_def_texture_musgrave(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "noise_intensity", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "ns_outscale");
 	RNA_def_property_range(prop, 0, 10);
-	RNA_def_property_ui_text(prop, "Noise Intensity", "Scales the intensity of the noise");
+	RNA_def_property_ui_text(prop, "Noise Intensity", "Intensity of the noise");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "noise_scale", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "noisesize");
 	RNA_def_property_range(prop, 0.0001, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2);
-	RNA_def_property_ui_text(prop, "Noise Size", "Sets scaling for noise input");
+	RNA_def_property_ui_text(prop, "Noise Size", "Scaling for noise input");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "noise_basis", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "noisebasis");
 	RNA_def_property_enum_items(prop, prop_noise_basis_items);
-	RNA_def_property_ui_text(prop, "Noise Basis", "Sets the noise basis used for turbulence");
+	RNA_def_property_ui_text(prop, "Noise Basis", "Noise basis used for turbulence");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "nabla", PROP_FLOAT, PROP_NONE);
@@ -1422,27 +1420,18 @@ static void rna_def_texture_voronoi(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	static EnumPropertyItem prop_distance_metric_items[] = {
-		{TEX_DISTANCE, "DISTANCE", 0, "Actual Distance",
-		               "Algorithm used to calculate distance of sample points to feature points; "
-		               "Actual Distance: sqrt(x*x+y*y+z*z)"},
-		{TEX_DISTANCE_SQUARED, "DISTANCE_SQUARED", 0, "Distance Squared",
-		                       "Algorithm used to calculate distance of sample points to feature points; "
-		                       "Distance squared: (x*x+y*y+z*z)"},
+		{TEX_DISTANCE, "DISTANCE", 0, "Actual Distance", "sqrt(x*x+y*y+z*z)"},
+		{TEX_DISTANCE_SQUARED, "DISTANCE_SQUARED", 0, "Distance Squared", "(x*x+y*y+z*z)"},
 		{TEX_MANHATTAN, "MANHATTAN", 0, "Manhattan",
-		                "Algorithm used to calculate distance of sample points to feature points; "
-		                "Manhattan: The length of the distance in axial directions"},
+		                "The length of the distance in axial directions"},
 		{TEX_CHEBYCHEV, "CHEBYCHEV", 0, "Chebychev",
-		                "Algorithm used to calculate distance of sample points to feature points; "
-		                "Chebychev: The length of the longest Axial journey"},
+		                "The length of the longest Axial journey"},
 		{TEX_MINKOVSKY_HALF, "MINKOVSKY_HALF", 0, "Minkovsky 1/2",
-		                     "Algorithm used to calculate distance of sample points to feature points; "
-		                     "Minovsky 1/2: Sets Minkovsky variable to 0.5"},
+		                     "Set Minkovsky variable to 0.5"},
 		{TEX_MINKOVSKY_FOUR, "MINKOVSKY_FOUR", 0, "Minkovsky 4",
-		                     "Algorithm used to calculate distance of sample points to feature points; "
-		                     "Minkovsky 4: Sets Minkovsky variable to 4"},
+		                     "Set Minkovsky variable to 4"},
 		{TEX_MINKOVSKY, "MINKOVSKY", 0, "Minkovsky",
-		                "Algorithm used to calculate distance of sample points to feature points; "
-		                "Minkovsky: Uses the Minkowsky function to calculate distance "
+		                "Use the Minkowsky function to calculate distance "
 		                "(exponent value determines the shape of the boundaries)"},
 		{0, NULL, 0, NULL, NULL}};
 
@@ -1450,7 +1439,7 @@ static void rna_def_texture_voronoi(BlenderRNA *brna)
 		/* XXX: OK names / descriptions? */
 		{TEX_INTENSITY, "INTENSITY", 0, "Intensity", "Only calculate intensity"},
 		{TEX_COL1, "POSITION", 0, "Position", "Color cells by position"},
-		{TEX_COL2, "POSITION_OUTLINE", 0, "Position and Outline", "Use position plus an outline based on F2-F.1"},
+		{TEX_COL2, "POSITION_OUTLINE", 0, "Position and Outline", "Use position plus an outline based on F2-F1"},
 		{TEX_COL3, "POSITION_OUTLINE_INTENSITY", 0, "Position, Outline, and Intensity",
 		           "Multiply position and outline by intensity"},
 		{0, NULL, 0, NULL, NULL}};
@@ -1492,7 +1481,7 @@ static void rna_def_texture_voronoi(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "distance_metric", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "vn_distm");
 	RNA_def_property_enum_items(prop, prop_distance_metric_items);
-	RNA_def_property_ui_text(prop, "Distance Metric", "");
+	RNA_def_property_ui_text(prop, "Distance Metric", "Algorithm used to calculate distance of sample points to feature points");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "color_mode", PROP_ENUM, PROP_NONE);
@@ -1511,7 +1500,7 @@ static void rna_def_texture_voronoi(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "noisesize");
 	RNA_def_property_range(prop, 0.0001, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2);
-	RNA_def_property_ui_text(prop, "Noise Size", "Sets scaling for noise input");
+	RNA_def_property_ui_text(prop, "Noise Size", "Scaling for noise input");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "nabla", PROP_FLOAT, PROP_NONE);
@@ -1540,19 +1529,19 @@ static void rna_def_texture_distorted_noise(BlenderRNA *brna)
 	RNA_def_property_float_sdna(prop, NULL, "noisesize");
 	RNA_def_property_range(prop, 0.0001, FLT_MAX);
 	RNA_def_property_ui_range(prop, 0.0001, 2, 10, 2);
-	RNA_def_property_ui_text(prop, "Noise Size", "Sets scaling for noise input");
+	RNA_def_property_ui_text(prop, "Noise Size", "Scaling for noise input");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 
 	prop= RNA_def_property(srna, "noise_basis", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "noisebasis2");
 	RNA_def_property_enum_items(prop, prop_noise_basis_items);
-	RNA_def_property_ui_text(prop, "Noise Basis", "Sets the noise basis used for turbulence");
+	RNA_def_property_ui_text(prop, "Noise Basis", "Noise basis used for turbulence");
 	RNA_def_property_update(prop, 0, "rna_Texture_nodes_update");
 
 	prop= RNA_def_property(srna, "noise_distortion", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "noisebasis");
 	RNA_def_property_enum_items(prop, prop_noise_basis_items);
-	RNA_def_property_ui_text(prop, "Noise Distortion", "Sets the noise basis for the distortion");
+	RNA_def_property_ui_text(prop, "Noise Distortion", "Noise basis for the distortion");
 	RNA_def_property_update(prop, 0, "rna_Texture_nodes_update");
 
 	prop= RNA_def_property(srna, "nabla", PROP_FLOAT, PROP_NONE);
@@ -1801,7 +1790,7 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "extension", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "extend");
 	RNA_def_property_enum_items(prop, voxeldata_extension);
-	RNA_def_property_ui_text(prop, "Extension", "Sets how the texture is extrapolated past its original bounds");
+	RNA_def_property_ui_text(prop, "Extension", "How the texture is extrapolated past its original bounds");
 	RNA_def_property_update(prop, 0, "rna_Texture_update");
 	
 	prop= RNA_def_property(srna, "intensity", PROP_FLOAT, PROP_NONE);