From b2152f811a5f01d8c76f339d75fb31859f93de02 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Tue, 27 Sep 2016 23:46:14 -0400 Subject: [PATCH] Tweak text in sync-user-change warning --- chrome/content/zotero/xpcom/sync/syncLocal.js | 2 +- chrome/locale/en-US/zotero/zotero.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chrome/content/zotero/xpcom/sync/syncLocal.js b/chrome/content/zotero/xpcom/sync/syncLocal.js index ab797f97b..2e324f099 100644 --- a/chrome/content/zotero/xpcom/sync/syncLocal.js +++ b/chrome/content/zotero/xpcom/sync/syncLocal.js @@ -123,7 +123,7 @@ Zotero.Sync.Data.Local = { var io = { title: Zotero.getString('general.warning'), text: [Zotero.getString('account.lastSyncWithDifferentAccount', [ZOTERO_CONFIG.CLIENT_NAME, lastUsername, username])], - checkboxLabel: Zotero.getString('account.confirmDelete', lastUsername), + checkboxLabel: Zotero.getString('account.confirmDelete'), acceptLabel: Zotero.getString('account.confirmDelete.button') }; win.openDialog("chrome://zotero/content/hardConfirmationDialog.xul", "", diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index 89555c0df..9da3bfb0e 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -861,7 +861,7 @@ account.unlinkWarning.button = Unlink Account account.warning.emptyLibrary = You are about to sync the ‘%1$S’ account to an empty %2$S database. This could happen if you removed your previous database or if the location of your %2$S data directory changed. account.warning.existingDataElsewhere = If your %S data exists elsewhere on your computer, you should move it to your current data directory or change your data directory to point to the existing data. account.lastSyncWithDifferentAccount = This %1$S database was last synced with a different account (‘%2$S’) from the current one (‘%3$S’). If you continue, data associated with the ‘%2$S’ account will be removed from this computer. -account.confirmDelete = Remove data associated with the ‘%S’ account +account.confirmDelete = Remove existing data account.confirmDelete.button = Switch Accounts sync.conflict.autoChange.alert = One or more locally deleted Zotero %S have been modified remotely since the last sync.