[Bf-blender-cvs] [2149886] master: More UI messages fixes and tweaks.

[Bastien Montagne]

Commit: 2149886033cd2d2e505f28446dad3d8f2bd8d83c
Author: Bastien Montagne
Date:   Tue May 13 15:07:24 2014 +0200
https://developer.blender.org/rB2149886033cd2d2e505f28446dad3d8f2bd8d83c

More UI messages fixes and tweaks.

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

M	source/blender/editors/object/object_bake_api.c
M	source/blender/editors/space_nla/nla_channels.c

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

diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 9cacc0d..b344bf3 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -350,7 +350,7 @@ static int initialize_internal_images(BakeImages *bake_images, ReportList *repor
 		}
 		else {
 			BKE_image_release_ibuf(bk_image->image, ibuf, lock);
-			BKE_reportf(reports, RPT_ERROR, "Not initialized image %s", bk_image->image->id.name + 2);
+			BKE_reportf(reports, RPT_ERROR, "Uninitialized image %s", bk_image->image->id.name + 2);
 			return 0;
 		}
 		BKE_image_release_ibuf(bk_image->image, ibuf, lock);
@@ -439,13 +439,13 @@ static int bake(
 	if (tot_materials == 0) {
 		if (is_save_internal) {
 			BKE_report(reports, RPT_ERROR,
-			           "No active image found. Add a material or bake to an external file");
+			           "No active image found, add a material or bake to an external file");
 
 			goto cleanup;
 		}
 		else if (is_split_materials) {
 			BKE_report(reports, RPT_ERROR,
-			           "No active image found. Add a material or bake without the Split Materials option");
+			           "No active image found, add a material or bake without the Split Materials option");
 
 			goto cleanup;
 		}
diff --git a/source/blender/editors/space_nla/nla_channels.c b/source/blender/editors/space_nla/nla_channels.c
index edd1a1f..3c8518c 100644
--- a/source/blender/editors/space_nla/nla_channels.c
+++ b/source/blender/editors/space_nla/nla_channels.c
@@ -416,8 +416,8 @@ static int nlachannels_pushdown_exec(bContext *C, wmOperator *op)
 		
 		/* active animdata block */
 		if (nla_panel_context(C, &adt_ptr, NULL, NULL) == 0 || (adt_ptr.data == NULL)) {
-			BKE_report(op->reports, RPT_ERROR, "No active AnimData block to use. " 
-			           "Select a datablock expander first or set the appropriate flags on an AnimData block");
+			BKE_report(op->reports, RPT_ERROR, "No active AnimData block to use "
+			           "(select a datablock expander first or set the appropriate flags on an AnimData block)");
 			return OPERATOR_CANCELLED;
 		}
 		else {
@@ -437,12 +437,12 @@ static int nlachannels_pushdown_exec(bContext *C, wmOperator *op)
 		/* get channel from index */
 		ale = BLI_findlink(&anim_data, channel_index);
 		if (ale == NULL) {
-			BKE_reportf(op->reports, RPT_ERROR, "No animation channel found at index = %d", channel_index);
+			BKE_reportf(op->reports, RPT_ERROR, "No animation channel found at index %d", channel_index);
 			BLI_freelistN(&anim_data);
 			return OPERATOR_CANCELLED;
 		}
 		else if (ale->type != ANIMTYPE_NLAACTION) {
-			BKE_reportf(op->reports, RPT_ERROR, "Animation channel at index = %d is not a NLA 'Active Action' channel", channel_index);
+			BKE_reportf(op->reports, RPT_ERROR, "Animation channel at index %d is not a NLA 'Active Action' channel", channel_index);
 			BLI_freelistN(&anim_data);
 			return OPERATOR_CANCELLED;
 		}