Index: lams_common/src/flash/org/lamsfoundation/lams/common/PreferencesDialog.as
===================================================================
diff -u -rbe5225130a3e8822d923e0a3fa3594dbbe4dcfa8 -r98fd51449c072a1f4da231734b5bc84b582339ee
--- lams_common/src/flash/org/lamsfoundation/lams/common/PreferencesDialog.as	(.../PreferencesDialog.as)	(revision be5225130a3e8822d923e0a3fa3594dbbe4dcfa8)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/PreferencesDialog.as	(.../PreferencesDialog.as)	(revision 98fd51449c072a1f4da231734b5bc84b582339ee)
@@ -82,12 +82,12 @@
         themeManager = ThemeManager.getInstance();
         
         //Set the text for buttons
-        ok_btn.label = Dictionary.getValue(5);
-        cancel_btn.label = Dictionary.getValue(6);
+        ok_btn.label = Dictionary.getValue('prefs_dlg_ok');
+        cancel_btn.label = Dictionary.getValue('prefs_dlg_cancel');
         
         //Set the labels
-        lang_lbl.text = Dictionary.getValue(7);
-        theme_lbl.text = Dictionary.getValue(8);
+        lang_lbl.text = Dictionary.getValue('prefs_dlg_theme_lbl');
+        theme_lbl.text = Dictionary.getValue('prefs_dlg_lng_lbl');
         
         //get focus manager + set focus to OK button, focus manager is available to all components through getFocusManager
         fm = _container.getFocusManager();
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as
===================================================================
diff -u -r59912308eb25bfc93b9bd701f349c45690e613bb -r98fd51449c072a1f4da231734b5bc84b582339ee
--- lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	(.../LFMenuBar.as)	(revision 59912308eb25bfc93b9bd701f349c45690e613bb)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	(.../LFMenuBar.as)	(revision 98fd51449c072a1f4da231734b5bc84b582339ee)
@@ -67,42 +67,43 @@
         /*=================
             FILE MENU
         =================*/
-        file_menu = _mb.addMenu(Dictionary.getValue(17));
+        file_menu = _mb.addMenu(Dictionary.getValue('mnu_file'));
         
         // "new" is the linkage id of the movie clip to be used as the icon for the "New" menu item.
         //file_menu.addMenuItem({label:"New", instanceName:"newInstance", icon:"new"});
         //_global.breakpoint();
-        file_menu.addMenuItem({label:Dictionary.getValue(9), instanceName:"newItem"});
-        file_menu.addMenuItem({label:Dictionary.getValue(10), instanceName:"openItem"});
-        file_menu.addMenuItem({label:Dictionary.getValue(11), instanceName:"revertItem", enabled:false});
-        file_menu.addMenuItem({label:Dictionary.getValue(12), instanceName:"closeItem"});
+        file_menu.addMenuItem({label:Dictionary.getValue('mnu_file_new'), instanceName:"newItem"});
+        file_menu.addMenuItem({label:Dictionary.getValue('mnu_file_open'), instanceName:"openItem"});
+        file_menu.addMenuItem({label:Dictionary.getValue('mnu_file_revert'), instanceName:"revertItem", enabled:false});
+        file_menu.addMenuItem({label:Dictionary.getValue('mnu_file_new'), instanceName:"closeItem"});
         file_menu.addMenuItem({type:"separator"});
-        file_menu.addMenuItem({label:Dictionary.getValue(13), instanceName:"saveItem"});
+        file_menu.addMenuItem({label:Dictionary.getValue('mnu_file_save'), instanceName:"saveItem"});
 
 
         /*=================
             TOOLS MENU
         =================*/
-        tools_menu = _mb.addMenu(Dictionary.getValue(18));
-        tools_menu.addMenuItem({label:Dictionary.getValue(14), instanceName:"drawTransitionalItem"});
-        tools_menu.addMenuItem({label:Dictionary.getValue(15), instanceName:"drawOptionalItem"});
+        tools_menu = _mb.addMenu(Dictionary.getValue('mnu_tools'));
+        tools_menu.addMenuItem({label:Dictionary.getValue('mnu_tools_trans'), instanceName:"drawTransitionalItem"});
+        tools_menu.addMenuItem({label:Dictionary.getValue('mnu_tools_opt'), instanceName:"drawOptionalItem"});
         tools_menu.addMenuItem({type:"separator"});
-        tools_menu.addMenuItem({label:Dictionary.getValue(21), instanceName:"prefsItem"});
+        tools_menu.addMenuItem({label:Dictionary.getValue('mnu_tools_prefs'), instanceName:"prefsItem"});
 
 
         /*=================
             HELP MENU
         =================*/
-        help_menu = _mb.addMenu(Dictionary.getValue(19));
-        help_menu.addMenuItem({label:Dictionary.getValue(20), instanceName:"aboutItem"});
+        help_menu = _mb.addMenu(Dictionary.getValue('mnu_help'));
+        help_menu.addMenuItem({label:Dictionary.getValue('mnu_help_abt'), instanceName:"aboutItem"});
         
         //set up listeners
         // register the listeners with the separate menus
         file_menu.addEventListener("change", Delegate.create(this,fileMenuClicked));
         tools_menu.addEventListener("change", Delegate.create(this,toolsMenuClicked));
 		
 		//Now that menu items have been set up make the menu bar visible
-		this._visible = true;
+		this._visible = true;
+		Debugger.log('Finished setting up set visible to:'+this._visible,Debugger.GEN,'setupMenuItems','LFMenuBar');
 
 	}