Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r6d1e7fa43f6a6ddfd559371f5dd9f129525c1bce -r5ff29eb8125ec761dcf188a571ae567bc61c2f03
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r6d1e7fa43f6a6ddfd559371f5dd9f129525c1bce -r5ff29eb8125ec761dcf188a571ae567bc61c2f03
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -r1d252c442d2a807f45abbc77f366c2952ce4c44d -r5ff29eb8125ec761dcf188a571ae567bc61c2f03
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 1d252c442d2a807f45abbc77f366c2952ce4c44d)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 5ff29eb8125ec761dcf188a571ae567bc61c2f03)
@@ -218,10 +218,10 @@
 		} else {
 			var dto:Object = _ddm.getDesignForSaving();
 			var groupingUIID:Number = null;
+			
 			if((groupingUIID = validateGroupings()) != null) {
-				// return error message
 				Cursor.showCursor(Application.C_DEFAULT);
-				LFMessage.showMessageAlert('Group names must be unique. Please review the Grouping Activity: '' + _ddm.getGroupingActivityByGroupingUIID(groupingUIID).title + ''', null);
+				LFMessage.showMessageAlert(Dictionary.getValue('grouping_invalid_with_common_names_msg', [_ddm.getGroupingActivityByGroupingUIID(groupingUIID).title]), null);
 				return false;
 			} else {
 				var callback:Function = Proxy.create(this,onStoreDesignResponse);
@@ -308,30 +308,34 @@
 		}
 	}
 	
-	public function validateGroupings():Number {
+	private function validateGroupings():Number {
 		var keys:Array = _ddm.groupings.keys();
 		var currentGrouping:Grouping = null;
 		
 		for(var i=0; i<keys.length; i++) {
 			currentGrouping = _ddm.groupings.get(keys[i])
 			var groups:Array = currentGrouping.getGroups(_ddm);
-			groups.sortOn("groupName", Array.UNIQUESORT | Array.ASCENDING);
-			
-			var group:Group = null;
-			if(groups.length > 0)
-				group = groups[0];
-			
-			for(var j=1; j<groups.length; j++) {
-				if(group.groupName == groups[j].groupName)
+			for(var j=0; j<groups.length; j++) {
+				if(!validateGroups(groups[j], groups))
 					return currentGrouping.groupingUIID;
-				else
-					group = groups[j];
 			}
 		}
 		
 		return null;
 	}
 	
+	private function validateGroups(group:Group, groups:Array):Boolean {
+		Debugger.log("groupname: "+ group.groupName, Debugger.CRITICAL, "validateGroupings", "Canvas");
+		for(var j=0; j<groups.length; j++) {
+			Debugger.log("groupname j: "+ groups[j].groupName, Debugger.CRITICAL, "validateGroupings", "Canvas");
+			
+			if(group.groupName == groups[j].groupName && group.groupUIID != groups[j].groupUIID)
+				return false;
+		}
+		
+		return true;
+	}
+	
 	/**
 	 * Called when a template activity is dropped onto the canvas
 	 * @usage