From 097d2b54c9fc93e5b40567965503227d079099c6 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Thu, 11 Mar 2010 17:25:37 +0000 Subject: [PATCH] Rephrase conflict warning --- chrome/content/zotero/xpcom/sync.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js index 8e1883e89f..1ca4845dc4 100644 --- a/chrome/content/zotero/xpcom/sync.js +++ b/chrome/content/zotero/xpcom/sync.js @@ -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); }