Index: lams_admin/build.xml
===================================================================
diff -u -r095d84cd64c174e6d15280be776375a2d1eb56f6 -r3fe021104934c6fcc41a99e6f64f67e91362378e
--- lams_admin/build.xml	(.../build.xml)	(revision 095d84cd64c174e6d15280be776375a2d1eb56f6)
+++ lams_admin/build.xml	(.../build.xml)	(revision 3fe021104934c6fcc41a99e6f64f67e91362378e)
@@ -127,6 +127,12 @@
 				<!--<fileset dir="${conf.hibernate.mapping.dir}"/>-->
 				<fileset dir="${build.web}"/>
 			</jar>
+			<copy overwrite="yes" todir="${build.lib}/language/org/lamsfoundation/lams/admin">
+				<fileset dir="${conf.language.dir}">
+					<include name="**/*.properties"/>
+					<include name="**/*.txt"/>
+				</fileset>
+			</copy>
 		</target>
 	
 	   <!-- =================================================================== -->
Index: lams_admin/conf/language/applicationResources.properties
===================================================================
diff -u
--- lams_admin/conf/language/applicationResources.properties	(revision 0)
+++ lams_admin/conf/language/applicationResources.properties	(revision 3fe021104934c6fcc41a99e6f64f67e91362378e)
@@ -0,0 +1,29 @@
+# CVS ID: $Id$
+# Language strings for the Admin classes and screens.
+
+#=========================List jobs in Quartz===========================#
+title.job.list = Jobs
+lable.job.name= Job name
+lable.job.start.date=Job start date
+lable.job.description=Job description
+
+#=========================Error Messages===========================#
+error.authorisation=You are not authorised to do this. 
+error.newpassword.mismatch=Your new passwords don't match each other.
+error.oldpassword.mismatch=Your old password is not correct.
+
+#===================== Main Sysadmin Screen ======================#
+sysadmin.manage.config.file=Manage Configuration File
+sysadmin.batch.heading=Batch Tasks
+sysadmin.batch.description=These need to be converted to batch jobs, able to be run from cron.
+sysadmin.batch.temp.file.delete=Delete old temporary files
+sysadmin.batch.preview.delete=Delete old Preview lessons
+
+#===================== Cache Screen ==============================#
+cache.title=Cache Management
+cache.entries.title=Cache Nodes
+cache.explanation1=Listed below are the current nodes in the cache. This keeps certain common objects in memory to speed up LAMS. It is managed automatically and should not require any intervention. However, if the system appears to be keeping "old values" e.g. an old first name, try clearing all the nodes in the cache. Once cleared, LAMS will reload the objects from the database. 
+cache.explanation2=Warning: Removing nodes will reduce the performance of the LAMS server. After a while, the cache will build up again and LAMS will run as usual.   
+cache.explanation3=Warning: If you remove a node, you will remove the node and all its child nodes. 
+cache.button.remove=Remove
+
Fisheye: Tag 3fe021104934c6fcc41a99e6f64f67e91362378e refers to a dead (removed) revision in file `lams_admin/src/java/org/lamsfoundation/lams/admin/applicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/build.xml
===================================================================
diff -u -r964a17daf6fb92158a417c62f42ac1bb9221e132 -r3fe021104934c6fcc41a99e6f64f67e91362378e
--- lams_build/build.xml	(.../build.xml)	(revision 964a17daf6fb92158a417c62f42ac1bb9221e132)
+++ lams_build/build.xml	(.../build.xml)	(revision 3fe021104934c6fcc41a99e6f64f67e91362378e)
@@ -57,7 +57,7 @@
 		<ant antfile="../${lams_admin}/build.xml" target="build-war" inheritAll="false"/>
 	</target>
 
-	<!-- build sub-projects -->
+	<!-- build tool deployment utility -->
 	<target name="build-tool-deploy-utility"
 		description="builds the tool deploy utility and copy to lams_build">
 
@@ -128,27 +128,37 @@
 					<include name="wddx/*.jar" />
 					<include name="concurrent/*.jar" />					
 				</patternset>
-			</fileset>
+			</fileset> 
 			<fileset dir="..">
-				<include name="${lams.jar}" />
-				<include name="${lams-contentrepository.jar}" />
-				<include name="${lams-central.war}" />
-				<include name="${lams-central.jar}" />
-				<include name="${lams-monitoring.jar}"/>
-				<include name="${lams-monitoring.war}"/>
-				<include name="${lams-learning.jar}"/>
-				<include name="${lams-learning.war}"/>
-				<include name="${lams-admin.jar}"/>
-				<include name="${lams-admin.war}"/>
+				<include name="${lams_common}/${sub.build.lib}/*.jar" />
+				<include name="${lams_contentrepository}/${sub.build.lib}/*.jar" />
+				<include name="${lams_central}/${sub.build.lib}/*.war" />
+				<include name="${lams_central}/${sub.build.lib}/*.jar" />
+				<include name="${lams_monitoring}/${sub.build.lib}/*.jar"/>
+				<include name="${lams_monitoring}/${sub.build.lib}/*.war"/>
+				<include name="${lams_learning}/${sub.build.lib}/*.jar"/>
+				<include name="${lams_learning}/${sub.build.lib}/*.war"/>
+				<include name="${lams_admin}/${sub.build.lib}/*.jar"/>
+				<include name="${lams_admin}/${sub.build.lib}/*.war"/>
 			</fileset>
+		</copy> 
+		<!-- Pull out all the language files -->
+		<mkdir dir="${assembly}/temp/lams-dictionary.jar" />
+		<copy todir="${assembly}/temp/lams-dictionary.jar" failonerror="true">
+			<fileset dir="../${lams_common}/${sub.build.language}"><include name="**" /></fileset>
+			<fileset dir="../${lams_contentrepository}/${sub.build.language}"><include name="**" /></fileset> 
+			<fileset dir="../${lams_central}/${sub.build.language}"><include name="**" /></fileset>
+			<fileset dir="../${lams_monitoring}/${sub.build.language}"><include name="**" /></fileset>
+			<fileset dir="../${lams_learning}/${sub.build.language}"><include name="**" /></fileset>
+			<fileset dir="../${lams_admin}/${sub.build.language}"><include name="**" /></fileset>
 		</copy>
 		<!-- create a temporary ear -->
 		<ear destfile="${assembly.temp.ear}" compress="false"
 			appxml="${app.xml}">
-			<fileset dir="${assembly}/temp" includes="*" />
+			<fileset dir="${assembly}/temp" includes="**" />
 		</ear>
 		<!-- remove temp lib -->
-		<delete dir="${assembly}/temp" includeEmptyDirs="true" />
+<!--		<delete dir="${assembly}/temp" includeEmptyDirs="true" /> -->
 		<!-- explode the ear (Why doesn't the EAR task support exploded format?) -->
 		<unjar src="${assembly.temp.ear}" dest="${assembly.lams.ear}" />
 		<!-- delete temp.ear -->
Index: lams_build/common.properties
===================================================================
diff -u -r96dc11437eb601c72326f54d168a6ecf1b13da04 -r3fe021104934c6fcc41a99e6f64f67e91362378e
--- lams_build/common.properties	(.../common.properties)	(revision 96dc11437eb601c72326f54d168a6ecf1b13da04)
+++ lams_build/common.properties	(.../common.properties)	(revision 3fe021104934c6fcc41a99e6f64f67e91362378e)
@@ -41,6 +41,8 @@
 conf.web.dir=${basedir}/web
 conf.webinf.dir=${conf.web.dir}/WEB-INF
 conf.struts.dir=${conf.webinf.dir}/struts
+##Language Files
+conf.language.dir=${conf.dir}/language
 
 # Build directory
 build=${basedir}/build
Index: lams_build/shared.properties
===================================================================
diff -u -r3e6658179df2b38fb9b524b65c71d4dd36c3bf36 -r3fe021104934c6fcc41a99e6f64f67e91362378e
--- lams_build/shared.properties	(.../shared.properties)	(revision 3e6658179df2b38fb9b524b65c71d4dd36c3bf36)
+++ lams_build/shared.properties	(.../shared.properties)	(revision 3fe021104934c6fcc41a99e6f64f67e91362378e)
@@ -33,17 +33,8 @@
 lams_central=lams_central
 lams_contentrepository=lams_contentrepository
 lams_tool_deploy=lams_tool_deploy
-sub.build=build/lib
-lams.jar=${lams_common}/${sub.build}/lams.jar
-lams-admin.jar=${lams_admin}/${sub.build}/lams-admin.jar
-lams-admin.war=${lams_admin}/${sub.build}/lams-admin.war
-lams-learning.jar=${lams_learning}/${sub.build}/lams-learning.jar
-lams-learning.war=${lams_learning}/${sub.build}/lams-learning.war
-lams-monitoring.jar=${lams_monitoring}/${sub.build}/lams-monitoring.jar
-lams-monitoring.war=${lams_monitoring}/${sub.build}/lams-monitoring.war
-lams-central.war=${lams_central}/${sub.build}/lams-central.war
-lams-central.jar=${lams_central}/${sub.build}/lams-central.jar
-lams-contentrepository.jar=${lams_contentrepository}/${sub.build}/lams-contentrepository.jar
+sub.build.lib=build/lib
+sub.build.language=build/lib/language
 
 # Known tools
 tool_forum_dir=lams_tool_forum
Index: lams_central/build.xml
===================================================================
diff -u -r095d84cd64c174e6d15280be776375a2d1eb56f6 -r3fe021104934c6fcc41a99e6f64f67e91362378e
--- lams_central/build.xml	(.../build.xml)	(revision 095d84cd64c174e6d15280be776375a2d1eb56f6)
+++ lams_central/build.xml	(.../build.xml)	(revision 3fe021104934c6fcc41a99e6f64f67e91362378e)
@@ -171,6 +171,12 @@
 			<fileset dir="${build.classes.java}"/>
 			<fileset dir="${build.classes.test}"/>
 		</jar>
+		<copy overwrite="yes" todir="${build.lib}/language/org/lamsfoundation/lams/central">
+			<fileset dir="${conf.language.dir}">
+				<include name="**/*.properties"/>
+				<include name="**/*.txt"/>
+			</fileset>
+		</copy>
 	</target>
 	<!-- =================================================================== -->
 	<!-- Run JUnit Tests                                                     -->