From a158e8a71b4ecb626fa65ad8545068eb181ae2d3 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 19 Jul 2017 03:52:08 -0400
Subject: [PATCH] Alter Quick Copy preferences text

Closes #1022

Could try to explain site-specific settings, but it's somewhat
complicated (requires the Zotero Connector, uses the last active tab
regardless of drag destination), so maybe enough to explain on the
linked documentation page.
---
 chrome/content/zotero/preferences/preferences_export.js   | 2 +-
 chrome/content/zotero/preferences/preferences_export.xul  | 4 ++--
 chrome/content/zotero/preferences/quickCopySiteEditor.xul | 2 +-
 chrome/locale/en-US/zotero/preferences.dtd                | 7 +++----
 chrome/locale/en-US/zotero/zotero.properties              | 6 +++---
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences_export.js b/chrome/content/zotero/preferences/preferences_export.js
index 7baaf13a9..55afdab23 100644
--- a/chrome/content/zotero/preferences/preferences_export.js
+++ b/chrome/content/zotero/preferences/preferences_export.js
@@ -94,7 +94,7 @@ Zotero_Preferences.Export = {
 		menulist.appendChild(popup);
 		
 		var itemNode = document.createElement("menuitem");
-		itemNode.setAttribute("label", Zotero.getString('zotero.preferences.export.quickCopy.bibStyles'));
+		itemNode.setAttribute("label", Zotero.getString('zotero.preferences.export.quickCopy.citationStyles'));
 		itemNode.setAttribute("disabled", true);
 		popup.appendChild(itemNode);
 		
diff --git a/chrome/content/zotero/preferences/preferences_export.xul b/chrome/content/zotero/preferences/preferences_export.xul
index 4a3b93802..07580d091 100644
--- a/chrome/content/zotero/preferences/preferences_export.xul
+++ b/chrome/content/zotero/preferences/preferences_export.xul
@@ -51,7 +51,7 @@
 			
 			<separator/>
 			
-			<label value="&zotero.preferences.quickCopy.defaultOutputFormat;" control="quickCopy-menu"/>
+			<label value="&zotero.preferences.quickCopy.defaultFormat;" control="quickCopy-menu"/>
 			<menulist id="zotero-quickCopy-menu" label="&zotero.general.loading;"/>
 			
 			<hbox align="center">
@@ -73,7 +73,7 @@
 					onkeypress="if (event.keyCode == event.DOM_VK_DELETE) { Zotero_Preferences.Export.deleteSelectedQuickCopySite(); }">
 				<treecols>
 					<treecol id="quickCopy-urlColumn" label="&zotero.preferences.quickCopy.siteEditor.domainPath;" flex="1"/>
-					<treecol id="quickCopy-formatColumn" label="&zotero.preferences.quickCopy.siteEditor.outputFormat;" flex="2"/>
+					<treecol id="quickCopy-formatColumn" label="&zotero.preferences.quickCopy.siteEditor.format;" flex="2"/>
 					<treecol id="quickCopy-localeColumn" label="&zotero.preferences.quickCopy.siteEditor.locale;"/>
 					<treecol id="quickCopy-copyAsHTML" label="HTML"/>
 				</treecols>
diff --git a/chrome/content/zotero/preferences/quickCopySiteEditor.xul b/chrome/content/zotero/preferences/quickCopySiteEditor.xul
index c89732aae..5383f5bca 100644
--- a/chrome/content/zotero/preferences/quickCopySiteEditor.xul
+++ b/chrome/content/zotero/preferences/quickCopySiteEditor.xul
@@ -51,7 +51,7 @@
 		
 		<separator class="thin"/>
 		
-		<label value="&zotero.preferences.quickCopy.siteEditor.outputFormat;" control="zotero-quickCopy-menu"/>
+		<label value="&zotero.preferences.quickCopy.siteEditor.format;" control="zotero-quickCopy-menu"/>
 		<menulist id="zotero-quickCopy-menu"/>
 		
 		<separator class="thin"/>
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index f2eac0c9a..4c23c3754 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -109,13 +109,12 @@
 <!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
 
 <!ENTITY zotero.preferences.quickCopy.caption				"Quick Copy">
-<!ENTITY zotero.preferences.quickCopy.defaultOutputFormat	"Default Output Format:">
+<!ENTITY zotero.preferences.quickCopy.defaultFormat       "Default Format:">
 <!ENTITY zotero.preferences.quickCopy.copyAsHTML			"Copy as HTML">
-<!ENTITY zotero.preferences.quickCopy.macWarning			"Note: Rich-text formatting will be lost on Mac OS X.">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.setings 	"Site-Specific Settings:">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath "Domain/Path">
-<!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
-<!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
+<!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g., wikipedia.org)">
+<!ENTITY zotero.preferences.quickCopy.siteEditor.format    "Format">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.locale		"Language">
 <!ENTITY zotero.preferences.quickCopy.dragLimit			 "Disable Quick Copy when dragging more than">
 
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 3d609acda..5d6ae133a 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -640,10 +640,10 @@ zotero.preferences.search.pdf.zoteroCanInstallVersion		= Zotero can automaticall
 zotero.preferences.search.pdf.zoteroCanInstallVersions		= Zotero can automatically install these applications into the Zotero data directory.
 zotero.preferences.search.pdf.toolsDownloadError 			= An error occurred while attempting to download the %S utilities from zotero.org.
 zotero.preferences.search.pdf.tryAgainOrViewManualInstructions	 = Please try again later, or view the documentation for manual installation instructions.
-zotero.preferences.export.quickCopy.bibStyles				= Bibliographic Styles
+zotero.preferences.export.quickCopy.citationStyles        = Citation Styles
 zotero.preferences.export.quickCopy.exportFormats			= Export Formats
-zotero.preferences.export.quickCopy.instructions			= Quick Copy allows you to copy selected items to the clipboard by pressing %S or dragging items into a text box on a web page.
-zotero.preferences.export.quickCopy.citationInstructions  = For bibliography styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
+zotero.preferences.export.quickCopy.instructions			= Quick Copy allows you to quickly export items in a given format. You can copy selected items to the clipboard by pressing %S or drag items directly into a text box in another program.
+zotero.preferences.export.quickCopy.citationInstructions  = For citation styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
 
 zotero.preferences.wordProcessors.installationSuccess		= Installation was successful.
 zotero.preferences.wordProcessors.installationError			= Installation could not be completed because an error occurred. Please ensure that %1$S is closed, and then restart %2$S.