diff --git a/chrome/content/zotero/xpcom/storage/webdav.js b/chrome/content/zotero/xpcom/storage/webdav.js index 09384f20c..447cc0647 100644 --- a/chrome/content/zotero/xpcom/storage/webdav.js +++ b/chrome/content/zotero/xpcom/storage/webdav.js @@ -581,7 +581,7 @@ Zotero.Sync.Storage.Session.WebDAV.prototype._onUploadComplete = function (httpR return; case 507: - this.onError(Zotero.getString('sync.storage.error.webDAVInsufficientSpace')); + this.onError(Zotero.getString('sync.storage.error.webdav.insufficientSpace')); return; default: @@ -1012,7 +1012,7 @@ Zotero.Sync.Storage.Session.WebDAV.prototype.checkServerCallback = function (uri return true; case Zotero.Sync.Storage.ERROR_NO_URL: - var errorMessage = Zotero.getString('sync.storage.error.enterWebDAVURL'); + var errorMessage = Zotero.getString('sync.storage.error.webdav.enterURL'); break; case Zotero.Sync.Storage.ERROR_NO_PASSWORD: @@ -1024,13 +1024,13 @@ Zotero.Sync.Storage.Session.WebDAV.prototype.checkServerCallback = function (uri break; case Zotero.Sync.Storage.ERROR_NOT_DAV: - var errorMessage = Zotero.getString('sync.storage.error.webDAVInvalidURL', spec); + var errorMessage = Zotero.getString('sync.storage.error.webdav.invalidURL', spec); break; case Zotero.Sync.Storage.ERROR_AUTH_FAILED: var errorTitle = Zotero.getString('general.permissionDenied'); var errorMessage = Zotero.localeJoin([ - Zotero.getString('sync.storage.error.webDAVInvalidLogin'), + Zotero.getString('sync.storage.error.webdav.invalidLogin'), Zotero.getString('sync.storage.error.checkFileSyncSettings') ]); break; @@ -1038,7 +1038,7 @@ Zotero.Sync.Storage.Session.WebDAV.prototype.checkServerCallback = function (uri case Zotero.Sync.Storage.ERROR_FORBIDDEN: var errorTitle = Zotero.getString('general.permissionDenied'); var errorMessage = Zotero.localeJoin([ - Zotero.getString('sync.storage.error.webDAVPermissionDenied', uri.path), + Zotero.getString('sync.storage.error.webdav.permissionDenied', uri.path), Zotero.getString('sync.storage.error.checkFileSyncSettings') ]); break; @@ -1527,8 +1527,8 @@ Zotero.Sync.Storage.Session.WebDAV.prototype._checkResponse = function (req, obj } var msg = Zotero.localeString([ - Zotero.getString('sync.storage.error.webDAVSSLCertificateError'), - Zotero.getString('sync.storage.error.webDAVLoadURLForMoreInfo') + Zotero.getString('sync.storage.error.webdav.sslCertificateError'), + Zotero.getString('sync.storage.error.webdav.loadURLForMoreInfo') ]); obj.onError(msg); @@ -1536,8 +1536,8 @@ Zotero.Sync.Storage.Session.WebDAV.prototype._checkResponse = function (req, obj } else if ((secInfo.securityState & Ci.nsIWebProgressListener.STATE_IS_BROKEN) == Ci.nsIWebProgressListener.STATE_IS_BROKEN) { var msg = Zotero.localeString([ - Zotero.getString('sync.storage.error.webDAVSSLConnectionError'), - Zotero.getString('sync.storage.error.webDAVLoadURLForMoreInfo') + Zotero.getString('sync.storage.error.webdav.sslConnectionError'), + Zotero.getString('sync.storage.error.webdav.loadURLForMoreInfo') ]); obj.onError(msg); return; diff --git a/chrome/content/zotero/xpcom/storage/zfs.js b/chrome/content/zotero/xpcom/storage/zfs.js index 4541738e7..cb3fa89b2 100644 --- a/chrome/content/zotero/xpcom/storage/zfs.js +++ b/chrome/content/zotero/xpcom/storage/zfs.js @@ -468,18 +468,14 @@ Zotero.Sync.Storage.Session.ZFS.prototype._getFileUploadParameters = function (i // Group file if (item.libraryID) { var group = Zotero.Groups.getByLibraryID(item.libraryID); - text = "The group '" + group.name + "' has reached its " - + "Zotero File Storage quota. Some files were not uploaded. " - + "Other Zotero data will continue to sync to the server.\n\n" - + "The group owner can increase the group's storage capacity " - + "from the storage settings section on zotero.org."; + text = Zotero.getString('sync.storage.error.zfs.groupQuotaReached1', group.name) + "\n\n" + Zotero.getString('sync.storage.error.zfs.groupQuotaReached2'); } // Personal file else { - text = "You have reached your Zotero File Storage quota. Some files were not uploaded. " - + "Other Zotero data will continue to sync to the server.\n\n" - + "See your zotero.org account settings for additional storage options."; - buttonText = "Open Account Settings"; + text = Zotero.getString('sync.storage.error.zfs.personalQuotaReached1') + "\n\n" + Zotero.getString('sync.storage.error.zfs.personalQuotaReached2'); + buttonText = Zotero.getString('sync.storage.openAccountSettings'); buttonCallback = function () { var url = "https://www.zotero.org/settings/storage"; diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index 922818b47..924cc9600 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -594,7 +594,7 @@ sync.error.loginManagerCorrupted1 = Zotero cannot access your login information, sync.error.loginManagerCorrupted2 = Close Firefox, back up and delete signons.* from your Firefox profile, and re-enter your Zotero login information in the Sync pane of the Zotero preferences. sync.error.syncInProgress = A sync operation is already in progress. sync.error.syncInProgress.wait = Wait for the previous sync to complete or restart Firefox. -sync.error.writeAccessLost = You no longer have write access to the Zotero group '%1$S', and files you've added or edited cannot be synced to the server. +sync.error.writeAccessLost = You no longer have write access to the Zotero group '%S', and files you've added or edited cannot be synced to the server. sync.error.groupWillBeReset = If you continue, your copy of the group will be reset to its state on the server, and local modifications to items and files will be lost. sync.error.copyChangedItems = If you would like a chance to copy your changes elsewhere or to request write access from a group administrator, cancel the sync now. sync.error.manualInterventionRequired = An automatic sync resulted in a conflict that requires manual intervention. @@ -615,29 +615,33 @@ sync.storage.none = None sync.storage.localFile = Local File sync.storage.remoteFile = Remote File sync.storage.savedFile = Saved File -sync.storage.serverConfigurationVerified = Server configuration verified -sync.storage.fileSyncSetUp = File sync is successfully set up. +sync.storage.serverConfigurationVerified = Server configuration verified +sync.storage.fileSyncSetUp = File sync is successfully set up. +sync.storage.openAccountSettings = Open Account Settings -sync.storage.error.serverCouldNotBeReached = The server %1$S could not be reached. +sync.storage.error.serverCouldNotBeReached = The server %S could not be reached. sync.storage.error.permissionDeniedAtAddress = You do not have permission to create a Zotero directory at the following address: sync.storage.error.checkFileSyncSettings = Please check your file sync settings or contact your server administrator. -sync.storage.error.verificationFailed = %1$S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences. -sync.storage.error.fileInUse = The file '%1$S' is in use and cannot be updated. Please close the file or restart your computer and try syncing again. -sync.storage.error.fileEditingAccessLost = You no longer have file editing access to the Zotero group '%1$S', and files you've added or edited cannot be synced to the server. +sync.storage.error.verificationFailed = %S verification failed. Verify your file sync settings in the Sync pane of the Zotero preferences. +sync.storage.error.fileInUse = The file '%S' is in use and cannot be updated. Please close the file or restart your computer and try syncing again. +sync.storage.error.fileEditingAccessLost = You no longer have file editing access to the Zotero group '%S', and files you've added or edited cannot be synced to the server. sync.storage.error.copyChangedItems = If you would like a chance to copy changed items and files elsewhere, cancel the sync now. sync.storage.error.fileUploadFailed = File upload failed. sync.storage.error.directoryNotFound = Directory not found -sync.storage.error.doesNotExist = %1$S does not exist. +sync.storage.error.doesNotExist = %S does not exist. sync.storage.error.createNow = Do you want to create it now? sync.storage.error.enterWebDAVURL = Please enter a WebDAV URL. -sync.storage.error.webDAVInvalidURL = %1$S is not a valid WebDAV URL. -sync.storage.error.webDAVInvalidLogin = The WebDAV server did not accept the username and password you entered. -sync.storage.error.webDAVPermissionDenied = You don't have permission to access %1$S on the WebDAV server. -sync.storage.error.webDAVInsufficientSpace = A file upload failed due to insufficient space on the WebDAV server. - -sync.storage.error.webDAVSSLCertificateError = SSL certificate error connecting to %1$S. -sync.storage.error.webDAVSSLConnectionError = SSL connection error connecting to %1$S. -sync.storage.error.webDAVLoadURLForMoreInfo = Load your WebDAV URL in the browser for more information. +sync.storage.error.webdav.invalidURL = %S is not a valid WebDAV URL. +sync.storage.error.webdav.invalidLogin = The WebDAV server did not accept the username and password you entered. +sync.storage.error.webdav.permissionDenied = You don't have permission to access %S on the WebDAV server. +sync.storage.error.webdav.insufficientSpace = A file upload failed due to insufficient space on the WebDAV server. +sync.storage.error.webdav.sslCertificateError = SSL certificate error connecting to %S. +sync.storage.error.webdav.sslConnectionError = SSL connection error connecting to %S. +sync.storage.error.webdav.loadURLForMoreInfo = Load your WebDAV URL in the browser for more information. +sync.storage.error.zfs.personalQuotaReached1 = You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server. +sync.storage.error.zfs.personalQuotaReached2 = See your zotero.org account settings for additional storage options. +sync.storage.error.zfs.groupQuotaReached1 = The group '%S' has reached its Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server. +sync.storage.error.zfs.groupQuotaReached2 = The group owner can increase the group's storage capacity from the storage settings section on zotero.org. sync.longTagFixer.saveTag = Save Tag sync.longTagFixer.saveTags = Save Tags