Index: lams_central/conf/language/ApplicationResources.properties
===================================================================
diff -u -r6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6e8ba0f3a63271750e8db1ea6e194fdfb2b28d1a)
+++ lams_central/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,7 +1,57 @@
 # CVS ID: $Id$
-error.authorisation=You are not authorised to do this. 
+# General label for username
+label.username=Username
+# General label for password
+label.password=Password
+# General authorisation (security) error
+error.authorisation=You are not authorised to do this.
+# Heading of general error 
+heading.general.error=Error
+# General error when an appropriate window cannot be opened. Line 1 of 3.
+error.general.1=Sorry, there as been an error.
+# General error when an appropriate window cannot be opened. Line 2 of 3.
+error.general.2=There is a problem processing this request. Close the browser window and try again.
+# General error when an appropriate window cannot be opened. Line 3 of 3.
+error.general.3=If the problem persists please contact your system administrator or the technical forums on  <A HREF="http://lamscommunity.org/">http://lamscommunity.org/</A>.  
+
+# Change Password screen - new passwords do not match
 error.newpassword.mismatch=Your new passwords don't match each other.
+# Change Password change screen - old password was not entered correctly
 error.oldpassword.mismatch=Your old password is not correct.
+# Change Password screen - page heading 
+heading.password.change.screen=Change Password
+# Change Password screen - Old Password
+label.password.old.password=Old Password
+# Change Password screen - New Password
+label.password.new.password=New Password
+# Change Password screen - Confirm New Password
+label.password.confirm.new.password=Confirm New Password
+# Password Changed screen - page heading
+heading.password.changed.screen=Password Changed
+# Password Changed screen - password changed okay
+msg.password.changed=Your password has been changed.
+
+# Login error message
+error.login=Sorry, that username or password is not known. Please try again.
+# Login button
+button.login=Login
+
+# Link to the user guide
+label.user.guide=[HELP]
+# Message displayed as the main page is loading.
+msg.loading=Loading...
+# LAMS Version shown on login and main page
+msg.LAMS.version=Version 2.0
+# Short copyright message shown on the login and main pages 
+msg.LAMS.copyright.short=2002-2006 LAMS Foundation.
+# Long copyright message shown on the login and main pages
+msg.LAMS.copyright.long=LAMS&#8482; &copy; 2002-2006 LAMS Foundation.\nAll rights reserved.\n\nLAMS is a trademark of LAMS Foundation.\nDistribution of this software is prohibited.
+
+# Save button text
+button.save=Save
+# Cancel button text
+button.cancel=Cancel
+
 # Invalid data sent from Flash to server.
 invalid.wddx.packet=Invalid Object in WDDX packet. Error was {0}.
 no.such.learningdesign.exist=No Learning Design with learning_design_id of:{0} exists.
@@ -32,10 +82,25 @@
 rename.resource.error.miss.vaue=renameResource(Long resourceID,Integer newName, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID.
 rename.resource.unspport=LAMS does not support renaming a file via the workspace interface.
 folder.already.exist=A folder with given name '{0}' already exists.
-can.not.rename.root.folder=Cannot rename the ROOT folder.
 organisations=Organisations
 folders=Folders
 
+# Title used for any misc LAMS screen such as the password change screen
+title.lams=LAMS
+title.login.window=Login - LAMS :: Learning Activity Management System
+title.system.admin.window=System Admin:: LAMS
+msg.loading.system.admin.window=Loading System Administration Environment.
+title.admin.window=Admin:: LAMS
+msg.loading.admin.window=Loading Administration Environment.
+title.add.lesson.window=Add Lesson:: LAMS
+msg.loading.add.lesson.window=Loading Add Lesson Wizard.
+title.monitor.lesson.window=Monitor Lesson:: LAMS
+msg.loading.monitor.lesson.window=Loading Lesson Monitoring Environment.
+title.learner.window=Learner:: LAMS
+msg.loading.learner.window=Loading Learner Environment.
+title.change.password.window=LAMS :: Change Password
+title.password.changed.window=LAMS :: Password Changed
+title.error.window=LAMS :: Error
 
 authoring.msg.save.success=Congratulation, your content saved successfully!
 label.authoring.close=Close
@@ -56,7 +121,9 @@
 index.dummymonitor = Dummy Monitor
 
 
-############# Since by 20 June 2006 #############
+# Import and Export related
+
+
 title.import.result=Import tool content result
 title.import=Import tool content
 title.import.instruction=Please choose learning design zip file and import.
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
diff -u -ra7107c71fc43b4d57db90dd624a0787ed65c4ba7 -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision a7107c71fc43b4d57db90dd624a0787ed65c4ba7)
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	(.../HomeAction.java)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -101,7 +101,7 @@
 			}
 			
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error("Failed to load sysadmin",e);
 			return mapping.findForward("error");
 		}
 	}
@@ -130,7 +130,7 @@
 			}
 			
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error("Failed to load learner",e);
 			return mapping.findForward("error");
 		}
 	}
@@ -157,7 +157,7 @@
 			}
 			
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error("Failed to load author",e);
 			return mapping.findForward("error");
 		}
 	}
@@ -186,7 +186,7 @@
 				return mapping.findForward("monitorLesson");
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error("Failed to load monitor lesson",e);
 			return mapping.findForward("error");
 		}
 	}
@@ -222,7 +222,7 @@
 			}
 
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error("Failed to load add lesson",e);
 			return mapping.findForward("error");
 		}
 	}
Index: lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
===================================================================
diff -u -r8a4d69bf6159f6bcd910eb930d77016e255619e9 -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	(.../WorkspaceManagementService.java)	(revision 8a4d69bf6159f6bcd910eb930d77016e255619e9)
+++ lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	(.../WorkspaceManagementService.java)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1255,10 +1255,7 @@
 															FlashMessage.ERROR);
 					}else
 						flashMessage = FlashMessage.getUserNotAuthorized(MSG_KEY_RENAME,userID);
-				}else
-					flashMessage = new FlashMessage(MSG_KEY_RENAME,
-											messageService.getMessage("can.not.rename.root.folder"),
-													FlashMessage.ERROR);
+				}
 			}else
 				flashMessage = FlashMessage.getNoSuchWorkspaceFolderExsists(MSG_KEY_RENAME,workspaceFolderID);
 		}catch(UserException ue){
Index: lams_central/web/WEB-INF/tiles/tiles-defs.xml
===================================================================
diff -u -r87af23f275675d99a2e83bc9fe44b1d52659ed28 -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 87af23f275675d99a2e83bc9fe44b1d52659ed28)
+++ lams_central/web/WEB-INF/tiles/tiles-defs.xml	(.../tiles-defs.xml)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -22,25 +22,29 @@
 -->
 <tiles-definitions>
 
+	<definition name=".login" path="/template.jsp">
+		<put name="titleKey" value="title.login.window"/>
+		<put name="header" value="header.jsp"/>
+		<put name="content" value="passwordChangeContent.jsp"/>	
+		<put name="footer" value="footer.jsp"/>	
+	</definition>
+
 	<definition name=".passwordChange" path="/template.jsp">
-		<put name="title" value="LAMS :: Change Password"/>
-		<put name="pageHeader" value="Change Password"/>
+		<put name="titleKey" value="title.change.password.window"/>
 		<put name="header" value="header.jsp"/>
 		<put name="content" value="passwordChangeContent.jsp"/>	
 		<put name="footer" value="footer.jsp"/>	
 	</definition>
 	
 	<definition name=".passwordChangeOk" path="/template.jsp">
-		<put name="title" value="LAMS :: Password Changed"/>
-		<put name="pageHeader" value="Password Changed"/>
+		<put name="titleKey" value="title.password.changed.window"/>
 		<put name="header" value="header.jsp"/>
 		<put name="content" value="passwordChangeOkContent.jsp" />	
 		<put name="footer" value="footer.jsp"/>	
 	</definition>
 
 	<definition name=".error" path="/template.jsp">
-		<put name="title" value="LAMS :: Error"/>
-		<put name="pageHeader" value="Error"/>
+		<put name="titleKey" value="heading.password.changed.screen"/>
 		<put name="header" value="header.jsp"/>
 		<put name="content" value="errorContent.jsp" />	
 		<put name="footer" value="footer.jsp"/>	
Index: lams_central/web/addLesson.jsp
===================================================================
diff -u -r440554bb4a9a414c6e3e676a93de72de3298951c -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 440554bb4a9a414c6e3e676a93de72de3298951c)
+++ lams_central/web/addLesson.jsp	(.../addLesson.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,15 +1,18 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
 
 <HTML>
 <HEAD>
-<META HTTP-EQUIV="Refresh" CONTENT="0;URL=monitoring/addLesson.jsp?courseID=<c:out value="${courseID}"/>&classID=<c:out value="${classID}"/>"/>
-
-<TITLE>Learner:: LAMS</TITLE>
+	<META HTTP-EQUIV="Refresh" CONTENT="0;URL=monitoring/addLesson.jsp?courseID=<c:out value="${courseID}"/>&classID=<c:out value="${classID}"/>"/>
+	<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<TITLE><fmt:message key="title.add.lesson.window"/></TITLE>
+	<lams:css/>
 </HEAD>
-<BODY bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 
-<p>Loading Learner Environment.</p>
-
+<BODY>
+<p><fmt:message key="msg.loading.add.lesson.window"/></p>
 </BODY>
+	
 </HTML>
Index: lams_central/web/admin.jsp
===================================================================
diff -u -r62ffc2985a40f544eb48a69f2ad7f124b19a43fa -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/admin.jsp	(.../admin.jsp)	(revision 62ffc2985a40f544eb48a69f2ad7f124b19a43fa)
+++ lams_central/web/admin.jsp	(.../admin.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,14 +1,18 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <HTML>
 <HEAD>
-<META HTTP-EQUIV="Refresh" CONTENT="0;URL=admin/adminstart.do">
-
-<TITLE>Admin:: LAMS</TITLE>
+	<META HTTP-EQUIV="Refresh" CONTENT="0;URL=admin/adminstart.do">
+	<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<TITLE><fmt:message key="title.admin.window"/></TITLE>
+	<lams:css/>
 </HEAD>
-<BODY bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 
-<p>Loading Administration Environment.</p>
-
+<BODY>
+<p><fmt:message key="msg.loading.admin.window"/></p>
 </BODY>
+	
 </HTML>
+
Index: lams_central/web/author.jsp
===================================================================
diff -u -r979548f9d216c9eff0a3b13b7ba883318637db68 -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/author.jsp	(.../author.jsp)	(revision 979548f9d216c9eff0a3b13b7ba883318637db68)
+++ lams_central/web/author.jsp	(.../author.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,10 +1,12 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %>
 <%@ page import="org.lamsfoundation.lams.themes.dto.CSSThemeBriefDTO" %>
 <HTML>
 <HEAD>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+	<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
 <%
 String protocol = request.getProtocol();
Index: lams_central/web/authoringConfirm.jsp
===================================================================
diff -u -r48551771119f5d11f8e78d0608788e2d15ab3589 -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision 48551771119f5d11f8e78d0608788e2d15ab3589)
+++ lams_central/web/authoringConfirm.jsp	(.../authoringConfirm.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,8 +1,10 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <html>
 	<head>
+		<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<lams:css />
 		<script type="text/javascript">
 			  function closeWindow() {
Index: lams_central/web/development/wddxPost.jsp
===================================================================
diff -u -r8628fad036956ba43219abfd392f4913069c3dd8 -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/development/wddxPost.jsp	(.../wddxPost.jsp)	(revision 8628fad036956ba43219abfd392f4913069c3dd8)
+++ lams_central/web/development/wddxPost.jsp	(.../wddxPost.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,11 +1,13 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+
 <%@ taglib uri="/WEB-INF/struts/tlds/struts-html.tld" prefix="html" %>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
 
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>Send WDDX Packet To Server</title>
 </head>
 
Index: lams_central/web/errorContent.jsp
===================================================================
diff -u -r41e3420d7cd50147599cb873f5695203fc6e17e4 -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/errorContent.jsp	(.../errorContent.jsp)	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
+++ lams_central/web/errorContent.jsp	(.../errorContent.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,10 +1,12 @@
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
 <table width="90%" border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
 	<tr> 
 		<td> 
 			<div align="center" class="heading">
-				<p>Sorry, there has been an error. </p>
-				<p class="body">There is a problem processing this request. Close the browser and try again. </p>
-				<p class="body">If the problem persists please contact technical support via the website <a href="http://www.uklams.net/" target="_blank">www.uklams.net</a></p>
+				<p><fmt:message key="error.general.1"/></p>
+				<p class="body"><fmt:message key="error.general.2"/></p>
+				<p class="body"><fmt:message key="error.general.3"/></p>
 			</div>
 		</td>
 	</tr>
Index: lams_central/web/header.jsp
===================================================================
diff -u -r41e3420d7cd50147599cb873f5695203fc6e17e4 -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/header.jsp	(.../header.jsp)	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
+++ lams_central/web/header.jsp	(.../header.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,15 +1,12 @@
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
 	<tr> 
 		<td colspan="2" height="10"></td>
 	</tr>
 	<tr bgcolor="#282871"> 
-		<td width="50%" height="15" align="left">
-			<img height=8 width=8 src="images/spacer.gif" alt="spacer.gif"/>
-			<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif"><c:out value="${pageHeader}" default="Welcome"/></font>
-		</td>
 		<td width="50%" height="15" align="right" > 
 			<a href="doc/LAMS_Learner_Guide_b60.pdf" target = 0>
-				<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif">[HELP]</font>
+				<font color="#FFFFFF" size="1" face="Verdana, Arial, Helvetica, sans-serif"><fmt:message key="label.user.guide"/></font>
 			</a>
 			<img height=8 width=8 src="images/spacer.gif" alt="spacer.gif"/>
 		</td>
Index: lams_central/web/index.jsp
===================================================================
diff -u -ra7107c71fc43b4d57db90dd624a0787ed65c4ba7 -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/index.jsp	(.../index.jsp)	(revision a7107c71fc43b4d57db90dd624a0787ed65c4ba7)
+++ lams_central/web/index.jsp	(.../index.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -96,7 +96,7 @@
 				</tr>
 				<tr>
 					<td colspan=2 id="content" width="100%" align="center">
-						<img src="images/loading.gif" /> <font color="gray" size="4">Loading... </font>
+						<img src="images/loading.gif" /> <font color="gray" size="4"><fmt:message key="msg.loading"/></font>
 					</td>
 				</tr>
 				<tr valign="bottom">
@@ -106,14 +106,11 @@
 				</tr>
 				<tr valign="bottom">
 					<td align="left">	
-						<a href="javascript:alert('LAMS&#8482; &copy; 2002-2006 LAMS Foundation. 
-								\nAll rights reserved.
-								\n\nLAMS is a trademark of LAMS Foundation.
-								\nDistribution of this software is prohibited.');" 
-								class="lightNoteLink">&copy; 2002-2006 LAMS Foundation.
+						<a href="javascript:alert('<fmt:message key="msg.LAMS.copyright.long"/>');" 
+								class="lightNoteLink">&copy; <fmt:message key="msg.LAMS.copyright.short"/>
 						</a>
 					</td>
-					<td align="right">Version 2.0</td>
+					<td align="right"><fmt:message key="msg.LAMS.version"/></td>
 				</tr>
 			</table>
 		</td>
Index: lams_central/web/learner.jsp
===================================================================
diff -u -r440554bb4a9a414c6e3e676a93de72de3298951c -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/learner.jsp	(.../learner.jsp)	(revision 440554bb4a9a414c6e3e676a93de72de3298951c)
+++ lams_central/web/learner.jsp	(.../learner.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,15 +1,18 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
 
 <HTML>
 <HEAD>
-<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/main.jsp?lessonID=<c:out value="${lessonID}"/>">
-
-<TITLE>Learner:: LAMS</TITLE>
+	<META HTTP-EQUIV="Refresh" CONTENT="0;URL=learning/main.jsp?lessonID=<c:out value="${lessonID}"/>">
+	<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<TITLE><fmt:message key="title.learner.window"/></TITLE>
+	<lams:css/>
 </HEAD>
-<BODY bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 
-<p>Loading Learner Environment.</p>
-
+<BODY>
+<p><fmt:message key="msg.loading.learner.window"/></p>
 </BODY>
+	
 </HTML>
Index: lams_central/web/login.jsp
===================================================================
diff -u -r41e3420d7cd50147599cb873f5695203fc6e17e4 -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/login.jsp	(.../login.jsp)	(revision 41e3420d7cd50147599cb873f5695203fc6e17e4)
+++ lams_central/web/login.jsp	(.../login.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,5 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <%@ taglib uri="tags-tiles" prefix="tiles" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
 <%@ page import="org.lamsfoundation.lams.security.JspRedirectStrategy" %>
 <%	
 	if (JspRedirectStrategy.loginPageRedirected(request,response))
@@ -20,8 +21,7 @@
 j_security_login_page
 -->
 <tiles:insert page="template.jsp" flush="true">
-	<tiles:put name="title" value="Login - LAMS :: Learning Activity Management System"/>
-	<tiles:put name="pageHeader" value="Welcome"/>
+	<tiles:put name="titleKey" value="title.login.window"/>
 	<tiles:put name="header" value="loginHeader.jsp"/>
 	<tiles:put name="content" value="loginContent.jsp" />	
 	<tiles:put name="footer" value="footer.jsp"/>	
Index: lams_central/web/loginContent.jsp
===================================================================
diff -u -r72a9f227989964d3faa2b23d288d8fe0c17bd9f0 -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/loginContent.jsp	(.../loginContent.jsp)	(revision 72a9f227989964d3faa2b23d288d8fe0c17bd9f0)
+++ lams_central/web/loginContent.jsp	(.../loginContent.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,4 +1,6 @@
-<%@ page contentType="text/html; charset=iso-8859-1" language="java" %>
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
 <script>
 	function encryptPassword(){
 		  var password=document.loginForm.j_password.value;	 
@@ -24,29 +26,29 @@
 				<%String failed = request.getParameter("failed");
 				if ( failed != null ){%>
 					<span class="error">
-						Sorry, that username or password is not known. Please try again.
+						<fmt:message key="error.login"/>
 					</span>
 				<%}%>
 				<table width="150" height="87" border="0" align="center" cellpadding="0" cellspacing="0">
 					<tr>
 						<td align="left" class="smallText">
-							Username
+							<fmt:message key="label.username"/>
 						</td>
 						<td colspan="2" align="right">
 							<input name="j_username" type="text" class="textField" size="15" />
 						</td>
 					</tr>
-					<tr>
+					<tr>	
 						<td align="left" class="smallText">
-							Password
+							<fmt:message key="label.password"/>
 						</td>
 						<td colspan="2" align="right">
 							<input name="j_password" type="password" class="textField" size="15" AUTOCOMPLETE="off"/>
 						</td>
 					</tr>
 					<tr>
 						<td colspan="3" align="right">
-							<input type="submit" value="Login" class="button" onmouseover="changeStyle(this,'buttonover')" onmouseout="changeStyle(this,'button')" />
+							<input type="submit" value="<fmt:message key="button.login"/>" class="button" onmouseover="changeStyle(this,'buttonover')" onmouseout="changeStyle(this,'button')" />
 						</td>
 					</tr>
 					<tr>
@@ -69,17 +71,11 @@
 	</tr>
 	<tr valign="bottom" class="lightNote">
 		<td>
-			<a href="javascript:alert('LAMS&#8482; &copy; 2002-2005 LAMS Foundation. 
-				\nAll rights reserved.
-				\n\nLAMS is a trademark of LAMS Foundation.
-				\nDistribution of this software is prohibited.');" class="lightNoteLink">&copy; 2002-2005 LAMS Foundation.
+			<a href="javascript:alert('<fmt:message key="msg.LAMS.copyright.long"/>');" class="lightNoteLink">&copy; <fmt:message key="msg.LAMS.copyright.short"/>
 			</a>
 		</td>
-		<td align="center">
-			This copy of LAMS&#8482; is authorised for use by the registered users only.
-		</td>
 		<td align="right"> 
-			Version 2.0
+			<fmt:message key="msg.LAMS.version"/>
 		</td>
 	</tr>
 </table>
Index: lams_central/web/monitorLesson.jsp
===================================================================
diff -u -r440554bb4a9a414c6e3e676a93de72de3298951c -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/monitorLesson.jsp	(.../monitorLesson.jsp)	(revision 440554bb4a9a414c6e3e676a93de72de3298951c)
+++ lams_central/web/monitorLesson.jsp	(.../monitorLesson.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,15 +1,18 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
-<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-core" prefix="c" %>
 
 <HTML>
 <HEAD>
-<META HTTP-EQUIV="Refresh" CONTENT="0;URL=monitoring/monitorLesson.jsp?lessonID=<c:out value="${lessonID}"/>"/>
-
-<TITLE>Learner:: LAMS</TITLE>
+	<META HTTP-EQUIV="Refresh" CONTENT="0;URL=monitoring/monitorLesson.jsp?lessonID=<c:out value="${lessonID}"/>"/>
+	<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<TITLE><fmt:message key="title.monitor.lesson.window"/></TITLE>
+	<lams:css/>
 </HEAD>
-<BODY bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 
-<p>Loading Learner Environment.</p>
-
+<BODY>
+<p><fmt:message key="msg.loading.monitor.lesson.window"/></p>
 </BODY>
+	
 </HTML>
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u -rccd319d5814f7182b441e35cd615aa162fef83fb -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision ccd319d5814f7182b441e35cd615aa162fef83fb)
+++ lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,17 +1,18 @@
 <%@page import="org.lamsfoundation.lams.web.PasswordChangeActionForm" %>
 <%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-bean" prefix="bean" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <html:form action="/passwordChanged" method="post">
 <table width="100%" height="177" border="0" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF">
 	<tr> 
 		<td valign="top">
-			<H2> Change Password </H2>
+			<H2><fmt:message key="title.password.change.screen"/></H2>
 			<p><html:errors/></p>
 			<table>
 				<tr>
 					<td class="body" align="right">
-						Username:
+						<fmt:message key="label.username"/>
 					</td>
 					<td class="body" align="left">
 						<html:hidden name="<%=PasswordChangeActionForm.formName%>" property="login"/>
@@ -20,30 +21,31 @@
 				</tr>
 				<tr>
 					<td class="body" align="right">
-						Old Password:
+						<fmt:message key="label.password.old.password"/>
 					</td>
 					<td class="body" align="left">
 						<html:password name="<%=PasswordChangeActionForm.formName%>" property="oldPassword" size="50" maxlength="50"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="body" align="right">
-						Password:
+						<fmt:message key="label.password.new.password"/>
 					</td>
 					<td class="body" align="left">
 						<html:password name="<%=PasswordChangeActionForm.formName%>" property="password" size="50" maxlength="50"/>
 					</td>
 				</tr>
 				<tr>
 					<td class="body" align="right">
-						Confirm Password:
+						<fmt:message key="label.password.confirm.new.password"/>
 					</td>
 					<td class="body" align="left">
 						<html:password name="<%=PasswordChangeActionForm.formName%>" property="passwordConfirm" size="50" maxlength="50"/>
 					</td>
 				</tr>
 			</table>
-			<p> <html:submit>Save</html:submit> &nbsp; 	<html:cancel>Cancel</html:cancel></p>
+			<p> <html:submit><fmt:message key="button.save"/></html:submit> &nbsp; 	
+				<html:cancel><fmt:message key="button.cancel"/></html:cancel></p>
 		</td>
 	</tr>
 </table>
Index: lams_central/web/passwordChangeOkContent.jsp
===================================================================
diff -u -r25ac272ffb5be9e7f0c2b97201de33727a617750 -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/passwordChangeOkContent.jsp	(.../passwordChangeOkContent.jsp)	(revision 25ac272ffb5be9e7f0c2b97201de33727a617750)
+++ lams_central/web/passwordChangeOkContent.jsp	(.../passwordChangeOkContent.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,13 +1,9 @@
-<html>
-	
-<head>
-	<link rel="stylesheet" type="text/css" href="css/aqua.css"/> 
-</head>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <table width="100%" height="177" border="0" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF">
 	<tr> 
 		<td valign="top">
-			<p class=body>Your password has been changed.</p>
+			<p class=body><fmt:message key="msg.password.changed"/></p>
 			<p class=body>	
 				<input name="Ok" type="button" class="button" id="Ok" 
 					onClick="javascript:document.location='passwordChangeOk.do';" 		
@@ -18,5 +14,3 @@
 		</td>
 	</tr>
 </table>
-
-</html>
\ No newline at end of file
Index: lams_central/web/sysadmin.jsp
===================================================================
diff -u -r62ffc2985a40f544eb48a69f2ad7f124b19a43fa -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision 62ffc2985a40f544eb48a69f2ad7f124b19a43fa)
+++ lams_central/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,14 +1,17 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <HTML>
 <HEAD>
-<META HTTP-EQUIV="Refresh" CONTENT="0;URL=admin/sysadminstart.do">
-
-<TITLE>System Admin:: LAMS</TITLE>
+	<META HTTP-EQUIV="Refresh" CONTENT="0;URL=admin/sysadminstart.do">
+	<META http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<TITLE><fmt:message key="title.system.admin.window"/></TITLE>
+	<lams:css/>
 </HEAD>
-<BODY bgcolor="#FFFFFF" leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
 
-<p>Loading System Administration Environment.</p>
-
+<BODY>
+<p><fmt:message key="msg.loading.system.admin.window"/></p>
 </BODY>
+	
 </HTML>
Index: lams_central/web/template.jsp
===================================================================
diff -u -r491ceec16e796f10b488f487e6698a87ef4f2c4a -r7a1f51f64555f4cd94274847196373c7f9f549f0
--- lams_central/web/template.jsp	(.../template.jsp)	(revision 491ceec16e796f10b488f487e6698a87ef4f2c4a)
+++ lams_central/web/template.jsp	(.../template.jsp)	(revision 7a1f51f64555f4cd94274847196373c7f9f549f0)
@@ -1,14 +1,16 @@
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
 
 <%@ taglib uri="tags-tiles" prefix="tiles" %>
 <%@ taglib uri="tags-html" prefix="html" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html:html locale = "true">
 <head>
 	<html:base/>
-	<title><tiles:getAsString name="title"/></title>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title><fmt:message><tiles:getAsString name="titleKey"/></fmt:message></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta http-equiv="pragma" content="no-cache">
 	<meta http-equiv="cache-control" content="no-cache">
 	<lams:css/>
@@ -24,7 +26,6 @@
 <table width="95%" height="95%" border="0" cellspacing="0" cellpadding="0" align="center">
 	<tr>
 		<td>
-	        <c:set var="pageHeader" scope="session"><tiles:getAsString name="pageHeader"/></c:set>
 			<tiles:insert attribute="header" />
 		</td>
 	</tr>