Index: Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js
===================================================================
--- Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js	(revision 7654)
+++ Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.js	(working copy)
@@ -1,7 +1,11 @@
-var commonStrings = document.getElementById('commonStrings');
-var circStrings = document.getElementById('circStrings');
+var commonStrings;
+var circStrings;
+
 function my_init() {
 	try {
+		commonStrings = document.getElementById('commonStrings');
+		circStrings = document.getElementById('circStrings');
+
 		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 		if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
 		JSAN.errorLevel = "die"; // none, warn, or die
Index: Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js
===================================================================
--- Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js	(revision 7654)
+++ Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.js	(working copy)
@@ -1,8 +1,11 @@
-var commonStrings = document.getElementById('commonStrings');
-var circStrings = document.getElementById('circStrings');
+var commonStrings;
+var circStrings;
 
 function my_init() {
 	try {
+		commonStrings = document.getElementById('commonStrings');
+		circStrings = document.getElementById('circStrings');
+
 		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 		if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
 		JSAN.errorLevel = "die"; // none, warn, or die
@@ -77,7 +80,7 @@
 		if (file._file.exists()) { g.delta = file.get_object()[0]; file.close(); } else { g.delta = 0; }
 
 	} catch(E) {
-		var err_msg = commonStrings.getFormattedMessage('common.exception', ["circ/offline_checkout.xul", E]);
+		var err_msg = commonStrings.getFormattedString('common.exception', ["circ/offline_checkout.xul", E]);
 		try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); }
 		alert(err_msg);
 	}
Index: Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
===================================================================
--- Open-ILS/xul/staff_client/chrome/content/circ/offline.xul	(revision 7654)
+++ Open-ILS/xul/staff_client/chrome/content/circ/offline.xul	(working copy)
@@ -30,11 +30,14 @@
 	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
 	<script>
 	<![CDATA[
-		var circStrings = document.getElementById('circStrings');
-		var commonStrings = document.getElementById('commonStrings');
+		var circStrings;
+		var commonStrings;
 
 		function my_init() {
 			try {
+				circStrings = document.getElementById('circStrings');
+				commonStrings = document.getElementById('commonStrings');
+
 				netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 		                if (typeof JSAN == 'undefined') { throw(commonStrings.getString('common.jsan.missing')); }
 				JSAN.errorLevel = "die"; // none, warn, or die
@@ -74,10 +77,10 @@
 	]]>
 	</script>
 
-	<stringbundleset id="circBundleSet">
-		<stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-		<stringbundle id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
-	</stringbundleset>
+	
+	<messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+	<messagecatalog id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
+	
 
 	<groupbox flex="1" class="my_overflow">
 		<caption label="&staff.circ.offline.main.label;"/>
Index: Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
===================================================================
--- Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul	(revision 7654)
+++ Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul	(working copy)
@@ -29,10 +29,10 @@
 	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
 	<script type="text/javascript" src="offline_checkin.js"/>
 
-	<stringbundleset id="circBundleSet">
-		<stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-		<stringbundle id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
-	</stringbundleset>
+	
+	<messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+	<messagecatalog id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
+	
 
 	<groupbox flex="1">
 		<caption label="&staff.circ.offline_checkin.main.label;"/>
Index: Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
===================================================================
--- Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul	(revision 7654)
+++ Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul	(working copy)
@@ -29,10 +29,10 @@
 	<script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
 	<script type="text/javascript" src="offline_checkout.js"/>
 
-	<stringbundleset id="circBundleSet">
-		<stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-		<stringbundle id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
-	</stringbundleset>
+	
+	<messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+	<messagecatalog id="circStrings" src="chrome://open_ils_staff_client/locale/circ.properties"/>
+	
 
 	<groupbox flex="1">
 		<caption label="&staff.circ.offline_checkout.main.label;"/>
Index: Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
===================================================================
--- Open-ILS/xul/staff_client/chrome/content/cat/opac.xul	(revision 7654)
+++ Open-ILS/xul/staff_client/chrome/content/cat/opac.xul	(working copy)
@@ -309,10 +309,10 @@
 	]]>
 	</script>
 
-	<stringbundleset id="catBundleSet">
-		<stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-		<stringbundle id="catStrings" src="chrome://open_ils_staff_client/locale/cat.properties"/>
-	</stringbundleset>
+	
+	<messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+	<messagecatalog id="catStrings" src="chrome://open_ils_staff_client/locale/cat.properties"/>
+	
 
 	<vbox flex="1">
 		<deck id="top_pane"/>
Index: Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
===================================================================
--- Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul	(revision 7654)
+++ Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul	(working copy)
@@ -56,10 +56,10 @@
 	]]>
 	</script>
 
-	<stringbundleset id="adminSet">
-		<stringbundle id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
-		<stringbundle id="adminStrings" src="chrome://open_ils_staff_client/locale/admin.properties"/>
-	</stringbundleset>
+	
+	<messagecatalog id="commonStrings" src="chrome://open_ils_staff_client/locale/common.properties"/>
+	<messagecatalog id="adminStrings" src="chrome://open_ils_staff_client/locale/admin.properties"/>
+	
 
 	<!-- Layout to be filled in by overlays and javascript -->
 	<wizardpage id="page1"/>