Index: lams_build/build.xml
===================================================================
diff -u -racc8d2acf5b6b0002e0c8129947040a779ab4077 -rea2fc9d773d5151414fea0a71dba64ba36880cd0
--- lams_build/build.xml	(.../build.xml)	(revision acc8d2acf5b6b0002e0c8129947040a779ab4077)
+++ lams_build/build.xml	(.../build.xml)	(revision ea2fc9d773d5151414fea0a71dba64ba36880cd0)
@@ -497,23 +497,33 @@
 	<target name="deploy-learning-libraries">
 
 		<echo>Deploying Library Activities</echo>
+		
+		<property name="dictionary.dir" value="${jboss.deploy}/lams-dictionary.jar/org/lamsfoundation/lams/library/" />
 
 		<!-- Generate the deployment package for share resources / forum parallel activity.-->
 		<ant antfile="buildcombinedtasks.xml" target="deploy-package-library">
 			<property name="assembly.activity" location="${basedir}/assembly/shareresourcesforum"/>
 			<property name="package.cfg" location="librarypackages/shareresourcesforum"/>
+			<property name="language.file.folder" value="librarypackages/shareresourcesforum/language/${conf.application}/" />
+			<property name="dest.language.file.folder" value="${dictionary.dir}/shareresourcesforum/"/>
 		</ant> 
  
 		<!-- Generate the deployment package for chat / scribe parallel activity. -->
 		<ant antfile="buildcombinedtasks.xml" target="deploy-package-library">
 			<property name="assembly.activity" value="${basedir}/assembly/chatscribe"/>
 			<property name="package.cfg" value="librarypackages/chatscribe"/>
+			<property name="conf.application" value="${conf.application}"/>
+			<property name="language.file.folder" value="librarypackages/chatscribe//language/${conf.application}/" />
+			<property name="dest.language.file.folder" value="${dictionary.dir}/chatscribe/"/>
 		</ant> 
 
 		<!-- Generate the deployment package for forum / scribe parallel activity. -->
 		<ant antfile="buildcombinedtasks.xml" target="deploy-package-library">
 			<property name="assembly.activity" value="${basedir}/assembly/forumscribe"/>
 			<property name="package.cfg" value="librarypackages/forumscribe"/>
+			<property name="conf.application" value="${conf.application}"/>
+			<property name="language.file.folder" value="librarypackages/forumscribe/language/${conf.application}/" />
+			<property name="dest.language.file.folder" value="${dictionary.dir}/forumscribe/"/>
 		</ant> 
 		
 </target>
Index: lams_build/buildcombinedtasks.xml
===================================================================
diff -u -r32204441be7aeba6afeda63e5f9c217598bc85fe -rea2fc9d773d5151414fea0a71dba64ba36880cd0
--- lams_build/buildcombinedtasks.xml	(.../buildcombinedtasks.xml)	(revision 32204441be7aeba6afeda63e5f9c217598bc85fe)
+++ lams_build/buildcombinedtasks.xml	(.../buildcombinedtasks.xml)	(revision ea2fc9d773d5151414fea0a71dba64ba36880cd0)
@@ -24,6 +24,7 @@
 			<mkdir dir="${assembly.activity}/lib"/> 
 			<mkdir dir="${assembly.activity}/sql"/> 
 			<mkdir dir="${assembly.activity}/language"/> 
+			<mkdir dir="${dest.language.file.folder}" />
 		
 			<copy overwrite="yes" todir="${assembly.activity}/sql">
 				<fileset dir="${package.cfg}">
@@ -86,6 +87,14 @@
 					<include name="lib/*.jar"/>
 				</fileset>
 			</path> 
+		
+			<!-- copy the language files to the assembly folder -->
+			<echo>Copying language files</echo>
+			<copy overwrite="yes" todir="${dest.language.file.folder}">
+				<fileset dir="${language.file.folder}">
+					<include name="*.properties"/>
+				</fileset>
+			</copy>
 	
 			<java
 				classname="org.lamsfoundation.lams.tool.deploy.libraryActivity.DeployLibrary"
Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar
===================================================================
diff -u -rb2f5f93c82ddd92373684db5b2a1737adff284bf -rea2fc9d773d5151414fea0a71dba64ba36880cd0
Binary files differ
Index: lams_build/librarypackages/chatscribe/libraryActivity1_insert.sql
===================================================================
diff -u -rfc409542d35faf8a5594144465becbd5e2db9fda -rea2fc9d773d5151414fea0a71dba64ba36880cd0
--- lams_build/librarypackages/chatscribe/libraryActivity1_insert.sql	(.../libraryActivity1_insert.sql)	(revision fc409542d35faf8a5594144465becbd5e2db9fda)
+++ lams_build/librarypackages/chatscribe/libraryActivity1_insert.sql	(.../libraryActivity1_insert.sql)	(revision ea2fc9d773d5151414fea0a71dba64ba36880cd0)
@@ -4,12 +4,13 @@
 learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file)
 values
 (null,null,'Combined Chat and Scribe','Prepare Group Report',null,null,null,
 'Learners to prepare group report, discussing report in chat',
 6,null,null,0,
 null,${learning_library_id},now(),0,
 null,null,null,null,
 null,null,null,'images/icon_groupreporting.swf',
-2,0,5);
\ No newline at end of file
+2,0,5,
+'org.lamsfoundation.lams.library.chatscribe.ApplicationResources');
\ No newline at end of file
Index: lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql
===================================================================
diff -u -r9da9dc2bc02f13973e46e044d81aa67ec38ed16c -rea2fc9d773d5151414fea0a71dba64ba36880cd0
--- lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql	(.../libraryActivity1_insert.sql)	(revision 9da9dc2bc02f13973e46e044d81aa67ec38ed16c)
+++ lams_build/librarypackages/forumscribe/libraryActivity1_insert.sql	(.../libraryActivity1_insert.sql)	(revision ea2fc9d773d5151414fea0a71dba64ba36880cd0)
@@ -4,12 +4,13 @@
 learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file)
 values
 (null,null,'Combined Chat and Scribe','Prepare Group Report',null,null,null,
 'Learners to prepare group report, discussing report in chat',
 6,null,null,0,
 null,${learning_library_id},now(),0,
 null,null,null,null,
 null,null,null,'images/icon_forum_and_scribe.swf',
-2,0,5);
\ No newline at end of file
+2,0,5,
+'org.lamsfoundation.lams.library.forumscribe.ApplicationResources');
\ No newline at end of file
Index: lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql
===================================================================
diff -u -r2f6f18089281ed02aeb71d8bb1d1f06fcd25e81a -rea2fc9d773d5151414fea0a71dba64ba36880cd0
--- lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql	(.../libraryActivity1_insert.sql)	(revision 2f6f18089281ed02aeb71d8bb1d1f06fcd25e81a)
+++ lams_build/librarypackages/shareresourcesforum/libraryActivity1_insert.sql	(.../libraryActivity1_insert.sql)	(revision ea2fc9d773d5151414fea0a71dba64ba36880cd0)
@@ -4,12 +4,13 @@
 learning_design_id,learning_library_id,create_date_time,run_offline_flag,
 max_number_of_options,min_number_of_options,tool_id,tool_content_id,
 gate_activity_level_id,gate_start_time_offset,gate_end_time_offset,library_activity_ui_image,
-grouping_support_type_id, apply_grouping_flag,activity_category_id)
+grouping_support_type_id, apply_grouping_flag,activity_category_id, language_file)
 values
 (null,null,'Combined Share Resources and Forum','Discuss Shared Resources',null,null,null,
 'Learners to discuss items they have viewed via Share Resources.',
 6,null,null,0,
 null,${learning_library_id},now(),0,
 null,null,null,null,
 null,null,null,'images/icon_urlcontentmessageboard.swf',
-2,0,5);
\ No newline at end of file
+2,0,5,
+'org.lamsfoundation.lams.library.shareresourcesforum.ApplicationResources');
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030301.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030301.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02030301.sql	(revision ea2fc9d773d5151414fea0a71dba64ba36880cd0)
@@ -0,0 +1,24 @@
+-- SQL statements to set the database/lams version at 2.3.2
+
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+-- LDEV-2450
+update lams_learning_activity set 
+	language_file='org.lamsfoundation.lams.library.shareresourcesforum.ApplicationResources1' 
+		where library_activity_ui_image='images/icon_urlcontentmessageboard.swf' and learning_design_id is NULL;
+update lams_learning_activity set 
+	language_file='org.lamsfoundation.lams.library.chatscribe.ApplicationResources2' 
+		where library_activity_ui_image='images/icon_groupreporting.swf' and learning_design_id is NULL;
+update lams_learning_activity set 
+	language_file='org.lamsfoundation.lams.library.forumscribe.ApplicationResources3' 
+		where library_activity_ui_image='images/icon_forum_and_scribe.swf' and learning_design_id is NULL;
+			
+			
+update lams_configuration set config_value='2.3.3' where config_key='Version';
+update lams_configuration set config_value='2.3.3.200910300000' where config_key='LearnerClientVersion' OR config_key='ServerVersionNumber' OR config_key='MonitorClientVersion' OR config_key='AuthoringClientVersion';
+update lams_configuration set config_value='2009-10-30' where config_key='DictionaryDateCreated';
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
\ No newline at end of file
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/libraryActivity/DeployLibrary.java
===================================================================
diff -u -r9ff87804184bccc69ba433b5c11daa0f1d4bda95 -rea2fc9d773d5151414fea0a71dba64ba36880cd0
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/libraryActivity/DeployLibrary.java	(.../DeployLibrary.java)	(revision 9ff87804184bccc69ba433b5c11daa0f1d4bda95)
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/libraryActivity/DeployLibrary.java	(.../DeployLibrary.java)	(revision ea2fc9d773d5151414fea0a71dba64ba36880cd0)
@@ -68,6 +68,9 @@
 		String languageFileDirectory = lib.getLanguageFileDirectory();
 		if (languageFileDirectory != null) {
 
+		    // This is for combined tools only, deprecated
+		    
+		    /*
 		    // generate package names in which the language files are placed.
 		    String packagePath = "org.lamsfoundation.lams.library.llid" + lib.getLearningLibraryId();
 
@@ -87,6 +90,7 @@
 		    activityDBTask.setActivityId(lib.getParentActivityId());
 		    activityDBTask.setLanguageFilename(packagePath + '.' + lib.getLanguageFileRoot());
 		    activityDBTask.execute();
+		    */
 		}
 
 		System.out.println("Activating learning library " + lib.getLearningLibraryId());