[Bf-blender-cvs] [df76616d74] master: Usual UI/i18n message fixes.

[Bastien Montagne]

Commit: df76616d7450b99938f265283fad443186da4039
Author: Bastien Montagne
Date:   Sun Mar 19 17:31:07 2017 +0100
Branches: master
https://developer.blender.org/rBdf76616d7450b99938f265283fad443186da4039

Usual UI/i18n message fixes.

Please provide valid description for SurfaceDeform modifier tooltip.
Such place-holders should not pass final checks before merging in master!

===================================================================

M	release/scripts/startup/bl_ui/space_userpref.py
M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/modifiers/intern/MOD_surfacedeform.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 99ac5a049e..fe126f6522 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1320,7 +1320,7 @@ class USERPREF_PT_addons(Panel):
         if addon_utils.error_duplicates:
             box = col.box()
             row = box.row()
-            row.label("Multiple addons with the same name found!")
+            row.label("Multiple add-ons with the same name found!")
             row.label(icon='ERROR')
             box.label("Please delete one of each pair:")
             for (addon_name, addon_file, addon_path) in addon_utils.error_duplicates:
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 47c4b42515..36cf909b29 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -4717,7 +4717,7 @@ static void rna_def_modifier_surfacedeform(BlenderRNA *brna)
 	PropertyRNA *prop;
 
 	srna = RNA_def_struct(brna, "SurfaceDeformModifier", "Modifier");
-	RNA_def_struct_ui_text(srna, "SurfaceDeform Modifier", "blablabla");
+	RNA_def_struct_ui_text(srna, "SurfaceDeform Modifier", "");
 	RNA_def_struct_sdna(srna, "SurfaceDeformModifierData");
 	RNA_def_struct_ui_icon(srna, ICON_MOD_MESHDEFORM);
 
diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c
index a999d7629a..776cf02754 100644
--- a/source/blender/modifiers/intern/MOD_surfacedeform.c
+++ b/source/blender/modifiers/intern/MOD_surfacedeform.c
@@ -973,7 +973,7 @@ static bool surfacedeformBind(SurfaceDeformModifierData *smd, float (*vertexCos)
 	adj_result = buildAdjacencyMap(mpoly, medge, mloop, tnumpoly, tnumedges, vert_edges, adj_array, edge_polys);
 
 	if (adj_result == MOD_SDEF_BIND_RESULT_NONMANY_ERR) {
-		modifier_setError((ModifierData *)smd, "Target has edges with more than two polys");
+		modifier_setError((ModifierData *)smd, "Target has edges with more than two polygons");
 		freeAdjacencyMap(vert_edges, adj_array, edge_polys);
 		free_bvhtree_from_mesh(&treeData);
 		MEM_freeN(smd->verts);
@@ -1019,11 +1019,11 @@ static bool surfacedeformBind(SurfaceDeformModifierData *smd, float (*vertexCos)
 		freeData((ModifierData *)smd);
 	}
 	else if (data.success == MOD_SDEF_BIND_RESULT_NONMANY_ERR) {
-		modifier_setError((ModifierData *)smd, "Target has edges with more than two polys");
+		modifier_setError((ModifierData *)smd, "Target has edges with more than two polygons");
 		freeData((ModifierData *)smd);
 	}
 	else if (data.success == MOD_SDEF_BIND_RESULT_CONCAVE_ERR) {
-		modifier_setError((ModifierData *)smd, "Target contains concave polys");
+		modifier_setError((ModifierData *)smd, "Target contains concave polygons");
 		freeData((ModifierData *)smd);
 	}
 	else if (data.success == MOD_SDEF_BIND_RESULT_OVERLAP_ERR) {
@@ -1035,7 +1035,7 @@ static bool surfacedeformBind(SurfaceDeformModifierData *smd, float (*vertexCos)
 		 * to explain this whith a reasonably sized message.
 		 * Though it shouldn't really matter all that much,
 		 * because this is very unlikely to occur */
-		modifier_setError((ModifierData *)smd, "Target contains invalid polys");
+		modifier_setError((ModifierData *)smd, "Target contains invalid polygons");
 		freeData((ModifierData *)smd);
 	}