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

Remove whitespace from localized strings

Browse source 
Follow-up to #264
This commit is contained in:
Dan Stillman 2013-03-05 18:08:26 -05:00
parent 61aef48381
commit 490a176dcd
5 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/merge.js
View file

@ -274,7 +274,7 @@ var Zotero_Merge_Window = new function () {
var msg = Zotero.getString('sync.conflict.itemChanged');
}
msg += Zotero.getString('sync.conflict.chooseVersionToKeep', buttonName);
msg += " " + Zotero.getString('sync.conflict.chooseVersionToKeep', buttonName);
document.getElementById('zotero-merge-instructions').value = msg;
}

2
chrome/content/zotero/xpcom/file.js
View file

@ -491,7 +491,7 @@ Zotero.File = new function(){
// Shows up on some Windows systems
|| e.name == 'NS_ERROR_FAILURE') {
Zotero.debug(e);
str = str + Zotero.getString('file.accessError.cannotBe') + opWord + ".";
str = str + " " + Zotero.getString('file.accessError.cannotBe') + " " + opWord + ".";
var checkFileWindows = Zotero.getString('file.accessError.message.windows');
var checkFileOther = Zotero.getString('file.accessError.message.other');
var msg = str + " "

2
chrome/content/zotero/xpcom/storage/webdav.js
View file

@ -1420,7 +1420,7 @@ Zotero.Sync.Storage.WebDAV = (function () {
case Zotero.Sync.Storage.ERROR_SERVER_ERROR:
var errorTitle = Zotero.getString('sync.storage.error.webdav.serverConfig.title');
var errorMessage = Zotero.getString('sync.storage.error.webdav.serverConfig')
+ Zotero.getString('sync.storage.error.checkFileSyncSettings');
+ "\n\n" + Zotero.getString('sync.storage.error.checkFileSyncSettings');
break;
case Zotero.Sync.Storage.ERROR_UNKNOWN:

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

@ -3686,7 +3686,7 @@ Zotero.Sync.Server.Data = new function() {
var remoteDelete = true;
}
var msg = Zotero.getString('sync.conflict.autoChange.alert', itemTypes);
var msg = Zotero.getString('sync.conflict.autoChange.alert', itemTypes) + " ";
if (localDelete) {
msg += Zotero.getString('sync.conflict.remoteVersionsKept');
}
@ -3696,7 +3696,7 @@ Zotero.Sync.Server.Data = new function() {
else {
msg += Zotero.getString('sync.conflict.recentVersionsKept');
}
msg += Zotero.getString('sync.conflict.viewErrorConsole', (Zotero.isStandalone ? "" : "Firefox "));
msg += "\n\n" + Zotero.getString('sync.conflict.viewErrorConsole', (Zotero.isStandalone ? "" : " Firefox"));
return msg;
}
@ -3717,10 +3717,10 @@ Zotero.Sync.Server.Data = new function() {
var remoteDelete = true;
}
var msg = Zotero.getString('sync.conflict.autoChange.log', itemType);
var msg = Zotero.getString('sync.conflict.autoChange.log', itemType) + "\n\n";
msg += Zotero.getString('sync.conflict.localVersion', localName);
msg += Zotero.getString('sync.conflict.remoteVersion', remoteName);
msg += "\n";
msg += "\n\n";
if (localDelete) {
msg += Zotero.getString('sync.conflict.remoteVersionKept');
}
@ -3783,7 +3783,7 @@ Zotero.Sync.Server.Data = new function() {
* @param {Boolean} remoteIsTarget
*/
function _generateTagItemMergeLogMessage(tagName, addedItemIDs, remoteIsTarget) {
var introMsg = Zotero.getString('sync.conflict.tagItemMerge.log', tagName);
var introMsg = Zotero.getString('sync.conflict.tagItemMerge.log', tagName) + " ";
if (remoteIsTarget) {
introMsg += Zotero.getString('sync.conflict.tag.addedToRemote');

18
chrome/locale/en-US/zotero/zotero.properties
View file

@ -759,28 +759,28 @@ sync.localGroupsWillBeRemoved1 = Local groups, including any with changed items
sync.avoidCombiningData = To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
sync.localGroupsWillBeRemoved2 = If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
sync.conflict.autoChange.alert = One or more locally deleted Zotero %S have been modified remotely since the last sync.\u0020
sync.conflict.autoChange.log = A Zotero %S has changed both locally and remotely since the last sync:\n\n
sync.conflict.autoChange.alert = One or more locally deleted Zotero %S have been modified remotely since the last sync.
sync.conflict.autoChange.log = A Zotero %S has changed both locally and remotely since the last sync:
sync.conflict.remoteVersionsKept = The remote versions have been kept.
sync.conflict.remoteVersionKept = The remote version has been kept.
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 = \n\nView the %S Error Console for the full list of such changes.
sync.conflict.localVersion = Local version: %S\n
sync.conflict.remoteVersion = Remote version: %S\n
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]
sync.conflict.collectionItemMerge.alert = One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
sync.conflict.collectionItemMerge.log = Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
sync.conflict.tagItemMerge.alert = One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
sync.conflict.tagItemMerge.log = The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.\u0020
sync.conflict.tagItemMerge.log = The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
sync.conflict.tag.addedToRemote = It has been added to the following remote items:
sync.conflict.tag.addedToLocal = It has been added to the following local items:
sync.conflict.fileChanged = The following file has been changed in multiple locations.
sync.conflict.itemChanged = The following item has been changed in multiple locations.
sync.conflict.chooseVersionToKeep = \u0020Choose the version you would like to keep, and then click %S.
sync.conflict.chooseVersionToKeep = Choose the version you would like to keep, and then click %S.
sync.conflict.chooseThisVersion = Choose this version
sync.status.notYetSynced = Not yet synced
@ -834,7 +834,7 @@ sync.storage.error.webdav.seeCertOverrideDocumentation = See the certificate ove
sync.storage.error.webdav.loadURL = Load WebDAV URL
sync.storage.error.webdav.fileMissingAfterUpload = A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
sync.storage.error.webdav.serverConfig.title = WebDAV Server Configuration Error
sync.storage.error.webdav.serverConfig = Your WebDAV server returned an internal error.\n\n
sync.storage.error.webdav.serverConfig = Your WebDAV server returned an internal error.
sync.storage.error.zfs.restart = A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
sync.storage.error.zfs.tooManyQueuedUploads = You have too many queued uploads. Please try again in %S minutes.
@ -883,7 +883,7 @@ rtfScan.scannedFileSuffix = (Scanned)
file.accessError.theFile = The file '%S'
file.accessError.aFile = A file
file.accessError.cannotBe = \u0020cannot be\u0020
file.accessError.cannotBe = cannot be
file.accessError.created = created
file.accessError.updated = updated
file.accessError.deleted = deleted