www

commit 82c4c90f5c271d25e06710c2f371c817b852ff7a
parent 41449871a1ca5b1ad3f7516602aedad3cd2379ac
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sat, 13 Apr 2013 03:44:09 -0400

Fix spacing in sync auto-merge dialogs

Diffstat:
M
chrome/content/zotero/xpcom/sync.js
 | 
13
++++++++-----
M
chrome/locale/en-US/zotero/zotero.properties
 | 
2
+-

2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js
@@ -3755,7 +3755,8 @@ Zotero.Sync.Server.Data = new function() {
 		else {
 			msg += Zotero.getString('sync.conflict.recentVersionsKept');
 		}
-		msg += "\n\n" + Zotero.getString('sync.conflict.viewErrorConsole', (Zotero.isStandalone ? "" : " Firefox"));
+		msg += "\n\n" + Zotero.getString('sync.conflict.viewErrorConsole',
+				(Zotero.isStandalone ? "" : "Firefox")).replace(/\s+/, " ");
 		return msg;
 	}
 	
@@ -3795,8 +3796,9 @@ Zotero.Sync.Server.Data = new function() {
 	
 	
 	function _generateCollectionItemMergeAlertMessage() {
-		var msg = Zotero.getString('sync.conflict.collectionItemMerge.alert')
-			+ Zotero.getString('sync.conflict.viewErrorConsole', (Zotero.isStandalone ? "" : "Firefox "));
+		var msg = Zotero.getString('sync.conflict.collectionItemMerge.alert') + "\n\n"
+			+ Zotero.getString('sync.conflict.viewErrorConsole',
+				(Zotero.isStandalone ? "" : "Firefox")).replace(/\s+/, " ");
 		return msg;
 	}
 	
@@ -3830,8 +3832,9 @@ Zotero.Sync.Server.Data = new function() {
 	
 	
 	function _generateTagItemMergeAlertMessage() {
-		var msg = Zotero.getString('sync.conflict.tagItemMerge.alert')
-			+ Zotero.getString('sync.conflict.viewErrorConsole', (Zotero.isStandalone ? "" : "Firefox "));
+		var msg = Zotero.getString('sync.conflict.tagItemMerge.alert') + "\n\n"
+			+ Zotero.getString('sync.conflict.viewErrorConsole',
+				(Zotero.isStandalone ? "" : "Firefox")).replace(/\s+/, " ");
 		return msg;
 	}
 	
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
@@ -783,7 +783,7 @@ sync.conflict.localVersionsKept 		= The local versions have been kept.
 sync.conflict.localVersionKept			= The local version has been kept.
 sync.conflict.recentVersionsKept 		= The most recent versions have been kept.
 sync.conflict.recentVersionKept 		= The most recent version, '%S', has been kept.
-sync.conflict.viewErrorConsole			= View the%S Error Console for the full list of such changes.
+sync.conflict.viewErrorConsole			= View the %S Error Console for the full list of such changes.
 sync.conflict.localVersion				= Local version: %S
 sync.conflict.remoteVersion				= Remote version: %S
 sync.conflict.deleted					= [deleted]