www

commit b2152f811a5f01d8c76f339d75fb31859f93de02
parent 6e741100783cec5f44f8f8d9e63f09f267b20aad
Author: Dan Stillman <dstillman@zotero.org>
Date:   Tue, 27 Sep 2016 23:46:14 -0400

Tweak text in sync-user-change warning

Diffstat:
M
chrome/content/zotero/xpcom/sync/syncLocal.js
 | 
2
+-
M
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
@@ -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
@@ -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.