suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak text in sync-user-change warning

Browse Source
This commit is contained in:
Dan Stillman 2016-09-27 23:46:14 -04:00
parent 6e74110078
commit b2152f811a
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrome/content/zotero/xpcom/sync/syncLocal.js
View File

@ -123,7 +123,7 @@ Zotero.Sync.Data.Local = {
var io = { var io = {
title: Zotero.getString('general.warning'), title: Zotero.getString('general.warning'),
text: [Zotero.getString('account.lastSyncWithDifferentAccount', [ZOTERO_CONFIG.CLIENT_NAME, lastUsername, username])], 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') acceptLabel: Zotero.getString('account.confirmDelete.button')
}; };
win.openDialog("chrome://zotero/content/hardConfirmationDialog.xul", "", win.openDialog("chrome://zotero/content/hardConfirmationDialog.xul", "",

2
chrome/locale/en-US/zotero/zotero.properties
View File

@ -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.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.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.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 account.confirmDelete.button = Switch Accounts
sync.conflict.autoChange.alert = One or more locally deleted Zotero %S have been modified remotely since the last sync. sync.conflict.autoChange.alert = One or more locally deleted Zotero %S have been modified remotely since the last sync.