From d7e4ae36209ab1e362754f2253feca06d98781fb Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Fri, 3 Jun 2011 05:14:48 +0000
Subject: [PATCH] Add some new menu items

---
 .../mac/standalone/baseMenuOverlay.xul        | 145 --------------
 .../mac/standalone/menuOverlay.xul            | 133 +++++++++++++
 .../unix/standalone/baseMenuOverlay.xul       |  81 --------
 .../unix/standalone/menuOverlay.xul           |  51 +++++
 .../win/standalone/baseMenuOverlay.xul        |  81 --------
 .../win/standalone/menuOverlay.xul            |  51 +++++
 chrome/content/zotero/standalone.xul          | 184 +++++++-----------
 chrome/content/zotero/zoteroPane.xul          |  12 +-
 .../zotero/standalone/baseMenuOverlay.dtd     |  41 ----
 .../en-US/zotero/standalone/standalone.dtd    | 166 ++++++++--------
 10 files changed, 399 insertions(+), 546 deletions(-)
 delete mode 100644 chrome/content/zotero-platform/mac/standalone/baseMenuOverlay.xul
 create mode 100644 chrome/content/zotero-platform/mac/standalone/menuOverlay.xul
 delete mode 100644 chrome/content/zotero-platform/unix/standalone/baseMenuOverlay.xul
 create mode 100644 chrome/content/zotero-platform/unix/standalone/menuOverlay.xul
 delete mode 100644 chrome/content/zotero-platform/win/standalone/baseMenuOverlay.xul
 create mode 100644 chrome/content/zotero-platform/win/standalone/menuOverlay.xul
 delete mode 100644 chrome/locale/en-US/zotero/standalone/baseMenuOverlay.dtd

diff --git a/chrome/content/zotero-platform/mac/standalone/baseMenuOverlay.xul b/chrome/content/zotero-platform/mac/standalone/baseMenuOverlay.xul
deleted file mode 100644
index 45561b22c..000000000
--- a/chrome/content/zotero-platform/mac/standalone/baseMenuOverlay.xul
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-	The Original Code is Mozilla.org Code.
- 
-	The Initial Developer of the Original Code is Netscape
-	Communications Corporation. Portions created by Netscape are
-	Copyright (C) 1998-2000 Netscape Communications Corporation. All
-	Rights Reserved.
-	
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-
-
-<!DOCTYPE overlay [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % baseMenuOverlayDTD SYSTEM "chrome://zotero/locale/standalone/baseMenuOverlay.dtd">
-%baseMenuOverlayDTD;
-]>
-<overlay id="baseMenuOverlay"
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-<!-- nsMenuBarX hides these and uses them to build the Application menu.
-     When using Carbon widgets for Mac OS X widgets, some of these are not
-     used as they only apply to Cocoa widget builds. All version of Firefox
-     through Firefox 2 will use Carbon widgets. -->
-    <menupopup id="menu_FilePopup">
-        <menuitem id="menu_preferences" label="&preferencesCmdMac.label;" key="key_preferencesCmdMac" oncommand="ZoteroPane.openPreferences();"/>
-        <menuitem id="menu_mac_services" label="&servicesMenuMac.label;"/>
-        <menuitem id="menu_mac_hide_app" label="&hideThisAppCmdMac.label;" key="key_hideThisAppCmdMac"/>
-        <menuitem id="menu_mac_hide_others" label="&hideOtherAppsCmdMac.label;" key="key_hideOtherAppsCmdMac"/>
-        <menuitem id="menu_mac_show_all" label="&showAllAppsCmdMac.label;"/>
-    </menupopup>
-    <script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
-    <commandset id="baseMenuCommandSet">
-        <command id="minimizeWindow"
-                 label="&minimizeWindow.label;"
-                 oncommand="Zotero.debug('minimizing window'); window.minimize();" />
-        <command id="zoomWindow"
-                 label="&zoomWindow.label;"
-                 oncommand="zoomWindow();" />
-    </commandset>
-    <menu id="windowMenu"
-          label="&windowMenu.label;"
-          datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot"
-          onpopupshowing="macWindowMenuDidShow();"
-          hidden="false">
-        <template>
-        <rule>
-            <menupopup>
-                <menuitem uri="rdf:*"
-                          label="rdf:http://home.netscape.com/NC-rdf#Name"
-                          type="radio"
-                          name="windowList"
-                          oncommand="ShowWindowFromResource(event.target)"/>
-            </menupopup>
-        </rule>
-        </template>
-        <menupopup id="windowPopup">
-            <menuitem command="minimizeWindow" label="&minimizeWindow.label;" key="key_minimizeWindow"/>
-            <menuitem command="zoomWindow" label="&zoomWindow.label;"/>
-            <!-- decomment when "BringAllToFront" is implemented
-                <menuseparator/>
-                <menuitem label="&bringAllToFront.label;" disabled="true"/> -->
-            <menuseparator id="sep-window-list"/>
-        </menupopup>
-    </menu>
-
-    <menu id="helpMenu"
-          label="&helpMenu.label;"
-          accesskey="&helpMenu.accesskey;">
-      <menupopup id="menu_HelpPopup">
-        <menuitem id="menu_openHelp"
-                  oncommand="ZoteroStandalone.openHelp();"
-                  label="&productHelp.label;"
-                  accesskey="&productHelp.accesskey;"
-                  key="key_openHelpMac"/>
-        <menuitem id="troubleShooting"
-                  accesskey="&helpTroubleshootingInfo.accesskey;"
-                  label="&helpTroubleshootingInfo.label;"
-                  oncommand="ZoteroStandalone.openHelp('troubleshooting');"/>
-        <menuitem id="feedbackPage"
-                  accesskey="&helpFeedbackPage.accesskey;"
-                  label="&helpFeedbackPage.label;"
-                  oncommand="ZoteroStandalone.openHelp('feedback');"/>
-        <menuseparator/>
-        <menuitem id="reportErrors"
-                  accesskey="&helpReportErrors.accesskey;"
-                  label="&helpReportErrors.label;"
-                  command="cmd_zotero_reportErrors"/>
-        <menuitem id="aboutName"
-                  accesskey="&aboutProduct.accesskey;"
-                  label="&aboutProduct.label;"
-                  oncommand="ZoteroPane.openAboutDialog();"/>
-      </menupopup>
-    </menu>
-
-    <keyset id="baseMenuKeyset">
-        <key id="key_minimizeWindow"
-             command="minimizeWindow"
-             key="&minimizeWindow.key;"
-             modifiers="accel"/>
-        <key id="key_openHelpMac"
-             oncommand="ZoteroStandalone.openHelp();"
-             key="&helpMac.commandkey;"
-             modifiers="accel"/>
-<!-- These are used to build the Application menu under Cocoa widgets -->
-        <key id="key_preferencesCmdMac"
-             key="&preferencesCmdMac.commandkey;"
-             modifiers="accel"/>
-        <key id="key_hideThisAppCmdMac"
-             key="&hideThisAppCmdMac.commandkey;"
-             modifiers="accel"/>
-        <key id="key_hideOtherAppsCmdMac"
-             key="&hideOtherAppsCmdMac.commandkey;"
-             modifiers="accel,alt"/>
-    </keyset>
-
-    <stringbundleset id="stringbundleset">
-        <stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
-        <stringbundle id="bundle_browser_region" src="chrome://browser-region/locale/region.properties"/>
-    </stringbundleset>
-</overlay>
diff --git a/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul b/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul
new file mode 100644
index 000000000..ded0b9c2e
--- /dev/null
+++ b/chrome/content/zotero-platform/mac/standalone/menuOverlay.xul
@@ -0,0 +1,133 @@
+<?xml version="1.0"?>
+<!--
+    ***** BEGIN LICENSE BLOCK *****
+    
+    Copyright © 2009 Center for History and New Media
+                     George Mason University, Fairfax, Virginia, USA
+                     http://zotero.org
+    
+	The Original Code is Mozilla.org Code.
+ 
+	The Initial Developer of the Original Code is Netscape
+	Communications Corporation. Portions created by Netscape are
+	Copyright (C) 1998-2000 Netscape Communications Corporation. All
+	Rights Reserved.
+	
+    This file is part of Zotero.
+    
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+    
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+    
+    ***** END LICENSE BLOCK *****
+-->
+
+
+<!DOCTYPE overlay [
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+%brandDTD;
+<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone/standalone.dtd" >
+%standaloneDTD;
+]>
+<overlay id="menuOverlay"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    
+    <script type="application/javascript" src="chrome://global/content/macWindowMenu.js"/>
+
+	<commandset id="mainCommandSet">
+		<command id="minimizeWindow"
+				label="&minimizeWindow.label;"
+				oncommand="window.minimize();" />
+		<command id="zoomWindow"
+				label="&zoomWindow.label;"
+				oncommand="zoomWindow();" />
+	</commandset>
+	
+	<keyset id="mainKeyset">
+		<key id="key_minimizeWindow"
+				command="minimizeWindow"
+				key="&minimizeWindow.key;"
+				modifiers="accel"/>
+		<key id="key_openHelpMac"
+				oncommand="ZoteroStandalone.openHelp();"
+				key="&helpMac.commandkey;"
+				modifiers="accel"/>
+		
+		<!-- These are used to build the Application menu under Cocoa widgets -->
+		<key id="key_preferencesCmdMac"
+				key="&preferencesCmdMac.commandkey;"
+				modifiers="accel"/>
+		<key id="key_hideThisAppCmdMac"
+				key="&hideThisAppCmdMac.commandkey;"
+				modifiers="accel"/>
+		<key id="key_hideOtherAppsCmdMac"
+				key="&hideOtherAppsCmdMac.commandkey;"
+				modifiers="accel,alt"/>
+		<key id="key_quitApplication"
+				key="&quitApplicationCmdMac.key;"
+				command="cmd_quitApplication"
+				modifiers="accel"/>
+	</keyset>
+
+	<!-- nsMenuBarX hides these and uses them to build the Application menu. -->
+    <menupopup id="menu_FilePopup">
+		<menuitem id="aboutName"
+				accesskey="&aboutProduct.accesskey;"
+				label="&aboutProduct.label;"
+				oncommand="ZoteroPane.openAboutDialog();"/>
+        <menuitem id="menu_preferences"
+				label="&preferencesCmdMac.label;"
+				key="key_preferencesCmdMac"
+				oncommand="ZoteroPane.openPreferences();"/>
+        <menuitem id="menu_mac_services"
+				label="&servicesMenuMac.label;"/>
+        <menuitem id="menu_mac_hide_app"
+				label="&hideThisAppCmdMac.label;"
+				key="key_hideThisAppCmdMac"/>
+        <menuitem id="menu_mac_hide_others"
+				label="&hideOtherAppsCmdMac.label;"
+				key="key_hideOtherAppsCmdMac"/>
+        <menuitem id="menu_mac_show_all"
+				label="&showAllAppsCmdMac.label;"/>
+		<menuitem id="menu_FileQuitItem"
+				label="&quitApplicationCmdMac.label;"
+				key="key_quitApplication"
+				command="cmd_quitApplication"/>
+    </menupopup>
+	
+    <menu id="windowMenu"
+			label="&windowMenu.label;"
+			datasources="rdf:window-mediator" ref="NC:WindowMediatorRoot"
+			onpopupshowing="macWindowMenuDidShow();"
+			hidden="false">
+		<template>
+			<rule>
+				<menupopup>
+					<menuitem uri="rdf:*"
+							label="rdf:http://home.netscape.com/NC-rdf#Name"
+							type="radio"
+							name="windowList"
+							oncommand="ShowWindowFromResource(event.target)"/>
+				</menupopup>
+			</rule>
+		</template>
+        <menupopup id="menu_windowPopup">
+            <menuitem command="minimizeWindow" label="&minimizeWindow.label;" key="key_minimizeWindow"/>
+            <menuitem command="zoomWindow" label="&zoomWindow.label;"/>
+            <!-- decomment when "BringAllToFront" is implemented
+                <menuseparator/>
+                <menuitem label="&bringAllToFront.label;" disabled="true"/> -->
+            <menuseparator id="sep-window-list"/>
+        </menupopup>
+    </menu>
+</overlay>
diff --git a/chrome/content/zotero-platform/unix/standalone/baseMenuOverlay.xul b/chrome/content/zotero-platform/unix/standalone/baseMenuOverlay.xul
deleted file mode 100644
index 91196820f..000000000
--- a/chrome/content/zotero-platform/unix/standalone/baseMenuOverlay.xul
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-	The Original Code is Mozilla.org Code.
- 
-	The Initial Developer of the Original Code is Netscape
-	Communications Corporation. Portions created by Netscape are
-	Copyright (C) 1998-2000 Netscape Communications Corporation. All
-	Rights Reserved.
-	
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-
-
-<!DOCTYPE overlay [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % baseMenuOverlayDTD SYSTEM "chrome://zotero/locale/standalone/baseMenuOverlay.dtd">
-%baseMenuOverlayDTD;
-]>
-<overlay id="baseMenuOverlay"
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-    <menu id="helpMenu"
-          label="&helpMenu.label;"
-          accesskey="&helpMenu.accesskey;">
-      <menupopup id="menu_HelpPopup">
-        <menuitem id="menu_openHelp"
-                  oncommand="ZoteroStandalone.openHelp();"
-                  label="&productHelp.label;"
-                  accesskey="&productHelp.accesskey;"/>
-        <menuitem id="troubleShooting"
-                  accesskey="&helpTroubleshootingInfo.accesskey;"
-                  label="&helpTroubleshootingInfo.label;"
-                  oncommand="ZoteroStandalone.openHelp("troubleshooting")"/>
-        <menuitem id="feedbackPage"
-                  accesskey="&helpFeedbackPage.accesskey;"
-                  label="&helpFeedbackPage.label;"
-                  oncommand="ZoteroStandalone.openHelp("feedback")"/>
-        <menuseparator/>
-        <menuitem id="reportErrors"
-                  accesskey="&helpReportErrors.accesskey;"
-                  label="&helpReportErrors.label;"
-                  command="cmd_zotero_reportErrors"/>
-        <menuseparator id="aboutSeparator"/>
-        <menuitem id="aboutName"
-                  accesskey="&aboutProduct.accesskey;"
-                  label="&aboutProduct.label;"
-                  oncommand="openAboutDialog();"/>
-      </menupopup>
-    </menu>
-
-    <keyset id="baseMenuKeyset">
-    </keyset>
-
-    <stringbundleset id="stringbundleset">
-        <stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
-        <stringbundle id="bundle_browser_region" src="chrome://browser-region/locale/region.properties"/>
-    </stringbundleset>
-</overlay>
diff --git a/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul b/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul
new file mode 100644
index 000000000..5b726034e
--- /dev/null
+++ b/chrome/content/zotero-platform/unix/standalone/menuOverlay.xul
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!--
+    ***** BEGIN LICENSE BLOCK *****
+    
+    Copyright © 2009 Center for History and New Media
+                     George Mason University, Fairfax, Virginia, USA
+                     http://zotero.org
+    
+	The Original Code is Mozilla.org Code.
+ 
+	The Initial Developer of the Original Code is Netscape
+	Communications Corporation. Portions created by Netscape are
+	Copyright (C) 1998-2000 Netscape Communications Corporation. All
+	Rights Reserved.
+	
+    This file is part of Zotero.
+    
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+    
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+    
+    ***** END LICENSE BLOCK *****
+-->
+
+
+<!DOCTYPE overlay [
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+%brandDTD;
+<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone/standalone.dtd" >
+%standaloneDTD;
+]>
+<overlay id="menuOverlay"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    <menupopup id="menu_FilePopup">
+		<menuseparator/>		
+		<menuitem id="menu_FileQuitItem" 
+				label="&quitApplicationCmd.label;"
+				key="key_quitApplication"
+				command="cmd_quitApplication"/>
+    </menupopup>
+</overlay>
diff --git a/chrome/content/zotero-platform/win/standalone/baseMenuOverlay.xul b/chrome/content/zotero-platform/win/standalone/baseMenuOverlay.xul
deleted file mode 100644
index bb8b28f90..000000000
--- a/chrome/content/zotero-platform/win/standalone/baseMenuOverlay.xul
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2009 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-	The Original Code is Mozilla.org Code.
- 
-	The Initial Developer of the Original Code is Netscape
-	Communications Corporation. Portions created by Netscape are
-	Copyright (C) 1998-2000 Netscape Communications Corporation. All
-	Rights Reserved.
-	
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
--->
-
-
-<!DOCTYPE overlay [
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-%brandDTD;
-<!ENTITY % baseMenuOverlayDTD SYSTEM "chrome://zotero/locale/standalone/baseMenuOverlay.dtd">
-%baseMenuOverlayDTD;
-]>
-<overlay id="baseMenuOverlay"
-         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-    <menu id="helpMenu"
-          label="&helpMenu.label;"
-          accesskey="&helpMenu.accesskey;">
-      <menupopup id="menu_HelpPopup">
-        <menuitem id="menu_openHelp"
-                  oncommand="ZoteroStandalone.openHelp();"
-                  label="&productHelp.label;"
-                  accesskey="&productHelp.accesskey;"/>
-        <menuitem id="troubleShooting"
-                  accesskey="&helpTroubleshootingInfo.accesskey;"
-                  label="&helpTroubleshootingInfo.label;"
-                  oncommand="ZoteroStandalone.openHelp('troubleshooting');"/>
-        <menuitem id="feedbackPage"
-                  accesskey="&helpFeedbackPage.accesskey;"
-                  label="&helpFeedbackPage.label;"
-                  oncommand="ZoteroStandalone.openHelp('feedback');"/>
-        <menuseparator/>
-        <menuitem id="reportErrors"
-                  accesskey="&helpReportErrors.accesskey;"
-                  label="&helpReportErrors.label;"
-                  command="cmd_zotero_reportErrors"/>
-        <menuseparator id="aboutSeparator"/>
-        <menuitem id="aboutName"
-                  accesskey="&aboutProduct.accesskey;"
-                  label="&aboutProduct.label;"
-                  oncommand="openAboutDialog();"/>
-      </menupopup>
-    </menu>
-
-    <keyset id="baseMenuKeyset">
-    </keyset>
-
-    <stringbundleset id="stringbundleset">
-        <stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
-        <stringbundle id="bundle_browser_region" src="chrome://browser-region/locale/region.properties"/>
-    </stringbundleset>
-</overlay>
diff --git a/chrome/content/zotero-platform/win/standalone/menuOverlay.xul b/chrome/content/zotero-platform/win/standalone/menuOverlay.xul
new file mode 100644
index 000000000..d0d01e74f
--- /dev/null
+++ b/chrome/content/zotero-platform/win/standalone/menuOverlay.xul
@@ -0,0 +1,51 @@
+<?xml version="1.0"?>
+<!--
+    ***** BEGIN LICENSE BLOCK *****
+    
+    Copyright © 2009 Center for History and New Media
+                     George Mason University, Fairfax, Virginia, USA
+                     http://zotero.org
+    
+	The Original Code is Mozilla.org Code.
+ 
+	The Initial Developer of the Original Code is Netscape
+	Communications Corporation. Portions created by Netscape are
+	Copyright (C) 1998-2000 Netscape Communications Corporation. All
+	Rights Reserved.
+	
+    This file is part of Zotero.
+    
+    Zotero is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+    
+    Zotero is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+    
+    You should have received a copy of the GNU Affero General Public License
+    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
+    
+    ***** END LICENSE BLOCK *****
+-->
+
+
+<!DOCTYPE overlay [
+<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+%brandDTD;
+<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone/standalone.dtd" >
+%standaloneDTD;
+]>
+<overlay id="menuOverlay"
+         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+    <menupopup id="menu_FilePopup">
+		<menuseparator/>		
+		<menuitem id="menu_FileQuitItem" 
+				label="&quitApplicationCmdWin.label;"
+				key="key_quitApplication"
+				command="cmd_quitApplication"/>
+    </menupopup>
+</overlay>
diff --git a/chrome/content/zotero/standalone.xul b/chrome/content/zotero/standalone.xul
index 4cfbda37f..ec49fdb57 100644
--- a/chrome/content/zotero/standalone.xul
+++ b/chrome/content/zotero/standalone.xul
@@ -31,19 +31,15 @@
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://zotero/content/zoteroPane.xul"?>
 <?xul-overlay href="chrome://zotero/content/itemPane.xul"?>
-<?xul-overlay href="chrome://zotero-platform/content/standalone/baseMenuOverlay.xul"?>
+<?xul-overlay href="chrome://zotero-platform/content/standalone/menuOverlay.xul"?>
 
 <!DOCTYPE window [
-<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
-%globalDTD;
-<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetOverlay.dtd" >
-%charsetDTD;
-<!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" >
-%textcontextDTD;
-<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone/standalone.dtd" >
-%standaloneDTD;
-<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
-%brandDTD;
+	<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
+	<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetOverlay.dtd" > %charsetDTD;
+	<!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" > %textcontextDTD;
+	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone/standalone.dtd" > %standaloneDTD;
+	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD;
+	<!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd"> %zoteroDTD;
 ]>
 
 <window id="main-window"
@@ -55,30 +51,25 @@
 				persist="screenX screenY width height sizemode"> 
 	<script type="application/javascript" src="standalone.js"/>
 	<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
-	<script type="application/javascript" src="chrome://global/content/viewZoomOverlay.js"/>
 	<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
 	<script type="application/javascript" src="chrome://global/content/inlineSpellCheckUI.js"/>
+	
 	<commandset id="mainCommandSet">
-		<command id="cmd_toggleTaskbar" oncommand="goToggleToolbar('status-bar','toggle_taskbar');"/>
-		<command id="cmd_quitApplication" oncommand="goQuitApplication()"/>
+		<!--FILE-->
+		<command id="cmd_quitApplication" oncommand="goQuitApplication();"/>
+		<command id="cmd_close" oncommand="window.close();"/>
 		
+		<!--EDIT-->
 		<commandset id="editMenuCommands"/>
-		
 		<command id="cmd_find"
-				 oncommand="gFindBar.onFindCommand();"
-				 observes="isImage"/>
-		<command id="cmd_findAgain"
-				 oncommand="gFindBar.onFindAgainCommand(false);"
-				 observes="isImage"/>
-		<command id="cmd_findPrevious"
-				 oncommand="gFindBar.onFindAgainCommand(true);"
-				 observes="isImage"/>
-		
-		<command id="cmd_fullZoomReduce"  oncommand="FullZoom.reduce()"/>
-		<command id="cmd_fullZoomEnlarge" oncommand="FullZoom.enlarge()"/>
-		<command id="cmd_fullZoomReset"   oncommand="FullZoom.reset()"/>
-		<command id="cmd_fullZoomToggle"  oncommand="ZoomManager.toggleZoom();"/>
+			oncommand="document.getElementById('zotero-tb-search').focus();"/>
 	</commandset>
+	
+	<keyset id="mainKeyset">
+		<key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
+	</keyset>
+	<keyset id="editMenuKeys"/>
+	
 	<popup id="contentAreaContextMenu">
 		<menuitem id="context-undo"
 				label="&undoCmd.label;"
@@ -116,60 +107,42 @@
 			<toolbaritem id="menubar-items" align="center">
 				<menubar id="main-menubar"
 				style="border:0px;padding:0px;margin:0px;-moz-appearance:none">
-					<menu id="file-menu" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;">
+					<menu id="fileMenu" label="&fileMenu.label;" accesskey="&fileMenu.accesskey;">
 						<menupopup id="menu_FilePopup">
 							<menuitem id="menu_close" label="&closeCmd.label;" key="key_close"
 									accesskey="&closeCmd.accesskey;" command="cmd_close"/>
-							<menuitem id="menu_FileQuitItem" 
-									label="&quitApplicationCmdMac.label;"
-									key="key_quitApplication"
-									command="cmd_quitApplication"/>
+							<menuseparator/>
+							<menuitem id="menu_import" label="&zotero.toolbar.import.label;"
+									command="cmd_zotero_import"/>
+							<menuitem id="menu_importFromClipboard" label="&zotero.toolbar.importFromClipboard;"
+									command="cmd_zotero_importFromClipboard"/>
+							<menuitem id="menu_exportLibrary" label="&zotero.toolbar.export.label;"
+									command="cmd_zotero_exportLibrary"/>
 						</menupopup>
 					</menu>
 					
-					<menu id="edit-menu" label="&editMenu.label;" accesskey="&editMenu.accesskey;">
+					<menu id="editMenu" label="&editMenu.label;" accesskey="&editMenu.accesskey;">
 						<menupopup id="menu_EditPopup">
-							<menuitem label="&undoCmd.label;"
-									id="menu_undo"
-									key="key_undo"
-									accesskey="&undoCmd.accesskey;"
-									command="cmd_undo"/>
-							<menuitem label="&redoCmd.label;"
-									id="menu_redo"
-									key="key_redo"
-									accesskey="&redoCmd.accesskey;"
-									command="cmd_redo"/>
+							<menuitem id="menu_undo"/>
+							<menuitem id="menu_redo"/>
 							<menuseparator/>
-							<menuitem label="&cutCmd.label;"
-									id="menu_cut"
-									key="key_cut"
-									accesskey="&cutCmd.accesskey;"
-									command="cmd_cut"/>
-							<menuitem label="&copyCmd.label;"
-									id="menu_copy"
-									key="key_copy"
-									accesskey="&copyCmd.accesskey;"
+							<menuitem id="menu_cut"/>
+							<menuitem id="menu_copy" label="&copyCmd.label;"
+									key="key_copy" accesskey="&copyCmd.accesskey;"
 									command="cmd_copy"/>
-							<menuitem label="&pasteCmd.label;"
-									id="menu_paste"
-									key="key_paste"
-									accesskey="&pasteCmd.accesskey;"
-									command="cmd_paste"/>
-							<menuitem label="&deleteCmd.label;"
-									id="menu_delete"
-									key="key_delete"
-									accesskey="&deleteCmd.accesskey;"
-									command="cmd_delete"/>
+							<menuitem id="menu_copyCitation" label="&copyCitationCmd.label;"
+									oncommand="ZoteroPane_Local.copySelectedItemsToClipboard(true);"/>
+							<menuitem id="menu_copyBibliography" label="&copyBibliographyCmd.label;"
+									oncommand="ZoteroPane_Local.copySelectedItemsToClipboard();"/>
+							<menuitem id="menu_paste"/>
+							<menuitem id="menu_delete"/>
 							<menuseparator/>
-							<menuitem id="menu_selectAll"
-									label="&selectAllCmd.label;"
-									key="key_selectAll"
-									accesskey="&selectAllCmd.accesskey;"
-									command="cmd_selectAll"/>
+							<menuitem id="menu_selectAll"/>
 							<menuseparator/>
-							<menuitem id="menu_find" label="&findOnCmd.label;" accesskey="&findOnCmd.accesskey;" key="key_find" command="cmd_find"/>
-							<menuitem label="&findAgainCmd.label;" accesskey="&findAgainCmd.accesskey;" key="key_findAgain" command="cmd_findAgain"
-									id="menu_findAgain" />
+							<menuitem id="menu_find"/>
+							<menuitem id="menu_advancedSearch"
+									label="&zotero.toolbar.advancedSearch;"
+									command="cmd_zotero_advancedSearch"/>
 							<menuseparator hidden="true" id="textfieldDirection-separator"/>
 							<menuitem id="textfieldDirection-swap"
 									command="cmd_switchTextDirection"
@@ -181,47 +154,39 @@
 					</menu>
 					
 					<menu id="windowMenu" />
-					<menu id="helpMenu" />
+					
+					<menu id="helpMenu"
+							label="&helpMenu.label;"
+							accesskey="&helpMenu.accesskey;">
+						<menupopup id="menu_HelpPopup">
+							<menuitem id="menu_openHelp"
+									  oncommand="ZoteroStandalone.openHelp();"
+									  label="&productHelp.label;"
+									  accesskey="&productHelp.accesskey;"
+									  key="key_openHelpMac"/>
+							<menuitem id="troubleShooting"
+									  accesskey="&helpTroubleshootingInfo.accesskey;"
+									  label="&helpTroubleshootingInfo.label;"
+									  oncommand="ZoteroStandalone.openHelp('troubleshooting');"/>
+							<menuitem id="feedbackPage"
+									  accesskey="&helpFeedbackPage.accesskey;"
+									  label="&helpFeedbackPage.label;"
+									  oncommand="ZoteroStandalone.openHelp('feedback');"/>
+							<menuseparator/>
+							<menuitem id="reportErrors"
+									  accesskey="&helpReportErrors.accesskey;"
+									  label="&helpReportErrors.label;"
+									  command="cmd_zotero_reportErrors"/>
+							<menuitem id="aboutName"
+									  accesskey="&aboutProduct.accesskey;"
+									  label="&aboutProduct.label;"
+									  oncommand="ZoteroPane.openAboutDialog();"/>
+						</menupopup>
+					</menu>
 				</menubar>
 			</toolbaritem>
 		</toolbar>
 	</toolbox>
-	<keyset id="mainKeyset">
-		<key id="key_close" key="&closeCmd.key;" command="cmd_close" modifiers="accel"/>
-		<key id="key_undo"
-			 key="&undoCmd.key;"
-			 modifiers="accel"/>
-		<key id="key_redo" key="&undoCmd.key;" modifiers="accel,shift"/>
-		<key id="key_cut"
-			 key="&cutCmd.key;"
-			 modifiers="accel"/>
-		<key id="key_copy"
-			 key="&copyCmd.key;"
-			 modifiers="accel"/>
-		<key id="key_paste"
-			 key="&pasteCmd.key;"
-			 modifiers="accel"/>
-		<key id="key_delete" keycode="VK_DELETE" command="cmd_delete"/>
-		<key id="key_selectAll" key="&selectAllCmd.key;" modifiers="accel"/>
-		
-		<key id="key_find" key="&findOnCmd.commandkey;" command="cmd_find" modifiers="accel"/>
-		<key id="key_findAgain" key="&findAgainCmd.commandkey;" command="cmd_findAgain" modifiers="accel"/>
-		<key id="key_findPrevious" key="&findAgainCmd.commandkey;" command="cmd_findPrevious" modifiers="accel,shift"/>
-		<key keycode="&findAgainCmd.commandkey2;" command="cmd_findAgain"/>
-		<key keycode="&findAgainCmd.commandkey2;"  command="cmd_findPrevious" modifiers="shift"/>
-		
-		<key id="key_fullZoomReduce"  key="&fullZoomReduceCmd.commandkey;"   command="cmd_fullZoomReduce"  modifiers="accel"/>
-		<key                          key="&fullZoomReduceCmd.commandkey2;"  command="cmd_fullZoomReduce"  modifiers="accel"/>
-		<key id="key_fullZoomEnlarge" key="&fullZoomEnlargeCmd.commandkey;"  command="cmd_fullZoomEnlarge" modifiers="accel"/>
-		<key                          key="&fullZoomEnlargeCmd.commandkey2;" command="cmd_fullZoomEnlarge" modifiers="accel"/>
-		<key                          key="&fullZoomEnlargeCmd.commandkey3;" command="cmd_fullZoomEnlarge" modifiers="accel"/>
-		<key id="key_fullZoomReset"   key="&fullZoomResetCmd.commandkey;"    command="cmd_fullZoomReset"   modifiers="accel"/>
-		<key                          key="&fullZoomResetCmd.commandkey2;"   command="cmd_fullZoomReset"   modifiers="accel"/>
-		
-		<key id="key_switchTextDirection" key="&bidiSwitchTextDirectionItem.commandkey;" command="cmd_switchTextDirection" modifiers="accel,shift" />
-		<key id="key_quitApplication" key="&quitApplicationCmdMac.key;" command="cmd_quitApplication" modifiers="accel"/>
-		<key id="key_errorConsole" key="&errorConsoleCmd.commandkey;" oncommand="toJavaScriptConsole();" modifiers="accel,shift" disabled="true"/>
-	</keyset>
 	<!--<toolbarpalette/>
 
 	<toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar"
@@ -243,7 +208,4 @@
 			<stack id="zotero-pane-stack" fullscreenmode="true" flex="1"/>
 		</vbox>
 	</hbox>
-	<keyset id="mainKeyset"/>
-	<keyset id="baseMenuKeyset"/>
-	<commandset id="baseMenuCommandSet"/>
 </window>
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index 86c609adf..1735b9666 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -47,6 +47,10 @@
 	
 	<commandset id="mainCommandSet">
 		<command id="cmd_zotero_reportErrors" oncommand="ZoteroPane_Local.reportErrors();"/>
+		<command id="cmd_zotero_import" oncommand="Zotero_File_Interface.importFile();"/>
+		<command id="cmd_zotero_importFromClipboard" oncommand="Zotero_File_Interface.importFromClipboard();"/>
+		<command id="cmd_zotero_exportLibrary" oncommand="Zotero_File_Interface.exportFile();"/>
+		<command id="cmd_zotero_advancedSearch" oncommand="ZoteroPane_Local.openAdvancedSearchWindow();"/>
 	</commandset>
 	
 	<popup id="contentAreaContextMenu">
@@ -87,9 +91,9 @@
 					<spacer flex="1"/>
 					<toolbarbutton id="zotero-tb-actions-menu" class="zotero-tb-button" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
 						<menupopup id="zotero-tb-actions-popup" onpopupshowing="document.getElementById('cmd_zotero_reportErrors').setAttribute('disabled', Zotero.getErrors().length == 0)">
-							<menuitem id="zotero-tb-actions-import" label="&zotero.toolbar.import.label;" oncommand="Zotero_File_Interface.importFile();"/>
-							<menuitem id="zotero-tb-actions-import-clipboard" label="&zotero.toolbar.importFromClipboard;" oncommand="Zotero_File_Interface.importFromClipboard();" />
-							<menuitem id="zotero-tb-actions-export" label="&zotero.toolbar.export.label;" oncommand="Zotero_File_Interface.exportFile();"/>
+							<menuitem id="zotero-tb-actions-import" label="&zotero.toolbar.import.label;" command="cmd_zotero_import"/>
+							<menuitem id="zotero-tb-actions-import-clipboard" label="&zotero.toolbar.importFromClipboard;" command="cmd_zotero_importFromClipboard"/>
+							<menuitem id="zotero-tb-actions-export" label="&zotero.toolbar.export.label;" command="cmd_zotero_exportLibrary"/>
 							<menuitem id="zotero-tb-actions-rtfScan" label="&zotero.toolbar.rtfScan.label;" oncommand="window.openDialog('chrome://zotero/content/rtfScan.xul', 'rtfScan', 'chrome,centerscreen')"/>
 							<menuitem hidden="true" id="zotero-tb-actions-zeroconf-update"
 								label="Search for Shared Libraries" oncommand="Zotero.Zeroconf.findInstances()"/>
@@ -142,7 +146,7 @@
 						</menupopup>
 					</toolbarbutton>
 					<toolbarseparator/>
-					<toolbarbutton id="zotero-tb-advanced-search" class="zotero-tb-button" tooltiptext="&zotero.toolbar.advancedSearch;" oncommand="ZoteroPane_Local.openAdvancedSearchWindow()"/>
+					<toolbarbutton id="zotero-tb-advanced-search" class="zotero-tb-button" tooltiptext="&zotero.toolbar.advancedSearch;" command="cmd_zotero_advancedSearch"/>
 					<spacer flex="1"/>
 					<textbox id="zotero-tb-search" type="search" timeout="250"
 							onkeypress="ZoteroPane_Local.handleSearchKeypress(this, event)"
diff --git a/chrome/locale/en-US/zotero/standalone/baseMenuOverlay.dtd b/chrome/locale/en-US/zotero/standalone/baseMenuOverlay.dtd
deleted file mode 100644
index 6231ecbe5..000000000
--- a/chrome/locale/en-US/zotero/standalone/baseMenuOverlay.dtd
+++ /dev/null
@@ -1,41 +0,0 @@
-<!ENTITY minimizeWindow.key       "m">
-<!ENTITY minimizeWindow.label     "Minimize">
-<!ENTITY bringAllToFront.label    "Bring All to Front">
-<!ENTITY zoomWindow.label         "Zoom">
-<!ENTITY windowMenu.label         "Window">
-
-<!ENTITY helpMenu.label           "Help"> 
-<!ENTITY helpMenu.accesskey       "H"> 
-<!-- LOCALIZATION NOTE some localizations of Windows (ex:french, german) use "?"
-                       for the help button in the menubar but Gnome does not.   -->
-<!ENTITY helpMenuWin.label        "Help"> 
-<!ENTITY helpMenuWin.accesskey    "H">
-<!ENTITY aboutProduct.label       "About &brandShortName;">
-<!ENTITY aboutProduct.accesskey   "A">
-<!ENTITY productHelp.label        "Support and Documentation">
-<!ENTITY productHelp.accesskey    "H">
-<!ENTITY helpMac.commandkey       "?">
-<!ENTITY helpSafeMode.label       "Restart with Add-ons Disabled…">
-<!ENTITY helpSafeMode.accesskey   "R">
-
-<!ENTITY helpTroubleshootingInfo.label      "Troubleshooting Information">
-<!ENTITY helpTroubleshootingInfo.accesskey  "T">
-
-<!ENTITY helpFeedbackPage.label      "Submit Feedback…">
-<!ENTITY helpFeedbackPage.accesskey  "S">
-
-<!ENTITY helpReportErrors.label      "Report Errors to Zotero…">
-<!ENTITY helpReportErrors.accesskey  "R">
-
-<!ENTITY preferencesCmdMac.label        "Preferences…">
-<!ENTITY preferencesCmdMac.commandkey   ",">
-
-<!ENTITY servicesMenuMac.label          "Services">
-
-<!ENTITY hideThisAppCmdMac.label        "Hide &brandShortName;">
-<!ENTITY hideThisAppCmdMac.commandkey   "H">
-
-<!ENTITY hideOtherAppsCmdMac.label      "Hide Others">
-<!ENTITY hideOtherAppsCmdMac.commandkey "H">
-
-<!ENTITY showAllAppsCmdMac.label        "Show All">
diff --git a/chrome/locale/en-US/zotero/standalone/standalone.dtd b/chrome/locale/en-US/zotero/standalone/standalone.dtd
index 78240187e..5f132524b 100644
--- a/chrome/locale/en-US/zotero/standalone/standalone.dtd
+++ b/chrome/locale/en-US/zotero/standalone/standalone.dtd
@@ -1,87 +1,87 @@
-<!ENTITY fileMenu.label "File">
+<!--ZOTERO MENU (OS X ONLY)-->
+<!ENTITY preferencesCmdMac.label        "Preferences…">
+<!ENTITY preferencesCmdMac.commandkey   ",">
+<!ENTITY servicesMenuMac.label          "Services">
+<!ENTITY hideThisAppCmdMac.label        "Hide &brandShortName;">
+<!ENTITY hideThisAppCmdMac.commandkey   "H">
+<!ENTITY hideOtherAppsCmdMac.label      "Hide Others">
+<!ENTITY hideOtherAppsCmdMac.commandkey "H">
+<!ENTITY showAllAppsCmdMac.label        "Show All">
+<!ENTITY quitApplicationCmdMac.label "Quit Zotero">
+<!ENTITY quitApplicationCmdMac.key "Q">
+
+<!--FILE MENU-->
+<!ENTITY fileMenu.label "File">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY closeCmd.label                 "Close">  
-<!ENTITY closeCmd.key                   "W">  
-<!ENTITY closeCmd.accesskey             "C">
-<!ENTITY quitApplicationCmdWin.label       "Exit"> 
-<!ENTITY quitApplicationCmdWin.accesskey   "x">
-<!ENTITY quitApplicationCmd.label       "Quit"> 
-<!ENTITY quitApplicationCmd.accesskey   "Q">
-<!ENTITY quitApplicationCmdMac.label    "Quit Zotero">
-<!ENTITY quitApplicationCmdMac.key      "Q">
+<!ENTITY closeCmd.label "Close">
+<!ENTITY closeCmd.key "W">
+<!ENTITY closeCmd.accesskey "C">
+<!ENTITY quitApplicationCmdWin.label "Exit">
+<!ENTITY quitApplicationCmdWin.accesskey "x">
+<!ENTITY quitApplicationCmd.label "Quit">
+<!ENTITY quitApplicationCmd.accesskey "Q">
 
-<!ENTITY editMenu.label         "Edit"> 
-<!ENTITY editMenu.accesskey       "E"> 
-<!ENTITY undoCmd.label            "Undo">  
-<!ENTITY undoCmd.key            "Z">  
-<!ENTITY undoCmd.accesskey          "U"> 
-<!ENTITY redoCmd.label            "Redo">  
-<!ENTITY redoCmd.key            "Y">  
-<!ENTITY redoCmd.accesskey          "R"> 
-<!ENTITY cutCmd.label           "Cut">  
-<!ENTITY cutCmd.key             "X">  
-<!ENTITY cutCmd.accesskey         "t"> 
-<!ENTITY copyCmd.label            "Copy">  
-<!ENTITY copyCmd.key            "C">  
-<!ENTITY copyCmd.accesskey          "C"> 
-<!ENTITY pasteCmd.label           "Paste">  
-<!ENTITY pasteCmd.key           "V">  
-<!ENTITY pasteCmd.accesskey         "P"> 
-<!ENTITY deleteCmd.label          "Delete">  
-<!ENTITY deleteCmd.key            "D">  
-<!ENTITY deleteCmd.accesskey        "D"> 
-<!ENTITY selectAllCmd.label         "Select All">  
-<!ENTITY selectAllCmd.key         "A">  
-<!ENTITY selectAllCmd.accesskey       "A"> 
-<!ENTITY preferencesCmd.label       "Options…">
-<!ENTITY preferencesCmd.accesskey     "O"> 
-<!ENTITY preferencesCmdUnix.label       "Preferences">
-<!ENTITY preferencesCmdUnix.accesskey     "n"> 
+<!--EDIT MENU-->
+<!ENTITY editMenu.label "Edit">
+<!ENTITY editMenu.accesskey "E">
+<!ENTITY undoCmd.label "Undo">
+<!ENTITY undoCmd.key "Z">
+<!ENTITY undoCmd.accesskey "U">
+<!ENTITY redoCmd.label "Redo">
+<!ENTITY redoCmd.key "Y">
+<!ENTITY redoCmd.accesskey "R">
+<!ENTITY cutCmd.label "Cut">
+<!ENTITY cutCmd.key "X">
+<!ENTITY cutCmd.accesskey "t">
+<!ENTITY copyCmd.label "Copy">
+<!ENTITY copyCmd.key "C">
+<!ENTITY copyCmd.accesskey "C">
+<!ENTITY copyCitationCmd.label "Copy Citation">
+<!ENTITY copyBibliographyCmd.label "Copy Bibliography">
+<!ENTITY pasteCmd.label "Paste">
+<!ENTITY pasteCmd.key "V">
+<!ENTITY pasteCmd.accesskey "P">
+<!ENTITY deleteCmd.label "Delete">
+<!ENTITY deleteCmd.key "D">
+<!ENTITY deleteCmd.accesskey "D">
+<!ENTITY selectAllCmd.label "Select All">
+<!ENTITY selectAllCmd.key "A">
+<!ENTITY selectAllCmd.accesskey "A">
+<!ENTITY preferencesCmd.label "Options…">
+<!ENTITY preferencesCmd.accesskey "O">
+<!ENTITY preferencesCmdUnix.label "Preferences">
+<!ENTITY preferencesCmdUnix.accesskey "n">
+<!ENTITY findCmd.label "Find">
+<!ENTITY findCmd.accesskey "F">
+<!ENTITY findCmd.commandkey "f">
+<!ENTITY bidiSwitchPageDirectionItem.label "Switch Page Direction">
+<!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
+<!ENTITY bidiSwitchTextDirectionItem.label "Switch Text Direction">
+<!ENTITY bidiSwitchTextDirectionItem.accesskey "w">
+<!ENTITY bidiSwitchTextDirectionItem.commandkey "X">
 
-<!ENTITY findOnCmd.label     "Find in This Page…">
-<!ENTITY findOnCmd.accesskey "F">
-<!ENTITY findOnCmd.commandkey "f">
-<!ENTITY findAgainCmd.label  "Find Again">
-<!ENTITY findAgainCmd.accesskey "g">
-<!ENTITY findAgainCmd.commandkey "g">
-<!ENTITY findAgainCmd.commandkey2 "VK_F3">
+<!--WINDOW MENU-->
+<!ENTITY minimizeWindow.key       "m">
+<!ENTITY minimizeWindow.label     "Minimize">
+<!ENTITY bringAllToFront.label    "Bring All to Front">
+<!ENTITY zoomWindow.label         "Zoom">
+<!ENTITY windowMenu.label         "Window">
 
-<!ENTITY bidiSwitchPageDirectionItem.label        "Switch Page Direction">
-<!ENTITY bidiSwitchPageDirectionItem.accesskey    "g">
-<!ENTITY bidiSwitchTextDirectionItem.label        "Switch Text Direction">
-<!ENTITY bidiSwitchTextDirectionItem.accesskey    "w">
-<!ENTITY bidiSwitchTextDirectionItem.commandkey   "X">
-
-<!-- LOCALIZATION NOTE :
-fullZoomEnlargeCmd.commandkey3, fullZoomReduceCmd.commandkey2 and
-fullZoomResetCmd.commandkey2 are alternative acceleration keys for zoom.
-If shift key is needed with your locale popular keyboard for them,
-you can use these alternative items. Otherwise, their values should be empty.  -->
-
-<!ENTITY fullZoomEnlargeCmd.label       "Zoom In">
-<!ENTITY fullZoomEnlargeCmd.accesskey   "I">
-<!ENTITY fullZoomEnlargeCmd.commandkey  "+">
-<!ENTITY fullZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
-<!ENTITY fullZoomEnlargeCmd.commandkey3 "">
-
-<!ENTITY fullZoomReduceCmd.label        "Zoom Out">
-<!ENTITY fullZoomReduceCmd.accesskey    "O">
-<!ENTITY fullZoomReduceCmd.commandkey   "-">
-<!ENTITY fullZoomReduceCmd.commandkey2  "">
-
-<!ENTITY fullZoomResetCmd.label         "Reset">
-<!ENTITY fullZoomResetCmd.accesskey     "R">
-<!ENTITY fullZoomResetCmd.commandkey    "0">
-<!ENTITY fullZoomResetCmd.commandkey2   "">
-
-<!ENTITY fullZoomToggleCmd.label        "Zoom Text Only">
-<!ENTITY fullZoomToggleCmd.accesskey    "T">
-<!ENTITY fullZoom.label                 "Zoom">
-<!ENTITY fullZoom.accesskey             "Z">
-
-<!ENTITY toolsMenu.label              "Tools">
-<!ENTITY toolsMenu.accesskey          "T"> 
-
-<!ENTITY errorConsoleCmd.label        "Error Console">
-<!ENTITY errorConsoleCmd.accesskey    "C">
-<!ENTITY errorConsoleCmd.commandkey   "j">
\ No newline at end of file
+<!--HELP MENU-->
+<!ENTITY helpMenu.label           "Help"> 
+<!ENTITY helpMenu.accesskey       "H"> 
+<!-- LOCALIZATION NOTE some localizations of Windows (ex:french, german) use "?"
+                       for the help button in the menubar but Gnome does not.   -->
+<!ENTITY helpMenuWin.label        "Help"> 
+<!ENTITY helpMenuWin.accesskey    "H">
+<!ENTITY helpMac.commandkey       "?">
+<!ENTITY aboutProduct.label       "About &brandShortName;">
+<!ENTITY aboutProduct.accesskey   "A">
+<!ENTITY productHelp.label        "Support and Documentation">
+<!ENTITY productHelp.accesskey    "H">
+<!ENTITY helpTroubleshootingInfo.label      "Troubleshooting Information">
+<!ENTITY helpTroubleshootingInfo.accesskey  "T">
+<!ENTITY helpFeedbackPage.label      "Submit Feedback…">
+<!ENTITY helpFeedbackPage.accesskey  "S">
+<!ENTITY helpReportErrors.label      "Report Errors to Zotero…">
+<!ENTITY helpReportErrors.accesskey  "R">