Index: lams_tool_lamc/web/authoring/BasicContent.jsp
===================================================================
diff -u -r66bdcbf0aa30e2806a09754ffb940f2b53126a01 -ra9c105aa88fefa46431ad7f8df36ccd061e66f79
--- lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision 66bdcbf0aa30e2806a09754ffb940f2b53126a01)
+++ lams_tool_lamc/web/authoring/BasicContent.jsp	(.../BasicContent.jsp)	(revision a9c105aa88fefa46431ad7f8df36ccd061e66f79)
@@ -112,7 +112,7 @@
 								  }"> 			
 
 								  <tr>
-								  	<td NOWRAP bgcolor="#EEEEEE" class="input" valign=top>  <font size=2> <b> <c:out value="Question ${queIndex}"/> : </b>  </font> </td>
+								  	<td NOWRAP bgcolor="#EEEEEE" class="input" valign=top>  <font size=2> <b> <bean:message key="label.question.only"/> ${queIndex} : </b>  </font> </td>
 								  	
 							  		<td NOWRAP bgcolor="#EEEEEE" class="input" valign=top width=50> 
 								  		<font size=2> <input type="text" name="questionContent<c:out value="${queIndex}"/>" value="<c:out value="${questionEntry.value}"/>" 
@@ -164,7 +164,7 @@
 										  }"> 			
 
 								  <tr>
-								  	<td NOWRAP bgcolor="#EEEEEE" class="input" valign=top>  <font size=2> <b> <c:out value="Question ${queIndex}"/> : </b>  </font> </td>
+								  	<td NOWRAP bgcolor="#EEEEEE" class="input" valign=top>  <font size=2> <b> <bean:message key="label.question.only"/> ${queIndex} : </b>  </font> </td>
 								  	
 							  		<td NOWRAP bgcolor="#EEEEEE" class="input" valign=top> 
 								  		<font size=2> <c:out value="${questionEntry.value}"/> </font>
Index: lams_tool_lamc/web/authoring/OptionsContent.jsp
===================================================================
diff -u -r65166da92a6f0f4ff73acb92b95672e237b25742 -ra9c105aa88fefa46431ad7f8df36ccd061e66f79
--- lams_tool_lamc/web/authoring/OptionsContent.jsp	(.../OptionsContent.jsp)	(revision 65166da92a6f0f4ff73acb92b95672e237b25742)
+++ lams_tool_lamc/web/authoring/OptionsContent.jsp	(.../OptionsContent.jsp)	(revision a9c105aa88fefa46431ad7f8df36ccd061e66f79)
@@ -74,7 +74,8 @@
 						<c:forEach var="optionEntry" items="${sessionScope.mapOptionsContent}">
 							  <c:if test="${optionEntry.key == 1}"> 			
 								  <tr>
-									  	<td bgcolor="#EEEEEE" class="input" valign=top>  <font size=2> <b> <c:out value="Candidate Answer ${optionIndex}"/> :  </b>  </font>
+								  
+									  	<td bgcolor="#EEEEEE" class="input" valign=top>  <font size=2> <b> <bean:message key="label.candidateAnswer"/> ${optionIndex} :  </b>  </font>
 
 										<font size=2>
 								  			<input type="text" name="optionContent<c:out value="${optionIndex}"/>" value="<c:out value="${optionEntry.value}"/>"   
@@ -87,8 +88,8 @@
 												  <c:if test="${selectedOptionEntry.value == optionEntry.value}"> 			
 							  					
 														  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
-																<option value="Incorrect" > <font size=2> Incorrect </font> </option>
-																<option value="Correct" SELECTED>  <font size=2> Correct </font></option>
+																<option value="Incorrect" > <font size=2> <bean:message key='option.incorrect'/> </font> </option>
+																<option value="Correct" SELECTED>  <font size=2> <bean:message key='option.correct'/> </font></option>
 															</select>
 												
 							  				  	 		<c:set var="selectedOptionFound" scope="request" value="1"/>
@@ -99,8 +100,8 @@
 									  <c:if test="${selectedOptionFound == 0}"> 			
 										  <font size=2>								  	
 													  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
-															<option value="Incorrect" SELECTED> <font size=2> Incorrect </font> </option>
-															<option value="Correct">   <font size=2> Correct  </font> </option>
+															<option value="Incorrect" SELECTED> <font size=2> <bean:message key='option.incorrect'/> </font> </option>
+															<option value="Correct">   <font size=2> <bean:message key='option.correct'/>  </font> </option>
 														</select>
 											</font>													
 					 					</c:if> 			
@@ -116,7 +117,7 @@
 					  		<c:if test="${optionEntry.key > 1}"> 			
 								<c:set var="optionIndex" scope="session" value="${optionIndex +1}"/>
 								  <tr>
-								  	<td bgcolor="#EEEEEE" class="input" valign=top> <font size=2> <b> <c:out value="Candidate Answer ${optionIndex}"/> : </b></font>
+								  	<td bgcolor="#EEEEEE" class="input" valign=top> <font size=2> <b> <bean:message key="label.candidateAnswer"/> ${optionIndex} : </b></font>
 
 									<font size=2>								  	
 							  			<input type="text" name="optionContent<c:out value="${optionIndex}"/>" value="<c:out value="${optionEntry.value}"/>"
@@ -128,8 +129,8 @@
 				  							<font size=2>								  	
 											  <c:if test="${selectedOptionEntry.value == optionEntry.value}"> 			
 													  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
-															<option value="Incorrect" > <font size=2> Incorrect </font> </option>
-															<option value="Correct" SELECTED> <font size=2>	  Correct  </font> </option>
+															<option value="Incorrect" > <font size=2> <bean:message key='option.incorrect'/> </font> </option>
+															<option value="Correct" SELECTED> <font size=2>	  <bean:message key='option.correct'/>   </font> </option>
 														</select>
 						  				  	 		<c:set var="selectedOptionFound" scope="request" value="1"/>
 							 					</c:if> 			
@@ -139,8 +140,8 @@
 									  <c:if test="${selectedOptionFound == 0}"> 			
 
 												  	<select name="checkBoxSelected<c:out value="${optionIndex}"/>">
-														<option value="Incorrect" SELECTED> <font size=2> Incorrect  </font> </option>
-														<option value="Correct">   <font size=2> Correct </font>   </option>
+														<option value="Incorrect" SELECTED> <font size=2> <bean:message key='option.incorrect'/>  </font> </option>
+														<option value="Correct">   <font size=2> <bean:message key='option.correct'/> </font>   </option>
 													</select>
 					 					</c:if> 			
 										</td>