diff --git a/chrome/content/zotero/preferences/preferences.js b/chrome/content/zotero/preferences/preferences.js index 6a29148cc3..9e99829043 100644 --- a/chrome/content/zotero/preferences/preferences.js +++ b/chrome/content/zotero/preferences/preferences.js @@ -109,12 +109,12 @@ function onDataDirUpdate(event) { var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] .getService(Components.interfaces.nsIPromptService); - var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING) + (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_CANCEL); + var app = Zotero.isStandalone ? Zotero.getString('app.standalone') : Zotero.getString('app.firefox'); var index = ps.confirmEx(window, Zotero.getString('general.restartRequired'), - Zotero.getString('general.restartRequiredForChange'), + Zotero.getString('general.restartRequiredForChange', app), buttonFlags, Zotero.getString('general.restartNow'), null, null, null, {}); diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js index 6a7491ba1d..135dea9258 100644 --- a/chrome/content/zotero/xpcom/db.js +++ b/chrome/content/zotero/xpcom/db.js @@ -799,7 +799,7 @@ Zotero.DBConnection.prototype.backupDatabase = function (suffix) { var corruptMarker = Zotero.getZoteroDatabase(this._dbName, 'is.corrupt').exists(); - if (this.skipBackup) { + if (this.skipBackup || Zotero.skipLoading) { this._debug("Skipping backup of database '" + this._dbName + "'", 1); return false; } diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js index b1634d538e..9d05b3649b 100644 --- a/chrome/content/zotero/xpcom/schema.js +++ b/chrome/content/zotero/xpcom/schema.js @@ -24,11 +24,6 @@ */ Zotero.Schema = new function(){ - this.userDataUpgradeRequired = userDataUpgradeRequired; - this.showUpgradeWizard = showUpgradeWizard; - this.updateSchema = updateSchema; - this.stopRepositoryTimer = stopRepositoryTimer; - this.skipDefaultData = false; this.dbInitialized = false; this.goToChangeLog = false; @@ -40,16 +35,34 @@ Zotero.Schema = new function(){ var self = this; - function userDataUpgradeRequired() { - var dbVersion = _getDBVersion('userdata'); + /* + * Retrieve the DB schema version + */ + this.getDBVersion = function (schema) { + if (_dbVersions[schema]){ + return _dbVersions[schema]; + } + + if (Zotero.DB.tableExists('version')){ + var dbVersion = Zotero.DB.valueQuery("SELECT version FROM " + + "version WHERE schema='" + schema + "'"); + _dbVersions[schema] = dbVersion; + return dbVersion; + } + return false; + } + + + this.userDataUpgradeRequired = function () { + var dbVersion = this.getDBVersion('userdata'); var schemaVersion = _getSchemaSQLVersion('userdata'); return dbVersion && (dbVersion < schemaVersion); } - function showUpgradeWizard() { - var dbVersion = _getDBVersion('userdata'); + this.showUpgradeWizard = function () { + var dbVersion = this.getDBVersion('userdata'); var schemaVersion = _getSchemaSQLVersion('userdata'); // Upgrading from 1.0 or earlier @@ -99,12 +112,12 @@ Zotero.Schema = new function(){ /* * Checks if the DB schema exists and is up-to-date, updating if necessary */ - function updateSchema(){ - var dbVersion = _getDBVersion('userdata'); + this.updateSchema = function () { + var dbVersion = this.getDBVersion('userdata'); // 'schema' check is for old (<= 1.0b1) schema system, // 'user' is for pre-1.0b2 'user' table - if (!dbVersion && !_getDBVersion('schema') && !_getDBVersion('user')){ + if (!dbVersion && !this.getDBVersion('schema') && !this.getDBVersion('user')){ Zotero.debug('Database does not exist -- creating\n'); _initializeSchema(); return true; @@ -128,7 +141,7 @@ Zotero.Schema = new function(){ // Old schema system if (!dbVersion){ // Check for pre-1.0b2 'user' table - var user = _getDBVersion('user'); + var user = this.getDBVersion('user'); if (user) { dbVersion = user; @@ -834,7 +847,7 @@ Zotero.Schema = new function(){ // Little hack to manually update CSLs from repo on upgrades if (!force && Zotero.Prefs.get('automaticScraperUpdates')) { var syncTargetVersion = 3; // increment this when releasing new version that requires it - var syncVersion = _getDBVersion('sync'); + var syncVersion = this.getDBVersion('sync'); if (syncVersion < syncTargetVersion) { force = true; var forceCSLUpdate = true; @@ -855,7 +868,7 @@ Zotero.Schema = new function(){ // Determine the earliest local time that we'd query the repository again var nextCheck = new Date(); - nextCheck.setTime((parseInt(_getDBVersion('lastcheck')) + nextCheck.setTime((parseInt(this.getDBVersion('lastcheck')) + ZOTERO_CONFIG['REPOSITORY_CHECK_INTERVAL']) * 1000); // JS uses ms var now = new Date(); @@ -882,7 +895,7 @@ Zotero.Schema = new function(){ } // Get the last timestamp we got from the server - var lastUpdated = _getDBVersion('repository'); + var lastUpdated = this.getDBVersion('repository'); var url = ZOTERO_CONFIG['REPOSITORY_URL'] + '/updated?' + (lastUpdated ? 'last=' + lastUpdated + '&' : '') @@ -921,7 +934,7 @@ Zotero.Schema = new function(){ } - function stopRepositoryTimer(){ + this.stopRepositoryTimer = function () { if (_repositoryTimer){ Zotero.debug('Stopping repository check timer'); _repositoryTimer.cancel(); @@ -963,24 +976,6 @@ Zotero.Schema = new function(){ // ///////////////////////////////////////////////////////////////// - /* - * Retrieve the DB schema version - */ - function _getDBVersion(schema){ - if (_dbVersions[schema]){ - return _dbVersions[schema]; - } - - if (Zotero.DB.tableExists('version')){ - var dbVersion = Zotero.DB.valueQuery("SELECT version FROM " - + "version WHERE schema='" + schema + "'"); - _dbVersions[schema] = dbVersion; - return dbVersion; - } - return false; - } - - /* * Retrieve the version from the top line of the schema SQL file */ @@ -1187,7 +1182,7 @@ Zotero.Schema = new function(){ function _updateSchema(schema){ - var dbVersion = _getDBVersion(schema); + var dbVersion = Zotero.Schema.getDBVersion(schema); var schemaVersion = _getSchemaSQLVersion(schema); if (dbVersion == schemaVersion){ diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js index 370a700bc2..e9b7973d68 100644 --- a/chrome/content/zotero/xpcom/zotero.js +++ b/chrome/content/zotero/xpcom/zotero.js @@ -370,7 +370,7 @@ var Zotero = new function(){ } // Locate new data directory else if (index == 2) { - Zotero.chooseZoteroDirectory(); + Zotero.chooseZoteroDirectory(true); } var dataDir = this.getZoteroDirectory(); } @@ -456,7 +456,6 @@ var Zotero = new function(){ Components.utils.reportError(e); this.skipLoading = true; - Zotero.DB.skipBackup = true; return; } @@ -467,16 +466,67 @@ var Zotero = new function(){ Zotero.Fulltext.init(); + // Require >=2.1b3 database to ensure proper locking + if (this.isStandalone && Zotero.Schema.getDBVersion('system') > 0 && Zotero.Schema.getDBVersion('system') < 31) { + var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"] + .getService(Components.interfaces.nsIAppStartup); + + var zs = Zotero.getString('app.standalone'); + var zf = Zotero.getString('app.firefox'); + // TODO: localize + var msg = zs + " can share a data directory only with " + + zf + " 2.1b3 or later. Upgrade to the latest " + + "version of " + zf + " or select a different data " + + "directory for use with " + zs + "."; + + var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"] + .createInstance(Components.interfaces.nsIPromptService); + var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_IS_STRING) + + (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_IS_STRING) + + ps.BUTTON_POS_1_DEFAULT; + var index = ps.confirmEx( + null, + // TODO: localize + "Incompatible Database Version", + msg, + buttonFlags, + Zotero.getString('dataDir.standaloneMigration.selectCustom'), + "Quit " + zs, + null, + null, + {} + ); + + var quit = false; + + // Select new data directory + if (index == 0) { + var dir = Zotero.chooseZoteroDirectory(true); + if (!dir) { + quit = true; + } + } + else { + quit = true; + } + + if (quit) { + appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit); + } + + this.skipLoading = true; + return false; + } + // Trigger updating of schema and scrapers if (Zotero.Schema.userDataUpgradeRequired()) { var upgraded = Zotero.Schema.showUpgradeWizard(); if (!upgraded) { this.skipLoading = true; - Zotero.DB.skipBackup = true; return false; } } - // If no userdata upgrade, still might need to process system/scrapers + // If no userdata upgrade, still might need to process system else { try { var updated = Zotero.Schema.updateSchema(); @@ -495,6 +545,7 @@ var Zotero = new function(){ else { this.startupError = Zotero.getString('startupError.databaseUpgradeError'); } + this.skipLoading = true; Components.utils.reportError(e); return false; } @@ -797,7 +848,7 @@ var Zotero = new function(){ // Warn if non-empty and no zotero.sqlite if (!dbfile.exists()) { var buttonFlags = ps.STD_YES_NO_BUTTONS; - var index = ps.confirmEx(win, + var index = ps.confirmEx(null, Zotero.getString('dataDir.selectedDirNonEmpty.title'), Zotero.getString('dataDir.selectedDirNonEmpty.text'), buttonFlags, null, null, null, null, {}); @@ -810,7 +861,7 @@ var Zotero = new function(){ } else { var buttonFlags = ps.STD_YES_NO_BUTTONS; - var index = ps.confirmEx(win, + var index = ps.confirmEx(null, //Zotero.getString('dataDir.selectedDirEmpty.title'), //Zotero.getString('dataDir.selectedDirEmpty.text'), 'Directory Empty', @@ -844,9 +895,10 @@ var Zotero = new function(){ if (!forceRestartNow) { buttonFlags += (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_IS_STRING); } - var index = ps.confirmEx(win, + var app = Zotero.isStandalone ? Zotero.getString('app.standalone') : Zotero.getString('app.firefox'); + var index = ps.confirmEx(null, Zotero.getString('general.restartRequired'), - Zotero.getString('general.restartRequiredForChange'), + Zotero.getString('general.restartRequiredForChange', app), buttonFlags, Zotero.getString('general.restartNow'), forceRestartNow ? null : Zotero.getString('general.restartLater'), diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties index db42c894e2..e2593c5172 100644 --- a/chrome/locale/af-ZA/zotero/zotero.properties +++ b/chrome/locale/af-ZA/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Don't show this warning again. general.browserIsOffline=%S is currently in offline mode. general.locate=Locate... general.restartRequired=Restart Required -general.restartRequiredForChange=Firefox must be restarted for the change to take effect. -general.restartRequiredForChanges=Firefox must be restarted for the changes to take effect. +general.restartRequiredForChange=%S must be restarted for the change to take effect. +general.restartRequiredForChanges=%S must be restarted for the changes to take effect. general.restartNow=Restart now general.restartLater=Restart later general.errorHasOccurred=An error has occurred. diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties index dec9b3052d..5d27c8dd32 100644 --- a/chrome/locale/bg-BG/zotero/zotero.properties +++ b/chrome/locale/bg-BG/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Не показвай това предупрежд general.browserIsOffline=%S в момента е в офлайн режим. general.locate=Намира... general.restartRequired=Необходимо е рестартиране -general.restartRequiredForChange=Firefox трябва да бъде рестартирана за да бъдат отразени промяната. -general.restartRequiredForChanges=Firefox трябва да бъде рестартирана за да бъдат отразени промените. +general.restartRequiredForChange=%S трябва да бъде рестартирана за да бъдат отразени промяната. +general.restartRequiredForChanges=%S трябва да бъде рестартирана за да бъдат отразени промените. general.restartNow=Рестартира веднага general.restartLater=Отлага рестартирането general.errorHasOccurred=Възникна грешка. diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties index 2adc914b74..71ed3abc6d 100644 --- a/chrome/locale/ca-AD/zotero/zotero.properties +++ b/chrome/locale/ca-AD/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=No mostris més aquesta advertència. general.browserIsOffline=%S es troba actualment treballant fora de línia general.locate=Localitza... general.restartRequired=Es requereix reiniciar -general.restartRequiredForChange=S'ha de reiniciar el Firefox per tal que el canvi faci efecte -general.restartRequiredForChanges=S'ha de reiniciar el Firefox per tal que els canvis facin efecte +general.restartRequiredForChange=S'ha de reiniciar el %S per tal que el canvi faci efecte +general.restartRequiredForChanges=S'ha de reiniciar el %S per tal que els canvis facin efecte general.restartNow=Reinicia ara general.restartLater=Reinicia més tard general.errorHasOccurred=S'ha produït un error diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties index 76e154922f..d2f1b0e0cf 100644 --- a/chrome/locale/cs-CZ/zotero/zotero.properties +++ b/chrome/locale/cs-CZ/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Toto upozornění již nezobrazovat. general.browserIsOffline=%S je momentálně v režimu offline. general.locate=Najít... general.restartRequired=Je vyžadován restart -general.restartRequiredForChange=Aby se změna projevila, musí být restartován Firefox. -general.restartRequiredForChanges=Aby se změny projevily, musí být restartován Firefox. +general.restartRequiredForChange=Aby se změna projevila, musí být restartován %S. +general.restartRequiredForChanges=Aby se změny projevily, musí být restartován %S. general.restartNow=Restartovat ihned general.restartLater=Restartovat později general.errorHasOccurred=Vyskytla se chyba. diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties index a3541f8627..570859b123 100644 --- a/chrome/locale/da-DK/zotero/zotero.properties +++ b/chrome/locale/da-DK/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Vis ikke denne advarsel igen general.browserIsOffline=%S arbejder pt. i offline mode. general.locate=Lokaliser... general.restartRequired=Genstart påkrævet... -general.restartRequiredForChange=Firefox skal genstartes før ændringerne -general.restartRequiredForChanges=Firefox must be restarted for the changes to take effect. +general.restartRequiredForChange=%S skal genstartes før ændringerne +general.restartRequiredForChanges=%S must be restarted for the changes to take effect. general.restartNow=Restart now general.restartLater=Restart later general.errorHasOccurred=An error has occurred. diff --git a/chrome/locale/de-DE/zotero/zotero.properties b/chrome/locale/de-DE/zotero/zotero.properties index dadfaea950..a04dd9afda 100644 --- a/chrome/locale/de-DE/zotero/zotero.properties +++ b/chrome/locale/de-DE/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Diese Warnung nicht noch einmal anzeigen. general.browserIsOffline=%S is momentan im Offline-Modus. general.locate=Lokalisieren... general.restartRequired=Neustart erforderlich -general.restartRequiredForChange=Firefox muss neu gestartet werden, damit die Änderung wirksam wird. -general.restartRequiredForChanges=Firefox muss neu gestartet werden, damit die Änderungen wirksam werden. +general.restartRequiredForChange=%S muss neu gestartet werden, damit die Änderung wirksam wird. +general.restartRequiredForChanges=%S muss neu gestartet werden, damit die Änderungen wirksam werden. general.restartNow=Jetzt neustarten general.restartLater=Später neustarten general.errorHasOccurred=Ein Fehler ist aufgetreten. diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties index db42c894e2..e2593c5172 100644 --- a/chrome/locale/el-GR/zotero/zotero.properties +++ b/chrome/locale/el-GR/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Don't show this warning again. general.browserIsOffline=%S is currently in offline mode. general.locate=Locate... general.restartRequired=Restart Required -general.restartRequiredForChange=Firefox must be restarted for the change to take effect. -general.restartRequiredForChanges=Firefox must be restarted for the changes to take effect. +general.restartRequiredForChange=%S must be restarted for the change to take effect. +general.restartRequiredForChanges=%S must be restarted for the changes to take effect. general.restartNow=Restart now general.restartLater=Restart later general.errorHasOccurred=An error has occurred. diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties index d77d28eed5..643d2c0111 100644 --- a/chrome/locale/en-US/zotero/zotero.properties +++ b/chrome/locale/en-US/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain = Don't show this warning again. general.browserIsOffline = %S is currently in offline mode. general.locate = Locate... general.restartRequired = Restart Required -general.restartRequiredForChange = Firefox must be restarted for the change to take effect. -general.restartRequiredForChanges = Firefox must be restarted for the changes to take effect. +general.restartRequiredForChange = %S must be restarted for the change to take effect. +general.restartRequiredForChanges = %S must be restarted for the changes to take effect. general.restartNow = Restart now general.restartLater = Restart later general.errorHasOccurred = An error has occurred. diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties index b41e421640..d038658b22 100644 --- a/chrome/locale/es-ES/zotero/zotero.properties +++ b/chrome/locale/es-ES/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=No mostrar más este aviso. general.browserIsOffline=%S está en modo desconectado [offline]. general.locate=Encontrar... general.restartRequired=Hace falta reiniciar -general.restartRequiredForChange=Firefox debe reiniciarse para que se realice el cambio. -general.restartRequiredForChanges=Firefox debe reiniciarse para que se realicen los cambios. +general.restartRequiredForChange=%S debe reiniciarse para que se realice el cambio. +general.restartRequiredForChanges=%S debe reiniciarse para que se realicen los cambios. general.restartNow=Reiniciar ahora general.restartLater=Reiniciar más tarde general.errorHasOccurred=Ha ocurrido un error. diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties index 8477e6a830..c17e0b1298 100644 --- a/chrome/locale/et-EE/zotero/zotero.properties +++ b/chrome/locale/et-EE/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Seda hoiatust enam mitte näidata. general.browserIsOffline=%S on preagu ilma võrguühenduseta. general.locate=Leida... general.restartRequired=Vajalik alglaadimine -general.restartRequiredForChange=Et muudatus rakenduks on vajalik Firefoxi alglaadimine. -general.restartRequiredForChanges=Et muudatused rakendusksid on vajalik Firefoxi alglaadimine. +general.restartRequiredForChange=Et muudatus rakenduks on vajalik %Si alglaadimine. +general.restartRequiredForChanges=Et muudatused rakendusksid on vajalik %Si alglaadimine. general.restartNow=Alglaadida nüüd general.restartLater=Alglaadida hiljem general.errorHasOccurred=Tekkis viga. diff --git a/chrome/locale/eu-ES/zotero/zotero.properties b/chrome/locale/eu-ES/zotero/zotero.properties index d0a81acb10..6c4701f045 100644 --- a/chrome/locale/eu-ES/zotero/zotero.properties +++ b/chrome/locale/eu-ES/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Ez irakutsi hau berriro general.browserIsOffline=%S lineaz kanpo dago orain. general.locate=Aurkitu... general.restartRequired=Berrabiarazi egin behar da -general.restartRequiredForChange=Firefox berrabiarazi behar da aldaketak gorde daitezen. -general.restartRequiredForChanges=Firefox berrabiarazi behar da aldaketak gorde daitezen. +general.restartRequiredForChange=%S berrabiarazi behar da aldaketak gorde daitezen. +general.restartRequiredForChanges=%S berrabiarazi behar da aldaketak gorde daitezen. general.restartNow=Berrabiarazi orain general.restartLater=Berrabiarazi gero general.errorHasOccurred=Errore bat gertatu da. diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties index 73993b6654..27706ef2b7 100644 --- a/chrome/locale/fi-FI/zotero/zotero.properties +++ b/chrome/locale/fi-FI/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Älä näytä tätä varoitusta uudelleen. general.browserIsOffline=%S on yhteydettömässä tilassa. general.locate=Paikallista... general.restartRequired=Uudelleenkäynnistys tarvitaan -general.restartRequiredForChange=Muutos vaikuttaa vasta Firefoxin uudelleenkäynnistyksen jälkeen. -general.restartRequiredForChanges=Muutokset vaikuttavat vasta Firefoxin uudelleenkäynnistyksen jälkeen. +general.restartRequiredForChange=Muutos vaikuttaa vasta %Sin uudelleenkäynnistyksen jälkeen. +general.restartRequiredForChanges=Muutokset vaikuttavat vasta %Sin uudelleenkäynnistyksen jälkeen. general.restartNow=Käynnistä uudelleen nyt general.restartLater=Käynnistä uudelleen myöhemmin general.errorHasOccurred=On tapahtunut virhe diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties index ec09827138..3ac8b9f0b3 100644 --- a/chrome/locale/fr-FR/zotero/zotero.properties +++ b/chrome/locale/fr-FR/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Ne plus montrer cet avertissement à nouveau. general.browserIsOffline=%S est actuellement en mode hors connexion. general.locate=Localisation en cours… general.restartRequired=Redémarrage nécessaire -general.restartRequiredForChange=Firefox doit être redémarré pour que la modification soit prise en compte. -general.restartRequiredForChanges=Firefox doit être redémarré pour que les modifications soient prises en compte. +general.restartRequiredForChange=%S doit être redémarré pour que la modification soit prise en compte. +general.restartRequiredForChanges=%S doit être redémarré pour que les modifications soient prises en compte. general.restartNow=Redémarrer maintenant general.restartLater=Redémarrer plus tard general.errorHasOccurred=Une erreur est survenue. diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties index c3b8b0c52d..0a2fe46334 100644 --- a/chrome/locale/gl-ES/zotero/zotero.properties +++ b/chrome/locale/gl-ES/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Non mostrar esta advertencia de novo general.browserIsOffline=%S atópase actualmente en modo fóra de liña. general.locate=Localizar ... general.restartRequired=Debe reiniciar -general.restartRequiredForChange=Debe reiniciar Firefox para que o cambio teña efecto. -general.restartRequiredForChanges=Debe reiniciar Firefox para que os cambios teña efecto. +general.restartRequiredForChange=Debe reiniciar %S para que o cambio teña efecto. +general.restartRequiredForChanges=Debe reiniciar %S para que os cambios teña efecto. general.restartNow=Produciuse un erro. general.restartLater=Reiniciar máis tarde general.errorHasOccurred=Produciuse un erro. diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties index e1745b87bf..98a4f7d2c5 100644 --- a/chrome/locale/he-IL/zotero/zotero.properties +++ b/chrome/locale/he-IL/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=.אל תציג אזהרה זו שנית general.browserIsOffline=%S is currently in offline mode. general.locate=אתר... general.restartRequired=Restart Required -general.restartRequiredForChange=Firefox must be restarted for the change to take effect. -general.restartRequiredForChanges=Firefox must be restarted for the changes to take effect. +general.restartRequiredForChange=%S must be restarted for the change to take effect. +general.restartRequiredForChanges=%S must be restarted for the changes to take effect. general.restartNow=הפעל מחדש כעת general.restartLater=Restart later general.errorHasOccurred=ארעה שגיאה diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties index db42c894e2..e2593c5172 100644 --- a/chrome/locale/hr-HR/zotero/zotero.properties +++ b/chrome/locale/hr-HR/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Don't show this warning again. general.browserIsOffline=%S is currently in offline mode. general.locate=Locate... general.restartRequired=Restart Required -general.restartRequiredForChange=Firefox must be restarted for the change to take effect. -general.restartRequiredForChanges=Firefox must be restarted for the changes to take effect. +general.restartRequiredForChange=%S must be restarted for the change to take effect. +general.restartRequiredForChanges=%S must be restarted for the changes to take effect. general.restartNow=Restart now general.restartLater=Restart later general.errorHasOccurred=An error has occurred. diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties index bee377604d..a2b3710569 100644 --- a/chrome/locale/hu-HU/zotero/zotero.properties +++ b/chrome/locale/hu-HU/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Ne mutassa többet ezt a figyelmeztetést. general.browserIsOffline=%S jelenleg kapcsolat nélküli módban van. general.locate=Tallózás... general.restartRequired=A böngésző újraindítása szükséges -general.restartRequiredForChange=A módosítás érvénybe lépéséhez újra kell indítani a Firefoxt. -general.restartRequiredForChanges=A módosítások érvénybe lépéséhez újra kell indítani a Firefoxt. +general.restartRequiredForChange=A módosítás érvénybe lépéséhez újra kell indítani a %St. +general.restartRequiredForChanges=A módosítások érvénybe lépéséhez újra kell indítani a %St. general.restartNow=Újraindítás most general.restartLater=Újraindítás később general.errorHasOccurred=Hiba lépett fel. diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties index 6a72c8c022..0a8f37d584 100644 --- a/chrome/locale/is-IS/zotero/zotero.properties +++ b/chrome/locale/is-IS/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Don't show this warning again. general.browserIsOffline=%S is currently in offline mode. general.locate=Locate... general.restartRequired=Restart Required -general.restartRequiredForChange=Firefox must be restarted for the change to take effect. -general.restartRequiredForChanges=Firefox must be restarted for the changes to take effect. +general.restartRequiredForChange=%S must be restarted for the change to take effect. +general.restartRequiredForChanges=%S must be restarted for the changes to take effect. general.restartNow=Restart now general.restartLater=Restart later general.errorHasOccurred=An error has occurred. diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties index b2408f1218..1c52f779be 100644 --- a/chrome/locale/it-IT/zotero/zotero.properties +++ b/chrome/locale/it-IT/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Non visualizzare questo avviso in futuro general.browserIsOffline=%S è in modalità non in linea general.locate=Trova... general.restartRequired=Richiede il riavvio -general.restartRequiredForChange=Riavviare Firefox per rendere effettive le modifiche. -general.restartRequiredForChanges=Riavviare Firefox per rendere effettive le modifiche. +general.restartRequiredForChange=Riavviare %S per rendere effettive le modifiche. +general.restartRequiredForChanges=Riavviare %S per rendere effettive le modifiche. general.restartNow=Riavvia ora general.restartLater=Riavvia in seguito general.errorHasOccurred=Si è verificato un errore. diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties index 683645572f..dbf020372e 100644 --- a/chrome/locale/ja-JP/zotero/zotero.properties +++ b/chrome/locale/ja-JP/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=次回からこの警告を表示しない。 general.browserIsOffline=%Sは現在オフラインモードに入っています。 general.locate=所在確認... general.restartRequired=再起動してください。 -general.restartRequiredForChange=変更を適用するためにFirefoxを再起動してください。 -general.restartRequiredForChanges=変更を適用するためにFirefoxを再起動してください。 +general.restartRequiredForChange=変更を適用するために%Sを再起動してください。 +general.restartRequiredForChanges=変更を適用するために%Sを再起動してください。 general.restartNow=今すぐ再起動する general.restartLater=後で再起動する general.errorHasOccurred=エラーが発生しました。 diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties index f3b2a4d1f0..6c8d55d1c6 100644 --- a/chrome/locale/ko-KR/zotero/zotero.properties +++ b/chrome/locale/ko-KR/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=이 경고를 다시 보지 않음. general.browserIsOffline=%S 는(은) 현재 오프라인 상태입니다. general.locate=위치... general.restartRequired=재시작 요청 -general.restartRequiredForChange=변경된 내용을 적용하려면 Firefox을 재시작해야만 합니다. -general.restartRequiredForChanges=변경된 내용을 적용하려면 Firefox을 재시작해야만 합니다. +general.restartRequiredForChange=변경된 내용을 적용하려면 %S을 재시작해야만 합니다. +general.restartRequiredForChanges=변경된 내용을 적용하려면 %S을 재시작해야만 합니다. general.restartNow=지금 재시작 general.restartLater=다음에 재시작 general.errorHasOccurred=오류가 발생했습니다. diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties index 00db5e9d4b..7ff111fc5c 100644 --- a/chrome/locale/mn-MN/zotero/zotero.properties +++ b/chrome/locale/mn-MN/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Don't show this warning again. general.browserIsOffline=%S is currently in offline mode. general.locate=Locate... general.restartRequired=Restart Required -general.restartRequiredForChange=Firefox must be restarted for the change to take effect. -general.restartRequiredForChanges=Firefox must be restarted for the changes to take effect. +general.restartRequiredForChange=%S must be restarted for the change to take effect. +general.restartRequiredForChanges=%S must be restarted for the changes to take effect. general.restartNow=Одоо ачаалах general.restartLater=Дараа ачаалах general.errorHasOccurred=An error has occurred. diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties index cc5275a67d..54537759dd 100644 --- a/chrome/locale/nb-NO/zotero/zotero.properties +++ b/chrome/locale/nb-NO/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Ikke vis denne advarselen igjen. general.browserIsOffline=%S er for øyeblikket i frakoblet modus. general.locate=Lokaliser... general.restartRequired=Omstart er nødvendig -general.restartRequiredForChange=Firefox må startes om igjen før endringen trer i kraft. -general.restartRequiredForChanges=Firefox må startes om igjen før endringene trer i kraft. +general.restartRequiredForChange=%S må startes om igjen før endringen trer i kraft. +general.restartRequiredForChanges=%S må startes om igjen før endringene trer i kraft. general.restartNow=Start på nytt nå general.restartLater=Start på nytt senere general.errorHasOccurred=En feil oppstod. diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties index eb6ada7d65..278dfb6fb3 100644 --- a/chrome/locale/nl-NL/zotero/zotero.properties +++ b/chrome/locale/nl-NL/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Deze waarschuwing niet meer tonen. general.browserIsOffline=%S is momenteel in offline-modus. general.locate=Opzoeken... general.restartRequired=Herstart is nodig -general.restartRequiredForChange=Firefox moet herstart worden om de verandering uit te voeren. -general.restartRequiredForChanges=Firefox moet herstart worden om de veranderingen uit te voeren. +general.restartRequiredForChange=%S moet herstart worden om de verandering uit te voeren. +general.restartRequiredForChanges=%S moet herstart worden om de veranderingen uit te voeren. general.restartNow=Nu herstarten general.restartLater=Later herstarten general.errorHasOccurred=Er is een fout opgetreden. diff --git a/chrome/locale/nn-NO/zotero/zotero.properties b/chrome/locale/nn-NO/zotero/zotero.properties index 17e231fc4b..90f3939846 100644 --- a/chrome/locale/nn-NO/zotero/zotero.properties +++ b/chrome/locale/nn-NO/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Ikkje vis denne advarselen igjen. general.browserIsOffline=%S er for augneblunken i frakobla modus. general.locate=Lokaliser... general.restartRequired=Omstart er naudsynt -general.restartRequiredForChange=Firefox må startast om att før endringa trer i kraft. -general.restartRequiredForChanges=Firefox må startast om att starta før endringane trer i kraft. +general.restartRequiredForChange=%S må startast om att før endringa trer i kraft. +general.restartRequiredForChanges=%S må startast om att starta før endringane trer i kraft. general.restartNow=Start om no general.restartLater=Start om seinare general.errorHasOccurred=Ein feil oppstod. diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties index c409a55647..3c64719ff9 100644 --- a/chrome/locale/pl-PL/zotero/zotero.properties +++ b/chrome/locale/pl-PL/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Nie pokazuj tego ostrzeżenia ponownie. general.browserIsOffline=%S jest aktualnie w trybie offline. general.locate=Lokalizuj general.restartRequired=Wymagane jest ponowne uruchomienie -general.restartRequiredForChange=Aby zastosować zmianę Firefox musi zostać ponownie uruchomiony. -general.restartRequiredForChanges=Aby zastosować zmiany Firefox musi zostać ponownie uruchomiony. +general.restartRequiredForChange=Aby zastosować zmianę %S musi zostać ponownie uruchomiony. +general.restartRequiredForChanges=Aby zastosować zmiany %S musi zostać ponownie uruchomiony. general.restartNow=Uruchom ponownie general.restartLater=Uruchom ponownie później general.errorHasOccurred=Wystąpił błąd. diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties index 7f1b97e512..5d964903bb 100644 --- a/chrome/locale/pt-BR/zotero/zotero.properties +++ b/chrome/locale/pt-BR/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Não exibir este aviso novamente. general.browserIsOffline=%S está atualmente em modo offline. general.locate=Localizar... general.restartRequired=Reiniciação necessária -general.restartRequiredForChange=O Firefox precisa ser reiniciado para que a mudança tenha efeito. -general.restartRequiredForChanges=O Firefox precisa ser reiniciado para que as mudanças tenham efeito. +general.restartRequiredForChange=O %S precisa ser reiniciado para que a mudança tenha efeito. +general.restartRequiredForChanges=O %S precisa ser reiniciado para que as mudanças tenham efeito. general.restartNow=Reiniciar agora general.restartLater=Reiniciar mais tarde general.errorHasOccurred=Um erro ocorreu. diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties index 2155f607e8..1f1e3bfcc0 100644 --- a/chrome/locale/pt-PT/zotero/zotero.properties +++ b/chrome/locale/pt-PT/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Não voltar a mostrar este aviso. general.browserIsOffline=%S está no modo desligado. general.locate=Localizar... general.restartRequired=Reinício Necessário -general.restartRequiredForChange=O Firefox tem de ser reiniciado para que a alteração tenha efeito. -general.restartRequiredForChanges=O Firefox tem de ser reiniciado para que as alterações tenham efeito. +general.restartRequiredForChange=O %S tem de ser reiniciado para que a alteração tenha efeito. +general.restartRequiredForChanges=O %S tem de ser reiniciado para que as alterações tenham efeito. general.restartNow=Reiniciar agora general.restartLater=Reiniciar mais tarde general.errorHasOccurred=Ocorreu um erro. diff --git a/chrome/locale/ro-RO/zotero/zotero.properties b/chrome/locale/ro-RO/zotero/zotero.properties index 0e104ab778..15f88a6b76 100644 --- a/chrome/locale/ro-RO/zotero/zotero.properties +++ b/chrome/locale/ro-RO/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Nu afișa din nou acest avertisment general.browserIsOffline=%S este în mod curent deconectat. general.locate=Localizează... general.restartRequired=E nevoie de repornire -general.restartRequiredForChange=Firefox trebuie repornit pentru ca schimbarea să aibă efect. -general.restartRequiredForChanges=Firefox trebuie repornit pentru ca schimbările să aibă efect +general.restartRequiredForChange=%S trebuie repornit pentru ca schimbarea să aibă efect. +general.restartRequiredForChanges=%S trebuie repornit pentru ca schimbările să aibă efect general.restartNow=Repornește acum general.restartLater=Repornește mai târziu general.errorHasOccurred=A intervenit o eroare. diff --git a/chrome/locale/sk-SK/zotero/zotero.properties b/chrome/locale/sk-SK/zotero/zotero.properties index b1707b740e..5b1ef26631 100644 --- a/chrome/locale/sk-SK/zotero/zotero.properties +++ b/chrome/locale/sk-SK/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Toto upozornenie už viackrát nezobrazovať. general.browserIsOffline=%S je momentálne v režime offline. general.locate=Nájsť... general.restartRequired=Požaduje sa reštart -general.restartRequiredForChange=Aby sa zmena prejavili, je potrebné reštartovať Firefox. -general.restartRequiredForChanges=Aby sa zmeny prejavili, je potrebné reštartovať Firefox. +general.restartRequiredForChange=Aby sa zmena prejavili, je potrebné reštartovať %S. +general.restartRequiredForChanges=Aby sa zmeny prejavili, je potrebné reštartovať %S. general.restartNow=Reštartovať teraz general.restartLater=Reštartovať neskôr general.errorHasOccurred=Vyskytla sa chyba. diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties index 0fc12c2b21..8b0882581f 100644 --- a/chrome/locale/sl-SI/zotero/zotero.properties +++ b/chrome/locale/sl-SI/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Tega opozorila ne kaži več. general.browserIsOffline=%S je trenutno v nepovezanem načinu. general.locate=Prebrskaj ... general.restartRequired=Potreben je ponoven zagon -general.restartRequiredForChange=Za uveljavitev sprememb je potrebno ponovno zagnati Firefox. -general.restartRequiredForChanges=Za uveljavitev sprememb je potrebno ponovno zagnati Firefox. +general.restartRequiredForChange=Za uveljavitev sprememb je potrebno ponovno zagnati %S. +general.restartRequiredForChanges=Za uveljavitev sprememb je potrebno ponovno zagnati %S. general.restartNow=Ponovno zaženi zdaj general.restartLater=Ponovno zaženi kasneje general.errorHasOccurred=Prišlo je do napake. diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties index 3d4974af73..fcf5fdf998 100644 --- a/chrome/locale/sr-RS/zotero/zotero.properties +++ b/chrome/locale/sr-RS/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Не показуј ово упозорење по general.browserIsOffline=%S је тренутно у режиму без повезаности са мрежом. general.locate=Нађи... general.restartRequired=Поновно покретање је потребно -general.restartRequiredForChange=Firefox се море поново покренути да би промена дошла у дејство. -general.restartRequiredForChanges=Firefox се море поново покренути да би промене дошле у дејство. +general.restartRequiredForChange=%S се море поново покренути да би промена дошла у дејство. +general.restartRequiredForChanges=%S се море поново покренути да би промене дошле у дејство. general.restartNow=Поново покрени сада general.restartLater=Поново покрени касније general.errorHasOccurred=Дошло је до грешке. diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties index ed357c4d63..eddf61817c 100644 --- a/chrome/locale/sv-SE/zotero/zotero.properties +++ b/chrome/locale/sv-SE/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Visa inte denna varning igen general.browserIsOffline=%S är för närvarande i offlineläge general.locate=Lokalisera... general.restartRequired=Omstart krävs -general.restartRequiredForChange=Firefox måste startas om för ändringarna att gälla -general.restartRequiredForChanges=Firefox måste startas om för att ändringarna ska börja gälla. +general.restartRequiredForChange=%S måste startas om för ändringarna att gälla +general.restartRequiredForChanges=%S måste startas om för att ändringarna ska börja gälla. general.restartNow=Starta om nu general.restartLater=Starta om senare general.errorHasOccurred=Ett fel har inträffat diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties index 0b6ea6de88..0b695f3502 100644 --- a/chrome/locale/tr-TR/zotero/zotero.properties +++ b/chrome/locale/tr-TR/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Bu uyarıyı tekrar gösterme. general.browserIsOffline=%S'i çevrimdışı kipte general.locate=Bul... general.restartRequired=Tekrar Başlatma Gerekiyor -general.restartRequiredForChange=Değişikliğin etkili olabilmesi için Firefox yeniden başlatılmalıdır. -general.restartRequiredForChanges=Değişikliklerin etkili olabilmesi için Firefox yeniden başlatılmalıdır. +general.restartRequiredForChange=Değişikliğin etkili olabilmesi için %S yeniden başlatılmalıdır. +general.restartRequiredForChanges=Değişikliklerin etkili olabilmesi için %S yeniden başlatılmalıdır. general.restartNow=Şimdi yeniden başlat general.restartLater=Sonra yeniden başlat. general.errorHasOccurred=Bir hata meydana geldi. diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties index 3585485acd..a7fd55b41f 100644 --- a/chrome/locale/vi-VN/zotero/zotero.properties +++ b/chrome/locale/vi-VN/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=Đừng hiện cảnh báo này nữa. general.browserIsOffline=%S đang trong chế độ offline. general.locate=Định vị... general.restartRequired=Cần phải khởi động lại -general.restartRequiredForChange=Bạn phải khởi động lại Firefox để thay đổi này có hiệu lực. -general.restartRequiredForChanges=Bạn phải khởi động lại Firefox để các thay đổi này có hiệu lực. +general.restartRequiredForChange=Bạn phải khởi động lại %S để thay đổi này có hiệu lực. +general.restartRequiredForChanges=Bạn phải khởi động lại %S để các thay đổi này có hiệu lực. general.restartNow=Khởi động lại ngay bây giờ general.restartLater=Khởi động lại sau general.errorHasOccurred=Đã xảy ra một lỗi. diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties index 378628292f..0995a7f9ad 100644 --- a/chrome/locale/zh-CN/zotero/zotero.properties +++ b/chrome/locale/zh-CN/zotero/zotero.properties @@ -8,7 +8,7 @@ general.browserIsOffline=%S 现处于离线模式. general.locate=定位... general.restartRequired=需要重新启动 general.restartRequiredForChange=必须重启才能使更改生效. -general.restartRequiredForChanges=必须重启Firefox更改才能生效. +general.restartRequiredForChanges=必须重启%S更改才能生效. general.restartNow=立即重启 general.restartLater=稍后重启 general.errorHasOccurred=发生了一个错误 diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties index 64341ed677..d6886ac812 100644 --- a/chrome/locale/zh-TW/zotero/zotero.properties +++ b/chrome/locale/zh-TW/zotero/zotero.properties @@ -7,8 +7,8 @@ general.dontShowWarningAgain=不要再次顯示這個警告。 general.browserIsOffline=%S 目前是在離線模式。 general.locate=找出… general.restartRequired=須要重新啟動 -general.restartRequiredForChange=必須重新啟動 Firefox 來讓改變生效。 -general.restartRequiredForChanges=必須重新啟動 Firefox 來讓改變生效。 +general.restartRequiredForChange=必須重新啟動 %S 來讓改變生效。 +general.restartRequiredForChanges=必須重新啟動 %S 來讓改變生效。 general.restartNow=立刻重新啟動 general.restartLater=待會再重新啟動 general.errorHasOccurred=發生了一個錯誤。 diff --git a/system.sql b/system.sql index 0763a0f386..fe425fe17e 100644 --- a/system.sql +++ b/system.sql @@ -1,4 +1,4 @@ --- 30 +-- 31 -- Copyright (c) 2009 Center for History and New Media -- George Mason University, Fairfax, Virginia, USA