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

Fix spacing in sync auto-merge dialogs

Browse Source
This commit is contained in:
Dan Stillman 2013-04-13 03:44:09 -04:00
parent 41449871a1
commit 82c4c90f5c
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
chrome/content/zotero/xpcom/sync.js
View File

@ -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;
}

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

@ -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]