More UI messages fixes.

Also forgot to translate reports' titles, and change some usages of BKE_reportf to simple BKE_report, when the former is not needed!

4 files changed, 13 insertions, 13 deletions

diff --git a/source/blender/makesrna/intern/rna_animation_api.c b/source/blender/makesrna/intern/rna_animation_api.c
index 39128b48cd8..b93fd9daa36 100644
--- a/source/blender/makesrna/intern/rna_animation_api.c
+++ b/source/blender/makesrna/intern/rna_animation_api.c
@@ -60,7 +60,7 @@ static void rna_KeyingSet_context_refresh(KeyingSet *ks, bContext *C, ReportList
 				break;
 				
 			case MODIFYKEY_MISSING_TYPEINFO:
-				BKE_report(reports, RPT_ERROR, "Incomplete built-in Keying Set. Appears to be missing type info");
+				BKE_report(reports, RPT_ERROR, "Incomplete built-in Keying Set, appears to be missing type info");
 				break;
 		}
 	}
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index dff08990dec..ce0f588a4ba 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -689,7 +689,7 @@ static bNode *rna_NodeTree_node_new(bNodeTree *ntree, bContext *C, ReportList *r
 	bNodeTemplate ntemp;
 
 	if (type == NODE_GROUP && group == NULL) {
-		BKE_reportf(reports, RPT_ERROR, "node type \'GROUP\' missing group argument");
+		BKE_report(reports, RPT_ERROR, "Node type 'GROUP' missing group argument");
 		return NULL;
 	}
 	
@@ -700,7 +700,7 @@ static bNode *rna_NodeTree_node_new(bNodeTree *ntree, bContext *C, ReportList *r
 	node = nodeAddNode(ntree, &ntemp);
 	
 	if (node == NULL) {
-		BKE_reportf(reports, RPT_ERROR, "Unable to create node");
+		BKE_report(reports, RPT_ERROR, "Unable to create node");
 	}
 	else {
 		ntreeUpdateTree(ntree); /* update group node socket links*/
@@ -800,7 +800,7 @@ static bNodeLink *rna_NodeTree_link_new(bNodeTree *ntree, ReportList *reports,
 	nodeFindNode(ntree, tosock, &tonode, NULL, &to_in_out);
 	
 	if (&from_in_out == &to_in_out) {
-		BKE_reportf(reports, RPT_ERROR, "Same input/output direction of sockets");
+		BKE_report(reports, RPT_ERROR, "Same input/output direction of sockets");
 		return NULL;
 	}
 
@@ -827,7 +827,7 @@ static bNodeLink *rna_NodeTree_link_new(bNodeTree *ntree, ReportList *reports,
 static void rna_NodeTree_link_remove(bNodeTree *ntree, ReportList *reports, bNodeLink *link)
 {
 	if (BLI_findindex(&ntree->links, link) == -1) {
-		BKE_reportf(reports, RPT_ERROR, "Unable to locate link in node tree");
+		BKE_report(reports, RPT_ERROR, "Unable to locate link in node tree");
 	}
 	else {
 		nodeRemLink(ntree, link);
@@ -882,9 +882,9 @@ static bNodeSocket *rna_NodeTree_input_expose(bNodeTree *ntree, ReportList *repo
 	int index, in_out;
 	
 	if (!nodeFindNode(ntree, sock, &node, &index, &in_out))
-		BKE_reportf(reports, RPT_ERROR, "Unable to locate socket in node tree");
+		BKE_report(reports, RPT_ERROR, "Unable to locate socket in node tree");
 	else if (in_out != SOCK_IN)
-		BKE_reportf(reports, RPT_ERROR, "Socket is not an input");
+		BKE_report(reports, RPT_ERROR, "Socket is not an input");
 	else {
 		/* XXX should check if tree is a group here! no good way to do this currently. */
 		gsock = node_group_add_socket(ntree, sock->name, sock->type, SOCK_IN);
@@ -906,9 +906,9 @@ static bNodeSocket *rna_NodeTree_output_expose(bNodeTree *ntree, ReportList *rep
 	int index, in_out;
 	
 	if (!nodeFindNode(ntree, sock, &node, &index, &in_out))
-		BKE_reportf(reports, RPT_ERROR, "Unable to locate socket in node tree");
+		BKE_report(reports, RPT_ERROR, "Unable to locate socket in node tree");
 	else if (in_out != SOCK_OUT)
-		BKE_reportf(reports, RPT_ERROR, "Socket is not an output");
+		BKE_report(reports, RPT_ERROR, "Socket is not an output");
 	else {
 		/* XXX should check if tree is a group here! no good way to do this currently. */
 		gsock = node_group_add_socket(ntree, sock->name, sock->type, SOCK_OUT);
diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index 879a77527cd..5f5bdb765b1 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -158,7 +158,7 @@ Mesh *rna_Object_to_mesh(Object *ob, ReportList *reports, Scene *sce, int apply_
 			/* BKE_mesh_from_nurbs changes the type to a mesh, check it worked */
 			if (tmpobj->type != OB_MESH) {
 				BKE_libblock_free_us(&(G.main->object), tmpobj);
-				BKE_report(reports, RPT_ERROR, "cant convert curve to mesh. Does the curve have any segments?");
+				BKE_report(reports, RPT_ERROR, "Can't convert curve to mesh (does the curve have any segments?)");
 				return NULL;
 			}
 
diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index d8753f4ff43..30bdc717f50 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -1062,7 +1062,7 @@ static StructRNA *rna_Operator_register(Main *bmain, ReportList *reports, void *
 				}
 				else {
 					BKE_reportf(reports, RPT_ERROR,
-					            "registering operator class: '%s', invalid bl_idname '%s', at position %d",
+					            "Registering operator class: '%s', invalid bl_idname '%s', at position %d",
 					            identifier, _operator_idname, i);
 					return NULL;
 				}
@@ -1071,7 +1071,7 @@ static StructRNA *rna_Operator_register(Main *bmain, ReportList *reports, void *
 			}
 
 			if (i > ((int)sizeof(dummyop.idname)) - 3) {
-				BKE_reportf(reports, RPT_ERROR, "registering operator class: '%s', invalid bl_idname '%s', "
+				BKE_reportf(reports, RPT_ERROR, "Registering operator class: '%s', invalid bl_idname '%s', "
 				            "is too long, maximum length is %d", identifier, _operator_idname,
 				            (int)sizeof(dummyop.idname) - 3);
 				return NULL;
@@ -1079,7 +1079,7 @@ static StructRNA *rna_Operator_register(Main *bmain, ReportList *reports, void *
 
 			if (dot != 1) {
 				BKE_reportf(reports, RPT_ERROR,
-				            "registering operator class: '%s', invalid bl_idname '%s', must contain 1 '.' character",
+				            "Registering operator class: '%s', invalid bl_idname '%s', must contain 1 '.' character",
 				            identifier, _operator_idname);
 				return NULL;
 			}