From aca774e132b883826093c5648204448d4e9ad56d Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 29 Jun 2017 03:50:02 -0400
Subject: [PATCH] Move connector install option to Tools menu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

And rename from "Install Browser Connectors…" to "Install Browser Connector"
---
 chrome/content/zotero/standalone/standalone.xul | 9 ++++-----
 chrome/locale/en-US/zotero/standalone.dtd       | 5 ++---
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/chrome/content/zotero/standalone/standalone.xul b/chrome/content/zotero/standalone/standalone.xul
index c1856d53a..329f4f7ac 100644
--- a/chrome/content/zotero/standalone/standalone.xul
+++ b/chrome/content/zotero/standalone/standalone.xul
@@ -173,6 +173,10 @@
 							<menuitem id="menu_rtfScan" label="&zotero.toolbar.rtfScan.label;"
 									command="cmd_zotero_rtfScan"/>
 							<menuseparator/>
+							<menuitem id="installConnector"
+									accessKey="&installConnector.accesskey;"
+									label="&installConnector.label;"
+									oncommand="ZoteroStandalone.openHelp('connectors');"/>
 							<menuitem id="menu_addons" label="&addons.label;"
 									oncommand="Zotero.openInViewer('chrome://mozapps/content/extensions/extensions.xul', ZoteroStandalone.updateAddonsPane)"/>
 							<menuitem id="menu_errorConsole" label="Error Console" oncommand="toJavaScriptConsole()" hidden="true"/>
@@ -199,11 +203,6 @@
 									  label="&helpFeedbackPage.label;"
 									  oncommand="ZoteroStandalone.openHelp('feedback');"/>
 							<menuseparator/>
-							<menuitem id="installBrowserConnectors"
-									accessKey="&helpInstallBrowserConnectors.accesskey;"
-									label="&helpInstallBrowserConnectors.label;"
-									oncommand="ZoteroStandalone.openHelp('connectors');"/>
-							<menuseparator/>
 							<menuitem id="reportErrors"
 									  accesskey="&helpReportErrors.accesskey;"
 									  label="&helpReportErrors.label;"
diff --git a/chrome/locale/en-US/zotero/standalone.dtd b/chrome/locale/en-US/zotero/standalone.dtd
index 1576e8696..5dcde3a6f 100644
--- a/chrome/locale/en-US/zotero/standalone.dtd
+++ b/chrome/locale/en-US/zotero/standalone.dtd
@@ -45,6 +45,8 @@
 <!--TOOLS MENU-->
 <!ENTITY toolsMenu.label           "Tools"> 
 <!ENTITY toolsMenu.accesskey           "T"> 
+<!ENTITY installConnector.label "Install Browser Connector">
+<!ENTITY installConnector.accesskey "C">
 <!ENTITY addons.label				"Add-ons">
 
 <!--WINDOW MENU-->
@@ -71,9 +73,6 @@
 <!ENTITY helpFeedbackPage.label      "Submit Feedback…">
 <!ENTITY helpFeedbackPage.accesskey  "S">
 
-<!ENTITY helpInstallBrowserConnectors.accesskey "C">
-<!ENTITY helpInstallBrowserConnectors.label "Install Browser Connectors…">
-
 <!ENTITY helpReportErrors.label      "Report Errors to Zotero…">
 <!ENTITY helpReportErrors.accesskey  "R">
 <!ENTITY helpCheckForUpdates.label      "Check for Updates…">