Index: lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r19c53ce28433c0e4d47c5f303be3e658c808329c -r78430c0da880a241dde8fb04994d852a92acf83c
--- lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
+++ lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 78430c0da880a241dde8fb04994d852a92acf83c)
@@ -47,8 +47,6 @@
 error.survey.item.question.blank  =Question can not be blank
 error.survey.item.question.less.option  =You must input at least two options.
 label.submit.survey  =Done
-label.retake.survey  =Retake survey
-label.retake  =[Retake]
 label.append.text  =Append text:
 label.next  =Next
 label.previous  =Previous
@@ -137,8 +135,6 @@
 label.monitoring.button.export.excel  =Export Report
 errors.maxfilesize  =The uploaded file has exceeded the maximum file size limit of {0} bytes
 message.not.available  =Not Available
-message.warnLockOnFinish  =Note: After you click on "Next Activity" and you come back to this Survey, you won't be able to change your answers.
-message.activityLocked  == The instructor has set this activity not to allow you to retake the survey after you have finished it. As you are returning to this activity, you are able to see your answers but not allowed to change them.
 label.export.reflection  =Notebook entries
 label.on  =On
 label.off  =Off
@@ -187,4 +183,9 @@
 label.other.answers  =Answers from other Learners
 label.total.responses  =Total responses so far: {0}
 
+label.retake.survey  =Change answers
+label.retake  =[Change answer]
+message.activityLocked  =The instructor has set this activity not to allow you to retake the survey after you have finished it. As you are returning to this activity, you are able to see your answers but not allowed to change them.
+message.warnLockOnFinish  =Note: After you click on "{0}" and you come back to this Survey, you won't be able to change your answers.
+
 #======= End labels: Exported 174 labels for en AU =====
Index: lams_tool_survey/web/pages/learning/result.jsp
===================================================================
diff -u -r19c53ce28433c0e4d47c5f303be3e658c808329c -r78430c0da880a241dde8fb04994d852a92acf83c
--- lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
+++ lams_tool_survey/web/pages/learning/result.jsp	(.../result.jsp)	(revision 78430c0da880a241dde8fb04994d852a92acf83c)
@@ -42,14 +42,35 @@
 			<c:out value="${sessionMap.instructions}" escapeXml="false" />
 		</p>
 
-		<c:if test="${sessionMap.lockOnFinish and sessionMap.mode != 'teacher' and !sessionMap.showOtherUsersAnswers}">
-			<div class="info">
+		<c:if test="${sessionMap.lockOnFinish and sessionMap.mode != 'teacher'}">
+			<div class="info space-bottom">
 				<c:choose>
+					<c:when test="${sessionMap.showOtherUsersAnswers}">
+						<c:set var="buttonLabel"><fmt:message key="label.view.all.responses" /></c:set>
+						<fmt:message key="message.warnLockOnFinish" >
+							<fmt:param>${buttonLabel}</fmt:param>
+						</fmt:message>
+					</c:when>
+								
 					<c:when test="${sessionMap.userFinished}">
 						<fmt:message key="message.activityLocked" />
 					</c:when>
+					
 					<c:otherwise>
-						<fmt:message key="message.warnLockOnFinish" />
+						<c:set var="buttonLabel">
+							<c:choose>
+							 	<c:when test="${sessionMap.activityPosition.last}">
+							 		<fmt:message key="label.submit" />
+							 	</c:when>
+							 					
+							 	<c:otherwise>
+							 		 <fmt:message key="label.finished" />
+							 	</c:otherwise>
+							 </c:choose>
+						</c:set>
+						<fmt:message key="message.warnLockOnFinish" >
+							<fmt:param>${buttonLabel}</fmt:param>
+						</fmt:message>
 					</c:otherwise>
 				</c:choose>
 			</div>
Index: lams_tool_survey/web/pages/learning/resultOtherUsers.jsp
===================================================================
diff -u -r19c53ce28433c0e4d47c5f303be3e658c808329c -r78430c0da880a241dde8fb04994d852a92acf83c
--- lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision 19c53ce28433c0e4d47c5f303be3e658c808329c)
+++ lams_tool_survey/web/pages/learning/resultOtherUsers.jsp	(.../resultOtherUsers.jsp)	(revision 78430c0da880a241dde8fb04994d852a92acf83c)
@@ -124,14 +124,7 @@
 
 		<c:if test="${sessionMap.lockOnFinish and sessionMap.mode != 'teacher'}">
 			<div class="info">
-				<c:choose>
-					<c:when test="${sessionMap.userFinished}">
-						<fmt:message key="message.activityLocked" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="message.warnLockOnFinish" />
-					</c:otherwise>
-				</c:choose>
+				<fmt:message key="message.activityLocked" />
 			</div>
 		</c:if>
 		
@@ -181,7 +174,7 @@
 			</div>
 		</c:forEach>
 
-		<c:if test="${not sessionMap.finishedLock}">
+		<c:if test="${not sessionMap.lockOnFinish}">
 			<html:button property="RetakeButton" onclick="return retakeSurvey()" styleClass="button">
 				<fmt:message key="label.retake.survey" />
 			</html:button>