Remove uses of "Firefox" and fix version

chrome/content/zotero/browser.js

@@ -142,7 +142,7 @@ var Zotero_Browser = new function() {
 		if (!Zotero.stateCheck()) {
 			Zotero_Browser.progress.changeHeadline(Zotero.getString("ingester.scrapeError"));
 			var desc = Zotero.getString("ingester.scrapeErrorDescription.previousError")
-				+ ' ' + Zotero.getString("general.restartFirefoxAndTryAgain");
+				+ ' ' + Zotero.getString("general.restartFirefoxAndTryAgain", Zotero.appName);
 			Zotero_Browser.progress.addDescription(desc);
 			Zotero_Browser.progress.show();
 			Zotero_Browser.progress.startCloseTimer(8000);

chrome/content/zotero/xpcom/db.js

@@ -750,7 +750,7 @@ Zotero.DBConnection.prototype.checkException = function (e) {
 
 		var index = ps.confirmEx(null,
 			Zotero.getString('general.error'),
-			Zotero.getString('db.dbCorrupted', this._dbName) + '\n\n' + Zotero.getString('db.dbCorrupted.restart'),
+			Zotero.getString('db.dbCorrupted', this._dbName) + '\n\n' + Zotero.getString('db.dbCorrupted.restart', Zotero.appName),
 			buttonFlags,
 			Zotero.getString('general.restartNow'),
 			Zotero.getString('general.restartLater'),

chrome/content/zotero/xpcom/schema.js

@@ -3086,7 +3086,7 @@ Zotero.Schema = new function(){
 				var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
 										.getService(Components.interfaces.nsIPromptService);
 				var title = Zotero.getString('upgrade.failed.title');
-				ps.alert(null, title, Zotero.getString('upgrade.couldNotMigrate') + "\n\n" + Zotero.getString('upgrade.couldNotMigrate.restart'));
+				ps.alert(null, title, Zotero.getString('upgrade.couldNotMigrate', Zotero.appName) + "\n\n" + Zotero.getString('upgrade.couldNotMigrate.restart'));
 			}
 
 			throw(e);

chrome/content/zotero/xpcom/sync.js

@@ -1131,8 +1131,8 @@ Zotero.Sync.Server = new function () {
 		}
 		catch (e) {
 			Zotero.debug(e);
-			var msg = Zotero.getString('sync.error.loginManagerCorrupted1') + "\n\n"
-						+ Zotero.getString('sync.error.loginManagerCorrupted2');
+			var msg = Zotero.getString('sync.error.loginManagerCorrupted1', Zotero.appName) + "\n\n"
+						+ Zotero.getString('sync.error.loginManagerCorrupted2', Zotero.appName);
 			alert(msg);
 			return '';
 		}
@@ -1321,7 +1321,7 @@ Zotero.Sync.Server = new function () {
 			if (_syncInProgress) {
 				var msg = Zotero.localeJoin([
 					Zotero.getString('sync.error.syncInProgress'),
-					Zotero.getString('sync.error.syncInProgress.wait')
+					Zotero.getString('sync.error.syncInProgress.wait', Zotero.appName)
 				]);
 				var e = new Zotero.Error(msg, 0, { dialogButtonText: null, frontWindowOnly: true });
 				_error(e);

chrome/content/zotero/zoteroPane.js

@@ -3619,7 +3619,7 @@ var ZoteroPane = new function()
 		if (popup) {
 			var pw = new Zotero.ProgressWindow();
 			pw.changeHeadline(Zotero.getString('general.errorHasOccurred'));
-			var msg = Zotero.getString('general.restartFirefox') + ' '
+			var msg = Zotero.getString('general.restartFirefox', Zotero.appName) + ' '
 				+ reportInstructions;
 			pw.addDescription(msg);
 			pw.show();
@@ -3628,7 +3628,7 @@ var ZoteroPane = new function()
 		// Display as items pane message
 		else {
 			var msg = Zotero.getString('general.errorHasOccurred') + ' '
-				+ Zotero.getString('general.restartFirefox') + '\n\n'
+				+ Zotero.getString('general.restartFirefox', Zotero.appName) + '\n\n'
 				+ reportInstructions;
 			self.setItemsPaneMessage(msg, true);
 		}

chrome/locale/en-US/zotero/zotero.properties

@@ -13,8 +13,8 @@ general.restartNow					= Restart now
 general.restartLater					= Restart later
 general.errorHasOccurred			= An error has occurred.
 general.unknownErrorOccurred		= An unknown error occurred.
-general.restartFirefox				= Please restart Firefox.
-general.restartFirefoxAndTryAgain	= Please restart Firefox and try again.
+general.restartFirefox				= Please restart %S.
+general.restartFirefoxAndTryAgain	= Please restart %S and try again.
 general.checkForUpdate				= Check for update
 general.actionCannotBeUndone		= This action cannot be undone.
 general.install						= Install
@@ -50,7 +50,7 @@ upgrade.advanceMessage				= Press %S to upgrade now.
 upgrade.dbUpdateRequired			= The Zotero database must be updated.
 upgrade.integrityCheckFailed		= Your Zotero database must be repaired before the upgrade can continue.
 upgrade.loadDBRepairTool			= Load Database Repair Tool
-upgrade.couldNotMigrate				= Zotero could not migrate all necessary files.\nPlease close any open attachment files and restart Firefox to try the upgrade again.
+upgrade.couldNotMigrate				= Zotero could not migrate all necessary files.\nPlease close any open attachment files and restart %S to try the upgrade again.
 upgrade.couldNotMigrate.restart		= If you continue to receive this message, restart your computer.
 
 errorReport.reportError				= Report Error…
@@ -410,7 +410,7 @@ ingester.importReferRISDialog.text	= Do you want to import items from "%1$S" int
 ingester.importReferRISDialog.checkMsg = Always allow for this site
 
 db.dbCorrupted					= The Zotero database '%S' appears to have become corrupted.
-db.dbCorrupted.restart			= Please restart Firefox to attempt an automatic restore from the last backup.
+db.dbCorrupted.restart			= Please restart %S to attempt an automatic restore from the last backup.
 db.dbCorruptedNoBackup			= The Zotero database '%S' appears to have become corrupted, and no automatic backup is available.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
 db.dbRestored					= The Zotero database '%1$S' appears to have become corrupted.\n\nYour data was restored from the last automatic backup made on %2$S at %3$S. The damaged file was saved in your Zotero directory.
 db.dbRestoreFailed				= The Zotero database '%S' appears to have become corrupted, and an attempt to restore from the last automatic backup failed.\n\nA new database file has been created. The damaged file was saved in your Zotero directory.
@@ -577,10 +577,10 @@ integration.removeBibEntry.body		= Are you sure you want to omit it from your bi
 integration.emptyCitationWarning.title	= Blank Citation
 integration.emptyCitationWarning.body	= The citation you have specified would be empty in the currently selected style. Are you sure you want to add it?
 
-integration.error.incompatibleVersion	= This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
+integration.error.incompatibleVersion	= This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of Zotero (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2  = Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
 integration.error.title					= Zotero Integration Error
-integration.error.notInstalled			= Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed and try again.
+integration.error.notInstalled			= Zotero could not load the component required to communicate with your word processor. Please ensure that the appropriate extension is installed and try again.
 integration.error.generic				= Zotero experienced an error updating your document.
 integration.error.mustInsertCitation 	= You must insert a citation before performing this operation.
 integration.error.mustInsertBibliography = You must insert a bibliography before performing this operation.
@@ -625,10 +625,10 @@ sync.error.usernameNotSet			= Username not set
 sync.error.passwordNotSet			= Password not set
 sync.error.invalidLogin				= Invalid username or password
 sync.error.enterPassword			= Please enter a password.
-sync.error.loginManagerCorrupted1	= Zotero cannot access your login information, likely due to a corrupted Firefox login manager database.
-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.loginManagerCorrupted1	= Zotero cannot access your login information, likely due to a corrupted %S login manager database.
+sync.error.loginManagerCorrupted2	= Close %S, back up and delete signons.* from your %S 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.syncInProgress.wait		= Wait for the previous sync to complete or restart %S.
 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.