From dc89cfb3baafee3f64002cde51b0e9446bf6261e Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 1 Jul 2017 06:58:56 -0400
Subject: [PATCH] Clean up Sync -> Reset pane

- Hide radio buttons for now, since there's only one option in each
section
- Tweak text for file sync history reset
---
 .../zotero/preferences/preferences_sync.js    |  2 +-
 .../zotero/preferences/preferences_sync.xul   | 47 ++++++++++---------
 chrome/locale/en-US/zotero/preferences.dtd    |  2 +-
 chrome/locale/en-US/zotero/zotero.properties  |  2 +-
 4 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/chrome/content/zotero/preferences/preferences_sync.js b/chrome/content/zotero/preferences/preferences_sync.js
index b0a32de820..6c94482bf8 100644
--- a/chrome/content/zotero/preferences/preferences_sync.js
+++ b/chrome/content/zotero/preferences/preferences_sync.js
@@ -757,7 +757,7 @@ Zotero_Preferences.Sync = {
 				var index = ps.confirmEx(
 					null,
 					Zotero.getString('general.warning'),
-					Zotero.getString('zotero.preferences.sync.reset.fileSyncHistory'),
+					Zotero.getString('zotero.preferences.sync.reset.fileSyncHistory', Zotero.clientName),
 					buttonFlags,
 					Zotero.getString('general.reset'),
 					null, null, null, {}
diff --git a/chrome/content/zotero/preferences/preferences_sync.xul b/chrome/content/zotero/preferences/preferences_sync.xul
index 375cf07133..4a098a78dc 100644
--- a/chrome/content/zotero/preferences/preferences_sync.xul
+++ b/chrome/content/zotero/preferences/preferences_sync.xul
@@ -271,11 +271,10 @@
 					<!-- This doesn't wrap without an explicit width, for some reason -->
 					<description width="45em">&zotero.preferences.sync.reset.warning1;<label style="margin-left: 0; margin-right: 0" class="zotero-text-link" href="http://zotero.org/support/kb/sync_reset_options">&zotero.preferences.sync.reset.warning2;</label>&zotero.preferences.sync.reset.warning3;</description>
 					
-					<radiogroup id="zotero-reset-sync-group"
-							oncommand="Zotero_Preferences.Sync.handleSyncResetSelect(this)">
-						<groupbox>
-							<caption label="&zotero.preferences.sync.syncServer;"/>
-							
+					<groupbox>
+						<caption label="&zotero.preferences.sync.syncServer;"/>
+						
+						<radiogroup oncommand="Zotero_Preferences.Sync.handleSyncResetSelect(this)">
 							<grid>
 								<columns>
 									<column/>
@@ -301,7 +300,7 @@
 									</row>
 									-->
 									<row id="zotero-reset-data-sync-history">
-										<radio/>
+										<radio hidden="true"/>
 										<vbox onclick="this.previousSibling.click()">
 											<label value="&zotero.preferences.sync.reset.resetDataSyncHistory;"/>
 											<description>&zotero.preferences.sync.reset.resetDataSyncHistory.desc;</description>
@@ -309,16 +308,18 @@
 									</row>
 								</rows>
 							</grid>
-							
-							<hbox>
-								<button label="&zotero.preferences.sync.reset.button;"
-									oncommand="document.getElementById('sync-reset-rows').firstChild.firstChild.click(); Zotero_Preferences.Sync.handleSyncReset('full-sync')"/>
-							</hbox>
-						</groupbox>
+						</radiogroup>
 						
-						<groupbox>
-							<caption label="&zotero.preferences.sync.fileSyncing;"/>
-							
+						<hbox>
+							<button label="&zotero.preferences.sync.reset.button;"
+								oncommand="document.getElementById('sync-reset-rows').firstChild.firstChild.click(); Zotero_Preferences.Sync.handleSyncReset('full-sync')"/>
+						</hbox>
+					</groupbox>
+					
+					<groupbox>
+						<caption label="&zotero.preferences.sync.fileSyncing;"/>
+						
+						<radiogroup oncommand="Zotero_Preferences.Sync.handleSyncResetSelect(this)">
 							<grid>
 								<columns>
 									<column/>
@@ -327,7 +328,7 @@
 								
 								<rows id="storage-reset-rows">
 									<row id="zotero-reset-storage-history">
-										<radio/>
+										<radio hidden="true"/>
 										<vbox onclick="this.previousSibling.click()">
 											<label value="&zotero.preferences.sync.reset.resetFileSyncHistory;"/>
 											<description>&zotero.preferences.sync.reset.resetFileSyncHistory.desc;</description>
@@ -335,13 +336,13 @@
 									</row>
 								</rows>
 							</grid>
-							
-							<hbox>
-								<button label="&zotero.preferences.sync.reset.button;"
-									oncommand="document.getElementById('storage-reset-rows').firstChild.firstChild.click(); Zotero_Preferences.Sync.handleSyncReset('reset-storage-history')"/>
-							</hbox>
-						</groupbox>
-					</radiogroup>
+						</radiogroup>
+						
+						<hbox>
+							<button label="&zotero.preferences.sync.reset.button;"
+								oncommand="document.getElementById('storage-reset-rows').firstChild.firstChild.click(); Zotero_Preferences.Sync.handleSyncReset('reset-storage-history')"/>
+						</hbox>
+					</groupbox>
 				</tabpanel>
 			</tabpanels>
 		</tabbox>
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index 1b2141442b..f2eac0c9af 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -84,7 +84,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer				"Restore to Zotero Server">
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc		"Erase all server data and overwrite with local Zotero data.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory		"Reset File Sync History">
-<!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc	"Check for remote copies of all local attachment files">
+<!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc	"Compare all attachment files with storage service">
 <!ENTITY zotero.preferences.sync.reset								"Reset">
 <!ENTITY zotero.preferences.sync.reset.button						"Reset…">
 
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 36a2d4584d..4a0a465518 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -605,7 +605,7 @@ zotero.preferences.sync.reset.replaceLocalData			= Replace Local Data
 zotero.preferences.sync.reset.restartToComplete			= Firefox must be restarted to complete the restore process.
 zotero.preferences.sync.reset.restoreToServer			= All data belonging to user '%S' on the Zotero server will be erased and replaced with data from this copy of Zotero.\n\nDepending on the size of your library, there may be a delay before your data is available on the server.
 zotero.preferences.sync.reset.replaceServerData			= Replace Server Data
-zotero.preferences.sync.reset.fileSyncHistory			= All file sync history will be cleared.\n\nAny local attachment files that do not exist on the storage server will be uploaded on the next sync.
+zotero.preferences.sync.reset.fileSyncHistory = On the next sync, %S will check all attachment files against the storage service. Any remote attachment files that are missing locally will be downloaded, and local attachment files missing remotely will be uploaded.\n\nThis option is not necessary during normal usage.
 
 zotero.preferences.search.rebuildIndex						= Rebuild Index
 zotero.preferences.search.rebuildWarning					= Do you want to rebuild the entire index? This may take a while.\n\nTo index only items that haven't been indexed, use %S.