Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.17 -r1.18
--- lams_learning/conf/language/lams/ApplicationResources.properties	29 May 2008 07:10:11 -0000	1.17
+++ lams_learning/conf/language/lams/ApplicationResources.properties	30 May 2008 02:36:38 -0000	1.18
@@ -85,6 +85,9 @@
 export.portfolio.generation.complete.message  =Export Portfolio completed
 message.activity.options.note  =<u><b>Note</b></u>: Once you finish any of the above activities you can revisit them by using the progress bar.
 message.activity.options.note.maximum  =<u><b>Note</b></u>: The maximum number of activities you may attempt is {0}. You can revisit started or finished activities by using the progress bar.
+message.activity.set.options.activityCount  =You must complete at least {0} out of {1} sets of activities to finish.
+message.activity.set.options.note  =<u><b>Note</b></u>: Once you finish any of the above sets of activities you can revisit them by using the progress bar.
+message.activity.set.options.note.maximum  =<u><b>Note</b></u>: The maximum number of sets of activities you may attempt is {0}. You can revisit started or finished sets of activities by using the progress bar.
 
 
 #======= End labels: Exported 79 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.16 -r1.17
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	29 May 2008 07:10:11 -0000	1.16
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	30 May 2008 02:36:38 -0000	1.17
@@ -85,6 +85,8 @@
 export.portfolio.generation.complete.message  =Export Portfolio completed
 message.activity.options.note  =<u><b>Note</b></u>: Once you finish any of the above activities you can revisit them by using the progress bar.
 message.activity.options.note.maximum  =<u><b>Note</b></u>: The maximum number of activities you may attempt is {0}. You can revisit started or finished activities by using the progress bar.
+message.activity.set.options.activityCount  =You must complete at least {0} out of {1} sets of activities to finish.
+message.activity.set.options.note  =<u><b>Note</b></u>: Once you finish any of the above sets of activities you can revisit them by using the progress bar.
+message.activity.set.options.note.maximum  =<u><b>Note</b></u>: The maximum number of sets of activities you may attempt is {0}. You can revisit started or finished sets of activities by using the progress bar.
 
-
 #======= End labels: Exported 79 labels for en AU =====
Index: lams_learning/web/optionsActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/optionsActivity.jsp,v
diff -u -r1.30 -r1.31
--- lams_learning/web/optionsActivity.jsp	29 May 2008 07:18:06 -0000	1.30
+++ lams_learning/web/optionsActivity.jsp	30 May 2008 02:36:38 -0000	1.31
@@ -8,6 +8,12 @@
 		progress="${optionsActivityForm.progressSummary}" />
 </c:if>
 
+<%
+	if (request.getAttribute("activity") instanceof org.lamsfoundation.lams.learningdesign.OptionsWithSequencesActivity) {
+		request.setAttribute("isOptionsWithSequencesActivity", "true");
+	}
+%>
+
 <script language="JavaScript" type="text/JavaScript"><!--
 	function validate() {
 		var validated = false;
@@ -47,10 +53,20 @@
 	<div class="group-box">
 
 		<p>
-			<fmt:message key="message.activity.options.activityCount">
-				<fmt:param value="${optionsActivityForm.minimum}" />
-				<fmt:param value="${optionsActivityForm.maximum}" />
-			</fmt:message>
+			<c:choose>
+				<c:when test="${isOptionsWithSequencesActivity}">
+					<fmt:message key="message.activity.set.options.activityCount">
+						<fmt:param value="${optionsActivityForm.minimum}" />
+						<fmt:param value="${optionsActivityForm.maximum}" />
+					</fmt:message>
+				</c:when>
+				<c:otherwise>
+					<fmt:message key="message.activity.options.activityCount">
+						<fmt:param value="${optionsActivityForm.minimum}" />
+						<fmt:param value="${optionsActivityForm.maximum}" />
+					</fmt:message>
+				</c:otherwise>
+			</c:choose>
 		</p>
 
 		<html:form action="/ChooseActivity" method="post"
@@ -98,12 +114,28 @@
 	<p class="info">
 		<c:choose>
 			<c:when test="${optionsActivityForm.maximum gt 0 and optionsActivityForm.maximum lt numActivities}">
-				<fmt:message key="message.activity.options.note.maximum">
-					<fmt:param value="${optionsActivityForm.maximum}" />
-				</fmt:message>
+				<c:choose>
+					<c:when test="${isOptionsWithSequencesActivity}">
+						<fmt:message key="message.activity.set.options.note.maximum">
+							<fmt:param value="${optionsActivityForm.maximum}" />
+						</fmt:message>
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="message.activity.options.note.maximum">
+							<fmt:param value="${optionsActivityForm.maximum}" />
+						</fmt:message>
+					</c:otherwise>
+				</c:choose>
 			</c:when>
 			<c:otherwise>
-				<fmt:message key="message.activity.options.note" />
+				<c:choose>
+					<c:when test="${isOptionsWithSequencesActivity}">
+						<fmt:message key="message.activity.set.options.note" />
+					</c:when>
+					<c:otherwise>
+						<fmt:message key="message.activity.options.note" />
+					</c:otherwise>
+				</c:choose>
 			</c:otherwise>
 		</c:choose>
 	</p>