From: Galen Charlton <gmc@esilibrary.com>
Date: Wed, 30 Jan 2013 15:46:29 +0000 (-0500)
Subject: start replacing messagecatalog with stringbudle
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6e2a46f8b4054eaf86979d3e70cfda07334a55eb;p=working%2FEvergreen.git

start replacing messagecatalog with stringbudle

NOTE: "%n$s" in properties must be replaced with "%n$S"

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---

diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
index c3b9e4772a..b511c9ce9b 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/util_overlay_chrome.xul
@@ -63,8 +63,8 @@
         <script type='text/javascript' src='util/en-US/OrgTree.js' />
         <script type="text/javascript" src="util/org_utils.js" />   
         <script type="text/javascript" src="global_util.js" />   
-        <messagecatalog id="offlineStrings" src='chrome://open_ils_staff_client/locale/offline.properties'/>
-        <messagecatalog id="authStrings" src='chrome://open_ils_staff_client/locale/auth.properties'/>
+        <stringbundle id="offlineStrings" src='chrome://open_ils_staff_client/locale/offline.properties'/>
+        <stringbundle id="authStrings" src='chrome://open_ils_staff_client/locale/auth.properties'/>
         <hbox id="debug_box" hidden="true" flex="1" style="border: red thin dashed">
             <label value="Debug:" />
             <textbox id="debug_tb" flex="1"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul b/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
index 6fe3dba9d1..50744ab9ff 100644
--- a/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/admin/survey_wizard.xul
@@ -54,7 +54,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <!-- Layout to be filled in by overlays and javascript -->
     <wizardpage id="page1"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
index ab15bc363a..bc848ce83f 100644
--- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.xul
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
     <script type="text/javascript" src="chrome://open_ils_staff_client/content/cat/opac.js"/>
     
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <vbox flex="1">
         <deck id="top_pane"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
index dbd9111b85..7e56aa5ed3 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline.xul
@@ -75,7 +75,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <groupbox flex="1" class="my_overflow">
         <caption label="&staff.circ.offline.main.label;"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
index 8c43929150..eddf56cd2e 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkin.xul
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
     <script type="text/javascript" src="offline_checkin.js"/>
 
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <groupbox flex="1">
         <caption label="&staff.circ.offline_checkin.main.label;"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
index a66f3dfb1d..9745dba401 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_checkout.xul
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
     <script type="text/javascript" src="offline_checkout.js"/>
 
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <groupbox flex="1">
         <caption label="&staff.circ.offline_checkout.main.label;"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul
index 57d7d66205..5ad096b795 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_in_house_use.xul
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
     <script type="text/javascript" src="offline_in_house_use.js"/>
 
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <groupbox flex="1">
         <caption label="&staff.circ.offline_in_house_use.main.label;"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.xul
index 571a649243..322c968892 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_register.xul
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
     <script type="text/javascript" src="offline_register.js"/>
 
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <groupbox flex="1">
         <caption label="&staff.circ.offline_register.main.label;"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.xul b/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.xul
index 3d41709873..0e4ac5ad2e 100644
--- a/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/circ/offline_renew.xul
@@ -29,7 +29,7 @@
     <script type="text/javascript" src="chrome://open_ils_staff_client/content/main/JSAN.js"/>
     <script type="text/javascript" src="offline_renew.js"/>
 
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <groupbox flex="1">
         <caption label="&staff.circ.offline_renew.main.label;"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml b/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml
index 35f179e165..2f4c82237b 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml
+++ b/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml
@@ -124,395 +124,6 @@
     </binding>
 
 
-	<binding id="messagecatalog">
-		<resources/>
-
-		<content>
-			<children>
-			</children>
-		</content>
-
-		<implementation>
-
-			<constructor>
-				<![CDATA[
-                try {
-                        this._load_sprintf();
-                        this._props = {};
-                        this._load_from_src();
-                } catch(E) {
-                    alert('Error constructing messagecatalog in bindings.xml: ' + E);
-                    throw(E);
-                }
-				]]>
-			</constructor>
-
-			<property name="src">
-				<getter>
-					<![CDATA[
-                    try {
-    					return this.getAttribute('src');
-                    } catch(E) {
-                        alert('Error getting @src in messagecatalog in bindings.xml: ' + E);
-                        throw(E);
-                    }
-					]]>
-				</getter>
-				<setter>
-					<![CDATA[
-                    try {
-					    this.setAttribute('src',val);
-    					this.load_from_src();
-    					return val;
-                    } catch(E) {
-                        alert('Error setting @src in messagecatalog in bindings.xml: ' + E);
-                        throw(E);
-                    }
-					]]>
-				</setter>
-			</property>
-
-			<method name="_load_from_src">
-				<body>
-					<![CDATA[
-                    try {
-                            var x = new XMLHttpRequest();
-                            x.open("GET",this.src,false);
-                            x.send(null);
-                            if ((x.status == 0 || x.status == 200) && x.responseText) {
-                                var props = this._props2object(x.responseText);
-                                for (var i in props) {
-                                    this._props[i] = props[i];
-                                }
-                            } else {
-                                var msg = "messageCatalog: No text from " + this.src;
-                                alert(msg); throw(msg);
-                            }
-                           
-                            try { // fail silently if no custom properties file exists
-                                var custom_src = String(this.src).replace(/\.properties$/,'_custom.properties'); 
-                                var x2 = new XMLHttpRequest();
-                                x2.open("GET",custom_src,false);
-                                x2.send(null);
-                                if ((x2.status == 0 || x2.status == 200) && x2.responseText) {
-                                    var props = this._props2object(x2.responseText);
-                                    for (var i in props) {
-                                        this._props[i] = props[i];
-                                    }
-                                }
-                            } catch(EE) {}
-
-                    } catch(E) {
-                        alert('Error loading properties in messagecatalog in bindings.xml: ' + E);
-                        throw(E);
-                    }
-					]]>
-				</body>
-			</method>
-
-			<method name="_props2object">
-				<parameter name="str"/>
-				<body>
-					<![CDATA[
-                        try {
-                            var lines = str.split("\n");
-                            var props = {};
-                            var line = '';
-                            var in_comment = false;
-
-                            for (var l in lines) {
-                                line += lines[l];
-
-                                // handle multi-line comments
-                                if (line.indexOf('/*') >= 0) in_comment = true;
-
-                                if (in_comment && line.indexOf('*/') > 0) {
-                                    var comment_start = line.indexOf('/*');
-                                    var comment_end = line.indexOf('*/');
-                                    line = line.substring(0, comment_start) + line.substring(0, comment_end + 2);
-                                    in_comment = false;
-                                } else if (in_comment) continue;
-                                    
-                                // get rid of entire-line comments
-                                if (line.indexOf('#') == 0) {
-                                    line = '';
-                                    continue;
-                                }
-
-                                // handle end-of-line comments
-                                var end_comment = line.indexOf('//');
-                                if (end_comment >= 0) line = line.substring(0, end_comment);
-
-                                // and line concatenation
-                                if (line.charAt(line.length - 1) == '\\') {
-                                    line = line.substring(0,line.length - 1);
-                                    continue;
-                                }
-
-                                var eq_pos = line.indexOf('=');
-                                if (eq_pos < 0) continue;
-
-                                var k = line.substring(0,eq_pos);
-                                k = k.replace(/\s+/g,"");
-
-                                var v = line.substring(eq_pos + 1);
-
-                                var current_m = 0;
-                                var cont = false;
-                                do {    
-                                    if (v.indexOf( "{" + current_m + "}" ) >= 0 ) {
-                                        var mes_bund = new RegExp( "\\\{" + current_m + "\\\}", 'g' );
-                                        var sprintf_format = "%" + (current_m + 1) + "$s";
-
-                                        v = v.replace( mes_bund, sprintf_format );
-
-                                        cont = true;
-                                        current_m++;
-                                    } else {
-                                        cont = false;
-                                    }
-                                } while ( cont == true );
-
-                                props[k] = v;
-                                line = '';
-                                }
-
-                            return props;
-                        } catch(E) {
-                            alert('Error in props2object in messagecatalog in bindings.xml: ' + E);
-                            throw(E);
-                        }
-					]]>
-				</body>
-			</method>
-
-			<method name="testString">
-				<parameter name="key"/>
-				<body>
-					<![CDATA[
-						try {
-                            var str = this._props[key];
-                            return (typeof str != 'undefined');
-						} catch(e) {
-                            return false;
-						}
-					]]>
-				</body>
-			</method>
-
-
-			<method name="getString">
-				<parameter name="key"/>
-				<body>
-					<![CDATA[
-						try {
-                            var str = this._props[key];
-                            if (typeof str == 'undefined') throw(str);
-							return str;
-						} catch(e) {
-							alert("*** Failed to get string " + key + " in bundle: " + this.src + "\n" + e);
-							throw(e);
-						}
-					]]>
-				</body>
-			</method>
-
-			<method name="getFormattedString">
-				<parameter name="key"/>
-				<parameter name="params"/>
-				<body>
-					<![CDATA[
-						try {
-							var str = this._props[key]; 
-                            if (typeof str == 'undefined') throw(str);
-							var these = [ str ].concat(params);
-							var v = this.sprintf.apply(this,these);
-
-							// replace unicode escapes
-/*
-							v = v.replace(
-								/\\u([0-9a-f]{4})/gi,
-								function (r,s) { return String.fromCharCode(s); }
-							);
-*/
-
-							return v;
-						} catch(e) {
-							alert("*** Failed to get string " + key + " in bundle: " + this.src + "\n");
-							throw(e);
-						}
-					]]>
-				</body>
-			</method>
-
-			<method name="_load_sprintf">
-				<body>
-					<![CDATA[
-					try { 
-						this.sprintf = function() {
-								// FIXME - is the following license GPL-compatible? seems equivalent to the public domain
-								/**
-								 * JavaScript printf/sprintf functions.
-								 *
-								 * This code is unrestricted: you are free to use it however you like.
-								 * 
-								 * The functions should work as expected, performing left or right alignment,
-								 * truncating strings, outputting numbers with a required precision etc.
-								 *
-								 * For complex cases, these functions follow the Perl implementations of
-								 * (s)printf, allowing arguments to be passed out-of-order, and to set the
-								 * precision or length of the output based on arguments instead of fixed
-								 * numbers.
-								 *
-								 * See http://perldoc.perl.org/functions/sprintf.html for more information.
-								 *
-								 * Implemented:
-								 * - zero and space-padding
-								 * - right and left-alignment,
-								 * - base X prefix (binary, octal and hex)
-								 * - positive number prefix
-								 * - (minimum) width
-								 * - precision / truncation / maximum width
-								 * - out of order arguments
-								 *
-								 * Not implemented (yet):
-								 * - vector flag
-								 * - size (bytes, words, long-words etc.)
-								 * 
-								 * Will not implement:
-								 * - %n or %p (no pass-by-reference in JavaScript)
-								 *
-								 * @version 2007.04.27
-								 * @author Ash Searle
-								 */
-
-							function pad(str, len, chr, leftJustify) {
-							var padding = (str.length >= len) ? '' : Array(1 + len - str.length >>> 0).join(chr);
-							return leftJustify ? str + padding : padding + str;
-
-							}
-
-							function justify(value, prefix, leftJustify, minWidth, zeroPad) {
-							var diff = minWidth - value.length;
-							if (diff > 0) {
-								if (leftJustify || !zeroPad) {
-								value = pad(value, minWidth, ' ', leftJustify);
-								} else {
-								value = value.slice(0, prefix.length) + pad('', diff, '0', true) + value.slice(prefix.length);
-								}
-							}
-							return value;
-							}
-
-							function formatBaseX(value, base, prefix, leftJustify, minWidth, precision, zeroPad) {
-							// Note: casts negative numbers to positive ones
-							var number = value >>> 0;
-							prefix = prefix && number && {'2': '0b', '8': '0', '16': '0x'}[base] || '';
-							value = prefix + pad(number.toString(base), precision || 0, '0', false);
-							return justify(value, prefix, leftJustify, minWidth, zeroPad);
-							}
-
-							function formatString(value, leftJustify, minWidth, precision, zeroPad) {
-							if (precision != null) {
-								value = value.slice(0, precision);
-							}
-							return justify(value, '', leftJustify, minWidth, zeroPad);
-							}
-
-							var a = arguments, i = 0, format = a[i++];
-							return format.replace(/%%|%(\d+\$)?([-+#0 ]*)(\*\d+\$|\*|\d+)?(\.(\*\d+\$|\*|\d+))?([scboxXuidfegEGS])/g, function(substring, valueIndex, flags, minWidth, _, precision, type) {
-								if (substring == '%%') return '%';
-
-								// parse flags
-								var leftJustify = false, positivePrefix = '', zeroPad = false, prefixBaseX = false;
-								for (var j = 0; flags && j < flags.length; j++) switch (flags.charAt(j)) {
-								case ' ': positivePrefix = ' '; break;
-								case '+': positivePrefix = '+'; break;
-								case '-': leftJustify = true; break;
-								case '0': zeroPad = true; break;
-								case '#': prefixBaseX = true; break;
-								}
-
-								// parameters may be null, undefined, empty-string or real valued
-								// we want to ignore null, undefined and empty-string values
-
-								if (!minWidth) {
-								minWidth = 0;
-								} else if (minWidth == '*') {
-								minWidth = +a[i++];
-								} else if (minWidth.charAt(0) == '*') {
-								minWidth = +a[minWidth.slice(1, -1)];
-								} else {
-								minWidth = +minWidth;
-								}
-
-								// Note: undocumented perl feature:
-								if (minWidth < 0) {
-								minWidth = -minWidth;
-								leftJustify = true;
-								}
-
-								if (!isFinite(minWidth)) {
-								throw new Error('sprintf: (minimum-)width must be finite');
-								}
-
-								if (!precision) {
-								precision = 'fFeE'.indexOf(type) > -1 ? 6 : (type == 'd') ? 0 : void(0);
-								} else if (precision == '*') {
-								precision = +a[i++];
-								} else if (precision.charAt(0) == '*') {
-								precision = +a[precision.slice(1, -1)];
-								} else {
-								precision = +precision;
-								}
-
-								// grab value using valueIndex if required?
-								var value = valueIndex ? a[valueIndex.slice(0, -1)] : a[i++];
-
-								switch (type) {
-								case 'S':
-								case 's': return formatString(String(value), leftJustify, minWidth, precision, zeroPad);
-								case 'c': return formatString(String.fromCharCode(+value), leftJustify, minWidth, precision, zeroPad);
-								case 'b': return formatBaseX(value, 2, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
-								case 'o': return formatBaseX(value, 8, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
-								case 'x': return formatBaseX(value, 16, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
-								case 'X': return formatBaseX(value, 16, prefixBaseX, leftJustify, minWidth, precision, zeroPad).toUpperCase();
-								case 'u': return formatBaseX(value, 10, prefixBaseX, leftJustify, minWidth, precision, zeroPad);
-								case 'i':
-								case 'd': {
-										  var number = parseInt(+value);
-										  var prefix = number < 0 ? '-' : positivePrefix;
-										  value = prefix + pad(String(Math.abs(number)), precision, '0', false);
-										  return justify(value, prefix, leftJustify, minWidth, zeroPad);
-									  }
-								case 'e':
-								case 'E':
-								case 'f':
-								case 'F':
-								case 'g':
-								case 'G':
-										  {
-										  var number = +value;
-										  var prefix = number < 0 ? '-' : positivePrefix;
-										  var method = ['toExponential', 'toFixed', 'toPrecision']['efg'.indexOf(type.toLowerCase())];
-										  var textTransform = ['toString', 'toUpperCase']['eEfFgG'.indexOf(type) % 2];
-										  value = prefix + Math.abs(number)[method](precision);
-										  return justify(value, prefix, leftJustify, minWidth, zeroPad)[textTransform]();
-									  }
-								default: return substring;
-								}
-								});
-						}
-					} catch(e) {
-						alert("*** Failed to load sprintf library: " + e + "\n");
-						throw(e);
-					}
-					]]>
-				</body>
-			</method>
-		</implementation>
-	</binding>
-
 	<binding id="caption" extends="chrome://global/content/bindings/general.xml#basetext">
 		<resources>
 			<stylesheet src="chrome://global/skin/groupbox.css"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.js b/Open-ILS/xul/staff_client/chrome/content/main/main.js
index a86b64278b..4a49f34e2d 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.js
@@ -604,7 +604,7 @@ function main_init() {
             }
         }
 
-        window.document.title = authStrings.getFormattedString('staff.auth.titlebar.label', CLIENT_VERSION);
+        window.document.title = authStrings.getFormattedString('staff.auth.titlebar.label', [CLIENT_VERSION]);
         var x = document.getElementById('about_btn');
         x.addEventListener(
             'command',
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/main.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
index 1ba82266b0..fba9a75e8a 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
@@ -59,8 +59,8 @@
     <script type="application/x-javascript" src="chrome://inspector/content/hooks.js"/>
     <script type="application/x-javascript" src="chrome://chromelist/content/overlay/ChromeListOverlay.js" />
 
-    <messagecatalog id="authStrings" src="chrome://open_ils_staff_client/locale/auth.properties"/>
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
+    <stringbundle id="authStrings" src="chrome://open_ils_staff_client/locale/auth.properties"/>
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties"/>
 
     <commandset id="auth_cmds">
         <command id="cmd_login" />
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
index 9c5174f657..e2c94ba4b2 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -128,9 +128,9 @@ main.menu.prototype = {
         for(var i = 0; i < hotkeysets.length; i++) {
             var keysetname = hotkeysets[i];
             var menuitem = document.createElement('menuitem');
-            if(offlineStrings.testString('hotkey.' + keysetname))
-                menuitem.setAttribute('label',offlineStrings.getString('hotkey.' + keysetname));
-            else
+            //if(offlineStrings.testString('hotkey.' + keysetname))
+                //menuitem.setAttribute('label',offlineStrings.getString('hotkey.' + keysetname));
+            //else
                 menuitem.setAttribute('label',keysetname);
             menuitem.setAttribute('value',keysetname);
             menuitem.setAttribute('type','radio');
@@ -1905,9 +1905,9 @@ main.menu.prototype = {
             var tab = this.controller.view.tabs.childNodes[i];
             tab.curindex = i;
             tab.label = i + ' ' + tab.origlabel;
-            if(doAccessKeys && offlineStrings.testString('menu.tab' + i + '.accesskey')) {
-                tab.accessKey = offlineStrings.getString('menu.tab' + i + '.accesskey');
-            }
+            //if(doAccessKeys && offlineStrings.testString('menu.tab' + i + '.accesskey')) {
+             //   tab.accessKey = offlineStrings.getString('menu.tab' + i + '.accesskey');
+            //}
         }
     },
 
@@ -1960,9 +1960,9 @@ main.menu.prototype = {
         this.controller.view.panels.appendChild(panel);
         tab.curindex = this.controller.view.tabs.childNodes.length - 1;
         if(!xulG.pref.getBoolPref('open-ils.disable_accesskeys_on_tabs')) {
-            if(offlineStrings.testString('menu.tab' + tab.curindex + '.accesskey')) {
-                tab.accessKey = offlineStrings.getString('menu.tab' + tab.curindex + '.accesskey');
-            }
+            //if(offlineStrings.testString('menu.tab' + tab.curindex + '.accesskey')) {
+                //tab.accessKey = offlineStrings.getString('menu.tab' + tab.curindex + '.accesskey');
+            //}
         }
         var tabs = this.controller.view.tabs;
         tab.addEventListener(
@@ -2619,7 +2619,7 @@ commands:
 
                 // If we have more than one context this should label each entry with where it came from
                 // Likely most useful for distinguishing assets from bookings
-                if(context != valid_r[i].type && offlineStrings.testString('barcode_choice.' + valid_r[i].type + '_label'))
+                if(context != valid_r[i].type && offlineStrings.getString('barcode_choice.' + valid_r[i].type + '_label'))
                     button_label = offlineStrings.getFormattedString('barcode_choice.' + valid_r[i].type + '_label', [button_label]);
 
                 xml += '<button label="' + button_label + '" name="fancy_submit" value="' + i + '"/>';
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul
index 664366c1be..9df034870e 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame.xul
@@ -108,7 +108,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties" />    
+    <stringbundle id="offlineStrings" src="chrome://open_ils_staff_client/locale/offline.properties" />    
 
     <commandset id="universal_cmds" />
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
index 9588022d93..433efaf0a4 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
@@ -288,5 +288,6 @@
     <toolbar id="toolbar_main" hidden="true"/>
     <toolbarpallete id="palette" hidden="true"/>
 </toolbox>
+<script>dump('done loading menu_frame_overlay.xul\n');</script>
 
 </overlay>
diff --git a/Open-ILS/xul/staff_client/chrome/locale/en-US/auth.properties b/Open-ILS/xul/staff_client/chrome/locale/en-US/auth.properties
index b505d7d896..1bc5b43665 100644
--- a/Open-ILS/xul/staff_client/chrome/locale/en-US/auth.properties
+++ b/Open-ILS/xul/staff_client/chrome/locale/en-US/auth.properties
@@ -2,14 +2,14 @@ staff.auth.controller.not_configured=Not yet configured for the specified server
 staff.auth.controller.testing_hostname=Testing hostname...
 staff.auth.controller.prompt_hostname=Please enter a server hostname.
 staff.auth.controller.error_hostname=There was an error testing this hostname.
-staff.auth.controller.status=%1$s : %2$s
+staff.auth.controller.status=%1$S : %2$S
 staff.auth.controller.testing_version=Testing version...
 staff.auth.controller.error_version=There was an error checking version support.
 staff.auth.controller.version_mismatch=This server does not support your version of the staff client.  Please check with your system administrator.
 # login with <username> and <password> at <server>
-staff.auth.controller.error_login=login with %1$s and %2$s at %3$s
+staff.auth.controller.error_login=login with %1$S and %2$S at %3$S
 staff.auth.controller.confirm_close=Are you sure you would like to exit the program completely?
-staff.auth.session.unregistered=%1$s is not registered with this server.
+staff.auth.session.unregistered=%1$S is not registered with this server.
 staff.auth.session.login_failed=Login failed.  Please check your Server Hostname, Username, Password, and your CAPS LOCK key.
 staff.auth.session.init_false=open-ils.auth.authenticate.init returned false
-staff.auth.titlebar.label=Evergreen Staff Client - %1$s
+staff.auth.titlebar.label=Evergreen Staff Client - %1$S
diff --git a/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties b/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
index 2405b95450..46c0a2207b 100644
--- a/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
+++ b/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
@@ -1,4 +1,4 @@
-common.exception=!! This software has encountered an error.  Please tell your friendly system administrator or software developer the following:\n%1$s\n%2$s\n
+common.exception=!! This software has encountered an error.  Please tell your friendly system administrator or software developer the following:\n%1$S\n%2$S\n
 common.jsan.missing=The JSAN library object is missing.
 common.ok=Ok
 common.ok.label=Ok
@@ -9,24 +9,24 @@ common.clear=Clear
 common.confirm=Check here to confirm this message.
 common.error.default=Please report that this happened.
 common.error.copy_msg=Copy Message
-common.barcode.status.warning=Warning: As of %1$s, this barcode (%2$s) was flagged %3$s.
+common.barcode.status.warning=Warning: As of %1$S, this barcode (%2$S) was flagged %3$S.
 common.barcode.status.warning.lost=Lost
 common.barcode.status.warning.expired=Expired
 common.barcode.status.warning.barred=Barred
 common.barcode.status.warning.blocked=Blocked
-common.barcode.status.warning.unknown=with an unknown code: %1$s
+common.barcode.status.warning.unknown=with an unknown code: %1$S
 common.date.invalid=Invalid Date
 common.no=No
 common.no.accesskey=N
 common.yes=Yes
 common.yes.accesskey=Y
 common.unimplemented=Not Yet Implemented
-cat.bib_record=Bib Record: %1$s
-serial.delete_record.confirm=Are you sure you want to delete MFHD record #%1$s?
-cat.opac.delete_record.confirm=Are you sure you want to delete title record #%1$s from the catalog?
+cat.bib_record=Bib Record: %1$S
+serial.delete_record.confirm=Are you sure you want to delete MFHD record #%1$S?
+cat.opac.delete_record.confirm=Are you sure you want to delete title record #%1$S from the catalog?
 cat.opac.delete_record=Delete Record
 cat.opac.delete=Delete
-cat.opac.undelete_record.confirm=Are you sure you want to undelete title record #%1$s from the catalog?
+cat.opac.undelete_record.confirm=Are you sure you want to undelete title record #%1$S from the catalog?
 cat.opac.undelete_record=Undelete Record
 cat.opac.undelete=Undelete
 cat.opac.cancel=Cancel
@@ -35,17 +35,17 @@ cat.opac.record_deleted.confirm=Check here to confirm this action.
 cat.opac.record_undeleted=Record undeleted.
 cat.opac.record_undeleted.confirm=Check here to confirm this action.
 # variables: document ID, error code, error description
-cat.opac.record_deleted.error=Error deleting record #%1$s : %2$s : %3$s
+cat.opac.record_deleted.error=Error deleting record #%1$S : %2$S : %3$S
 # variables: document ID, error code, error description
-cat.opac.record_undeleted.error=Error undeleting record #%1$s : %2$s : %3$s
-cat.opac.record_marked_for_overlay.record_id.alert=Record with ID %1$s marked for overlay.
-cat.opac.record_marked_for_overlay.tcn.alert=Record with TCN %1$s marked for overlay.
-cat.opac.record_marked_for_multi_home.record_id.alert=Record with ID %1$s targeted for Multi-Bib items.
-cat.opac.record_marked_for_multi_home.tcn.alert=Record with TCN %1$s targeted for Mutli-Bib items.
+cat.opac.record_undeleted.error=Error undeleting record #%1$S : %2$S : %3$S
+cat.opac.record_marked_for_overlay.record_id.alert=Record with ID %1$S marked for overlay.
+cat.opac.record_marked_for_overlay.tcn.alert=Record with TCN %1$S marked for overlay.
+cat.opac.record_marked_for_multi_home.record_id.alert=Record with ID %1$S targeted for Multi-Bib items.
+cat.opac.record_marked_for_multi_home.tcn.alert=Record with TCN %1$S targeted for Mutli-Bib items.
 cat.opac.clear_statusbar=Un-target/un-mark this record?
 cat.save_record=Save Record
 cat.save.failure=Record not likely updated.
-cat.record.counter=Record %1$s of %2$s
+cat.record.counter=Record %1$S of %2$S
 cat.preference.error=Preference not likely updated.
 staff.admin.survey.save_response.label=Save this response
 staff.admin.survey.save_response.accesskey=R
@@ -58,11 +58,11 @@ circ.duplicate_scan.field=Duplicate Scan
 circ.offline_checkout.nonbarcoded=or choose a non-barcoded option...
 circ.offline_checkout.items=Enter the number of items:
 circ.offline_checkout.download.warning=WARNING: The non-barcode types have not been downloaded from the server.  You should log in to retrieve these.
-circ.offline_checkout.barcode.flagged.lost=Warning: As of %1$s, this barcode (%2$s) was flagged Lost.
-circ.offline_checkout.barcode.flagged.expired=Warning: As of %1$s, this barcode (%2$s) was flagged Expired.
-circ.offline_checkout.barcode.flagged.barred=Warning: As of %1$s, this barcode (%2$s) was flagged Barred.
-circ.offline_checkout.barcode.flagged.blocked=Warning: As of %1$s, this barcode (%2$s) was flagged Blocked.
-circ.offline_checkout.barcode.flagged.unknown=Warning: As of %1$s, this barcode (%2$s) was flagged with an unknown code: %3$s.
+circ.offline_checkout.barcode.flagged.lost=Warning: As of %1$S, this barcode (%2$S) was flagged Lost.
+circ.offline_checkout.barcode.flagged.expired=Warning: As of %1$S, this barcode (%2$S) was flagged Expired.
+circ.offline_checkout.barcode.flagged.barred=Warning: As of %1$S, this barcode (%2$S) was flagged Barred.
+circ.offline_checkout.barcode.flagged.blocked=Warning: As of %1$S, this barcode (%2$S) was flagged Blocked.
+circ.offline_checkout.barcode.flagged.unknown=Warning: As of %1$S, this barcode (%2$S) was flagged with an unknown code: %3$S.
 circ.offline_checkout.date.early=Due date needs to be after today.
 circ.offline_checkout.required_field=Required Field
 circ.offline_checkout.valid_count=Please try again and enter a valid count.
@@ -90,20 +90,20 @@ circ.offline_register.missing.profile.list=Missing profile list.
 circ.offline_register.missing.id.type.list=Missing identification type list.
 circ.offline_register.missing.required.surveys=Missing required surveys.
 circ.offline_register.missing.files.error=ERROR: Offline patron registration requires some server-generated files.  Please login periodically to retrieve these files.
-jsan.file_not_found.error=File not found: %1$s
-jsan.namespace.creation.error=Could not create namespace[%1$s]: %2$s
+jsan.file_not_found.error=File not found: %1$S
+jsan.namespace.creation.error=Could not create namespace[%1$S]: %2$S
 menu.cmd_edit_copy_buckets.tab=Copy Buckets
 menu.cmd_edit_volume_buckets.tab=Volume Buckets
 menu.cmd_edit_record_buckets.tab=Record Buckets
 menu.cmd_edit_user_buckets.tab=User Buckets
 menu.cmd_replace_barcode.prompt=Enter original barcode for the item:
 menu.cmd_replace_barcode.label=Replace Barcode
-menu.cmd_replace_barcode.retrieval.error=We were unable to retrieve an item with barcode "%1$s".
+menu.cmd_replace_barcode.retrieval.error=We were unable to retrieve an item with barcode "%1$S".
 menu.cmd_replace_barcode.replacement.prompt=Enter the replacement barcode for the item:
 menu.cmd_replace_barcode.replacement.label=Replace Barcode
 menu.cmd_replace_barcode.blank.error=Rename aborted.  Blank for barcode not allowed.
-menu.cmd_replace_barcode.duplicate.error=Rename aborted.  Another copy has barcode "%1$s".
-menu.cmd_replace_barcode.testing.error=Error testing replacement barcode "%1$s".
+menu.cmd_replace_barcode.duplicate.error=Rename aborted.  Another copy has barcode "%1$S".
+menu.cmd_replace_barcode.testing.error=Error testing replacement barcode "%1$S".
 menu.cmd_replace_barcode.permission.error=Rename aborted.  Insufficient permission.
 menu.cmd_replace_barcode.renaming.error=Error renaming item.
 menu.cmd_replace_barcode.renaming.failure=The rename operation probably failed.
@@ -114,14 +114,14 @@ menu.cmd_search_usr_id.tab=What is the internal database ID for the patron accou
 menu.cmd_search_usr_id.prompt=Patron ID Lookup
 menu.cmd_search_tcn.tab=What is the TCN or accession ID for the record?
 menu.cmd_search_tcn.prompt=TCN Lookup
-menu.cmd_search_tcn.not_found.error="%1$s" not found
-menu.cmd_search_tcn.deleted.error="%1$s" is deleted.  Show the deleted record anyway?
+menu.cmd_search_tcn.not_found.error="%1$S" not found
+menu.cmd_search_tcn.deleted.error="%1$S" is deleted.  Show the deleted record anyway?
 menu.cmd_patron_register.related.tab=Editing Related Patron
 menu.cmd_patron_register.tab=Register Patron
 # 1 - Staff Username  2 - Patron Family  3 - Patron Barcode
-staff.circ.work_log_patron_registration.message=%1$s registered %3$s (%2$s)
+staff.circ.work_log_patron_registration.message=%1$S registered %3$S (%2$S)
 # 1 - Staff Username  2 - Patron Family  3 - Patron Barcode  4 - Hold ID  5 - Hold Type
-staff.circ.work_log_hold_placed.message=%1$s placed hold %4$s (%5$s) for %3$s (%2$s)
+staff.circ.work_log_hold_placed.message=%1$S placed hold %4$S (%5$S) for %3$S (%2$S)
 menu.cmd_browse_holds.tab=Hold Browser
 menu.cmd_browse_holds_shelf.tab=Holds Shelf
 menu.cmd_browse_hold_pull_list.tab=On Shelf Pull List
@@ -133,10 +133,10 @@ menu.cmd_retrieve_last_patron.session.error=No patron visited yet this session.
 menu.cmd_retrieve_last_record.session.error=No record visited yet this session.
 menu.cmd_retrieve_last_record.status=Retrieving title...
 menu.cmd_chg_session.label=Change Login
-menu.cmd_chg_session.operator.label=Change Operator: %1$s
+menu.cmd_chg_session.operator.label=Change Operator: %1$S
 menu.cmd_manage_offline_xacts.tab=Offline Transactions
 menu.cmd_download_patrons.complete.status=Download completed
-menu.cmd_download_patrons.error=There was a problem with the download.  The server returned a status %1$s : %2$s
+menu.cmd_download_patrons.error=There was a problem with the download.  The server returned a status %1$S : %2$S
 menu.cmd_stat_cat_edit.tab=Statistical Category Editor
 menu.cmd_non_cat_type_edit.tab=Non-Cataloged Type Editor
 menu.cmd_copy_location_edit.tab=Copy Location Editor
@@ -148,19 +148,19 @@ menu.cmd_public_opac.tab=OPAC
 menu.cmd_extension_manager.tab=Extension Manager
 menu.cmd_theme_manager.tab=Theme Manager
 menu.cmd_shutdown.prompt=Exit Evergreen completely?
-menu.spawn_search.msg=Editor would like to search for: %1$s
+menu.spawn_search.msg=Editor would like to search for: %1$S
 menu.cmd_verify_credentials.tabname=Verify Credentials
 menu.close_all_tabs.error=Error closing all tabs
 menu.new_tab.tab=Tab
 menu.new_tab.max_tab_dialog=Sorry, we can't create any more tabs in this window.\nWould you like to create a new tab in another window?
-main.session_cookie.error=Error setting session cookie: %1$s
+main.session_cookie.error=Error setting session cookie: %1$S
 menu.set_tab.error=pause for error
 menu.reset_network_stats=Reset network activity summary?
 main.testing=Testing
 main.transaction_export.title=Save Transaction File As
-main.transaction_export.prompt=Would you like to overwrite the existing file %1$s?
+main.transaction_export.prompt=Would you like to overwrite the existing file %1$S?
 main.transaction_export.prompt.title=Transaction Export Warning
-main.transaction_export.success.prompt=Your transactions have been successfully exported to file %1$s. We strongly recommend that you now purge the transactions from this staff client.  Would you like for us to do this?
+main.transaction_export.success.prompt=Your transactions have been successfully exported to file %1$S. We strongly recommend that you now purge the transactions from this staff client.  Would you like for us to do this?
 main.transaction_export.success.title=Transaction Export Successful
 main.transaction_export.filename.error=Error purging transactions:  Taking too long to find a unique filename for archival.
 main.transaction_export.duplicate.warning=Please note that you now have two sets of identical transactions.  Unless the set you just exported is solely for archival purposes, we run the risk of duplicate transactions being processed on the server.
@@ -168,45 +168,45 @@ main.transaction_export.no_filename.error=Either you did not choose a filename,
 main.transaction_export.no_transactions.error=There are no outstanding transactions to export.
 main.transaction_import.outstanding.error=There are already outstanding transactions on this staff client.  Upload these first.
 main.transaction_import.title=Import Transaction File
-main.transaction_import.delete.prompt=Your transactions have been successfully migrated to this staff client.\n\nWe recommend that you delete the external copy.  Would you like for us to delete %1$s?
+main.transaction_import.delete.prompt=Your transactions have been successfully migrated to this staff client.\n\nWe recommend that you delete the external copy.  Would you like for us to delete %1$S?
 main.transaction_import.success=Transaction Import Successful
 main.on_debug.clear_cache=cache cleared
 main.on_debug.debug=debug the debug :D
 main.new_window_btn.login_first_warning=Please login first!
 main.settings.migrate=This version of the staff client stores local settings in a different location than your previous installation.  Should we attempt to migrate these settings?
-main.settings.migrate.failed=WARNING: Unable to migrate legacy settings.  The settings and configuration files appear to exist in multiple locations. \nTo resolve this problem manually, please consider:\n\t%1$s\nwhich is in the directory where we want to store settings for the current operating system account, and:\n\t%2$s\nwhich is where we used to store such information.\n
-main.settings.migrate.confirm=Move the settings and configuration files from\n%1$s\nto\n%2$s?
-main.settings.migrate.error=Error trying to move %1$s to directory %2$s
+main.settings.migrate.failed=WARNING: Unable to migrate legacy settings.  The settings and configuration files appear to exist in multiple locations. \nTo resolve this problem manually, please consider:\n\t%1$S\nwhich is in the directory where we want to store settings for the current operating system account, and:\n\t%2$S\nwhich is where we used to store such information.\n
+main.settings.migrate.confirm=Move the settings and configuration files from\n%1$S\nto\n%2$S?
+main.settings.migrate.error=Error trying to move %1$S to directory %2$S
 network.override.exceptions=Exceptions
 network.override.override=Override 
 network.override.force.prompt=Force this action?
 network.ignore_errors=Ignore Errors
-network.method_not_found.error=Method not found for %1$s
+network.method_not_found.error=Method not found for %1$S
 network.new_session.authorize=Authorize
 network.new_session.expired=Session Expired
 network.new_session.expired.prompt=Please enter the credentials for a new login session.
 network.new_session.operator_change=Operator Change
 network.new_session.operator_change.prompt=Please enter the credentials for the new login session.  Note that the previous session is still active.
 network.permission.authorize=Authorize
-network.permission.description.brief=Permission Denied: %1$s
-network.permission.description.full=Another staff member with the above permission may authorize this specific action.  Please notify your library administrator if you need this permission.  If you feel you have received this exception in error, please inform your friendly Evergreen developers or helpdesk staff of the above permission and this debug information: %1$s
+network.permission.description.brief=Permission Denied: %1$S
+network.permission.description.full=Another staff member with the above permission may authorize this specific action.  Please notify your library administrator if you need this permission.  If you feel you have received this exception in error, please inform your friendly Evergreen developers or helpdesk staff of the above permission and this debug information: %1$S
 network.server_or_method.error=Server or method error
-network.server.failure.exception=Network or server failure.  Please check your Internet connection to %1$s and choose Retry Network.  If you need to enter Offline Mode, choose Ignore Errors in this and subsequent dialogs.  If you believe this error is due to a bug in Evergreen and not network problems, please contact your help desk or friendly Evergreen administrators, and give them this information:
-network.server.method=method=%1$s
-network.server.params=params=%1$s
+network.server.failure.exception=Network or server failure.  Please check your Internet connection to %1$S and choose Retry Network.  If you need to enter Offline Mode, choose Ignore Errors in this and subsequent dialogs.  If you believe this error is due to a bug in Evergreen and not network problems, please contact your help desk or friendly Evergreen administrators, and give them this information:
+network.server.method=method=%1$S
+network.server.params=params=%1$S
 network.server.thrown_label=THROWN:
 network.server.status_label=STATUS:
 network.network_failure=Network Failure
 network.retry_network=Retry Network
 network.unknown_status=Unknown status
 network.window_title.error=Error setting window titles to match new login
-openils.global_util.clear_cache.error=Problem clearing the cache: %1$s
-openils.global_util.clipboard.error=Clipboard action failed: %1$s
-openils.global_util.clipboard=Copied "%1$s" to clipboard.
-openils.global_util.content_window_jsobject.error=Error with get_contentWindow(%1$s) and wrappedJSObject: %2$s
-openils.global_util.content_window.error=Error with get_contentWindow(%1$s): %2$s
-openils.global_util.font_size.error=Error adjusting the font size: %1$s
-list.row_fetch_warning=WARNING: Only %1$s out of %2$s rows in this list have been retrieved for immediate viewing.  Sorting this list requires that all these rows be retrieved, and this may take some time and lag the staff client.  Would you like to proceed?
+openils.global_util.clear_cache.error=Problem clearing the cache: %1$S
+openils.global_util.clipboard.error=Clipboard action failed: %1$S
+openils.global_util.clipboard=Copied "%1$S" to clipboard.
+openils.global_util.content_window_jsobject.error=Error with get_contentWindow(%1$S) and wrappedJSObject: %2$S
+openils.global_util.content_window.error=Error with get_contentWindow(%1$S): %2$S
+openils.global_util.font_size.error=Error adjusting the font size: %1$S
+list.row_fetch_warning=WARNING: Only %1$S out of %2$S rows in this list have been retrieved for immediate viewing.  Sorting this list requires that all these rows be retrieved, and this may take some time and lag the staff client.  Would you like to proceed?
 list.columns_saved=Column configuration saved.
 list.column_save_disabled=Column configuration save disabled by server policy.
 list.row_retrieving=Retrieving...
@@ -272,23 +272,23 @@ staff.cat.util.copy_editor.batch_view=Batch View
 staff.cat.util.copy_editor.edit=Edit
 staff.cat.util.copy_editor.view=View
 staff.circ.copy_status.add_volumes.perm_failure=You do not have permission to add volumes to the workstation library.
-staff.circ.copy_status.add_volumes.title=Add Volume/Item for Record # %1$s
-staff.cat.copy_browser.marked_record_for_multi_home_indicator.tcn.label=Record with TCN %1$s targeted for Multi-Bib items.
-staff.cat.copy_browser.marked_record_for_multi_home_indicator.record_id.label=Record with ID %1$s targeted for Multi-Bib items.
-staff.cat.z3950.marked_record_for_overlay_indicator.tcn.label=Record with TCN %1$s marked for overlay.
-staff.cat.z3950.marked_record_for_overlay_indicator.record_id.label=Record with ID %1$s marked for overlay.
-staff.cat.opac.marked_record_for_hold_transfer_indicator.tcn.label=Record with TCN %1$s marked for title hold transfer.
-staff.cat.opac.marked_record_for_hold_transfer_indicator.record_id.label=Record with ID %1$s marked for title hold transfer.
+staff.circ.copy_status.add_volumes.title=Add Volume/Item for Record # %1$S
+staff.cat.copy_browser.marked_record_for_multi_home_indicator.tcn.label=Record with TCN %1$S targeted for Multi-Bib items.
+staff.cat.copy_browser.marked_record_for_multi_home_indicator.record_id.label=Record with ID %1$S targeted for Multi-Bib items.
+staff.cat.z3950.marked_record_for_overlay_indicator.tcn.label=Record with TCN %1$S marked for overlay.
+staff.cat.z3950.marked_record_for_overlay_indicator.record_id.label=Record with ID %1$S marked for overlay.
+staff.cat.opac.marked_record_for_hold_transfer_indicator.tcn.label=Record with TCN %1$S marked for title hold transfer.
+staff.cat.opac.marked_record_for_hold_transfer_indicator.record_id.label=Record with ID %1$S marked for title hold transfer.
 staff.cat.opac.title_for_hold_transfer.destination_needed.label=Need to mark a record as a Title Hold Transfer Destination first.
 staff.cat.opac.title_for_hold_transfer.success.label=Holds transferred.
 staff.cat.opac.title_for_hold_transfer.failure.label=Holds not transferred.
 staff.cat.opac.related_items=Related Lineitems
 staff.cat.opac.serial_alt_mgmt=Subscriptions
 staff.cat.create_or_rebarcode_items=Create or Re-barcode Items
-staff.cat.bib_source.can_have_copies.false=Records from %1$s cannot have copies.
+staff.cat.bib_source.can_have_copies.false=Records from %1$S cannot have copies.
 printing.nothing_to_reprint=Nothing to re-print
 printing.prompt_for_external_print_cmd=Enter external print command and parameters (use %receipt.txt% or %receipt.html% as the file containing the print data. Those values will be substituted with the proper path.):
-printing.print_strategy_saved=Print strategy (%1$s) for %2$s context saved to file system.
+printing.print_strategy_saved=Print strategy (%1$S) for %2$S context saved to file system.
 text_editor.prompt_for_external_cmd=Enter external text editor command and parameters (use %letter.txt% as the file containing the text. This value will be substituted with the proper path.):
 menu.tab1.accesskey=1
 menu.tab2.accesskey=2
@@ -309,25 +309,25 @@ menu.logoff.unsaved_data_warning=This session may have unsaved data. Logoff anyw
 menu.shutdown.unsaved_data_warning=This application may have unsaved data. Exit it anyway?
 hotkeys.Default=Default
 hotkeys.None=No Hotkeys
-barcode_choice.join_barcodes=%1$s / %2$s
-barcode_choice.actor=%1$s : %2$s, %3$s from %4$s (%5$s)
-barcode_choice.asset=%1$s : %2$s from %3$s (%4$s)
+barcode_choice.join_barcodes=%1$S / %2$S
+barcode_choice.actor=%1$S : %2$S, %3$S from %4$S (%5$S)
+barcode_choice.asset=%1$S : %2$S from %3$S (%4$S)
 barcode_choice.none=None of the above
 barcode_choice.prompt=After auto completion multiple barcodes may match your input. Please choose the barcode you intended below.
 barcode_choice.errors_found=In addition to the options below, one or more errors were encountered on items not shown.
 barcode_choice.title=Barcode Choice
 barcode_choice.choice_label=Found Barcodes:
-barcode_choice.actor_label=Patron : %1$s
-barcode_choice.asset_label=Item : %1$s
-barcode_choice.serial_label=Serial : %1$s
-barcode_choice.booking_label=Booking : %1$s
+barcode_choice.actor_label=Patron : %1$S
+barcode_choice.asset_label=Item : %1$S
+barcode_choice.serial_label=Serial : %1$S
+barcode_choice.booking_label=Booking : %1$S
 staff.main.button_bar.none=None
 staff.main.button_bar.default=Default
 util.hide_elements.title=Hide UI Elements
 util.hide_elements.desc=This is a list of hideable elements for this interface.  Check the ones that you want hidden and the library (and descendants) you want to affect:
-util.hide_elements.current_setting_preamble=Workstation library %1$s is currently hiding these elements based on a setting inherited from %2$s:
-util.hide_elements.current_setting_nonexistent=Workstation library %1$s is not currently hiding any of these elements.
+util.hide_elements.current_setting_preamble=Workstation library %1$S is currently hiding these elements based on a setting inherited from %2$S:
+util.hide_elements.current_setting_nonexistent=Workstation library %1$S is not currently hiding any of these elements.
 util.hide_elements.update_setting.update_success=Successfully updated the setting.
 util.hide_elements.update_setting.delete_success=Successfully deleted the setting.
 util.hide_elements.update_setting.failure=Setting not changed.
-util.hide_elements.missing_permission=Missing permission %1$s
+util.hide_elements.missing_permission=Missing permission %1$S
diff --git a/Open-ILS/xul/staff_client/chrome/skin/global.css b/Open-ILS/xul/staff_client/chrome/skin/global.css
index 85e3d1f81b..b3e6c5102d 100644
--- a/Open-ILS/xul/staff_client/chrome/skin/global.css
+++ b/Open-ILS/xul/staff_client/chrome/skin/global.css
@@ -16,7 +16,6 @@ iframe { background: #CDCED3 url("chrome://browser/skin/icons/box-background.png
 .operator_change { background-color: red; }
 
 .shrinkable_groupbox { font-weight: bold; -moz-binding: url('chrome://open_ils_staff_client/content/main/bindings.xml#caption'); }
-messagecatalog { -moz-binding: url('chrome://open_ils_staff_client/content/main/bindings.xml#messagecatalog'); }
 help { -moz-binding: url('chrome://open_ils_staff_client/content/main/bindings.xml#help'); }
 
 .my_overflow { overflow: auto; }
diff --git a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
index b4b81ac400..1408383975 100644
--- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
@@ -86,9 +86,9 @@
             <menuitem label="&common.sort.next.ascending;" oncommand="util.sort.dispatch('next','asc');"/>
             <menuitem label="&common.sort.next.descending;" oncommand="util.sort.dispatch('next','desc');"/>
         </menupopup>
-        <messagecatalog id="commonStrings" src='/xul/server/locale/<!--#echo var="locale"-->/common.properties'/>
-        <messagecatalog id="offlineStrings" src='/xul/server/locale/<!--#echo var="locale"-->/offline.properties'/>
-        <messagecatalog id="authStrings" src='/xul/server/locale/<!--#echo var="locale"-->/auth.properties'/>
+        <stringbundle id="commonStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/common.properties'/>
+        <stringbundle id="offlineStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/offline.properties'/>
+        <stringbundle id="authStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/auth.properties'/>
         <hbox id="debug_box" hidden="true" flex="1" style="border: red thin dashed">
             <label value="Debug:" />
             <textbox id="debug_tb" flex="1"/>
diff --git a/Open-ILS/xul/staff_client/server/admin/circ_age_to_lost.xul b/Open-ILS/xul/staff_client/server/admin/circ_age_to_lost.xul
index b9664fc1c7..1f72f5102c 100644
--- a/Open-ILS/xul/staff_client/server/admin/circ_age_to_lost.xul
+++ b/Open-ILS/xul/staff_client/server/admin/circ_age_to_lost.xul
@@ -31,7 +31,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="circ_age_to_lost.js"/>
 
-    <messagecatalog id="adminStrings" src="/xul/server/locale/<!--#echo var='locale'-->/admin.properties"/>
+    <stringbundle id="adminStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/admin.properties"/>
 
     <vbox flex="1">
         <grid>
diff --git a/Open-ILS/xul/staff_client/server/admin/do_not_auto_attempt_print_setting.xul b/Open-ILS/xul/staff_client/server/admin/do_not_auto_attempt_print_setting.xul
index d556207106..3364cd7437 100644
--- a/Open-ILS/xul/staff_client/server/admin/do_not_auto_attempt_print_setting.xul
+++ b/Open-ILS/xul/staff_client/server/admin/do_not_auto_attempt_print_setting.xul
@@ -28,7 +28,7 @@
     </script>
     <scripts id="openils_util_scripts"/>
 
-    <messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
+    <stringbundle id="adminStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="do_not_auto_attempt_print_setting.js"/>
diff --git a/Open-ILS/xul/staff_client/server/admin/font_settings.xul b/Open-ILS/xul/staff_client/server/admin/font_settings.xul
index 78f4dd7504..b558a8ef28 100644
--- a/Open-ILS/xul/staff_client/server/admin/font_settings.xul
+++ b/Open-ILS/xul/staff_client/server/admin/font_settings.xul
@@ -123,7 +123,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
+    <stringbundle id="adminStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
 
     <groupbox orient="vertical">
         <caption label="&staff.server.admin.font.sound.caption;"/>
diff --git a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
index 860327f18d..e7707b0448 100644
--- a/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
+++ b/Open-ILS/xul/staff_client/server/admin/offline_manage_xacts.xul
@@ -50,7 +50,7 @@
 
     ]]>
     </script>
-    <messagecatalog id="adminStrings" src="/xul/server/locale/<!--#echo var='locale'-->/admin.properties"/>
+    <stringbundle id="adminStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/admin.properties"/>
 
     <vbox id="admin_offline_manage_xacts_main" flex="1">
 
diff --git a/Open-ILS/xul/staff_client/server/admin/patrons_due_refunds.xul b/Open-ILS/xul/staff_client/server/admin/patrons_due_refunds.xul
index 26250c79f7..4718a0af24 100644
--- a/Open-ILS/xul/staff_client/server/admin/patrons_due_refunds.xul
+++ b/Open-ILS/xul/staff_client/server/admin/patrons_due_refunds.xul
@@ -28,7 +28,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="patrons_due_refunds.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <commandset id="patrons_due_refunds_cmds">
         <command id="retrieve_patron" label="&staff.patron.display_overlay.retrieve_patron.label;" accesskey="&staff.patron.display_overlay.retrieve_patron.accesskey;" />
diff --git a/Open-ILS/xul/staff_client/server/admin/printer_settings.xul b/Open-ILS/xul/staff_client/server/admin/printer_settings.xul
index e8f61aed0a..2861398255 100644
--- a/Open-ILS/xul/staff_client/server/admin/printer_settings.xul
+++ b/Open-ILS/xul/staff_client/server/admin/printer_settings.xul
@@ -26,7 +26,7 @@
     <script type="text/javascript" src="/xul/server/main/constants.js"></script>
     <script type="text/javascript" src="/xul/server/main/JSAN.js"></script>
     <script type="text/javascript" src="printer_settings.js"></script>
-    <messagecatalog id="offlineStrings" src="/xul/server/locale/<!--#echo var='locale'-->/offline.properties" />
+    <stringbundle id="offlineStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/offline.properties" />
     <groupbox>
         <caption label="&staff.printing.context.header;" />
         <vbox>
diff --git a/Open-ILS/xul/staff_client/server/admin/toolbar.xul b/Open-ILS/xul/staff_client/server/admin/toolbar.xul
index 5732674034..0df4934412 100644
--- a/Open-ILS/xul/staff_client/server/admin/toolbar.xul
+++ b/Open-ILS/xul/staff_client/server/admin/toolbar.xul
@@ -27,7 +27,7 @@
         var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
     </script>
     <scripts id="openils_util_scripts"/>
-    <messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
+    <stringbundle id="adminStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="toolbar.js"/>
diff --git a/Open-ILS/xul/staff_client/server/admin/transit_list.xul b/Open-ILS/xul/staff_client/server/admin/transit_list.xul
index b281208cae..7abb718708 100644
--- a/Open-ILS/xul/staff_client/server/admin/transit_list.xul
+++ b/Open-ILS/xul/staff_client/server/admin/transit_list.xul
@@ -52,9 +52,9 @@
     ]]>
     </script>
 
-    <messagecatalog id="adminStrings" src='/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
-    <messagecatalog id="circStrings" src='/xul/server/locale/<!--#echo var="locale"-->/circ.properties'/>
-    <messagecatalog id="catStrings" src='/xul/server/locale/<!--#echo var="locale"-->/cat.properties'/>
+    <stringbundle id="adminStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/admin.properties'/>
+    <stringbundle id="circStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/circ.properties'/>
+    <stringbundle id="catStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/cat.properties'/>
 
     <vbox flex="1" class="my_overflow">
         <hbox>
diff --git a/Open-ILS/xul/staff_client/server/admin/work_log.xul b/Open-ILS/xul/staff_client/server/admin/work_log.xul
index 0bcfc67e9d..b59e29a6cc 100644
--- a/Open-ILS/xul/staff_client/server/admin/work_log.xul
+++ b/Open-ILS/xul/staff_client/server/admin/work_log.xul
@@ -27,7 +27,7 @@
         var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true;
     </script>
     <scripts id="openils_util_scripts"/>
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="work_log.js"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief.js b/Open-ILS/xul/staff_client/server/cat/bib_brief.js
index 0f527d6aab..8d393b038b 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief.js
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief.js
@@ -277,12 +277,12 @@ function dynamic_grid_replacement(mode) {
             label.setAttribute('control',name);
             label.setAttribute('class','emphasis');
             label.setAttribute('value',
-                catStrings.testString('staff.cat.bib_brief.'+name+'.label')
+                (typeof catStrings.getString('staff.cat.bib_brief.'+name+'.label') != 'undefined')
                 ? catStrings.getString('staff.cat.bib_brief.'+name+'.label')
                 : name
             );
             label.setAttribute('accesskey',
-                catStrings.testString('staff.cat.bib_brief.'+name+'.accesskey')
+                (typeof catStrings.getString('staff.cat.bib_brief.'+name+'.accesskey') != 'undefined')
                 ? catStrings.getString('staff.cat.bib_brief.'+name+'.accesskey')
                 : name
             );
diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief.xul b/Open-ILS/xul/staff_client/server/cat/bib_brief.xul
index 3ce8e8f6c5..d36815d637 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief.xul
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief.xul
@@ -35,8 +35,8 @@ vim: noet:sw=4:ts=4:
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="/xul/server/cat/bib_brief.js"/>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
 
     <groupbox id="groupbox" flex="1" style="overflow: auto;">
         <caption id="caption">
diff --git a/Open-ILS/xul/staff_client/server/cat/bib_brief_vertical.xul b/Open-ILS/xul/staff_client/server/cat/bib_brief_vertical.xul
index 34f7cbeedd..87ccee61f3 100644
--- a/Open-ILS/xul/staff_client/server/cat/bib_brief_vertical.xul
+++ b/Open-ILS/xul/staff_client/server/cat/bib_brief_vertical.xul
@@ -35,8 +35,8 @@ vim: noet:sw=4:ts=4:
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="/xul/server/cat/bib_brief.js"/>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
 
     <groupbox id="groupbox" flex="1">
         <caption id="caption"><label value="&staff.cat.bib_brief.record_summary;"/>(<label value="&staff.cat.bib_brief.view_marc;" class="click_link" onclick="view_marc();"/>)</caption>
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_browser.xul b/Open-ILS/xul/staff_client/server/cat/copy_browser.xul
index 51ee003416..db2a72c83f 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_browser.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_browser.xul
@@ -65,8 +65,8 @@ vim:noet:sw=4:ts=4:
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <commandset id="cat_copy_browser">
         <command id="save_columns" />
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul b/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
index 1c4d25ecae..f9cd03674d 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets.xul
@@ -72,8 +72,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
 
     <commandset id="copy_buckets_cmds">
         <command id="cmd_copy_bucket_submit_barcode" />
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul b/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul
index 4d5894ff54..16740df9db 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_buckets_quick.xul
@@ -149,8 +149,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <vbox flex="1" style="overflow: auto">
     <groupbox flex="1">
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_editor.js b/Open-ILS/xul/staff_client/server/cat/copy_editor.js
index 1e826c20c7..5f4c65e28c 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_editor.js
+++ b/Open-ILS/xul/staff_client/server/cat/copy_editor.js
@@ -94,7 +94,6 @@ function my_init() {
 
         /******************************************************************************************************/
         /* Quick fix, this was defined inline in the global scope but now needs g.error and g.copies from my_init */
-        /* Quick fix, messagecatalog only usable during/after onload */
 
         init_panes0();
         init_panes();
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_editor.xul b/Open-ILS/xul/staff_client/server/cat/copy_editor.xul
index b72d537b0c..5161d3dacd 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_editor.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_editor.xul
@@ -33,7 +33,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="copy_editor.js"/>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <vbox id="brief_display_box"/>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_notes.xul b/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
index a71f436b40..55b6b9a7c7 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_notes.xul
@@ -201,8 +201,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <stack hidden="true" id="note_template" flex="1">
         <groupbox flex="1" style="background-color: black;"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
index 3bc57236ca..cbff6d5e79 100644
--- a/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
+++ b/Open-ILS/xul/staff_client/server/cat/copy_summary.xul
@@ -182,8 +182,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <groupbox id="groupbox" flex="1" style="overflow: none; min-height: 80;">
         <caption label="&staff.cat.copy_summary.label;" id="caption"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.xul b/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.xul
index fa739267f2..28eee35859 100644
--- a/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.xul
+++ b/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.xul
@@ -29,8 +29,8 @@
     </script>
     <scripts id="openils_util_scripts"/>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="manage_multi_home_items.js"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/marc_new.xul b/Open-ILS/xul/staff_client/server/cat/marc_new.xul
index ae5d3d2317..87b41e471f 100644
--- a/Open-ILS/xul/staff_client/server/cat/marc_new.xul
+++ b/Open-ILS/xul/staff_client/server/cat/marc_new.xul
@@ -198,8 +198,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <vbox id="marc_editor_box" flex="1">
         <hbox id="actions">
diff --git a/Open-ILS/xul/staff_client/server/cat/marc_view.xul b/Open-ILS/xul/staff_client/server/cat/marc_view.xul
index 90b42e8e35..f176052e2d 100644
--- a/Open-ILS/xul/staff_client/server/cat/marc_view.xul
+++ b/Open-ILS/xul/staff_client/server/cat/marc_view.xul
@@ -75,7 +75,7 @@ vim:noet:sw=4:ts=4:
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
 
     <groupbox flex="1">
         <caption label="&staff.cat.marc_view.title;"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.css b/Open-ILS/xul/staff_client/server/cat/marcedit.css
index 8f1fcf5e64..f81c970b88 100644
--- a/Open-ILS/xul/staff_client/server/cat/marcedit.css
+++ b/Open-ILS/xul/staff_client/server/cat/marcedit.css
@@ -1,4 +1,3 @@
-messagecatalog { -moz-binding: url('../main/bindings.xml#messagecatalog'); }
 input {
     background-color: lightgrey;
 }
diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.xul b/Open-ILS/xul/staff_client/server/cat/marcedit.xul
index 0519d0655e..dcf6a6ac74 100644
--- a/Open-ILS/xul/staff_client/server/cat/marcedit.xul
+++ b/Open-ILS/xul/staff_client/server/cat/marcedit.xul
@@ -18,8 +18,8 @@
 
 <script src="marcedit.js" type="application/x-javascript; e4x=1"/>
 
-<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+<stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+<stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
 <groupbox flex="0">
     <caption label="&staff.cat.marcedit.options.label;"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets.xul b/Open-ILS/xul/staff_client/server/cat/record_buckets.xul
index 2682425a80..8b907247fa 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets.xul
@@ -81,8 +81,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
 
     <commandset id="record_buckets_cmds" />
 
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul b/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
index 2ea4cdbc3e..614afd4848 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets_overlay.xul
@@ -7,8 +7,8 @@
 
 <script>dump('loading record_buckets_overlay.xul\n');</script>
 
-<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+<stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+<stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
 <commandset id="record_buckets_cmds">
     <command id="sel_clip0" disabled="true"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets_quick.xul b/Open-ILS/xul/staff_client/server/cat/record_buckets_quick.xul
index 72264b7284..73fe9a76c3 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets_quick.xul
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets_quick.xul
@@ -138,8 +138,8 @@
     ]]>
     </script>
     
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <vbox flex="1" style="overflow: auto">
     <groupbox flex="1">
diff --git a/Open-ILS/xul/staff_client/server/cat/spine_labels.xul b/Open-ILS/xul/staff_client/server/cat/spine_labels.xul
index 3839704253..751f34f288 100644
--- a/Open-ILS/xul/staff_client/server/cat/spine_labels.xul
+++ b/Open-ILS/xul/staff_client/server/cat/spine_labels.xul
@@ -30,8 +30,8 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="/xul/server/cat/spine_labels.js"/>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <vbox id="spine_labels_main" flex="1" class="my_overflow">
         <hbox flex="1" class="my_overflow">
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_buckets.xul b/Open-ILS/xul/staff_client/server/cat/volume_buckets.xul
index 59c1f5436e..e3c1cd6dc0 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_buckets.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_buckets.xul
@@ -53,8 +53,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
     
     <label value="Just a stub, Not Yet Implemented"/>
 
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
index 5cfc111c9b..fcf5346cb4 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.xul
@@ -33,8 +33,8 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="volume_copy_creator.js"/>
     
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
 <vbox flex="1" class="my_overflow">
     <vbox id="summary_box" oils_persist="height"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul
index ec03b1a559..3a87bb39e2 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_editor_horiz.xul
@@ -28,7 +28,7 @@
     </script>
     <scripts id="openils_util_scripts"/>
 
-    <messagecatalog id="catStrings" src='/xul/server/locale/<!--#echo var="locale"-->/cat.properties'/>
+    <stringbundle id="catStrings" src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/cat.properties'/>
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="volume_copy_editor.js"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_editor.xul b/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
index 33d856c814..36993542df 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
+++ b/Open-ILS/xul/staff_client/server/cat/volume_editor.xul
@@ -33,8 +33,8 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="volume_editor.js"/>
 
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <groupbox flex="1" style="overflow: auto">
         <caption id="caption" label="&staff.cat.volume_editor.caption.label;"/>
diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.js b/Open-ILS/xul/staff_client/server/cat/z3950.js
index cf78b115c8..b897176c85 100644
--- a/Open-ILS/xul/staff_client/server/cat/z3950.js
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.js
@@ -330,7 +330,7 @@ cat.z3950.prototype = {
                                                         }
                                                         if (attr.label) {
                                                             attrs[i].labels[ attr.label ] = true;
-                                                        } else if (document.getElementById('commonStrings').testString('staff.z39_50.search_class.' + i)) {
+                                                        } else if (typeof document.getElementById('commonStrings').getString('staff.z39_50.search_class.' + i) != 'undefined') {
                                                             attrs[i].labels[ document.getElementById('commonStrings').getString('staff.z39_50.search_class.' + i) ] = true;
                                                         } else if (attr.name) {
                                                             attrs[i].labels[ attr.name ] = true;
diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.xul b/Open-ILS/xul/staff_client/server/cat/z3950.xul
index 7c02ef465f..b553e05907 100644
--- a/Open-ILS/xul/staff_client/server/cat/z3950.xul
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.xul
@@ -74,8 +74,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-     <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+     <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <commandset id="cat_z3950_cmds">
         <command id="cmd_broken" />
diff --git a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
index 7d39fd9f82..f01fb7e0b2 100644
--- a/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
+++ b/Open-ILS/xul/staff_client/server/circ/alternate_copy_summary.xul
@@ -33,8 +33,8 @@
     <script type="text/javascript" src="/xul/server/cat/bib_brief.js"/>
     <script type="text/javascript" src="alternate_copy_summary.js"/>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
 
     <groupbox flex="1">
 
diff --git a/Open-ILS/xul/staff_client/server/circ/backdate_post_checkin.xul b/Open-ILS/xul/staff_client/server/circ/backdate_post_checkin.xul
index 81cdec091e..98bde73f9d 100644
--- a/Open-ILS/xul/staff_client/server/circ/backdate_post_checkin.xul
+++ b/Open-ILS/xul/staff_client/server/circ/backdate_post_checkin.xul
@@ -31,7 +31,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="backdate_post_checkin.js"/>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
     <!-- CONTENT -->
diff --git a/Open-ILS/xul/staff_client/server/circ/checkin.xul b/Open-ILS/xul/staff_client/server/circ/checkin.xul
index 1910e01a44..5fca0007a3 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkin.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkin.xul
@@ -77,8 +77,8 @@
 
     <commandset id="checkin_cmds" />
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
 
     <box id="checkin_main" />
 
diff --git a/Open-ILS/xul/staff_client/server/circ/checkout.xul b/Open-ILS/xul/staff_client/server/circ/checkout.xul
index 75c8a55799..d69c63bb8e 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.xul
@@ -80,7 +80,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <commandset id="checkout_cmds">
         <command id="cmd_checkout_submit" />
diff --git a/Open-ILS/xul/staff_client/server/circ/circ_brief.xul b/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
index 0b07021797..4cc57b6377 100644
--- a/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
+++ b/Open-ILS/xul/staff_client/server/circ/circ_brief.xul
@@ -119,7 +119,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <groupbox id="gb" flex="1" style="overflow: auto;">
         <caption id="caption"/>
diff --git a/Open-ILS/xul/staff_client/server/circ/copy_details.xul b/Open-ILS/xul/staff_client/server/circ/copy_details.xul
index 3cc45c2049..3c6a0a101a 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_details.xul
+++ b/Open-ILS/xul/staff_client/server/circ/copy_details.xul
@@ -189,7 +189,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <vbox flex="1" style="overflow: auto;">
         <vbox id="top_box" flex="1" style="border: none; overflow: none; min-height: 80;" oils_persist="height"/>
diff --git a/Open-ILS/xul/staff_client/server/circ/copy_status.xul b/Open-ILS/xul/staff_client/server/circ/copy_status.xul
index 89610e319b..08d57dc8e2 100644
--- a/Open-ILS/xul/staff_client/server/circ/copy_status.xul
+++ b/Open-ILS/xul/staff_client/server/circ/copy_status.xul
@@ -116,8 +116,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <commandset id="copy_status_cmds">
         <command id="cmd_copy_status_submit_barcode" />
diff --git a/Open-ILS/xul/staff_client/server/circ/in_house_use.xul b/Open-ILS/xul/staff_client/server/circ/in_house_use.xul
index 097aeb756d..f626bef144 100644
--- a/Open-ILS/xul/staff_client/server/circ/in_house_use.xul
+++ b/Open-ILS/xul/staff_client/server/circ/in_house_use.xul
@@ -65,7 +65,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <commandset id="in_house_use_cmds">
         <command id="sel_clip" disabled="true" />
diff --git a/Open-ILS/xul/staff_client/server/circ/missing_pieces.xul b/Open-ILS/xul/staff_client/server/circ/missing_pieces.xul
index 6991013a09..de603552ed 100644
--- a/Open-ILS/xul/staff_client/server/circ/missing_pieces.xul
+++ b/Open-ILS/xul/staff_client/server/circ/missing_pieces.xul
@@ -28,8 +28,8 @@
     </script>
     <scripts id="openils_util_scripts"/>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="missing_pieces.js"/>
diff --git a/Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul b/Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul
index 046f2b2141..837857af8e 100644
--- a/Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul
+++ b/Open-ILS/xul/staff_client/server/circ/pre_cat_fields.xul
@@ -90,8 +90,8 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
     <groupbox flex="1" style="overflow: auto">
         <caption label="&staff.circ.pre_cat.caption.label;"/>
diff --git a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.xul b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.xul
index f486048138..9bc63a0fff 100644
--- a/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.xul
+++ b/Open-ILS/xul/staff_client/server/circ/print_list_template_editor.xul
@@ -63,7 +63,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
 
     <commandset id="print_list_cmds">
         <command id="cmd_broken" />
diff --git a/Open-ILS/xul/staff_client/server/circ/renew.xul b/Open-ILS/xul/staff_client/server/circ/renew.xul
index 300d253dd2..58cdcf2594 100644
--- a/Open-ILS/xul/staff_client/server/circ/renew.xul
+++ b/Open-ILS/xul/staff_client/server/circ/renew.xul
@@ -85,9 +85,9 @@
 
     </commandset>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <box id="renew_main" />
 
diff --git a/Open-ILS/xul/staff_client/server/main/verify_credentials.xul b/Open-ILS/xul/staff_client/server/main/verify_credentials.xul
index 62aed30a8b..00caa8da9e 100644
--- a/Open-ILS/xul/staff_client/server/main/verify_credentials.xul
+++ b/Open-ILS/xul/staff_client/server/main/verify_credentials.xul
@@ -28,7 +28,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="verify_credentials.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <commandset id="verify_cmds">
         <command id="cmd_verify" />
diff --git a/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul b/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul
index bd8f0776c4..4cb901e00c 100644
--- a/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul
+++ b/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul
@@ -201,7 +201,7 @@
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <vbox flex="1" class="my_overflow">
         <groupbox orient="vertical" flex="1">
diff --git a/Open-ILS/xul/staff_client/server/patron/bill2.xul b/Open-ILS/xul/staff_client/server/patron/bill2.xul
index 51167a5bd3..a3fdebbf7e 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill2.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill2.xul
@@ -32,9 +32,9 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="bill2.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties"/>
 
     <commandset>
         <command id="opac" label="&staff.patron.bill_interface.show_in_catalog.label;" accesskey="&staff.patron.bill_interface.show_in_catalog.accesskey;" disabled="true"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul b/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul
index 36337450e2..05caee90b9 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_cc_info.xul
@@ -160,7 +160,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <groupbox>
         <caption label="&staff.patron.bill_cc_info.info.label;"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_check_info.xul b/Open-ILS/xul/staff_client/server/patron/bill_check_info.xul
index 71738ec28e..39dc5d4163 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_check_info.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_check_info.xul
@@ -59,7 +59,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <groupbox>
         <caption label="&staff.patron.bill_check_info.check_info.label;"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_details.xul b/Open-ILS/xul/staff_client/server/patron/bill_details.xul
index a16d4e7520..6e12beba3f 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_details.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_details.xul
@@ -32,7 +32,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="bill_details.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <vbox flex="1" class="my_overflow">
         <label id="patron_name" class="patronNameLarge"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_history.xul b/Open-ILS/xul/staff_client/server/patron/bill_history.xul
index 128ce1d27d..cce008d0a5 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_history.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_history.xul
@@ -32,8 +32,8 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="bill_history.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties"/>
 
     <vbox flex="1" class="my_overflow">
         <groupbox orient="vertical" flex="1">
diff --git a/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul b/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
index 126f021ae2..ad8fe8b102 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
@@ -32,7 +32,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="/xul/server/patron/bill_wizard.js"/>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <vbox flex="1">
 
diff --git a/Open-ILS/xul/staff_client/server/patron/display.xul b/Open-ILS/xul/staff_client/server/patron/display.xul
index e0861dbb89..b674231f06 100644
--- a/Open-ILS/xul/staff_client/server/patron/display.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display.xul
@@ -85,7 +85,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <commandset id="patron_display_cmds">
         <command id="cmd_patron_refresh" />
diff --git a/Open-ILS/xul/staff_client/server/patron/display_horiz.xul b/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
index 1c5383410c..55f5134cb0 100644
--- a/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
@@ -85,7 +85,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <commandset id="patron_display_cmds">
         <command id="cmd_patron_refresh" />
diff --git a/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul b/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul
index d27c00152a..2f3ddf3334 100644
--- a/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul
+++ b/Open-ILS/xul/staff_client/server/patron/edit_standing_penalty.xul
@@ -31,7 +31,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="edit_standing_penalty.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
     <!-- CONTENT -->
diff --git a/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul b/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
index fb3830cc6e..24d9a230c6 100644
--- a/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
+++ b/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
@@ -30,7 +30,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="hold_cancel.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
     <!-- CONTENT -->
diff --git a/Open-ILS/xul/staff_client/server/patron/hold_details.xul b/Open-ILS/xul/staff_client/server/patron/hold_details.xul
index 779b798cf6..932b9ff7d0 100644
--- a/Open-ILS/xul/staff_client/server/patron/hold_details.xul
+++ b/Open-ILS/xul/staff_client/server/patron/hold_details.xul
@@ -30,8 +30,8 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="hold_details.js"/>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <stack hidden="true" id="notification_template" flex="1">
         <groupbox flex="1" style="background-color: black;"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/holds.xul b/Open-ILS/xul/staff_client/server/patron/holds.xul
index f7f03fcc41..8fc742db7a 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds.xul
+++ b/Open-ILS/xul/staff_client/server/patron/holds.xul
@@ -70,9 +70,9 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale' -->/patron.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/patron.properties"/>
 
         <commandset id="holds_cmds" />
 
diff --git a/Open-ILS/xul/staff_client/server/patron/info_group.xul b/Open-ILS/xul/staff_client/server/patron/info_group.xul
index 9e8777e9d1..2a2865fb90 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_group.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_group.xul
@@ -30,7 +30,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="info_group.js"/>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <commandset id="info_group_cmds">
         <command id="clone" 
diff --git a/Open-ILS/xul/staff_client/server/patron/info_notes.xul b/Open-ILS/xul/staff_client/server/patron/info_notes.xul
index 133eec5cf2..ccd706d816 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_notes.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_notes.xul
@@ -231,7 +231,7 @@
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <stack hidden="true" id="note_template" flex="1" minheight="50px">
         <groupbox flex="1" style="background-color: black;"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul b/Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul
index 4318313f66..4c0280e3f3 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_stat_cats.xul
@@ -176,7 +176,7 @@
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <stack hidden="true" id="actsc_template" flex="1">
         <groupbox flex="1" style="background-color: black;"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/info_surveys.xul b/Open-ILS/xul/staff_client/server/patron/info_surveys.xul
index 66231c398e..c2ebb6ec3d 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_surveys.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_surveys.xul
@@ -164,7 +164,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
     
     <stack hidden="true" id="asv_template" flex="1">
         <groupbox flex="1" style="background-color: black;"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/items.xul b/Open-ILS/xul/staff_client/server/patron/items.xul
index 6faf415104..04cf90dd1f 100644
--- a/Open-ILS/xul/staff_client/server/patron/items.xul
+++ b/Open-ILS/xul/staff_client/server/patron/items.xul
@@ -63,9 +63,9 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
-    <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/circ.properties"/>
+    <stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale' -->/cat.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <commandset id="items_cmds" />
     <popupset id="items_popupset"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul b/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul
index 7e9271b61a..361a32b4aa 100644
--- a/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul
+++ b/Open-ILS/xul/staff_client/server/patron/new_standing_penalty.xul
@@ -31,7 +31,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="new_standing_penalty.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
     <!-- CONTENT -->
diff --git a/Open-ILS/xul/staff_client/server/patron/place_hold.xul b/Open-ILS/xul/staff_client/server/patron/place_hold.xul
index afa0a5539d..d1ce134f4a 100644
--- a/Open-ILS/xul/staff_client/server/patron/place_hold.xul
+++ b/Open-ILS/xul/staff_client/server/patron/place_hold.xul
@@ -28,8 +28,8 @@
     </script>
     <scripts id="openils_util_scripts"/>
 
-    <messagecatalog id="patronStrings"
-        src='/xul/server/locale/<!--#echo var="locale"-->/patron.properties'/>
+    <stringbundle id="patronStrings"
+        src='oils://remote/xul/server/locale/<!--#echo var="locale"-->/patron.properties'/>
 
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="place_hold.js"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/search_form.xul b/Open-ILS/xul/staff_client/server/patron/search_form.xul
index 43a4fde48a..bf53f2907e 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_form.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_form.xul
@@ -84,7 +84,7 @@
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <commandset id="patron_search_form_cmds">
     </commandset>
diff --git a/Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul b/Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul
index 4e8f6afcd6..d7675e0217 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_form_horiz.xul
@@ -84,7 +84,7 @@
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <commandset id="patron_search_form_cmds">
     </commandset>
diff --git a/Open-ILS/xul/staff_client/server/patron/search_result.xul b/Open-ILS/xul/staff_client/server/patron/search_result.xul
index 9546380110..ce50b6cd0b 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_result.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_result.xul
@@ -79,7 +79,7 @@
         <command id="cmd_save_cols" />
     </commandset>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
 
     <box id="patron_search_result_main" />
 
diff --git a/Open-ILS/xul/staff_client/server/patron/staged.xul b/Open-ILS/xul/staff_client/server/patron/staged.xul
index f7fb70f2fa..ecc82fbe9c 100644
--- a/Open-ILS/xul/staff_client/server/patron/staged.xul
+++ b/Open-ILS/xul/staff_client/server/patron/staged.xul
@@ -28,7 +28,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="staged.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <commandset id="staged_cmds">
         <command id="cmd_load" disabled="true"/>
diff --git a/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul b/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul
index a1b5d90ef2..4789accc46 100644
--- a/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul
+++ b/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul
@@ -28,7 +28,7 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="standing_penalties.js"/>
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties" />
 
     <commandset id="penalty_cmds">
         <command id="cmd_apply_penalty" />
diff --git a/Open-ILS/xul/staff_client/server/patron/summary.xul b/Open-ILS/xul/staff_client/server/patron/summary.xul
index cee959b03a..5291da47f7 100644
--- a/Open-ILS/xul/staff_client/server/patron/summary.xul
+++ b/Open-ILS/xul/staff_client/server/patron/summary.xul
@@ -135,8 +135,8 @@
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-    <messagecatalog id="offlineStrings" src="/xul/server/locale/<!--#echo var='locale'-->/offline.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="offlineStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/offline.properties"/>
 
     <commandset id="patron_summary_cmds" />
     <popupset id="patron_summary_popups" />
diff --git a/Open-ILS/xul/staff_client/server/patron/user_edit.xul b/Open-ILS/xul/staff_client/server/patron/user_edit.xul
index 0d9987c213..0838610d4c 100644
--- a/Open-ILS/xul/staff_client/server/patron/user_edit.xul
+++ b/Open-ILS/xul/staff_client/server/patron/user_edit.xul
@@ -18,7 +18,7 @@
     onload="try { init_editor(); } catch(E) { alert(js2JSON(E)); }"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
     <script type="text/javascript">var myPackageDir = 'open_ils_staff_client'; var IAMXUL = true; var g = {};</script>
     <script type='text/javascript' src='/opac/common/js/utils.js'/>
     <script type='text/javascript' src='/opac/common/js//config.js'/>
diff --git a/Open-ILS/xul/staff_client/server/serial/batch_receive.xul b/Open-ILS/xul/staff_client/server/serial/batch_receive.xul
index 98c90f99cf..cd3d556ff3 100644
--- a/Open-ILS/xul/staff_client/server/serial/batch_receive.xul
+++ b/Open-ILS/xul/staff_client/server/serial/batch_receive.xul
@@ -24,8 +24,8 @@
         not to use it otherwise.  -->
     <script type="text/javascript" src="/xul/server/main/JSAN.js" />
 
-    <messagecatalog id="serialStrings"
-        src="/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
+    <stringbundle id="serialStrings"
+        src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
 
     <commandset />
     <box id="batch_receive_main" />
diff --git a/Open-ILS/xul/staff_client/server/serial/notes.xul b/Open-ILS/xul/staff_client/server/serial/notes.xul
index 4e2d9606a5..7854ed0a48 100644
--- a/Open-ILS/xul/staff_client/server/serial/notes.xul
+++ b/Open-ILS/xul/staff_client/server/serial/notes.xul
@@ -255,8 +255,8 @@
 	]]>
 	</script>
 
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="serialStrings" src="/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
+	<stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+	<stringbundle id="serialStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
 
 	<stack hidden="true" id="note_template" flex="1">
 		<vbox flex="1" style="background-color: black; margin:3px"/>
diff --git a/Open-ILS/xul/staff_client/server/serial/pattern_wizard.xul b/Open-ILS/xul/staff_client/server/serial/pattern_wizard.xul
index 7b0469bcc2..2d742ac73c 100644
--- a/Open-ILS/xul/staff_client/server/serial/pattern_wizard.xul
+++ b/Open-ILS/xul/staff_client/server/serial/pattern_wizard.xul
@@ -25,8 +25,8 @@
         not to use it otherwise.  -->
     <script type="text/javascript" src="/xul/server/main/JSAN.js" />
 
-    <messagecatalog id="serialStrings"
-        src="/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
+    <stringbundle id="serialStrings"
+        src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
 
     <commandset />
     <box id="pattern_wizard_main" />
diff --git a/Open-ILS/xul/staff_client/server/serial/select_aou.xul b/Open-ILS/xul/staff_client/server/serial/select_aou.xul
index 4026ae5c27..2676a5da34 100644
--- a/Open-ILS/xul/staff_client/server/serial/select_aou.xul
+++ b/Open-ILS/xul/staff_client/server/serial/select_aou.xul
@@ -83,7 +83,7 @@
 	]]>
 	</script>
 	
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+	<stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
 	<vbox flex="1" style="overflow: auto">
 	<groupbox flex="1">
diff --git a/Open-ILS/xul/staff_client/server/serial/select_unit.xul b/Open-ILS/xul/staff_client/server/serial/select_unit.xul
index 3d0cbdc722..96b00aa30d 100644
--- a/Open-ILS/xul/staff_client/server/serial/select_unit.xul
+++ b/Open-ILS/xul/staff_client/server/serial/select_unit.xul
@@ -72,7 +72,7 @@
 	]]>
 	</script>
 	
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+	<stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
 
 	<vbox flex="1" style="overflow: auto">
 	<groupbox flex="1">
diff --git a/Open-ILS/xul/staff_client/server/serial/serctrl_main.xul b/Open-ILS/xul/staff_client/server/serial/serctrl_main.xul
index 34b0f31ebf..763355be31 100644
--- a/Open-ILS/xul/staff_client/server/serial/serctrl_main.xul
+++ b/Open-ILS/xul/staff_client/server/serial/serctrl_main.xul
@@ -39,10 +39,10 @@ vim:noet:sw=4:ts=4:
 
 	<script type="text/javascript" src="/xul/server/main/JSAN.js"/>
 
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
-    <messagecatalog id="patronStrings" src="/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
-    <messagecatalog id="serialStrings" src="/xul/server/locale/<!--#echo var='locale'-->/serial.properties"/>
+	<stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+	<stringbundle id="circStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/circ.properties" />
+    <stringbundle id="patronStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/patron.properties"/>
+    <stringbundle id="serialStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/serial.properties"/>
 
 	<commandset id="serial_commands">
 		<command id="cmd_add_item"/>
diff --git a/Open-ILS/xul/staff_client/server/serial/sitem_editor.xul b/Open-ILS/xul/staff_client/server/serial/sitem_editor.xul
index 7b003ea060..2f67d0a7bd 100644
--- a/Open-ILS/xul/staff_client/server/serial/sitem_editor.xul
+++ b/Open-ILS/xul/staff_client/server/serial/sitem_editor.xul
@@ -58,8 +58,8 @@
         ]]>
     </script>
 
-	<messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
-	<messagecatalog id="serialStrings" src="/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
+	<stringbundle id="catStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/cat.properties" />
+	<stringbundle id="serialStrings" src="oils://remote/xul/server/locale/<!--#echo var='locale'-->/serial.properties" />
 
     <vbox id="brief_display_box"/>
 
diff --git a/Open-ILS/xul/staff_client/server/skin/global.css b/Open-ILS/xul/staff_client/server/skin/global.css
index f8a6ad1543..c3ff278e74 100644
--- a/Open-ILS/xul/staff_client/server/skin/global.css
+++ b/Open-ILS/xul/staff_client/server/skin/global.css
@@ -5,7 +5,6 @@
 @namespace xhtml url("http://www.w3.org/1999/xhtml"); 
 
 help { -moz-binding: url('/xul/server/main/bindings.xml#help'); }
-messagecatalog { -moz-binding: url('/xul/server/main/bindings.xml#messagecatalog'); }
 .shrinkable_groupbox { font-weight: bold; -moz-binding: url('/xul/server/main/bindings.xml#caption'); }
 
 window:not([active="true"]) menubar > menu { color: menutext !important }