Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml,v
diff -u -r1.17 -r1.18
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	21 Sep 2007 06:52:48 -0000	1.17
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml	15 May 2008 05:40:13 -0000	1.18
@@ -70,9 +70,16 @@
 	
 	<!-- end of data access and repository access beans -->
 
+	<bean id="lamcMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
+		<property name="basename"><value>org.lamsfoundation.lams.tool.mc.ApplicationResources</value></property>
+	</bean>
+	
+	<bean id="lamcMessageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
+		<property name="messageSource"><ref local="lamcMessageSource"/></property>										
+	</bean>
+
 	<bean id="mcOutputFactory" class="org.lamsfoundation.lams.tool.mc.service.MCOutputFactory">
-		<property name="loadedMessageSourceService"><ref bean="loadedMessageSourceService"/></property>
-		<property name="languageFilename"><value>org.lamsfoundation.lams.tool.mc.ApplicationResources</value></property>
+		<property name="toolMessageService"><ref bean="lamcMessageService"/></property>
 	</bean>
 	
 	<bean id="mcService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
@@ -93,7 +100,8 @@
 					<property name="auditService"><ref bean="auditService"/></property>					
 					<property name="exportContentService"><ref bean="exportToolContentService"/></property> 		
 			   		<property name="coreNotebookService"><ref bean="coreNotebookService"/></property>										
-			   		<property name="mcOutputFactory"><ref bean="mcOutputFactory"/></property>										
+			   		<property name="mcOutputFactory"><ref bean="mcOutputFactory"/></property>	
+			   		<property name="messageService"><ref bean="lamcMessageService"/></property>									
 				</bean>
 			</property>
 			<property name="transactionAttributes">
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v
diff -u -r1.101 -r1.102
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	11 Oct 2007 06:27:31 -0000	1.101
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	15 May 2008 05:40:13 -0000	1.102
@@ -85,6 +85,7 @@
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.util.audit.IAuditService;
 import org.lamsfoundation.lams.util.wddx.WDDXProcessor;
@@ -130,7 +131,9 @@
     private IExportToolContentService exportContentService;
 	
     private ICoreNotebookService coreNotebookService;
-    
+
+	private MessageService messageService;
+	
     public McServicePOJO(){}
     
     public void configureContentRepository() throws McApplicationException {
@@ -2442,5 +2445,18 @@
     public void setAuditService(IAuditService auditService) {
         this.auditService = auditService;
     }
+    
+	/**
+     * @return Returns the MessageService.
+     */
+    public MessageService getMessageService() {
+        return messageService;
+    }
+    /**
+     * @param messageService The MessageService to set.
+     */
+    public void setMessageService(MessageService messageService) {
+        this.messageService = messageService;
+    }
 
 }
\ No newline at end of file
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServiceProxy.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServiceProxy.java,v
diff -u -r1.4 -r1.5
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServiceProxy.java	17 Sep 2006 06:23:44 -0000	1.4
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServiceProxy.java	15 May 2008 05:40:13 -0000	1.5
@@ -26,6 +26,7 @@
 
 import org.lamsfoundation.lams.tool.ToolContentManager;
 import org.lamsfoundation.lams.tool.ToolSessionManager;
+import org.lamsfoundation.lams.util.MessageService;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -63,11 +64,21 @@
     {
         return (ToolContentManager)getMcDomainService(servletContext);
     }
+    
+    public static final MessageService getMessageService(ServletContext servletContext)
+    {
+		return (MessageService) getMcMessageService(servletContext);
+	}
 
     private static Object getMcDomainService(ServletContext servletContext)
     {
         WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
         return wac.getBean("mcService");
     }
     
+    private static Object getMcMessageService(ServletContext servletContext)
+    {
+        WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext);
+        return wac.getBean("lamcMessageService");
+    }
 }
\ No newline at end of file
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v
diff -u -r1.38 -r1.39
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	15 May 2008 03:48:58 -0000	1.38
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	15 May 2008 05:40:13 -0000	1.39
@@ -72,6 +72,7 @@
 import org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile;
 import org.lamsfoundation.lams.tool.mc.service.IMcService;
 import org.lamsfoundation.lams.tool.mc.service.McServiceProxy;
+import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -4663,6 +4664,8 @@
 	public ActionForward downloadMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
 	throws IOException,ServletException
 	{
+		MessageService messageService = getMessageService();
+		
 		String currentMonitoredToolSession=request.getParameter("monitoredToolSessionId");
 	    McMonitoringForm mcMonitoringForm = (McMonitoringForm) form;
 		
@@ -4737,16 +4740,17 @@
 							
 							cell = row.createCell((short) 0);
 							cell.setEncoding(HSSFCell.ENCODING_UTF_16);
-							cell.setCellValue("Group");
+							cell.setCellValue(messageService.getMessage("group.label"));
 							
 							cell = row.createCell((short) 1);
 							cell.setEncoding(HSSFCell.ENCODING_UTF_16);
 							cell.setCellValue(currentSessionName);
 							
+							idx++;
 							row = sheet.createRow(idx++);
 							cell = row.createCell((short) 0);
 							cell.setEncoding(HSSFCell.ENCODING_UTF_16);
-							cell.setCellValue("User");
+							cell.setCellValue(messageService.getMessage("label.user"));
 							
 							Iterator answersIterator = listMonitoredAnswersContainerDTO.iterator();
 							int count = 1;
@@ -4755,12 +4759,12 @@
 								
 								cell = row.createCell((short) count++);
 								cell.setEncoding(HSSFCell.ENCODING_UTF_16);
-								cell.setCellValue("Question " + count + "(Mark:" + mcMonitoredAnswersDTO.getMark() + ")");
+								cell.setCellValue(messageService.getMessage("label.monitoring.downloadMarks.question.mark", new Object[] {count-1, mcMonitoredAnswersDTO.getMark()}));
 							}
 						
 							cell = row.createCell((short) count++);
 							cell.setEncoding(HSSFCell.ENCODING_UTF_16);
-							cell.setCellValue("Total");
+							cell.setCellValue(messageService.getMessage("label.total"));
 							
 							Iterator userMarkIterator = usersMarksMap.values().iterator();
 							
@@ -4786,7 +4790,10 @@
 								cell.setEncoding(HSSFCell.ENCODING_UTF_16);
 								cell.setCellValue(userMark.getTotalMark());
 							}	
-						}	
+							
+							idx++;
+						}
+						
 					}
 			
 			ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -4819,6 +4826,12 @@
 		
 		return null;
 	}
-    
+
+    /**
+	 * Return ResourceService bean.
+	 */
+	private MessageService getMessageService() {
+	     return (MessageService) McServiceProxy.getMessageService(getServlet().getServletContext());
+	}
 }
     
\ No newline at end of file