From: Jason Etheridge <jason@esilibrary.com>
Date: Mon, 4 Feb 2013 07:00:30 +0000 (-0500)
Subject: strip out messagecatalog
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=77b968559fba945a4abf26bb57723d40c8581f64;p=evergreen%2Fequinox.git

strip out messagecatalog

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
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 0860a6ddec..1742432e2b 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
@@ -64,8 +64,8 @@
         <script type="text/javascript" src="util/org_utils.js" />   
         <script type="text/javascript" src="global_util.js" />   
         <script type="text/javascript" src="event_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'/>
+        
+        
         <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..5f26e09911 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"/>
+    
 
     <!-- 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..4854577780 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"/>
+    
 
     <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..cf43240b08 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"/>
+    
 
     <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..f27ea8dbc8 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"/>
+    
 
     <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..ebdc9df612 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"/>
+    
 
     <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..36cc6139bf 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"/>
+    
 
     <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..9d4c9cf3f9 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"/>
+    
 
     <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..c1aeeb3f6e 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"/>
+    
 
     <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 c7881b50e9..366e40c531 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml
+++ b/Open-ILS/xul/staff_client/chrome/content/main/bindings.xml
@@ -123,408 +123,6 @@
         </implementation>
     </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>
-
-			<destructor>                                                                                              
-				<![CDATA[                                                                                         
-				try {                                                                                                            
-					delete this._props;                                                                                      
-					delete this.sprintf;                                                                                     
-				} catch(E) {                                                                                                     
-					alert('Error destroying messagecatalog in bindings.xml: ' + E);                                             
-					throw(E);                                                                                                    
-				}                                                                                                                
-				]]>                                                                                               
-			</destructor>  
-
-			<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.xul b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
index 3884d9c18c..2b08796ecc 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
@@ -60,8 +60,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"/>
+    
+    
 
     <commandset id="auth_cmds">
         <command id="cmd_login" />
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..702cc7b3f7 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" />    
+        
 
     <commandset id="universal_cmds" />
 
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 dec055d6ec..351d60e34e 100644
--- a/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/OpenILS/util_overlay.xul
@@ -87,9 +87,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'/>
+        
+        
+        
         <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..9a3fe53aa8 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"/>
+    
 
     <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..cffc6052b7 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'/>
+    
 
     <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..3536f9a49e 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'/>
+    
 
     <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..f36f8713fe 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"/>
+    
 
     <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..5b4131d75a 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" />
+    
 
     <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 6df759b972..8e603a7de6 100644
--- a/Open-ILS/xul/staff_client/server/admin/printer_settings.xul
+++ b/Open-ILS/xul/staff_client/server/admin/printer_settings.xul
@@ -27,7 +27,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" />
+    
     <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..9787a9eb3e 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'/>
+    
 
     <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..d2056980ce 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'/>
+    
+    
+    
 
     <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..3f76e6ab0f 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" />
+    
 
     <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.xul b/Open-ILS/xul/staff_client/server/cat/bib_brief.xul
index 3ce8e8f6c5..22fe75274d 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"/>
+    
+    
 
     <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..88fb46060a 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"/>
+    
+    
 
     <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..744704aca0 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" />
+    
+    
 
     <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..ecc1686185 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"/>
+    
+    
 
     <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..a971f02c2c 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" />
+    
+    
 
     <vbox flex="1" style="overflow: auto">
     <groupbox flex="1">
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..3f07641377 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" />
+    
 
     <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..cc32db24d1 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" />
+    
+    
 
     <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..872bf15cde 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" />
+    
+    
 
     <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..f7ce7ded08 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" />
+    
+    
 
     <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..46db6901b5 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" />
+    
+    
 
     <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..54c0741928 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"/>
+    
 
     <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..62d857316b 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" />
+
+
 
 <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..fd3eb76350 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"/>
+    
+    
 
     <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..45390f9480 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" />
+
+
 
 <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..b8e33c61d8 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" />
+    
+    
 
     <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..1e9d32af87 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" />
+    
+    
 
     <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..25a46f3f82 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" />
+    
+    
     
     <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..2edb38f519 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" />
+    
+    
 
 <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..f9554fa7e6 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'/>
+    
 
     <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..2f0222acaf 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" />
+    
+    
 
     <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.xul b/Open-ILS/xul/staff_client/server/cat/z3950.xul
index 7c02ef465f..dcb964f1b6 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" />
+    
+     
 
     <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 bcdf212112..41cf681f20 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"/>
+    
+    
 
     <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..ca4d593c9f 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" />
+    
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
     <!-- 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..893d13cf96 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"/>
+    
+    
 
     <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 c1ba2ee727..dfc4417472 100644
--- a/Open-ILS/xul/staff_client/server/circ/checkout.xul
+++ b/Open-ILS/xul/staff_client/server/circ/checkout.xul
@@ -93,7 +93,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="circStrings" src="/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..976b75875b 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" />
+    
 
     <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..8860f6e2b3 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" />
+    
 
     <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..0a885d4b57 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" />
+    
+    
 
     <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..abef1593be 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" />
+    
 
     <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..fb3e9c9ace 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" />
+    
+    
 
     <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..a2e918c23f 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" />
+    
+    
 
     <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..a23f679a21 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" />
+    
 
     <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..3f584ccf5a 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"/>
+    
+    
+    
 
     <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..8b12664475 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" />
+    
 
     <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 d2e2405521..e8aa199915 100644
--- a/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul
+++ b/Open-ILS/xul/staff_client/server/patron/barcode_entry.xul
@@ -213,7 +213,7 @@
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/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 32f0e0be7a..0f09b6c932 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill2.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill2.xul
@@ -33,9 +33,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"/>
+    
+    
+    
 
     <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 8cb4804267..95d5af1819 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
@@ -161,7 +161,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/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 373a74b8a5..dd216e9741 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
@@ -60,7 +60,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/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 2454d35ddc..884e2c7629 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_details.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_details.xul
@@ -33,7 +33,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"/>
+    
 
     <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 9671de1bba..edddbcc84d 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_history.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_history.xul
@@ -33,8 +33,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"/>
+    
+    
 
     <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 44cb12a923..930804cea6 100644
--- a/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
+++ b/Open-ILS/xul/staff_client/server/patron/bill_wizard.xul
@@ -33,7 +33,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"/>
+    
 
     <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 65a1a740a4..50cae54580 100644
--- a/Open-ILS/xul/staff_client/server/patron/display.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display.xul
@@ -96,7 +96,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/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 52aa0b699f..9d22804317 100644
--- a/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
+++ b/Open-ILS/xul/staff_client/server/patron/display_horiz.xul
@@ -96,7 +96,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/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 771ae57669..62941387a2 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
@@ -32,7 +32,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" />
+    
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
     <!-- 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 d2da173951..88bab49e73 100644
--- a/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
+++ b/Open-ILS/xul/staff_client/server/patron/hold_cancel.xul
@@ -31,7 +31,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" />
+    
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
     <!-- 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 245a061011..45b5ca88b4 100644
--- a/Open-ILS/xul/staff_client/server/patron/hold_details.xul
+++ b/Open-ILS/xul/staff_client/server/patron/hold_details.xul
@@ -31,8 +31,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"/>
+    
+    
 
     <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 47eb367099..7d5b02b22b 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds.xul
+++ b/Open-ILS/xul/staff_client/server/patron/holds.xul
@@ -81,9 +81,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"/>
+    
+    
+    
 
         <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 388efa27da..56afa96793 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_group.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_group.xul
@@ -31,7 +31,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"/>
+    
 
     <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 ab45e78afa..d62e41b8df 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_notes.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_notes.xul
@@ -244,7 +244,7 @@
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/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 400aa6753c..805e002645 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
@@ -177,7 +177,7 @@
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/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 c0fb29bd23..4305666bb2 100644
--- a/Open-ILS/xul/staff_client/server/patron/info_surveys.xul
+++ b/Open-ILS/xul/staff_client/server/patron/info_surveys.xul
@@ -165,7 +165,7 @@
     ]]>
     </script>
 
-    <messagecatalog id="patronStrings" src="/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 0c7c537e36..870e1ba048 100644
--- a/Open-ILS/xul/staff_client/server/patron/items.xul
+++ b/Open-ILS/xul/staff_client/server/patron/items.xul
@@ -74,9 +74,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"/>
+    
+    
+    
 
     <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 cef7264189..195532b831 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
@@ -32,7 +32,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" />
+    
 
     <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
     <!-- 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 21c59b212a..f1ff0165e5 100644
--- a/Open-ILS/xul/staff_client/server/patron/place_hold.xul
+++ b/Open-ILS/xul/staff_client/server/patron/place_hold.xul
@@ -29,9 +29,6 @@
     </script>
     <scripts id="openils_util_scripts"/>
 
-    <messagecatalog id="patronStrings"
-        src='/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 782246908a..7ac262bf91 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_form.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_form.xul
@@ -95,7 +95,7 @@
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/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 ed0655bfc7..0f51eb48a1 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
@@ -95,7 +95,7 @@
     ]]>
     </script>
     
-    <messagecatalog id="patronStrings" src="/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 658eafc067..742f5f9dfb 100644
--- a/Open-ILS/xul/staff_client/server/patron/search_result.xul
+++ b/Open-ILS/xul/staff_client/server/patron/search_result.xul
@@ -90,7 +90,7 @@
         <command id="cmd_save_cols" />
     </commandset>
 
-    <messagecatalog id="patronStrings" src="/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 18b31408de..4b0a86d661 100644
--- a/Open-ILS/xul/staff_client/server/patron/staged.xul
+++ b/Open-ILS/xul/staff_client/server/patron/staged.xul
@@ -29,7 +29,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" />
+    
 
     <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 5571298a1d..d0589fd1d1 100644
--- a/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul
+++ b/Open-ILS/xul/staff_client/server/patron/standing_penalties.xul
@@ -29,7 +29,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" />
+    
 
     <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 699002889f..9ce46818fc 100644
--- a/Open-ILS/xul/staff_client/server/patron/summary.xul
+++ b/Open-ILS/xul/staff_client/server/patron/summary.xul
@@ -147,8 +147,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"/>
+    
+    
 
     <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..960924b417 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"/>
+    
     <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..10fe7a47a4 100644
--- a/Open-ILS/xul/staff_client/server/serial/batch_receive.xul
+++ b/Open-ILS/xul/staff_client/server/serial/batch_receive.xul
@@ -24,9 +24,6 @@
         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" />
-
     <commandset />
     <box id="batch_receive_main" />
 </window>
diff --git a/Open-ILS/xul/staff_client/server/serial/notes.xul b/Open-ILS/xul/staff_client/server/serial/notes.xul
index 4e2d9606a5..204cefa925 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" />
+	
+	
 
 	<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..952dd518f9 100644
--- a/Open-ILS/xul/staff_client/server/serial/pattern_wizard.xul
+++ b/Open-ILS/xul/staff_client/server/serial/pattern_wizard.xul
@@ -25,9 +25,6 @@
         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" />
-
     <commandset />
     <box id="pattern_wizard_main" />
 </window>
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..561366539f 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" />
+	
 
 	<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..cbf70f80d6 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" />
+	
 
 	<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..fe18aeda9b 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"/>
+	
+	
+    
+    
 
 	<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..cc70f72a02 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" />
+	
+	
 
     <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 }