Fix a bunch of UI string issues...

6 files changed, 12 insertions, 12 deletions

diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py
index 74f94d6eafc..5adcbc67f4c 100644
--- a/intern/cycles/blender/addon/properties.py
+++ b/intern/cycles/blender/addon/properties.py
@@ -317,8 +317,8 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
 
         cls.volume_step_size = FloatProperty(
                 name="Step Size",
-                description="Distance between volume shader samples when rendering the volume. "
-                            "Lower values give more accurate and detailed results but also increased render time",
+                description="Distance between volume shader samples when rendering the volume "
+                            "(lower values give more accurate and detailed results, but also increased render time)",
                 default=0.1,
                 min=0.0000001, max=100000.0
                 )
@@ -326,7 +326,7 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
         cls.volume_max_steps = IntProperty(
                 name="Max Steps",
                 description="Maximum number of steps through the volume before giving up, "
-                            "to protect from extremely long render times with big objects or small step sizes",
+                            "to avoid extremely long render times with big objects or small step sizes",
                 default=1024,
                 min=2, max=65536
                 )
@@ -538,7 +538,7 @@ class CyclesMaterialSettings(bpy.types.PropertyGroup):
                 )
         cls.homogeneous_volume = BoolProperty(
                 name="Homogeneous Volume",
-                description="When using volume rendering, assume volume has the same density everywhere"
+                description="When using volume rendering, assume volume has the same density everywhere "
                             "(not using any textures), for faster rendering",
                 default=False,
                 )
diff --git a/release/scripts/startup/bl_operators/object.py b/release/scripts/startup/bl_operators/object.py
index 321c4a39c3b..4cc032cac9a 100644
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -557,7 +557,7 @@ class JoinUVs(Operator):
 
 
 class MakeDupliFace(Operator):
-    """Converts objects into dupli-face instanced"""
+    """Convert objects into dupli-face instanced"""
     bl_idname = "object.make_dupli_face"
     bl_label = "Make Dupli-Face"
     bl_options = {'REGISTER', 'UNDO'}
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c
index 9bafc9c4cb1..7759e53473a 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -656,7 +656,7 @@ void BKE_mesh_loop_tangents_ex(MVert *mverts, const int UNUSED(numVerts), MLoop
 	/* First check we do have a tris/quads only mesh. */
 	for (mp = mpolys, mp_index = 0; mp_index < numPolys; mp++, mp_index++) {
 		if (mp->totloop > 4) {
-			BKE_report(reports, RPT_ERROR, "Tangent space can only be computed for tris/quads, aborting...\n");
+			BKE_report(reports, RPT_ERROR, "Tangent space can only be computed for tris/quads, aborting");
 			return;
 		}
 	}
@@ -681,7 +681,7 @@ void BKE_mesh_loop_tangents_ex(MVert *mverts, const int UNUSED(numVerts), MLoop
 
 	/* 0 if failed */
 	if (genTangSpaceDefault(&s_context) == false) {
-		BKE_report(reports, RPT_ERROR, "Mikktspace failed to generate tangents for this mesh!\n");
+		BKE_report(reports, RPT_ERROR, "Mikktspace failed to generate tangents for this mesh!");
 	}
 }
 
@@ -703,13 +703,13 @@ void BKE_mesh_loop_tangents(Mesh *mesh, const char *uvmap, float (*r_looptangent
 		loopuvs = CustomData_get_layer(&mesh->ldata, CD_MLOOPUV);
 	}
 	if (!loopuvs) {
-		BKE_reportf(reports, RPT_ERROR, "Tangent space computation needs an UVMap, \"%s\" not found, aborting.\n", uvmap);
+		BKE_reportf(reports, RPT_ERROR, "Tangent space computation needs an UVMap, \"%s\" not found, aborting", uvmap);
 		return;
 	}
 
 	loopnors = CustomData_get_layer(&mesh->ldata, CD_NORMAL);
 	if (!loopnors) {
-		BKE_report(reports, RPT_ERROR, "Tangent space computation needs loop normals, none found, aborting.\n");
+		BKE_report(reports, RPT_ERROR, "Tangent space computation needs loop normals, none found, aborting");
 		return;
 	}
 
diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index 034635d0757..f48c5bee12e 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -1012,7 +1012,7 @@ static void rna_def_font(BlenderRNA *UNUSED(brna), StructRNA *srna)
 	RNA_def_property_ui_text(prop, "Object Font",
 	                         "Use Objects as font characters (give font objects a common name "
 	                         "followed by the character they represent, eg. 'family_a', 'family_b', etc, "
-	                         "and set this to 'family_', turn on Vertex Duplication)");
+	                         "set this setting to 'family_', and turn on Vertex Duplication)");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 	
 	prop = RNA_def_property(srna, "body", PROP_STRING, PROP_NONE);
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 4de9615d24c..73db7adb8cb 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -2401,7 +2401,7 @@ static void rna_def_modifier_bevel(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "profile", PROP_FLOAT, PROP_FACTOR);
 	RNA_def_property_range(prop, 0.0f, 1.0f);
 	RNA_def_property_ui_range(prop, 0.15f, 1.0f, 0.05, 2);
-	RNA_def_property_ui_text(prop, "Profile", "Controls profile shape (0.5 = round)");
+	RNA_def_property_ui_text(prop, "Profile", "The profile shape (0.5 = round)");
 	RNA_def_property_update(prop, 0, "rna_Modifier_update");
 }
 
diff --git a/source/blender/makesrna/intern/rna_rigidbody.c b/source/blender/makesrna/intern/rna_rigidbody.c
index b0a66ab2dc9..6e24397d066 100644
--- a/source/blender/makesrna/intern/rna_rigidbody.c
+++ b/source/blender/makesrna/intern/rna_rigidbody.c
@@ -80,7 +80,7 @@ EnumPropertyItem rigidbody_constraint_type_items[] = {
 /* mesh source for collision shape creation */
 static EnumPropertyItem rigidbody_mesh_source_items[] = {
 	{RBO_MESH_BASE, "BASE", 0, "Base", "Base mesh"},
-	{RBO_MESH_DEFORM, "DEFORM", 0, "Deform", "Deformations (shaps keys, deform modifiers"},
+	{RBO_MESH_DEFORM, "DEFORM", 0, "Deform", "Deformations (shape keys, deform modifiers)"},
 	{RBO_MESH_FINAL, "FINAL", 0, "Final", "All modifiers"},
 	{0, NULL, 0, NULL, NULL}};
 #endif