CSL-related updates:

- Add a content listener to install CSLs served with text/x-csl - Delete styles with old URIs when new versions come from repo - Change default style prefs to use new URI for Chicago Note - Clear CSL table and quick copy drop-down when resetting translators (so it works correctly for styles too) - Change button text from "Rebuild Translators Table" to more accurate and forward-looking "Reset Translators and Styles..." - Allow passed callbacks in Schema.updateScrapersRemote() and Schema.rebuild(Translators|Styles|TranslatorsAndStyles)Table[s]
2007-11-13 06:56:04 +00:00 · 2007-11-13 06:56:04 +00:00 · 89c4a7dd04
commit 89c4a7dd04
parent 922423b5a3
74 changed files with 318 additions and 147 deletions
--- a/chrome/content/zotero/browser.js
+++ b/chrome/content/zotero/browser.js
@ -105,6 +105,7 @@ var Zotero_Browser = new function() {
 		Zotero_Browser._scrapePopupShowing = false;
 		Zotero.Ingester.ProxyMonitor.init();
 		Zotero.Ingester.MIMEHandler.init();
+		Zotero.Cite.MIMEHandler.init();
 		Zotero.Translate.init();
 		
 		window.addEventListener("load",
--- a/chrome/content/zotero/preferences/preferences.js
+++ b/chrome/content/zotero/preferences/preferences.js
@ -146,6 +146,9 @@ function populateQuickCopyList() {


 function buildQuickCopyFormatDropDown(menulist, currentFormat) {
+	menulist.selectedItem = null;
+	menulist.removeAllItems();
+	
 	// Prevent Cmd-w from setting "Wikipedia"
 	menulist.onkeydown = function (event) {
 		if ((Zotero.isMac && event.metaKey) || event.ctrlKey) {
@ -769,7 +772,26 @@ function runIntegrityCheck() {
 }


-function rebuildTranslators() {
+function updateTranslators() {
+	Zotero.Schema.updateScrapersRemote(true, function (xmlhttp, updated) {
+		var button = document.getElementById('updateButton');
+		if (button) {
+			if (updated===-1) {
+				var label = Zotero.getString('zotero.preferences.update.upToDate');
+			}
+			else if (updated) {
+				var label = Zotero.getString('zotero.preferences.update.updated');
+			}
+			else {
+				var label = Zotero.getString('zotero.preferences.update.error');
+			}
+			button.setAttribute('label', label);
+		}
+	});
+}
+
+
+function resetTranslatorsAndStyles() {
 	var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
 		.getService(Components.interfaces.nsIPromptService);
 	
@ -778,9 +800,31 @@ function rebuildTranslators() {
 	
 	var index = ps.confirmEx(null,
 		Zotero.getString('general.warning'),
-		Zotero.getString('zotero.preferences.advanced.rebuildTranslators.changesLost'),
+		Zotero.getString('zotero.preferences.advanced.resetTranslatorsAndStyles.changesLost'),
 		buttonFlags,
-		Zotero.getString('zotero.preferences.advanced.rebuildTranslators.rebuildTable'),
+		Zotero.getString('zotero.preferences.advanced.resetTranslatorsAndStyles'),
+		null, null, null, {});
+	
+	if (index == 0) {
+		Zotero.Schema.rebuildTranslatorsAndStylesTables(function (xmlhttp, updated) {
+			populateQuickCopyList();
+		});
+	}
+}
+
+
+function resetTranslators() {
+	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 index = ps.confirmEx(null,
+		Zotero.getString('general.warning'),
+		Zotero.getString('zotero.preferences.advanced.resetTranslators.changesLost'),
+		buttonFlags,
+		Zotero.getString('zotero.preferences.advanced.resetTranslators'),
 		null, null, null, {});
 	
 	if (index == 0) {
@ -789,6 +833,28 @@ function rebuildTranslators() {
 }


+function resetStyles() {
+	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 index = ps.confirmEx(null,
+		Zotero.getString('general.warning'),
+		Zotero.getString('zotero.preferences.advanced.resetStyles.changesLost'),
+		buttonFlags,
+		Zotero.getString('zotero.preferences.advanced.resetStyles'),
+		null, null, null, {});
+	
+	if (index == 0) {
+		Zotero.Schema.rebuildStylesTable(function (xmlhttp, updated) {
+			populateQuickCopyList();
+		});
+	}
+}
+
+
 function onOpenURLSelected()
 {
 	var openURLMenu = document.getElementById('openURLMenu');
--- a/chrome/content/zotero/preferences/preferences.xul
+++ b/chrome/content/zotero/preferences/preferences.xul
@ -114,7 +114,7 @@ To add a new preference:
 			
 			<hbox align="center">
 				<checkbox label="&zotero.preferences.autoUpdate;" preference="pref-automaticScraperUpdates"/>
-				<button id="updateButton" style="margin-top:0" label="&zotero.preferences.updateNow;" oncommand="Zotero.Schema.updateScrapersRemote(true)"/>
+				<button id="updateButton" style="margin-top:0" label="&zotero.preferences.updateNow;" oncommand="updateTranslators()"/>
 			</hbox>
 			
 			<checkbox label="&zotero.preferences.reportTranslationFailure;" preference="pref-reportTranslationFailure"/>
@ -407,7 +407,7 @@ To add a new preference:
 			</hbox>
 			
 			<hbox>
-				<button label="&zotero.preferences.dbMaintenance.rebuildTranslators;" oncommand="rebuildTranslators()"/>
+				<button label="&zotero.preferences.dbMaintenance.resetTranslatorsAndStyles;" oncommand="resetTranslatorsAndStyles()"/>
 			</hbox>
 		</groupbox>
 	</prefpane>
--- a/chrome/content/zotero/xpcom/cite.js
+++ b/chrome/content/zotero/xpcom/cite.js
@ -92,6 +92,164 @@ Zotero.Cite = new function() {
 	}
 }

+
+
+Zotero.Cite.MIMEHandler = new function () {
+	this.init = init;
+	
+	/*
+	 * registers URIContentListener to handle MIME types
+	 */
+	function init() {
+		Zotero.debug("Registering URIContentListener for text/x-csl");
+		var uriLoader = Components.classes["@mozilla.org/uriloader;1"]
+			.getService(Components.interfaces.nsIURILoader);
+		uriLoader.registerContentListener(Zotero.Cite.MIMEHandler.URIContentListener);
+	}
+}
+
+
+/*
+ * Zotero.Cite.MIMEHandler.URIContentListener: implements
+ * nsIURIContentListener interface to grab MIME types
+ */
+Zotero.Cite.MIMEHandler.URIContentListener = new function() {
+	// list of content types to capture
+	// NOTE: must be from shortest to longest length
+	this.desiredContentTypes = ["text/x-csl"];
+	
+	this.QueryInterface = QueryInterface;
+	this.canHandleContent = canHandleContent;
+	this.doContent = doContent;
+	this.isPreferred = isPreferred;
+	this.onStartURIOpen = onStartURIOpen;
+	
+	function QueryInterface(iid) {
+		if  (iid.equals(Components.interfaces.nsISupports)
+		   || iid.equals(Components.interfaces.nsISupportsWeakReference)
+		   || iid.equals(Components.interfaces.nsIURIContentListener)) {
+			return this;
+		}
+		throw Components.results.NS_ERROR_NO_INTERFACE;
+	}
+	
+	function canHandleContent(contentType, isContentPreferred, desiredContentType) {
+		if (this.desiredContentTypes.indexOf(contentType) != -1) {
+			return true;
+		}
+		return false;
+	}
+	
+	function doContent(contentType, isContentPreferred, request, contentHandler) {
+		Zotero.debug("Running doContent() for " + request.name);
+		contentHandler.value = new Zotero.Cite.MIMEHandler.StreamListener(request, contentType);
+		return false;
+	}
+	
+	function isPreferred(contentType, desiredContentType) {
+		if (this.desiredContentTypes.indexOf(contentType) != -1) {
+			return true;
+		}
+		return false;
+	}
+	
+	function onStartURIOpen(URI) {
+		return true;
+	}
+}
+
+/*
+ * Zotero.Cite.MIMEHandler.StreamListener: implements nsIStreamListener and
+ * nsIRequestObserver interfaces to download MIME types we've grabbed
+ */
+Zotero.Cite.MIMEHandler.StreamListener = function(request, contentType) {
+	this._request = request;
+	this._contentType = contentType
+	this._readString = "";
+	this._scriptableStream = null;
+	this._scriptableStreamInput = null
+	
+	Zotero.debug("Prepared to grab content type " + contentType);
+}
+
+Zotero.Cite.MIMEHandler.StreamListener.prototype.QueryInterface = function(iid) {
+	if (iid.equals(Components.interfaces.nsISupports)
+	   || iid.equals(Components.interfaces.nsIRequestObserver)
+	   || iid.equals(Components.interfaces.nsIStreamListener)) {
+		return this;
+	}
+	throw Components.results.NS_ERROR_NO_INTERFACE;
+}
+
+Zotero.Cite.MIMEHandler.StreamListener.prototype.onStartRequest = function(channel, context) {}
+
+/*
+ * Called when there's data available; basically, we just want to collect this data
+ */
+Zotero.Cite.MIMEHandler.StreamListener.prototype.onDataAvailable = function(request, context, inputStream, offset, count) {
+	Zotero.debug(count + " bytes available");
+	
+	if (inputStream != this._scriptableStreamInput) {
+		this._scriptableStream = Components.classes["@mozilla.org/scriptableinputstream;1"]
+			.createInstance(Components.interfaces.nsIScriptableInputStream);
+		this._scriptableStream.init(inputStream);
+		this._scriptableStreamInput = inputStream;
+	}
+	this._readString += this._scriptableStream.read(count);
+}
+
+/*
+ * Called when the request is done
+ */
+Zotero.Cite.MIMEHandler.StreamListener.prototype.onStopRequest = function(channel, context, status) {
+	Zotero.debug("Request finished");
+	var externalHelperAppService = Components.classes["@mozilla.org/uriloader/external-helper-app-service;1"]
+		.getService(Components.interfaces.nsIExternalHelperAppService);
+	
+	if (this._request.name) {
+		var loadURI = this._request.name;
+	}
+	else {
+		var loadURI = '';
+	}
+	
+	try {
+		var xml = new XML(Zotero.CSL.Global.cleanXML(this._readString));
+	}
+	catch (e) {
+		var error = true;
+		Components.utils.reportError(e);
+	}
+	
+	if (!xml || error) {
+		alert(Zotero.getString('styles.installError', loadURI));
+		return;
+	}
+	
+	var uri = xml.info.id.toString();
+	var title = xml.info.title.toString();
+	var updated = xml.info.updated.toString().replace(/(.+)T([^\+]+)\+?.*/, "$1 $2");
+	
+	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 index = ps.confirmEx(null,
+		'',
+		Zotero.getString('styles.installStyle', [title, loadURI]),
+		buttonFlags,
+		Zotero.getString('general.install'), null, null, null, {});
+	
+	if (index == 0) {
+		var sql = "REPLACE INTO csl VALUES (?,?,?,?)";
+		Zotero.DB.query(sql, [uri, updated, title, this._readString]);
+		alert(Zotero.getString('styles.installed', title));
+	}
+}
+
+
+
 /*
 * CSL: a class for creating bibliographies from CSL files
 * this is abstracted as a separate class for the benefit of anyone who doesn't
--- a/chrome/content/zotero/xpcom/schema.js
+++ b/chrome/content/zotero/xpcom/schema.js
@ -26,6 +26,7 @@ Zotero.Schema = new function(){
 	this.updateSchema = updateSchema;
 	this.updateScrapersRemote = updateScrapersRemote;
 	this.stopRepositoryTimer = stopRepositoryTimer;
+	this.rebuildTranslatorsAndStylesTables = rebuildTranslatorsAndStylesTables;
 	this.rebuildTranslatorsTable = rebuildTranslatorsTable;
 	
 	this.dbInitialized = false;
@ -201,7 +202,7 @@ Zotero.Schema = new function(){
 	* _force_ forces a repository query regardless of how long it's been
 	* 	since the last check
 	**/
-	function updateScrapersRemote(force){
+	function updateScrapersRemote(force, callback) {
 		if (!force){
 			if (_remoteUpdateInProgress) {
 				Zotero.debug("A remote update is already in progress -- not checking repository");
@ -243,20 +244,25 @@ Zotero.Schema = new function(){
 			+ (lastUpdated ? 'last=' + lastUpdated + '&' : '')
 			+ 'version=' + Zotero.version;
 		
-		Zotero.debug('Checking repository for updates (' + url + ')');
+		Zotero.debug('Checking repository for updates');
 		
 		_remoteUpdateInProgress = true;
 		
-		if (force === true) {
-			url += '&m=1';
-			var get = Zotero.Utilities.HTTP.doGet(url, _updateScrapersRemoteCallbackManual);
-		}
-		else {
+		if (force) {
 			if (force == 2) {
 				url += '&m=2';
 			}
-			var get = Zotero.Utilities.HTTP.doGet(url, _updateScrapersRemoteCallback);
+			else {
+				url += '&m=1';
 			}
+		}
+		
+		var get = Zotero.Utilities.HTTP.doGet(url, function (xmlhttp) {
+			var updated = _updateScrapersRemoteCallback(xmlhttp, !!force);
+			if (callback) {
+				callback(xmlhttp, updated)
+			}
+		});
 		
 		// TODO: instead, add an observer to start and stop timer on online state change
 		if (!get){
@ -274,7 +280,37 @@ Zotero.Schema = new function(){
 	}
 	
 	
-	function rebuildTranslatorsTable() {
+	function rebuildTranslatorsAndStylesTables(callback) {
+		Zotero.debug("Rebuilding translators and styles tables");
+		Zotero.DB.beginTransaction();
+		
+		Zotero.DB.query("DELETE FROM translators");
+		Zotero.DB.query("DELETE FROM csl");
+		var sql = "DELETE FROM version WHERE schema IN "
+			+ "('scrapers', 'repository', 'lastcheck')";
+		Zotero.DB.query(sql);
+		_dbVersions['scrapers'] = null;
+		_dbVersions['repository'] = null;
+		_dbVersions['lastcheck'] = null;
+		
+		// Rebuild from scrapers.sql
+		_updateSchema('scrapers');
+		
+		// Rebuild the translator cache
+		Zotero.debug("Clearing translator cache");
+		Zotero.Translate.cache = null;
+		Zotero.Translate.init();
+		
+		Zotero.DB.commitTransaction();
+		
+		// Run a manual update from repository if pref set
+		if (Zotero.Prefs.get('automaticScraperUpdates')) {
+			this.updateScrapersRemote(2, callback);
+		}
+	}
+	
+	
+	function rebuildTranslatorsTable(callback) {
 		Zotero.debug("Rebuilding translators table");
 		Zotero.DB.beginTransaction();
 		
@ -298,12 +334,11 @@ Zotero.Schema = new function(){
 		
 		// Run a manual update from repository if pref set
 		if (Zotero.Prefs.get('automaticScraperUpdates')) {
-			this.updateScrapersRemote(2);
+			this.updateScrapersRemote(2, callback);
 		}
 	}
 	
 	
-	
 	/////////////////////////////////////////////////////////////////
 	//
 	// Private methods
@ -637,32 +672,6 @@ Zotero.Schema = new function(){
 	}
 	
 	
-	function _updateScrapersRemoteCallbackManual(xmlhttp){
-		var updated = _updateScrapersRemoteCallback(xmlhttp, true);
-		
-		// Update the "Update Now" button in the pref dialog with the result
-		var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-			.getService(Components.interfaces.nsIWindowMediator);
-		var enumerator = wm.getEnumerator('zotero:pref');
-		while (enumerator.hasMoreElements()){
-			var win = enumerator.getNext();
-			var button = win.window.document.getElementById('updateButton');
-			if (button){
-				if (updated===-1){
-					var label = Zotero.getString('zotero.preferences.update.upToDate');
-				}
-				else if (updated){
-					var label = Zotero.getString('zotero.preferences.update.updated');
-				}
-				else {
-					var label = Zotero.getString('zotero.preferences.update.error');
-				}
-				button.setAttribute('label', label);
-			}
-		}
-	}
-	
-	
 	/**
 	* Set the interval between repository queries
 	*
@ -743,6 +752,32 @@ Zotero.Schema = new function(){
 		// https://bugzilla.mozilla.org/show_bug.cgi?id=194231
 		xmlnode.normalize();
 		
+		var uri = xmlnode.getAttribute('id');
+		
+		//
+		// Workaround for URI change -- delete existing versions with old URIs of updated styles
+		//
+		var re = new RegExp("http://www.zotero.org/styles/(.+)");
+		var matches = uri.match(re);
+		
+		if (matches) {
+			var zoteroReplacements = ['chicago-author-date', 'chicago-note-bibliography'];
+			var purlReplacements = [
+				'apa', 'asa', 'chicago-note', 'ieee', 'mhra_note_without_bibliography',
+				'mla', 'nature', 'nlm'
+			];
+			
+			if (zoteroReplacements.indexOf(matches[1]) != -1) {
+				var sql = "DELETE FROM csl WHERE cslID=?";
+				Zotero.DB.query(sql, 'http://www.zotero.org/namespaces/CSL/' + matches[1] + '.csl');
+			}
+			else if (purlReplacements.indexOf(matches[1]) != -1) {
+				var sql = "DELETE FROM csl WHERE cslID=?";
+				Zotero.DB.query(sql, 'http://purl.org/net/xbiblio/csl/styles/' + matches[1] + '.csl');
+			}
+		}
+		
+		
 		var sqlValues = [
 			{string: xmlnode.getAttribute('id')},
 			{string: xmlnode.getAttribute('updated')},
--- a/chrome/locale/af-ZA/zotero/preferences.dtd
+++ b/chrome/locale/af-ZA/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/af-ZA/zotero/zotero.properties
+++ b/chrome/locale/af-ZA/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/ar/zotero/preferences.dtd
+++ b/chrome/locale/ar/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/ar/zotero/zotero.properties
+++ b/chrome/locale/ar/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=اسلوب توثيق المراج
 zotero.preferences.export.quickCopy.exportFormats=صيغ التصدير
 zotero.preferences.export.quickCopy.instructions=َتسمح لك خاصية النسخ السريع بنسخ المرجع الذي اخترته إلى الحافظة بالضغط على زر (%S) أو سحب الموضوع إلى أي مربع نص في صفحة الويب.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=الملفات التالية موجودة مسبقاً في الوجهة التي تريدها ، لذا لم يتم نسخها:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/bg-BG/zotero/preferences.dtd
+++ b/chrome/locale/bg-BG/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Подръжка на базата дани">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Проберка на цялостта на базата дани">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Възстановяване на таблицата с преводачите">
--- a/chrome/locale/bg-BG/zotero/zotero.properties
+++ b/chrome/locale/bg-BG/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Стил на библиограф
 zotero.preferences.export.quickCopy.exportFormats=Формати за експорт
 zotero.preferences.export.quickCopy.instructions=Бързо копиране ви позволява да копирате избраните отпратки в клипборда с клавишната комбинация (%S) или да ги издърпате в текстова кутия от интернет страница.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Възстановяване на таблицата
-zotero.preferences.advanced.rebuildTranslators.changesLost=Промените които сте направили в таблицата с преводачите ще бъдат загубени.

 dragAndDrop.existingFiles=Папката вече съдържа следните файлове и те не бяха копирани.
 dragAndDrop.filesNotFound=Следните файлове не бяха намерени и не могат да бъдат копирани:
--- a/chrome/locale/ca-AD/zotero/preferences.dtd
+++ b/chrome/locale/ca-AD/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Manteniment de la base de dades">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Comprova la integritat de la base de dades">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Reconstrueix la taula de transcriptors">
--- a/chrome/locale/ca-AD/zotero/zotero.properties
+++ b/chrome/locale/ca-AD/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Estils bibliogràfics
 zotero.preferences.export.quickCopy.exportFormats=Formats d'exportació
 zotero.preferences.export.quickCopy.instructions=Copia ràpida permet copiar les referències seleccionades al portaretalls prement una drecera de teclat o arrossegant els elements a un quadre de text en una pàgina web.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Reconstrueix la taula
-zotero.preferences.advanced.rebuildTranslators.changesLost=Qualsevol canvi que hagis fet als transcriptors es perdrà.

 dragAndDrop.existingFiles=Els següents arxiu ja existeixen al directori de destí i no poden ser copiats:
 dragAndDrop.filesNotFound=Els següents arxius no s'han trobat i no s'han pogut copiar:
--- a/chrome/locale/cs-CZ/zotero/preferences.dtd
+++ b/chrome/locale/cs-CZ/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/cs-CZ/zotero/zotero.properties
+++ b/chrome/locale/cs-CZ/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/da-DK/zotero/preferences.dtd
+++ b/chrome/locale/da-DK/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/da-DK/zotero/zotero.properties
+++ b/chrome/locale/da-DK/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/de-AT/zotero/preferences.dtd
+++ b/chrome/locale/de-AT/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/de-AT/zotero/zotero.properties
+++ b/chrome/locale/de-AT/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/de-CH/zotero/preferences.dtd
+++ b/chrome/locale/de-CH/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/de-CH/zotero/zotero.properties
+++ b/chrome/locale/de-CH/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/de/zotero/preferences.dtd
+++ b/chrome/locale/de/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Datenbankwartung">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Integrität der Datenbank überprüfen">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Tabelle der Übersetzern neu aufbauen">
--- a/chrome/locale/de/zotero/zotero.properties
+++ b/chrome/locale/de/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Zitierstile
 zotero.preferences.export.quickCopy.exportFormats=Export-Formate
 zotero.preferences.export.quickCopy.instructions=Quick Copy erlaubt Ihnen, ausgewählte Literaturangaben durch Drücken einer Tastenkombination (%S) in die Zwischenablage zu kopieren oder Einträge in ein Textfeld auf einer Webseite zu ziehen.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Tabelle neu aufbauen
-zotero.preferences.advanced.rebuildTranslators.changesLost=Alle Änderungen, die Sie an den Übersetzern vorgenommen haben, werden verloren gehen.

 dragAndDrop.existingFiles=Die folgenden Datein waren im Zielordner bereits vorhanden und wurden nicht kopiert:
 dragAndDrop.filesNotFound=Die folgenden Datei wurden nicht gefunden und konnten nicht kopiert werden.
--- a/chrome/locale/el-GR/zotero/preferences.dtd
+++ b/chrome/locale/el-GR/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/el-GR/zotero/zotero.properties
+++ b/chrome/locale/el-GR/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@ -80,4 +80,6 @@

 <!ENTITY zotero.preferences.dbMaintenance							"Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck			"Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators		"Rebuild Translators Table">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles	"Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators				"Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles					"Reset Styles...">
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@ -381,8 +381,12 @@ zotero.preferences.export.quickCopy.bibStyles				= Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats			= Export Formats
 zotero.preferences.export.quickCopy.instructions			= Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable	= Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost		= Any changes you have made to the translators table will be lost.
+zotero.preferences.advanced.resetTranslatorsAndStyles					= Reset Translators and Styles
+zotero.preferences.advanced.resetTranslatorsAndStyles.changesLost		= Any new or modified translators or styles will be lost.
+zotero.preferences.advanced.resetTranslators							= Reset Translators
+zotero.preferences.advanced.resetTranslators.changesLost				= Any new or modified translators will be lost.
+zotero.preferences.advanced.resetStyles								= Reset Styles
+zotero.preferences.advanced.resetStyles.changesLost					= Any new or modified styles will be lost.

 dragAndDrop.existingFiles = The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound = The following files were not found and could not be copied:
@ -483,3 +487,7 @@ integration.regenerate.saveBehavior	= Always follow this selection.

 integration.deleteCitedItem.title	= Are you sure you want to remove this reference?
 integration.deleteCitedItem.body	= This reference is cited in the text of your document. Deleting it will remove all citations.
+
+styles.installStyle					= Install style "%1$S" from %2$S?
+styles.installed					= The style "%S" was installed successfully.
+styles.installError					= %S does not appear to be a valid CSL file.
--- a/chrome/locale/es-ES/zotero/preferences.dtd
+++ b/chrome/locale/es-ES/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Mantenimiento de la base de datos">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Comprobar la integridad de la base de datos">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Reconstruir la tabla de traductores">
--- a/chrome/locale/es-ES/zotero/zotero.properties
+++ b/chrome/locale/es-ES/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/et-EE/zotero/preferences.dtd
+++ b/chrome/locale/et-EE/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/et-EE/zotero/zotero.properties
+++ b/chrome/locale/et-EE/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/fr-FR/zotero/preferences.dtd
+++ b/chrome/locale/fr-FR/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Maintenance de la base de données">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Vérifier l&apos;intégrité de la base de données">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Reconstruire la table des collecteurs">
--- a/chrome/locale/fr-FR/zotero/zotero.properties
+++ b/chrome/locale/fr-FR/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Styles bibliographiques
 zotero.preferences.export.quickCopy.exportFormats=Formats d'exportation
 zotero.preferences.export.quickCopy.instructions=La copie rapide vous permet de copier les références sélectionnées dans le presse-papiers par un raccourci clavier (%S) ou en glissant les objets dans une zone de texte d'une page Web.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Reconstruire la table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Toutes les modifications faites sur le tableau des collecteurs seront perdues.

 dragAndDrop.existingFiles=Les fichiers suivants existent déjà dans le répertoire de destination et n'ont pas été copiés :
 dragAndDrop.filesNotFound=Les fichiers suivants n'ont pu être trouvés et donc copiés :
--- a/chrome/locale/he-IL/zotero/preferences.dtd
+++ b/chrome/locale/he-IL/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/he-IL/zotero/zotero.properties
+++ b/chrome/locale/he-IL/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/hu-HU/zotero/preferences.dtd
+++ b/chrome/locale/hu-HU/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Adatbázis karbantartás">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Az adatbázis integritásának ellenőrzése">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Konverter tábla újraépítése">
--- a/chrome/locale/hu-HU/zotero/zotero.properties
+++ b/chrome/locale/hu-HU/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliográfiai stíélusok
 zotero.preferences.export.quickCopy.exportFormats=Exportálási formátumok
 zotero.preferences.export.quickCopy.instructions=A Gyorsmásolás segítségével a kiválasztott hivatkozásokat a vágólapra lehet másolni a %S gyorsbillentyű lenyomásával. A hivatkozást egy tetszőleges weboldal szövegmezőjébe is be lehet másolni, ha a kijelölt hivatkozást a szövegmezőbe húzzuk.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=A tábla újraépítése
-zotero.preferences.advanced.rebuildTranslators.changesLost=A konverter tábla módosításai elvesznek

 dragAndDrop.existingFiles=Az alábbi fájlok már léteznek a célmappában, ezért nem kerültek bemásolásra.
 dragAndDrop.filesNotFound=Az alábbi fájlok nem találhatóak, ezért nem lehet őket másolni:
--- a/chrome/locale/is-IS/zotero/preferences.dtd
+++ b/chrome/locale/is-IS/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/is-IS/zotero/zotero.properties
+++ b/chrome/locale/is-IS/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/it-IT/zotero/preferences.dtd
+++ b/chrome/locale/it-IT/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Manutenzione database">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Controlla l&apos;integrità del database">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Ricrea la tabella dei motori di ricerca">
--- a/chrome/locale/it-IT/zotero/zotero.properties
+++ b/chrome/locale/it-IT/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Stili bibliografici
 zotero.preferences.export.quickCopy.exportFormats=Formati di esportazione
 zotero.preferences.export.quickCopy.instructions=Copia veloce permette di copiare le citazioni bibliografiche selezionate negli Appunti utilizzando la scorciatoia da tastiera (%S) o trascinando l'elemento in un campo di testo di una pagina web.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Ricrea tabella
-zotero.preferences.advanced.rebuildTranslators.changesLost=Tutte le modifiche apportate alla tabella dei motori di ricerca andranno perse.

 dragAndDrop.existingFiles=I seguenti file sono già presenti nella cartella di destinazione e non verranno copiati:
 dragAndDrop.filesNotFound=I seguenti file non sono stati trovati e non saranno copiati:
--- a/chrome/locale/ja-JP/zotero/preferences.dtd
+++ b/chrome/locale/ja-JP/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/ja-JP/zotero/zotero.properties
+++ b/chrome/locale/ja-JP/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=参考文献のスタイル
 zotero.preferences.export.quickCopy.exportFormats=エクスポートフォーマット
 zotero.preferences.export.quickCopy.instructions=クイックコピー機能で、ショートカットキーを押してクリップボードに選択された参照文献のコピー、またはウェブページのテキストボックスにアイテムをドラッグすることができます。

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=表を再構築
-zotero.preferences.advanced.rebuildTranslators.changesLost=翻訳者の表の変更事項は失われます。

 dragAndDrop.existingFiles=次のファイルは宛先フォルダにすでに存在しており、コピーされませんでした:
 dragAndDrop.filesNotFound=次のファイルは見つからず、コピーできませんでした。
--- a/chrome/locale/ko-KR/zotero/preferences.dtd
+++ b/chrome/locale/ko-KR/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "데이터베이스 유지">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "데이터베이스 무결성 점검">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "중계기 테이블 재구축">
--- a/chrome/locale/ko-KR/zotero/zotero.properties
+++ b/chrome/locale/ko-KR/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=도서목록 형식
 zotero.preferences.export.quickCopy.exportFormats=내보내기 형식
 zotero.preferences.export.quickCopy.instructions=빠른 복사는 단축 키 (%S)를 누르거나 웹 페이지내 텍스트 박스 안으로 항목을 끌어 오면 클립보드에 선택한 참고를 복사하는 것을 허용시킵니다.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=테이블 재구축
-zotero.preferences.advanced.rebuildTranslators.changesLost=어떤 변경 사항이든 중계기 테이블을 손실시킵니다.

 dragAndDrop.existingFiles=다음 파일은 목적 디렉토리내 이미 존재하며 복사하지는 않았습니다:
 dragAndDrop.filesNotFound=다음 파일을 찾을수 없어 복사를 할 수 없습니다.
--- a/chrome/locale/mn-MN/zotero/preferences.dtd
+++ b/chrome/locale/mn-MN/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/mn-MN/zotero/zotero.properties
+++ b/chrome/locale/mn-MN/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/nb-NO/zotero/preferences.dtd
+++ b/chrome/locale/nb-NO/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/nb-NO/zotero/zotero.properties
+++ b/chrome/locale/nb-NO/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/nl-NL/zotero/preferences.dtd
+++ b/chrome/locale/nl-NL/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Onderhoud">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Controleer Integriteit Database">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Vertaler-tabel Herbouwen">
--- a/chrome/locale/nl-NL/zotero/zotero.properties
+++ b/chrome/locale/nl-NL/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliografie-stijlen
 zotero.preferences.export.quickCopy.exportFormats=Exportformaten
 zotero.preferences.export.quickCopy.instructions=Met Snelle Kopie kunt u geselecteerde verwijzingen naar het klembord kopiëren met behulp van een sneltoets (%S) of door de items naar een tekstvak te slepen.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Tabel Herbouwen
-zotero.preferences.advanced.rebuildTranslators.changesLost=Wijzingingen die u heeft gemaakt aan de vertalers-tabel zullen verloren gaan.

 dragAndDrop.existingFiles=De volgende bestanden waren al aanwezig in de bestemmingsmap en zijn niet gekopieerd:
 dragAndDrop.filesNotFound=De volgende bestanden konden niet gevonden en gekopieerd worden:
--- a/chrome/locale/pl-PL/zotero/preferences.dtd
+++ b/chrome/locale/pl-PL/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Konserwacja bazy danych">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Sprawdź spójność bazy danych">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Odbuduj tabelę translatorów">
--- a/chrome/locale/pl-PL/zotero/zotero.properties
+++ b/chrome/locale/pl-PL/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Style bibliograficzne
 zotero.preferences.export.quickCopy.exportFormats=Eksportuj formaty
 zotero.preferences.export.quickCopy.instructions=Szybka kopia pozwala na skopiowanie wybranych pozycji bibliograficznych do schowka poprzez użycie skrótu klawiaturowego (%S) lub poprzez przeciągnięcie elementu w obszar pola tekstowego na stronie internetowej.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=Następujące pliki istnieją już w katalogu docelowym i nie zostały skopiowane:
 dragAndDrop.filesNotFound=Następujących plików nie znaleziono i nie mogą zostać skopiowane:
--- a/chrome/locale/pt-BR/zotero/preferences.dtd
+++ b/chrome/locale/pt-BR/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/pt-BR/zotero/zotero.properties
+++ b/chrome/locale/pt-BR/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/pt-PT/zotero/preferences.dtd
+++ b/chrome/locale/pt-PT/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/pt-PT/zotero/zotero.properties
+++ b/chrome/locale/pt-PT/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/ro-RO/zotero/preferences.dtd
+++ b/chrome/locale/ro-RO/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Întreţinerea bazei de date">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Controlează integritatea bazei de date">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Reconstruieşte tabelul traducătorilor">
--- a/chrome/locale/ro-RO/zotero/zotero.properties
+++ b/chrome/locale/ro-RO/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Stiluri bibliografice
 zotero.preferences.export.quickCopy.exportFormats=Exportă formate
 zotero.preferences.export.quickCopy.instructions=Copierea rapidă îţi permite să selectezi referinţele în memoria clipboard apăsând scurtătura de la tastatură (%S) sau trăgând înregistrările pe o pagină web, într-o casetă de text.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Reconstruieşte tabelul
-zotero.preferences.advanced.rebuildTranslators.changesLost=Orice schimbare pe care ai făcut-o în tabelul traducătorilor se va pierde.

 dragAndDrop.existingFiles=Fişierele următoare există deja în dosarul de destinaţie şi nu au fost copiate:
 dragAndDrop.filesNotFound=Următoarele fişiere nu au fost găsite şi nu pot fi copiate:
--- a/chrome/locale/ru-RU/zotero/preferences.dtd
+++ b/chrome/locale/ru-RU/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Поддержка БД">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Проверить целостность БД">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Перестроить таблицу трансляторов">
--- a/chrome/locale/ru-RU/zotero/zotero.properties
+++ b/chrome/locale/ru-RU/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Библиографические
 zotero.preferences.export.quickCopy.exportFormats=Форматы экспорта
 zotero.preferences.export.quickCopy.instructions=Быстрое копирование позволяет Вам копировать выбранные ссылки в буфер обмена, нажав горячую клавишу (%S) или перетащить документы в текстовое поле веб-страницы

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Перестроить таблицу
-zotero.preferences.advanced.rebuildTranslators.changesLost=Любые изменения, которые вы сделали с таблицей трансляторов, будут потеряны

 dragAndDrop.existingFiles=Следующие файлы уже существуют в конечной директории и они не скопированы:
 dragAndDrop.filesNotFound=Файлы не были найдены и не могут быть скопированы:
--- a/chrome/locale/sr-YU/zotero/preferences.dtd
+++ b/chrome/locale/sr-YU/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Одржавање базе података">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Провери целовитост базе података">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Поново изгради табелу преводилаца">
--- a/chrome/locale/sr-YU/zotero/zotero.properties
+++ b/chrome/locale/sr-YU/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Библиографски сти
 zotero.preferences.export.quickCopy.exportFormats=Извозни формат
 zotero.preferences.export.quickCopy.instructions=Брзо умножавање вам дозвољава да умножите изабране референце у списак исечака (clipboard) притискајући дугме за пречицу (%S) или превлачењем ставки у поље за текст на веб страници.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Поново направи табелу
-zotero.preferences.advanced.rebuildTranslators.changesLost=Све промене које сте направили у табели преводиоца ће бити изгубљена.

 dragAndDrop.existingFiles=Следеће датотеке већ постоје у одредишном директоријуму и нису умножене:
 dragAndDrop.filesNotFound=Следеће датотеке нису нађене и због тога нису умножене:
--- a/chrome/locale/sv-SE/zotero/preferences.dtd
+++ b/chrome/locale/sv-SE/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/sv-SE/zotero/zotero.properties
+++ b/chrome/locale/sv-SE/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliographic Styles
 zotero.preferences.export.quickCopy.exportFormats=Export Formats
 zotero.preferences.export.quickCopy.instructions=Quick Copy allows you to copy selected references to the clipboard by pressing a shortcut key (%S) or dragging items into a text box on a web page.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=The following files already existed in the destination directory and were not copied:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/tr-TR/zotero/preferences.dtd
+++ b/chrome/locale/tr-TR/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Rebuild Translators Table">
--- a/chrome/locale/tr-TR/zotero/zotero.properties
+++ b/chrome/locale/tr-TR/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Bibliyografik Sitiller
 zotero.preferences.export.quickCopy.exportFormats=Dışarı Aktarım Biçimleri
 zotero.preferences.export.quickCopy.instructions=Çabuk Kopya bir kısayol tuşuna (%S) basarak seçilen referansların pano'ya kopyalanmasını sağlar. Veya eserleri bir web sayfasındaki text box'a sürükleyebilirsiniz.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Rebuild Table
-zotero.preferences.advanced.rebuildTranslators.changesLost=Any changes you have made to the translators table will be lost.

 dragAndDrop.existingFiles=Aşağıdaki dosyalar hedef dizinde zaten varlar ve kopyalanmadılar:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
--- a/chrome/locale/vi-VN/zotero/preferences.dtd
+++ b/chrome/locale/vi-VN/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "Bảo dưỡng Cơ sở dữ liệu">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Kiểm tra Tính toàn vẹn của Cơ sở dữ liệu">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "Tái lập Bảng các Bộ chuyển đổi">
--- a/chrome/locale/vi-VN/zotero/zotero.properties
+++ b/chrome/locale/vi-VN/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=Các Văn phong Thư tịch
 zotero.preferences.export.quickCopy.exportFormats=Các Định dạng Xuất khẩu
 zotero.preferences.export.quickCopy.instructions=Quick Copy cho phép bạn sao chép các tham khảo được chọn vào clipboard bằng cách ấn phím tắt (%S) hoặc bằng cách kéo thả các biểu ghi vào trong một khuôn văn bản của một trang Web.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=Lập lại Bảng
-zotero.preferences.advanced.rebuildTranslators.changesLost=Tất cả các thay đổi bạn vừa làm trong Bảng các Bộ chuyển đổi sẽ bị mất.

 dragAndDrop.existingFiles=Các tập tin sau đã có ở trong thư mục đích, và do đó không được sao chép:
 dragAndDrop.filesNotFound=Các tập tin sau không tồn tại, và do đó không được sao chép:
--- a/chrome/locale/zh-CN/zotero/preferences.dtd
+++ b/chrome/locale/zh-CN/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "数据库维护">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "数据库完整性检测">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "重建转换器表">
--- a/chrome/locale/zh-CN/zotero/zotero.properties
+++ b/chrome/locale/zh-CN/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=文献目录样式
 zotero.preferences.export.quickCopy.exportFormats=导出格式
 zotero.preferences.export.quickCopy.instructions=快速复制可以让你通过快捷键(%S)或拖放条目到文本框的方式将所选引文复制到剪切板.

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=重建表
-zotero.preferences.advanced.rebuildTranslators.changesLost=你对转换器表所做的任何改动都将丢失.

 dragAndDrop.existingFiles=下列文件因已在目标文件夹中, 所以没有复制:
 dragAndDrop.filesNotFound=未找到下列文件, 无法复制.
--- a/chrome/locale/zh-TW/zotero/preferences.dtd
+++ b/chrome/locale/zh-TW/zotero/preferences.dtd
@ -80,4 +80,3 @@

 <!ENTITY zotero.preferences.dbMaintenance "資料庫維修">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "檢查資料庫完整性">
-<!ENTITY zotero.preferences.dbMaintenance.rebuildTranslators "重建轉譯器項目表">
--- a/chrome/locale/zh-TW/zotero/zotero.properties
+++ b/chrome/locale/zh-TW/zotero/zotero.properties
@ -381,8 +381,6 @@ zotero.preferences.export.quickCopy.bibStyles=參考文獻的樣式
 zotero.preferences.export.quickCopy.exportFormats=匯出格式
 zotero.preferences.export.quickCopy.instructions=快速複製讓你可以按快捷鍵（%S）來把選取的參考文獻複製到剪貼簿，或者拖放項目到網頁的文字輸入區。

-zotero.preferences.advanced.rebuildTranslators.rebuildTable=重建項目表
-zotero.preferences.advanced.rebuildTranslators.changesLost=將會失去你對轉譯器項目表所作的任何變更。

 dragAndDrop.existingFiles=以下的檔案已經存在目的目錄中，並未被複製：
 dragAndDrop.filesNotFound=找不到以下的檔案而無法加以複製：
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@ -57,11 +57,11 @@ pref("extensions.zotero.report.combineChildItems", true);
 // Export and citation settings
 pref("extensions.zotero.export.lastTranslator", '14763d24-8ba0-45df-8f52-b8d1108e7ac9');
 pref("extensions.zotero.export.translatorSettings", 'true,false');
-pref("extensions.zotero.export.lastStyle", 'http://purl.org/net/xbiblio/csl/styles/chicago-note.csl');
+pref("extensions.zotero.export.lastStyle", 'http://www.zotero.org/styles/chicago-note.csl');
 pref("extensions.zotero.export.bibliographySettings", 'save-as-rtf');
 pref("extensions.zotero.export.bibliographyLocale", '');

-pref("extensions.zotero.export.quickCopy.setting", 'bibliography=http://purl.org/net/xbiblio/csl/styles/chicago-note.csl');
+pref("extensions.zotero.export.quickCopy.setting", 'bibliography=http://www.zotero.org/styles/chicago-note.csl');

 // Integration settings
 pref("extensions.zotero.integration.autoRegenerate", -1);	// -1 = ask; 0 = no; 1 = yes