From cfa15a3e3ca89f22920dabf1a4bb95feb2dd8a81 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 24 Jan 2017 03:38:21 -0500 Subject: [PATCH] Rename "Full Sync" to "Reset Data Sync History", and don't start sync This allows generating debug output for full sync of a single library. Also clarify some dialog text --- .../zotero/preferences/preferences_sync.js | 9 ++++----- .../zotero/preferences/preferences_sync.xul | 20 ++++++++----------- chrome/locale/en-US/zotero/preferences.dtd | 6 +++--- 3 files changed, 15 insertions(+), 20 deletions(-) diff --git a/chrome/content/zotero/preferences/preferences_sync.js b/chrome/content/zotero/preferences/preferences_sync.js index 752ff60e33..93f915ae7d 100644 --- a/chrome/content/zotero/preferences/preferences_sync.js +++ b/chrome/content/zotero/preferences/preferences_sync.js @@ -590,15 +590,15 @@ Zotero_Preferences.Sync = { + ps.BUTTON_POS_1_DEFAULT; var index = ps.confirmEx( null, - // TODO: localize Zotero.getString('general.warning'), - "Zotero will compare all local and remote data and merge any data that does not " - + "exist in both locations.\n\n" + // TODO: localize + "On the next sync, Zotero will compare all local and remote data and merge any " + + "data that does not exist in both locations.\n\n" + "This option is not necessary during normal usage and should " + "generally be used only to troubleshoot specific issues as recommended " + "by Zotero support staff.", buttonFlags, - "Sync", + Zotero.getString('general.reset'), null, null, null, {} ); @@ -611,7 +611,6 @@ Zotero_Preferences.Sync = { yield library.save(); } }); - yield Zotero.Sync.Runner.sync(); break; // Cancel diff --git a/chrome/content/zotero/preferences/preferences_sync.xul b/chrome/content/zotero/preferences/preferences_sync.xul index 0155d05607..375cf07133 100644 --- a/chrome/content/zotero/preferences/preferences_sync.xul +++ b/chrome/content/zotero/preferences/preferences_sync.xul @@ -282,7 +282,7 @@ - + - + - @@ -312,9 +312,7 @@