Index: lams_admin/web/toolcontent/learningLibraryGroup.jsp
===================================================================
diff -u -rff01a6c237cefc4a5186889bf46041152cfc37ae -r711e1fbc1443b1dc7c19e5cbf6358744499590a4
--- lams_admin/web/toolcontent/learningLibraryGroup.jsp	(.../learningLibraryGroup.jsp)	(revision ff01a6c237cefc4a5186889bf46041152cfc37ae)
+++ lams_admin/web/toolcontent/learningLibraryGroup.jsp	(.../learningLibraryGroup.jsp)	(revision 711e1fbc1443b1dc7c19e5cbf6358744499590a4)
@@ -18,10 +18,14 @@
 		
 			LAMS_URL = '<lams:LAMSURL/>',
 			LABELS = {
-					GROUP_DEFAULT_NAME : '<fmt:message key="tool.groups.group.default.name" />',
-					GROUP_REMOVE_CONFIRM : '<fmt:message key="tool.groups.remove.confirm" />',
-					GROUP_NAME_VALIDATION_ERROR : '<fmt:message key="tool.groups.group.name.error" />',
-					SAVE_ERROR : '<fmt:message key="tool.groups.save.error" />'
+					<fmt:message key="tool.groups.group.default.name" var="GROUP_DEFAULT_NAME_VAR"/>
+					GROUP_DEFAULT_NAME : '<c:out value="GROUP_DEFAULT_NAME_VAR" />',
+					<fmt:message key="tool.groups.remove.confirm" var="GROUP_REMOVE_CONFIRM_VAR"/>
+					GROUP_REMOVE_CONFIRM : '<c:out value="GROUP_REMOVE_CONFIRM_VAR" />',
+					<fmt:message key="tool.groups.group.name.error" var="GROUP_NAME_VALIDATION_ERROR_VAR"/>
+					GROUP_NAME_VALIDATION_ERROR : '<c:out value="GROUP_NAME_VALIDATION_ERROR_VAR" />',
+					<fmt:message key="tool.groups.save.error" var="SAVE_ERROR_VAR"/>
+					SAVE_ERROR : '<c:out value="SAVE_ERROR_VAR" />'
 			};
 	</script>
 </lams:head>
Index: lams_central/web/authoring/authoring.jsp
===================================================================
diff -u -ra2c2ffbc4808b62204aabfd45b1697ef623f4f89 -r711e1fbc1443b1dc7c19e5cbf6358744499590a4
--- lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision a2c2ffbc4808b62204aabfd45b1697ef623f4f89)
+++ lams_central/web/authoring/authoring.jsp	(.../authoring.jsp)	(revision 711e1fbc1443b1dc7c19e5cbf6358744499590a4)
@@ -40,119 +40,221 @@
 			LD_THUMBNAIL_URL_BASE = LAMS_URL + 'home.do?method=createLearningDesignThumbnail&ldId=',
 			LABELS = {
 				// ActivityLib
-				DEFAULT_GROUPING_TITLE : '<fmt:message key="authoring.fla.default.group.title" />',
-				DEFAULT_GROUP_PREFIX : '<fmt:message key="authoring.fla.default.group.prefix" />',
-				DEFAULT_BRANCHING_TITLE : '<fmt:message key="authoring.fla.default.branching.title" />',
-				DEFAULT_BRANCH_PREFIX : '<fmt:message key="authoring.fla.default.branch.prefix" />',
-				DEFAULT_OPTIONAL_ACTIVITY_TITLE : '<fmt:message key="authoring.fla.default.optional.activity.title" />',
-				SUPPORT_ACTIVITY_TITLE : '<fmt:message key="authoring.fla.support.activity.title" />',
-				GATE_ACTIVITY_LABEL : '<fmt:message key="authoring.fla.gate.activity.label" />',
-				BRANCHING_START_SUFFIX : '<fmt:message key="authoring.fla.branching.start.suffix" />',
-				BRANCHING_END_SUFFIX : '<fmt:message key="authoring.fla.branching.end.suffix" />',
-				REMOVE_ACTIVITY_CONFIRM : '<fmt:message key="authoring.fla.remove.activity.confirm" />',
-				BRANCHING_CREATE_CONFIRM : '<fmt:message key="authoring.fla.branching.create.confirm" />',
-				TRANSITION_TO_EXISTS_ERROR : '<fmt:message key="authoring.fla.transition.to.exists.error" />',
-				CIRCULAR_SEQUENCE_ERROR : '<fmt:message key="authoring.fla.circular.sequence.error" />',
-				ACTIVITY_IN_CONTAINER_ERROR : '<fmt:message key="authoring.fla.activity.in.container.error" />',
+				<fmt:message key="authoring.fla.default.group.title" var="DEFAULT_GROUPING_TITLE_VAR"/>
+				DEFAULT_GROUPING_TITLE : '<c:out value="DEFAULT_GROUPING_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.default.group.prefix" var="DEFAULT_GROUP_PREFIX_VAR"/>
+				DEFAULT_GROUP_PREFIX : '<c:out value="DEFAULT_GROUP_PREFIX_VAR" />',
+				<fmt:message key="authoring.fla.default.branching.title" var="DEFAULT_BRANCHING_TITLE_VAR"/>
+				DEFAULT_BRANCHING_TITLE : '<c:out value="DEFAULT_BRANCHING_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.default.branch.prefix" var="DEFAULT_BRANCH_PREFIX_VAR"/>
+				DEFAULT_BRANCH_PREFIX : '<c:out value="DEFAULT_BRANCH_PREFIX_VAR" />',
+				<fmt:message key="authoring.fla.default.optional.activity.title" var="DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR"/>
+				DEFAULT_OPTIONAL_ACTIVITY_TITLE : '<c:out value="DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.support.activity.title" var="SUPPORT_ACTIVITY_TITLE_VAR"/>
+				SUPPORT_ACTIVITY_TITLE : '<c:out value="SUPPORT_ACTIVITY_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.gate.activity.label" var="GATE_ACTIVITY_LABEL_VAR"/>
+				GATE_ACTIVITY_LABEL : '<c:out value="GATE_ACTIVITY_LABEL_VAR" />',
+				<fmt:message key="authoring.fla.branching.start.suffix" var="BRANCHING_START_SUFFIX_VAR"/>
+				BRANCHING_START_SUFFIX : '<c:out value="BRANCHING_START_SUFFIX_VAR" />',
+				<fmt:message key="authoring.fla.branching.end.suffix" var="BRANCHING_END_SUFFIX_VAR"/>
+				BRANCHING_END_SUFFIX : '<c:out value="BRANCHING_END_SUFFIX_VAR" />',
+				<fmt:message key="authoring.fla.remove.activity.confirm" var="REMOVE_ACTIVITY_CONFIRM_VAR"/>
+				REMOVE_ACTIVITY_CONFIRM : '<c:out value="REMOVE_ACTIVITY_CONFIRM_VAR" />',
+				<fmt:message key="authoring.fla.branching.create.confirm" var="BRANCHING_CREATE_CONFIRM_VAR"/>
+				BRANCHING_CREATE_CONFIRM : '<c:out value="BRANCHING_CREATE_CONFIRM_VAR" />',
+				<fmt:message key="authoring.fla.transition.to.exists.error" var="TRANSITION_TO_EXISTS_ERROR_VAR"/>
+				TRANSITION_TO_EXISTS_ERROR : '<c:out value="TRANSITION_TO_EXISTS_ERROR_VAR" />',
+				<fmt:message key="authoring.fla.circular.sequence.error" var="CIRCULAR_SEQUENCE_ERROR_VAR"/>
+				CIRCULAR_SEQUENCE_ERROR : '<c:out value="CIRCULAR_SEQUENCE_ERROR_VAR" />',
+				<fmt:message key="authoring.fla.activity.in.container.error" var="ACTIVITY_IN_CONTAINER_ERROR_VAR"/>
+				ACTIVITY_IN_CONTAINER_ERROR : '<c:out value="ACTIVITY_IN_CONTAINER_ERROR_VAR" />',
 				
 				// DecorationLib
-				DEFAULT_ANNOTATION_LABEL_TITLE : '<fmt:message key="authoring.fla.default.annotation.label.title" />',
-				REGION_FIT_BUTTON_TOOLTIP : '<fmt:message key="authoring.fla.region.fit.button.tooltip" />',
+				<fmt:message key="authoring.fla.default.annotation.label.title" var="DEFAULT_ANNOTATION_LABEL_TITLE_VAR"/>
+				DEFAULT_ANNOTATION_LABEL_TITLE : '<c:out value="DEFAULT_ANNOTATION_LABEL_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.region.fit.button.tooltip" var="REGION_FIT_BUTTON_TOOLTIP_VAR"/>
+				REGION_FIT_BUTTON_TOOLTIP : '<c:out value="REGION_FIT_BUTTON_TOOLTIP_VAR" />',
 				
 				// General
-				NEW_FOLDER_BUTTON : '<fmt:message key="authoring.fla.new.folder.button" />',
-				COPY_BUTTON : '<fmt:message key="authoring.fla.copy.button" />',
-				PASTE_BUTTON : '<fmt:message key="authoring.fla.paste.button" />',
-				DELETE_BUTTON : '<fmt:message key="authoring.fla.delete.button" />',
-				RENAME_BUTTON : '<fmt:message key="authoring.fla.rename.button" />',
-				OPEN_BUTTON : '<fmt:message key="authoring.fla.open.button" />',
-				SAVE_BUTTON : '<fmt:message key="authoring.fla.save.button" />',
-				IMPORT_BUTTON : '<fmt:message key="authoring.fla.import.button" />',
-				FOLDER : '<fmt:message key="authoring.fla.folder" />',
-				SEQUENCE : '<fmt:message key="authoring.fla.sequence" />',
-				SEQUENCE_NOT_VALID : '<fmt:message key="authoring.fla.sequence.not.valid" />',
-				SEQUENCE_VALIDATION_ISSUES : '<fmt:message key="authoring.fla.sequence.validation.issues" />',
-				SAVE_SUCCESSFUL : '<fmt:message key="authoring.fla.save.successful" />',
-				NAVIGATE_AWAY_CONFIRM : '<fmt:message key="authoring.fla.navigate.away.confirm" />',
-				DELETE_NODE_CONFIRM : '<fmt:message key="authoring.fla.delete.node.confirm" />',
-				SEQUENCE_OVERWRITE_CONFIRM : '<fmt:message key="authoring.fla.sequence.overwrite.confirm" />',
-				NEW_FOLDER_TITLE_PROMPT : '<fmt:message key="authoring.fla.new.folder.title.prompt" />',
-				RENAME_TITLE_PROMPT : '<fmt:message key="authoring.fla.rename.title.prompt" />',
-				SAVE_SEQUENCE_TITLE_PROMPT : '<fmt:message key="authoring.fla.save.sequence.title.prompt" />',
-				IMPORT_PART_CHOOSE_PROMPT : '<fmt:message key="authoring.fla.import.part.choose.prompt" />',
-				FOLDER_NOT_SELECTED_ERROR : '<fmt:message key="authoring.fla.folder.not.selected.error" />',
-				TITLE_VALIDATION_ERROR : '<fmt:message key="authoring.fla.title.validation.error" />',
-				FOLDER_EXISTS_ERROR : '<fmt:message key="authoring.fla.folder.exists.error" />',
-				SEQUENCE_EXISTS_ERROR : '<fmt:message key="authoring.fla.sequence.exists.error" />',
-				SEQUENCE_SAVE_ERROR : '<fmt:message key="authoring.fla.sequence.save.error" />',
-				SEQUENCE_NOT_SELECTED_ERROR : '<fmt:message key="authoring.fla.sequence.not.selected.error" />',
-				SEQUENCE_LOAD_ERROR : '<fmt:message key="authoring.fla.sequence.load.error" />',
+				<fmt:message key="authoring.fla.new.folder.button" var="NEW_FOLDER_BUTTON_VAR"/>
+				NEW_FOLDER_BUTTON : '<c:out value="NEW_FOLDER_BUTTON_VAR" />',
+				<fmt:message key="authoring.fla.copy.button" var="COPY_BUTTON_VAR"/>
+				COPY_BUTTON : '<c:out value="COPY_BUTTON_VAR" />',
+				<fmt:message key="authoring.fla.paste.button" var="PASTE_BUTTON_VAR"/>
+				PASTE_BUTTON : '<c:out value="PASTE_BUTTON_VAR" />',
+				<fmt:message key="authoring.fla.delete.button" var="DELETE_BUTTON_VAR"/>
+				DELETE_BUTTON : '<c:out value="DELETE_BUTTON_VAR" />',
+				<fmt:message key="authoring.fla.rename.button" var="RENAME_BUTTON_VAR"/>
+				RENAME_BUTTON : '<c:out value="RENAME_BUTTON_VAR" />',
+				<fmt:message key="authoring.fla.open.button" var="OPEN_BUTTON_VAR"/>
+				OPEN_BUTTON : '<c:out value="OPEN_BUTTON_VAR" />',
+				<fmt:message key="authoring.fla.save.button" var="SAVE_BUTTON_VAR"/>
+				SAVE_BUTTON : '<c:out value="SAVE_BUTTON_VAR" />',
+				<fmt:message key="authoring.fla.import.button" var="IMPORT_BUTTON_VAR"/>
+				IMPORT_BUTTON : '<c:out value="IMPORT_BUTTON_VAR" />',
+				<fmt:message key="authoring.fla.folder" var="FOLDER_VAR"/>
+				FOLDER : '<c:out value="FOLDER_VAR" />',
+				<fmt:message key="authoring.fla.sequence" var="SEQUENCE_VAR"/>
+				SEQUENCE : '<c:out value="SEQUENCE_VAR" />',
+				<fmt:message key="authoring.fla.sequence.not.valid" var="SEQUENCE_NOT_VALID_VAR"/>
+				SEQUENCE_NOT_VALID : '<c:out value="SEQUENCE_NOT_VALID_VAR" />',
+				<fmt:message key="authoring.fla.sequence.validation.issues" var="SEQUENCE_VALIDATION_ISSUES_VAR"/>
+				SEQUENCE_VALIDATION_ISSUES : '<c:out value="SEQUENCE_VALIDATION_ISSUES_VAR" />',
+				<fmt:message key="authoring.fla.save.successful" var="SAVE_SUCCESSFUL_VAR"/>
+				SAVE_SUCCESSFUL : '<c:out value="SAVE_SUCCESSFUL_VAR" />',
+				<fmt:message key="authoring.fla.navigate.away.confirm" var="NAVIGATE_AWAY_CONFIRM_VAR"/>
+				NAVIGATE_AWAY_CONFIRM : '<c:out value="NAVIGATE_AWAY_CONFIRM_VAR" />',
+				<fmt:message key="authoring.fla.delete.node.confirm" var="DELETE_NODE_CONFIRM_VAR"/>
+				DELETE_NODE_CONFIRM : '<c:out value="DELETE_NODE_CONFIRM_VAR" />',
+				<fmt:message key="authoring.fla.sequence.overwrite.confirm" var="SEQUENCE_OVERWRITE_CONFIRM_VAR"/>
+				SEQUENCE_OVERWRITE_CONFIRM : '<c:out value="SEQUENCE_OVERWRITE_CONFIRM_VAR" />',
+				<fmt:message key="authoring.fla.new.folder.title.prompt" var="NEW_FOLDER_TITLE_PROMPT_VAR"/>
+				NEW_FOLDER_TITLE_PROMPT : '<c:out value="NEW_FOLDER_TITLE_PROMPT_VAR" />',
+				<fmt:message key="authoring.fla.rename.title.prompt" var="RENAME_TITLE_PROMPT_VAR"/>
+				RENAME_TITLE_PROMPT : '<c:out value="RENAME_TITLE_PROMPT_VAR" />',
+				<fmt:message key="authoring.fla.save.sequence.title.prompt" var="SAVE_SEQUENCE_TITLE_PROMPT_VAR"/>
+				SAVE_SEQUENCE_TITLE_PROMPT : '<c:out value="SAVE_SEQUENCE_TITLE_PROMPT_VAR" />',
+				<fmt:message key="authoring.fla.import.part.choose.prompt" var="IMPORT_PART_CHOOSE_PROMPT_VAR"/>
+				IMPORT_PART_CHOOSE_PROMPT : '<c:out value="IMPORT_PART_CHOOSE_PROMPT_VAR" />',
+				<fmt:message key="authoring.fla.folder.not.selected.error" var="FOLDER_NOT_SELECTED_ERROR_VAR"/>
+				FOLDER_NOT_SELECTED_ERROR : '<c:out value="FOLDER_NOT_SELECTED_ERROR_VAR" />',
+				<fmt:message key="authoring.fla.title.validation.error" var="TITLE_VALIDATION_ERROR_VAR"/>
+				TITLE_VALIDATION_ERROR : '<c:out value="TITLE_VALIDATION_ERROR_VAR" />',
+				<fmt:message key="authoring.fla.folder.exists.error" var="FOLDER_EXISTS_ERROR_VAR"/>
+				FOLDER_EXISTS_ERROR : '<c:out value="FOLDER_EXISTS_ERROR_VAR" />',
+				<fmt:message key="authoring.fla.sequence.exists.error" var="SEQUENCE_EXISTS_ERROR_VAR"/>
+				SEQUENCE_EXISTS_ERROR : '<c:out value="SEQUENCE_EXISTS_ERROR_VAR" />',
+				<fmt:message key="authoring.fla.sequence.save.error" var="SEQUENCE_SAVE_ERROR_VAR"/>
+				SEQUENCE_SAVE_ERROR : '<c:out value="SEQUENCE_SAVE_ERROR_VAR" />',
+				<fmt:message key="authoring.fla.sequence.not.selected.error" var="SEQUENCE_NOT_SELECTED_ERROR_VAR"/>
+				SEQUENCE_NOT_SELECTED_ERROR : '<c:out value="SEQUENCE_NOT_SELECTED_ERROR_VAR" />',
+				<fmt:message key="authoring.fla.sequence.load.error" var="SEQUENCE_LOAD_ERROR_VAR"/>
+				SEQUENCE_LOAD_ERROR : '<c:out value="SEQUENCE_LOAD_ERROR_VAR" />',
 				
 				// HandlerLib
-				TRANSITION_FROM_EXISTS_ERROR : '<fmt:message key="authoring.fla.transition.from.exists.error" />',
+				<fmt:message key="authoring.fla.transition.from.exists.error" var="TRANSITION_FROM_EXISTS_ERROR_VAR"/>
+				TRANSITION_FROM_EXISTS_ERROR : '<c:out value="TRANSITION_FROM_EXISTS_ERROR_VAR" />',
 				
 				// MenuLib
-				EXPORT_IMAGE_DIALOG_TITLE : '<fmt:message key="authoring.fla.export.image.dialog.title" />',
-				EXPORT_SEQUENCE_DIALOG_TITLE : '<fmt:message key="authoring.fla.export.sequence.dialog.title" />',
-				ACTIVITY_COPY_TITLE_PREFIX : '<fmt:message key="authoring.fla.activity.copy.title.prefix" />',
-				PREVIEW_LESSON_DEFAULT_TITLE : '<fmt:message key="authoring.fla.preview.lesson.default.title" />',
-				SAVE_DIALOG_TITLE : '<fmt:message key="authoring.fla.save.dialog.title" />',
-				OPEN_DIALOG_TITLE : '<fmt:message key="authoring.fla.open.dialog.title" />',
-				IMPORT_PART_DIALOG_TITLE : '<fmt:message key="authoring.fla.import.part.dialog.title" />',
-				RUN_SEQUENCES_FOLDER : '<fmt:message key="label.tab.lesson.sequence.folder" />',
-				ARRANGE_CONFIRM : '<fmt:message key="authoring.fla.arrange.confirm" />',
-				CLEAR_CANVAS_CONFIRM : '<fmt:message key="authoring.fla.clear.canvas.confirm" />',
-				BRANCHING_START_PLACE_PROMPT : '<fmt:message key="authoring.fla.branching.start.place.prompt" />',
-				BRANCHING_END_PLACE_PROMPT : '<fmt:message key="authoring.fla.branching.end.place.prompt" />',
-				ANNOTATION_REGION_PLACE_PROMPT : '<fmt:message key="authoring.fla.annotation.region.place.prompt" />',
-				ANNOTATION_LABEL_PLACE_PROMPT : '<fmt:message key="authoring.fla.annotation.label.place.prompt" />',
-				OPTIONAL_ACTIVITY_PLACE_PROMPT : '<fmt:message key="authoring.fla.optional.activity.place.prompt" />',
-				SUPPORT_ACTIVITY_PLACE_PROMPT : '<fmt:message key="authoring.fla.support.activity.place.prompt" />',
-				TRANSITION_PLACE_PROMPT : '<fmt:message key="authoring.fla.transition.place.prompt" />',
-				PASTE_ERROR : '<fmt:message key="authoring.fla.paste.error" />',
-				PREVIEW_ERROR : '<fmt:message key="authoring.fla.preview.error" />',
-				CROSS_BRANCHING_ERROR : '<fmt:message key="authoring.fla.cross.branching.error" />',
-				END_MATCH_ERROR : '<fmt:message key="authoring.fla.end.match.error" />',
+				<fmt:message key="authoring.fla.export.image.dialog.title" var="EXPORT_IMAGE_DIALOG_TITLE_VAR"/>
+				EXPORT_IMAGE_DIALOG_TITLE : '<c:out value="EXPORT_IMAGE_DIALOG_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.export.sequence.dialog.title" var="EXPORT_SEQUENCE_DIALOG_TITLE_VAR"/>
+				EXPORT_SEQUENCE_DIALOG_TITLE : '<c:out value="EXPORT_SEQUENCE_DIALOG_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.activity.copy.title.prefix" var="ACTIVITY_COPY_TITLE_PREFIX_VAR"/>
+				ACTIVITY_COPY_TITLE_PREFIX : '<c:out value="ACTIVITY_COPY_TITLE_PREFIX_VAR" />',
+				<fmt:message key="authoring.fla.preview.lesson.default.title" var="PREVIEW_LESSON_DEFAULT_TITLE_VAR"/>
+				PREVIEW_LESSON_DEFAULT_TITLE : '<c:out value="PREVIEW_LESSON_DEFAULT_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.save.dialog.title" var="SAVE_DIALOG_TITLE_VAR"/>
+				SAVE_DIALOG_TITLE : '<c:out value="SAVE_DIALOG_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.open.dialog.title" var="OPEN_DIALOG_TITLE_VAR"/>
+				OPEN_DIALOG_TITLE : '<c:out value="OPEN_DIALOG_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.import.part.dialog.title" var="IMPORT_PART_DIALOG_TITLE_VAR"/>
+				IMPORT_PART_DIALOG_TITLE : '<c:out value="IMPORT_PART_DIALOG_TITLE_VAR" />',
+				<fmt:message key="label.tab.lesson.sequence.folder" var="RUN_SEQUENCES_FOLDER_VAR"/>
+				RUN_SEQUENCES_FOLDER : '<c:out value="RUN_SEQUENCES_FOLDER_VAR" />',
+				<fmt:message key="authoring.fla.arrange.confirm" var="ARRANGE_CONFIRM_VAR"/>
+				ARRANGE_CONFIRM : '<c:out value="ARRANGE_CONFIRM_VAR" />',
+				<fmt:message key="authoring.fla.clear.canvas.confirm" var="CLEAR_CANVAS_CONFIRM_VAR"/>
+				CLEAR_CANVAS_CONFIRM : '<c:out value="CLEAR_CANVAS_CONFIRM_VAR" />',
+				<fmt:message key="authoring.fla.branching.start.place.prompt" var="BRANCHING_START_PLACE_PROMPT_VAR"/>
+				BRANCHING_START_PLACE_PROMPT : '<c:out value="BRANCHING_START_PLACE_PROMPT_VAR" />',
+				<fmt:message key="authoring.fla.branching.end.place.prompt" var="BRANCHING_END_PLACE_PROMPT_VAR"/>
+				BRANCHING_END_PLACE_PROMPT : '<c:out value="BRANCHING_END_PLACE_PROMPT_VAR" />',
+				<fmt:message key="authoring.fla.annotation.region.place.prompt" var="ANNOTATION_REGION_PLACE_PROMPT_VAR"/>
+				ANNOTATION_REGION_PLACE_PROMPT : '<c:out value="ANNOTATION_REGION_PLACE_PROMPT_VAR" />',
+				<fmt:message key="authoring.fla.annotation.label.place.prompt" var="ANNOTATION_LABEL_PLACE_PROMPT_VAR"/>
+				ANNOTATION_LABEL_PLACE_PROMPT : '<c:out value="ANNOTATION_LABEL_PLACE_PROMPT_VAR" />',
+				<fmt:message key="authoring.fla.optional.activity.place.prompt" var="OPTIONAL_ACTIVITY_PLACE_PROMPT_VAR"/>
+				OPTIONAL_ACTIVITY_PLACE_PROMPT : '<c:out value="OPTIONAL_ACTIVITY_PLACE_PROMPT_VAR" />',
+				<fmt:message key="authoring.fla.support.activity.place.prompt" var="SUPPORT_ACTIVITY_PLACE_PROMPT_VAR"/>
+				SUPPORT_ACTIVITY_PLACE_PROMPT : '<c:out value="SUPPORT_ACTIVITY_PLACE_PROMPT_VAR" />',
+				<fmt:message key="authoring.fla.transition.place.prompt" var="TRANSITION_PLACE_PROMPT_VAR"/>
+				TRANSITION_PLACE_PROMPT : '<c:out value="TRANSITION_PLACE_PROMPT_VAR" />',
+				<fmt:message key="authoring.fla.paste.error" var="PASTE_ERROR_VAR"/>
+				PASTE_ERROR : '<c:out value="PASTE_ERROR_VAR" />',
+				<fmt:message key="authoring.fla.preview.error" var="PREVIEW_ERROR_VAR"/>
+				PREVIEW_ERROR : '<c:out value="PREVIEW_ERROR_VAR" />',
+				<fmt:message key="authoring.fla.cross.branching.error" var="CROSS_BRANCHING_ERROR_VAR"/>
+				CROSS_BRANCHING_ERROR : '<c:out value="CROSS_BRANCHING_ERROR_VAR" />',
+				<fmt:message key="authoring.fla.end.match.error" var="END_MATCH_ERROR_VAR"/>
+				END_MATCH_ERROR : '<c:out value="END_MATCH_ERROR_VAR" />',
 				
 				
 				// PropertyLib
-				OK_BUTTON : '<fmt:message key="authoring.fla.ok.button" />',
-				CANCEL_BUTTON : '<fmt:message key="authoring.fla.cancel.button" />',
-				CLEAR_ALL_BUTTON : '<fmt:message key="authoring.fla.clear.all.button" />',
-				REFRESH_BUTTON : '<fmt:message key="authoring.fla.refresh.button" />',
-				REMOVE_CONDITION_BUTTON : '<fmt:message key="authoring.fla.remove.condition.button" />',
-				PROPERTIES_DIALOG_TITLE : '<fmt:message key="authoring.fla.properties.dialog.title" />',
-				GROUP_NAMING_DIALOG_TITLE : '<fmt:message key="authoring.fla.group.naming.dialog.title" />',
-				GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE : '<fmt:message key="authoring.fla.groups.to.branches.match.dialog_title" />',
-				BRANCH_MAPPING_GROUPS_HEADER : '<fmt:message key="authoring.fla.branch.mapping.groups.header" />',
-				BRANCH_MAPPING_GROUP_HEADER : '<fmt:message key="authoring.fla.branch.mapping.group.header" />',
-				CONDITIONS_DIALOG_TITLE : '<fmt:message key="authoring.fla.conditions.dialog.title" />',
-				BRANCH_MAPPING_CONDITIONS_HEADER : '<fmt:message key="authoring.fla.branch.mapping.conditions.header" />',
-				BRANCH_MAPPING_CONDITION_HEADER : '<fmt:message key="authoring.fla.branch.mapping.condition.header" />',
-				BRANCH_MAPPING_GATE_HEADER : '<fmt:message key="authoring.fla.branch.mapping.gate.header" />',
-				BRANCH_MAPPING_BRANCHES_HEADER : '<fmt:message key="authoring.fla.branch.mapping.branches.header" />',
-				BRANCH_MAPPING_BRANCH_HEADER : '<fmt:message key="authoring.fla.branch.mapping.branch.header" />',
-				GATE_STATE_MAPPING_DIALOG_TITLE : '<fmt:message key="authoring.fla.gate.state.mapping.dialog.title" />',
-				BRANCH_MAPPING_DIALOG_TITLE : '<fmt:message key="authoring.fla.branch.mapping.dialog.title" />',
-				GATE_STATE_OPEN : '<fmt:message key="authoring.fla.gate.state.open" />',
-				GATE_STATE_CLOSED : '<fmt:message key="authoring.fla.gate.state.closed" />',
-				BRANCH_MAPPING_DEFAULT_BRANCH_SUFFIX : '<fmt:message key="authoring.fla.branch.mapping.default.branch.suffix" />',
-				COMPLEX_OUTPUT_SUFFIX : '<fmt:message key="authoring.fla.complex.output.suffix" />',
-				RANGE_OUTPUT_SUFFIX : '<fmt:message key="authoring.fla.range.output.suffix" />',
-				RANGE_CONDITION_DESCRIPTION : '<fmt:message key="authoring.fla.range.condition.description" />',
-				EXACT_CONDITION_DESCRIPTION : '<fmt:message key="authoring.fla.exact.condition.description" />',
-				LESS_CONDITION_DESCRIPTION : '<fmt:message key="authoring.fla.less.condition.description" />',
-				GREATER_CONDITION_DESCRIPTION : '<fmt:message key="authoring.fla.greater.condition.description" />',
-				DEFAULT_RANGE_CONDITION_TITLE_PREFIX : '<fmt:message key="authoring.fla.default.range.condition.title.prefix" />',
-				CLEAR_ALL_CONFIRM : '<fmt:message key="authoring.fla.clear.all.confirm" />',
-				REMOVE_CONDITION_CONFIRM : '<fmt:message key="authoring.fla.remove.condition.confirm" />',
-				REFRESH_CONDITIONS_CONFIRM : '<fmt:message key="authoring.fla.refresh.conditions.confirm" />',
-				CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM : '<fmt:message key="authoring.fla.conditions.to.default.gate.state.confirm" />',
-				CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM : '<fmt:message key="authoring.fla.conditions.to.default.branch.confirm" />',
-				GROUPS_TO_DEFAULT_BRANCH_CONFIRM : '<fmt:message key="authoring.fla.groups.to.default.branch.confirm" />',
-				RANGE_CONDITION_ADD_START_ERROR : '<fmt:message key="authoring.fla.range.condition.add.start.error" />',
-				RANGE_CONDITION_ADD_END_ERROR : '<fmt:message key="authoring.fla.range.condition.add.end.error" />',
-				GROUP_TITLE_VALIDATION_ERORR : '<fmt:message key="authoring.fla.group.title.validation.erorr" />',
+				<fmt:message key="authoring.fla.ok.button" var="OK_BUTTON_VAR"/>
+				OK_BUTTON : '<c:out value="OK_BUTTON_VAR" />',
+				<fmt:message key="authoring.fla.cancel.button" var="CANCEL_BUTTON_VAR"/>
+				CANCEL_BUTTON : '<c:out value="CANCEL_BUTTON_VAR" />',
+				<fmt:message key="authoring.fla.clear.all.button" var="CLEAR_ALL_BUTTON_VAR"/>
+				CLEAR_ALL_BUTTON : '<c:out value="CLEAR_ALL_BUTTON_VAR" />',
+				<fmt:message key="authoring.fla.refresh.button" var="REFRESH_BUTTON_VAR"/>
+				REFRESH_BUTTON : '<c:out value="REFRESH_BUTTON_VAR" />',
+				<fmt:message key="authoring.fla.remove.condition.button" var="REMOVE_CONDITION_BUTTON_VAR"/>
+				REMOVE_CONDITION_BUTTON : '<c:out value="REMOVE_CONDITION_BUTTON_VAR" />',
+				<fmt:message key="authoring.fla.properties.dialog.title" var="PROPERTIES_DIALOG_TITLE_VAR"/>
+				PROPERTIES_DIALOG_TITLE : '<c:out value="PROPERTIES_DIALOG_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.group.naming.dialog.title" var="GROUP_NAMING_DIALOG_TITLE_VAR"/>
+				GROUP_NAMING_DIALOG_TITLE : '<c:out value="GROUP_NAMING_DIALOG_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.groups.to.branches.match.dialog_title" var="GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE_VAR"/>
+				GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE : '<c:out value="GROUPS_TO_BRANCHES_MATCH_DIALOG_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.branch.mapping.groups.header" var="BRANCH_MAPPING_GROUPS_HEADER_VAR"/>
+				BRANCH_MAPPING_GROUPS_HEADER : '<c:out value="BRANCH_MAPPING_GROUPS_HEADER_VAR" />',
+				<fmt:message key="authoring.fla.branch.mapping.group.header" var="BRANCH_MAPPING_GROUP_HEADER_VAR"/>
+				BRANCH_MAPPING_GROUP_HEADER : '<c:out value="BRANCH_MAPPING_GROUP_HEADER_VAR" />',
+				<fmt:message key="authoring.fla.conditions.dialog.title" var="CONDITIONS_DIALOG_TITLE_VAR"/>
+				CONDITIONS_DIALOG_TITLE : '<c:out value="CONDITIONS_DIALOG_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.branch.mapping.conditions.header" var="BRANCH_MAPPING_CONDITIONS_HEADER_VAR"/>
+				BRANCH_MAPPING_CONDITIONS_HEADER : '<c:out value="BRANCH_MAPPING_CONDITIONS_HEADER_VAR" />',
+				<fmt:message key="authoring.fla.branch.mapping.condition.header" var="BRANCH_MAPPING_CONDITION_HEADER_VAR"/>
+				BRANCH_MAPPING_CONDITION_HEADER : '<c:out value="BRANCH_MAPPING_CONDITION_HEADER_VAR" />',
+				<fmt:message key="authoring.fla.branch.mapping.gate.header" var="BRANCH_MAPPING_GATE_HEADER_VAR"/>
+				BRANCH_MAPPING_GATE_HEADER : '<c:out value="BRANCH_MAPPING_GATE_HEADER_VAR" />',
+				<fmt:message key="authoring.fla.branch.mapping.branches.header" var="BRANCH_MAPPING_BRANCHES_HEADER_VAR"/>
+				BRANCH_MAPPING_BRANCHES_HEADER : '<c:out value="BRANCH_MAPPING_BRANCHES_HEADER_VAR" />',
+				<fmt:message key="authoring.fla.branch.mapping.branch.header" var="BRANCH_MAPPING_BRANCH_HEADER_VAR"/>
+				BRANCH_MAPPING_BRANCH_HEADER : '<c:out value="BRANCH_MAPPING_BRANCH_HEADER_VAR" />',
+				<fmt:message key="authoring.fla.gate.state.mapping.dialog.title" var="GATE_STATE_MAPPING_DIALOG_TITLE_VAR"/>
+				GATE_STATE_MAPPING_DIALOG_TITLE : '<c:out value="GATE_STATE_MAPPING_DIALOG_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.branch.mapping.dialog.title" var="BRANCH_MAPPING_DIALOG_TITLE_VAR"/>
+				BRANCH_MAPPING_DIALOG_TITLE : '<c:out value="BRANCH_MAPPING_DIALOG_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.gate.state.open" var="GATE_STATE_OPEN_VAR"/>
+				GATE_STATE_OPEN : '<c:out value="GATE_STATE_OPEN_VAR" />',
+				<fmt:message key="authoring.fla.gate.state.closed" var="GATE_STATE_CLOSED_VAR"/>
+				GATE_STATE_CLOSED : '<c:out value="GATE_STATE_CLOSED_VAR" />',
+				<fmt:message key="authoring.fla.branch.mapping.default.branch.suffix" var="BRANCH_MAPPING_DEFAULT_BRANCH_SUFFIX_VAR"/>
+				BRANCH_MAPPING_DEFAULT_BRANCH_SUFFIX : '<c:out value="BRANCH_MAPPING_DEFAULT_BRANCH_SUFFIX_VAR" />',
+				<fmt:message key="authoring.fla.complex.output.suffix" var="COMPLEX_OUTPUT_SUFFIX_VAR"/>
+				COMPLEX_OUTPUT_SUFFIX : '<c:out value="COMPLEX_OUTPUT_SUFFIX_VAR" />',
+				<fmt:message key="authoring.fla.range.output.suffix" var="RANGE_OUTPUT_SUFFIX_VAR"/>
+				RANGE_OUTPUT_SUFFIX : '<c:out value="RANGE_OUTPUT_SUFFIX_VAR" />',
+				<fmt:message key="authoring.fla.range.condition.description" var="RANGE_CONDITION_DESCRIPTION_VAR"/>
+				RANGE_CONDITION_DESCRIPTION : '<c:out value="RANGE_CONDITION_DESCRIPTION_VAR" />',
+				<fmt:message key="authoring.fla.exact.condition.description" var="EXACT_CONDITION_DESCRIPTION_VAR"/>
+				EXACT_CONDITION_DESCRIPTION : '<c:out value="EXACT_CONDITION_DESCRIPTION_VAR" />',
+				<fmt:message key="authoring.fla.less.condition.description" var="LESS_CONDITION_DESCRIPTION_VAR"/>
+				LESS_CONDITION_DESCRIPTION : '<c:out value="LESS_CONDITION_DESCRIPTION_VAR" />',
+				<fmt:message key="authoring.fla.greater.condition.description" var="GREATER_CONDITION_DESCRIPTION_VAR"/>
+				GREATER_CONDITION_DESCRIPTION : '<c:out value="GREATER_CONDITION_DESCRIPTION_VAR" />',
+				<fmt:message key="authoring.fla.default.range.condition.title.prefix" var="DEFAULT_RANGE_CONDITION_TITLE_PREFIX_VAR"/>
+				DEFAULT_RANGE_CONDITION_TITLE_PREFIX : '<c:out value="DEFAULT_RANGE_CONDITION_TITLE_PREFIX_VAR" />',
+				<fmt:message key="authoring.fla.clear.all.confirm" var="CLEAR_ALL_CONFIRM_VAR"/>
+				CLEAR_ALL_CONFIRM : '<c:out value="CLEAR_ALL_CONFIRM_VAR" />',
+				<fmt:message key="authoring.fla.remove.condition.confirm" var="REMOVE_CONDITION_CONFIRM_VAR"/>
+				REMOVE_CONDITION_CONFIRM : '<c:out value="REMOVE_CONDITION_CONFIRM_VAR" />',
+				<fmt:message key="authoring.fla.refresh.conditions.confirm" var="REFRESH_CONDITIONS_CONFIRM_VAR"/>
+				REFRESH_CONDITIONS_CONFIRM : '<c:out value="REFRESH_CONDITIONS_CONFIRM_VAR" />',
+				<fmt:message key="authoring.fla.conditions.to.default.gate.state.confirm" var="CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM_VAR"/>
+				CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM : '<c:out value="CONDITIONS_TO_DEFAULT_GATE_STATE_CONFIRM_VAR" />',
+				<fmt:message key="authoring.fla.conditions.to.default.branch.confirm" var="CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM_VAR"/>
+				CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM : '<c:out value="CONDITIONS_TO_DEFAULT_BRANCH_CONFIRM_VAR" />',
+				<fmt:message key="authoring.fla.groups.to.default.branch.confirm" var="GROUPS_TO_DEFAULT_BRANCH_CONFIRM_VAR"/>
+				GROUPS_TO_DEFAULT_BRANCH_CONFIRM : '<c:out value="GROUPS_TO_DEFAULT_BRANCH_CONFIRM_VAR" />',
+				<fmt:message key="authoring.fla.range.condition.add.start.error" var="RANGE_CONDITION_ADD_START_ERROR_VAR"/>
+				RANGE_CONDITION_ADD_START_ERROR : '<c:out value="RANGE_CONDITION_ADD_START_ERROR_VAR" />',
+				<fmt:message key="authoring.fla.range.condition.add.end.error" var="RANGE_CONDITION_ADD_END_ERROR_VAR"/>
+				RANGE_CONDITION_ADD_END_ERROR : '<c:out value="RANGE_CONDITION_ADD_END_ERROR_VAR" />',
+				<fmt:message key="authoring.fla.group.title.validation.erorr" var="GROUP_TITLE_VALIDATION_ERORR_VAR"/>
+				GROUP_TITLE_VALIDATION_ERORR : '<c:out value="GROUP_TITLE_VALIDATION_ERORR_VAR" />'
 			},
 			
 			isReadOnlyMode = false,
Index: lams_central/web/authoring/svgGenerator.jsp
===================================================================
diff -u -re837b7b90d6cbae5ecf051b9c9ba61b3097e0c51 -r711e1fbc1443b1dc7c19e5cbf6358744499590a4
--- lams_central/web/authoring/svgGenerator.jsp	(.../svgGenerator.jsp)	(revision e837b7b90d6cbae5ecf051b9c9ba61b3097e0c51)
+++ lams_central/web/authoring/svgGenerator.jsp	(.../svgGenerator.jsp)	(revision 711e1fbc1443b1dc7c19e5cbf6358744499590a4)
@@ -21,18 +21,28 @@
 		var LAMS_URL = '<lams:LAMSURL/>',
 			LABELS = {
 				// ActivityLib
-DEFAULT_GROUPING_TITLE : '<fmt:message key="authoring.fla.default.group.title" />',
-				DEFAULT_GROUP_PREFIX : '<fmt:message key="authoring.fla.default.group.prefix" />',
-				DEFAULT_BRANCHING_TITLE : '<fmt:message key="authoring.fla.default.branching.title" />',
-				DEFAULT_BRANCH_PREFIX : '<fmt:message key="authoring.fla.default.branch.prefix" />',
-				DEFAULT_OPTIONAL_ACTIVITY_TITLE : '<fmt:message key="authoring.fla.default.optional.activity.title" />',
-				SUPPORT_ACTIVITY_TITLE : '<fmt:message key="authoring.fla.support.activity.title" />',
-				GATE_ACTIVITY_LABEL : '<fmt:message key="authoring.fla.gate.activity.label" />',
-				BRANCHING_START_SUFFIX : '<fmt:message key="authoring.fla.branching.start.suffix" />',
-				BRANCHING_END_SUFFIX : '<fmt:message key="authoring.fla.branching.end.suffix" />',
+				<fmt:message key="authoring.fla.default.group.title" var="DEFAULT_GROUPING_TITLE_VAR"/>
+				DEFAULT_GROUPING_TITLE : '<c:out value="DEFAULT_GROUPING_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.default.group.prefix" var="DEFAULT_GROUP_PREFIX_VAR"/>
+				DEFAULT_GROUP_PREFIX : '<c:out value="DEFAULT_GROUP_PREFIX_VAR" />',
+				<fmt:message key="authoring.fla.default.branching.title" var="DEFAULT_BRANCHING_TITLE_VAR"/>
+				DEFAULT_BRANCHING_TITLE : '<c:out value="DEFAULT_BRANCHING_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.default.branch.prefix" var="DEFAULT_BRANCH_PREFIX_VAR"/>
+				DEFAULT_BRANCH_PREFIX : '<c:out value="DEFAULT_BRANCH_PREFIX_VAR" />',
+				<fmt:message key="authoring.fla.default.optional.activity.title" var="DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR"/>
+				DEFAULT_OPTIONAL_ACTIVITY_TITLE : '<c:out value="DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.support.activity.title" var="SUPPORT_ACTIVITY_TITLE_VAR"/>
+				SUPPORT_ACTIVITY_TITLE : '<c:out value="SUPPORT_ACTIVITY_TITLE_VAR" />',
+				<fmt:message key="authoring.fla.gate.activity.label" var="GATE_ACTIVITY_LABEL_VAR"/>
+				GATE_ACTIVITY_LABEL : '<c:out value="GATE_ACTIVITY_LABEL_VAR" />',
+				<fmt:message key="authoring.fla.branching.start.suffix" var="BRANCHING_START_SUFFIX_VAR"/>
+				BRANCHING_START_SUFFIX : '<c:out value="BRANCHING_START_SUFFIX_VAR" />',
+				<fmt:message key="authoring.fla.branching.end.suffix" var="BRANCHING_END_SUFFIX_VAR"/>
+				BRANCHING_END_SUFFIX : '<c:out value="BRANCHING_END_SUFFIX_VAR" />',
 				
 				// DecorationLib
-				DEFAULT_ANNOTATION_LABEL_TITLE : '<fmt:message key="authoring.fla.default.annotation.label.title" />'
+				<fmt:message key="authoring.fla.default.annotation.label.title" var="DEFAULT_ANNOTATION_LABEL_TITLE_VAR"/>
+				DEFAULT_ANNOTATION_LABEL_TITLE : '<c:out value="DEFAULT_ANNOTATION_LABEL_TITLE_VAR" />'
 			},
 			
 			isReadOnlyMode = true,
Index: lams_central/web/main.jsp
===================================================================
diff -u -r6cea41c13ae7d7ef330284fa195209b9c201e5d2 -r711e1fbc1443b1dc7c19e5cbf6358744499590a4
--- lams_central/web/main.jsp	(.../main.jsp)	(revision 6cea41c13ae7d7ef330284fa195209b9c201e5d2)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 711e1fbc1443b1dc7c19e5cbf6358744499590a4)
@@ -1,4 +1,6 @@
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ page import="org.lamsfoundation.lams.security.JspRedirectStrategy"%>
+<%@ page import="org.lamsfoundation.lams.web.util.HttpSessionManager"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
@@ -7,6 +9,10 @@
 <%@ taglib uri="tags-function" prefix="fn"%>
 <%@ taglib uri="tags-tiles" prefix="tiles" %>
 
+<%-- If you change this file, remember to update the copy made for CNG-21 --%>
+
+<%JspRedirectStrategy.welcomePageStatusUpdate(request, response);%>
+<%HttpSessionManager.getInstance().updateHttpSessionByLogin(request.getSession(),request.getRemoteUser());%>
 <!DOCTYPE HTML>
 <lams:html>
 <lams:head>
@@ -36,18 +42,30 @@
 	<script type="text/javascript">
 			var LAMS_URL = '<lams:LAMSURL/>';
 			var LABELS = {
-					EMAIL_NOTIFICATIONS_TITLE : '<fmt:message key="index.emailnotifications" />',
-					REMOVE_LESSON_CONFIRM1 : '<fmt:message key="index.remove.lesson.confirm1"/>',
-					REMOVE_LESSON_CONFIRM2 : '<fmt:message key="index.remove.lesson.confirm2"/>',
-					SORTING_ENABLE : '<fmt:message key="label.enable.lesson.sorting"/>',
-					SORTING_DISABLE : '<fmt:message key="label.disable.lesson.sorting"/>',
-					SINGLE_ACTIVITY_LESSON_TITLE : '<fmt:message key="index.single.activity.lesson.title"/>',
-					GRADEBOOK_COURSE_TITLE : '<fmt:message key="index.gradebook.course.title"/>',
-					GRADEBOOK_LESSON_TITLE : '<fmt:message key="index.gradebook.lesson.title"/>',
-					GRADEBOOK_LEARNER_TITLE : '<fmt:message key="index.gradebook.learner.title"/>',
-					CONDITIONS_TITLE : '<fmt:message key="index.conditions.title"/>',
-					SEARCH_LESSON_TITLE : '<fmt:message key="index.search.lesson.title"/>',
-					COURSE_GROUPS_TITLE : '<fmt:message key="index.course.groups.title"/>'
+					<fmt:message key="index.emailnotifications" var="EMAIL_NOTIFICATIONS_TITLE_VAR"/>
+					EMAIL_NOTIFICATIONS_TITLE : '<c:out value="EMAIL_NOTIFICATIONS_TITLE_VAR" />',
+					<fmt:message key="index.remove.lesson.confirm1" var="REMOVE_LESSON_CONFIRM1_VAR"/>
+					REMOVE_LESSON_CONFIRM1 : '<c:out value="REMOVE_LESSON_CONFIRM1_VAR" />',
+					<fmt:message key="index.remove.lesson.confirm2" var="REMOVE_LESSON_CONFIRM2_VAR"/>
+					REMOVE_LESSON_CONFIRM2 : '<c:out value="REMOVE_LESSON_CONFIRM2_VAR" />',
+					<fmt:message key="label.enable.lesson.sorting" var="SORTING_ENABLE_VAR"/>
+					SORTING_ENABLE : '<c:out value="SORTING_ENABLE_VAR" />',
+					<fmt:message key="label.disable.lesson.sorting" var="SORTING_DISABLE_VAR"/>
+					SORTING_DISABLE : '<c:out value="SORTING_DISABLE_VAR" />',
+					<fmt:message key="index.single.activity.lesson.title" var="SINGLE_ACTIVITY_LESSON_TITLE_VAR"/>
+					SINGLE_ACTIVITY_LESSON_TITLE : '<c:out value="SINGLE_ACTIVITY_LESSON_TITLE_VAR" />',
+					<fmt:message key="index.gradebook.course.title" var="GRADEBOOK_COURSE_TITLE_VAR"/>
+					GRADEBOOK_COURSE_TITLE : '<c:out value="GRADEBOOK_COURSE_TITLE_VAR" />',
+					<fmt:message key="index.gradebook.lesson.title" var="GRADEBOOK_LESSON_TITLE_VAR"/>
+					GRADEBOOK_LESSON_TITLE : '<c:out value="GRADEBOOK_LESSON_TITLE_VAR" />',
+					<fmt:message key="index.gradebook.learner.title" var="GRADEBOOK_LEARNER_TITLE_VAR"/>
+					GRADEBOOK_LEARNER_TITLE : '<c:out value="GRADEBOOK_LEARNER_TITLE_VAR" />',
+					<fmt:message key="index.conditions.title" var="CONDITIONS_TITLE_VAR"/>
+					CONDITIONS_TITLE : '<c:out value="CONDITIONS_TITLE_VAR" />',
+					<fmt:message key="index.search.lesson.title" var="SEARCH_LESSON_TITLE_VAR"/>
+					SEARCH_LESSON_TITLE : '<c:out value="SEARCH_LESSON_TITLE_VAR" />',
+					<fmt:message key="index.course.groups.title" var="COURSE_GROUPS_TITLE_VAR"/>
+					COURSE_GROUPS_TITLE : '<c:out value="COURSE_GROUPS_TITLE_VAR" />'
 			}
 			
 			var tabName = '${tab}';
Index: lams_central/web/orgGroup.jsp
===================================================================
diff -u -r0b087f6386e7e8cfd72dd34e3eec37533cb97d5f -r711e1fbc1443b1dc7c19e5cbf6358744499590a4
--- lams_central/web/orgGroup.jsp	(.../orgGroup.jsp)	(revision 0b087f6386e7e8cfd72dd34e3eec37533cb97d5f)
+++ lams_central/web/orgGroup.jsp	(.../orgGroup.jsp)	(revision 711e1fbc1443b1dc7c19e5cbf6358744499590a4)
@@ -30,11 +30,16 @@
 		
 		var LAMS_URL = '<lams:LAMSURL/>';
 		var LABELS = {
-			GROUP_PREFIX_LABEL : '<fmt:message key="label.course.groups.prefix" />',
-			GROUP_REMOVE_LABEL : '<fmt:message key="label.course.groups.remove.confirm" />',
-			EMPTY_GROUP_SAVE_LABEL : '<fmt:message key="label.course.groups.remove.empty.confirm" />',
-			GROUP_LOCK_LABEL : '<fmt:message key="label.course.groups.locked" />',
-			TRANSFER_LOCKED_LABEL : '<fmt:message key="label.course.groups.locked.transfer" />'
+			<fmt:message key="label.course.groups.prefix" var="GROUP_PREFIX_LABEL_VAR"/>
+			GROUP_PREFIX_LABEL : '<c:out value="GROUP_PREFIX_LABEL_VAR" />',
+			<fmt:message key="label.course.groups.remove.confirm" var="GROUP_REMOVE_LABEL_VAR"/>
+			GROUP_REMOVE_LABEL : '<c:out value="GROUP_REMOVE_LABEL_VAR" />',
+			<fmt:message key="label.course.groups.remove.empty.confirm" var="EMPTY_GROUP_SAVE_LABEL_VAR"/>
+			EMPTY_GROUP_SAVE_LABEL : '<c:out value="EMPTY_GROUP_SAVE_LABEL_VAR" />',
+			<fmt:message key="label.course.groups.locked" var="GROUP_LOCK_LABEL_VAR"/>
+			GROUP_LOCK_LABEL : '<c:out value="GROUP_LOCK_LABEL_VAR" />',
+			<fmt:message key="label.course.groups.locked.transfer" var="TRANSFER_LOCKED_LABEL_VAR"/>
+			TRANSFER_LOCKED_LABEL : '<c:out value="TRANSFER_LOCKED_LABEL_VAR" />'
 		};
 	</script>
 </lams:head>
Index: lams_central/web/orgGrouping.jsp
===================================================================
diff -u -rbf965a1a2768bdec78ccb7b0ff8f7b694580e02c -r711e1fbc1443b1dc7c19e5cbf6358744499590a4
--- lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision bf965a1a2768bdec78ccb7b0ff8f7b694580e02c)
+++ lams_central/web/orgGrouping.jsp	(.../orgGrouping.jsp)	(revision 711e1fbc1443b1dc7c19e5cbf6358744499590a4)
@@ -24,8 +24,10 @@
 		
 			LAMS_URL = '<lams:LAMSURL/>',
 			LABELS = {
-				REMOVE_GROUPING_CONFIRM_LABEL : '<fmt:message key="label.course.groups.grouping.remove.confirm" />',
-				USE_GROUPING_CONFIRM_LABEL : '<fmt:message key="label.course.groups.grouping.use.confirm" />'
+				<fmt:message key="label.course.groups.grouping.remove.confirm" var="REMOVE_GROUPING_CONFIRM_LABEL_VAR"/>
+				REMOVE_GROUPING_CONFIRM_LABEL : '<c:out value="REMOVE_GROUPING_CONFIRM_LABEL_VAR" />',
+				<fmt:message key="label.course.groups.grouping.use.confirm" var="USE_GROUPING_CONFIRM_LABEL_VAR"/>
+				USE_GROUPING_CONFIRM_LABEL : '<c:out value="USE_GROUPING_CONFIRM_LABEL_VAR" />'
 			};
 	</script>
 </lams:head>
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r7a608a8d74f8c7d1d4ad5a729d034ae8ab65a816 -r711e1fbc1443b1dc7c19e5cbf6358744499590a4
--- lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 7a608a8d74f8c7d1d4ad5a729d034ae8ab65a816)
+++ lams_monitoring/web/monitor.jsp	(.../monitor.jsp)	(revision 711e1fbc1443b1dc7c19e5cbf6358744499590a4)
@@ -45,63 +45,120 @@
 			LAMS_URL = '<lams:LAMSURL/>',
 			
 			LABELS = {
-				FORCE_COMPLETE_CLICK : '<fmt:message key="force.complete.click"/>',
-				FORCE_COMPLETE_BUTTON : '<fmt:message key="button.force.complete"/>',
-				FORCE_COMPLETE_END_LESSON_CONFIRM : '<fmt:message key="force.complete.end.lesson.confirm"/>',
-				FORCE_COMPLETE_ACTIVITY_CONFIRM : '<fmt:message key="force.complete.activity.confirm"/>',
-				FORCE_COMPLETE_REMOVE_CONTENT : '<fmt:message key="force.complete.remove.content"/>',
-				FORCE_COMPLETE_REMOVE_CONTENT_YES : '<fmt:message key="force.complete.remove.content.yes"/>',
-				FORCE_COMPLETE_REMOVE_CONTENT_NO : '<fmt:message key="force.complete.remove.content.no"/>',
-				FORCE_COMPLETE_DROP_FAIL : '<fmt:message key="force.complete.drop.fail"/>',
-				LEARNER_GROUP_COUNT : '<fmt:message key="learner.group.count"/>',
-				LEARNER_GROUP_SHOW : '<fmt:message key="learner.group.show"/>',
-				LEARNER_GROUP_REMOVE_PROGRESS : '<fmt:message key="learner.group.remove.progress"/>',
-				LEARNER_GROUP_LIST_TITLE : '<fmt:message key="learner.group.list.title"/>',
-				VIEW_LEARNER_BUTTON : '<fmt:message key="button.view.learner"/>',
-				EMAIL_BUTTON : '<fmt:message key="button.email"/>',
-				CLOSE_BUTTON : '<fmt:message key="button.close"/>',
-				NOTIFCATIONS : '<fmt:message key="email.notifications"/>',
-				SAVE_BUTTON : '<fmt:message key="button.save"/>',
-				CANCEL_BUTTON : '<fmt:message key="button.cancel"/>',
-				LEARNER_FINISHED_COUNT : '<fmt:message key="learner.finished.count"/>',
-				LEARNER_FINISHED_DIALOG_TITLE : '<fmt:message key="learner.finished.dialog.title"/>',
-				LESSON_PRESENCE_ENABLE_ALERT : '<fmt:message key="lesson.enable.presence.alert"/>',
-				LESSON_PRESENCE_DISABLE_ALERT : '<fmt:message key="lesson.disable.presence.alert"/>',
-				LESSON_IM_ENABLE_ALERT : '<fmt:message key="lesson.enable.im.alert"/>',
-				LESSON_IM_DISABLE_ALERT : '<fmt:message key="lesson.disable.im.alert"/>',
-				LESSON_REMOVE_ALERT : '<fmt:message key="lesson.remove.alert"/>',
-				LESSON_REMOVE_DOUBLECHECK_ALERT : '<fmt:message key="lesson.remove.doublecheck.alert"/>',
-				LESSON_STATE_CREATED : '<fmt:message key="lesson.state.created"/>',
-				LESSON_STATE_SCHEDULED : '<fmt:message key="lesson.state.scheduled"/>',
-				LESSON_STATE_STARTED : '<fmt:message key="lesson.state.started"/>',
-				LESSON_STATE_SUSPENDED : '<fmt:message key="lesson.state.suspended"/>',
-				LESSON_STATE_FINISHED : '<fmt:message key="lesson.state.finished"/>',
-				LESSON_STATE_ARCHIVED : '<fmt:message key="lesson.state.archived"/>',
-				LESSON_STATE_REMOVED : '<fmt:message key="lesson.state.removed"/>',
-				LESSON_STATE_ACTION_DISABLE : '<fmt:message key="lesson.state.action.disable"/>',
-				LESSON_STATE_ACTION_ACTIVATE : '<fmt:message key="lesson.state.action.activate"/>',
-				LESSON_STATE_ACTION_REMOVE : '<fmt:message key="lesson.state.action.remove"/>',
-				LESSON_STATE_ACTION_ARCHIVE : '<fmt:message key="lesson.state.action.archive"/>',
-				LESSON_ERROR_SCHEDULE_DATE : '<fmt:message key="error.lesson.schedule.date"/>',
-				LESSON_EDIT_CLASS : '<fmt:message key="button.edit.class"/>',
-				LESSON_GROUP_DIALOG_CLASS : '<fmt:message key="lesson.group.dialog.class"/>',
-				CURRENT_ACTIVITY : '<fmt:message key="label.learner.progress.activity.current.tooltip"/>',
-				COMPLETED_ACTIVITY : '<fmt:message key="label.learner.progress.activity.completed.tooltip"/>',
-				ATTEMPTED_ACTIVITY : '<fmt:message key="label.learner.progress.activity.attempted.tooltip"/>',
-				TOSTART_ACTIVITY : '<fmt:message key="label.learner.progress.activity.tostart.tooltip"/>',
-				SUPPORT_ACTIVITY : '<fmt:message key="label.learner.progress.activity.support.tooltip"/>',
-				EXPORT_PORTFOLIO : '<fmt:message key="button.export"/>',
-				EXPORT_PORTFOLIO_LEARNER_TOOLTIP : '<fmt:message key="button.export.learner.tooltip"/>',
-			    TIME_CHART : '<fmt:message key="button.timechart"/>',
-			    TIME_CHART_TOOLTIP : '<fmt:message key="button.timechart.tooltip"/>',
-				LIVE_EDIT_CONFIRM : '<fmt:message key="button.live.edit.confirm"/>',
-				CONTRIBUTE_GATE : '<fmt:message key="lesson.task.gate"/>',
-				CONTRIBUTE_GROUPING : '<fmt:message key="lesson.task.grouping"/>',
-				CONTRIBUTE_BRANCHING : '<fmt:message key="lesson.task.branching"/>',
-				CONTRIBUTE_CONTENT_EDITED : '<fmt:message key="lesson.task.content.edited"/>',
-				CONTRIBUTE_TOOLTIP : '<fmt:message key="button.task.go.tooltip"/>',
-				CONTRIBUTE_BUTTON : '<fmt:message key="button.task.go"/>',
-				CONTRIBUTE_ATTENTION : '<fmt:message key="lesson.task.attention"/>'
+				<fmt:message key="force.complete.click" var="FORCE_COMPLETE_CLICK_VAR"/>
+				FORCE_COMPLETE_CLICK : '<c:out value="FORCE_COMPLETE_CLICK_VAR" />',
+				<fmt:message key="button.force.complete" var="FORCE_COMPLETE_BUTTON_VAR"/>
+				FORCE_COMPLETE_BUTTON : '<c:out value="FORCE_COMPLETE_BUTTON_VAR" />',
+				<fmt:message key="force.complete.end.lesson.confirm" var="FORCE_COMPLETE_END_LESSON_CONFIRM_VAR"/>
+				FORCE_COMPLETE_END_LESSON_CONFIRM : '<c:out value="FORCE_COMPLETE_END_LESSON_CONFIRM_VAR" />',
+				<fmt:message key="force.complete.activity.confirm" var="FORCE_COMPLETE_ACTIVITY_CONFIRM_VAR"/>
+				FORCE_COMPLETE_ACTIVITY_CONFIRM : '<c:out value="FORCE_COMPLETE_ACTIVITY_CONFIRM_VAR" />',
+				<fmt:message key="force.complete.remove.content" var="FORCE_COMPLETE_REMOVE_CONTENT_VAR"/>
+				FORCE_COMPLETE_REMOVE_CONTENT : '<c:out value="FORCE_COMPLETE_REMOVE_CONTENT_VAR" />',
+				<fmt:message key="force.complete.remove.content.yes" var="FORCE_COMPLETE_REMOVE_CONTENT_YES_VAR"/>
+				FORCE_COMPLETE_REMOVE_CONTENT_YES : '<c:out value="FORCE_COMPLETE_REMOVE_CONTENT_YES_VAR" />',
+				<fmt:message key="force.complete.remove.content.no" var="FORCE_COMPLETE_REMOVE_CONTENT_NO_VAR"/>
+				FORCE_COMPLETE_REMOVE_CONTENT_NO : '<c:out value="FORCE_COMPLETE_REMOVE_CONTENT_NO_VAR" />',
+				<fmt:message key="force.complete.drop.fail" var="FORCE_COMPLETE_DROP_FAIL_VAR"/>
+				FORCE_COMPLETE_DROP_FAIL : '<c:out value="FORCE_COMPLETE_DROP_FAIL_VAR" />',
+				<fmt:message key="learner.group.count" var="LEARNER_GROUP_COUNT_VAR"/>
+				LEARNER_GROUP_COUNT : '<c:out value="LEARNER_GROUP_COUNT_VAR" />',
+				<fmt:message key="learner.group.show" var="LEARNER_GROUP_SHOW_VAR"/>
+				LEARNER_GROUP_SHOW : '<c:out value="LEARNER_GROUP_SHOW_VAR" />',
+				<fmt:message key="learner.group.remove.progress" var="LEARNER_GROUP_REMOVE_PROGRESS_VAR"/>
+				LEARNER_GROUP_REMOVE_PROGRESS : '<c:out value="LEARNER_GROUP_REMOVE_PROGRESS_VAR" />',
+				<fmt:message key="learner.group.list.title" var="LEARNER_GROUP_LIST_TITLE_VAR"/>
+				LEARNER_GROUP_LIST_TITLE : '<c:out value="LEARNER_GROUP_LIST_TITLE_VAR" />',
+				<fmt:message key="button.view.learner" var="VIEW_LEARNER_BUTTON_VAR"/>
+				VIEW_LEARNER_BUTTON : '<c:out value="VIEW_LEARNER_BUTTON_VAR" />',
+				<fmt:message key="button.email" var="EMAIL_BUTTON_VAR"/>
+				EMAIL_BUTTON : '<c:out value="EMAIL_BUTTON_VAR" />',
+				<fmt:message key="button.close" var="CLOSE_BUTTON_VAR"/>
+				CLOSE_BUTTON : '<c:out value="CLOSE_BUTTON_VAR" />',
+				<fmt:message key="email.notifications" var="NOTIFCATIONS_VAR"/>
+				NOTIFCATIONS : '<c:out value="NOTIFCATIONS_VAR" />',
+				<fmt:message key="button.save" var="SAVE_BUTTON_VAR"/>
+				SAVE_BUTTON : '<c:out value="SAVE_BUTTON_VAR" />',
+				<fmt:message key="button.cancel" var="CANCEL_BUTTON_VAR"/>
+				CANCEL_BUTTON : '<c:out value="CANCEL_BUTTON_VAR" />',
+				<fmt:message key="learner.finished.count" var="LEARNER_FINISHED_COUNT_VAR"/>
+				LEARNER_FINISHED_COUNT : '<c:out value="LEARNER_FINISHED_COUNT_VAR" />',
+				<fmt:message key="learner.finished.dialog.title" var="LEARNER_FINISHED_DIALOG_TITLE_VAR"/>
+				LEARNER_FINISHED_DIALOG_TITLE : '<c:out value="LEARNER_FINISHED_DIALOG_TITLE_VAR" />',
+				<fmt:message key="lesson.enable.presence.alert" var="LESSON_PRESENCE_ENABLE_ALERT_VAR"/>
+				LESSON_PRESENCE_ENABLE_ALERT : '<c:out value="LESSON_PRESENCE_ENABLE_ALERT_VAR" />',
+				<fmt:message key="lesson.disable.presence.alert" var="LESSON_PRESENCE_DISABLE_ALERT_VAR"/>
+				LESSON_PRESENCE_DISABLE_ALERT : '<c:out value="LESSON_PRESENCE_DISABLE_ALERT_VAR" />',
+				<fmt:message key="lesson.enable.im.alert" var="LESSON_IM_ENABLE_ALERT_VAR"/>
+				LESSON_IM_ENABLE_ALERT : '<c:out value="LESSON_IM_ENABLE_ALERT_VAR" />',
+				<fmt:message key="lesson.disable.im.alert" var="LESSON_IM_DISABLE_ALERT_VAR"/>
+				LESSON_IM_DISABLE_ALERT : '<c:out value="LESSON_IM_DISABLE_ALERT_VAR" />',
+				<fmt:message key="lesson.remove.alert" var="LESSON_REMOVE_ALERT_VAR"/>
+				LESSON_REMOVE_ALERT : '<c:out value="LESSON_REMOVE_ALERT_VAR" />',
+				<fmt:message key="lesson.remove.doublecheck.alert" var="LESSON_REMOVE_DOUBLECHECK_ALERT_VAR"/>
+				LESSON_REMOVE_DOUBLECHECK_ALERT : '<c:out value="LESSON_REMOVE_DOUBLECHECK_ALERT_VAR" />',
+				<fmt:message key="lesson.state.created" var="LESSON_STATE_CREATED_VAR"/>
+				LESSON_STATE_CREATED : '<c:out value="LESSON_STATE_CREATED_VAR" />',
+				<fmt:message key="lesson.state.scheduled" var="LESSON_STATE_SCHEDULED_VAR"/>
+				LESSON_STATE_SCHEDULED : '<c:out value="LESSON_STATE_SCHEDULED_VAR" />',
+				<fmt:message key="lesson.state.started" var="LESSON_STATE_STARTED_VAR"/>
+				LESSON_STATE_STARTED : '<c:out value="LESSON_STATE_STARTED_VAR" />',
+				<fmt:message key="lesson.state.suspended" var="LESSON_STATE_SUSPENDED_VAR"/>
+				LESSON_STATE_SUSPENDED : '<c:out value="LESSON_STATE_SUSPENDED_VAR" />',
+				<fmt:message key="lesson.state.finished" var="LESSON_STATE_FINISHED_VAR"/>
+				LESSON_STATE_FINISHED : '<c:out value="LESSON_STATE_FINISHED_VAR" />',
+				<fmt:message key="lesson.state.archived" var="LESSON_STATE_ARCHIVED_VAR"/>
+				LESSON_STATE_ARCHIVED : '<c:out value="LESSON_STATE_ARCHIVED_VAR" />',
+				<fmt:message key="lesson.state.removed" var="LESSON_STATE_REMOVED_VAR"/>
+				LESSON_STATE_REMOVED : '<c:out value="LESSON_STATE_REMOVED_VAR" />',
+				<fmt:message key="lesson.state.action.disable" var="LESSON_STATE_ACTION_DISABLE_VAR"/>
+				LESSON_STATE_ACTION_DISABLE : '<c:out value="LESSON_STATE_ACTION_DISABLE_VAR" />',
+				<fmt:message key="lesson.state.action.activate" var="LESSON_STATE_ACTION_ACTIVATE_VAR"/>
+				LESSON_STATE_ACTION_ACTIVATE : '<c:out value="LESSON_STATE_ACTION_ACTIVATE_VAR" />',
+				<fmt:message key="lesson.state.action.remove" var="LESSON_STATE_ACTION_REMOVE_VAR"/>
+				LESSON_STATE_ACTION_REMOVE : '<c:out value="LESSON_STATE_ACTION_REMOVE_VAR" />',
+				<fmt:message key="lesson.state.action.archive" var="LESSON_STATE_ACTION_ARCHIVE_VAR"/>
+				LESSON_STATE_ACTION_ARCHIVE : '<c:out value="LESSON_STATE_ACTION_ARCHIVE_VAR" />',
+				<fmt:message key="error.lesson.schedule.date" var="LESSON_ERROR_SCHEDULE_DATE_VAR"/>
+				LESSON_ERROR_SCHEDULE_DATE : '<c:out value="LESSON_ERROR_SCHEDULE_DATE_VAR" />',
+				<fmt:message key="button.edit.class" var="LESSON_EDIT_CLASS_VAR"/>
+				LESSON_EDIT_CLASS : '<c:out value="LESSON_EDIT_CLASS_VAR" />',
+				<fmt:message key="lesson.group.dialog.class" var="LESSON_GROUP_DIALOG_CLASS_VAR"/>
+				LESSON_GROUP_DIALOG_CLASS : '<c:out value="LESSON_GROUP_DIALOG_CLASS_VAR" />',
+				<fmt:message key="label.learner.progress.activity.current.tooltip" var="CURRENT_ACTIVITY_VAR"/>
+				CURRENT_ACTIVITY : '<c:out value="CURRENT_ACTIVITY_VAR" />',
+				<fmt:message key="label.learner.progress.activity.completed.tooltip" var="COMPLETED_ACTIVITY_VAR"/>
+				COMPLETED_ACTIVITY : '<c:out value="COMPLETED_ACTIVITY_VAR" />',
+				<fmt:message key="label.learner.progress.activity.attempted.tooltip" var="ATTEMPTED_ACTIVITY_VAR"/>
+				ATTEMPTED_ACTIVITY : '<c:out value="ATTEMPTED_ACTIVITY_VAR" />',
+				<fmt:message key="label.learner.progress.activity.tostart.tooltip" var="TOSTART_ACTIVITY_VAR"/>
+				TOSTART_ACTIVITY : '<c:out value="TOSTART_ACTIVITY_VAR" />',
+				<fmt:message key="label.learner.progress.activity.support.tooltip" var="SUPPORT_ACTIVITY_VAR"/>
+				SUPPORT_ACTIVITY : '<c:out value="SUPPORT_ACTIVITY_VAR" />',
+				<fmt:message key="button.export" var="EXPORT_PORTFOLIO_VAR"/>
+				EXPORT_PORTFOLIO : '<c:out value="EXPORT_PORTFOLIO_VAR" />',
+				<fmt:message key="button.export.learner.tooltip" var="EXPORT_PORTFOLIO_LEARNER_TOOLTIP_VAR"/>
+				EXPORT_PORTFOLIO_LEARNER_TOOLTIP : '<c:out value="EXPORT_PORTFOLIO_LEARNER_TOOLTIP_VAR" />',
+			    <fmt:message key="button.timechart" var="TIME_CHART_VAR"/>
+			    TIME_CHART : '<c:out value="TIME_CHART_VAR" />',
+			    <fmt:message key="button.timechart.tooltip" var="TIME_CHART_TOOLTIP_VAR"/>
+			    TIME_CHART_TOOLTIP : '<c:out value="TIME_CHART_TOOLTIP_VAR" />',
+				<fmt:message key="button.live.edit.confirm" var="LIVE_EDIT_CONFIRM_VAR"/>
+				LIVE_EDIT_CONFIRM : '<c:out value="LIVE_EDIT_CONFIRM_VAR" />',
+				<fmt:message key="lesson.task.gate" var="CONTRIBUTE_GATE_VAR"/>
+				CONTRIBUTE_GATE : '<c:out value="CONTRIBUTE_GATE_VAR" />',
+				<fmt:message key="lesson.task.grouping" var="CONTRIBUTE_GROUPING_VAR"/>
+				CONTRIBUTE_GROUPING : '<c:out value="CONTRIBUTE_GROUPING_VAR" />',
+				<fmt:message key="lesson.task.branching" var="CONTRIBUTE_BRANCHING_VAR"/>
+				CONTRIBUTE_BRANCHING : '<c:out value="CONTRIBUTE_BRANCHING_VAR" />',
+				<fmt:message key="lesson.task.content.edited" var="CONTRIBUTE_CONTENT_EDITED_VAR"/>
+				CONTRIBUTE_CONTENT_EDITED : '<c:out value="CONTRIBUTE_CONTENT_EDITED_VAR" />',
+				<fmt:message key="button.task.go.tooltip" var="CONTRIBUTE_TOOLTIP_VAR"/>
+				CONTRIBUTE_TOOLTIP : '<c:out value="CONTRIBUTE_TOOLTIP_VAR" />',
+				<fmt:message key="button.task.go" var="CONTRIBUTE_BUTTON_VAR"/>
+				CONTRIBUTE_BUTTON : '<c:out value="CONTRIBUTE_BUTTON_VAR" />',
+				<fmt:message key="lesson.task.attention" var="CONTRIBUTE_ATTENTION_VAR"/>
+				CONTRIBUTE_ATTENTION : '<c:out value="CONTRIBUTE_ATTENTION_VAR" />'
 			}
 	    
 		$(document).ready(function(){