Index: lams_common/build.xml
===================================================================
diff -u -r6c47778062c2409dafd81f71c8dfdb8b63945a4a -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_common/build.xml	(.../build.xml)	(revision 6c47778062c2409dafd81f71c8dfdb8b63945a4a)
+++ lams_common/build.xml	(.../build.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -222,6 +222,12 @@
 				<include name="org/lamsfoundation/lams/web/session/*"/>
 			</fileset>
 		</jar>
+		<copy overwrite="yes" todir="${build.lib}/language/org/lamsfoundation/lams">
+			<fileset dir="${conf.language.dir}">
+				<include name="**/*.properties"/>
+				<include name="**/*.txt"/>
+			</fileset>
+		</copy>
 	</target>
 	<!-- ================================================================ -->
 	<!-- copy jar archive of org.lamsfoundation.lams.web.session.* for   -->
Index: lams_common/conf/language/applicationResources.properties
===================================================================
diff -u
--- lams_common/conf/language/applicationResources.properties	(revision 0)
+++ lams_common/conf/language/applicationResources.properties	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -0,0 +1,30 @@
+# Resources for parameter 'org.lamsfoundation.lams.applicationResources'
+
+#====================================================================#
+#=========================Common labels===========================#
+#====================================================================#
+
+#=========================Error Messages===========================#
+
+# Validation messages 
+
+validation.error.other=Other Error
+validation.error.transitionNoActivityBeforeOrAfter=A Transition must have an activity before or after the transition
+validation.error.activityWithNoTransition=An activity must have an input or output transition
+validation.error.inputTransitionType1=There is more than one activity with no input transition
+validation.error.inputTransitionType2=No activities are missing their input transition.
+validation.error.outputTransitionType1=There is more than one activity with no output transition
+validation.error.outputTransitionType2=No activities are missing their output transition.
+validation.error.GroupingRequired=Grouping is required
+validation.error.GroupingNotRequired=Grouping is not supported
+validation.error.GroupingSelected=Grouping is selected but does not exist
+validation.error.OptionalActivity=An Optional Activity must have one or more activities
+validation.error.OptionalActivityOrderId=This Optional Activity has invalid order ids
+validation.error.illegalScheduleGateOffsetsType1=A Schedule Gate cannot have equal start and end time offsets.
+validation.error.illegalScheduleGateOffsetsType2=A Schedule Gate cannot have the start time offset greater than end time offset
+
+# Theme Service messages
+theme.service.setTheme.saved=User theme saved.
+theme.service.setTheme.type.invalid=Invalid theme type.
+theme.service.setTheme.noSuchTheme=No such theme exists.
+theme.service.setTheme.noSuchUser=No such User exists.
\ No newline at end of file
Fisheye: Tag 1c31dbd6b844bffd77d86babab9592e8267cc462 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/applicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_contentrepository/build.xml
===================================================================
diff -u -r095d84cd64c174e6d15280be776375a2d1eb56f6 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_contentrepository/build.xml	(.../build.xml)	(revision 095d84cd64c174e6d15280be776375a2d1eb56f6)
+++ lams_contentrepository/build.xml	(.../build.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -219,6 +219,12 @@
 			<fileset dir="${hbm}">
 			</fileset>
 		</jar>
+		<copy overwrite="yes" todir="${build.lib}/language/${package.contentrepository}">
+			<fileset dir="${conf.language.dir}">
+				<include name="**/*.properties"/>
+				<include name="**/*.txt"/>
+			</fileset>
+		</copy>
 	</target>
 
 	<!-- = = = = = = = = = = = = = = = = = = = = = = = =  -->
Index: lams_contentrepository/conf/language/applicationResources.properties
===================================================================
diff -u
--- lams_contentrepository/conf/language/applicationResources.properties	(revision 0)
+++ lams_contentrepository/conf/language/applicationResources.properties	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -0,0 +1,13 @@
+# CVS ID: $Id$
+# Language strings for the Admin classes and screens.
+
+# Used for the demo pages - not used for the standard LAMS application.
+errors.mandatory={0} must not be empty.
+errors.filedirmandatory=Either a file must be uploaded or a directory selected.
+error.login=Unable to login to repository. Error: {0}.
+error.noTicket=The ticket is missing from the session. Unable to access the repository.
+error.entryStringNeeded=The file that "starts" the content is required when there is a zip file to be unpacked.
+error.uuidMissing=No node has been selected.
+error.repositoryUnexpected=The repository has returned an unexpected value. {0}
+exception.repository=An error occured involving the repository. {0}
+
Fisheye: Tag 1c31dbd6b844bffd77d86babab9592e8267cc462 refers to a dead (removed) revision in file `lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/struts/ApplicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_example/build.xml
===================================================================
diff -u -r59a6f58ab28a49b3c56e196050782286efe879ea -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_example/build.xml	(.../build.xml)	(revision 59a6f58ab28a49b3c56e196050782286efe879ea)
+++ lams_tool_example/build.xml	(.../build.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -96,11 +96,6 @@
 					<include name="*.properties"/>
 			</fileset>
 		</copy>
-		<copy overwrite="yes" todir="${build.classes.java}/${package}/web">
-			<fileset dir="${src.java.dir}/${package}/web">
-					<include name="*.properties"/>
-			</fileset>
-		</copy>
 	</target>
 
 	<target name="compile-test" depends="compile-java">
@@ -298,7 +293,7 @@
 				<mkdir dir="${build.deploy}"/>
 				<mkdir dir="${build.deploy}/lib"/> 
 				<mkdir dir="${build.deploy}/sql"/> 
-				<mkdir dir="${build.deploy}/lang"/> 
+				<mkdir dir="${build.deploy}/language"/>
 				 
 				<copy overwrite="yes" todir="${build.deploy}/sql">
 					<fileset dir="${db.scripts}/">
@@ -322,8 +317,8 @@
 					</fileset>
 				</copy>
 
-				<copy overwrite="yes" todir="${build.deploy}/lang">
-					<fileset dir="${conf.dir}/language">
+				<copy overwrite="yes" todir="${build.deploy}/language">
+					<fileset dir="${conf.language.dir}">
 						<include name="*.properties"/>
 					</fileset>
 				</copy>
@@ -342,18 +337,20 @@
 					dbDriverClass="com.mysql.jdbc.Driver"
 					deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar"
 					toolSignature="${signature}"
-					toolTablesScriptPath="${db.scripts}/create_lams_tool_example.sql"
-					toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_example.sql"
-					toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql"
-					toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql"
-					toolInsertScriptPath="${db.scripts}/tool_insert.sql"
+					toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_example.sql"
+					toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_example.sql"
+					toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql"
+					toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql"
+					toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql"
 					lamsEarPath="${jboss.deploy}"
 					toolContext="${toolContext}"
-					toolWebUri="${product}.war">
+					toolWebUri="${product}.war"
+					languageFilesPackage="org.lamsfoundation.lams.tool.example">
 
 					<!-- language files go as a fileset. Not nice but can't work out how to embed them in a tag. -->
-					<fileset dir="${conf.dir}/language/">
+					<fileset dir="${build.deploy}/language">
 						<include name="*.properties"/>
+						<include name="**/*.txt"/>
 					</fileset>
 						
 				</generateDeployProperties>
Index: lams_tool_example/conf/language/ApplicationResources.properties
===================================================================
diff -u -rf5b920fba520d9e1b985bfbc8060b9b3c7e18d0b -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_example/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f5b920fba520d9e1b985bfbc8060b9b3c7e18d0b)
+++ lams_tool_example/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -1,14 +1,13 @@
-# $Id$
+# CVS ID: $Id$
+# Language strings for the Example tool.
 
-# Australian English language file for the example tool.
-
 # ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
-tool.display.name=Example
-tool.description=Example Tool
+activity.title=Example
+activity.description=Example Library Activity
+activity.helptext=Example activity to help you start writing your own tool.
 
-activity.display.name=Example
-activity.description=Example Tool
-activity.helptext=This is an example tool to help you start writing your own tool.
+tool.display.name=Example Tool
+tool.description=Example tool to help you start writing your own tool.
 
 # ========== Authoring Page =========== 
 
Index: lams_tool_example/db/sql/activity_insert.sql
===================================================================
diff -u -r20cec9981645fa322ca6c398af8892b541dd4c7c -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_example/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision 20cec9981645fa322ca6c398af8892b541dd4c7c)
+++ lams_tool_example/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -76,5 +76,5 @@
 , NULL
 , NULL
 , NULL
-, 'org.lamsfoundation.lams.tool.example.web.ApplicationResources'
+, 'org.lamsfoundation.lams.tool.example.ApplicationResources'
 )
Index: lams_tool_example/db/sql/tool_insert.sql
===================================================================
diff -u -r20cec9981645fa322ca6c398af8892b541dd4c7c -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_example/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 20cec9981645fa322ca6c398af8892b541dd4c7c)
+++ lams_tool_example/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -49,6 +49,6 @@
 'tool/laex11/exportPortfolio?mode=teacher',
 'tool/laex11/contribute.do',
 'tool/laex11/moderate.do',
-'org.lamsfoundation.lams.tool.example.web.ApplicationResources',
+'org.lamsfoundation.lams.tool.example.ApplicationResources',
 NOW()
 )
Index: lams_tool_example/web/WEB-INF/web.xml
===================================================================
diff -u -r59a6f58ab28a49b3c56e196050782286efe879ea -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_example/web/WEB-INF/web.xml	(.../web.xml)	(revision 59a6f58ab28a49b3c56e196050782286efe879ea)
+++ lams_tool_example/web/WEB-INF/web.xml	(.../web.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
- <context-param>
+ <!-- $Id$ -->
+
+<context-param>
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
   	<param-value>org.lamsfoundation.lams.applicationResources</param-value>
 </context-param>
Index: lams_tool_forum/build.xml
===================================================================
diff -u -r095d84cd64c174e6d15280be776375a2d1eb56f6 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_forum/build.xml	(.../build.xml)	(revision 095d84cd64c174e6d15280be776375a2d1eb56f6)
+++ lams_tool_forum/build.xml	(.../build.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -303,6 +303,7 @@
 		<mkdir dir="${build.deploy}"/>
 		<mkdir dir="${build.deploy}/lib"/> 
 		<mkdir dir="${build.deploy}/sql"/> 
+		<mkdir dir="${build.deploy}/language"/>
 		 
 		<copy overwrite="yes" todir="${build.deploy}/sql">
 			<fileset dir="${db.scripts}/">
@@ -325,6 +326,13 @@
 				<include name="*.jar"/>
 			</fileset>
 		</copy>
+		
+		<copy overwrite="yes" todir="${build.deploy}/language">
+			<fileset dir="${conf.language.dir}">
+				<include name="*.properties"/>
+				<include name="*.txt"/>
+			</fileset>
+		</copy>		
 
 		<taskdef name="generateDeployProperties" 
 			classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
@@ -348,7 +356,16 @@
 			lamsEarPath="${jboss.deploy}"
 			toolContext="${toolContext}"
 			toolWebUri="${product}.war"
-			/>
+			languageFilesPackage="org.lamsfoundation.lams.tool.forum">
+
+			<!-- language files go as a fileset. Not nice but can't work out how to embed them in a tag. -->
+			<fileset dir="${build.deploy}/language">
+				<include name="**/*.properties"/>
+				<include name="**/*.txt"/>
+			</fileset>
+				
+		</generateDeployProperties>
+		
 	</target>
 
 	<target name="deploy-tool" depends="create-deploy-package" 
Index: lams_tool_forum/conf/language/ApplicationResources.properties
===================================================================
diff -u
--- lams_tool_forum/conf/language/ApplicationResources.properties	(revision 0)
+++ lams_tool_forum/conf/language/ApplicationResources.properties	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -0,0 +1,174 @@
+# CVS ID: $Id$ #
+# Language strings for the Forum tool.
+# ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
+activity.title=Forum
+activity.description=Online threaded discussion tool (asynchronous).
+activity.helptext=Discussion tool useful for long running collaborations and situations where learners are not all on line at the same time.
+
+tool.display.name=Forum Tool
+tool.description=Tool for forums, also known as message boards.
+
+#=========================labels===========================#
+#-------------------------Authoring Labels-----------------#
+label.authoring.heading.basic=Forum
+label.authoring.heading.basic.desc=Basic input information for forum
+label.authoring.heading.instructions.desc=Please input online and offline instructions
+label.authoring.heading.advance.desc=Please input advance options for Forum 
+label.authoring.create.new.topic=Create a new topic
+
+label.authoring.basic.title=Title
+label.authoring.basic.instruction=Instruction
+label.authoring.online.instruction =Online Instructions
+label.authoring.offline.instruction=Offline Instructions
+label.authoring.online.file =Upload online file
+label.authoring.offline.file=Upload offline file
+label.authoring.advance.lock.on.finished=Lock on finished
+
+label.authoring.save.button=Save
+label.authoring.cancel.button=Cancel
+label.authoring.choosefile.button=Choose file
+label.authoring.upload.online.button=Upload Online
+label.authoring.upload.offline.button=Upload Offline
+label.authoring.online.filelist=Online file list
+label.authoring.offline.filelist=Offline file list
+label.authoring.online.delete=Delete
+label.authoring.offline.delete=Delete
+label.authoring.advance.allow.edit=Allow Edit
+label.authoring.advance.use.richeditor=Allow Rich Editor
+label.authoring.advance.limited.input=Limitation of input characters
+
+lable.topic.title.subject=Subject
+lable.topic.title.body=Body
+lable.topic.title.update=Last post
+lable.topic.title.author=Author
+lable.topic.title.startedby=Start by
+lable.topic.title.replies=Replies
+lable.topic.title.mark=Mark
+lable.topic.subject.by=By
+label.back.to.forum=Go back to froum
+lable.topic.title.message.number=# of Msg
+lable.topic.title.average.mark= Aver mark
+authoring.exception= There is a problem in forum authoring page, the reason is {0}
+#-------------------------END Authoring Labels END-----------------#
+
+#---------------------------------Monitoring ----------------------------------#
+page.title.monitoring.content.userlist=Summary
+page.title.monitoring.view.user.mark=View user mark
+page.title.monitoring.edit.user.mark=Edit user mark
+page.title.monitoring.view.activity=View Activity
+page.title.monitoring.edit.activity=Edit Activity
+page.title.monitoring.view.instructions=View Instructions
+page.title.monitoring.view.topic=View topic
+page.title.monitoring.statistic=Statistic
+page.title.monitoring.definelater=Forum Tool Define
+
+label.monitoring.edit.activity.cancel=Cancel
+label.monitoring.edit.activity.update=Update
+label.monitoring.edit.activity.edit=Edit
+
+label.monitoring.statistic.average.mark= Average message mark
+lable.monitoring.statistic.total.message=# of total message
+
+message.monitoring.edit.activity.not.editable=This Activity is no longer editable
+#------------------------------End Monitoring ----------------------------------#
+
+## errors
+errors.header=<b class="error">
+errors.footer=</b>
+
+#error.title = System Error!
+error.valueReqd = Value Required
+error.inputFileTooLarge = Input File size is too large!
+error.uploading = error uploading
+error.mark.needNumber= Mark must be int value
+error.mark.invalid.number= Mark is invalid number format
+error.fail.get.forum=No Forum available
+error.title.empty=Title can not be blank
+#General Messages
+message.msg.maxFileSize = Max 250K
+
+##Message
+title.messageTopic.open = Topic Details
+
+title.message.add = Add Message
+title.message.open = View Message
+title.message.reply = Reply Message
+title.message.edit = Edit Message
+title.message.view=Message Board
+title.message.view.topic=View Message
+title.message.delete=Delete Message
+
+message.label.subject = Subject
+message.label.body = Body
+message.label.attachment = Attachment
+message.label.postedOn = Posted On:
+message.label.threadReplies  = Thread Replies
+message.link.reply = Reply
+
+##Labels
+label.open = Open
+label.delete = Delete
+label.download = Download 
+label.view = View
+label.edit = Edit
+label.reply = Reply
+label.done = Done
+label.finish= Finish
+label.newtopic= New Topic
+label.refresh= Refresh
+lable.char.left=Characters left
+label.basic=Basic
+label.advanced=Advanced
+label.instructions=Instructions
+##Buttons
+button.upload = Upload
+button.done = Done
+button.submit = Submit
+button.on = On
+button.off = Off
+button.add = Add
+button.cancel = Cancel
+
+js.error.invalid.number=The input is invalid number format 
+js.error.min.number=The input must be greater than 0 
+js.error.title=The following error(s) occurred:
+
+#not list in spanish yet
+monitoring.tab.summary=Summary
+monitoring.tab.instructions=Instruction
+monitoring.tab.edit.activity=Edit Activity
+
+monitoring.user.post.topic=provides following posts:
+lable.topic.title.comment=Comment
+message.not.avaliable=Not Available
+lable.update.mark=Update mark
+message.assign.mark= Please assign a mark and a comment for the report by 
+message.session.name=Session Name
+message.monitoring.summary.no.users=No users available
+message.view.all.marks=View all marks
+message.download.marks=Download marks
+label.monitoring.summary.view.forum= View forum
+
+#new messages 6/3/06
+message.monitoring.summary.no.session=No Session Available
+
+#new messages 7/3/06
+topic.message.subject.hidden=Message subject hidden
+topic.message.body.hidden=Message body hidden
+label.show=Show
+label.hide=Hide
+
+#new messages 10/3/06
+page.title.monitoring.init=Forum Monitoring
+monitoring.tab.statistics=Statistics
+# NB monitoring.tab.edit.statistics was removed 
+label.save=Save
+label.cancel=Cancel
+
+#new messages 16/3/06
+authoring.tab.basic=Basic
+authoring.tab.advanced=Advanced
+authoring.tab.instructions=Instructions
+
+#new messages 17/03/06
+page.title.authoring.init=Forum Authoring
Index: lams_tool_forum/conf/language/ApplicationResources_es_AR.properties
===================================================================
diff -u
--- lams_tool_forum/conf/language/ApplicationResources_es_AR.properties	(revision 0)
+++ lams_tool_forum/conf/language/ApplicationResources_es_AR.properties	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -0,0 +1,126 @@
+# CVS ID: $Id$ #
+# Language strings for the Forum tool.
+
+# ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
+activity.title=Foro
+activity.description=Online threaded discussion tool (asynchronous).
+activity.helptext=Discussion tool useful for long running collaborations and situations where learners are not all on line at the same time.
+
+tool.display.name=Herramienta Del Foro
+tool.description=Tool for forums, also known as message boards.
+
+#=========================labels===========================#
+#-------------------------Authoring Labels-----------------#
+label.authoring.heading.basic.desc=Basic input information for forum
+label.authoring.heading.instructions.desc=Ingrese instrucciones para modos online y offline
+label.authoring.heading.advance.desc=Ingrese instrucciones avanzadas para Foro
+label.authoring.create.new.topic=Crear un nuevo hilo de discussi\u00f3n 
+
+label.authoring.basic.title=T\u00edtulo
+label.authoring.basic.instruction=Instrucciones
+label.authoring.online.instruction =Instrucciones para modo Online
+label.authoring.offline.instruction=Instrucciones para modo Offline
+label.authoring.online.file =Subir instrucciones como archivo (online)
+label.authoring.offline.file=Subir instrucciones como archivo (offline)
+label.authoring.advance.lock.on.finished=Cuando terminado, bloquear foro
+
+label.authoring.save.button=Salvar
+label.authoring.cancel.button=Cancelar
+label.authoring.choosefile.button=Elegir archivo
+label.authoring.upload.online.button=Subir Archivo Online
+label.authoring.upload.offline.button=Subir Archivo Offline
+label.authoring.online.filelist=Lista de Archivos Online
+label.authoring.offline.filelist=List de Archivos Offline
+label.authoring.online.delete=Borrar
+label.authoring.offline.delete=Borrar
+label.authoring.advance.allow.edit=Permitir Edici\u00f3n
+label.authoring.advance.use.richeditor=Utilizar Editor HTML
+label.authoring.advance.limited.input=Limite de n\u00famero de caracteres
+
+lable.topic.title.subject=Asunto
+lable.topic.title.body=Mensaje
+lable.topic.title.update=\u00daltimo mensaje
+lable.topic.title.author=Autor
+lable.topic.title.startedby=Empezar en
+lable.topic.title.replies=Respuestas
+lable.topic.title.mark=Nota de Evaluaci\u00f3n
+lable.topic.subject.by=De
+label.back.to.forum=Volver al Foro
+label.monitoring.edit.activity.cancel=Cancelar
+label.monitoring.edit.activity.update=Update
+label.monitoring.edit.activity.edit=Editar
+lable.topic.title.message.number=N\u00famero de Mensajes
+lable.topic.title.average.mark= Promedio Nota de Evaluaci\u00f3n
+label.monitoring.statistic.average.mark= Promedio de Evaluaci\u00f3n por mensaje
+lable.monitoring.statistic.total.message=N\u00famero total de Mensajes
+authoring.exception= Hay un problmea con la paguina de Foro, la raz\u00f3n es {0}
+#-------------------------END Authoring Labels END-----------------#
+page.title.monitoring.content.userlist=Monitoreo de lista de estudiantes
+page.title.monitoring.view.user.mark=Ver evaluaci\u00f3n de estudiante
+page.title.monitoring.edit.user.mark=Editr evaluaci\u00f3n de estudiante
+page.title.monitoring.view.activity=Ver Actividad
+page.title.monitoring.edit.activity=Editar Actividad
+page.title.monitoring.view.instructions=Ver Instrucciones
+page.title.monitoring.view.topic=Ver hilo
+page.title.monitoring.statistic=Estad\u00edsticas
+page.title.monitoring.definelater=Definir en Monitoreo
+## errors
+errors.header=<b class="error">
+errors.footer=</b>
+
+#error.title = System Error!
+error.valueReqd = Valor Requerido
+error.inputFileTooLarge = El tama\u00f1o de este archivo es demasiado grande!
+error.uploading = error al subir archivo
+error.mark.needNumber= La evaluaci\u00f3n tiene que ser valor entero
+error.mark.invalid.number= La evaluaci\u00f3n no es un valor entero
+error.fail.get.forum=Foro no disponible
+error.title.empty=El Asunto no puede omitirse
+#General Messages
+message.msg.maxFileSize = Maximo 250K
+
+##Message
+title.messageTopic.open = Detalles del hilo
+
+title.message.add = Agregar Mensaje
+title.message.open = Ver Mensaje
+title.message.reply = Responder Mensaje
+title.message.edit = Editar Mensaje
+title.message.view=Lista de Mensajes
+title.message.view.topic=Ver Mensaje
+title.message.delete=Borrar Mensaje
+
+message.label.subject = Asunto
+message.label.body = Mensaje
+message.label.attachment = Archivo Adjunto
+message.label.postedOn = Enviado el:
+message.label.threadReplies  = Hilo de respuestas
+message.link.reply = Responder
+
+##Labels
+label.open = Abrir
+label.delete = Borrar
+label.download = Bajar-Descargar 
+label.view = Ver
+label.edit = Editar
+label.reply = Responder
+label.done = Listo
+label.finish= Terminar
+label.newtopic= Nuevo Hilo
+label.refresh= Refrescar
+lable.char.left=Limite de caracteres
+label.basic=Contenido Basico
+label.advanced=Opciones Avanzadas
+label.instructions=Instrucciones
+##Buttons
+button.upload = Subir
+button.done = Fin
+button.submit = Enviar
+button.on = Si
+button.off = No
+button.add = Agregrar
+button.cancel = Cancelar
+
+js.error.invalid.number=Su ingreso no es un n\u00famero entero valido
+js.error.min.number=El n\u00famero ingresado tiene que ser mayor a 0
+js.error.title=Se han producido los siguientes errores:
Index: lams_tool_forum/conf/language/ApplicationResources_zh_CN.properties
===================================================================
diff -u
--- lams_tool_forum/conf/language/ApplicationResources_zh_CN.properties	(revision 0)
+++ lams_tool_forum/conf/language/ApplicationResources_zh_CN.properties	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -0,0 +1,142 @@
+# CVS ID: $Id$ #
+# Language strings for the Forum tool.
+
+# ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
+activity.title=Forum
+activity.description=Online threaded discussion tool (asynchronous).
+activity.helptext=Discussion tool useful for long running collaborations and situations where learners are not all on line at the same time.
+
+tool.display.name=Forum Tool
+tool.description=Tool for forums, also known as message boards.
+
+#=========================labels===========================#
+#-------------------------Authoring Labels-----------------#
+label.authoring.heading.basic.desc=\u57fa\u672c\u4fe1\u606f
+label.authoring.heading.instructions.desc=\u8bf7\u8f93\u5165\u5728\u7ebf\u548c\u8131\u673a\u6307\u5bfc
+label.authoring.heading.advance.desc=\u8bf7\u8f93\u5165\u9ad8\u7ea7\u9009\u9879
+label.authoring.create.new.topic=\u53d1\u6d88\u606f
+
+label.authoring.basic.title=\u6807\u9898
+label.authoring.basic.instruction=\u6307\u5bfc
+label.authoring.online.instruction =\u5728\u7ebf\u6307\u5bfc
+label.authoring.offline.instruction=\u8131\u673a\u6307\u5bfc
+label.authoring.online.file =\u4e0a\u4f20\u5728\u7ebf\u6307\u5bfc
+label.authoring.offline.file=\u4e0a\u4f20\u8131\u673a\u6307\u5bfc
+label.authoring.advance.lock.on.finished=\u5b8c\u6210\u540e\u9501\u5b9a
+
+label.authoring.save.button=\u4fdd\u5b58
+label.authoring.cancel.button=\u53d6\u6d88
+label.authoring.choosefile.button=\u9009\u62e9\u6587\u4ef6
+label.authoring.upload.online.button=\u4e0a\u4f20\u5728\u7ebf
+label.authoring.upload.offline.button=\u4e0a\u4f20\u8131\u673a
+label.authoring.online.filelist=\u5728\u7ebf\u6587\u4ef6\u5217\u8868
+label.authoring.offline.filelist=\u8131\u673a\u6587\u4ef6\u5217\u8868
+label.authoring.online.delete=\u5220\u9664
+label.authoring.offline.delete=\u8131\u673a
+label.authoring.advance.allow.edit=\u5bb9\u8bb8\u7f16\u8f91
+label.authoring.advance.use.richeditor=\u5bb9\u8bb8\u9ad8\u7ea7\u7f16\u8f91\u5668
+label.authoring.advance.limited.input=\u9650\u5236\u8f93\u5165\u5b57\u7b26
+
+lable.topic.title.subject=\u4e3b\u9898
+lable.topic.title.body=\u5185\u5bb9
+lable.topic.title.update=\u524d\u4e00\u4e2a\u6d88\u606f
+lable.topic.title.author=\u4f5c\u8005
+lable.topic.title.startedby=\u9996\u8d34\u4e8e
+lable.topic.title.replies=\u56de\u590d
+lable.topic.title.mark=\u6807\u6ce8
+lable.topic.subject.by=\u7531
+label.back.to.forum=\u8fd4\u56de\u8bba\u575b
+label.monitoring.edit.activity.cancel=\u53d6\u6d88
+label.monitoring.edit.activity.update=\u66f4\u65b0
+label.monitoring.edit.activity.edit=\u7f16\u8f91
+lable.topic.title.message.number=\u6d88\u606f# 
+lable.topic.title.average.mark= \u5e73\u5747\u5206
+label.monitoring.statistic.average.mark= \u6d88\u606f\u5e73\u5747\u5206
+lable.monitoring.statistic.total.message= \u603b\u6d88\u606f # 
+authoring.exception= \u5728\u7f16\u8f91\u9875\u53d1\u751f\u95ee\u9898,\u539f\u56e0\u662f{0}
+#-------------------------END Authoring Labels END-----------------#
+page.title.monitoring.content.userlist=\u76d1\u63a7\u7528\u6237\u5217\u8868
+page.title.monitoring.view.user.mark=\u67e5\u770b\u7528\u6237\u5206\u6570
+page.title.monitoring.edit.user.mark=\u7f16\u8f91\u7528\u6237\u5206\u6570
+page.title.monitoring.view.activity=\u67e5\u770b\u6d3b\u52a8
+page.title.monitoring.edit.activity=\u7f16\u8f91\u6d3b\u52a8
+page.title.monitoring.view.instructions=\u67e5\u770b\u6307\u5bfc
+page.title.monitoring.view.topic=\u67e5\u770b\u4e3b\u9898
+page.title.monitoring.statistic=\u7edf\u8ba1
+page.title.monitoring.definelater=\u8bba\u575b\u5de5\u5177\u5b9a\u4e49
+## errors
+errors.header=<b class="error">
+errors.footer=</b>
+
+#error.title = \u7cfb\u7edf\u51fa\u9519
+error.valueReqd = \u5fc5\u987b\u8f93\u5165\u503c
+error.inputFileTooLarge = \u8d85\u8fc7\u6587\u4ef6\u5927\u5c0f\u4e0a\u9650
+error.uploading = \u4e0a\u4f20\u51fa\u9519
+error.mark.needNumber= \u5206\u6570\u5fc5\u987b\u662f\u6574\u6570
+error.mark.invalid.number= \u5206\u6570\u662f\u65e0\u6548\u7684\u6570\u5b57\u683c\u5f0f
+error.fail.get.forum=\u6ca1\u6709\u53ef\u5229\u7528\u7684\u8bba\u575b
+error.title.empty=\u6807\u9898\u4e0d\u80fd\u4e3a\u7a7a
+#General Messages
+message.msg.maxFileSize = \u6700\u5927 250K
+
+##Message
+title.messageTopic.open = \u66f4\u591a
+
+title.message.add = \u53d1\u6d88\u606f
+title.message.open = \u67e5\u770b\u6d88\u606f
+title.message.reply = \u56de\u590d\u6d88\u606f
+title.message.edit = \u7f16\u8f91\u6d88\u606f
+title.message.view=\u6d88\u606f\u677f
+title.message.view.topic=\u67e5\u770b\u6d88\u606f
+title.message.delete=\u5220\u9664\u6d88\u606f
+
+message.label.subject = \u4e3b\u9898
+message.label.body = \u5185\u5bb9
+message.label.attachment = \u9644\u4ef6
+message.label.postedOn = \u53d1\u5e03:
+message.label.threadReplies  = \u6d88\u606f\u6811
+message.link.reply = \u56de\u590d
+
+##Labels
+label.open = \u6253\u5f00
+label.delete = \u5220\u9664
+label.download = \u4e0b\u8f7d
+label.view = \u67e5\u770b
+label.edit = \u7f16\u8f91
+label.reply = \u56de\u590d
+label.done = \u5b8c\u6210
+label.finish= \u5b8c\u6210
+label.newtopic= \u65b0\u6d88\u606f
+label.refresh= \u5237\u65b0
+lable.char.left=\u5269\u4f59\u5b57\u7b26
+label.basic=\u57fa\u672c
+label.advanced=\u9ad8\u7ea7
+label.instructions=\u6307\u5bfc
+##Buttons
+button.upload = \u4e0a\u4f20
+button.done = \u5b8c\u6210
+button.submit = \u63d0\u4ea4
+button.on = \u5728
+button.off = \u5173
+button.add = \u6dfb\u52a0
+button.cancel = \u53d6\u6d88
+
+js.error.invalid.number=\u8f93\u5165\u662f\u65e0\u6548\u7684\u6570\u5b57\u683c\u5f0f 
+js.error.min.number=\u8f93\u5165\u5fc5\u987b\u5927\u4e8e0
+js.error.title=\u6709\u4e0b\u5217\u9519\u8bef\u53d1\u751f\uff1a
+
+
+monitoring.tab.summary=\u603b\u8ba1
+monitoring.tab.instructions=\u6307\u5bfc
+monitoring.tab.edit.activity=\u7f16\u8f91\u6d3b\u52a8
+monitoring.tab.edit.statistics=\u7edf\u8ba1
+monitoring.user.post.topic=\u53d1\u5e03\u4e0b\u5217\u6d88\u606f:
+lable.topic.title.comment=\u8bc4\u8bba
+message.not.avaliable=\u4e0d\u53ef\u7528
+lable.update.mark=\u66f4\u65b0\u5206\u6570
+message.assign.mark= \u8bf7\u7ed9\u51fa\u5206\u6570\u548c\u8bc4\u8bba 
+message.session.name=\u4f1a\u8bdd\u540d
+message.monitoring.summary.no.users=\u6ca1\u6709\u53ef\u7528\u7528\u6237
+message.view.all.marks=\u67e5\u770b\u5168\u90e8\u5206\u6570
+message.download.marks=\u4e0b\u8f7d\u5206\u6570
+label.monitoring.summary.view.forum=\u67e5\u770b\u8bba\u575b
Index: lams_tool_forum/conf/language/chinese_zh.txt
===================================================================
diff -u
--- lams_tool_forum/conf/language/chinese_zh.txt	(revision 0)
+++ lams_tool_forum/conf/language/chinese_zh.txt	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -0,0 +1,142 @@
+# CVS ID: $Id: #
+# Language strings for the Forum tool.
+
+# ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
+activity.title=Forum
+activity.description=Online threaded discussion tool (asynchronous).
+activity.helptext=Discussion tool useful for long running collaborations and situations where learners are not all on line at the same time.
+
+tool.display.name=Forum Tool
+tool.description=Tool for forums, also known as message boards.
+
+#=========================labels===========================#
+#-------------------------Authoring Labels-----------------#
+label.authoring.heading.basic.desc=������Ϣ
+label.authoring.heading.instructions.desc=���������ߺ��ѻ�ָ��
+label.authoring.heading.advance.desc=������߼�ѡ��
+label.authoring.create.new.topic=����Ϣ
+
+label.authoring.basic.title=����
+label.authoring.basic.instruction=ָ��
+label.authoring.online.instruction =����ָ��
+label.authoring.offline.instruction=�ѻ�ָ��
+label.authoring.online.file =�ϴ�����ָ��
+label.authoring.offline.file=�ϴ��ѻ�ָ��
+label.authoring.advance.lock.on.finished=��ɺ�����
+
+label.authoring.save.button=����
+label.authoring.cancel.button=ȡ��
+label.authoring.choosefile.button=ѡ���ļ�
+label.authoring.upload.online.button=�ϴ�����
+label.authoring.upload.offline.button=�ϴ��ѻ�
+label.authoring.online.filelist=�����ļ��б�
+label.authoring.offline.filelist=�ѻ��ļ��б�
+label.authoring.online.delete=ɾ��
+label.authoring.offline.delete=�ѻ�
+label.authoring.advance.allow.edit=����༭
+label.authoring.advance.use.richeditor=����߼��༭��
+label.authoring.advance.limited.input=���������ַ�
+
+lable.topic.title.subject=����
+lable.topic.title.body=����
+lable.topic.title.update=ǰһ����Ϣ
+lable.topic.title.author=����
+lable.topic.title.startedby=������
+lable.topic.title.replies=�ظ�
+lable.topic.title.mark=��ע
+lable.topic.subject.by=��
+label.back.to.forum=������̳
+label.monitoring.edit.activity.cancel=ȡ��
+label.monitoring.edit.activity.update=����
+label.monitoring.edit.activity.edit=�༭
+lable.topic.title.message.number=��Ϣ# 
+lable.topic.title.average.mark= ƽ����
+label.monitoring.statistic.average.mark= ��Ϣƽ����
+lable.monitoring.statistic.total.message= ����Ϣ # 
+authoring.exception= �ڱ༭ҳ��������,ԭ����{0}
+#-------------------------END Authoring Labels END-----------------#
+page.title.monitoring.content.userlist=����û��б�
+page.title.monitoring.view.user.mark=�鿴�û�����
+page.title.monitoring.edit.user.mark=�༭�û�����
+page.title.monitoring.view.activity=�鿴�
+page.title.monitoring.edit.activity=�༭�
+page.title.monitoring.view.instructions=�鿴ָ��
+page.title.monitoring.view.topic=�鿴����
+page.title.monitoring.statistic=ͳ��
+page.title.monitoring.definelater=��̳���߶���
+## errors
+errors.header=<b class="error">
+errors.footer=</b>
+
+#error.title = ϵͳ����
+error.valueReqd = ��������ֵ
+error.inputFileTooLarge = �����ļ���С����
+error.uploading = �ϴ�����
+error.mark.needNumber= ��������������
+error.mark.invalid.number= ��������Ч�����ָ�ʽ
+error.fail.get.forum=û�п����õ���̳
+error.title.empty=���ⲻ��Ϊ��
+#General Messages
+message.msg.maxFileSize = ��� 250K
+
+##Message
+title.messageTopic.open = ����
+
+title.message.add = ����Ϣ
+title.message.open = �鿴��Ϣ
+title.message.reply = �ظ���Ϣ
+title.message.edit = �༭��Ϣ
+title.message.view=��Ϣ��
+title.message.view.topic=�鿴��Ϣ
+title.message.delete=ɾ����Ϣ
+
+message.label.subject = ����
+message.label.body = ����
+message.label.attachment = ����
+message.label.postedOn = ����:
+message.label.threadReplies  = ��Ϣ��
+message.link.reply = �ظ�
+
+##Labels
+label.open = ��
+label.delete = ɾ��
+label.download = ����
+label.view = �鿴
+label.edit = �༭
+label.reply = �ظ�
+label.done = ���
+label.finish= ���
+label.newtopic= ����Ϣ
+label.refresh= ˢ��
+lable.char.left=ʣ���ַ�
+label.basic=����
+label.advanced=�߼�
+label.instructions=ָ��
+##Buttons
+button.upload = �ϴ�
+button.done = ���
+button.submit = �ύ
+button.on = ��
+button.off = ��
+button.add = ���
+button.cancel = ȡ��
+
+js.error.invalid.number=��������Ч�����ָ�ʽ 
+js.error.min.number=����������0
+js.error.title=�����������
+
+
+monitoring.tab.summary=�ܼ�
+monitoring.tab.instructions=ָ��
+monitoring.tab.edit.activity=�༭�
+monitoring.tab.edit.statistics=ͳ��
+monitoring.user.post.topic=����������Ϣ:
+lable.topic.title.comment=����
+message.not.avaliable=������
+lable.update.mark=���·���
+message.assign.mark= ��������������� 
+message.session.name=�Ự��
+message.monitoring.summary.no.users=û�п����û�
+message.view.all.marks=�鿴ȫ������
+message.download.marks=���ط���
+label.monitoring.summary.view.forum=�鿴��̳
\ No newline at end of file
Index: lams_tool_forum/conf/language/spanish_AR.txt
===================================================================
diff -u
--- lams_tool_forum/conf/language/spanish_AR.txt	(revision 0)
+++ lams_tool_forum/conf/language/spanish_AR.txt	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -0,0 +1,126 @@
+# CVS ID: $Id$ #
+# Language strings for the Forum tool.
+
+# ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
+activity.title=Foro
+activity.description=Online threaded discussion tool (asynchronous).
+activity.helptext=Discussion tool useful for long running collaborations and situations where learners are not all on line at the same time.
+
+tool.display.name=Herramienta Del Foro
+tool.description=Tool for forums, also known as message boards.
+
+#=========================labels===========================#
+#-------------------------Authoring Labels-----------------#
+label.authoring.heading.basic.desc=Basic input information for forum
+label.authoring.heading.instructions.desc=Ingrese instrucciones para modos online y offline
+label.authoring.heading.advance.desc=Ingrese instrucciones avanzadas para Foro
+label.authoring.create.new.topic=Crear un nuevo hilo de discussión 
+
+label.authoring.basic.title=Título
+label.authoring.basic.instruction=Instrucciones
+label.authoring.online.instruction =Instrucciones para modo Online
+label.authoring.offline.instruction=Instrucciones para modo Offline
+label.authoring.online.file =Subir instrucciones como archivo (online)
+label.authoring.offline.file=Subir instrucciones como archivo (offline)
+label.authoring.advance.lock.on.finished=Cuando terminado, bloquear foro
+
+label.authoring.save.button=Salvar
+label.authoring.cancel.button=Cancelar
+label.authoring.choosefile.button=Elegir archivo
+label.authoring.upload.online.button=Subir Archivo Online
+label.authoring.upload.offline.button=Subir Archivo Offline
+label.authoring.online.filelist=Lista de Archivos Online
+label.authoring.offline.filelist=List de Archivos Offline
+label.authoring.online.delete=Borrar
+label.authoring.offline.delete=Borrar
+label.authoring.advance.allow.edit=Permitir Edición
+label.authoring.advance.use.richeditor=Utilizar Editor HTML
+label.authoring.advance.limited.input=Limite de número de caracteres
+
+lable.topic.title.subject=Asunto
+lable.topic.title.body=Mensaje
+lable.topic.title.update=Último mensaje
+lable.topic.title.author=Autor
+lable.topic.title.startedby=Empezar en
+lable.topic.title.replies=Respuestas
+lable.topic.title.mark=Nota de Evaluación
+lable.topic.subject.by=De
+label.back.to.forum=Volver al Foro
+label.monitoring.edit.activity.cancel=Cancelar
+label.monitoring.edit.activity.update=Update
+label.monitoring.edit.activity.edit=Editar
+lable.topic.title.message.number=Número de Mensajes
+lable.topic.title.average.mark= Promedio Nota de Evaluación
+label.monitoring.statistic.average.mark= Promedio de Evaluación por mensaje
+lable.monitoring.statistic.total.message=Número total de Mensajes
+authoring.exception= Hay un problmea con la paguina de Foro, la razón es {0}
+#-------------------------END Authoring Labels END-----------------#
+page.title.monitoring.content.userlist=Monitoreo de lista de estudiantes
+page.title.monitoring.view.user.mark=Ver evaluación de estudiante
+page.title.monitoring.edit.user.mark=Editr evaluación de estudiante
+page.title.monitoring.view.activity=Ver Actividad
+page.title.monitoring.edit.activity=Editar Actividad
+page.title.monitoring.view.instructions=Ver Instrucciones
+page.title.monitoring.view.topic=Ver hilo
+page.title.monitoring.statistic=Estadísticas
+page.title.monitoring.definelater=Definir en Monitoreo
+## errors
+errors.header=<b class="error">
+errors.footer=</b>
+
+#error.title = System Error!
+error.valueReqd = Valor Requerido
+error.inputFileTooLarge = El tamaño de este archivo es demasiado grande!
+error.uploading = error al subir archivo
+error.mark.needNumber= La evaluación tiene que ser valor entero
+error.mark.invalid.number= La evaluación no es un valor entero
+error.fail.get.forum=Foro no disponible
+error.title.empty=El Asunto no puede omitirse
+#General Messages
+message.msg.maxFileSize = Maximo 250K
+
+##Message
+title.messageTopic.open = Detalles del hilo
+
+title.message.add = Agregar Mensaje
+title.message.open = Ver Mensaje
+title.message.reply = Responder Mensaje
+title.message.edit = Editar Mensaje
+title.message.view=Lista de Mensajes
+title.message.view.topic=Ver Mensaje
+title.message.delete=Borrar Mensaje
+
+message.label.subject = Asunto
+message.label.body = Mensaje
+message.label.attachment = Archivo Adjunto
+message.label.postedOn = Enviado el:
+message.label.threadReplies  = Hilo de respuestas
+message.link.reply = Responder
+
+##Labels
+label.open = Abrir
+label.delete = Borrar
+label.download = Bajar-Descargar 
+label.view = Ver
+label.edit = Editar
+label.reply = Responder
+label.done = Listo
+label.finish= Terminar
+label.newtopic= Nuevo Hilo
+label.refresh= Refrescar
+lable.char.left=Limite de caracteres
+label.basic=Contenido Basico
+label.advanced=Opciones Avanzadas
+label.instructions=Instrucciones
+##Buttons
+button.upload = Subir
+button.done = Fin
+button.submit = Enviar
+button.on = Si
+button.off = No
+button.add = Agregrar
+button.cancel = Cancelar
+
+js.error.invalid.number=Su ingreso no es un número entero valido
+js.error.min.number=El número ingresado tiene que ser mayor a 0
+js.error.title=Se han producido los siguientes errores:
\ No newline at end of file
Index: lams_tool_forum/conf/xdoclet/struts-message-resources.xml
===================================================================
diff -u -re2d5d907aabab2d2bc94f232285ff086fb11ed37 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_forum/conf/xdoclet/struts-message-resources.xml	(.../struts-message-resources.xml)	(revision e2d5d907aabab2d2bc94f232285ff086fb11ed37)
+++ lams_tool_forum/conf/xdoclet/struts-message-resources.xml	(.../struts-message-resources.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -1 +1 @@
-<message-resources parameter="org.lamsfoundation.lams.tool.forum.web.ApplicationResources" />
+<message-resources parameter="org.lamsfoundation.lams.tool.forum.ApplicationResources" />
Index: lams_tool_forum/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r62402371ee899b9b20c61c988149efbec1cc00bd -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_forum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 62402371ee899b9b20c61c988149efbec1cc00bd)
+++ lams_tool_forum/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -5,7 +5,7 @@
     
 <context-param>
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-	<param-value>org.lamsfoundation.lams.tool.forum.web.ApplicationResources</param-value>
+	<param-value>org.lamsfoundation.lams.tool.forum.ApplicationResources</param-value>
 	
 </context-param>
 	
Index: lams_tool_forum/db/sql/activity_insert.sql
===================================================================
diff -u -rac0c4f506511cfd628fc56582b17c934425db055 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_forum/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision ac0c4f506511cfd628fc56582b17c934425db055)
+++ lams_tool_forum/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -76,5 +76,5 @@
 , NULL
 , NULL
 , NULL
-, 'org.lamsfoundation.lams.tool.forum.web.ApplicationResources'
+, 'org.lamsfoundation.lams.tool.forum.ApplicationResources'
 )
Index: lams_tool_forum/db/sql/tool_insert.sql
===================================================================
diff -u -rac0c4f506511cfd628fc56582b17c934425db055 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_forum/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision ac0c4f506511cfd628fc56582b17c934425db055)
+++ lams_tool_forum/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -49,6 +49,6 @@
 'tool/lafrum11/exportPortfolio?mode=teacher',
 'tool/lafrum11/contribute.do',
 'tool/lafrum11/moderate.do',
-'org.lamsfoundation.lams.tool.forum.web.ApplicationResources',
+'org.lamsfoundation.lams.tool.forum.ApplicationResources',
 NOW()
 )
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
===================================================================
diff -u -r738ec33b9a38c8bad8d04be35d1304e366bf90c3 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 738ec33b9a38c8bad8d04be35d1304e366bf90c3)
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml	(.../forumApplicationContext.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -2,7 +2,7 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 <beans>
 	<bean id="messageSource" class="org.springframework.context.support.ResourceBundleMessageSource">
-		<property name="basename"><value>org.lamsfoundation.lams.tool.forum.web.ApplicationResources</value></property>
+		<property name="basename"><value>org.lamsfoundation.lams.tool.forum.ApplicationResources</value></property>
 	</bean>
 	<bean id="messageService" class="org.lamsfoundation.lams.util.MessageService" singleton="true">
 		<property name="messageSource"><ref local="messageSource"/></property>										
Fisheye: Tag 1c31dbd6b844bffd77d86babab9592e8267cc462 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1c31dbd6b844bffd77d86babab9592e8267cc462 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources_es_AR.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1c31dbd6b844bffd77d86babab9592e8267cc462 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/ApplicationResources_zh_CN.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1c31dbd6b844bffd77d86babab9592e8267cc462 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/chinese_zh.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1c31dbd6b844bffd77d86babab9592e8267cc462 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/spanish_AR.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rd343a1f8e38f854b55dd233f727727085e8a68ba -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision d343a1f8e38f854b55dd233f727727085e8a68ba)
+++ lams_tool_forum/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -324,7 +324,7 @@
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
-  <message-resources parameter="org.lamsfoundation.lams.tool.forum.web.ApplicationResources" />
+  <message-resources parameter="org.lamsfoundation.lams.tool.forum.ApplicationResources" />
 
   <!-- Put custom struts plugin here -->
 <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
Index: lams_tool_forum/web/WEB-INF/web.xml
===================================================================
diff -u -rd343a1f8e38f854b55dd233f727727085e8a68ba -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision d343a1f8e38f854b55dd233f727727085e8a68ba)
+++ lams_tool_forum/web/WEB-INF/web.xml	(.../web.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -7,7 +7,7 @@
 </description>
 <context-param>
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-	<param-value>org.lamsfoundation.lams.tool.forum.web.ApplicationResources</param-value>
+	<param-value>org.lamsfoundation.lams.tool.forum.ApplicationResources</param-value>
 </context-param>
 <context-param>
 	<param-name>contextConfigLocation</param-name>
Index: lams_tool_forum/web/includes/authoringHeader.jsp
===================================================================
diff -u -re6e4c5d47aec32f4d9248c009cad07165289237b -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_forum/web/includes/authoringHeader.jsp	(.../authoringHeader.jsp)	(revision e6e4c5d47aec32f4d9248c009cad07165289237b)
+++ lams_tool_forum/web/includes/authoringHeader.jsp	(.../authoringHeader.jsp)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -9,7 +9,7 @@
 
 <head>
 	<title>
-		<bean:message key="appName" />
+		<bean:message key="activity.title" />
 	</title>
 	<lams:css />
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
Index: lams_tool_forum/web/includes/header.jsp
===================================================================
diff -u -re6e4c5d47aec32f4d9248c009cad07165289237b -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_forum/web/includes/header.jsp	(.../header.jsp)	(revision e6e4c5d47aec32f4d9248c009cad07165289237b)
+++ lams_tool_forum/web/includes/header.jsp	(.../header.jsp)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -9,8 +9,8 @@
 
 <head>
 	<title>
-		<bean:message key="appName" />
-	</title>
+		<bean:message key="activity.title" />
+  	</title>
 	<lams:css />
 	<script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
     <script type="text/javascript" src="${lams}fckeditor/fckeditor.js"></script>
Index: lams_tool_lamc/build.xml
===================================================================
diff -u -r32e8a3903d8a5280c7c0201243d412e65ef4feb4 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_lamc/build.xml	(.../build.xml)	(revision 32e8a3903d8a5280c7c0201243d412e65ef4feb4)
+++ lams_tool_lamc/build.xml	(.../build.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -335,6 +335,7 @@
 			<mkdir dir="${build.deploy}"/>
 			<mkdir dir="${build.deploy}/lib"/> 
 			<mkdir dir="${build.deploy}/sql"/> 
+			<mkdir dir="${build.deploy}/language"/>
 			 
 			<copy overwrite="yes" todir="${build.deploy}/sql">
 				<fileset dir="${db.scripts}/">
@@ -358,6 +359,12 @@
 				</fileset>
 			</copy>
 
+			<copy overwrite="yes" todir="${build.deploy}/language">
+				<fileset dir="${conf.language.dir}">
+					<include name="*.properties"/>
+				</fileset>
+			</copy>
+
 			<taskdef name="generateDeployProperties" 
 				classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
 			    <classpath refid="deploy.lib.classpath"/>
@@ -380,7 +387,15 @@
 				lamsEarPath="${jboss.deploy}"
 				toolContext="${toolContext}"
 				toolWebUri="${product}.war"
-				/>
+				languageFilesPackage="org.lamsfoundation.lams.tool.mc">
+
+				<!-- language files go as a fileset. Not nice but can't work out how to embed them in a tag. -->
+				<fileset dir="${build.deploy}/language">
+					<include name="**/*.properties"/>
+					<include name="**/*.txt"/>
+				</fileset>
+					
+			</generateDeployProperties>
 		</target>
 	
 		<target name="deploy-tool" depends="create-deploy-package" 
Index: lams_tool_lamc/conf/language/McResources.properties
===================================================================
diff -u
--- lams_tool_lamc/conf/language/McResources.properties	(revision 0)
+++ lams_tool_lamc/conf/language/McResources.properties	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -0,0 +1,245 @@
+# CVS ID: $Id$
+# Language strings for the Multiple Choice tool.
+
+# ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
+activity.title=Multiple Choice
+activity.description=Creates automated assessment questions. e.g. Multiple choice and true/false questions. Can provide feedback and scores.
+activity.helptext=Learner answers a series of automated assessment questions. e.g. Multiple choice and true/false questions. Optional features include feedback on each question and scoring. Questions are weighted for scoring. 
+
+tool.display.name=Multiple Choice Tool
+tool.description=Tool for learners to answer a series of automated assessment questions.
+
+#Authoring mode resources
+label.tool.shortname					=MCQ
+label.authoring.mc						=Multiple Choice Questions
+label.basic								=Basic
+label.advanced							=Advanced
+label.instructions						=Instructions
+label.summary							=Summary
+label.stats								=Stats
+label.editActivity						=Edit Activity
+label.authoring							=MCQ Authoring
+label.learning							=MCQ Learning
+label.preview							=MCQ Preview
+label.exportPortfolio					=MCQ Export Portfolio
+label.exportPortfolio.simple			=Export Portfolio
+label.authoring.mc.basic 				=Please define the questions. 
+label.monitoring						=MCQ Monitoring
+label.mc.questions						=Multiple Choice Questions
+label.authoring.mc.basic.editOptions	=Please define the question and/or its options.
+label.advanced.definitions				=Advanced Definitions
+label.authoring.title					=Title
+label.authoring.instructions			=Instructions
+label.Questions 						=Questions
+label.weight							=Weight
+label.addNewQuestion					=Add New Question
+label.moveDown							=Down
+label.add.question						=Add New
+label.add.option						=Add New
+label.mc.options						=Candidate Answers
+label.mc.options.col					=Candidate Answers:
+label.fileContent						=File Content
+label.assessment						=Assessment
+label.learner.message					=Answer the questions until you reach the passmark.
+label.withRetries						=Multiple Choice with Retries
+label.withoutRetries					=Multiple Choice without Retries
+label.individual.results.withRetries	=Results for Multiple Choice with Retries
+label.individual.results.withoutRetries	=Results for Multiple Choice without Retries
+label.viewAnswers						=Previous Answers
+label.learner.viewAnswers				=Learner's Answers
+label.withRetries.results.summary		=Multiple Choice with Retries Summary
+label.withoutRetries.results.summary	=Multiple Choice without Retries Summary
+label.learnersFinished					=learners have finished. Minimum passmark is
+label.learnersFinished.simple			=learners have finished. 
+label.topMark							=Top Mark: 
+label.avMark							=Average Mark:
+label.loMark							=Lowest Mark: 
+count.total.user						=Total Users Count: 
+count.finished.user						=Finished User Count:
+count.max.attempt						=Maximum Attempt Count:
+label.attempts							=Attempts
+label.mark								=Mark:
+label.you.answered						=You answered:
+label.learner.answered					=Learner answered:
+label.redo.questions					=Redo Questions
+label.view.summary						=View Summary
+label.view.answers						=View Answers
+label.view								=View
+label.download							=Download
+label.delete							=Delete
+label.finished							=Finished
+label.attempt							=Attempt  					
+button.cancel					    	=Cancel
+button.upload					    	=Upload
+button.preview							=Preview
+button.advanced							=Advanced
+button.instructions						=Instructions 
+tool.icon.name							=MC
+button.add								=Add   
+button.addNewQuestion					=Add   
+button.remove							=Delete
+button.submit							=Submit
+button.done								=Done
+button.getNextQuestion					=Next
+button.next								=Next
+button.nextQuestion						=Next Question
+button.continue							=Continue
+button.getPreviousQuestion				=Previous
+label.percent							=%
+label.option							=Option
+label.option1							=Option 1
+label.options							=Options
+label.option.correct					=Correct
+label.candidateAnswers					=Candidate Answers
+label.isCorrect							=Correct?
+sbmt.successful							=The content has been created successfully. 
+label.monitoringReport.title			=Monitoring Report Title
+label.question.only						=Question 
+label.question							=Question: 
+label.question.col						=Question:
+label.question1							=Question 1
+radiobox.defineLater					=Define Later
+radiobox.synchInMonitor					=Sync in Monitor
+radiobox.forceOffline					=Force Offline
+radiobox.usernameVisible				=Username Visible
+radiobox.questionsSequenced				=Questions Sequenced 
+radiobox.passmark						=Pass Mark
+radiobox.showFeedback					=Show Feedback
+radiobox.sln							=Show Learner's Report
+radiobox.onepq							=1 page per question
+radiobox.retries						=Allow Retries
+label.report.title						=Report Title
+label.report.endLearningMessage			=End of Activity Message
+label.offlineInstructions				=Offline Instructions
+label.offlineInstructions.col			=Offline Instructions:
+label.onlineInstructions				=Online Instructions
+label.onlineInstructions.col			=Online Instructions:
+label.offlineFiles						=Offline Files:
+label.onlineFiles						=Online Files:
+label.uploadedOfflineFiles				=Uploaded Offline Files:
+label.uploadedOnlineFiles				=Uploaded Online Files:
+option.on								=ON
+option.off								=OFF
+option.correct							=Correct
+option.incorrect						=Incorrect
+label.feedback.incorrect				=Feedback if answered incorrectly:
+label.feedback.correct					=Feedback if answered correctly:
+label.learner.redo						=Are you sure you want to answer the questions again?
+label.learner.bestMark					=Your best mark so far is
+label.outof								=out of
+label.mustGet							=Must get at least
+label.toFinish							=to finish
+label.save								=Save
+label.cancel							=Cancel
+
+feedback								=Please address the following issues before submit. <br>
+error.default.content.notSetup			=The tool initialization error: The tool default content has not been set up properly.
+error.questions.submitted.none			=Please correct this: No questions have been submitted. Please also note that the questions with no candidate answers are being automatically removed.
+error.question.empty					=Please correct this: The question text can not be empty.
+error.weights.empty						=Please correct this: The question weights can not be empty.
+error.checkBoxes.empty					=Please correct this: No candidate answer has been selected.
+error.weights.zero						=Please correct this: The question weights can not be 0.
+error.weights.notInteger				=Please correct this: The question weights must be an integer.
+error.question.weight.total				=Please correct this: The total question weight:100 has been reached.
+error.answers.duplicate					=Please correct this: The candidate answers must be unique.
+error.emptyQuestion						=Please enter the question text. The chosen question can not be empty. 
+error.singleOption						=Please correct this: There must be at least 2 candidate answers.
+error.emptyWeight						=Sorry, the question can not be added without a weight.
+error.title								=Please correct this:  The field "Title" is mandatory. <br>
+error.instructions						=Please correct this: The field "Instructions" is mandatory. <br>
+error.reportTitle						=Please correct this: The field "Report Title (Advanced)" is mandatory. <br>
+error.defaultquestion.empty				=Please correct this: The first question can not be empty. <br>
+error.passMark.empty					=Please correct this: Pass Mark can not be empty.
+options.count.zero						=Please correct this: There must be at least one candidate answer.
+error.passmark.notInteger				=Please correct this: Pass Mark can only be an integer.
+error.weights.total.invalid				=Please correct this: The total weight must equal 100. Please also note that the questions with no candidate answers are being automatically removed.
+error.learner.userId.required			=Tool Activity Error! Can't continue. Tool Activity expects learner's user id. 
+error.learner.user.doesNoExist			=Tool Activity Error! Learner is not ready in the tool's database yet. 
+error.file.notPersisted					=An error occurred: The file is not viewable yet. Please save all the content first and check back.
+error.learningUser.notAvailable			=Tool Activity Error! Can't continue. Tool Activity expects a user id. 
+error.toolSession.notAvailable			=Tool Activity Error! Can't continue. Tool session is not ready in the tool's database yet. <br> Please verify the API method: public void createToolSession(Long toolSessionId, Long toolContentId) has already been executed.
+error.toolSession.doesNoExist			=Tool Activity Error! Can't continue. Tool session is not ready in the tool's database yet. 
+error.toolContent.notAvailable			=Tool Activity Error! Can't continue. Tool content is not ready in the tool's database yet. <br> Please verify the API method: public void createToolSession(Long toolSessionId, Long toolContentId) has run properly.
+error.learner.required					=Tool Activity Error! Can't continue. The Learner records are not ready in the tool's database yet. 
+error.fileName.empty					=Please correct this: Under "Instructions", the file(name) to upload can not be empty.
+error.questions.withNoOptions			=Please note: The questions with no candidate answers have been automatically removed for you. Please check total question weight.
+error.answers.empty						=Please correct this: Candidate answers can not be empty.
+error.passMark.greater100				=Please correct this: The passmark can not be greater than 100%
+error.question.addNotAllowed.thisScreen	= The question text can not be modified in this screen since it has options attached . Please use the "Options" button to edit the question text.
+error.question.removeNotAllowed.thisScreen = The question can not be removed since one or more of the question texts has been modified. Please try again without any text modifications.
+error.selectedIndex.empty				=Can not continue. Please select the correct answer and click "Done".
+error.content.locked					=The content has been locked since it is being used by one mor more learners. <br> The modification of the content is not allowed.
+error.content.doesNotExist				=Tool Activity Error! Can't continue. Tool content is not ready in the tool's database yet. 
+error.content.inUse						=The modification of the content is not allowed since one or more students has attempted the activity.
+error.content.beingModified				=The content can not be presented since it is being modified. Please check back later.
+error.content.unstableState				=The content is in an unstable state since it has been left editable while monitored. <br> Please use this screen to redefine the content.
+error.defaultContent.notAvailable		=Tool Activity Error! Can't continue <br> The the default content for the Tool Activity has not been set up.
+error.defaultQuestionContent.notAvailable	=Tool Activity Error! Can't continue <br> The the default question content for the Tool Activity has not been set up.
+error.defaultOptionsContent.notAvailable	=Tool Activity Error! Can't continue <br> The the default options content for the Tool Activity has not been set up.
+error.noLearnerActivity					=Summary report is not available since no users attempted the activity yet.
+			
+#Learning mode resources
+label.question							=Question
+label.answers							=Answers:
+button.endLearning						=Finish
+label.learning.user						=User
+label.learning.attemptTime				=Attempt Date/Time
+label.learning.timezone					=Time-Zone
+label.learning.response					=Response
+label.user								=User
+label.attemptTime						=Attempt Date/Time
+label.timezone							=Time-Zone
+label.response							=Response
+label.learning.forceOfflineMessage		=This is setup to be carried out offline. Plase see your instructor for details.
+label.learning.runOffline				=This activity is not being done on the computer. Please see your instructor for details.
+error.defineLater						=Sorry, the activity's content is not ready yet. Please wait for the teacher to define this part.
+error.toolSessionId.required			=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a toolSession id. 
+error.contentId.required				=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a content id. 
+error.authoringUser.notAvailable		=Tool Activity Error! Can't continue. Tool Activity expects a user id. 
+error.userId.required					=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a user id. 
+error.userId.notNumeric					=Tool Activity Error! Can't continue. The user id passed to the Tool Activity must be numerical.
+error.userId.existing					=Tool Activity Error! Can't continue. The user id passed to the Tool Activity refers to a student that has already used the activity. <br> Each learner activity should be associated with a unique userId.
+error.defaultContent.notSetup			=Tool Activity Error! Can't continue. The default content for the tool has not been setup properly.
+error.mode.required						=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a mode. 
+error.mode.invalid						=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a valid mode: learner or teacher 
+error.learner.sessionId.inconsistent	=Tool Activity Error! Can't continue <br> The session id passed is inconsistent for learner progress report.
+
+#Monitoring mode resources
+button.startLesson						=Start Lesson
+button.deleteLesson						=Delete Lesson
+button.contributeLesson					=Contribute -> Report
+button.forceComplete					=Force Complete
+error.synchInMonitor					=The report is available only after all the students finish their activities. <br> 
+										 Some of the students has not completed the activity yet.  However, those students may be forced to complete.
+error.monitorReportTitle				=The field "Monitor Report Title (Advanced)" is mandatory. <br>
+error.noStudentActivity					=Sorry, the report can not be generated. <br> No student has attempted the activity yet.
+error.contentAndToolSession.notCompatible	=Tool Activity Error! Can't continue. The content id and tool session(s) passed to the tool activity are not compatible with each other. <br> The Tool Activity expects that each of the passed tool sessions refer to the same passed content id.
+error.toolSessions.wrongFormat				=Tool Activity Error! Can't continue. No valid tool sessions has been passed to the Tool Activity. <br> The expected format is: TOOLURL?toolContentId=A&toolSessionId1=B&toolSessionId2=C&toolSessionId3=D&...
+error.numberFormatException					=Tool Activity Error! Can't continue. The content id and tool session id(s) passed to the Tool Activity must be numerical.
+error.ids.numberFormatException				=Tool Activity Error! Can't continue. The content id and tool session id(s) passed to the Tool Activity must be numerical.
+error.contentId.numberFormatException		=Tool Activity Error! Can't continue. The content id passed to the Tool Activity must be numerical.
+error.sessionId.numberFormatException		=Tool Activity Error! Can't continue. The toolSession id passed to the Tool Activity must be numerical.
+error.toolSessions.doesNotExist				=Tool Activity Error! Can't continue. One of the toolsession ids passed to the Tool Activity does not refer to an existing tool session.
+error.toolSession.doesNotExist				=Tool Activity Error! Can't continue. The toolsession id passed to the Tool Activity does not refer to an existing tool session.
+error.content.onlyContentAndNoSessions		=A report can not be generated since no tool sessions has been passed to the Tool Activity.
+error.content.noToolSessions				=A report can not be generated since there has not been any student activity on this content.
+error.user.doesNotExist 					=Tool Activity Error! Can't continue. The user id passed to the Tool Activity does not refer to an existing user.
+error.tab.contentId.required				=Sorry, the screen is not available. The Tool Activity requires a content id. 
+monitoring.feedback.instructionUpdate		=The content has been updated successfully.
+
+group.label									=Group
+button.summary								=Summary
+button.editActivity							=Edit Activity
+button.stats								=Stats
+label.edit									=Edit
+label.update								=Update
+label.selectGroup							=Select Group:
+label.learner.progress						=Learner Progress Report
+label.stats.totalLearners					=Total count of learners: 
+label.stats.allGroups						=All Groups: 
+label.stats.totalAllGroups					=Total count of all learners:
+
+#=========================Error Messages===========================#
+error.system.mc=<font color\="red">A system exception has occured. Please contact Lams International technical support at 95806666. The error to report is\: <br/> <b>{0}</b></font>
+
+
Fisheye: Tag 1c31dbd6b844bffd77d86babab9592e8267cc462 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/build.xml
===================================================================
diff -u -r095d84cd64c174e6d15280be776375a2d1eb56f6 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_laqa/build.xml	(.../build.xml)	(revision 095d84cd64c174e6d15280be776375a2d1eb56f6)
+++ lams_tool_laqa/build.xml	(.../build.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -334,6 +334,7 @@
 			<mkdir dir="${build.deploy}"/>
 			<mkdir dir="${build.deploy}/lib"/> 
 			<mkdir dir="${build.deploy}/sql"/> 
+			<mkdir dir="${build.deploy}/language"/>
 			 
 			<copy overwrite="yes" todir="${build.deploy}/sql">
 				<fileset dir="${db.scripts}/">
@@ -356,6 +357,12 @@
 					<include name="*.jar"/>
 				</fileset>
 			</copy>
+			
+			<copy overwrite="yes" todir="${build.deploy}/language">
+				<fileset dir="${conf.language.dir}">
+					<include name="*.properties"/>
+				</fileset>
+			</copy>
 
 			<taskdef name="generateDeployProperties" 
 				classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
@@ -379,7 +386,15 @@
 				lamsEarPath="${jboss.deploy}"
 				toolContext="${toolContext}"
 				toolWebUri="${product}.war"
-				/>
+				languageFilesPackage="org.lamsfoundation.lams.tool.qa">
+
+				<!-- language files go as a fileset. Not nice but can't work out how to embed them in a tag. -->
+				<fileset dir="${build.deploy}/language">
+					<include name="**/*.properties"/>
+					<include name="**/*.txt"/>
+				</fileset>
+					
+			</generateDeployProperties>
 		</target>
 	
 		<target name="deploy-tool" depends="create-deploy-package" 
Index: lams_tool_laqa/conf/language/QaResources.properties
===================================================================
diff -u
--- lams_tool_laqa/conf/language/QaResources.properties	(revision 0)
+++ lams_tool_laqa/conf/language/QaResources.properties	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -0,0 +1,195 @@
+# CVS ID: $Id$ 
+# Language strings for the Question and Answer tool.
+
+# ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
+activity.title=Q & A
+activity.description=Each learner answers question(s) and then sees answers from all learners collated on the next page.
+activity.helptext=Each learner answers one or more questions in short answer format and then sees answers from all learners collated on the next page.
+
+tool.display.name=Question and Answer Tool
+tool.description=Tool for asking one or more short answer questions and displays the results.
+
+#Authoring mode resources
+label.tool.shortname					=Q/A
+label.authoring							=Q/A Authoring
+label.monitoring						=Q/A Monitoring
+label.authoring.qa						=Questions and Answers
+label.basic								=Basic
+label.advanced							=Advanced
+label.instructions						=Instructions
+label.authoring.title					=Title
+label.authoring.instructions			=Instructions
+label.summary							=Summary
+label.instructions						=Instructions
+label.editActivity						=Edit Activity
+label.stats								=Stats
+label.authoring.qa.basic				=Please define the questions. 
+label.advanced.definitions				=Advanced Definitions
+label.authoring.instructions			=Instructions
+radiobox.synchInMonitor					=Sync in Monitor
+radiobox.usernameVisible				=Username Visible
+radiobox.questionsSequenced				=Questions Sequenced 
+label.report.title						=Report Title
+label.report.endLearningMessage			=End of Activity Message
+label.monitoringReport.title			=Monitoring Report Title
+label.offlineInstructions				=Offline Instructions
+label.offlineInstructions.col			=Offline Instructions:
+label.onlineInstructions				=Online Instructions
+label.onlineInstructions.col			=Online Instructions:
+label.offlineFiles						=Offline Files:
+label.onlineFiles						=Online Files:
+label.exportPortfolio.simple			=Export Portfolio
+label.exportPortfolio					=Q/A Export Portfolio
+instructions.type.online                =Online
+instructions.type.offline               =Offline
+link.view                               =View
+link.download                           =Download
+link.delete                             =Delete
+button.basic							=Basic
+button.uploadFile						=Upload Package
+button.preview							=Preview
+button.advanced							=Advanced
+button.instructions						=Instructions 
+button.done								=Done
+tool.icon.name							=Q/A 
+button.addNewQuestion					=+
+button.removeQuestion					=-
+button.removeAllContent					=Remove Content
+button.submitAllContent					=Submit
+button.done								=Done
+button.getNextQuestion					=Next
+button.getPreviousQuestion				=Previous
+label.report.title						=Report Title
+label.monitoringReport.title			=Monitoring Report Title
+label.report.endLearningMessage			=End of Activity Message
+label.question1							=Question 1
+radiobox.defineLater					=Define Later
+radiobox.synchInMonitor					=Sync in Monitor
+radiobox.forceOffline					=Force Offline
+radiobox.usernameVisible				=Username Visible
+radiobox.questionsSequenced				=Questions Sequenced 
+radiobox.showFeedback					=Show Feedback
+label.offlineInstructions				=Offline Instructions
+label.onlineInstructions				=Online Instructions
+label.offlineFiles						=Offline Files:
+label.onlineFiles						=Online Files:
+label.upload							=Upload
+label.uploadedOfflineFiles				=Uploaded Offline Files:
+label.uploadedOnlineFiles				=Uploaded Online Files:
+label.attachments                       =Attachments
+label.filename                          =File Name
+label.type                              =Type
+label.download                          =Download
+label.view                              =View
+label.delete                            =Delete
+option.on								=ON
+option.off								=OFF
+feedback								=Please address the following issues before submit. <br>
+error.title								=The field "Title" is mandatory. <br>
+error.instructions						=The field "Instructions" is mandatory. <br>
+error.reportTitle						=The field "Report Title (Advanced)" is mandatory. <br>
+error.defaultquestion.empty				=The first question can not be empty. <br>
+submit.successful						=The content has been created successfully. <br>
+submit.unSuccessful						=Warning: An error occurred while saving the content. <br>
+
+error.content.locked					=The content has been locked since it is being used by one mor more learners. <br> The modification of the content is not allowed.
+error.content.inUse						=The modification of the content is not allowed since one or more students has attempted the activity.
+error.content.beingModified				=The content creation is not allowed since the same content is being modified.
+error.content.unstableState				=The content is in an unstable state since it has been left editable while monitored. <br> Please use this screen to redefine the content.
+error.defaultContent.notAvailable		=Tool Activity Error! Can't continue <br> The the default content for the Tool Activity has not been set up.
+error.defaultQuestionContent.notAvailable	=Tool Activity Error! Can't continue <br> The the default question content for the Tool Activity has not been set up.
+
+#Learning mode resources
+label.learning.qa						=Answers for Q/A
+label.question							=Question
+label.answers							=Answers:
+label.answer							=Answer:
+button.endLearning						=Finish
+label.learning.user						=User
+label.learning.attemptTime				=Attempt Date/Time
+label.learning.timezone					=Time-Zone
+label.learning.response					=Response
+label.learning.report					=Learning Report
+label.learning.viewOnly					=Previous Responses Report
+label.learner.progress					=Learner Progress Report
+label.preview							=Preview Learner Screen
+label.openEditor						=Open Richtext Editor 
+label.user								=User
+label.question.col						=Question:
+label.attemptTime						=Attempt Date/Time
+label.timezone							=Time-Zone
+label.response							=Response
+label.selectGroup						=Select Group:
+group.label								=Group
+button.summary							=Summary
+button.editActivity						=Edit Activity
+button.stats							=Stats
+label.save								=Save
+label.edit								=Edit
+label.cancel							=Cancel
+label.update							=Update
+label.hide								=Hide
+label.unHide							=UnHide
+label.hidden							=Hidden
+label.stats.totalLearners				=Total count of learners: 
+label.stats.allGroups					=All Groups: 
+label.stats.totalAllGroups				=Total count of all learners:
+
+
+label.learning.runOffline				=This activity is not being done on the computer. Please see your instructor for details.
+label.learning.forceOfflineMessage		=This is setup to be carried out offline. Plase see your instructor for details.
+error.defineLater						=Sorry, this activity's content is not ready yet. <br> Please wait for your teacher to make the content ready.
+error.toolSessionId.required			=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a toolSession id. 
+error.contentId.required				=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a content id. 
+error.authoringUser.notAvailable		=Tool Activity Error! Can't continue. Tool Activity expects a user id. 
+error.userId.required					=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a user id. 
+error.userId.notNumeric					=Tool Activity Error! Can't continue. The user id passed to the Tool Activity must be numerical.
+error.userId.existing					=Tool Activity Error! Can't continue. The user id passed to the Tool Activity refers to a student that has already used the activity. <br> Each learner activity should be associated with a unique userId.
+error.defaultContent.notSetup			=Tool Activity Error! Can't continue. The default content for the tool has not been setup properly.
+error.mode.required						=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a mode. 
+error.toolSession.notAvailable			=Tool Activity Error! Can't continue. Tool session is not ready in the tool's database yet. 
+error.learningUser.notAvailable			=Tool Activity Error! Can't continue. Tool Activity expects a user id. 
+error.learner.userId.required			==Tool Activity Error! Can't continue. Tool Activity expects learner's user id. 
+error.noLearnerActivity					=Summary report is not available since no users attempted the activity yet.
+error.questions.duplicate				=Please correct this: The questions must be unique.
+
+#Monitoring mode resources
+button.startLesson						=Start Lesson
+button.deleteLesson						=Delete Lesson
+button.contributeLesson					=Contribute -> Report
+button.forceComplete					=Force Complete
+count.total.user						=Total User Count: 
+count.finished.user						=Finished User Count:
+label.topMark							=Top Mark: 
+label.avMark							=Average Mark:
+label.loMark							=Lowest Mark: 
+count.max.attempt						=Maximum Attempt Count:
+error.synchInMonitor					=The report is available only after all the students finish their activities. <br> 
+										 Some of the students has not completed the activity yet.  However, those students may be forced to complete.
+
+error.monitorReportTitle				=The field "Monitor Report Title (Advanced)" is mandatory. <br>
+error.noStudentActivity					=Sorry, the report can not be generated. <br> No student has attempted the activity yet.
+error.contentAndToolSession.notCompatible	=Tool Activity Error! Can't continue. The content id and tool session(s) passed to the tool activity are not compatible with each other. <br> The Tool Activity expects that each of the passed tool sessions refer to the same passed content id.
+error.toolSessions.wrongFormat				=Tool Activity Error! Can't continue. No valid tool sessions has been passed to the Tool Activity. <br> The expected format is: TOOLURL?toolContentId=A&toolSessionId1=B&toolSessionId2=C&toolSessionId3=D&...
+error.numberFormatException					=Tool Activity Error! Can't continue. The content id and tool session id(s) passed to the Tool Activity must be numerical.
+error.contentId.numberFormatException		=Tool Activity Error! Can't continue. The content id passed to the Tool Activity must be numerical.
+error.sessionId.numberFormatException		=Tool Activity Error! Can't continue. The toolSession id passed to the Tool Activity must be numerical.
+error.content.doesNotExist 					=Tool Activity Error! Can't continue. The content id passed to the Tool Activity does not refer to an existing content.
+error.toolSessions.doesNotExist				=Tool Activity Error! Can't continue. One of the toolsession ids passed to the Tool Activity does not refer to an existing tool session.
+error.toolSession.doesNotExist				=Tool Activity Error! Can't continue. The toolsession id passed to the Tool Activity does not refer to an existing tool session.
+error.toolContent.notAvailable				=Tool Activity Error! Can't continue. Tool content is not ready in the tool's database yet. <br> Please verify the API method: public void createToolSession(Long toolSessionId, Long toolContentId) has run properly.
+error.content.onlyContentAndNoSessions		=A report can not be generated since no tool sessions has been passed to the Tool Activity.
+error.content.noToolSessions				=A report can not be generated since there has not been any student activity on this content.
+error.user.doesNotExist 					=Tool Activity Error! Can't continue. The user id passed to the Tool Activity does not refer to an existing user.
+error.tab.contentId.required				=Sorry, the screen is not available. The Tool Activity requires a content id.
+error.mode.invalid							=Tool Activity Error! Can't continue <br> URL is not complete. The Tool Activity requires a valid mode: learner or teacher 
+error.contentrepository                     =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly. 
+monitoring.feedback.instructionUpdate		=The content has been updated successfully.
+label.content.notEditable					=The content can not be edited since it is being used by learners.
+
+
+
+#=========================Error Messages===========================#
+error.system.qa=<font color\="red">A system exception has occured. Please contact Lams International technical support at 95806666. The error to report is\: <br/> <b>{0}</b></font>
+
+
Fisheye: Tag 1c31dbd6b844bffd77d86babab9592e8267cc462 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_nb/build.xml
===================================================================
diff -u -r9490fc622a5c909b29cbf748d8815a9507adce41 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_nb/build.xml	(.../build.xml)	(revision 9490fc622a5c909b29cbf748d8815a9507adce41)
+++ lams_tool_nb/build.xml	(.../build.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -384,6 +384,7 @@
 				<mkdir dir="${build.deploy}/lib"/> 
 				<mkdir dir="${build.deploy}/sql"/> 
 				<mkdir dir="${build.deploy}/lang"/> 
+				<mkdir dir="${build.deploy}/language"/>
 				 
 				<copy overwrite="yes" todir="${build.deploy}/sql">
 					<fileset dir="${db.scripts}/">
@@ -407,8 +408,8 @@
 					</fileset>
 				</copy>
 
-				<copy overwrite="yes" todir="${build.deploy}/lang">
-					<fileset dir="${conf.dir}/language">
+				<copy overwrite="yes" todir="${build.deploy}/language">
+					<fileset dir="${conf.language.dir}">
 						<include name="*.properties"/>
 					</fileset>
 				</copy>
@@ -435,11 +436,12 @@
 					lamsEarPath="${jboss.deploy}"
 					toolContext="${toolContext}"
 					toolWebUri="${product}.war"
-					languageFilesPackage="org.lamsfoundation.lams.tool.noticeboard.web">
+					languageFilesPackage="org.lamsfoundation.lams.tool.noticeboard">
 
 					<!-- language files go as a fileset. Not nice but can't work out how to embed them in a tag. -->
-					<fileset dir="${conf.dir}/language/">
+					<fileset dir="${build.deploy}/language">
 						<include name="**/*.properties"/>
+						<include name="**/*.txt"/>
 					</fileset>
 						
 				</generateDeployProperties>
Index: lams_tool_nb/conf/language/ApplicationResources.properties
===================================================================
diff -u -r9987748e9f4adfa87a5665a3d116663d55d9ff34 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_nb/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 9987748e9f4adfa87a5665a3d116663d55d9ff34)
+++ lams_tool_nb/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -1,4 +1,4 @@
-# $Id$
+# CVS ID: $Id$
 # Language strings for the Noticeboard tool.
 
 # ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
Index: lams_tool_nb/conf/xdoclet/struts-message-resources.xml
===================================================================
diff -u -ra766c8fe51dfa314947b20ef98e525d63b328fbe -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_nb/conf/xdoclet/struts-message-resources.xml	(.../struts-message-resources.xml)	(revision a766c8fe51dfa314947b20ef98e525d63b328fbe)
+++ lams_tool_nb/conf/xdoclet/struts-message-resources.xml	(.../struts-message-resources.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -1 +1 @@
-<message-resources parameter="org.lamsfoundation.lams.tool.noticeboard.web.ApplicationResources" />
+<message-resources parameter="org.lamsfoundation.lams.tool.noticeboard.ApplicationResources" />
Index: lams_tool_nb/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r324d261262ced6761fa4510aad6e37422111a503 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_nb/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 324d261262ced6761fa4510aad6e37422111a503)
+++ lams_tool_nb/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -1,6 +1,6 @@
 <context-param>
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.tool.noticeboard.web.ApplicationResources</param-value>
+  	<param-value>org.lamsfoundation.lams.tool.noticeboard.ApplicationResources</param-value>
 </context-param>
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
Index: lams_tool_nb/db/sql/activity_insert.sql
===================================================================
diff -u -rb2d2b09633657141ddb1d3019a1c37d8f504f2fb -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_nb/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision b2d2b09633657141ddb1d3019a1c37d8f504f2fb)
+++ lams_tool_nb/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -98,5 +98,5 @@
 , NULL
 , NULL
 , NULL
-, 'org.lamsfoundation.lams.tool.noticeboard.web.ApplicationResources'
+, 'org.lamsfoundation.lams.tool.noticeboard.ApplicationResources'
 )
Index: lams_tool_nb/db/sql/tool_insert.sql
===================================================================
diff -u -rb2d2b09633657141ddb1d3019a1c37d8f504f2fb -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_nb/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision b2d2b09633657141ddb1d3019a1c37d8f504f2fb)
+++ lams_tool_nb/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -49,6 +49,6 @@
 'tool/lanb11/portfolioExport?mode=teacher',
 NULL,
 NULL,
-'org.lamsfoundation.lams.tool.noticeboard.web.ApplicationResources',
+'org.lamsfoundation.lams.tool.noticeboard.ApplicationResources',
 NOW()
 );
Index: lams_tool_nb/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_nb/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f)
+++ lams_tool_nb/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -193,7 +193,7 @@
 
    <!-- Define your Struts controller in a file called struts-controller.xml and place it in your merge directory. -->
 
-  <message-resources parameter="org.lamsfoundation.lams.tool.noticeboard.web.ApplicationResources" />
+  <message-resources parameter="org.lamsfoundation.lams.tool.noticeboard.ApplicationResources" />
 
   <!-- ===================== Plugin Definition  ======================== -->
 <plug-in className="org.apache.struts.tiles.TilesPlugin">
Index: lams_tool_nb/web/WEB-INF/web.xml
===================================================================
diff -u -r28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 28ee094d9b04c0fb37dcbd7a6472a7da7ae72d4f)
+++ lams_tool_nb/web/WEB-INF/web.xml	(.../web.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -3,7 +3,7 @@
 <web-app  xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4">
  <context-param>
   	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
-  	<param-value>org.lamsfoundation.lams.tool.noticeboard.web.ApplicationResources</param-value>
+  	<param-value>org.lamsfoundation.lams.tool.noticeboard.ApplicationResources</param-value>
 </context-param>
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
Index: lams_tool_sbmt/build.xml
===================================================================
diff -u -r095d84cd64c174e6d15280be776375a2d1eb56f6 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_sbmt/build.xml	(.../build.xml)	(revision 095d84cd64c174e6d15280be776375a2d1eb56f6)
+++ lams_tool_sbmt/build.xml	(.../build.xml)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -351,6 +351,7 @@
 		<mkdir dir="${build.deploy}"/>
 		<mkdir dir="${build.deploy}/lib"/> 
 		<mkdir dir="${build.deploy}/sql"/> 
+		<mkdir dir="${build.deploy}/language"/>
 		 
 		<copy overwrite="yes" todir="${build.deploy}/sql">
 			<fileset dir="${db.scripts}/">
@@ -374,6 +375,12 @@
 			</fileset>
 		</copy>
 
+		<copy overwrite="yes" todir="${build.deploy}/language">
+			<fileset dir="${conf.language.dir}">
+				<include name="*.properties"/>
+			</fileset>
+		</copy>
+
 		<taskdef name="generateDeployProperties" 
 			classname="org.lamsfoundation.lams.tool.deploy.CreateToolPackageTask">
 		    <classpath refid="deploy.lib.classpath"/>
@@ -396,7 +403,16 @@
 			lamsEarPath="${jboss.deploy}"
 			toolContext="${toolContext}"
 			toolWebUri="${product}.war"
-			/>
+			languageFilesPackage="org.lamsfoundation.lams.tool.sbmt">
+
+			<!-- language files go as a fileset. Not nice but can't work out how to embed them in a tag. -->
+			<fileset dir="${build.deploy}/language">
+				<include name="**/*.properties"/>
+				<include name="**/*.txt"/>
+			</fileset>
+				
+		</generateDeployProperties>
+		
 	</target>
 
 	<target name="deploy-tool" depends="delete-exploded-tool-folder,create-deploy-package" 
Index: lams_tool_sbmt/conf/language/SbmtResources.properties
===================================================================
diff -u
--- lams_tool_sbmt/conf/language/SbmtResources.properties	(revision 0)
+++ lams_tool_sbmt/conf/language/SbmtResources.properties	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -0,0 +1,140 @@
+# CVS ID: $Id$
+# Language strings for the File Submission tool.
+
+# ========== Values for tool and library activity. Sent to Flash as part of the learning design toolkit.  ======
+activity.title=File Submission
+activity.description=Learners submit files for assessment by the teacher. Scores and comments may be exported as a spreadsheet.
+activity.helptext=Learners submit files for assessment by the teacher. Scores and comments for each learner are recorded and may be exported as a spreadsheet.
+
+tool.display.name=File Submission Tool
+tool.description=Tool for learners to submit files for assessment by the teacher.
+
+#=========================Common labels===========================#
+label.view=View
+label.download=Download
+label.save=Save
+label.cancel=Cancel
+#=========================labels===========================#
+#-------------------------Authoring Labels-----------------#
+label.authoring.heading=File Submission
+label.authoring.heading.basic=Basic
+label.authoring.heading.basic.desc=Basic input information for submission 
+label.authoring.heading.instructions=Instructions
+label.authoring.heading.instructions.desc=Please input online and offline instructions
+label.authoring.heading.advance=Advanced
+label.authoring.heading.advance.desc=Please input advance options for submission 
+
+label.authoring.basic.title=Title
+label.authoring.basic.instruction=Instruction
+label.authoring.online.instruction =Online Instructions
+label.authoring.offline.instruction=Offline Instructions
+label.authoring.online.file =Upload online file
+label.authoring.offline.file=Upload offline file
+label.authoring.advance.lock.on.finished=Lock on finished
+
+label.authoring.save.button=Save
+label.authoring.cancel.button=Cancel
+label.authoring.choosefile.button=Choose file
+label.authoring.upload.online.button=Upload Online
+label.authoring.upload.offline.button=Upload Offline
+label.authoring.online.filelist=Online file list
+label.authoring.offline.filelist=Offline file list
+label.authoring.online.delete=Delete
+label.authoring.offline.delete=Delete
+
+authoring.exception= There is a problem submitting content, the reason is {0}
+#-------------------------Learners Labels-----------------#
+label.learner.fileName = File Name
+label.learner.filePath = File 
+label.learner.fileDescription = File Description
+label.learner.upload = Upload File
+label.learner.finished = Finished Uploading
+
+label.learner.time = Time Uploaded
+label.learner.dateOfSubmission = Date of Submission
+label.learner.comments = Comments
+label.learner.marks = Marks
+label.learner.dateMarksReleased = Date Marks Released
+
+label.learner.notAvailable = Not Available 
+label.learner.noUpload = No files have been uploaded yet.
+label.learner.uploadMessage = Only one file can be uploaded at a time - Maximum file size is 1.0 MB
+learner.finish.without.upload=No files have been uploaded yet. Files can not be uploaded once you choose OK.
+ 
+#-------------------------Monitoring Labels-----------------#
+
+label.monitoring.heading=Monitoring
+
+label.monitoring.heading.userlist=Summary
+label.monitoring.heading.userlist.desc=User List Description
+
+label.monitoring.heading.instructions=Instructions
+label.monitoring.heading.instructions.desc=Online and offline instructions
+
+label.monitoring.heading.edit.activity=Edit Activity
+label.monitoring.heading.edit.activity.desc=Edit Activity description
+
+label.monitoring.heading.stats=Statistics
+label.monitoring.heading.stats.desc=Statistics description
+
+label.monitoring.heading.marking=Marking
+label.monitoring.heading.marking.desc=Marking description
+
+page.title.mark1.userlist=Report Marking
+label.monitoring.needMarking = File(s) need marking
+
+label.monitoring.done.button=Done
+label.monitoring.viewAllMarks.button=View All Marks
+label.monitoring.Mark.button=Mark
+label.monitoring.releaseMarks.button=Release Marks
+label.monitoring.downloadMarks.button=Download Marks
+label.monitoring.updateMarks.button=Update Marks
+label.monitoring.saveMarks.button=Save Marks
+label.monitoring.finishedMarks.button=Finished
+
+label.monitoring.edit.activity.edit=Edit Activity
+label.monitoring.edit.activity.cancel=Cancel Edit
+label.monitoring.edit.activity.update=Update Activity
+
+monitoring.statistic.title=Statistic for monitoring
+monitoring.statistic.marked=Marked files:
+monitoring.statistic.not.marked=Not marked files:
+monitoring.statistic.total.uploaded.file=Total uploaded files 
+
+#-------------------------Exception Labels-----------------#
+sbmt.web.action.upload.exception = Upload of file failed.
+monitoring.download.error = Download failed becuase of this reason: {0}
+
+submit.upload.twice=You already upload this file, please waiting for a while.
+submit.modenotsupported=The mode "{0}" you've requested is not supported
+submit.successful=The content has been created successfully. 
+# Errors
+learner.form.filepath.displayname=Upload file name
+monitoring.mark.input.error=Invalidate input: {0}
+# -- standard errors --
+errors.header=<UL>
+errors.prefix=<LI>
+errors.suffix=</LI>
+errors.footer=</UL>
+# -- validator --
+errors.invalid={0} is invalid.
+errors.maxlength={0} can not be greater than {1} characters.
+errors.minlength={0} can not be less than {1} characters.
+errors.range={0} is not in the range {1} through {2}.
+errors.required={0} is required.
+errors.byte={0} must be an byte.
+errors.date={0} is not a date.
+errors.double={0} must be an double.
+errors.float={0} must be an float.
+errors.integer={0} must be an integer.
+errors.long={0} must be an long.
+errors.short={0} must be an short.
+errors.creditcard={0} is not a valid credit card number.
+errors.email={0} is an invalid e-mail address.
+# -- other --
+errors.cancel=Operation cancelled.
+errors.detail={0}
+errors.general=The process did not complete. Details should follow.
+errors.token=Request could not be completed. Operation is not in sequence.
+errors.maxfilesize=The uploaded file has exceeded the maximum file size limit of {0} bytes
+error.read.only.mode=Read only mode, function can not be finished
\ No newline at end of file
Index: lams_tool_sbmt/db/sql/activity_insert.sql
===================================================================
diff -u -rcf0462718e704009612fe0c8ecec16d517603a39 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_sbmt/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision cf0462718e704009612fe0c8ecec16d517603a39)
+++ lams_tool_sbmt/db/sql/activity_insert.sql	(.../activity_insert.sql)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -76,5 +76,5 @@
 , NULL
 , NULL
 , NULL
-, 'org.lamsfoundation.tool.sbmt.SbmtResources'
+, 'org.lamsfoundation.lams.tool.sbmt.SbmtResources'
 )
Index: lams_tool_sbmt/db/sql/tool_insert.sql
===================================================================
diff -u -rcf0462718e704009612fe0c8ecec16d517603a39 -r1c31dbd6b844bffd77d86babab9592e8267cc462
--- lams_tool_sbmt/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision cf0462718e704009612fe0c8ecec16d517603a39)
+++ lams_tool_sbmt/db/sql/tool_insert.sql	(.../tool_insert.sql)	(revision 1c31dbd6b844bffd77d86babab9592e8267cc462)
@@ -49,7 +49,7 @@
 'tool/lasbmt11/exportPortfolio?mode=teacher',
 'tool/lasbmt11/contribute.do',
 'tool/lasbmt11/moderation.do',
-'org.lamsfoundation.lams.tool.smbt.web.SmbtResources',
+'org.lamsfoundation.lams.tool.sbmt.SbmtResources',
 NOW()
 );
 
Fisheye: Tag 1c31dbd6b844bffd77d86babab9592e8267cc462 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?