Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.1.2.2 -r1.1.2.3
--- lams_learning/conf/language/lams/ApplicationResources.properties	28 Mar 2007 06:42:13 -0000	1.1.2.2
+++ lams_learning/conf/language/lams/ApplicationResources.properties	3 Apr 2007 05:08:32 -0000	1.1.2.3
@@ -73,6 +73,6 @@
 label.close.button  =Close
 mynotes.journals.title  =Journals
 mynotes.entry.no.title.label  =No Title
-message.progress.broken=An error has occurred and you cannot continue with LAMS recalculating your current activity. Please select "Resume" or close and reopen this window to continue.
+message.progress.broken=An error has occurred and you cannot continue without LAMS recalculating your current activity. The lesson may be currently under edit. Please select "Resume" or close and reopen this window to continue.
 
 #======= End labels: Exported 67 labels for en AU =====
Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources_en_AU.properties,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	12 Mar 2007 05:41:15 -0000	1.1.2.1
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	3 Apr 2007 05:08:32 -0000	1.1.2.2
@@ -73,6 +73,6 @@
 label.close.button  =Close
 mynotes.journals.title  =Journals
 mynotes.entry.no.title.label  =No Title
+message.progress.broken=An error has occurred and you cannot continue without LAMS recalculating your current activity. The lesson may be currently under edit. Please select "Resume" or close and reopen this window to continue.
 
-
 #======= End labels: Exported 67 labels for en AU =====
Index: lams_learning/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/struts-actions.xml,v
diff -u -r1.12 -r1.12.4.1
--- lams_learning/conf/xdoclet/struts-actions.xml	29 Sep 2006 06:23:10 -0000	1.12
+++ lams_learning/conf/xdoclet/struts-actions.xml	3 Apr 2007 05:08:33 -0000	1.12.4.1
@@ -5,6 +5,9 @@
 <action path="/close"
 	type="org.apache.struts.actions.ForwardAction"
 	parameter=".close" />
+<action path="/progressBroken"
+	type="org.apache.struts.actions.ForwardAction"
+	parameter=".progressBroken" />
 <action path="/content"
 	type="org.apache.struts.actions.ForwardAction"
 	parameter=".welcome" />
Index: lams_learning/conf/xdoclet/struts-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/struts-forms.xml,v
diff -u -r1.9 -r1.9.4.1
--- lams_learning/conf/xdoclet/struts-forms.xml	29 Sep 2006 06:23:10 -0000	1.9
+++ lams_learning/conf/xdoclet/struts-forms.xml	3 Apr 2007 05:08:33 -0000	1.9.4.1
@@ -5,7 +5,8 @@
 
 <form-bean name="GateForm"  type="org.apache.struts.action.DynaActionForm">
 	<form-property name="gate" type="org.lamsfoundation.lams.learningdesign.GateActivity" />
-	<form-property name="activityId" type="java.lang.Long" />
+	<form-property name="activityID" type="java.lang.Long" />
+	<form-property name="lessonID" type="java.lang.Long" />
 	<form-property name="waitingLearners" type="java.lang.Integer"/>
 	<form-property name="totalLearners" type="java.lang.Integer" />
 	<form-property name="startingTime" type="java.util.Date" />