From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 28 Jun 2005 13:11:59 +0000 (+0000)
Subject: moving some menus to nested overlays
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=be152f7919dac524196cbbcf6fcc351075a44f20;p=Evergreen.git

moving some menus to nested overlays


git-svn-id: svn://svn.open-ils.org/ILS/trunk@938 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_menus_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_menus_overlay.xul
new file mode 100644
index 0000000000..64b9bf7d08
--- /dev/null
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_menus_overlay.xul
@@ -0,0 +1,134 @@
+<?xml version="1.0"?>
+<!DOCTYPE overlay SYSTEM "chrome://evergreen/locale/app_shell.dtd">
+<overlay id="app_shell_menus_overlay" 
+	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+<!-- The File menu on the main menu -->
+<menu id="main.menu.file" label="&main.menu.file.label;" accesskey="&main.menu.file.key;">
+	<menupopup id="main.menu.file.popup">
+		<menuitem label="&main.menu.file.new.label;" accesskey="&main.menu.file.new.key;" key="file-new-key" command="cmd_new_window"/>
+		<menuitem label="&main.menu.file.new_tab.label;" accesskey="&main.menu.file.new_tab.key;" key="file-new-tab-key" command="cmd_new_tab"/>
+		<menuseparator />
+	<!--
+		<menuitem label="&main.menu.file.open.label;" accesskey="&main.menu.file.open.key;" key="file-open-key" command="cmd_broken" disabled="true"/>
+		<menuitem label="&main.menu.file.save.label;" accesskey="&main.menu.file.save.key;" key="file-save-key" command="cmd_broken"/>
+		<menuseparator />
+	-->
+		<menuitem label="&main.menu.file.close_tab.label;" accesskey="&main.menu.file.close_tab.key;" key="file-close-tab-key" command="cmd_close_tab"/>
+		<menuitem label="&main.menu.file.close.label;" accesskey="&main.menu.file.close.key;" key="file-close-key" command="cmd_close_window"/>
+	</menupopup>
+</menu>
+
+<!-- The Edit menu on the main menu -->
+<menu id="main.menu.edit" label="&main.menu.edit.label;" accesskey="&main.menu.edit.key;">
+	<menupopup id="main.menu.edit.popup">
+		<menuitem label="stub"/>
+	<!--
+		<menuitem label="&main.menu.edit.undo.label;" accesskey="&main.menu.edit.undo.key;" key="edit-undo-key" command="cmd_broken"/>
+		<menuitem label="&main.menu.edit.redo.label;" accesskey="&main.menu.edit.redo.key;" key="edit-redo-key" command="cmd_broken"/>
+		<menuseparator />
+		<menuitem label="&main.menu.edit.cut.label;" accesskey="&main.menu.edit.cut.key;" key="edit-cut-key" command="cmd_broken"/>
+		<menuitem label="&main.menu.edit.copy.label;" accesskey="&main.menu.edit.copy.key;" key="edit-copy-key" command="cmd_broken"/>
+		<menuitem label="&main.menu.edit.paste.label;" accesskey="&main.menu.edit.paste.key;" key="edit-paste-key" command="cmd_broken"/>
+		<menuitem label="&main.menu.edit.delete.label;" accesskey="&main.menu.edit.delete.key;" key="edit-delete-key" command="cmd_broken"/>
+		<menuseparator />
+		<menuitem label="&main.menu.edit.buckets.label;" accesskey="&main.menu.edit.buckets.key;" command="cmd_broken"/>
+		<menuseparator />
+		<menuitem label="&main.menu.edit.select_all.label;" accesskey="&main.menu.edit.select_all.key;" key="edit-select-all-key" command="cmd_broken"/>
+		<menuseparator />
+		<menuitem label="&main.menu.edit.find.label;" accesskey="&main.menu.edit.find.key;" key="edit-find-key" command="cmd_broken"/>
+		<menuitem label="&main.menu.edit.find_again.label;" accesskey="&main.menu.edit.find_again.key;" key="edit-find-again-key" command="cmd_broken"/>
+	-->
+	</menupopup>
+</menu>
+
+<!-- The Circulation menu on the main menu -->
+<menu id="main.menu.circ" label="&main.menu.circ.label;" accesskey="&main.menu.circ.key;">
+	<menupopup id="main.menu.circ.popup">
+		<menuitem label="&main.menu.circ.checkout.label;" accesskey="&main.menu.circ.checkout.key;" key="circ-check-out-key" command="cmd_circ_checkout"/>
+		<menuitem label="&main.menu.circ.checkin.label;" accesskey="&main.menu.circ.checkin.key;" key="circ-check-in-key" command="cmd_circ_checkin"/>
+		<menuitem label="&main.menu.circ.renew.label;" accesskey="&main.menu.circ.renew.key;" key="circ-renew-key" command="cmd_broken"/>
+	<!--
+		<menu id="special-circ-menu" label="&main.menu.circ.special.label;" accesskey="&main.menu.circ.special.key;" command="cmd_broken"/>
+		<menuseparator />
+		<menuitem label="&main.menu.circ.place_hold.label;" accesskey="&main.menu.circ.place_hold.key;" key="circ-place-hold-key" command="cmd_broken"/>
+	-->
+		<menuseparator />
+		<menuitem label="&main.menu.circ.copy_status.label;" accesskey="&main.menu.circ.copy_status.key;" key="circ-copy-status-key" command="cmd_broken"/>
+		<menuitem label="&main.menu.circ.patron_status.label;" accesskey="&main.menu.circ.patron_status.key;" key="circ-patron-status-key" command="cmd_circ_display"/>
+		<menuseparator />
+		<menuitem label="&main.menu.circ.patron_registration.label;" accesskey="&main.menu.circ.patron_registration.key;" key="circ-patron-registration-key" command="cmd_patron_register"/>
+	</menupopup>
+</menu>
+
+<!-- The Special Circulation submenu in the Circulation menu -->
+<menu id="special-circ-menu">
+	<menupopup id="special-circ-popup">
+		<menuitem label="&main.menu.circ.mark_used.label;" accesskey="&main.menu.circ.mark_used.key;" key="circ-mark-used-key" command="cmd_broken"/>
+		<menuitem label="&main.menu.circ.lost.label;" accesskey="&main.menu.circ.lost.key;" command="cmd_broken"/>
+		<menuitem label="&main.menu.circ.missing.label;" accesskey="&main.menu.circ.missing.key;" command="cmd_broken"/>
+		<menuitem label="&main.menu.circ.found.label;" accesskey="&main.menu.circ.found.key;" command="cmd_broken"/>
+		<menuitem label="&main.menu.circ.claimed_returned.label;" accesskey="&main.menu.circ.claimed_returned.key;" command="cmd_broken"/>
+		<menuitem label="&main.menu.circ.quick_add.label;" accesskey="&main.menu.circ.quick_add.key;" command="cmd_broken"/>
+	</menupopup>
+</menu>
+
+<!-- The Cataloging menu on the main menu -->
+<menu id="main.menu.cat" label="&main.menu.cat.label;" accesskey="&main.menu.cat.key;">
+	<menupopup id="main.menu.cat.popup">
+		<menuitem label="&main.menu.cat.bib_search.label;" accesskey="&main.menu.cat.bib_search.key;" command="cmd_cat_main"/>
+		<menuseparator />
+		<menuitem disabled="true" label="&main.menu.cat.dedup.label;" accesskey="&main.menu.cat.dedup.key;" command="cmd_broken"/>
+		<menuitem label="Z39.50 Import" accesskey="Z" command="cmd_z39_50_import"/>
+	</menupopup>
+</menu>
+
+<!-- The Search menu on the main menu -->
+<menu id="main.menu.search" label="&main.menu.search.label;" accesskey="&main.menu.search.key;">
+	<menupopup id="main.menu.search.popup">
+		<menuitem label="Catalog" accesskey="C" command="cmd_search_opac" />
+		<menuitem label="Patrons" accesskey="P" command="cmd_circ_search" />
+	</menupopup>
+</menu>
+
+<!-- The Serials menu on the main menu -->
+<menu id="main.menu.serials" label="&main.menu.serials.label;" accesskey="&main.menu.serials.key;">
+	<menupopup id="main.menu.serials.popup">
+		<menuitem label="stub" />
+	</menupopup>
+</menu>
+
+<!-- The Acquisitions menu on the main menu -->
+<menu id="main.menu.acquisitions" label="&main.menu.acquisitions.label;" accesskey="&main.menu.acquisitions.key;">
+	<menupopup id="main.menu.acquisitions.popup">
+		<menuitem label="stub" />
+	</menupopup>
+</menu>
+
+<!-- The Reports menu on the main menu -->
+<menu id="main.menu.reports" label="&main.menu.reports.label;" accesskey="&main.menu.reports.key;">
+	<menupopup id="main.menu.reports.popup">
+		<menuitem label="stub" />
+	</menupopup>
+</menu>
+
+<!-- The Help menu on the main menu -->
+<menu id="main.menu.help" label="&main.menu.help.label;" accesskey="&main.menu.help.key;">
+	<menupopup id="main.menu.help.popup">
+		<menuitem label="stub" />
+	</menupopup>
+</menu>
+
+<!-- The Help menu on the main menu -->
+<menu id="main.menu.admin" label="&main.menu.admin.label;" accesskey="&main.menu.admin.key;">
+	<menupopup id="main.menu.admin.popup">
+		<menuitem label="Survey Wizard" accesskey="S" command="cmd_survey_wizard"/>
+		<menuitem label="Copy Stat-Cat Editor" accesskey="C" command="cmd_copy_stat_cat_edit"/>
+		<menuitem label="Patron Stat-Cat Editor" accesskey="P" command="cmd_patron_stat_cat_edit"/>
+		<menuitem label="stub" />
+		<menuitem label="Test Module" command="cmd_test"/>
+	</menupopup>
+</menu>
+
+
+</overlay>
diff --git a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
index 3f35dfae5a..de01e67db2 100644
--- a/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
+++ b/Evergreen/staff_client/chrome/content/evergreen/main/app_shell_overlay.xul
@@ -3,6 +3,8 @@
 <overlay id="app_shell_overlay" 
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
+	<?xul-overlay href="chrome://evergreen/content/main/app_shell_menus_overlay.xul"?>
+
 <commandset id="AppShell_cmds">
 
 	<command id="cmd_close_window" oncommand="
@@ -91,168 +93,45 @@
 <!-- The main top level menubar -->
 <toolbox id="main_toolbox">
 	<menubar id="main_menubar">
-		<menu id="file-menu" label="&evergreen.file;" accesskey="&evergreen.file.key;"/>
-		<menu id="edit-menu" label="&evergreen.edit;" accesskey="&evergreen.edit.key;"/>
-		<menu id="search-menu" label="&evergreen.search;" accesskey="&evergreen.search.key;"/>
-		<menu id="circ-menu" label="&evergreen.circ;" accesskey="&evergreen.circ.key;"/>
-		<menu id="cat-menu" label="&evergreen.cat;" accesskey="&evergreen.cat.key;"/>
-		<menu id="serials-menu" label="&evergreen.serials;" accesskey="&evergreen.serials.key;"/>
-		<menu id="acquisitions-menu" label="&evergreen.acquisitions;" accesskey="&evergreen.acquisitions.key;"/>
-		<menu id="reports-menu" label="&evergreen.reports;" accesskey="&evergreen.reports.key;"/>
+		<menu id="main.menu.file" />
+		<menu id="main.menu.edit" />
+		<menu id="main.menu.search" />
+		<menu id="main.menu.circ" />
+		<menu id="main.menu.cat" />
+		<menu id="main.menu.serials" />
+		<menu id="main.menu.acquisitions" />
+		<menu id="main.menu.reports" />
 		<spacer flex="1" />
-		<menu id="admin-menu" label="&evergreen.admin;" accesskey="&evergreen.admin.key;"/>
-		<menu id="help-menu" label="&evergreen.help;" accesskey="&evergreen.help.key;"/>
+		<menu id="main.menu.admin" />
+		<menu id="main.menu.help" />
 	</menubar>
 </toolbox>
 
-<!-- The File menu on the main menu -->
-<menu id="file-menu">
-	<menupopup id="file-popup">
-		<menuitem label="&evergreen.file.new;" accesskey="&evergreen.file.new.key;" key="file-new-key" command="cmd_new_window"/>
-		<menuitem label="&evergreen.file.new_tab;" accesskey="&evergreen.file.new_tab.key;" key="file-new-tab-key" command="cmd_new_tab"/>
-		<menuseparator />
-		<menuitem label="&evergreen.file.open;" accesskey="&evergreen.file.open.key;" key="file-open-key" command="cmd_broken"/>
-		<menuitem label="&evergreen.file.save;" accesskey="&evergreen.file.save.key;" key="file-save-key" command="cmd_broken"/>
-		<menuseparator />
-		<menuitem label="&evergreen.file.close_tab;" accesskey="&evergreen.file.close_tab.key;" key="file-close-tab-key" command="cmd_close_tab"/>
-		<menuitem label="&evergreen.file.close;" accesskey="&evergreen.file.close.key;" key="file-close-key" command="cmd_close_window"/>
-	</menupopup>
-</menu>
-
-<!-- The Edit menu on the main menu -->
-<menu id="edit-menu">
-	<menupopup id="edit-popup">
-		<menuitem label="&evergreen.edit.undo;" accesskey="&evergreen.edit.undo.key;" key="edit-undo-key" command="cmd_broken"/>
-		<menuitem label="&evergreen.edit.redo;" accesskey="&evergreen.edit.redo.key;" key="edit-redo-key" command="cmd_broken"/>
-		<menuseparator />
-		<menuitem label="&evergreen.edit.cut;" accesskey="&evergreen.edit.cut.key;" key="edit-cut-key" command="cmd_broken"/>
-		<menuitem label="&evergreen.edit.copy;" accesskey="&evergreen.edit.copy.key;" key="edit-copy-key" command="cmd_broken"/>
-		<menuitem label="&evergreen.edit.paste;" accesskey="&evergreen.edit.paste.key;" key="edit-paste-key" command="cmd_broken"/>
-		<menuitem label="&evergreen.edit.delete;" accesskey="&evergreen.edit.delete.key;" key="edit-delete-key" command="cmd_broken"/>
-		<menuseparator />
-		<menuitem label="&evergreen.edit.buckets;" accesskey="&evergreen.edit.buckets.key;" command="cmd_broken"/>
-		<menuseparator />
-		<menuitem label="&evergreen.edit.select_all;" accesskey="&evergreen.edit.select_all.key;" key="edit-select-all-key" command="cmd_broken"/>
-		<menuseparator />
-		<menuitem label="&evergreen.edit.find;" accesskey="&evergreen.edit.find.key;" key="edit-find-key" command="cmd_broken"/>
-		<menuitem label="&evergreen.edit.find_again;" accesskey="&evergreen.edit.find_again.key;" key="edit-find-again-key" command="cmd_broken"/>
-	</menupopup>
-</menu>
-
-<!-- The Circulation menu on the main menu -->
-<menu id="circ-menu">
-	<menupopup id="circ-popup">
-		<menuitem label="&evergreen.circ.checkout;" accesskey="&evergreen.circ.checkout.key;" key="circ-check-out-key" command="cmd_circ_checkout"/>
-		<menuitem label="&evergreen.circ.checkin;" accesskey="&evergreen.circ.checkin.key;" key="circ-check-in-key" command="cmd_circ_checkin"/>
-		<menuitem label="&evergreen.circ.renew;" accesskey="&evergreen.circ.renew.key;" key="circ-renew-key" command="cmd_broken"/>
-		<menu id="special-circ-menu" label="&evergreen.circ.special;" accesskey="&evergreen.circ.special.key;" command="cmd_broken"/>
-		<menuseparator />
-		<menuitem label="&evergreen.circ.place_hold;" accesskey="&evergreen.circ.place_hold.key;" key="circ-place-hold-key" command="cmd_broken"/>
-		<menuseparator />
-		<menuitem label="&evergreen.circ.copy_status;" accesskey="&evergreen.circ.copy_status.key;" key="circ-copy-status-key" command="cmd_broken"/>
-		<menuitem label="&evergreen.circ.patron_status;" accesskey="&evergreen.circ.patron_status.key;" key="circ-patron-status-key" command="cmd_circ_display"/>
-		<menuseparator />
-		<menuitem label="&evergreen.circ.patron_registration;" accesskey="&evergreen.circ.patron_registration.key;" key="circ-patron-registration-key" command="cmd_patron_register"/>
-	</menupopup>
-</menu>
-
-<!-- The Special Circulation submenu in the Circulation menu -->
-<menu id="special-circ-menu">
-	<menupopup id="special-circ-popup">
-		<menuitem label="&evergreen.circ.mark_used;" accesskey="&evergreen.circ.mark_used.key;" key="circ-mark-used-key" command="cmd_broken"/>
-		<menuitem label="&evergreen.circ.lost;" accesskey="&evergreen.circ.lost.key;" command="cmd_broken"/>
-		<menuitem label="&evergreen.circ.missing;" accesskey="&evergreen.circ.missing.key;" command="cmd_broken"/>
-		<menuitem label="&evergreen.circ.found;" accesskey="&evergreen.circ.found.key;" command="cmd_broken"/>
-		<menuitem label="&evergreen.circ.claimed_returned;" accesskey="&evergreen.circ.claimed_returned.key;" command="cmd_broken"/>
-		<menuitem label="&evergreen.circ.quick_add;" accesskey="&evergreen.circ.quick_add.key;" command="cmd_broken"/>
-	</menupopup>
-</menu>
-
-<!-- The Cataloging menu on the main menu -->
-<menu id="cat-menu">
-	<menupopup id="cat-popup">
-		<menuitem label="&evergreen.cat.bib_search;" accesskey="&evergreen.cat.bib_search.key;" command="cmd_cat_main"/>
-		<menuseparator />
-		<menuitem disabled="true" label="&evergreen.cat.dedup;" accesskey="&evergreen.cat.dedup.key;" command="cmd_broken"/>
-		<menuitem label="Z39.50 Import" accesskey="Z" command="cmd_z39_50_import"/>
-	</menupopup>
-</menu>
-
-<!-- The Search menu on the main menu -->
-<menu id="search-menu">
-	<menupopup id="search-popup">
-		<menuitem label="Catalog" accesskey="C" command="cmd_search_opac" />
-		<menuitem label="Patrons" accesskey="P" command="cmd_circ_search" />
-	</menupopup>
-</menu>
-
-<!-- The Serials menu on the main menu -->
-<menu id="serials-menu">
-	<menupopup id="serials-popup">
-		<menuitem label="stub" />
-		<menuitem label="stub" />
-		<menuitem label="stub" />
-	</menupopup>
-</menu>
-
-<!-- The Acquisitions menu on the main menu -->
-<menu id="acquisitions-menu">
-	<menupopup id="acquisitions-popup">
-		<menuitem label="stub" />
-		<menuitem label="stub" />
-		<menuitem label="stub" />
-	</menupopup>
-</menu>
-
-<!-- The Reports menu on the main menu -->
-<menu id="reports-menu">
-	<menupopup id="reports-popup">
-		<menuitem label="stub" />
-		<menuitem label="stub" />
-		<menuitem label="stub" />
-	</menupopup>
-</menu>
-
-<!-- The Help menu on the main menu -->
-<menu id="help-menu">
-	<menupopup id="help-popup">
-		<menuitem label="stub" />
-		<menuitem label="stub" />
-		<menuitem label="stub" />
-	</menupopup>
-</menu>
-
-<!-- The Help menu on the main menu -->
-<menu id="admin-menu">
-	<menupopup id="admin-popup">
-		<menuitem label="Survey Wizard" accesskey="S" command="cmd_survey_wizard"/>
-		<menuitem label="Copy Stat-Cat Editor" accesskey="C" command="cmd_copy_stat_cat_edit"/>
-		<menuitem label="Patron Stat-Cat Editor" accesskey="P" command="cmd_patron_stat_cat_edit"/>
-		<menuitem label="stub" />
-		<menuitem label="Test Module" command="cmd_test"/>
-	</menupopup>
-</menu>
-
 <!-- The Entity top level menubar -->
+<!--
 <toolbox id="entity_toolbox">
 	<menubar id="entity_menubar">
-		<menu id="patron-menu" label="&evergreen.entity.patron;" accesskey="&evergreen.entity.patron.key;" command="cmd_broken"/>
-		<menu id="copy-menu" label="&evergreen.entity.copy;" accesskey="&evergreen.entity.copy.key;" command="cmd_broken"/>
-		<menu id="volume-menu" label="&evergreen.entity.volume;" accesskey="&evergreen.entity.volume.key;" command="cmd_broken"/>
-		<menu id="bib-menu" label="&evergreen.entity.bib;" accesskey="&evergreen.entity.bib.key;" command="cmd_broken"/>
+		<menu id="patron-menu" label="&main.menu.entity.patron.label;" accesskey="&main.menu.entity.patron.key;" command="cmd_broken"/>
+		<menu id="copy-menu" label="&main.menu.entity.copy.label;" accesskey="&main.menu.entity.copy.key;" command="cmd_broken"/>
+		<menu id="volume-menu" label="&main.menu.entity.volume.label;" accesskey="&main.menu.entity.volume.key;" command="cmd_broken"/>
+		<menu id="bib-menu" label="&main.menu.entity.bib.label;" accesskey="&main.menu.entity.bib.key;" command="cmd_broken"/>
 	</menubar>
 </toolbox>
+-->
 
 <!-- The Patron menu on the Entity menubar -->
+<!--
 <menu id="patron-menu">
 	<menupopup id="patron-popup">
-		<menuitem label="&evergreen.circ.patron_registration;" accesskey="&evergreen.entity.patron.register.key;" command="cmd_patron_register"/>
+		<menuitem label="&main.menu.circ.patron_registration.label;" accesskey="&main.menu.entity.patron.register.key;" command="cmd_patron_register"/>
 		<menuitem label="stub" />
 		<menuitem label="stub" />
 	</menupopup>
 </menu>
+-->
 
 <!-- The Items menu on the Entity menubar -->
+<!--
 <menu id="copy-menu">
 	<menupopup id="copy-popup">
 		<menuitem label="stub" />
@@ -260,8 +139,10 @@
 		<menuitem label="stub" />
 	</menupopup>
 </menu>
+-->
 
 <!-- The Volumes menu on the Entity menubar -->
+<!--
 <menu id="volume-menu">
 	<menupopup id="volume-popup">
 		<menuitem label="stub" />
@@ -269,8 +150,10 @@
 		<menuitem label="stub" />
 	</menupopup>
 </menu>
+-->
 
 <!-- The Bib Records menu on the Entity menubar -->
+<!--
 <menu id="bib-menu">
 	<menupopup id="bib-popup">
 		<menuitem label="stub" />
@@ -278,6 +161,7 @@
 		<menuitem label="stub" />
 	</menupopup>
 </menu>
+-->
 
 <!-- Accelerator Keys (Accessor Keys are in DTD's) -->
 <keyset id="AppShell_keys">
diff --git a/Evergreen/staff_client/chrome/locale/en-US/evergreen/app_shell.dtd b/Evergreen/staff_client/chrome/locale/en-US/evergreen/app_shell.dtd
index a034d88f22..fe9f93ef0a 100644
--- a/Evergreen/staff_client/chrome/locale/en-US/evergreen/app_shell.dtd
+++ b/Evergreen/staff_client/chrome/locale/en-US/evergreen/app_shell.dtd
@@ -1,72 +1,72 @@
-<!ENTITY evergreen.title "Evergreen Staff Client">
+<!ENTITY main.menu.title "Evergreen Staff Client">
 
 <!-- The Main Menubar -->
-<!ENTITY evergreen.file "File"><!ENTITY evergreen.file.key "F">
-<!ENTITY evergreen.edit "Edit"><!ENTITY evergreen.edit.key "E">
-<!ENTITY evergreen.circ "Circulation"><!ENTITY evergreen.circ.key "C">
-<!ENTITY evergreen.cat "Cataloging"><!ENTITY evergreen.cat.key "a">
-<!ENTITY evergreen.serials "Serials"><!ENTITY evergreen.serials.key "l">
-<!ENTITY evergreen.acquisitions "Acquisitions"><!ENTITY evergreen.acquisitions.key "q">
-<!ENTITY evergreen.search "Search"><!ENTITY evergreen.search.key "r">
-<!ENTITY evergreen.reports "Reports"><!ENTITY evergreen.reports.key "">
-<!ENTITY evergreen.help "Help"><!ENTITY evergreen.help.key "H">
-<!ENTITY evergreen.admin "Admin"><!ENTITY evergreen.admin.key "">
+<!ENTITY main.menu.file.label "File"><!ENTITY main.menu.file.key "F">
+<!ENTITY main.menu.edit.label "Edit"><!ENTITY main.menu.edit.key "E">
+<!ENTITY main.menu.circ.label "Circulation"><!ENTITY main.menu.circ.key "C">
+<!ENTITY main.menu.cat.label "Cataloging"><!ENTITY main.menu.cat.key "a">
+<!ENTITY main.menu.serials.label "Serials"><!ENTITY main.menu.serials.key "l">
+<!ENTITY main.menu.acquisitions.label "Acquisitions"><!ENTITY main.menu.acquisitions.key "q">
+<!ENTITY main.menu.search.label "Search"><!ENTITY main.menu.search.key "r">
+<!ENTITY main.menu.reports.label "Reports"><!ENTITY main.menu.reports.key "">
+<!ENTITY main.menu.help.label "Help"><!ENTITY main.menu.help.key "H">
+<!ENTITY main.menu.admin.label "Admin"><!ENTITY main.menu.admin.key "">
 
 <!-- The File menu on the Main Menubar -->
-<!ENTITY evergreen.file.new "New Window"><!ENTITY evergreen.file.new.key "N">
-<!ENTITY evergreen.file.new_tab "New Tab"><!ENTITY evergreen.file.new_tab.key "T">
-<!ENTITY evergreen.file.open "Open Session"><!ENTITY evergreen.file.open.key "O">
-<!ENTITY evergreen.file.save "Save Session"><!ENTITY evergreen.file.save.key "S">
-<!ENTITY evergreen.file.close_tab "Close Tab"><!ENTITY evergreen.file.close_tab.key "">
-<!ENTITY evergreen.file.close "Close Window"><!ENTITY evergreen.file.close.key "C">
+<!ENTITY main.menu.file.new.label "New Window"><!ENTITY main.menu.file.new.key "N">
+<!ENTITY main.menu.file.new_tab.label "New Tab"><!ENTITY main.menu.file.new_tab.key "T">
+<!ENTITY main.menu.file.open.label "Open Session"><!ENTITY main.menu.file.open.key "O">
+<!ENTITY main.menu.file.save.label "Save Session"><!ENTITY main.menu.file.save.key "S">
+<!ENTITY main.menu.file.close_tab.label "Close Tab"><!ENTITY main.menu.file.close_tab.key "">
+<!ENTITY main.menu.file.close.label "Close Window"><!ENTITY main.menu.file.close.key "C">
 
 <!-- The Edit menu on the Main Menubar -->
-<!ENTITY evergreen.edit.undo "Undo"><!ENTITY evergreen.edit.undo.key "U">
-<!ENTITY evergreen.edit.redo "Redo"><!ENTITY evergreen.edit.redo.key "R">
-<!ENTITY evergreen.edit.cut "Cut"><!ENTITY evergreen.edit.cut.key "t">
-<!ENTITY evergreen.edit.copy "Copy"><!ENTITY evergreen.edit.copy.key "C">
-<!ENTITY evergreen.edit.paste "Paste"><!ENTITY evergreen.edit.paste.key "P">
-<!ENTITY evergreen.edit.delete "Delete"><!ENTITY evergreen.edit.delete.key "D">
-<!ENTITY evergreen.edit.select_all "Select All"><!ENTITY evergreen.edit.select_all.key "A">
-<!ENTITY evergreen.edit.find "Find"><!ENTITY evergreen.edit.find.key "F">
-<!ENTITY evergreen.edit.find_again "Find Again"><!ENTITY evergreen.edit.find_again.key "g">
-<!ENTITY evergreen.edit.buckets "Manage Buckets"><!ENTITY evergreen.edit.buckets.key "B">
+<!ENTITY main.menu.edit.undo.label "Undo"><!ENTITY main.menu.edit.undo.key "U">
+<!ENTITY main.menu.edit.redo.label "Redo"><!ENTITY main.menu.edit.redo.key "R">
+<!ENTITY main.menu.edit.cut.label "Cut"><!ENTITY main.menu.edit.cut.key "t">
+<!ENTITY main.menu.edit.copy.label "Copy"><!ENTITY main.menu.edit.copy.key "C">
+<!ENTITY main.menu.edit.paste.label "Paste"><!ENTITY main.menu.edit.paste.key "P">
+<!ENTITY main.menu.edit.delete.label "Delete"><!ENTITY main.menu.edit.delete.key "D">
+<!ENTITY main.menu.edit.select_all.label "Select All"><!ENTITY main.menu.edit.select_all.key "A">
+<!ENTITY main.menu.edit.find.label "Find"><!ENTITY main.menu.edit.find.key "F">
+<!ENTITY main.menu.edit.find_again.label "Find Again"><!ENTITY main.menu.edit.find_again.key "g">
+<!ENTITY main.menu.edit.buckets.label "Manage Buckets"><!ENTITY main.menu.edit.buckets.key "B">
 
 <!-- The Circulation menu on the Main Menubar -->
-<!ENTITY evergreen.circ.checkout "Check Out"><!ENTITY evergreen.circ.checkout.key "O">
-<!ENTITY evergreen.circ.checkin "Check In"><!ENTITY evergreen.circ.checkin.key "C">
-<!ENTITY evergreen.circ.renew "Renew"><!ENTITY evergreen.circ.renew.key "n">
-<!ENTITY evergreen.circ.mark_used "Mark Used"><!ENTITY evergreen.circ.mark_used.key "U">
-<!ENTITY evergreen.circ.copy_status "Display Item"><!ENTITY evergreen.circ.copy_status.key "I">
-<!ENTITY evergreen.circ.patron_status "Display Patron"><!ENTITY evergreen.circ.patron_status.key "P">
-<!ENTITY evergreen.circ.patron_registration "Register Patron"><!ENTITY evergreen.circ.patron_registration.key "R">
-<!ENTITY evergreen.circ.place_hold "Place Hold"><!ENTITY evergreen.circ.place_hold.key "H">
+<!ENTITY main.menu.circ.checkout.label "Check Out"><!ENTITY main.menu.circ.checkout.key "O">
+<!ENTITY main.menu.circ.checkin.label "Check In"><!ENTITY main.menu.circ.checkin.key "C">
+<!ENTITY main.menu.circ.renew.label "Renew"><!ENTITY main.menu.circ.renew.key "n">
+<!ENTITY main.menu.circ.mark_used.label "Mark Used"><!ENTITY main.menu.circ.mark_used.key "U">
+<!ENTITY main.menu.circ.copy_status.label "Display Item"><!ENTITY main.menu.circ.copy_status.key "I">
+<!ENTITY main.menu.circ.patron_status.label "Display Patron"><!ENTITY main.menu.circ.patron_status.key "P">
+<!ENTITY main.menu.circ.patron_registration.label "Register Patron"><!ENTITY main.menu.circ.patron_registration.key "R">
+<!ENTITY main.menu.circ.place_hold.label "Place Hold"><!ENTITY main.menu.circ.place_hold.key "H">
 
 <!-- The Special Circulation submenu in the Circulation Menu -->
-<!ENTITY evergreen.circ.special "Special Circulation"><!ENTITY evergreen.circ.special.key "S">
-<!ENTITY evergreen.circ.lost "Mark Lost"><!ENTITY evergreen.circ.lost.key "L">
-<!ENTITY evergreen.circ.missing "Mark Missing"><!ENTITY evergreen.circ.missing.key "M">
-<!ENTITY evergreen.circ.found "Mark Found"><!ENTITY evergreen.circ.found.key "F">
-<!ENTITY evergreen.circ.quick_add "Quick Add"><!ENTITY evergreen.circ.quick_add.key "Q">
-<!ENTITY evergreen.circ.claimed_returned 'Mark as "Claimed Returned"'><!ENTITY evergreen.circ.claimed_returned.key "C">
+<!ENTITY main.menu.circ.special.label "Special Circulation"><!ENTITY main.menu.circ.special.key "S">
+<!ENTITY main.menu.circ.lost.label "Mark Lost"><!ENTITY main.menu.circ.lost.key "L">
+<!ENTITY main.menu.circ.missing.label "Mark Missing"><!ENTITY main.menu.circ.missing.key "M">
+<!ENTITY main.menu.circ.found.label "Mark Found"><!ENTITY main.menu.circ.found.key "F">
+<!ENTITY main.menu.circ.quick_add.label "Quick Add"><!ENTITY main.menu.circ.quick_add.key "Q">
+<!ENTITY main.menu.circ.claimed_returned.label 'Mark as "Claimed Returned"'><!ENTITY main.menu.circ.claimed_returned.key "C">
 
 <!-- The Cataloging menu on the Main Menubar -->
-<!ENTITY evergreen.cat.add_copy "Add Item"><!ENTITY evergreen.cat.add_copy.key "I">
-<!ENTITY evergreen.cat.add_volume "Add Volume"><!ENTITY evergreen.cat.add_volume.key "V">
-<!ENTITY evergreen.cat.add_bib "Add Bib Record"><!ENTITY evergreen.cat.add_bib.key "B">
-<!ENTITY evergreen.cat.copy_status "Display Item"><!ENTITY evergreen.cat.copy_status.key "I">
-<!ENTITY evergreen.cat.volume_status "Display Volume"><!ENTITY evergreen.cat.volume_status.key "V">
-<!ENTITY evergreen.cat.bib_status "Display Bib Record"><!ENTITY evergreen.cat.bib_status.key "B">
-<!ENTITY evergreen.cat.bib_search "Search Catalog"><!ENTITY evergreen.cat.bib_search.key "S">
-<!ENTITY evergreen.cat.dedup "Merge/Transfer Interface"><!ENTITY evergreen.cat.dedup.key "M">
+<!ENTITY main.menu.cat.add_copy.label "Add Item"><!ENTITY main.menu.cat.add_copy.key "I">
+<!ENTITY main.menu.cat.add_volume.label "Add Volume"><!ENTITY main.menu.cat.add_volume.key "V">
+<!ENTITY main.menu.cat.add_bib.label "Add Bib Record"><!ENTITY main.menu.cat.add_bib.key "B">
+<!ENTITY main.menu.cat.copy_status.label "Display Item"><!ENTITY main.menu.cat.copy_status.key "I">
+<!ENTITY main.menu.cat.volume_status.label "Display Volume"><!ENTITY main.menu.cat.volume_status.key "V">
+<!ENTITY main.menu.cat.bib_status.label "Display Bib Record"><!ENTITY main.menu.cat.bib_status.key "B">
+<!ENTITY main.menu.cat.bib_search.label "Search Catalog"><!ENTITY main.menu.cat.bib_search.key "S">
+<!ENTITY main.menu.cat.dedup.label "Merge/Transfer Interface"><!ENTITY main.menu.cat.dedup.key "M">
 
 <!-- The Entity Menubar -->
-<!ENTITY evergreen.entity.patron "Patrons"><!ENTITY evergreen.entity.patron.key "">
-<!ENTITY evergreen.entity.copy "Items"><!ENTITY evergreen.entity.copy.key "">
-<!ENTITY evergreen.entity.volume "Volumes"><!ENTITY evergreen.entity.volume.key "">
-<!ENTITY evergreen.entity.bib "Bib Records"><!ENTITY evergreen.entity.bib.key "">
+<!ENTITY main.menu.entity.patron.label "Patrons"><!ENTITY main.menu.entity.patron.key "">
+<!ENTITY main.menu.entity.copy.label "Items"><!ENTITY main.menu.entity.copy.key "">
+<!ENTITY main.menu.entity.volume.label "Volumes"><!ENTITY main.menu.entity.volume.key "">
+<!ENTITY main.menu.entity.bib.label "Bib Records"><!ENTITY main.menu.entity.bib.key "">
 
 <!-- The Patron menu on the Entity Menubar -->
-<!-- Re-use evergreen.copy.patron_registration for menuitem label -->
-<!ENTITY evergreen.entity.patron.register.key "R">
+<!-- Re-use main.menu.copy.patron_registration for menuitem label -->
+<!ENTITY main.menu.entity.patron.register.key "R">