Index: lams_flash/src/central/flex/CloudWizard/.actionScriptProperties
===================================================================
diff -u
--- lams_flash/src/central/flex/CloudWizard/.actionScriptProperties	(revision 0)
+++ lams_flash/src/central/flex/CloudWizard/.actionScriptProperties	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actionScriptProperties mainApplicationPath="CloudWizard.mxml" version="3">
+<compiler additionalCompilerArguments="-locale en_US" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.124" htmlPlayerVersionCheck="true" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
+<compilerSourcePath>
+<compilerSourcePathEntry kind="1" linkType="1" path="C:/Documents and Settings/Admin/lams_head/lams_flash/src/common/flex"/>
+</compilerSourcePath>
+<libraryPath defaultLinkType="1">
+<libraryPathEntry kind="4" path=""/>
+<libraryPathEntry kind="1" linkType="1" path="libs"/>
+<libraryPathEntry kind="3" linkType="1" path="C:/Documents and Settings/Admin/lams_head/lams_flash/src/common/flex/lib/Mate_08_7.swc" useDefaultLinkType="false"/>
+</libraryPath>
+<sourceAttachmentPath/>
+</compiler>
+<applications>
+<application path="CloudWizard.mxml"/>
+</applications>
+<modules/>
+<buildCSSFiles/>
+</actionScriptProperties>
Index: lams_flash/src/central/flex/CloudWizard/.flexProperties
===================================================================
diff -u
--- lams_flash/src/central/flex/CloudWizard/.flexProperties	(revision 0)
+++ lams_flash/src/central/flex/CloudWizard/.flexProperties	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<flexProperties flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
Index: lams_flash/src/central/flex/CloudWizard/.project
===================================================================
diff -u
--- lams_flash/src/central/flex/CloudWizard/.project	(revision 0)
+++ lams_flash/src/central/flex/CloudWizard/.project	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>CloudWizard</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.adobe.flexbuilder.project.flexbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.adobe.flexbuilder.project.flexnature</nature>
+		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>[source path] flex</name>
+			<type>2</type>
+			<location>C:/Documents and Settings/Admin/lams_head/lams_flash/src/common/flex</location>
+		</link>
+		<link>
+			<name>bin-release</name>
+			<type>2</type>
+			<location>C:/Documents and Settings/Admin/lams_head/lams_monitoring/web</location>
+		</link>
+	</linkedResources>
+</projectDescription>
Index: lams_flash/src/central/flex/CloudWizard/src/assets/images/ajax-loader-big.swf
===================================================================
diff -u -rb791537342fb2b0446a7010efcc2db8ef94e826a -rf6dafb83f9dc6236b4243b5dce063898846424f7
Binary files differ
Index: lams_flash/src/central/flex/TimeChart/.actionScriptProperties
===================================================================
diff -u
--- lams_flash/src/central/flex/TimeChart/.actionScriptProperties	(revision 0)
+++ lams_flash/src/central/flex/TimeChart/.actionScriptProperties	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actionScriptProperties mainApplicationPath="TimeChart.mxml" version="3">
+<compiler additionalCompilerArguments="-locale en_US" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="true" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
+<compilerSourcePath>
+<compilerSourcePathEntry kind="1" linkType="1" path="C:/Documents and Settings/Admin/lams_head/lams_flash/src/common/flex"/>
+</compilerSourcePath>
+<libraryPath defaultLinkType="1">
+<libraryPathEntry kind="4" path=""/>
+<libraryPathEntry kind="1" linkType="1" path="libs"/>
+<libraryPathEntry kind="3" linkType="1" path="C:/Documents and Settings/Admin/lams_head/lams_flash/src/common/flex/lib/Mate_08_7.swc" useDefaultLinkType="false"/>
+</libraryPath>
+<sourceAttachmentPath/>
+</compiler>
+<applications>
+<application path="TimeChart.mxml"/>
+</applications>
+<modules/>
+<buildCSSFiles/>
+</actionScriptProperties>
Index: lams_flash/src/central/flex/TimeChart/.flexProperties
===================================================================
diff -u
--- lams_flash/src/central/flex/TimeChart/.flexProperties	(revision 0)
+++ lams_flash/src/central/flex/TimeChart/.flexProperties	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<flexProperties flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
Index: lams_flash/src/central/flex/TimeChart/.project
===================================================================
diff -u
--- lams_flash/src/central/flex/TimeChart/.project	(revision 0)
+++ lams_flash/src/central/flex/TimeChart/.project	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>TimeLAMS</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.adobe.flexbuilder.project.flexbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.adobe.flexbuilder.project.flexnature</nature>
+		<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
+	</natures>
+	<linkedResources>
+		<link>
+			<name>[source path] flex</name>
+			<type>2</type>
+			<location>C:/Documents and Settings/Admin/lams_head/lams_flash/src/common/flex</location>
+		</link>
+		<link>
+			<name>bin-release</name>
+			<type>2</type>
+			<location>C:/Documents and Settings/Admin/lams_head/lams_monitoring/web</location>
+		</link>
+	</linkedResources>
+</projectDescription>
Index: lams_flash/src/central/flex/TimeChart/.settings/org.eclipse.core.resources.prefs
===================================================================
diff -u
--- lams_flash/src/central/flex/TimeChart/.settings/org.eclipse.core.resources.prefs	(revision 0)
+++ lams_flash/src/central/flex/TimeChart/.settings/org.eclipse.core.resources.prefs	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -0,0 +1,3 @@
+#Wed Apr 09 22:04:34 PDT 2008
+eclipse.preferences.version=1
+encoding/<project>=utf-8
Index: lams_flash/src/central/flex/TimeChart/src/TimeChart.mxml
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -rf6dafb83f9dc6236b4243b5dce063898846424f7
--- lams_flash/src/central/flex/TimeChart/src/TimeChart.mxml	(.../TimeChart.mxml)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_flash/src/central/flex/TimeChart/src/TimeChart.mxml	(.../TimeChart.mxml)	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -15,6 +15,7 @@
 	xmlns:views="org.lamsfoundation.lams.views.*" 
 	xmlns:maps="org.lamsfoundation.lams.maps.*" 
 	width="100%" height="100%" preinitialize="init()">
+	
 	<mx:Script>
 		<![CDATA[
 			
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/ChartManager.as
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -rf6dafb83f9dc6236b4243b5dce063898846424f7
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/ChartManager.as	(.../ChartManager.as)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/business/ChartManager.as	(.../ChartManager.as)	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -5,7 +5,7 @@
 	
 	import mx.collections.ArrayCollection;
 	
-	import org.lamsfoundation.lams.common.dictionary.XMLDictionary;
+	import org.lamsfoundation.lams.common.dictionary.XMLDictionaryRegistry;
 	import org.lamsfoundation.lams.events.DictionaryEvent;
 	import org.lamsfoundation.lams.vos.CompletedActivity;
 	import org.lamsfoundation.lams.vos.LearnerProgress;
@@ -22,11 +22,13 @@
 		
 		private var _settings:Array;
 		private var _loadType:String;
-		private var _dictionary:XMLDictionary;
 		
+		private var _dictionaryRegistry:XMLDictionaryRegistry;
+		
 		/*-.........................................Constructor..........................................*/
 		 public function ChartManager()
         {
+        	_dictionaryRegistry = new XMLDictionaryRegistry(new XML());
         	_averageProgress = new ArrayCollection();
         }
         
@@ -50,10 +52,10 @@
 			return _learnerProgress;
 		}
 		
-		[Bindable (event="chartDictionaryChanged")]
-		public function get dictionary():XMLDictionary
+		[Bindable (event="dictionaryUpdated")]
+		public function get dictionaryRegistry():XMLDictionaryRegistry
 		{
-			return _dictionary;
+			return _dictionaryRegistry;
 		}
 		
 		public function get loadType():String
@@ -62,12 +64,10 @@
 		}
 		
 		public function setDictionary(xml:XML):void {
-			_dictionary = new XMLDictionary(xml);
+			_dictionaryRegistry.xml = xml;
+			
+			dispatchEvent(new Event("dictionaryUpdated"));
 		}
-		
-		public function setLabel(event:DictionaryEvent, key:String):void {
-			event.result = _dictionary.getLabel(key);
-		}
 
 		/*-.........................................Methods..........................................*/
 		
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/ChartErrorEvent.as
===================================================================
diff -u
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/ChartErrorEvent.as	(revision 0)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/ChartErrorEvent.as	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -0,0 +1,22 @@
+package org.lamsfoundation.lams.events
+{
+	import flash.events.Event;
+
+	public class ChartErrorEvent extends Event
+	{
+		/*-.........................................Constants..........................................*/
+		
+		public static const SHOW_ERROR:String 					= "showErrorEvent";
+		
+		
+		/*-.........................................Properties..........................................*/
+		public var message:String;
+		/*-.........................................Constructor..........................................*/
+		
+		public function ChartErrorEvent(type:String, bubbles:Boolean=true, cancelable:Boolean=false)
+		{
+			super(type, bubbles, cancelable);
+		}
+		
+	}
+}
\ No newline at end of file
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/ChartEvent.as
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -rf6dafb83f9dc6236b4243b5dce063898846424f7
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/ChartEvent.as	(.../ChartEvent.as)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/ChartEvent.as	(.../ChartEvent.as)	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -13,14 +13,11 @@
 		
 		public static const UPDATE: String 				= "updateLearnerProgressEvent";
 		public static const SELECT: String 				= "showLearnerProgressEvent";
-		//public static const HIDE: String 				= "hideLearnerProgressEvent";
 		
 		public static const LOAD: String 				= "loadLearnerProgressEvent";
 		public static const LOAD_LEARNER: String  		= "loadLearnerProgressSingleEvent";
 		public static const LOAD_CLASS: String 			= "loadLearnerProgressAllEvent";
 		
-		public static const DICTIONARY: String			= "loadDictionaryEvent";
-		
 		/*-.........................................Properties..........................................*/
 		public var learnerProgressList:ArrayCollection;
 		public var learnerProgress:LearnerProgress;
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/DictionaryEvent.as
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -rf6dafb83f9dc6236b4243b5dce063898846424f7
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/DictionaryEvent.as	(.../DictionaryEvent.as)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/events/DictionaryEvent.as	(.../DictionaryEvent.as)	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -6,7 +6,6 @@
 	{
 		/*-.........................................Constants..........................................*/
 		
-		public static const LOAD: String 			= "loadEvent";
 		public static const GET: String 			= "getEvent";
 		public static const UPDATE: String			= "updateEvent";
 		
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/MainEventMap.mxml
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -rf6dafb83f9dc6236b4243b5dce063898846424f7
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -5,6 +5,7 @@
 		<![CDATA[
 			import com.asfusion.mate.actions.builders.EventAnnouncer;
 			import com.asfusion.mate.actions.builders.HTTPServiceInvoker;
+			import com.asfusion.mate.events.UnhandledFaultEvent;
 			import mx.core.Application;
 			
 			import mx.events.*;
@@ -13,17 +14,26 @@
 			import org.lamsfoundation.lams.views.*;
 			
 			import org.lamsfoundation.lams.common.dictionary.XMLDictionary;
+			import org.lamsfoundation.lams.common.dictionary.XMLDictionaryEvent;
+			
+			import org.lamsfoundation.lams.common.util.WDDXParser;
 	
 			[Bindable]
 			private var serverURL:String;
 			
 			public function init(url:String):void {
-				trace('serverUrl: ' + url);
 				serverURL = url;
 			}
 		]]>
 	</mx:Script>
 	
+	<!-- UnhandledFaultEvent.FAULT -->
+	<EventHandlers type="{UnhandledFaultEvent.FAULT}">
+      	<EventAnnouncer generator="{ChartErrorEvent}" type="{ChartErrorEvent.SHOW_ERROR}">
+      		<Properties message="{event.fault.message}" />
+      	</EventAnnouncer>
+	</EventHandlers>
+	
 	<!-- FlexEvent.PREINITIALIZE __________________________________________________________________ -->
 	
 	<EventHandlers type="{FlexEvent.PREINITIALIZE}">
@@ -32,26 +42,16 @@
 	
 	<!-- FlexEvent.APPLICATION_COMPLETE ___________________________________________________________ -->
 	<EventHandlers type="{FlexEvent.APPLICATION_COMPLETE}">
-		<EventAnnouncer generator="{ChartEvent}" type="{DictionaryEvent.LOAD}" />
-		<EventAnnouncer generator="{ChartEvent}" type="{ChartEvent.LOAD}" />
-	</EventHandlers>
-	
-	<!-- DictionaryEvent.LOAD ___________________________________________________________ -->
-	<EventHandlers type="{DictionaryEvent.LOAD}">
-		<!-- load dict data -->
+	<!-- load dict data -->
 		<HTTPServiceInvoker instance="{dictionaryService}">
+			<Request module="timechart" />
 			<resultHandlers>
 				<MethodInvoker generator="{ChartManager}" method="setDictionary" arguments="{resultObject}" />
-				<EventAnnouncer generator="{DictionaryEvent}" type="{DictionaryEvent.UPDATE}" />
+				<EventAnnouncer generator="{ChartEvent}" type="{ChartEvent.LOAD}" />
 			</resultHandlers>
 		</HTTPServiceInvoker>
 	</EventHandlers>
 	
-	<!-- DictionaryEvent.GET ___________________________________________________________ -->
-	<EventHandlers type="{DictionaryEvent.GET}">
-		<MethodInvoker generator="{ChartManager}" method="setLabel" arguments="{[event, event.labelKey]}" />
-	</EventHandlers>
-	
 	<!-- ChartEvent.LOAD_CLASS ___________________________________________________________ -->
 	<EventHandlers type="{ChartEvent.LOAD_CLASS}">
 		
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/ModelMap.mxml
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -rf6dafb83f9dc6236b4243b5dce063898846424f7
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/ModelMap.mxml	(.../ModelMap.mxml)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/maps/ModelMap.mxml	(.../ModelMap.mxml)	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -12,6 +12,7 @@
 	<!-- Chart  __________________________________________________________________ -->
 	
 	<Injectors target="{Chart}" >
+		<PropertyInjector targetKey="dictionary" source="{ChartManager}" sourceKey="dictionaryRegistry" />
 		<PropertyInjector targetKey="selectedLearnerProgress" source="{ChartManager}" sourceKey="learnerProgress" />
 		<PropertyInjector targetKey="learnerProgressData" source="{ChartManager}" sourceKey="progressList" />
 		<PropertyInjector targetKey="averageProgressList" source="{ChartManager}" sourceKey="averageProgress" />
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -rf6dafb83f9dc6236b4243b5dce063898846424f7
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml	(.../Chart.mxml)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart.mxml	(.../Chart.mxml)	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Panel xmlns:mx="http://www.adobe.com/2006/mxml" xmlns="*" width="100%" height="100%"
 	xmlns:vos="org.lamsfoundation.lams.vos.*" xmlns:mate="http://mate.asfusion.com/"
-	title="{chartTitle}" xmlns:model="org.lamsfoundation.lams.model.*" horizontalAlign="center">
+	xmlns:model="org.lamsfoundation.lams.model.*" 
+	title="{dictionary.getLabel('time.chart.panel.title')}" 
+	horizontalAlign="center">
 
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.common.dictionary.XMLDictionaryRegistry;
 		
 			import org.lamsfoundation.lams.common.dictionary.XMLDictionary;
 			import mx.charts.chartClasses.IAxis;
@@ -41,17 +44,20 @@
 			[Bindable]
 			public var _averageProgressList:ArrayCollection = new ArrayCollection();
 			
+			[Bindable]
+			public var dictionary:XMLDictionaryRegistry;
 			
 			include 'Chart_functions.as'
 			include 'Chart_eventHandlers.as'
-			include 'Chart_labels.as'
 
 			public function loadLearner():void {
 				chartViews.selectedIndex = LEARNER;
 				
 				showAverage.visible = false;
 				selectLearnerForm.visible = false;
 				
+				initButtons();
+				
 				Button(chart_button_bar.getChildAt(ACTIVITY_SPLIT__BUTTON)).enabled = false;
 				Button(chart_button_bar.getChildAt(COMPLETION__BUTTON)).enabled = true;
 			}
@@ -61,17 +67,25 @@
 				
 				showAverage.selected = true;
 				
+				initButtons();
+				
 				Button(chart_button_bar.getChildAt(ACTIVITY_SPLIT__BUTTON)).enabled = true;
 				Button(chart_button_bar.getChildAt(COMPLETION__BUTTON)).enabled = false;
 				
 			}
+			
+			private function initButtons():void {
+	   			Button(chart_button_bar.getChildAt(ACTIVITY_SPLIT__BUTTON)).label = dictionary.getLabel('chart.btn.activity.split');
+				Button(chart_button_bar.getChildAt(COMPLETION__BUTTON)).label = dictionary.getLabel('chart.btn_completion.rate');
+   			}
 
 			[Bindable]
    			public var learnerFillColor:Number = 0x0000FF;
 
     		[Bindable]
    			public var avgFillColor:Number = 0x008000;
    			
+   			
 		]]>
 	</mx:Script>
 	
@@ -80,8 +94,7 @@
 	<mate:Listener type="{ChartEvent.LOAD_CLASS}" 			receive="loadClass()" />
 	<mate:Listener type="{ChartEvent.UPDATE}"				receive="loadSelectedLearner()" />
 	<mate:Listener type="{ChartEvent.SELECT}"				receive="loadSelectedLearner()" />
-	<mate:Listener type="{DictionaryEvent.UPDATE}"			receive="updateLabels()" />
-	
+
 	<!-- Model ______________________________________________________________________ -->
 	
 	<!-- GUI ______________________________________________________________________ -->
@@ -96,10 +109,10 @@
 				
 		<!-- Button row -->
 		<mx:ButtonBar id="chart_button_bar" horizontalGap="2" itemClick="chartControlHandler(event)">
-			<mx:dataProvider>
+			<mx:dataProvider >
 				<mx:Array>
-					<mx:String>1</mx:String>
-					<mx:String>2</mx:String>
+					<mx:String> </mx:String>
+					<mx:String> </mx:String>
 				</mx:Array>
 			</mx:dataProvider>
 		</mx:ButtonBar>
@@ -125,7 +138,7 @@
 					<mx:CartesianChart id="learnerLineChart" dataProvider="{_learnerProgressList}" width="100%" showDataTips="true" dataTipFunction="learnerPlotDataTrip" dataTipMode="single" height="100%">
 						<mx:verticalAxis>
 			                <mx:LinearAxis 
-			                    title="{learner_linear_axis_lbl}" 
+			                    title="{dictionary.getLabel('chart.learner.linear.axis.title')}" 
 			                    minimum="0"
 			                    labelFunction="labelLinAxis"
 			                />
@@ -135,16 +148,16 @@
 							<mx:CategoryAxis 
 				           		dataFunction="dataLearnerPlot"
 				           		labelFunction="labelLearnerPlot"
-				           		title="{learner_category_axis_lbl}"
+				           		title="{dictionary.getLabel('chart.learner.category.axis.title')}"
 				            />
 						</mx:horizontalAxis>
 						<mx:series>
 							<!-- learner plot -->
-							<mx:PlotSeries xField="Activity" yField="Completed" itemRenderer="mx.charts.renderers.TriangleItemRenderer" displayName="{chart_completed_time_lbl}" />
+							<mx:PlotSeries xField="Activity" yField="Completed" itemRenderer="mx.charts.renderers.TriangleItemRenderer" displayName="{dictionary.getLabel('chart.series.completed.time')}" />
 							<mx:LineSeries name="completion" xField="Activity" yField="Completed" form="curve" lineStroke="{s1}" />
 							
 							<!-- average plot -->
-							<mx:PlotSeries dataProvider="{_averageProgressList}" xField="Activity" yField="Completed" itemRenderer="mx.charts.renderers.TriangleItemRenderer" displayName="{chart_average_time_lbl}" visible="{showAverage.selected}" />
+							<mx:PlotSeries dataProvider="{_averageProgressList}" xField="Activity" yField="Completed" itemRenderer="mx.charts.renderers.TriangleItemRenderer" displayName="{dictionary.getLabel('chart.series.average.time')}" visible="{showAverage.selected}" />
 							<mx:LineSeries dataProvider="{_averageProgressList}" name="average" xField="Activity" yField="Completed" form="curve" lineStroke="{s2}" visible="{showAverage.selected}" />
 						</mx:series>
 					</mx:CartesianChart>
@@ -157,7 +170,7 @@
 								<mx:SolidColor color="{learnerFillColor}" />
 							</mx:fill>
 						</mx:LegendItem>
-						<mx:LegendItem visible="{showAverage.selected}" label="{chart_legend_average_lbl}" fontWeight="bold">
+						<mx:LegendItem visible="{showAverage.selected}" label="{dictionary.getLabel('chart.legend.average')}" fontWeight="bold">
 							<mx:fill>
 								<mx:SolidColor color="{avgFillColor}" />
 							</mx:fill>
@@ -177,19 +190,19 @@
 				            />
 				        </mx:horizontalAxis>
 			            <mx:series>
-				    		<mx:ColumnSeries id="cols_ser" xField="Title" yField="Duration" displayName="{chart_duration_lbl}"/>
-				    		<mx:ColumnSeries id="avg_ser" xField="Title" yField="Duration" displayName="{chart_legend_average_lbl}" visible="{showAverage.selected}" />
+				    		<mx:ColumnSeries id="cols_ser" xField="Title" yField="Duration" displayName="{dictionary.getLabel('chart.series.duration')}"/>
+				    		<mx:ColumnSeries id="avg_ser" xField="Title" yField="Duration" displayName="{dictionary.getLabel('chart.legend.average')}" visible="{showAverage.selected}" />
 						</mx:series>
 					</mx:ColumnChart>
 				</mx:VBox>
 			
 			</mx:ViewStack>
 			
 			<mx:Form id="selectLearnerForm">
-				<mx:CheckBox id="showAverage" visible="true" enabled="true" selected="false" label="{chart_average_cb_lbl}" />
+				<mx:CheckBox id="showAverage" visible="true" enabled="true" selected="false" label="{dictionary.getLabel('show.average.checkbox')}" />
 				<mx:HBox>
 					<mx:ComboBox id="selectedLearner_cmb" dataProvider="{learnerProgressData}" labelFunction="learnerName" selectedIndex="{learnerProgressData.getItemIndex(selectedLearnerProgress)}" change="selectLearnerEvent(event)"/>
-					<mx:TextInput id="searchLearner_txt" text="{search_learner_txt_lbl}" width="200" enabled="true" click="clearSearch(event)" change="applyFilter()" />
+					<mx:TextInput id="searchLearner_txt" text="{dictionary.getLabel('search.learner.textbox')}" width="200" enabled="true" click="clearSearch(event)" change="applyFilter()" />
 				</mx:HBox>
 			</mx:Form>
 		</mx:VBox>
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_eventHandlers.as
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -rf6dafb83f9dc6236b4243b5dce063898846424f7
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_eventHandlers.as	(.../Chart_eventHandlers.as)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_eventHandlers.as	(.../Chart_eventHandlers.as)	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -30,8 +30,8 @@
 		
 		var formatStr:String = "<b>" + hd.item.Title + "</b>";
 		
-		formatStr += " " + completed_lbl + " <br>" + formatTime(hd.item.Completed);
-		if(hd.item.Average) formatStr += "<br><i>" + learner_datatip_average + "</i>";
+		formatStr += " " + dictionary.getLabel("label.completed") + " <br>" + formatTime(hd.item.Completed);
+		if(hd.item.Average) formatStr += "<br><i>" + dictionary.getLabel("chart.learner.datatip.average") + "</i>";
 		
 		return formatStr;
 	}
@@ -62,7 +62,7 @@
 		
 		learnerProgressData.refresh();
 		
-		trace('applying filter: ' + learnerProgressData.length);
+		//trace('applying filter: ' + learnerProgressData.length);
 		
 		var idx:int = learnerProgressData.getItemIndex(selectedLearnerProgress);
 		
Index: lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_functions.as
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -rf6dafb83f9dc6236b4243b5dce063898846424f7
--- lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_functions.as	(.../Chart_functions.as)	(revision c18e988af13e3ade386f0c2b76e84e5ea44dbd83)
+++ lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_functions.as	(.../Chart_functions.as)	(revision f6dafb83f9dc6236b4243b5dce063898846424f7)
@@ -9,7 +9,7 @@
 		_averageProgressList = averageProgressList;
 		
 		if(_averageProgressList.length > 0)
-		trace('avg first: ' + _averageProgressList.getItemAt(0).Completed);
+		//trace('avg first: ' + _averageProgressList.getItemAt(0).Completed);
 		
 		if(_averageProgressList.length > 0)
 			showAverage.enabled = true;
@@ -28,14 +28,14 @@
 			return;
 		}
 		
-		chart_lbl.htmlText = "<b>" + learner_lbl + " :: " + selectedLearnerProgress.learner_fname + " " + selectedLearnerProgress.learner_lname + "</b>";
+		chart_lbl.htmlText = "<b>" + dictionary.getLabel("label.learner") + " :: " + selectedLearnerProgress.learner_fname + " " + selectedLearnerProgress.learner_lname + "</b>";
 		
 		for each(var cp:CompletedActivity in selectedLearnerProgress.completedActivities) {
 			_learnerProgressList.addItem(cp.dataObject);
 				
-			trace('adding new c: ' + cp.dataObject.Completed);
-			trace('adding new t: ' + cp.dataObject.Title);
-			trace('adding new d: ' + cp.dataObject.Duration);
+			//trace('adding new c: ' + cp.dataObject.Completed);
+			//trace('adding new t: ' + cp.dataObject.Title);
+			//trace('adding new d: ' + cp.dataObject.Duration);
 		} 
 		
 	}
@@ -77,10 +77,10 @@
 	    var Hours:Number = (value/3600);
    		
    		if(Hours > 1) 
-   			formatStr += Hours.toFixed(0) + " " + chart_time_hrs_lbl + " ";
+   			formatStr += Hours.toFixed(0) + " " + dictionary.getLabel('chart.time.format.hours') + " ";
    			
-   		if(Minutes > 1) formatStr += Number(Minutes).toFixed(1) + " " + chart_time_mins_lbl + " ";
-   		else formatStr += Seconds + " " + chart_time_secs_lbl;
+   		if(Minutes > 1) formatStr += Number(Minutes).toFixed(1) + " " + dictionary.getLabel('chart.time.format.minutes') + " ";
+   		else formatStr += Seconds + " " + dictionary.getLabel('chart.time.format.seconds');
    		
    		return formatStr;
 	}
@@ -90,7 +90,7 @@
 		var lp:LearnerProgress = item as LearnerProgress;
 		var name:String = learnerName(lp);
 		
-		trace('searching... : ' + name);
+		//trace('searching... : ' + name);
 		
 		if(learnerName(lp).search(searchLearner_txt.text) >= 0)
 			return true;
Fisheye: Tag f6dafb83f9dc6236b4243b5dce063898846424f7 refers to a dead (removed) revision in file `lams_flash/src/central/flex/TimeChart/src/org/lamsfoundation/lams/views/Chart_labels.as'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_monitoring/web/TimeChart.swf
===================================================================
diff -u -rc18e988af13e3ade386f0c2b76e84e5ea44dbd83 -rf6dafb83f9dc6236b4243b5dce063898846424f7
Binary files differ