From 8517ed01f13cb4c3185dadef958b742730dad987 Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Wed, 1 Aug 2007 14:13:35 +0000
Subject: [PATCH] ARG! reverting patch from Dan Scott -- the SC chrome has
 localization issues and will need to be attacked differently

git-svn-id: svn://svn.open-ils.org/ILS/trunk@7616 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/examples/apache/eg_vhost.conf             |   3 -
 Open-ILS/web/opac/locale/en-US/lang.dtd            | 158 +++------------------
 .../xul/staff_client/chrome/content/main/main.xul  |  38 ++---
 .../chrome/content/main/menu_frame_menus.xul       | 116 +++++++--------
 .../chrome/content/main/simple_auth.xul            |  14 +-
 .../xul/staff_client/chrome/content/main/test.xul  |   5 +-
 6 files changed, 102 insertions(+), 232 deletions(-)

diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf
index 8a47ef059c..66cf5910ea 100644
--- a/Open-ILS/examples/apache/eg_vhost.conf
+++ b/Open-ILS/examples/apache/eg_vhost.conf
@@ -105,9 +105,6 @@ RewriteRule /opac/extras/jacket/large/(.*) \
     XMLEntContentType "application/vnd.mozilla.xul+xml"
     AddOutputFilter INCLUDES;XMLENT .xul
     allow from all
-
-    # We only support one locale (en-US) for the time being
-    SetEnv locale=en-US
 </LocationMatch>
 
 # ----------------------------------------------------------------------------------
diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 530286cb97..cf589c7d71 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -17,7 +17,6 @@
 <!ENTITY common.cancel "Cancel">
 <!ENTITY common.library "Library">
 <!ENTITY common.username "Username">
-<!ENTITY common.username.label "Username:">
 <!ENTITY common.password "Password">
 <!ENTITY common.submit "Submit">
 <!ENTITY common.user_not_found "User not found">
@@ -31,10 +30,7 @@
 
 
 
-<!ENTITY common.cancel.accesskey "C">
-<!ENTITY common.login.accesskey "L">
-<!ENTITY common.password.accesskey "P">
-<!ENTITY common.username.accesskey "U">
+
 <!ENTITY staff.about.title "About">
 <!ENTITY staff.acp_label_barcode "Barcode">
 <!ENTITY staff.acp_label_call_number "Call Number">
@@ -125,12 +121,10 @@
 <!ENTITY staff.au_usrname_label "Usrname">
 <!ENTITY staff.auth.login_header "Login">
 <!ENTITY staff.auth.logoff_prompt "Log Off">
-<!ENTITY staff.auth.logoff_prompt.accesskey "f">
 <!ENTITY staff.auth.logoff_prompt.key "L">
 <!ENTITY staff.auth.name_prompt "Name:">
 <!ENTITY staff.auth.name_prompt.key "N">
 <!ENTITY staff.auth.password_prompt "Password:">
-<!ENTITY staff.auth.password_prompt.accesskey "P">
 <!ENTITY staff.auth.password_prompt.key "P">
 <!ENTITY staff.auth.quit_prompt "Exit Evergreen">
 <!ENTITY staff.auth.quit_prompt.key "x">
@@ -414,69 +408,10 @@
 <!ENTITY staff.items_out_interface_label "ITEMS OUT">
 <!ENTITY staff.javascript_console_label "CONSOLE">
 <!ENTITY staff.javascript_shell_label "JS SHELL">
-<!ENTITY staff.main.auth.caption "Authentication">
-<!ENTITY staff.main.auth.caption "Startup / Shutdown">
-<!ENTITY staff.main.auth.debug.caption "Debug Options">
-<!ENTITY staff.main.auth.debug.clear "Clear Cache">
-<!ENTITY staff.main.auth.debug.clear.accesskey "C">
-<!ENTITY staff.main.auth.debug.javascript "Javascript Console">
-<!ENTITY staff.main.auth.debug.javascript.accesskey "J">
-<!ENTITY staff.main.auth.hostname "Hostname">
-<!ENTITY staff.main.auth.hostname.accesskey "H">
-<!ENTITY staff.main.auth.offline.caption "Offline Use">
-<!ENTITY staff.main.auth.offline.export "Export Transactions">
-<!ENTITY staff.main.auth.offline.import "Import Transactions">
-<!ENTITY staff.main.auth.offline.interface "Standalone Interface">
-<!ENTITY staff.main.auth.offline.interface.accesskey "S">
-<!ENTITY staff.main.auth.retest "Re-Test Server">
-<!ENTITY staff.main.auth.retest.accesskey "R">
-<!ENTITY staff.main.auth.server "Server">
-<!ENTITY staff.main.auth.status "Status">
-<!ENTITY staff.main.auth.version "Version">
-<!ENTITY staff.main.auth.workstation "Workstation">
 <!ENTITY staff.main.menu.acquisitions.key "q">
 <!ENTITY staff.main.menu.acquisitions.label "Acquisitions">
-<!ENTITY staff.main.menu.admin.accesskey "-">
-<!ENTITY staff.main.menu.admin.browse_holds.accesskey "B">
-<!ENTITY staff.main.menu.admin.browse_holds.label "Browse Unfulfilled Holds for this Pickup Lib">
-<!ENTITY staff.main.menu.admin.change_session.label "Operator Change: New">
-<!ENTITY staff.main.menu.admin.clear_cache.accesskey "3">
-<!ENTITY staff.main.menu.admin.clear_cache.label "Clear Cache">
-<!ENTITY staff.main.menu.admin.cmd_console.accesskey "J">
-<!ENTITY staff.main.menu.admin.cmd_console.label "Javascript Console">
-<!ENTITY staff.main.menu.admin.cmd_shell.accesskey "H">
-<!ENTITY staff.main.menu.admin.cmd_shell.label "Javascript Shell">
-<!ENTITY staff.main.menu.admin.cmd_test.label "Test Module">
-<!ENTITY staff.main.menu.admin.copy_location_edit.accesskey "L">
-<!ENTITY staff.main.menu.admin.copy_location_edit.label "Copy Location Editor">
-<!ENTITY staff.main.menu.admin.developer.accesskey "-">
-<!ENTITY staff.main.menu.admin.developer.label "For developers...">
-<!ENTITY staff.main.menu.admin.download_patrons.accesskey "D">
-<!ENTITY staff.main.menu.admin.download_patrons.label "Download Offline Patron List">
-<!ENTITY staff.main.menu.admin.fieldmapper.accesskey "m">
-<!ENTITY staff.main.menu.admin.fieldmapper.label "Fieldmapper">
 <!ENTITY staff.main.menu.admin.key "i">
 <!ENTITY staff.main.menu.admin.label "Admin">
-<!ENTITY staff.main.menu.admin.local_admin.accesskey "L">
-<!ENTITY staff.main.menu.admin.local_admin.label "Local System Administration">
-<!ENTITY staff.main.menu.admin.non_cat_type_edit.accesskey "n">
-<!ENTITY staff.main.menu.admin.non_cat_type_edit.label "Non-Cataloged Type Editor">
-<!ENTITY staff.main.menu.admin.offline_xacts.accesskey "T">
-<!ENTITY staff.main.menu.admin.offline_xacts.label "Offline Transaction Management">
-<!ENTITY staff.main.menu.admin.public_opac.accesskey "p">
-<!ENTITY staff.main.menu.admin.public_opac.label "Public OPAC">
-<!ENTITY staff.main.menu.admin.restore_all_tabs.label "Unhide Tabs">
-<!ENTITY staff.main.menu.admin.stat_cat_edit.accesskey "C">
-<!ENTITY staff.main.menu.admin.stat_cat_edit.label "Statistical Category Editor">
-<!ENTITY staff.main.menu.admin.survey_wizard.accesskey "S">
-<!ENTITY staff.main.menu.admin.survey_wizard.label "Survey Wizard">
-<!ENTITY staff.main.menu.admin.template_edit.accesskey "R">
-<!ENTITY staff.main.menu.admin.template_edit.label "Receipt Template Editor">
-<!ENTITY staff.main.menu.admin.user_edit.accesskey "U">
-<!ENTITY staff.main.menu.admin.user_edit.label "User Permission Editor">
-<!ENTITY staff.main.menu.admin.xuleditor.accesskey "X">
-<!ENTITY staff.main.menu.admin.xuleditor.label "XUL Test">
-<!ENTITY staff.main.menu.cat.accesskey "g">
 <!ENTITY staff.main.menu.cat.add_bib.key "B">
 <!ENTITY staff.main.menu.cat.add_bib.label "Add Bib Record">
 <!ENTITY staff.main.menu.cat.add_copy.key "I">
@@ -484,54 +419,29 @@
 <!ENTITY staff.main.menu.cat.add_volume.key "V">
 <!ENTITY staff.main.menu.cat.add_volume.label "Add Volume">
 <!ENTITY staff.main.menu.cat.bib_search.key "S">
-<!ENTITY staff.main.menu.cat.bib_search.label "Search the Catalog">
+<!ENTITY staff.main.menu.cat.bib_search.label "Search Catalog">
 <!ENTITY staff.main.menu.cat.bib_status.key "B">
 <!ENTITY staff.main.menu.cat.bib_status.label "Display Bib Record">
-<!ENTITY staff.main.menu.cat.copy_status.accesskey "B">
 <!ENTITY staff.main.menu.cat.copy_status.key "I">
 <!ENTITY staff.main.menu.cat.copy_status.label "Display Item">
-<!ENTITY staff.main.menu.cat.create_marc.accesskey "N">
-<!ENTITY staff.main.menu.cat.create_marc.label "Create New Marc Record">
 <!ENTITY staff.main.menu.cat.dedup.key "M">
 <!ENTITY staff.main.menu.cat.dedup.label "Merge/Transfer Interface">
-<!ENTITY staff.main.menu.cat.edit_copy_buckets.accesskey "B">
-<!ENTITY staff.main.menu.cat.edit_copy_buckets.label "Manage Copy Buckets">
-<!ENTITY staff.main.menu.cat.edit_record_buckets.accesskey "R">
-<!ENTITY staff.main.menu.cat.edit_record_buckets.label "Manage Record Buckets">
-<!ENTITY staff.main.menu.cat.edit_volume_buckets.accesskey "V">
-<!ENTITY staff.main.menu.cat.edit_volume_buckets.label "Manage Volume Buckets">
 <!ENTITY staff.main.menu.cat.key "a">
 <!ENTITY staff.main.menu.cat.label "Cataloging">
-<!ENTITY staff.main.menu.cat.retrieve_last_record.accesskey "L">
-<!ENTITY staff.main.menu.cat.retrieve_last_record.label "Retrieve Last Record">
-<!ENTITY staff.main.menu.cat.search_tcn.accesskey "T">
-<!ENTITY staff.main.menu.cat.search_tcn.label "Retrieve record by TCN">
 <!ENTITY staff.main.menu.cat.volume_status.key "V">
 <!ENTITY staff.main.menu.cat.volume_status.label "Display Volume">
-<!ENTITY staff.main.menu.cat.z39_50_import.accesskey "Z">
-<!ENTITY staff.main.menu.cat.z39_50_import.label "Import Record from Z39.50">
-<!ENTITY staff.main.menu.circ.barcode.retrieve_patron "Retrieve Patron by Barcode">
-<!ENTITY staff.main.menu.circ.barcode.retrieve_patron.accesskey "P">
-<!ENTITY staff.main.menu.circ.barcode.show_item "Show Item Status by Barcode">
-<!ENTITY staff.main.menu.circ.barcode.show_item.accesskey "B">
 <!ENTITY staff.main.menu.circ.checkin.key "C">
-<!ENTITY staff.main.menu.circ.checkin.label "Check In Items">
+<!ENTITY staff.main.menu.circ.checkin.label "Check In">
 <!ENTITY staff.main.menu.circ.checkout.key "O">
-<!ENTITY staff.main.menu.circ.checkout.label "Check Out Items">
+<!ENTITY staff.main.menu.circ.checkout.label "Check Out">
 <!ENTITY staff.main.menu.circ.claimed_returned.key "C">
 <!ENTITY staff.main.menu.circ.claimed_returned.label 'Mark as "Claimed Returned"'>
 <!ENTITY staff.main.menu.circ.copy_status.key "I">
 <!ENTITY staff.main.menu.circ.copy_status.label "Display Item">
 <!ENTITY staff.main.menu.circ.found.key "F">
 <!ENTITY staff.main.menu.circ.found.label "Mark Found">
-<!ENTITY staff.main.menu.circ.hold_browse.accesskey "B">
-<!ENTITY staff.main.menu.circ.hold_browse.label "Browse Holds Shelf">
 <!ENTITY staff.main.menu.circ.hold_capture.key "H">
 <!ENTITY staff.main.menu.circ.hold_capture.label "Capture Holds">
-<!ENTITY staff.main.menu.circ.hold_pull.accesskey "S">
-<!ENTITY staff.main.menu.circ.hold_pull.label "Pull List for Hold Requests">
-<!ENTITY staff.main.menu.circ.in_house.accesskey "I">
-<!ENTITY staff.main.menu.circ.in_house.label "Record In-House Use">
 <!ENTITY staff.main.menu.circ.key "C">
 <!ENTITY staff.main.menu.circ.label "Circulation">
 <!ENTITY staff.main.menu.circ.lost.key "L">
@@ -540,33 +450,20 @@
 <!ENTITY staff.main.menu.circ.mark_used.label "Mark Used">
 <!ENTITY staff.main.menu.circ.missing.key "M">
 <!ENTITY staff.main.menu.circ.missing.label "Mark Missing">
-<!ENTITY staff.main.menu.circ.offline.accesskey "f">
-<!ENTITY staff.main.menu.circ.offline.label "Enter Offline Interface">
 <!ENTITY staff.main.menu.circ.patron_registration.key "R">
 <!ENTITY staff.main.menu.circ.patron_registration.label "Register Patron">
-<!ENTITY staff.main.menu.circ.patron_retrieve.accesskey "L">
-<!ENTITY staff.main.menu.circ.patron_retrieve.label "Retrieve Last Patron">
 <!ENTITY staff.main.menu.circ.patron_status.key "P">
 <!ENTITY staff.main.menu.circ.patron_status.label "Display Patron">
-<!ENTITY staff.main.menu.circ.place_hold.accesskey "H">
 <!ENTITY staff.main.menu.circ.place_hold.key "H">
 <!ENTITY staff.main.menu.circ.place_hold.label "Place Hold">
 <!ENTITY staff.main.menu.circ.quick_add.key "Q">
 <!ENTITY staff.main.menu.circ.quick_add.label "Quick Add">
 <!ENTITY staff.main.menu.circ.renew.key "n">
 <!ENTITY staff.main.menu.circ.renew.label "Renew">
-<!ENTITY staff.main.menu.circ.reprint.accesskey "L">
-<!ENTITY staff.main.menu.circ.reprint.label "Re-Print Last">
 <!ENTITY staff.main.menu.circ.special.key "S">
 <!ENTITY staff.main.menu.circ.special.label "Special Circulation">
-<!ENTITY staff.main.menu.edit.buckets.copies "Copy Buckets">
-<!ENTITY staff.main.menu.edit.buckets.copies.accesskey "B">
 <!ENTITY staff.main.menu.edit.buckets.key "B">
 <!ENTITY staff.main.menu.edit.buckets.label "Manage Buckets">
-<!ENTITY staff.main.menu.edit.buckets.records "Record Buckets">
-<!ENTITY staff.main.menu.edit.buckets.records.accesskey "R">
-<!ENTITY staff.main.menu.edit.buckets.volumes "Volume Buckets">
-<!ENTITY staff.main.menu.edit.buckets.volumes.accesskey "V">
 <!ENTITY staff.main.menu.edit.copy.key "C">
 <!ENTITY staff.main.menu.edit.copy.label "Copy">
 <!ENTITY staff.main.menu.edit.cut.key "t">
@@ -596,10 +493,8 @@
 <!ENTITY staff.main.menu.entity.patron.register.key "R">
 <!ENTITY staff.main.menu.entity.volume.key "">
 <!ENTITY staff.main.menu.entity.volume.label "Volumes">
-<!ENTITY staff.main.menu.file.close.accesskey "W">
 <!ENTITY staff.main.menu.file.close.key "C">
 <!ENTITY staff.main.menu.file.close.label "Close Window">
-<!ENTITY staff.main.menu.file.close_tab.accesskey "C">
 <!ENTITY staff.main.menu.file.close_tab.key "">
 <!ENTITY staff.main.menu.file.close_tab.label "Close Tab">
 <!ENTITY staff.main.menu.file.key "F">
@@ -614,33 +509,13 @@
 <!ENTITY staff.main.menu.file.save.label "Save Session">
 <!ENTITY staff.main.menu.help.key "H">
 <!ENTITY staff.main.menu.help.label "Help">
-<!ENTITY staff.main.menu.quit "Quit Program">
-<!ENTITY staff.main.menu.quit.accesskey "Q">
-<!ENTITY staff.main.menu.replace_barcode.label "Replace Barcode">
 <!ENTITY staff.main.menu.reports.key "">
 <!ENTITY staff.main.menu.reports.label "Reports">
-<!ENTITY staff.main.menu.search.catalog.accesskey "C">
-<!ENTITY staff.main.menu.search.catalog.label "the Catalog">
-<!ENTITY staff.main.menu.search.copies.accesskey "B">
-<!ENTITY staff.main.menu.search.copies.label "for copies by Barcode">
 <!ENTITY staff.main.menu.search.key "r">
 <!ENTITY staff.main.menu.search.label "Search">
-<!ENTITY staff.main.menu.search.patrons.accesskey "P">
-<!ENTITY staff.main.menu.search.patrons.label "for Patrons">
-<!ENTITY staff.main.menu.search.patrons_barcode.accesskey "n">
-<!ENTITY staff.main.menu.search.patrons_barcode.label "for patron by Barcode">
-<!ENTITY staff.main.menu.search.record.accesskey "T">
-<!ENTITY staff.main.menu.search.record.label "for record by TCN">
 <!ENTITY staff.main.menu.serials.key "l">
 <!ENTITY staff.main.menu.serials.label "Serials">
-<!ENTITY staff.main.menu.tabs.close "Close All Tabs">
-<!ENTITY staff.main.menu.tabs.close.accesskey "A">
 <!ENTITY staff.main.menu.title "Evergreen Staff Client">
-<!ENTITY staff.main.simple_auth.authorization.label "Authorization">
-<!ENTITY staff.main.simple_auth.authorize.accesskey "A">
-<!ENTITY staff.main.simple_auth.authorize.label "Authorization">
-<!ENTITY staff.main.simple_auth.exception.label "Exception">
-<!ENTITY staff.main.test.example_template.label "Hello world!">
 <!ENTITY staff.marc.008.BKS.MAP.indx.desc "Index">
 <!ENTITY staff.marc.008.BKS.MAP.indx.field "008">
 <!ENTITY staff.marc.008.BKS.MAP.indx.field_end_pos "31">
@@ -1065,24 +940,25 @@
 <!ENTITY staff.volume.wizard.page4 "Entering Copy-Level Attribute Defaults">
 <!ENTITY staff.volume.wizard.title "Batch Add Volumes/Copies Wizard">
 <!ENTITY staff.xuleditor_label "XUL TEST">
+<!ENTITY staff.z39_50_import_interface_label "Z39.50 IMPORT">
 <!ENTITY staff.z39_50.search_class.author "Author">
 <!ENTITY staff.z39_50.search_class.isbn "ISBN">
 <!ENTITY staff.z39_50.search_class.issn "ISSN">
+<!ENTITY staff.z39_50.search_class.pubdate "PubDate">
+<!ENTITY staff.z39_50.search_class.publisher "Publisher">
+<!ENTITY staff.z39_50.search_class.tcn "Accession #">
+<!ENTITY staff.z39_50.search_class.title "Title">
+<!ENTITY staff.z39_50.search_class.lccn "LCCN">
 <!ENTITY staff.z39_50.search_class.item_type "Item Type">
 <!ENTITY staff.z39_50.search_class.item_type.all "All Formats"> 
-<!ENTITY staff.z39_50.search_class.item_type.art "Papers/Articles"> 
 <!ENTITY staff.z39_50.search_class.item_type.bks "Books"> 
-<!ENTITY staff.z39_50.search_class.item_type.com "Computer files"> 
-<!ENTITY staff.z39_50.search_class.item_type.map "Maps"> 
-<!ENTITY staff.z39_50.search_class.item_type.mix "Mixed material"> 
+<!ENTITY staff.z39_50.search_class.item_type.ser "Serials"> 
+<!ENTITY staff.z39_50.search_class.item_type.vis "Visual materials"> 
 <!ENTITY staff.z39_50.search_class.item_type.rec "Sound recordings"> 
 <!ENTITY staff.z39_50.search_class.item_type.sco "Musical scores"> 
-<!ENTITY staff.z39_50.search_class.item_type.ser "Serials"> 
+<!ENTITY staff.z39_50.search_class.item_type.map "Maps"> 
+<!ENTITY staff.z39_50.search_class.item_type.com "Computer files"> 
+<!ENTITY staff.z39_50.search_class.item_type.mix "Mixed material"> 
 <!ENTITY staff.z39_50.search_class.item_type.url "Internet Resources"> 
-<!ENTITY staff.z39_50.search_class.item_type.vis "Visual materials"> 
-<!ENTITY staff.z39_50.search_class.lccn "LCCN">
-<!ENTITY staff.z39_50.search_class.pubdate "PubDate">
-<!ENTITY staff.z39_50.search_class.publisher "Publisher">
-<!ENTITY staff.z39_50.search_class.tcn "Accession #">
-<!ENTITY staff.z39_50.search_class.title "Title">
-<!ENTITY staff.z39_50_import_interface_label "Z39.50 IMPORT">
+<!ENTITY staff.z39_50.search_class.item_type.art "Papers/Articles"> 
+
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 13cac9b070..b316fddbb8 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/main.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/main.xul
@@ -79,7 +79,7 @@
 	<!-- CONTENT -->
 	<deck id="main_deck" flex="1">
 	<groupbox id="main_groupbox" flex="1" style="overflow: auto;">
-		<caption id="main_caption" label="&staff.main.auth.caption;"/>
+		<caption id="main_caption" label="Startup / Shutdown"/>
 		<hbox>
 			<label id="version_label"/>
 			<button id="about_btn"/>
@@ -91,23 +91,23 @@
 	<rows flex="1">
 <row flex="1">
 		<groupbox flex="1">
-			<caption label="&staff.main.auth.server;"/>
+			<caption label="Server"/>
 			<grid>
 				<columns><column /><column /></columns>
 				<rows>
 					<row>
-						<label value="&staff.main.auth.hostname;" control="server_prompt" accesskey="&staff.main.auth.hostname.accesskey;"/>
+						<label value="Hostname" control="server_prompt" accesskey="H"/>
 						<vbox>
 							<textbox id="server_prompt"/>
-							<button label="&staff.main.auth.retest;" id="retest" accesskey="&staff.main.auth.retest.accesskey;" command="cmd_test_server"/>
+							<button label="Re-Test Server" id="retest" accesskey="R" command="cmd_test_server"/>
 						</vbox>
 					</row>
 					<row>
-						<label value="&staff.main.auth.status;"/>
+						<label value="Status"/>
 						<label id="status" />
 					</row>
 					<row>
-						<label value="&staff.main.auth.version;"/>
+						<label value="Version"/>
 						<label id="version" />
 					</row>
 				</rows>
@@ -115,7 +115,7 @@
 		</groupbox>
 
 		<groupbox flex="1">
-			<caption label="&staff.main.auth.workstation;"/>
+			<caption label="Workstation"/>
 			<deck id="ws_deck" flex="1">
 			</deck>
 		</groupbox>
@@ -123,21 +123,21 @@
 </row>
 <row flex="1">
 		<groupbox flex="1">
-			<caption label="&staff.main.auth.caption;"/>
+			<caption label="Authentication"/>
 			<grid>
 				<columns> <column /> <column /> </columns>
 				<rows>
-					<row> <label value="&common.username;" control="name_prompt" accesskey="&common.username.accesskey;"/> <textbox id="name_prompt" value=""/>
+					<row> <label value="Username" control="name_prompt" accesskey="U"/> <textbox id="name_prompt" value=""/>
 					</row>
 					<row>
-						<label value="&common.password;" control="password_prompt" accesskey="&common.password.accesskey;"/>
+						<label value="Password" control="password_prompt" accesskey="P"/>
 						<textbox id="password_prompt" value="" type="password"/>
 					</row>
 					<row>
 						<spacer />
 						<hbox>
-							<button id="submit_button" label="&common.login;" accesskey="&common.login.accesskey;" command="cmd_login" />
-							<button label="&staff.auth.logoff_prompt;" accesskey="&staff.auth.logoff_prompt.accesskey;" command="cmd_logoff" />
+							<button id="submit_button" label="Login" accesskey="L" command="cmd_login" />
+							<button label="&staff.auth.logoff_prompt;" accesskey="f" command="cmd_logoff" />
 						</hbox>
 					</row>
 				</rows>
@@ -145,10 +145,10 @@
 		</groupbox>
 
 		<groupbox flex="1">
-			<caption label="&staff.main.auth.offline.caption;"/>
-			<hbox><button label="&staff.main.auth.offline.interface;" accesskey="&staff.main.auth.offline.interface.accesskey;" command="cmd_standalone"/></hbox>
-			<hbox><button label="&staff.main.auth.offline.export;" command="cmd_standalone_export"/></hbox>
-			<hbox><button label="&staff.main.auth.offline.import;" command="cmd_standalone_import"/></hbox>
+			<caption label="Offline Use"/>
+			<hbox><button label="Standalone Interface" accesskey="S" command="cmd_standalone"/></hbox>
+			<hbox><button label="Export Transactions" command="cmd_standalone_export"/></hbox>
+			<hbox><button label="Import Transactions" command="cmd_standalone_import"/></hbox>
 		</groupbox>
 </row>
 </rows>
@@ -158,10 +158,10 @@
 		</vbox>
 		<button label="&staff.auth.quit_prompt;" accesskey="&staff.auth.quit_prompt.key;" command="cmd_close_window"/>
 		<groupbox id="debug_gb" flex="1" hidden="true">
-			<caption label="&staff.main.auth.debug.caption;"/>
+			<caption label="Debug Options"/>
 			<hbox>
-				<button label="&staff.main.auth.debug.javascript;" accesskey="&staff.main.auth.debug.javascript.accesskey;" command="cmd_js_console"/>
-				<button label="&staff.main.auth.debug.clear;" accesskey="&staff.main.auth.debug.clear.accesskey;" command="cmd_clear_cache"/>
+				<button label="Javascript Console" accesskey="J" command="cmd_js_console"/>
+				<button label="Clear Cache" accesskey="C" command="cmd_clear_cache"/>
 			</hbox>
 		</groupbox>
 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
index d72643ff7a..ccdd58d1d3 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
@@ -95,78 +95,78 @@
 		<menuitem label="&staff.main.menu.file.new.label;" accesskey="&staff.main.menu.file.new.key;" key="new-window-key" command="cmd_new_window"/>
 		<menuitem label="&staff.main.menu.file.new_tab.label;" accesskey="&staff.main.menu.file.new_tab.key;" key="new-tab-key" command="cmd_new_tab"/>
 		<menuseparator />
-		<menuitem label="&staff.main.menu.file.close_tab.label;" accesskey="&staff.main.menu.file.close_tab.accesskey;" oldaccesskey="&staff.main.menu.file.close_tab.key;" key="close-tab-key" command="cmd_close_tab"/>
-		<menuitem label="&staff.main.menu.tabs.close;" accesskey="&staff.main.menu.tabs.close.accesskey;" key="close-all-tabs-key" command="cmd_close_all_tabs"/>
-		<menuitem label="&staff.main.menu.file.close.label;" accesskey="&staff.main.menu.file.close.accesskey;" oldaccesskey="&staff.main.menu.file.close.key;" key="close-window-key" command="cmd_close_window"/>
+		<menuitem label="&staff.main.menu.file.close_tab.label;" accesskey="C" oldaccesskey="&staff.main.menu.file.close_tab.key;" key="close-tab-key" command="cmd_close_tab"/>
+		<menuitem label="Close All Tabs" accesskey="A" key="close-all-tabs-key" command="cmd_close_all_tabs"/>
+		<menuitem label="&staff.main.menu.file.close.label;" accesskey="W" oldaccesskey="&staff.main.menu.file.close.key;" key="close-window-key" command="cmd_close_window"/>
 		<menuseparator />
-		<menuitem label="&staff.main.menu.quit;" accesskey="&staff.main.menu.quit.accesskey;" command="cmd_shutdown"/>
+		<menuitem label="Quit Program" accesskey="Q" command="cmd_shutdown"/>
 	</menupopup>
 </menu>
 
 <!-- The Edit menu on the main menu -->
 <menu id="main.menu.edit" label="&staff.main.menu.edit.label;" accesskey="&staff.main.menu.edit.key;">
 	<menupopup id="main.menu.edit.popup">
-		<menuitem label="&staff.main.menu.edit.buckets.copies;" command="cmd_edit_copy_buckets" accesskey="&staff.main.menu.edit.buckets.copies.accesskey;"/>
-		<menuitem label="&staff.main.menu.edit.buckets.volumes;" command="cmd_broken" accesskey="&staff.main.menu.edit.buckets.volumes.accesskey;"/>
-		<menuitem label="&staff.main.menu.edit.buckets.records;" command="cmd_edit_record_buckets" accesskey="&staff.main.menu.edit.buckets.records.accesskey;"/>
+		<menuitem label="Copy Buckets" command="cmd_edit_copy_buckets" accesskey="B"/>
+		<menuitem label="Volume Buckets" command="cmd_broken" accesskey="V"/>
+		<menuitem label="Record Buckets" command="cmd_edit_record_buckets" accesskey="R"/>
 		<menuseparator />
-		<menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
+		<menuitem label="Replace Barcode" command="cmd_replace_barcode"/>
 	</menupopup>
 </menu>
 
 <!-- The Circulation menu on the main menu -->
 <menu id="main.menu.circ" label="&staff.main.menu.circ.label;" accesskey="&staff.main.menu.circ.key;">
 	<menupopup id="main.menu.circ.popup">
-		<menuitem label="&staff.main.menu.circ.checkout.label;" accesskey="&staff.main.menu.circ.checkout.key;" key="circ-checkout-key" command="cmd_circ_checkout"/>
-		<menuitem label="&staff.main.menu.circ.checkin.label;" accesskey="&staff.main.menu.circ.checkin.key;" key="circ-checkin-key" command="cmd_circ_checkin"/>
+		<menuitem label="Check Out Items" accesskey="&staff.main.menu.circ.checkout.key;" key="circ-checkout-key" command="cmd_circ_checkout"/>
+		<menuitem label="Check In Items" accesskey="&staff.main.menu.circ.checkin.key;" key="circ-checkin-key" command="cmd_circ_checkin"/>
 		<menuitem label="&staff.main.menu.circ.patron_registration.label;" accesskey="&staff.main.menu.circ.patron_registration.key;" key="patron-register-key" command="cmd_patron_register"/>
-		<menuitem label="&staff.main.menu.circ.patron_retrieve.label;" accesskey="&staff.main.menu.circ.patron_retrieve.accesskey;" command="cmd_retrieve_last_patron" key="retrieve_last_patron_key"/>
+		<menuitem label="Retrieve Last Patron" accesskey="L" command="cmd_retrieve_last_patron" key="retrieve_last_patron_key"/>
 		<menuseparator />
-		<menuitem label="&staff.main.menu.circ.hold_capture.label;" accesskey="&staff.main.menu.circ.hold_capture.key;" key="circ-hold-capture-key" command="cmd_circ_hold_capture"/>
-		<menuitem label="&staff.main.menu.circ.hold_pull.label;" accesskey="&staff.main.menu.circ.hold_pull.accesskey;" command="cmd_circ_hold_pull_list"/>
-		<menuitem label="&staff.main.menu.circ.hold_browse.label;" command="cmd_browse_holds_shelf" accesskey="&staff.main.menu.circ.hold_browse.accesskey;"/>
-		<menuitem label="&staff.main.menu.circ.place_hold.label;" accesskey="&staff.main.menu.circ.place_hold.accesskey;" key="search-opac-key" command="cmd_search_opac"/>
+		<menuitem label="Capture Holds" accesskey="&staff.main.menu.circ.hold_capture.key;" key="circ-hold-capture-key" command="cmd_circ_hold_capture"/>
+		<menuitem label="Pull List for Hold Requests" accesskey="S" command="cmd_circ_hold_pull_list"/>
+		<menuitem label="Browse Holds Shelf" command="cmd_browse_holds_shelf" accesskey="B"/>
+		<menuitem label="Place Hold" accesskey="H" key="search-opac-key" command="cmd_search_opac"/>
 		<menuseparator />
-		<menuitem label="&staff.main.menu.circ.barcode.show_item;" accesskey="&staff.main.menu.circ.barcode.show_item.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
-		<menuitem label="&staff.main.menu.circ.barcode.retrieve_patron;" accesskey="&staff.main.menu.circ.barcode.retrieve_patron.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
-		<menuitem label="&staff.main.menu.barcode.replace;" command="cmd_replace_barcode"/>
-		<menuitem label="&staff.main.menu.circ.in_house.label;" accesskey="&staff.main.menu.circ.in_house.accesskey;" key="circ-in-house-use-key" command="cmd_in_house_use"/>
+		<menuitem label="Show Item Status by Barcode" accesskey="B" key="copy-status-key" command="cmd_copy_status"/>
+		<menuitem label="Retrieve Patron by Barcode" accesskey="P" key="circ-checkout-key" command="cmd_circ_checkout"/>
+		<menuitem label="Replace Barcode" command="cmd_replace_barcode"/>
+		<menuitem label="Record In-House Use" accesskey="I" key="circ-in-house-use-key" command="cmd_in_house_use"/>
 		<menuseparator />
-		<menuitem label="&staff.main.menu.circ.reprint.label;" accesskey="&staff.main.menu.circ.reprint.accesskey;" command="cmd_reprint"/>
-		<menuitem label="&staff.main.menu.circ.offline.label;" command="cmd_standalone" accesskey="&staff.main.menu.circ.offline.accesskey;"/>
+		<menuitem label="Re-Print Last" accesskey="L" command="cmd_reprint"/>
+		<menuitem label="Enter Offline Interface" command="cmd_standalone" accesskey="f"/>
 	</menupopup>
 </menu>
 
 <!-- The Cataloging menu on the main menu -->
-<menu id="main.menu.cat" label="&staff.main.menu.cat.label;" accesskey="&staff.main.menu.cat.accesskey;">
+<menu id="main.menu.cat" label="Cataloging" accesskey="g">
 	<menupopup id="main.menu.cat.popup">
-		<menuitem label="&staff.main.menu.cat.bib_search.label;" accesskey="&staff.main.menu.cat.bib_search.key;" key="search-opac-key" command="cmd_search_opac"/>
-		<menuitem label="&staff.main.menu.cat.search_tcn.label;" accesskey="&staff.main.menu.cat.search_tcn.accesskey;" key="search-tcn-key" command="cmd_search_tcn" />
-		<menuitem label="&staff.main.menu.cat.copy_status.label;" accesskey="&staff.main.menu.cat.copy_status.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
+		<menuitem label="Search the Catalog" accesskey="&staff.main.menu.cat.bib_search.key;" key="search-opac-key" command="cmd_search_opac"/>
+		<menuitem label="Retrieve record by TCN" accesskey="T" key="search-tcn-key" command="cmd_search_tcn" />
+		<menuitem label="Show Copy Status by Barcode" accesskey="B" key="copy-status-key" command="cmd_copy_status"/>
 		<menuseparator />
 		<!--
 		<menuitem disabled="true" label="&staff.main.menu.cat.dedup.label;" accesskey="&staff.main.menu.cat.dedup.key;" command="cmd_broken"/>
 		-->
-		<menuitem label="&staff.main.menu.cat.edit_copy_buckets.label;" command="cmd_edit_copy_buckets" accesskey="&staff.main.menu.cat.edit_copy_buckets.accesskey;"/>
-		<menuitem label="&staff.main.menu.cat.edit_volume_buckets.label;" command="cmd_broken" accesskey="&staff.main.menu.cat.edit_volume_buckets.accesskey;"/>
-		<menuitem label="&staff.main.menu.cat.edit_record_buckets.label;" command="cmd_edit_record_buckets" accesskey="&staff.main.menu.cat.edit_record_buckets.accesskey;"/>
+		<menuitem label="Manage Copy Buckets" command="cmd_edit_copy_buckets" accesskey="B"/>
+		<menuitem label="Manage Volume Buckets" command="cmd_broken" accesskey="V"/>
+		<menuitem label="Manage Record Buckets" command="cmd_edit_record_buckets" accesskey="R"/>
 		<menuseparator />
-		<menuitem label="&staff.main.menu.cat.create_marc.label;" accesskey="&staff.main.menu.cat.create_marc.accesskey;" command="cmd_create_marc"/>
-		<menuitem label="&staff.main.menu.cat.z39_50_import.label;" accesskey="&staff.main.menu.cat.z39_50_import.accesskey;" command="cmd_z39_50_import"/>
+		<menuitem label="Create New Marc Record" accesskey="N" command="cmd_create_marc"/>
+		<menuitem label="Import Record from Z39.50" accesskey="Z" command="cmd_z39_50_import"/>
 		<menuseparator />
-		<menuitem label="&staff.main.menu.replace_barcode.label;" command="cmd_replace_barcode"/>
-		<menuitem label="&staff.main.menu.cat.retrieve_last_record.label;" accesskey="&staff.main.menu.cat.retrieve_last_record.accesskey;" command="cmd_retrieve_last_record" key="retrieve_last_record_key"/>
+		<menuitem label="Replace Barcode" command="cmd_replace_barcode"/>
+		<menuitem label="Retrieve Last Record" accesskey="L" command="cmd_retrieve_last_record" key="retrieve_last_record_key"/>
 	</menupopup>
 </menu>
 
 <!-- The Search menu on the main menu -->
 <menu id="main.menu.search" label="&staff.main.menu.search.label;" accesskey="&staff.main.menu.search.key;">
 	<menupopup id="main.menu.search.popup">
-		<menuitem label="&staff.main.menu.search.patrons.label;" accesskey="&staff.main.menu.search.patrons.accesskey;" key="patron-search-key" command="cmd_patron_search" />
-		<menuitem label="&staff.main.menu.search.catalog.label;" accesskey="&staff.main.menu.search.catalog.accesskey;" key="search-opac-key" command="cmd_search_opac" />
-		<menuitem label="&staff.main.menu.search.record.label;" accesskey="&staff.main.menu.search.record.accesskey;" key="search-tcn-key" command="cmd_search_tcn" />
-		<menuitem label="&staff.main.menu.search.copies.label;" accesskey="&staff.main.menu.search.copies.accesskey;" key="copy-status-key" command="cmd_copy_status"/>
-		<menuitem label="&staff.main.menu.search.patrons_barcode.label;" accesskey="&staff.main.menu.search.patrons_barcode.accesskey;" key="circ-checkout-key" command="cmd_circ_checkout"/>
+		<menuitem label="for Patrons" accesskey="P" key="patron-search-key" command="cmd_patron_search" />
+		<menuitem label="the Catalog" accesskey="C" key="search-opac-key" command="cmd_search_opac" />
+		<menuitem label="for record by TCN" accesskey="T" key="search-tcn-key" command="cmd_search_tcn" />
+		<menuitem label="for copies by Barcode" accesskey="B" key="copy-status-key" command="cmd_copy_status"/>
+		<menuitem label="for patron by Barcode" accesskey="n" key="circ-checkout-key" command="cmd_circ_checkout"/>
 	</menupopup>
 </menu>
 
@@ -178,35 +178,35 @@
 </menu>
 
 <!-- The Help menu on the main menu -->
-<menu id="main.menu.admin" label="&staff.main.menu.admin.label;" accesskey="&staff.main.menu.admin.accesskey;" old_accesskey="&staff.main.menu.admin.key;">
+<menu id="main.menu.admin" label="&staff.main.menu.admin.label;" accesskey="-" old_accesskey="&staff.main.menu.admin.key;">
 	<menupopup id="main.menu.admin.popup">
-		<menuitem id="oc_menuitem" label="&staff.main.menu.admin.change_session.label;" label_orig="&staff.main.menu.admin.change_session.label;" 
+		<menuitem id="oc_menuitem" label="Operator Change: New" label_orig="Operator Change: New" 
 			accesskey="O" command="cmd_change_session"/>
-		<menuitem label="&staff.main.menu.admin.offline_xacts.label;" accesskey="&staff.main.menu.admin.offline_xacts.accesskey;" command="cmd_manage_offline_xacts"/>
-		<menuitem label="&staff.main.menu.admin.download_patrons.label;" accesskey="&staff.main.menu.admin.download_patrons.accesskey;" command="cmd_download_patrons"/>
+		<menuitem label="Offline Transaction Management" accesskey="T" command="cmd_manage_offline_xacts"/>
+		<menuitem label="Download Offline Patron List" accesskey="D" command="cmd_download_patrons"/>
 		<menuseparator />
-		<menuitem label="&staff.main.menu.admin.local_admin.label;" accesskey="&staff.main.menu.admin.local_admin.accesskey;" command="cmd_local_admin"/>
-		<menuitem label="&staff.main.menu.admin.user_edit.label;" accesskey="&staff.main.menu.admin.user_edit.accesskey;" command="cmd_adv_user_edit"/>
-		<menuitem label="&staff.main.menu.admin.template_edit.label;" accesskey="&staff.main.menu.admin.template_edit.accesskey;" command="cmd_print_list_template_edit"/>
-		<menuitem label="&staff.main.menu.admin.survey_wizard.label;" accesskey="&staff.main.menu.admin.survey_wizard.accesskey;" command="cmd_survey_wizard"/>
+		<menuitem label="Local System Administration" accesskey="L" command="cmd_local_admin"/>
+		<menuitem label="User Permission Editor" accesskey="U" command="cmd_adv_user_edit"/>
+		<menuitem label="Receipt Template Editor" accesskey="R" command="cmd_print_list_template_edit"/>
+		<menuitem label="Survey Wizard" accesskey="S" command="cmd_survey_wizard"/>
 		<menuseparator />
-		<menu id="main.menu.admin.sub" accesskey="&staff.main.menu.admin.developer.accesskey;" label="&staff.main.menu.admin.developer.label;">
+		<menu id="main.menu.admin.sub" accesskey="-" label="For developers...">
 			<menupopup id="main.menu.admin.sub.popup">
-				<menuitem label="&staff.main.menu.admin.stat_cat_edit.label;" accesskey="&staff.main.menu.admin.stat_cat_edit.accesskey;" command="cmd_stat_cat_edit"/>
-				<menuitem label="&staff.main.menu.admin.non_cat_type_edit.label;" accesskey="&staff.main.menu.admin.non_cat_type_edit.accesskey;" command="cmd_non_cat_type_edit"/>
-				<menuitem label="&staff.main.menu.admin.copy_location_edit.label;" accesskey="&staff.main.menu.admin.copy_location_edit.accesskey;" command="cmd_copy_location_edit"/>
-				<menuitem label="&staff.main.menu.admin.browse_holds.label;" command="cmd_browse_holds" accesskey="&staff.main.menu.admin.browse_holds.accesskey;"/>
+				<menuitem label="Statistical Category Editor" accesskey="C" command="cmd_stat_cat_edit"/>
+				<menuitem label="Non-Cataloged Type Editor" accesskey="n" command="cmd_non_cat_type_edit"/>
+				<menuitem label="Copy Location Editor" accesskey="L" command="cmd_copy_location_edit"/>
+				<menuitem label="Browse Unfulfilled Holds for this Pickup Lib" command="cmd_browse_holds" accesskey="B"/>
 				<menuseparator />
-				<menuitem label="&staff.main.menu.admin.public_opac.label;" command="cmd_public_opac" accesskey="&staff.main.menu.admin.public_opac.accesskey;"/>
-				<menuitem label="&staff.main.menu.admin.cmd_test.label;" old_accesskey="T" command="cmd_test"/>
-				<menuitem label="&staff.main.menu.admin.xuleditor.label;" accesskey="&staff.main.menu.admin.xuleditor.accesskey;" command="cmd_xuleditor"/>
-				<menuitem label="&staff.main.menu.admin.fieldmapper.label;" accesskey="&staff.main.menu.admin.fieldmapper.accesskey;" command="cmd_fieldmapper"/>
-				<menuitem label="&staff.main.menu.admin.cmd_console.label;" accesskey="&staff.main.menu.admin.cmd_console.accesskey;" command="cmd_console"/>
-				<menuitem label="&staff.main.menu.admin.cmd_shell.label;" accesskey="&staff.main.menu.admin.cmd_shell.accesskey;" command="cmd_shell"/>
+				<menuitem label="Public OPAC" command="cmd_public_opac" accesskey="p"/>
+				<menuitem label="Test Module" old_accesskey="T" command="cmd_test"/>
+				<menuitem label="XUL Test" accesskey="X" command="cmd_xuleditor"/>
+				<menuitem label="Fieldmapper" accesskey="m" command="cmd_fieldmapper"/>
+				<menuitem label="Javscript Console" accesskey="J" command="cmd_console"/>
+				<menuitem label="Javscript Shell" accesskey="H" command="cmd_shell"/>
 				<menuitem label="server/main/test.html" accesskey="1" command="cmd_test_html"/>
 				<menuitem label="server/main/test.xul" accesskey="2" command="cmd_test_xul"/>
-				<menuitem label="&staff.main.menu.admin.clear_cache.label;" accesskey="&staff.main.menu.admin.clear_cache.accesskey;" command="cmd_clear_cache"/>
-				<menuitem label="&staff.main.menu.admin.restore_all_tabs.label;" command="cmd_restore_all_tabs"/>
+				<menuitem label="Clear Cache" accesskey="3" command="cmd_clear_cache"/>
+				<menuitem label="Unhide Tabs" command="cmd_restore_all_tabs"/>
 			</menupopup>
 		</menu>
 	</menupopup>
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul b/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
index 96681b9878..5114692d96 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/simple_auth.xul
@@ -11,7 +11,7 @@
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
 <!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
+	<!--#include virtual="/opac/locale/en-US/lang.dtd"-->
 ]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
@@ -131,26 +131,26 @@
 
 	<vbox id="simple_auth_main" flex="1">
 	<groupbox id="desc" hidden="true">
-		<caption label="&staff.main.simple_auth.exception.label;"/>
+		<caption label="Exception"/>
 		<description id="desc_brief" style="color: red"/>
 		<description id="desc_full"/>
 	</groupbox>
 	<groupbox>
-		<caption label="&staff.main.simple_auth.authorization.label;"/>
+		<caption label="Authorization"/>
 		<grid>
 			<columns><column /><column /></columns>
 			<rows>
 				<row>
-					<label value="&common.username.label;" control="username" accesskey="&common.username.accesskey;"/>
+					<label value="Username:" control="username" accesskey="U"/>
 					<textbox id="username" />
 				</row>
 				<row>
-					<label value="&staff.auth.password_prompt;" control="password" accesskey="&staff.auth.password_prompt.accesskey;"/>
+					<label value="Password:" control="password" accesskey="P"/>
 					<textbox id="password" type="password"/>
 				</row>
 				<row>
-					<button label="&common.cancel;" accesskey="&common.cancel.accesskey;" oncommand="window.close()"/>
-					<button label="&staff.main.simple_auth.authorize.label;" accesskey="&staff.main.simple_auth.authorize.accesskey;" oncommand="authorize()"/>
+					<button label="Cancel" accesskey="C" oncommand="window.close()"/>
+					<button label="Authorize" accesskey="A" oncommand="authorize()"/>
 				</row>
 			</rows>
 		</grid>
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/test.xul b/Open-ILS/xul/staff_client/chrome/content/main/test.xul
index d5e925447e..6deec89a21 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/test.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/test.xul
@@ -8,9 +8,6 @@
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- LOCALIZATION -->
-<!DOCTYPE window PUBLIC "" ""[
-	<!--#include virtual="/opac/locale/${locale}/lang.dtd"-->
-]>
 
 <!-- ///////////////////////////////////////////////////////////////////////////////////////////////////////////// -->
 <!-- OVERLAYS -->
@@ -18,7 +15,7 @@
 <window id="example_template_win" 
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-	<label value="&staff.main.test.example_template.label;" />
+	<label value="Hello World" />
 
 </window>
 
-- 
2.11.0