mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rephrase conflict warning

Browse source
This commit is contained in:
Dan Stillman 2010-03-11 17:25:37 +00:00
parent c174f07517
commit 097d2b54c9
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
chrome/content/zotero/xpcom/sync.js
View file

@ -2768,9 +2768,10 @@ Zotero.Sync.Server.Data = new function() {
if (Zotero.Sync.Runner.background) {
Zotero.Sync.Server.manualSyncRequired = true;
var msg = Zotero.getString('sync.error.manualInterventionRequired')
+ "\n\n"
+ Zotero.getString('sync.error.clickSyncIcon');
// TODO: localize again
//Zotero.getString('sync.error.manualInterventionRequired')
//Zotero.getString('sync.error.clickSyncIcon')
var msg = "Conflicts have suspended automatic syncing.\n\nClick the sync icon to resolve them.";
var e = new Zotero.Error(msg, 0, { dialogButtonText: null });
throw (e);
}