Merged revisions 1986,1988-1990,1996,1998,2000-2004,2006,2008-2010,2013,2020-2028,2032-2034,2037,2039,2044-2049,2052-2056,2059,2065-2066,2068-2072,2075,2077-2079,2081,2083-2084,2086,2088-2094,2096,2099,2101,2103-2104,2107-2110,2115,2118,2120-2122,2126-2128,2131,2140,2142-2145,2149-2153,2155-2159,2165,2167-2168,2170-2171,2173-2176,2179-2183,2185-2186 via svnmerge from

https://www.zotero.org/svn/extension/branches/1.0

chrome.manifest

@@ -1,4 +1,5 @@
 content	zotero				chrome/content/zotero/
+content	zotero-platform		chrome/content/zotero-platform/		platform
 
 locale	zotero	en-US		chrome/locale/en-US/zotero/
 locale	zotero	af-ZA		chrome/locale/af-ZA/zotero/
@@ -42,5 +43,3 @@ overlay	chrome://browser/content/browser.xul	chrome://zotero/content/itemPane.xu
 
 style	chrome://browser/content/browser.xul	chrome://zotero/skin/zotero.css
 style	chrome://global/content/customizeToolbar.xul	chrome://zotero/skin/zotero.css
-
-content	zotero-platform		chrome/content/zotero-platform/		platform

chrome/content/zotero/addCitationDialog.js

@@ -459,6 +459,11 @@ var Zotero_Citation_Dialog = new function () {
 					citationItem[property] = document.getElementById(property)[_preserveData[property]];
 				}
 			}
+			
+			if(citationItem["locator"] == "") {
+				citationItem["locator"] = citationItem["locatorType"] = undefined;
+			}
+			
 			io.citation.citationItems = [citationItem];
 		}
 	}

chrome/content/zotero/bibliography.js

@@ -60,22 +60,29 @@ var Zotero_File_Interface_Bibliography = new function() {
 		}
 		
 		// add styles to list
-		for(var i in styles) {
+		var index = 0;
+		for (var i in styles) {
 			var itemNode = document.createElement("listitem");
 			itemNode.setAttribute("value", i);
 			itemNode.setAttribute("label", styles[i]);
 			listbox.appendChild(itemNode);
 			
 			if(i == _io.style) {
-				listbox.selectedItem = itemNode;
+				var selectIndex = index;
 			}
+			index++;
 		}
 		
-		// select first item by default
+		if (selectIndex < 1) {
-		if(listbox.selectedIndex == -1) {
+			selectIndex = 0;
-			listbox.selectedIndex = 0;
 		}
 		
+		// Can't select below-the-fold listitems inline in Firefox 2, because that would be too easy
+		setTimeout(function () {
+			listbox.ensureIndexIsVisible(selectIndex);
+			listbox.selectedIndex = selectIndex;
+		}, 1);
+		
 		// ONLY FOR bibliography.xul: export options
 		if(document.getElementById("save-as-rtf")) {
 			// restore saved bibliographic settings
@@ -92,7 +99,7 @@ var Zotero_File_Interface_Bibliography = new function() {
 		// bookmarks text
 		if(document.getElementById("displayAs")) {
 			if(_io.useEndnotes && _io.useEndnotes == 1) document.getElementById("displayAs").selectedIndex = 1;
-			styleChanged();
+			styleChanged(selectIndex);
 			
 			if(_io.useBookmarks && _io.useBookmarks == 1) document.getElementById("formatUsing").selectedIndex = 1;			
 			if(_io.openOffice) {
@@ -105,7 +112,7 @@ var Zotero_File_Interface_Bibliography = new function() {
 			
 			// add border on Windows
 			if(Zotero.isWin) {
-				document.getElementById("zotero-bibliography-container").style.border = "1px solid black";
+				document.getElementById("doc-prefs-dialog").style.border = "1px solid black";
 			}
 		}
 		window.sizeToContent();
@@ -115,9 +122,19 @@ var Zotero_File_Interface_Bibliography = new function() {
 	/*
 	 * ONLY FOR integrationDocPrefs.xul: called when style is changed
 	 */
-	function styleChanged() {
+	function styleChanged(index) {
+		// When called from init(), selectedItem isn't yet set
+		if (index != undefined) {
+			var selectedItem = document.getElementById("style-listbox").getItemAtIndex(index);
+		}
+		else {
+			var selectedItem = document.getElementById("style-listbox").selectedItem;
+		}
+		
+		var selectedStyle = selectedItem.getAttribute('value');
+		
 		// update status of displayAs box based
-		var selectedStyle = document.getElementById("style-listbox").selectedItem.getAttribute('value');
+		
 		var styleClass = Zotero.Cite.getStyleClass(selectedStyle);
 		document.getElementById("displayAs").disabled = styleClass != "note";
 	}

chrome/content/zotero/bindings/zoterosearch.xml

@@ -101,6 +101,7 @@
 				<body>
 					<![CDATA[
 						var conditionsBox = this.id('conditions');
+						
 						this.search.removeCondition(id);
 						
 						for (var i = 0, len=conditionsBox.childNodes.length; i < len; i++){
@@ -164,7 +165,7 @@
 				<body>
 					<![CDATA[
 						this.updateSearch();
-						return this.search.save();
+						return this.search.save(true);
 					]]>
 				</body>
 			</method>
@@ -200,11 +201,11 @@
 		</implementation>
 		
 		<content>
-			<xul:vbox id="search-box" flex="1" onkeypress="this.parentNode.handleKeyPress(event)">
+			<xul:vbox id="search-box" flex="1" onkeypress="document.getBindingParent(this).handleKeyPress(event)">
 				<xul:groupbox xbl:inherits="flex">
 					<xul:caption align="center">
 						<xul:label value="&zotero.search.joinMode.prefix;"/>
-						<xul:menulist id="joinModeMenu" oncommand="this.parentNode.parentNode.parentNode.parentNode.updateJoinMode(); event.stopPropagation()">
+						<xul:menulist id="joinModeMenu" oncommand="document.getBindingParent(this).updateJoinMode(); event.stopPropagation()">
 							<xul:menupopup>
 								<xul:menuitem label="&zotero.search.joinMode.any;" value="any"/>
 								<xul:menuitem label="&zotero.search.joinMode.all;" value="all" selected="true"/>
@@ -215,8 +216,8 @@
 					<xul:vbox id="conditions"/>
 				</xul:groupbox>
 				<xul:hbox>
-					<xul:checkbox id="recursiveCheckbox" label="&zotero.search.recursive.label;" oncommand="this.parentNode.parentNode.parentNode.updateCheckbox('recursive'); event.stopPropagation()"/>
+					<xul:checkbox id="recursiveCheckbox" label="&zotero.search.recursive.label;" oncommand="document.getBindingParent(this).updateCheckbox('recursive'); event.stopPropagation()"/>
-					<xul:checkbox id="noChildrenCheckbox" label="&zotero.search.noChildren;" oncommand="this.parentNode.parentNode.parentNode.updateCheckbox('noChildren'); event.stopPropagation()"/>
+					<xul:checkbox id="noChildrenCheckbox" label="&zotero.search.noChildren;" oncommand="document.getBindingParent(this).updateCheckbox('noChildren'); event.stopPropagation()"/>
 				</xul:hbox>
 				<xul:checkbox id="includeParentsAndChildrenCheckbox" label="&zotero.search.includeParentsAndChildren;" oncommand="document.getBindingParent(this).updateCheckbox('includeParentsAndChildren'); event.stopPropagation()"/>
 			</xul:vbox>

chrome/content/zotero/exportOptions.js

@@ -109,6 +109,8 @@ var Zotero_File_Interface_Export = new function() {
 		}
 		
 		var optionsBox = document.getElementById("translator-options");
+		optionsBox.hidden = true;
+		var haveOption = false;
 		for(var i=0; i<optionsBox.childNodes.length; i++) {
 			// loop through options to see which should be enabled
 			var node = optionsBox.childNodes[i];
@@ -116,7 +118,8 @@ var Zotero_File_Interface_Export = new function() {
 			
 			if(translatorOptions[optionName] != undefined) {
 				// option should be enabled
-				node.disabled = undefined;
+				optionsBox.hidden = undefined;
+				node.hidden = undefined;
 				
 				var defValue = translatorOptions[optionName];
 				if(typeof(defValue) == "boolean") {
@@ -131,10 +134,12 @@ var Zotero_File_Interface_Export = new function() {
 				}
 			} else {
 				// option should be disabled and unchecked to prevent confusion
-				node.disabled = true;
+				node.hidden = true;
 				node.setAttribute("checked", "false");
 			}
 		}
+		
+		window.sizeToContent();
 	}
 	
 	/*

chrome/content/zotero/fileInterface.js

@@ -312,7 +312,7 @@ var Zotero_File_Interface = new function() {
 	 *
 	 * Does not check that items are actual references (and not notes or attachments)
 	 */
-	function copyItemsToClipboard(items, style) {
+	function copyItemsToClipboard(items, style, asHTML) {
 		// copy to clipboard
 		var transferable = Components.classes["@mozilla.org/widget/transferable;1"].
 						   createInstance(Components.interfaces.nsITransferable);
@@ -329,8 +329,8 @@ var Zotero_File_Interface = new function() {
 		transferable.addDataFlavor("text/html");
 		transferable.setTransferData("text/html", str, bibliography.length*2);
 		
-		// add text
+		// add text (or HTML source)
-		var bibliography = csl.formatBibliography(itemSet, "Text");
+		var bibliography = csl.formatBibliography(itemSet, asHTML ? 'HTML' : 'Text');
 		var str = Components.classes["@mozilla.org/supports-string;1"].
 				  createInstance(Components.interfaces.nsISupportsString);
 		str.data = bibliography;
@@ -345,8 +345,10 @@ var Zotero_File_Interface = new function() {
 	 * Copies HTML and text citations for passed items in given style
 	 *
 	 * Does not check that items are actual references (and not notes or attachments)
+	 *
+	 * if |asHTML| is true, copy HTML source as text
 	 */
-	function copyCitationToClipboard(items, style) {
+	function copyCitationToClipboard(items, style, asHTML) {
 		// copy to clipboard
 		var transferable = Components.classes["@mozilla.org/widget/transferable;1"].
 						   createInstance(Components.interfaces.nsITransferable);
@@ -369,8 +371,8 @@ var Zotero_File_Interface = new function() {
 		transferable.addDataFlavor("text/html");
 		transferable.setTransferData("text/html", str, bibliography.length*2);
 		
-		// add text
+		// add text (or HTML source)
-		var bibliography = csl.formatCitation(citation, "Text");
+		var bibliography = csl.formatCitation(citation, asHTML ? 'HTML' : 'Text');
 		var str = Components.classes["@mozilla.org/supports-string;1"].
 				  createInstance(Components.interfaces.nsISupportsString);
 		str.data = bibliography;

chrome/content/zotero/integrationDocPrefs.xul

@@ -5,7 +5,7 @@
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 
 <dialog
-	id="add-citation-dialog"
+	id="doc-prefs-dialog"
 	orient="vertical"
 	buttons="accept"
 	title="&zotero.integration.docPrefs.title;"

chrome/content/zotero/note.js

@@ -45,7 +45,14 @@ function onLoad()
 	
 	if (itemID) {
 		var ref = Zotero.Items.get(itemID);
+		
+		// Make sure Undo doesn't wipe out the note
+		if (!noteEditor.note || noteEditor.note.getID() != ref.getID()) {
+			noteEditor.id('noteField').editor.enableUndo(false);
+		}
 		noteEditor.note = ref;
+		noteEditor.id('noteField').editor.enableUndo(true);
+		
 		document.title = ref.getNoteTitle();
 	}
 	else if (parentItemID) {
@@ -72,9 +79,18 @@ function onUnload()
 var NotifyCallback = {
 	notify: function(action, type, ids){
 		// DEBUG: why does this reset without checking the modified ids?
-		if (noteEditor.note){
+		if (noteEditor.note) {
 			noteEditor.note = noteEditor.note;
-			document.title = noteEditor.note.getNoteTitle();
+			
+			// If the document title hasn't yet been set, reset undo so
+			// undoing to empty isn't possible
+			var noteTitle = noteEditor.note.getNoteTitle();
+			if (!document.title && noteTitle != '') {
+				noteEditor.id('noteField').editor.enableUndo(false);
+				noteEditor.id('noteField').editor.enableUndo(true);
+				document.title = noteTitle;
+			}
+			
 			// Update the window name (used for focusing) in case this is a new note
 			window.name = 'zotero-note-' + noteEditor.note.getID();
 		}

chrome/content/zotero/overlay.js

@@ -763,8 +763,18 @@ var ZoteroPane = new function()
 			if(item.isNote())
 			{
 				var noteEditor = document.getElementById('zotero-note-editor');
+				
+				// If loading new or different note, disable undo while we repopulate the text field
+				// so Undo doesn't end up clearing the field. This also ensures that Undo doesn't
+				// undo content from another note into the current one.
+				if (!noteEditor.note || noteEditor.note.getID() != item.ref.getID()) {
+					noteEditor.id('noteField').editor.enableUndo(false);
+				}
 				noteEditor.item = null;
 				noteEditor.note = item.ref;
+				
+				noteEditor.id('noteField').editor.enableUndo(true);
+				
 				document.getElementById('zotero-view-note-button').setAttribute('noteID',item.ref.getID());
 				if(item.ref.getSource())
 				{
@@ -1129,13 +1139,14 @@ var ZoteroPane = new function()
 		
 		var url = window.content.location.href;
 		var [mode, format] = Zotero.QuickCopy.getFormatFromURL(url).split('=');
+		var [mode, contentType] = mode.split('/');
 		
 		if (mode == 'bibliography') {
 			if (asCitations) {
-				Zotero_File_Interface.copyCitationToClipboard(items, format);
+				Zotero_File_Interface.copyCitationToClipboard(items, format, contentType == 'html');
 			}
 			else {
-				Zotero_File_Interface.copyItemsToClipboard(items, format);
+				Zotero_File_Interface.copyItemsToClipboard(items, format, contentType == 'html');
 			}
 		}
 		else if (mode == 'export') {

chrome/content/zotero/preferences/preferences.js

@@ -134,18 +134,32 @@ function populateOpenURLResolvers() {
 }
 
 
+/*
+ * Builds the main Quick Copy drop-down from the current global pref
+ */
 function populateQuickCopyList() {
 	// Initialize default format drop-down
-	var formatMenu = document.getElementById("quickCopy-menu");
 	var format = Zotero.Prefs.get("export.quickCopy.setting");
-	buildQuickCopyFormatDropDown(formatMenu, format);
+	var menulist = document.getElementById("zotero-quickCopy-menu");
-	formatMenu.setAttribute('preference', "pref-quickCopy-setting");
+	buildQuickCopyFormatDropDown(menulist, Zotero.QuickCopy.getContentType(format), format);
+	menulist.setAttribute('preference', "pref-quickCopy-setting");
+	updateQuickCopyHTMLCheckbox();
 	
 	refreshQuickCopySiteList();
 }
 
 
-function buildQuickCopyFormatDropDown(menulist, currentFormat) {
+/*
+ * Builds a Quick Copy drop-down 
+ */
+function buildQuickCopyFormatDropDown(menulist, contentType, currentFormat) {
+	if (!currentFormat) {
+		currentFormat = menulist.value;
+	}
+	// Strip contentType from mode
+	currentFormat = Zotero.QuickCopy.stripContentType(currentFormat);
+		
+	
 	menulist.selectedItem = null;
 	menulist.removeAllItems();
 	
@@ -167,13 +181,15 @@ function buildQuickCopyFormatDropDown(menulist, currentFormat) {
 	// add styles to list
 	var styles = Zotero.Cite.getStyles();
 	for (var i in styles) {
-		var val = 'bibliography=' + i;
+		var baseVal = 'bibliography=' + i;
+		var val = 'bibliography' + (contentType == 'html' ? '/html' : '') + '=' + i;
 		var itemNode = document.createElement("menuitem");
 		itemNode.setAttribute("value", val);
 		itemNode.setAttribute("label", styles[i]);
+		itemNode.setAttribute("oncommand", 'updateQuickCopyHTMLCheckbox()');
 		popup.appendChild(itemNode);
 		
-		if (val == currentFormat) {
+		if (baseVal == currentFormat) {
 			menulist.selectedItem = itemNode;
 		}
 	}
@@ -198,6 +214,7 @@ function buildQuickCopyFormatDropDown(menulist, currentFormat) {
 		var itemNode = document.createElement("menuitem");
 		itemNode.setAttribute("value", val);
 		itemNode.setAttribute("label", translators[i].label);
+		itemNode.setAttribute("oncommand", 'updateQuickCopyHTMLCheckbox()');
 		popup.appendChild(itemNode);
 		
 		if (val == currentFormat) {
@@ -205,19 +222,37 @@ function buildQuickCopyFormatDropDown(menulist, currentFormat) {
 		}
 	}
 	
+	menulist.click();
+	
 	return popup;
 }
 
+function updateQuickCopyHTMLCheckbox() {
+	var format = document.getElementById('zotero-quickCopy-menu').value;
+	var mode, contentType;
+	
+	var checkbox = document.getElementById('zotero-quickCopy-copyAsHTML');
+	[mode, format] = format.split('=');
+	[mode, contentType] = mode.split('/');
+	
+	checkbox.checked = contentType == 'html';
+	checkbox.disabled = mode != 'bibliography';
+}
+
 function showQuickCopySiteEditor(index) {
 	var treechildren = document.getElementById('quickCopy-siteSettings-rows');
 	
 	if (index != undefined && index > -1 && index < treechildren.childNodes.length) {
 		var treerow = treechildren.childNodes[index].firstChild;
-		var domain = treerow.childNodes[0].getAttribute('label')
+		var domain = treerow.childNodes[0].getAttribute('label');
-		var format = treerow.childNodes[1].getAttribute('label')
+		var format = treerow.childNodes[1].getAttribute('label');
+		var asHTML = treerow.childNodes[2].getAttribute('label') != '';
 	}
 	
 	var format = Zotero.QuickCopy.getSettingFromFormattedName(format);
+	if (asHTML) {
+		format = format.replace('bibliography=', 'bibliography/html=');
+	}
 	
 	var io = {domain: domain, format: format, ok: false};
 	window.openDialog('chrome://zotero/content/preferences/quickCopySiteEditor.xul', "zotero-preferences-quickCopySiteEditor", "chrome, modal", io);
@@ -254,14 +289,18 @@ function refreshQuickCopySiteList() {
 		var treerow = document.createElement('treerow');
 		var domainCell = document.createElement('treecell');
 		var formatCell = document.createElement('treecell');
+		var HTMLCell = document.createElement('treecell');
 		
 		domainCell.setAttribute('label', siteData[i].domainPath);
 		
 		var formatted = Zotero.QuickCopy.getFormattedNameFromSetting(siteData[i].format);
 		formatCell.setAttribute('label', formatted);
+		var copyAsHTML = Zotero.QuickCopy.getContentType(siteData[i].format) == 'html';
+		HTMLCell.setAttribute('label', copyAsHTML ? '   ✓   ' : '');
 		
 		treerow.appendChild(domainCell);
 		treerow.appendChild(formatCell);
+		treerow.appendChild(HTMLCell);
 		treeitem.appendChild(treerow);
 		treechildren.appendChild(treeitem);
 	}

chrome/content/zotero/preferences/preferences.xul

@@ -262,34 +262,38 @@ To add a new preference:
 			
 			<separator/>
 			
-			<vbox>
+			<label value="&zotero.preferences.quickCopy.defaultOutputFormat;" control="quickCopy-menu"/>
-				<label value="&zotero.preferences.quickCopy.defaultOutputFormat;" control="quickCopy-menu"/>
+			<menulist id="zotero-quickCopy-menu"/>
-				<menulist id="quickCopy-menu"/>
-			</vbox>
 			
 			<separator/>
 			
-			<vbox>
+			<checkbox id="zotero-quickCopy-copyAsHTML" label="&zotero.preferences.quickCopy.copyAsHTML;"
-				<label value="&zotero.preferences.quickCopy.siteEditor.setings;" control="quickCopy-siteSettings"/>
+				oncommand="buildQuickCopyFormatDropDown(document.getElementById('zotero-quickCopy-menu'), this.checked ? 'html' : '');"/>
-				<tree flex="1" id="quickCopy-siteSettings" hidecolumnpicker="true" rows="6" seltype="single"
+			
-						ondblclick="showQuickCopySiteEditor(this.currentIndex)"
+			<separator/>
-						onkeypress="if (event.keyCode == event.DOM_VK_DELETE) { deleteSelectedQuickCopySite(); }">
+			
-					<treecols>
+			<label value="&zotero.preferences.quickCopy.siteEditor.setings;" control="quickCopy-siteSettings"/>
-						<treecol id="quickCopy-urlColumn" label="&zotero.preferences.quickCopy.siteEditor.domainPath;" flex="1"/>
+			<tree flex="1" id="quickCopy-siteSettings" hidecolumnpicker="true" rows="6" seltype="single"
-						<treecol id="quickCopy-formatColumn" label="&zotero.preferences.quickCopy.siteEditor.outputFormat;" flex="2"/>
+					ondblclick="showQuickCopySiteEditor(this.currentIndex)"
-					</treecols>
+					onkeypress="if (event.keyCode == event.DOM_VK_DELETE) { deleteSelectedQuickCopySite(); }">
-					<treechildren id="quickCopy-siteSettings-rows"/>
+				<treecols>
-				</tree>
+					<treecol id="quickCopy-urlColumn" label="&zotero.preferences.quickCopy.siteEditor.domainPath;" flex="1"/>
-				<separator class="thin"/>
+					<treecol id="quickCopy-formatColumn" label="&zotero.preferences.quickCopy.siteEditor.outputFormat;" flex="2"/>
-				<hbox pack="end">
+					<treecol id="quickCopy-copyAsHTML" label="HTML"/>
-					<button label="-" onclick="deleteSelectedQuickCopySite()"/>
+				</treecols>
-					<button label="+" onclick="showQuickCopySiteEditor()"/>
+				<treechildren id="quickCopy-siteSettings-rows"/>
-				</hbox>
+			</tree>
-			</vbox>
+			<separator class="thin"/>
+			<hbox pack="end">
+				<button label="-" onclick="deleteSelectedQuickCopySite()"/>
+				<button label="+" onclick="showQuickCopySiteEditor()"/>
+			</hbox>
 			
 			<separator/>
 			
 			<label id="quickCopy-macWarning" hidden="true" value="&zotero.preferences.quickCopy.macWarning;"/>
+			<separator/>
+			<label class="text-link" href="http://www.zotero.org/styles/" value="&zotero.preferences.export.getAdditionalStyles;"/>
 		</groupbox>
 	</prefpane>
 	

chrome/content/zotero/preferences/quickCopySiteEditor.xul

@@ -20,7 +20,7 @@
 			function onAccept() {
 				var io = window.arguments[0];
 				io.domain = document.getElementById('zotero-quickCopy-domain').value;
-				io.format = document.getElementById('zotero-quickCopy-format').value;
+				io.format = document.getElementById('zotero-quickCopy-menu').value;
 				io.ok = true;
 			}
 		}
@@ -28,21 +28,22 @@
 	</script>
 	
 	<vbox id="zotero-preferences-quickCopySiteEditor">
-		<vbox>
+		<label value="&zotero.preferences.quickCopy.siteEditor.domainPath; &zotero.preferences.quickCopy.siteEditor.domainPath.example;" control="zotero-quickCopy-domain"/>
-			<label value="&zotero.preferences.quickCopy.siteEditor.domainPath; &zotero.preferences.quickCopy.siteEditor.domainPath.example;" control="zotero-quickCopy-domain"/>
+		<textbox id="zotero-quickCopy-domain"/>
-			<textbox id="zotero-quickCopy-domain"/>
+		<separator class="thin"/>
-		</vbox>
+		<label value="&zotero.preferences.quickCopy.siteEditor.outputFormat;" control="zotero-quickCopy-menu"/>
-		<vbox>
+		<menulist id="zotero-quickCopy-menu"/>
-			<label value="&zotero.preferences.quickCopy.siteEditor.outputFormat;" control="zotero-quickCopy-format"/>
+		<separator class="thin"/>
-			<menulist id="zotero-quickCopy-format"/>
+		<checkbox id="zotero-quickCopy-copyAsHTML" label="&zotero.preferences.quickCopy.copyAsHTML;"
-		</vbox>
+			oncommand="buildQuickCopyFormatDropDown(document.getElementById('zotero-quickCopy-menu'), this.checked ? 'html' : '')"/>
 	</vbox>
 	
 	<script>
 	<![CDATA[
 		var io = window.arguments[0];
 		document.getElementById('zotero-quickCopy-domain').value = io.domain ? io.domain : '';
-		buildQuickCopyFormatDropDown(document.getElementById('zotero-quickCopy-format'), io.format);
+		buildQuickCopyFormatDropDown(document.getElementById('zotero-quickCopy-menu'), Zotero.QuickCopy.getContentType(io.format), io.format);
+		updateQuickCopyHTMLCheckbox();
 	]]>
 	</script>
 </dialog>

chrome/content/zotero/selectItemsDialog.js

@@ -61,11 +61,26 @@ function onCollectionSelected()
 	{
 		var collection = collectionsView._getItemAtRow(collectionsView.selection.currentIndex);
 		collection.setSearch('');
-
+		
-		itemsView = new Zotero.ItemTreeView(collection, (window.arguments[1] ? true : false));
+		try {
-		document.getElementById('zotero-items-tree').view = itemsView;
+			Zotero.UnresponsiveScriptIndicator.disable();
+			itemsView = new Zotero.ItemTreeView(collection, (window.arguments[1] ? true : false));
+			document.getElementById('zotero-items-tree').view = itemsView;
+		}
+		finally {
+			Zotero.UnresponsiveScriptIndicator.enable();
+		}
+		
+		if (collection.isLibrary()) {
+			Zotero.Prefs.set('lastViewedFolder', 'L');
+		}
+		if (collection.isCollection()) {
+			Zotero.Prefs.set('lastViewedFolder', 'C' + collection.ref.getID());
+		}
+		else if (collection.isSearch()) {
+			Zotero.Prefs.set('lastViewedFolder', 'S' + collection.ref.id);
+		}
 	}
-
 }
 
 function onSearch()

chrome/content/zotero/tools/csledit.xul

@@ -99,7 +99,7 @@
 					iframe.contentDocument.documentElement.innerHTML = '<html><head><title></title></head><body><p style="color: red">No references selected in Zotero.</p></body></html>';
 					return;
 				}
-				
+				var csl;
 				if (str.indexOf("<defaults") != -1) {
 					csl = new Zotero.CSL.Compat(str);
 				}

chrome/content/zotero/tools/cslpreview.xul

@@ -93,7 +93,7 @@
 					iframe.contentDocument.documentElement.innerHTML = '<html><head><title></title></head><body><p style="color: red">No references selected in Zotero.</p></body></html>';
 					return '';
 				}
-				
+				var csl;
 				if (str.indexOf("<defaults") != -1) {
 					csl = new Zotero.CSL.Compat(str);
 				}

chrome/content/zotero/xpcom/annotate.js

@@ -867,8 +867,8 @@ Zotero.Annotation.prototype._confirmDelete = function(event) {
 	var dontShowAgain = { value: false };
 	var del = promptService.confirmCheck(
 		this.window,
-		Zotero.getString('annotations.regenerate.title'),
+		Zotero.getString('annotations.confirmClose.title'),
-		Zotero.getString('annotations.regenerate.body'),
+		Zotero.getString('annotations.confirmClose.body'),
 		Zotero.getString('general.dontShowWarningAgain'),
 		dontShowAgain
 	);

chrome/content/zotero/xpcom/attachments.js

@@ -174,6 +174,13 @@ Zotero.Attachments = new function(){
 	function importFromURL(url, sourceItemID, forceTitle, forceFileBaseName, parentCollectionIDs){
 		Zotero.debug('Importing attachment from URL');
 		
+		// Throw error on invalid URLs
+		urlRe = /^https?:\/\/[^\s]*$/;
+		var matches = urlRe.exec(url);
+		if (!matches) {
+			throw ("Invalid URL '" + url + "' in Zotero.Attachments.importFromURL()");
+		}
+		
 		Zotero.Utilities.HTTP.doHead(url, function(obj){
 			var mimeType = obj.channel.contentType;
 			
@@ -343,6 +350,13 @@ Zotero.Attachments = new function(){
 	function linkFromURL(url, sourceItemID, mimeType, title){
 		Zotero.debug('Linking attachment from URL');
 		
+		// Throw error on invalid URLs
+		urlRe = /^https?:\/\/[^\s]*$/;
+		var matches = urlRe.exec(url);
+		if (!matches) {
+			throw ("Invalid URL '" + url + "' in Zotero.Attachments.linkFromURL()");
+		}
+		
 		// If no title provided, figure it out from the URL
 		if (!title){
 			title = url.substring(url.lastIndexOf('/')+1);
@@ -814,21 +828,21 @@ Zotero.Attachments = new function(){
 					var value = item.getField(field, false, true);
 			}
 			
+			var re = new RegExp("\{?([^%\{\}]*)" + rpl + "(\{[0-9]+\})?" + "([^%\{\}]*)\}?");
+			
 			// If no value for this field, strip entire conditional block
 			// (within curly braces)
 			if (!value) {
-				var re = new RegExp("\{[^%]*" + rpl + "(\{[0-9]+\})?" + "[^%]*\}");
 				if (str.match(re)) {
 					return str.replace(re, '')
 				}
 			}
 			
-			var f = function(match) {
+			var f = function(match, p1, p2, p3) {
-				var chars = match.match(/{([0-9]+)}/);
+				var maxChars = p2 ? p2.replace(/[^0-9]+/g, '') : false;
-				return (chars) ? value.substr(0, chars[1]) : value;
+				return p1 + (maxChars ? value.substr(0, maxChars) : value) + p3;
 			}
 			
-			var re = new RegExp("(\{[^%]*)?" + rpl + "(\{[0-9]+\})?" + "([^%]*\})?");
 			return str.replace(re, f);
 		}
 		

chrome/content/zotero/xpcom/data_access.js

@@ -110,7 +110,7 @@ Zotero.Item.prototype.loadFromID = function(id) {
 					break;
 				
 				case 'firstCreator':
-					colSQL = Zotero.Items.getfirstCreatorSQL();
+					colSQL = Zotero.Items.getFirstCreatorSQL();
 					break;
 					
 				case 'numNotes':
@@ -1789,9 +1789,34 @@ Zotero.Item.prototype.getAttachments = function(){
 		return [];
 	}
 	
-	var sql = "SELECT itemID FROM itemAttachments NATURAL JOIN items "
+	var sql = "SELECT A.itemID, value AS title FROM itemAttachments A "
-		+ "WHERE sourceItemID=" + this.getID() + " ORDER BY dateAdded";
+		+ "NATURAL JOIN items I LEFT JOIN itemData ID USING (itemID) "
-	return Zotero.DB.columnQuery(sql);
+		+ "LEFT JOIN itemDataValues IDV "
+		+ "ON (fieldID=110 AND ID.valueID=IDV.valueID) "
+		+ "WHERE sourceItemID=?";
+		
+	if (Zotero.Prefs.get('sortAttachmentsChronologically')) {
+		sql +=  " ORDER BY dateAdded";
+		return Zotero.DB.columnQuery(sql, this.getID());
+	}
+	
+	var attachments = Zotero.DB.query(sql, this.getID());
+	if (!attachments) {
+		return false;
+	}
+	
+	// Sort by title
+	var collation = Zotero.getLocaleCollation();
+	var f = function (a, b) {
+		return collation.compareString(1, a.title, b.title);
+	}
+	
+	var attachmentIDs = [];
+	attachments.sort(f);
+	for each(var attachment in attachments) {
+		attachmentIDs.push(attachment.itemID);
+	}
+	return attachmentIDs;
 }
 
 
@@ -1876,6 +1901,21 @@ Zotero.Item.prototype.addTag = function(tag, type){
 }
 
 
+Zotero.Item.prototype.addTags = function (tags, type) {
+	Zotero.DB.beginTransaction();
+	try {
+		for each(var tag in tags) {
+			this.addTag(tag, type);
+		}
+		Zotero.DB.commitTransaction();
+	}
+	catch (e) {
+		Zotero.DB.rollbackTransaction();
+		throw (e);
+	}
+}
+
+
 Zotero.Item.prototype.addTagByID = function(tagID) {
 	if (!this.getID()) {
 		throw ('Cannot add tag to unsaved item in Item.addTagByID()');
@@ -3153,7 +3193,7 @@ Zotero.Notes = new function(){
 /*
  * Constructor for Collection object
  *
- * Generally should be called from Zotero.Collection rather than directly
+ * Generally should be called from Zotero.Collections rather than directly
  */
 Zotero.Collection = function(){
 	 this._init();

chrome/content/zotero/xpcom/db.js

@@ -44,6 +44,15 @@ Zotero.DBConnection = function(dbName) {
 //
 /////////////////////////////////////////////////////////////////
 
+/**
+ * Test a connection to the database, throwing any errors that occur
+ *
+ * @return	void
+ */
+Zotero.DBConnection.prototype.test = function () {
+	this._getDBConnection();
+}
+
 /*
  * Run an SQL query
  *

chrome/content/zotero/xpcom/ingester.js

@@ -288,11 +288,11 @@ Zotero.OpenURL = new function() {
 			if(item.journalAbbreviation) co += _mapTag(item.journalAbbreviation, "stitle", version);
 			if(item.volume) co += _mapTag(item.volume, "volume", version);
 			if(item.issue) co += _mapTag(item.issue, "issue", version);
-		} else if(item.itemType == "book" || item.itemType == "bookitem") {
+		} else if(item.itemType == "book" || item.itemType == "bookSection") {
 			if(version == "0.1") {
 				co += "&genre=book";
 			} else {
-				co += "&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook&rft.genre=book";
+				co += "&rft_val_fmt=info%3Aofi%2Ffmt%3Akev%3Amtx%3Abook";
 			}
 			
 			if(item.itemType == "book") {

chrome/content/zotero/xpcom/integration.js

@@ -20,7 +20,7 @@
     ***** END LICENSE BLOCK *****
 */
 
-const API_VERSION = 3;
+const API_VERSION = 4;
 
 Zotero.Integration = new function() {
 	var _contentLengthRe = /[\r\n]Content-Length: *([0-9]+)/i;
@@ -393,7 +393,7 @@ Zotero.Integration.SOAP = new function() {
 				}
 			} else if(editCitationIndex !== false && vars[i] == editCitationIndex) {
 				// save citation data
-				editCitation = session.unserializeCitation(vars[i+1]);
+				editCitation = session.unserializeCitation(vars[i+1], vars[i]);
 			} else {
 				session.addCitation(vars[i], vars[i+1]);
 			}
@@ -422,7 +422,7 @@ Zotero.Integration.SOAP = new function() {
 		// update
 		var output = new Array();
 		if((bibliographyMode == "updated"			// if we want updated bib
-				&& session.itemSetHasChanged)		// and bibliography changed
+				&& session.bibliographyHasChanged)	// and bibliography changed
 				|| bibliographyMode == "true") {	// or if we should generate regardless of changes
 			var bibliography = session.getBibliography();
 			if(!bibliography) bibliography = "!";
@@ -454,11 +454,16 @@ Zotero.Integration.SOAP = new function() {
 	 */
 	function restoreSession(vars) {
 		if(!vars || !_checkVersion(vars[0])) {
-			return "ERROR:"+Zotero.getString("integration.incompatibleVersion");
+			return "ERROR:"+Zotero.getString("integration.incompatibleVersion", Zotero.version);
+		}
+
+		try {
+			Zotero.Cite.getStyle(vars[2]);
+		} catch(e) {
+			return "ERROR:prefsNeedReset";
 		}
 		
 		var sessionID = Zotero.randomString();
-		
 		var session = _sessions[sessionID] = new Zotero.Integration.Session();
 		session.setStyle(vars[2], vars[3], vars[4]);
 		
@@ -472,6 +477,7 @@ Zotero.Integration.SOAP = new function() {
 		
 		session.updateItemSet(session.citationsByItemID);
 		if(vars[1] != "!") session.loadDocumentData(vars[1]);
+		session.sortItemSet();
 		session.resetRequest();
 		
 		return [sessionID];
@@ -484,7 +490,7 @@ Zotero.Integration.SOAP = new function() {
 	 */
 	function setDocPrefs(vars) {
 		if(!vars || !vars.length || !_checkVersion(vars[1])) {
-			return "ERROR:"+Zotero.getString("integration.incompatibleVersion");
+			return "ERROR:"+Zotero.getString("integration.incompatibleVersion", Zotero.version);
 		}
 		
 		var io = new function() {
@@ -496,6 +502,7 @@ Zotero.Integration.SOAP = new function() {
 			io.openOffice = true;
 		}
 		
+		var oldStyle = false;
 		if(vars[0] == "!") {
 			// no session ID; generate a new one
 			var sessionID = Zotero.randomString();
@@ -506,7 +513,7 @@ Zotero.Integration.SOAP = new function() {
 			var session = _sessions[sessionID];
 			if(!session) return "ERROR:sessionExpired";
 			
-			io.style = session.styleID;
+			oldStyle = io.style = session.styleID;
 			io.useEndnotes = session.useEndnotes;
 			io.useBookmarks = session.useBookmarks;
 		}
@@ -514,6 +521,9 @@ Zotero.Integration.SOAP = new function() {
 		watcher.openWindow(null, 'chrome://zotero/content/integrationDocPrefs.xul', '',
 		                   'chrome,modal'+(Zotero.isWin ? ',popup' : ''), io, true);
 		session.setStyle(io.style, io.useEndnotes, io.useBookmarks);
+		if(!oldStyle || oldStyle == io.style) {
+			session.regenerateAll = session.bibliographyHasChanged = true;
+		}
 		
 		return [sessionID, io.style, session.style.class, session.style.hasBibliography ? "1" : "0", io.useEndnotes, io.useBookmarks];
 	}
@@ -548,10 +558,8 @@ Zotero.Integration.Session.prototype.setStyle = function(styleID, useEndnotes, u
 	this.style = Zotero.Cite.getStyle(styleID);
 	this.useEndnotes = useEndnotes;
 	this.useBookmarks = useBookmarks;
-	
 	this.itemSet = this.style.createItemSet();
 	this.dateModified = new Object();
-	this.itemSetIsSorted = true;
 	
 	this.loadUncitedItems();
 }
@@ -563,7 +571,8 @@ Zotero.Integration.Session.prototype.resetRequest = function() {
 	this.citationsByItemID = new Object();
 	this.citationsByIndex = new Array();
 	
-	this.itemSetHasChanged = false;
+	this.regenerateAll = false;
+	this.bibliographyHasChanged = false;
 	this.documentDataHasChanged = false;
 	this.updateItemIDs = new Object();
 	this.updateIndices = new Object()
@@ -613,15 +622,12 @@ Zotero.Integration._oldCitationLocatorMap = {
  * gets a Zotero.CSL.Citation object given a field name
  */
 Zotero.Integration.Session.prototype.addCitation = function(index, arg) {
+	var index = parseInt(index, 10);
+	
 	if(typeof(arg) == "string") {	// text field
 		if(arg == "!" || arg == "X") return;
 		
-		var citation = this.unserializeCitation(arg);
+		var citation = this.unserializeCitation(arg, index);
-		if(arg[0] == "{") {		// JSON
-			citation.properties.field = arg;
-		} else {
-			this.updateIndices[citation.properties.index];
-		}
 	} else {					// a citation already
 		var citation = arg;
 	}
@@ -673,7 +679,7 @@ Zotero.Integration.Session.prototype.completeCitation = function(object) {
 			
 			this.dateModified[citationItem.itemID] = item.zoteroItem.getField("dateModified", true, true);
 			this.updateItemIDs[citationItem.itemID] = true;
-			this.itemSetChanged();
+			this.bibliographyHasChanged = true;
 		}
 		
 		citationItem.item = item;
@@ -684,11 +690,20 @@ Zotero.Integration.Session.prototype.completeCitation = function(object) {
 /*
  * unserializes a JSON citation into a citation object (sans items)
  */
-Zotero.Integration.Session.prototype.unserializeCitation = function(arg) {
+Zotero.Integration.Session.prototype.unserializeCitation = function(arg, index) {
 	if(arg[0] == "{") {		// JSON field
 		// create citation
 		var citation = this.style.createCitation();
 		
+		// fix for corrupted fields
+		var lastBracket = arg.lastIndexOf("}");
+		if(lastBracket+1 != arg.length) {
+			arg = arg.substr(0, lastBracket+1);
+			this.updateIndices[index] = true;
+		} else {
+			citation.properties.field = arg;
+		}
+		
 		// get JSON
 		var object = Zotero.JSON.unserialize(arg);
 		
@@ -721,6 +736,7 @@ Zotero.Integration.Session.prototype.unserializeCitation = function(arg) {
 		}
 		
 		var citation = this.style.createCitation(citationItems);
+		this.updateIndices[index] = true;
 	}
 	
 	return citation;
@@ -758,7 +774,6 @@ Zotero.Integration.Session.prototype.previewCitation = function(citation) {
 	// delete from item set
 	if(deleteItems.length) {
 		this.itemSet.remove(deleteItems);
-		this.itemSetIsSorted = false;
 	}
 	
 	return text;
@@ -774,7 +789,7 @@ Zotero.Integration.Session.prototype.editCitation = function(index, citation) {
 	
 	// create object to hold citation
 	io.citation = (citation ? citation.clone() : this.style.createCitation());
-	io.citation.properties.index = index;
+	io.citation.properties.index = parseInt(index, 10);
 	// assign preview function
 	io.previewFunction = function() {
 		return me.previewCitation(io.citation);
@@ -881,7 +896,6 @@ Zotero.Integration.Session.prototype.updateItemSet = function() {
 					citation.properties.delete = true;
 				}
 			}
-			this.itemSetChanged();
 		}
 	}
 	
@@ -892,7 +906,6 @@ Zotero.Integration.Session.prototype.updateItemSet = function() {
 		// see if items were removed 
 		if(!this.citationsByItemID[itemID] && !this.uncitedItems[itemID]) {
 			deleteItems.push(itemID);
-			this.itemSetChanged();
 			continue;
 		}
 
@@ -901,13 +914,12 @@ Zotero.Integration.Session.prototype.updateItemSet = function() {
 			this.dateModified[itemID] = item.zoteroItem.getField("dateModified", true, true);
 			// add to list of updated item IDs
 			this.updateItemIDs[itemID] = true;
-			// need to resort now
-			this.itemSetChanged();
 		}
 	}
 	
 	if(deleteItems.length) {
 		this.itemSet.remove(deleteItems);
+		this.bibliographyHasChanged = true;
 	}
 	
 	this.sortItemSet();
@@ -917,55 +929,21 @@ Zotero.Integration.Session.prototype.updateItemSet = function() {
  * sorts the ItemSet (what did you think it did?)
  */
 Zotero.Integration.Session.prototype.sortItemSet = function() {
-	if(!this.itemSetIsSorted) {
+	// save first index
-		if(!this.itemSet.sortable) {
+	for(var itemID in this.citationsByItemID) {
-			// sort by order in document. we need a stable sort, so first we
+		if(this.citationsByItemID[itemID]) {
-			// collect old indices.
+			var item = this.itemSet.getItemsByIds([itemID])[0];
-			var oldItemIndices = new Object();
+			if(item) item.setProperty("index", this.citationsByItemID[itemID][0].properties.index);
-			for(var i=0; i<this.itemSet.items.length; i++) {
-				oldItemIndices[this.itemSet.items[i].getID()] = i;
-			}
-			
-			var me = this;
-			this.itemSet.items.sort(function(a, b) { return me.sortByOrderAdded(a, b, oldItemIndices) });
 		}
-		
-		var citationChanged = this.itemSet.resort();
-		
-		// add to list of updated item IDs
-		for each(var item in citationChanged) {
-			this.updateItemIDs[item.getID()] = true;
-		}
-		
-		this.itemSetIsSorted = true;
-	}
-}
-
-/*
- * sorts items by order added
- */
-Zotero.Integration.Session.prototype.sortByOrderAdded = function(a, b, oldItemIndices) {
-	var aID = a.getID();
-	var bID = b.getID();
-	
-	if(this.citationsByItemID[aID] && this.citationsByItemID[aID].length) {
-		if(!this.citationsByItemID[bID] || !this.citationsByItemID[bID].length) return -1;
-		
-		var diff = this.citationsByItemID[aID][0].properties.index-this.citationsByItemID[bID][0].properties.index;
-		if(diff != 0) return diff;
-	} else if(this.citationsByItemID[bID] && this.citationsByItemID[bID].length) {
-		return 1;
 	}
 	
-	return oldItemIndices[aID]-oldItemIndices[bID];
+	var citationChanged = this.itemSet.resort();
-}
+	
-
+	// add to list of updated item IDs
-/*
+	for each(var item in citationChanged) {
- * marks an itemSet as changed
+		this.updateItemIDs[item.getID()] = true;
- */
+		this.bibliographyHasChanged = true;
-Zotero.Integration.Session.prototype.itemSetChanged = function() {
+	}
-	this.itemSetIsSorted = false;
-	this.itemSetHasChanged = true;
 }
 
 /*
@@ -975,8 +953,7 @@ Zotero.Integration.Session.prototype.editBibliography = function() {
 	var bibliographyEditor = new Zotero.Integration.Session.BibliographyEditInterface(this);
 	var io = new function() { this.wrappedJSObject = bibliographyEditor; }
 	
-	this.documentDataHasChanged = true;
+	this.documentDataHasChanged = this.bibliographyHasChanged = true;
-	this.itemSetHasChanged = true;
 	
 	Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
 	          .getService(Components.interfaces.nsIWindowWatcher)
@@ -996,7 +973,7 @@ Zotero.Integration.Session.prototype.getBibliography = function() {
  * gets citations in need of update
  */
 Zotero.Integration.Session.prototype.getCitations = function(regenerateAll) {
-	if(regenerateAll) {
+	if(regenerateAll || this.regenerateAll) {
 		// update all indices
 		for(var i=0; i<this.citationsByIndex.length; i++) {
 			this.updateIndices[i] = true;
@@ -1031,7 +1008,9 @@ Zotero.Integration.Session.prototype.getCitations = function(regenerateAll) {
 			if(citation.properties.custom) {
 				output.push(citation.properties.custom);
 			} else {
-				output.push(this.style.formatCitation(citation, "Integration"));
+				var citation = this.style.formatCitation(citation, "Integration");
+				if(citation == "") citation = " ";
+				output.push(citation);
 			}
 		}
 	}
@@ -1056,9 +1035,7 @@ Zotero.Integration.Session.prototype.loadDocumentData = function(json) {
 	// set custom bibliography entries
 	if(documentData.custom) {
 		for(var itemID in documentData.custom) {
-			Zotero.debug("getting item "+itemID);
 			var item = this.itemSet.getItemsByIds([itemID])[0];
-			Zotero.debug(item.toSource());
 			item.setProperty("bibliography-Integration", documentData.custom[itemID]);
 		}
 	}
@@ -1130,14 +1107,12 @@ Zotero.Integration.Session.BibliographyEditInterface.prototype.add = function(it
 	// create new item
 	this.session.itemSet.add([item]);
 	this.session.uncitedItems[item.getID()] = true;
-	this.session.itemSetChanged();
 	this.session.sortItemSet();
 }
 
 Zotero.Integration.Session.BibliographyEditInterface.prototype.remove = function(item) {
 	// create new item
 	this.session.itemSet.remove([item]);
-	this.session.itemSetChanged();
 	this.session.sortItemSet();
 	
 	// delete citations if necessary

chrome/content/zotero/xpcom/itemTreeView.js

@@ -1432,9 +1432,6 @@ Zotero.ItemTreeCommandController.prototype.onEvent = function(evt)
  */
 Zotero.ItemTreeView.prototype.onDragStart = function (evt,transferData,action)
 { 
-	try {
-	
-	
 	transferData.data = new TransferData();
 	transferData.data.addDataForFlavour("zotero/item", this.saveSelection());
 	
@@ -1472,17 +1469,13 @@ Zotero.ItemTreeView.prototype.onDragStart = function (evt,transferData,action)
 	if (mode == 'export') {
 		Zotero.QuickCopy.getContentFromItems(items, format, exportCallback);
 	}
-	else if (mode == 'bibliography') {
+	else if (mode.indexOf('bibliography') == 0) {
 		var content = Zotero.QuickCopy.getContentFromItems(items, format);
 		transferData.data.addDataForFlavour("text/unicode", content.text);
 		transferData.data.addDataForFlavour("text/html", content.html);
 	}
-	
+	else {
-	
+		Components.utils.reportError("Invalid Quick Copy mode '" + mode + "'");
-	
-	}
-	catch (e) {
-		Zotero.debug(e);
 	}
 }
 

chrome/content/zotero/xpcom/quickCopy.js

@@ -1,6 +1,8 @@
 Zotero.QuickCopy = new function() {
 	this.getFormattedNameFromSetting = getFormattedNameFromSetting;
 	this.getSettingFromFormattedName = getSettingFromFormattedName;
+	this.getContentType = getContentType;
+	this.stripContentType = stripContentType;
 	this.getFormatFromURL = getFormatFromURL;
 	this.getContentFromItems = getContentFromItems;
 	
@@ -13,7 +15,7 @@ Zotero.QuickCopy = new function() {
 			_init();
 		}
 		
-		return _formattedNames[setting];
+		return _formattedNames[this.stripContentType(setting)];
 	}
 	
 	function getSettingFromFormattedName(name) {
@@ -31,6 +33,23 @@ Zotero.QuickCopy = new function() {
 	}
 	
 	
+	/*
+	 * Returns the setting with any contentType stripped from the mode part
+	 */
+	function getContentType(setting) {
+		var matches = setting.match(/(?:bibliography|export)\/([^=]+)=.+$/, '$1');
+		return matches ? matches[1] : '';
+	}
+	
+	
+	/*
+	 * Returns the setting with any contentType stripped from the mode part
+	 */
+	function stripContentType(setting) {
+		return setting.replace(/(bibliography|export)(?:\/[^=]+)?=(.+)$/, '$1=$2');
+	}
+	
+	
 	function getFormatFromURL(url) {
 		if (!url) {
 			return Zotero.Prefs.get("export.quickCopy.setting");
@@ -51,9 +70,9 @@ Zotero.QuickCopy = new function() {
 		var matches = [];
 		
 		var sql = "SELECT key AS domainPath, value AS format FROM settings "
-			+ "WHERE setting='quickCopySite' AND key LIKE ?";
+			+ "WHERE setting='quickCopySite' AND (key LIKE ? OR key LIKE ?)";
 		var urlDomain = urlHostPort.match(/[^\.]+\.[^\.]+$/);
-		var rows = Zotero.DB.query(sql, ['%' + urlDomain + '%']);
+		var rows = Zotero.DB.query(sql, ['%' + urlDomain + '%', '/%']);
 		for each(var row in rows) {
 			var [domain, path] = row.domainPath.split(/\//);
 			path = '/' + (path ? path : '');
@@ -113,6 +132,7 @@ Zotero.QuickCopy = new function() {
 	 */
 	function getContentFromItems(items, format, callback) {
 		var [mode, format] = format.split('=');
+		var [mode, contentType] = mode.split('/');
 		
 		if (mode == 'export') {
 			var translation = new Zotero.Translate("export");
@@ -127,7 +147,7 @@ Zotero.QuickCopy = new function() {
 			var csl = Zotero.Cite.getStyle(format);
 			var itemSet = csl.createItemSet(items);
 			var bibliography = {
-				text: csl.formatBibliography(itemSet, "Text"),
+				text: csl.formatBibliography(itemSet, contentType == "html" ? "HTML" : "Text"),
 				html: csl.formatBibliography(itemSet, "HTML")
 			};
 			return bibliography;

chrome/content/zotero/xpcom/schema.js

@@ -203,6 +203,17 @@ Zotero.Schema = new function(){
 	* 	since the last check
 	**/
 	function updateScrapersRemote(force, callback) {
+		// Little hack to manually update from repo on upgrade to 1.0.3
+		if (!force) {
+			var syncTargetVersion = 2; // increment this when releasing new version that requires it
+			var syncVersion = _getDBVersion('sync');
+			if (syncVersion < syncTargetVersion) {
+				_updateDBVersion('sync', syncTargetVersion);
+				force = true;
+				var uriChangeFix = true;
+			}
+		}
+		
 		if (!force){
 			if (_remoteUpdateInProgress) {
 				Zotero.debug("A remote update is already in progress -- not checking repository");
@@ -255,6 +266,11 @@ Zotero.Schema = new function(){
 			else {
 				url += '&m=1';
 			}
+			
+			// Fix for styles with new URIs in 1.0.3
+			if (uriChangeFix) {
+				url += '&urifix=1';
+			}
 		}
 		
 		var get = Zotero.Utilities.HTTP.doGet(url, function (xmlhttp) {

chrome/content/zotero/xpcom/search.js

@@ -111,9 +111,13 @@ Zotero.Search.prototype.getName = function(){
 /*
  * Save the search to the DB and return a savedSearchID
  *
+ * If there are gaps in the searchConditionIDs, |fixGaps| must be true
+ * and the caller must dispose of the search or reload the condition ids,
+ * which may change after the save.
+ *
  * For new searches, setName() must be called before saving
  */
-Zotero.Search.prototype.save = function(){
+Zotero.Search.prototype.save = function(fixGaps) {
 	if (!this._savedSearchName){
 		throw('Name not provided for saved search');
 	}
@@ -139,6 +143,20 @@ Zotero.Search.prototype.save = function(){
 			[this._savedSearchID, {string: this._savedSearchName}]);
 	}
 	
+	// Close gaps in savedSearchIDs
+	var saveConditions = {};
+	var i = 1;
+	for (var id in this._conditions) {
+		if (!fixGaps && id != i) {
+			Zotero.DB.rollbackTransaction();
+			throw ('searchConditionIDs not contiguous and |fixGaps| not set in save() of saved search ' + this._savedSearchID);
+		}
+		saveConditions[i] = this._conditions[id];
+		i++;
+	}
+	
+	this._conditions = saveConditions;
+	
 	// TODO: use proper bound parameters once DB class is updated
 	for (var i in this._conditions){
 		var sql = "INSERT INTO savedSearchConditions (savedSearchID, "
@@ -331,7 +349,10 @@ Zotero.Search.prototype.search = function(asTempTable){
 		this._buildQuery();
 	}
 	
+	// Default to 'all' mode
 	var joinMode = 'all';
+	
+	// Set some variables for conditions to avoid further lookups
 	for each(var condition in this._conditions) {
 		switch (condition.condition) {
 			case 'joinMode':
@@ -368,6 +389,7 @@ Zotero.Search.prototype.search = function(asTempTable){
 		}
 	}
 	
+	// Run a subsearch to define the superset of possible results
 	if (this._scope) {
 		Zotero.DB.beginTransaction();
 		
@@ -405,23 +427,33 @@ Zotero.Search.prototype.search = function(asTempTable){
 		sql += ")";
 		
 		var ids = Zotero.DB.columnQuery(sql, this._sqlParams);
+		/*
+		// DEBUG: Should this be here?
+		//
+		if (!ids) {
+			Zotero.DB.query("DROP TABLE " + tmpTable);
+			Zotero.DB.commitTransaction();
+			return false;
+		}
+		*/
 	}
+	// Or just run main search
 	else {
 		var ids = Zotero.DB.columnQuery(this._sql, this._sqlParams);
 	}
 	
-	//Zotero.debug('IDs from main search: ');
+	//Zotero.debug('IDs from main search or subsearch: ');
 	//Zotero.debug(ids);
 	
 	//Zotero.debug('Join mode: ' + joinMode);
 	
 	// Filter results with fulltext search
 	//
-	// If join mode ALL, return the (union of main and fulltext word search)
+	// If join mode ALL, return the (intersection of main and fulltext word search)
 	// filtered by fulltext content
 	//
 	// If join mode ANY or there's a quicksearch (which we assume
-	// fulltextContent is part of), return the superset of the main search and
+	// fulltextContent is part of), return the union of the main search and
 	// (a separate fulltext word search filtered by fulltext content)
 	for each(var condition in this._conditions){
 		if (condition['condition']=='fulltextContent'){
@@ -485,8 +517,10 @@ Zotero.Search.prototype.search = function(asTempTable){
 				}
 				var fulltextWordIDs = s.search();
 				
+				//Zotero.debug("Fulltext word IDs");
+				//Zotero.debug(fulltextWordIDs);
 				
-				// If ALL mode, set union of main search and fulltext word index
+				// If ALL mode, set intersection of main search and fulltext word index
 				// as the scope for the fulltext content search
 				if (joinMode == 'all' && !hasQuicksearch) {
 					var hash = {};
@@ -508,16 +542,16 @@ Zotero.Search.prototype.search = function(asTempTable){
 				}
 			}
 			
-			var fulltextIDs = Zotero.Fulltext.findTextInItems(scopeIDs,
+			if (scopeIDs && scopeIDs.length) {
-				condition['value'],	condition['mode']);
+				var fulltextIDs = Zotero.Fulltext.findTextInItems(scopeIDs,
-			
+					condition['value'], condition['mode']);
-			if (scopeIDs) {
+				
 				var hash = {};
 				for each(var val in fulltextIDs){
 					hash[val.id] = true;
 				}
 				
-				var filteredIDs = scopeIDs.filter(filter);
+				filteredIDs = scopeIDs.filter(filter);
 			}
 			else {
 				var filteredIDs = [];

chrome/content/zotero/xpcom/translate.js

@@ -661,7 +661,6 @@ Zotero.Translate.prototype._generateSandbox = function() {
 		this._sandbox.Zotero.Utilities = new Zotero.Utilities();
 	}
 	
-	
 	if(this.type == "export") {
 		// add routines to retrieve items and collections
 		this._sandbox.Zotero.nextItem = function() { return me._exportGetItem() };
@@ -690,7 +689,7 @@ Zotero.Translate.prototype._generateSandbox = function() {
 	this._sandbox.Zotero.addOption = function(option, value) {me._addOption(option, value) };
 	// for getting the value of displayed options
 	this._sandbox.Zotero.getOption = function(option) { return me._getOption(option) };
-	
+
 	// for loading other translators and accessing their methods
 	this._sandbox.Zotero.loadTranslator = function(type) {
 		var translation = new Zotero.Translate(type, false);
@@ -1023,24 +1022,43 @@ Zotero.Translate.prototype._itemTagsAndSeeAlso = function(item, newItem) {
 		}
 	}
 	if(item.tags) {
+		var tagsToAdd = {};
+		tagsToAdd[0] = []; // user tags
+		tagsToAdd[1] = []; // automatic tags
+		
 		for each(var tag in item.tags) {
 			if(typeof(tag) == "string") {
 				// accept strings in tag array as automatic tags, or, if
 				// importing, as non-automatic tags
-				newItem.addTag(tag, (this.type == "import" ? 0 : 1));
+				if (this.type == 'import') {
+					tagsToAdd[0].push(tag);
+				}
+				else {
+					tagsToAdd[1].push(tag);
+				}
 			} else if(typeof(tag) == "object") {
 				// also accept objects
 				if(tag.tag) {
-					newItem.addTag(tag.tag, tag.type ? tag.type : 0);
+					if (!tagsToAdd[tag.type]) {
+						tagsToAdd[tag.type] = [];
+					}
+					tagsToAdd[tag.type].push(tag.tag);
 				}
 			}
 		}
+		
+		for (var type in tagsToAdd) {
+			if (tagsToAdd[type].length) {
+				newItem.addTags(tagsToAdd[type], type);
+			}
+		}
 	}
 }
 
 /*
  * executed when an item is done and ready to be loaded into the database
  */
+Zotero.Translate._urlRe = /(([A-Za-z]+):\/\/[^\s]*)/i;
 Zotero.Translate.prototype._itemDone = function(item, attachedTo) {
 	if(this.type == "web") {
 		// store repository if this item was captured from a website, and
@@ -1092,18 +1110,36 @@ Zotero.Translate.prototype._itemDone = function(item, attachedTo) {
 			
 			Zotero.debug("Translate: adding attachment");
 			
+			if(!item.url && !item.path) {
+				Zotero.debug("Translate: ignoring attachment: no path or URL specified");
+				return;
+			}
+			
+			if(!item.path) {
+				// see if this is actually a file URL
+				var m = Zotero.Translate._urlRe.exec(item.url);
+				var protocol = m ? m[2].toLowerCase() : "";
+				if(protocol == "file") {
+					item.path = item.url;
+					item.url = false;
+				} else if(protocol != "http" && protocol != "https") {
+					Zotero.debug("Translate: unrecognized protocol "+protocol);
+					return;
+				}
+			}
+			
 			if(!item.path) {
 				// create from URL
-				if(item.url) {
+				try {
 					var myID = Zotero.Attachments.linkFromURL(item.url, attachedTo,
 							(item.mimeType ? item.mimeType : undefined),
 							(item.title ? item.title : undefined));
-					Zotero.debug("Translate: created attachment; id is "+myID);
+				} catch(e) {
-					var newItem = Zotero.Items.get(myID);
+					Zotero.debug("Translate: error adding attachment "+item.url);
-				} else {
-					Zotero.debug("Translate: not adding attachment: no path or url specified");
 					return;
 				}
+				Zotero.debug("Translate: created attachment; id is "+myID);
+				var newItem = Zotero.Items.get(myID);
 			} else {
 				// generate nsIFile
 				var IOService = Components.classes["@mozilla.org/network/io-service;1"].
@@ -1112,10 +1148,14 @@ Zotero.Translate.prototype._itemDone = function(item, attachedTo) {
 				var file = uri.QueryInterface(Components.interfaces.nsIFileURL).file;
 				
 				if (!file.exists()) {
+					// use item title if possible, or else file leaf name
+					var title = item.title;
+					if(!title) title = file.leafName;
+					
 					var myID = Zotero.Attachments.createMissingAttachment(
 						item.url ? Zotero.Attachments.LINK_MODE_IMPORTED_URL
 							: Zotero.Attachments.LINK_MODE_IMPORTED_FILE,
-						file, item.url ? item.url : null, item.title,
+						file, item.url ? item.url : null, title,
 						item.mimeType, item.charset, attachedTo);
 				}
 				else if (item.url) {
@@ -1263,16 +1303,24 @@ Zotero.Translate.prototype._itemDone = function(item, attachedTo) {
 									Zotero.debug("Translate: NOTICE: either mimeType or title is missing; attaching file will be slower");
 								}
 								
-								Zotero.Attachments.linkFromURL(attachment.url, myID,
+								try {
-										(attachment.mimeType ? attachment.mimeType : undefined),
+									Zotero.Attachments.linkFromURL(attachment.url, myID,
-										(attachment.title ? attachment.title : undefined));
+											(attachment.mimeType ? attachment.mimeType : undefined),
+											(attachment.title ? attachment.title : undefined));
+								} catch(e) {
+									Zotero.debug("Translate: error adding attachment "+attachment.url);
+								}
 							}
 						} else if(attachment.document
 						|| (attachment.mimeType && attachment.mimeType == "text/html")
 						|| Zotero.Prefs.get("downloadAssociatedFiles")) {
 							// if snapshot is not explicitly set to false, retrieve snapshot
 							if(attachment.document) {
-								Zotero.Attachments.importFromDocument(attachment.document, myID, attachment.title);
+								try {
+									Zotero.Attachments.importFromDocument(attachment.document, myID, attachment.title);
+								} catch(e) {
+									Zotero.debug("Translate: error attaching document");
+								}
 							} else {
 								var mimeType = null;
 								var title = null;
@@ -1297,7 +1345,11 @@ Zotero.Translate.prototype._itemDone = function(item, attachedTo) {
 								}
 								
 								var fileBaseName = Zotero.Attachments.getFileBaseNameFromItem(myID);
-								Zotero.Attachments.importFromURL(attachment.url, myID, title, fileBaseName);
+								try {
+									Zotero.Attachments.importFromURL(attachment.url, myID, title, fileBaseName);
+								} catch(e) {
+									Zotero.debug("Zotero.Translate: error adding attachment "+attachment.url);
+								}
 							}
 						}
 					}
@@ -1330,23 +1382,42 @@ Zotero.Translate.prototype._itemDone = function(item, attachedTo) {
 	// enabled in the preferences (as it is by default)
 	if(item.tags &&
 	  (this.type == "import" || Zotero.Prefs.get("automaticTags"))) {
+		var tagsToAdd = {};
+		tagsToAdd[0] = []; // user tags
+		tagsToAdd[1] = []; // automatic tags
+		
 		for each(var tag in item.tags) {
 			if(typeof(tag) == "string") {
 				// accept strings in tag array as automatic tags, or, if
 				// importing, as non-automatic tags
-				newItem.addTag(tag, (this.type == "import" ? 0 : 1));
+				if (this.type == 'import') {
+					tagsToAdd[0].push(tag);
+				}
+				else {
+					tagsToAdd[1].push(tag);
+				}
 			} else if(typeof(tag) == "object") {
 				// also accept objects
 				if(tag.tag) {
-					if(this.type == "import") {
+					if (this.type == "import") {
-						newItem.addTag(tag.tag, tag.type ? tag.type : 0);
+						if (!tagsToAdd[tag.type]) {
-					} else {
+							tagsToAdd[tag.type] = [];
-						// force web imports to automatic
+						}
-						newItem.addTag(tag.tag, 1);
+						tagsToAdd[tag.type].push(tag.tag);
+					}
+					// force web imports to automatic
+					else {
+						tagsToAdd[1].push(tag.tag);
 					}
 				}
 			}
 		}
+		
+		for (var type in tagsToAdd) {
+			if (tagsToAdd[type].length) {
+				newItem.addTags(tagsToAdd[type], type);
+			}
+		}
 	}
 	
 	if(!attachedTo) this.runHandler("itemDone", newItem);

chrome/content/zotero/xpcom/utilities.js

@@ -488,7 +488,7 @@ Zotero.Utilities.Ingester.HTTP = function(translate) {
 	this.translate = translate;
 }
 
-Zotero.Utilities.Ingester.HTTP.prototype.doGet = function(urls, processor, done) {
+Zotero.Utilities.Ingester.HTTP.prototype.doGet = function(urls, processor, done, responseCharset) {
 	var callAgain = false;
 	
 	if(typeof(urls) == "string") {
@@ -523,10 +523,10 @@ Zotero.Utilities.Ingester.HTTP.prototype.doGet = function(urls, processor, done)
 		} catch(e) {
 			me.translate.error(false, e);
 		}
-	});
+	}, responseCharset);
 }
 
-Zotero.Utilities.Ingester.HTTP.prototype.doPost = function(url, body, onDone, contentType) {
+Zotero.Utilities.Ingester.HTTP.prototype.doPost = function(url, body, onDone, requestContentType, responseCharset) {
 	if(this.translate.locationIsProxied) {
 		url = Zotero.Ingester.ProxyMonitor.properToProxy(url);
 	}
@@ -541,7 +541,7 @@ Zotero.Utilities.Ingester.HTTP.prototype.doPost = function(url, body, onDone, co
 		} catch(e) {
 			translate.error(false, e);
 		}
-	}, contentType);
+	}, requestContentType, responseCharset);
 }
 
 // These are front ends for XMLHttpRequest. XMLHttpRequest can't actually be
@@ -563,7 +563,7 @@ Zotero.Utilities.HTTP = new function() {
 	* doGet can be called as:
 	* Zotero.Utilities.HTTP.doGet(url, onDone)
 	**/
-	function doGet(url, onDone, onError) {
+	function doGet(url, onDone, onError, responseCharset) {
 		Zotero.debug("HTTP GET "+url);
 		if (this.browserIsOffline()){
 			return false;
@@ -575,7 +575,7 @@ Zotero.Utilities.HTTP = new function() {
 		var test = xmlhttp.open('GET', url, true);
 		
 		xmlhttp.onreadystatechange = function(){
-			_stateChange(xmlhttp, onDone);
+			_stateChange(xmlhttp, onDone, responseCharset);
 		};
 		
 		xmlhttp.send(null);
@@ -592,7 +592,7 @@ Zotero.Utilities.HTTP = new function() {
 	* doPost can be called as:
 	* Zotero.Utilities.HTTP.doPost(url, body, onDone)
 	**/
-	function doPost(url, body, onDone, contentType) {
+	function doPost(url, body, onDone, requestContentType, responseCharset) {
 		Zotero.debug("HTTP POST "+body+" to "+url);
 		if (this.browserIsOffline()){
 			return false;
@@ -602,10 +602,10 @@ Zotero.Utilities.HTTP = new function() {
 					.createInstance();
 		
 		xmlhttp.open('POST', url, true);
-		xmlhttp.setRequestHeader("Content-Type", (contentType ? contentType : "application/x-www-form-urlencoded" ));
+		xmlhttp.setRequestHeader("Content-Type", (requestContentType ? requestContentType : "application/x-www-form-urlencoded" ));
 		
 		xmlhttp.onreadystatechange = function(){
-			_stateChange(xmlhttp, onDone);
+			_stateChange(xmlhttp, onDone, responseCharset);
 		};
 		
 		xmlhttp.send(body);
@@ -671,7 +671,7 @@ Zotero.Utilities.HTTP = new function() {
 	}
 	
 	
-	function _stateChange(xmlhttp, onDone){
+	function _stateChange(xmlhttp, onDone, responseCharset){
 		switch (xmlhttp.readyState){
 			// Request not yet made
 			case 1:
@@ -684,6 +684,10 @@ Zotero.Utilities.HTTP = new function() {
 			// Download complete
 			case 4:
 				if(onDone){
+					// Override the content charset
+					if (responseCharset) {
+						xmlhttp.channel.contentCharset = responseCharset;
+					}
 					onDone(xmlhttp);
 				}
 			break;

chrome/content/zotero/xpcom/zotero.js

@@ -206,6 +206,15 @@ var Zotero = new function(){
 		// Initialize keyboard shortcuts
 		Zotero.Keys.init();
 		
+		try {
+			Zotero.DB.test();
+		}
+		catch (e) {
+			this.skipLoading = true;
+			Zotero.DB.skipBackup = true;
+			return;
+		}
+		
 		// Add notifier queue callbacks to the DB layer
 		Zotero.DB.addCallback('begin', Zotero.Notifier.begin);
 		Zotero.DB.addCallback('commit', Zotero.Notifier.commit);
@@ -1387,7 +1396,7 @@ Zotero.Date = new function(){
 		if(!date.month) {
 			// compile month regular expression
 			var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul',
-				+ 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+				'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
 			// If using a non-English bibliography locale, try those too
 			if (Zotero.CSL.Global.locale != 'en-US') {
 				months = months.concat(Zotero.CSL.Global.getMonthStrings("short"));
@@ -1597,8 +1606,6 @@ Zotero.Date = new function(){
 	/**
 	 * Figure out the date order from the output of toLocaleDateString()
 	 *
-	 * Note: Currently unused
-	 *
 	 * Returns a string with y, m, and d (e.g. 'ymd', 'mdy')
 	 */
 	function getLocaleDateOrder(){

chrome/locale/af-ZA/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Uitvoer">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Kitskopieer">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Verstek-afvoerformaat:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Let wel: rykteksformatering sal op Mac OS X verlore gaan.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(bv wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Afvoerformaat">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Snelsleutels">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/sluit Zotero-paneel">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/af-ZA/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Export Notes
 exportOptions.exportFileData=Export Files
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/ar/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "تصدير">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "نسخ سريع">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "شكل المخرجات الإفتراضي:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "ملاحظة: التنسيق الغني للنصوص سيفقد عند استخدام نظام ماكنتوش.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(مثال: wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "شكل المخرجات">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "اختصارات">
 
 <!ENTITY zotero.preferences.keys.openZotero "فتح/إغلاق نافذة زوتيرو">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/ar/zotero/zotero.properties

@@ -381,6 +381,12 @@ zotero.preferences.export.quickCopy.bibStyles=اسلوب توثيق المراج
 zotero.preferences.export.quickCopy.exportFormats=صيغ التصدير
 zotero.preferences.export.quickCopy.instructions=َتسمح لك خاصية النسخ السريع بنسخ المرجع الذي اخترته إلى الحافظة بالضغط على زر (%S) أو سحب الموضوع إلى أي مربع نص في صفحة الويب.
 
+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=الملفات التالية موجودة مسبقاً في الوجهة التي تريدها ، لذا لم يتم نسخها:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=جزئي
 
 exportOptions.exportNotes=تصدير الملاحظات
 exportOptions.exportFileData=تصدير الملفات
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=,,,
 date.abbreviation.year=سنة
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/bg-BG/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Експорт">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Бързо копиране">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Изходящ формат по подразбиране:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Внимание: Rich-text formatting ще бъде загубен при Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(напр. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Изходящ формат">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Клавишни Комбинации">
 
 <!ENTITY zotero.preferences.keys.openZotero "Отваряне/Затваряне на Панела на Зотеро">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Подръжка на базата дани">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Проберка на цялостта на базата дани">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/bg-BG/zotero/zotero.properties

@@ -381,6 +381,12 @@ zotero.preferences.export.quickCopy.bibStyles=Стил на библиограф
 zotero.preferences.export.quickCopy.exportFormats=Формати за експорт
 zotero.preferences.export.quickCopy.instructions=Бързо копиране ви позволява да копирате избраните отпратки в клипборда с клавишната комбинация (%S) или да ги издърпате в текстова кутия от интернет страница.
 
+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=Папката вече съдържа следните файлове и те не бяха копирани.
 dragAndDrop.filesNotFound=Следните файлове не бяха намерени и не могат да бъдат копирани:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Частичен
 
 exportOptions.exportNotes=Експорт на бележки
 exportOptions.exportFileData=Експорт на Файлове
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=ви, ри, ти, ти
 date.abbreviation.year=г
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=Винаги следвай този изб
 
 integration.deleteCitedItem.title=Сигурни ли сте, че искате да премахните тази отпратка?
 integration.deleteCitedItem.body=Тази отпратка е цитирана в текста на вашият документ. Изтриването и ще премахне всички цитати.
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/ca-AD/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Exporta">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Còpia ràpida">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Format de sortida per defecte:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Nota: el format de text enriquit es perdrà en Mac OS X">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(p.ex. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Format de sortida">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Dreceres de teclat">
 
 <!ENTITY zotero.preferences.keys.openZotero "Obre/Tanca Zotero">
@@ -80,3 +86,6 @@
 
 <!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.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/ca-AD/zotero/zotero.properties

@@ -381,6 +381,12 @@ 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.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=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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Parcial
 
 exportOptions.exportNotes=Exportar les notes
 exportOptions.exportFileData=Exportar els arxius adjunts
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=r, n, r, rt, é
 date.abbreviation.year=a
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=Segueix sempre aquesta selecció.
 
 integration.deleteCitedItem.title=Estàs segur que vols eliminar aquesta referència?
 integration.deleteCitedItem.body=Aquesta referència està citada en el text del teu document. Eliminant-la s'eliminaran també totes les cites.
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/cs-CZ/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Default Output Format:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Note: Rich-text formatting will be lost on Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/cs-CZ/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Export Notes
 exportOptions.exportFileData=Export Files
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/da-DK/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Default Output Format:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Note: Rich-text formatting will be lost on Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/da-DK/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Eksporter Notater
 exportOptions.exportFileData=Eksporter filer
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/de-AT/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Default Output Format:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Note: Rich-text formatting will be lost on Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/de-AT/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Notizen exportieren
 exportOptions.exportFileData=Dateien exportieren
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=.
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/de-CH/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Default Output Format:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Note: Rich-text formatting will be lost on Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/de-CH/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Notizen exportieren
 exportOptions.exportFileData=Dateien exportieren
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=.
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/de/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick-Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Standardausgabeformat">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Achtung: Rich-Text-Formatierungen gehen unter Mac OS X verloren.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(z.B. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Ausgabeformat">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Tastenkombinationen">
 
 <!ENTITY zotero.preferences.keys.openZotero "Zotero-Panel öffnen/schließen">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Datenbankwartung">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Integrität der Datenbank überprüfen">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/de/zotero/zotero.properties

@@ -381,6 +381,12 @@ 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.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=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.
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Unvollständig
 
 exportOptions.exportNotes=Notizen exportieren
 exportOptions.exportFileData=Dateien exportieren
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=.
 date.abbreviation.year=J
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=Diese Auswahl dauerhaft übernehmen.
 
 integration.deleteCitedItem.title=Sind Sie sicher, dass Sie diese Literaturangabe löschen wollen?
 integration.deleteCitedItem.body=Diese Literaturangabe wird im Text Ihres Dokuments zitiert. Sie zu löschen, wird alle Zitationen entfernen.
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/el-GR/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Default Output Format:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Note: Rich-text formatting will be lost on Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/el-GR/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Export Notes
 exportOptions.exportFileData=Export Files
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/en-US/zotero/preferences.dtd

@@ -48,17 +48,20 @@
 <!ENTITY zotero.preferences.prefpane.export				"Export">
 
 <!ENTITY zotero.preferences.citationOptions.caption			"Citation Options">
-<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper journal articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
-<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal articles only if the article does not have a page range specified.">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
 
 <!ENTITY zotero.preferences.quickCopy.caption				"Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat	"Default Output Format:">
+<!ENTITY zotero.preferences.quickCopy.copyAsHTML			"Copy as HTML">
 <!ENTITY zotero.preferences.quickCopy.macWarning			"Note: Rich-text formatting will be lost on Mac OS X.">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.setings 	"Site-Specific Settings:">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath "Domain/Path">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles			"Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys				"Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero				"Open/Close Zotero Pane">

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

@@ -451,6 +451,7 @@ fulltext.indexState.partial								= Partial
 
 exportOptions.exportNotes       = Export Notes
 exportOptions.exportFileData    = Export Files
+exportOptions.UTF8				= Export as UTF-8
 
 date.daySuffixes                = st, nd, rd, th
 date.abbreviation.year          = y
@@ -475,7 +476,7 @@ annotations.collapse.tooltip		= Collapse Annotation
 annotations.expand.tooltip			= Expand Annotation
 annotations.oneWindowWarning		= Annotations for a snapshot may only be opened in one browser window simultaneously. This snapshot will be opened without annotations.
 
-integration.incompatibleVersion		= This version of the Zotero Word plug-in is incompatible with the currently installed version of the Zotero Firefox extension. Please ensure you are using the latest versions of both components.
+integration.incompatibleVersion		= This version of the Zotero Word plug-in ($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.fields.label			= Fields
 integration.referenceMarks.label	= ReferenceMarks
 integration.fields.caption			= Microsoft Word Fields are less likely to be accidentally modified, but cannot be shared with OpenOffice.org.

chrome/locale/es-ES/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Exportar">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Copia rápida">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Formato de salida normal:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Nota: el formato especial se perderá en Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(p.ej. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Formato de salida">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Atajos de teclado">
 
 <!ENTITY zotero.preferences.keys.openZotero "Abrir/cerrar el panel de Zotero">
@@ -80,3 +86,6 @@
 
 <!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.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/es-ES/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Exportar notas
 exportOptions.exportFileData=Exportar archivos
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=º, º, º, º
 date.abbreviation.year=a
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/et-EE/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Default Output Format:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Note: Rich-text formatting will be lost on Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/et-EE/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Export Notes
 exportOptions.exportFileData=Export Files
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/fr-FR/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Exportation">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Copie rapide">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Format de sortie par défaut :">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Noter que le format texte enrichi (RTF) sera perdu sur Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(p. ex. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Format de sortie">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Raccourcis clavier">
 
 <!ENTITY zotero.preferences.keys.openZotero "Ouvrir/fermer le panneau Zotero">
@@ -80,3 +86,6 @@
 
 <!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.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/fr-FR/zotero/zotero.properties

@@ -381,6 +381,12 @@ 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.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=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 :
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partiel
 
 exportOptions.exportNotes=Exporter les notes
 exportOptions.exportFileData=Exporter les fichiers
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=er, , ,
 date.abbreviation.year=a
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=Toujours faire ainsi.
 
 integration.deleteCitedItem.title=Voulez-vous vraiment supprimer cette référence ?
 integration.deleteCitedItem.body=Cette référence est citée dans le texte de votre document. La supprimer supprimera toutes les citations.
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/he-IL/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Default Output Format:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Note: Rich-text formatting will be lost on Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/he-IL/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Export Notes
 exportOptions.exportFileData=יצוא קבצים
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=ש
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/hu-HU/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Exportálás">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Gyorsmásolás">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Alapértelmezett kimeneti formátum">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Megjegyzés: A formázás Mac OS X alatt elveszik.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(pl: wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Kimeneti formátum">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Billentyűparancsok">
 
 <!ENTITY zotero.preferences.keys.openZotero "Zotero megnyitása/bezárása">
@@ -80,3 +86,6 @@
 
 <!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.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/hu-HU/zotero/zotero.properties

@@ -381,6 +381,12 @@ 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.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=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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Részleges
 
 exportOptions.exportNotes=Jegyzetek exportálása
 exportOptions.exportFileData=Fájlok exportálása
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=.
 date.abbreviation.year=év
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=Beállítás megőrzése.
 
 integration.deleteCitedItem.title=A hivatkozás törlésének megerősítése?
 integration.deleteCitedItem.body=A hivatkozás említve van a dokumentum szövegében. Törlés után az összes hivatkozás törlésre kerül.
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/is-IS/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Default Output Format:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Note: Rich-text formatting will be lost on Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Flýtihnappar">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/is-IS/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Flytja út athugasemdir
 exportOptions.exportFileData=Flytja út skrár
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/it-IT/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Esportazione">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Copia veloce">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Formato di output predefinito">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Nota: la formattazione RTF verrà persa su Mac OS X">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(per es. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Formato di output">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Scorciatoie da tastiera">
 
 <!ENTITY zotero.preferences.keys.openZotero "Apri o chiudi pannello di Zotero">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Manutenzione database">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Controlla l&apos;integrità del database">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/it-IT/zotero/zotero.properties

@@ -381,6 +381,12 @@ 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.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=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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Parzialmente indicizzato
 
 exportOptions.exportNotes=Esporta note
 exportOptions.exportFileData=Esporta file
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=°, °, °, °
 date.abbreviation.year=a
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=Imposta come comportamento predefinito.
 
 integration.deleteCitedItem.title=Eliminare questa citazione?
 integration.deleteCitedItem.body=Questa citazione è contenuta nel testo del documento, la sua eliminazione causerà l'eliminazione di tutte le citazioni.
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/ja-JP/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "エクスポート">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "クィックコピー">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "標準アウトプットフォーマット：">
 <!ENTITY zotero.preferences.quickCopy.macWarning "注意：Mac OS Xにはリッチテキスト形式は失われます。">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "（例：wikipedia.org）">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "出力形式">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "ショートカットキー">
 
 <!ENTITY zotero.preferences.keys.openZotero "Zoteroパネルを開く／閉じる">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/ja-JP/zotero/zotero.properties

@@ -381,6 +381,12 @@ zotero.preferences.export.quickCopy.bibStyles=参考文献のスタイル
 zotero.preferences.export.quickCopy.exportFormats=エクスポートフォーマット
 zotero.preferences.export.quickCopy.instructions=クイックコピー機能で、ショートカットキーを押してクリップボードに選択された参照文献のコピー、またはウェブページのテキストボックスにアイテムをドラッグすることができます。
 
+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=次のファイルは宛先フォルダにすでに存在しており、コピーされませんでした:
 dragAndDrop.filesNotFound=次のファイルは見つからず、コピーできませんでした。
@@ -445,6 +451,7 @@ fulltext.indexState.partial=部分作成
 
 exportOptions.exportNotes=メモをエクスポート
 exportOptions.exportFileData=ファイルをエクスポート
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=日, 日, 日, 日
 date.abbreviation.year=年
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=常にこの設定を使用する。
 
 integration.deleteCitedItem.title=この参照事項を削除してよろしいですか？
 integration.deleteCitedItem.body=この参照事項はあなたのドキュメントの文章の中に引用されています。削除するときに全ての引用はなくなります。
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/ko-KR/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "내보내기">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "빠른 복사">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "기본 출력 형식:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "주: Rich-text 형식은 Mac OS X 상에선 손실됩니다.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(예. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "출력 형식">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "단축키">
 
 <!ENTITY zotero.preferences.keys.openZotero "Zotero 패널 열기/닫기">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "데이터베이스 유지">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "데이터베이스 무결성 점검">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/ko-KR/zotero/zotero.properties

@@ -381,6 +381,12 @@ zotero.preferences.export.quickCopy.bibStyles=도서목록 형식
 zotero.preferences.export.quickCopy.exportFormats=내보내기 형식
 zotero.preferences.export.quickCopy.instructions=빠른 복사는 단축 키 (%S)를 누르거나 웹 페이지내 텍스트 박스 안으로 항목을 끌어 오면 클립보드에 선택한 참고를 복사하는 것을 허용시킵니다.
 
+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=다음 파일은 목적 디렉토리내 이미 존재하며 복사하지는 않았습니다:
 dragAndDrop.filesNotFound=다음 파일을 찾을수 없어 복사를 할 수 없습니다.
@@ -445,6 +451,7 @@ fulltext.indexState.partial=부분적
 
 exportOptions.exportNotes=노트 내보내기
 exportOptions.exportFileData=파일 내보내기
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=일, 일, 일, 일
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=언제나 이 선택을 따릅니다.
 
 integration.deleteCitedItem.title=이 참조를 삭제하길 원하는 것이 맞습니까?
 integration.deleteCitedItem.body=이 참조는 문서의 문장 내에 인용되고 있습니다. 삭제할 경우에 모든 인용은 없어집니다.
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/mn-MN/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Default Output Format:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Note: Rich-text formatting will be lost on Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/mn-MN/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Export Notes
 exportOptions.exportFileData=Export Files
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/nb-NO/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Default Output Format:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Note: Rich-text formatting will be lost on Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Hurtigtaster">
 
 <!ENTITY zotero.preferences.keys.openZotero "Åpne/lukk Zotero-panelet">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/nb-NO/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Eksporter notater
 exportOptions.exportFileData=Eksporter filer
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=ste, ndre, dje, de, te
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/nl-NL/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Exporteren">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Snelle Kopie">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Standaard Uitvoerformaat:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Let op: onder Mac OS X gaat hierbij de tekstopmaak verloren.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(b.v. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Uitvoerformaat">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Sneltoetsen">
 
 <!ENTITY zotero.preferences.keys.openZotero "Openen/Sluiten van Zotero-paneel">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Onderhoud">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Controleer Integriteit Database">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/nl-NL/zotero/zotero.properties

@@ -381,6 +381,12 @@ 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.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=De volgende bestanden waren al aanwezig in de bestemmingsmap en zijn niet gekopieerd:
 dragAndDrop.filesNotFound=De volgende bestanden konden niet gevonden en gekopieerd worden:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Gedeeltelijk
 
 exportOptions.exportNotes=Exporteer Aantekeningen
 exportOptions.exportFileData=Exporteer Bestanden
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=e, e, e, e
 date.abbreviation.year=j
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=Altijd deze selectie volgen.
 
 integration.deleteCitedItem.title=Wilt u deze verwijzing verwijderen?
 integration.deleteCitedItem.body=Deze verwijzing is geciteerd in de tekst van uw document. Als u de verwijzing wist worden de citaties verwijderd.
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/pl-PL/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Eksport">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Szybka kopia">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Domyślny format wyjściowy">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Uwaga: formatowanie RTF zostanie utracone w systemie Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(np. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Format wyjściowy">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Skróty klawiaturowe">
 
 <!ENTITY zotero.preferences.keys.openZotero "Otwórz/Zamknij okno Zotero">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Konserwacja bazy danych">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Sprawdź spójność bazy danych">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/pl-PL/zotero/zotero.properties

@@ -381,6 +381,12 @@ 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.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=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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Częściowy
 
 exportOptions.exportNotes=Eksportuj notatki
 exportOptions.exportFileData=Eksportuj pliki
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=-szy, -gi, -ci, -ty
 date.abbreviation.year=r.
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=Zawsze korzystaj z tej sekcji.
 
 integration.deleteCitedItem.title=Czy chcesz usunąć tę pozycję bibliograficzną?
 integration.deleteCitedItem.body=W tekście dokumentu znajdują się odwołania do tej pozycji bibliograficznej. Usunięcie jej spowoduje usunięcie wszystkich odwołań.
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/pt-BR/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Default Output Format:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Note: Rich-text formatting will be lost on Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Teclas de Atalhos">
 
 <!ENTITY zotero.preferences.keys.openZotero "Abrir/Fechar painel Zotero">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/pt-BR/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Exportar notas
 exportOptions.exportFileData=Exportar arquivos
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/pt-PT/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Default Output Format:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Note: Rich-text formatting will be lost on Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Shortcut Keys">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/pt-PT/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Export Notes
 exportOptions.exportFileData=Export Files
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/ro-RO/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Exportare">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Copiere rapidă">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Stil implicit de formatare:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Notă: Formatarea RTF se va pierde pe Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(ex. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Stil de formatare">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Scurtături de la tastatură">
 
 <!ENTITY zotero.preferences.keys.openZotero "Deschide/Închide panoul Zotero">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Întreţinerea bazei de date">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Controlează integritatea bazei de date">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/ro-RO/zotero/zotero.properties

@@ -381,6 +381,12 @@ 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.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=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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Parţial
 
 exportOptions.exportNotes=Export note
 exportOptions.exportFileData=Export fişiere
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=, , ,
 date.abbreviation.year=a
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=Întotdeauna urmează această selecţie.
 
 integration.deleteCitedItem.title=Eşti sigur că vrei să ştergi această referinţă?
 integration.deleteCitedItem.body=Referinţa este citată în textul documentului tău. Dacă o ştergi, toate citările vor fi şterse.
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/ru-RU/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Экспортировать">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Быстро копировать">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Выходящий формат по умолчанию:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Примечание: форматирование RTF будет утрачено в Mac OS X">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(например wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Выходной формат">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Горячие клавиши">
 
 <!ENTITY zotero.preferences.keys.openZotero "Открыть/закрыть панель Zotero">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Поддержка БД">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Проверить целостность БД">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/ru-RU/zotero/zotero.properties

@@ -381,6 +381,12 @@ zotero.preferences.export.quickCopy.bibStyles=Библиографические
 zotero.preferences.export.quickCopy.exportFormats=Форматы экспорта
 zotero.preferences.export.quickCopy.instructions=Быстрое копирование позволяет Вам копировать выбранные ссылки в буфер обмена, нажав горячую клавишу (%S) или перетащить документы в текстовое поле веб-страницы
 
+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=Следующие файлы уже существуют в конечной директории и они не скопированы:
 dragAndDrop.filesNotFound=Файлы не были найдены и не могут быть скопированы:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Частичное
 
 exportOptions.exportNotes=Экспорт Заметок
 exportOptions.exportFileData=Экспорт Файлов
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=ый,ой, ий, ый
 date.abbreviation.year=г
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=Всегда следовать этому
 
 integration.deleteCitedItem.title=Вы уверены, что хотите удалить эту ссылку?
 integration.deleteCitedItem.body=Эта ссылка цитируется в тексте вашего документа. Удалив ее, вы удалите все цитаты
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/sr-YU/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Извоз">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Брзо умножавање">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Подразумевани излазни формат:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Белешка: Rich-text формат ће бити изгубљен на Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(нпр. sr.wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Излазни формат">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Пречице на тастатури">
 
 <!ENTITY zotero.preferences.keys.openZotero "Отвори/затвори Зотеро површ">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Одржавање базе података">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Провери целовитост базе података">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/sr-YU/zotero/zotero.properties

@@ -381,6 +381,12 @@ zotero.preferences.export.quickCopy.bibStyles=Библиографски сти
 zotero.preferences.export.quickCopy.exportFormats=Извозни формат
 zotero.preferences.export.quickCopy.instructions=Брзо умножавање вам дозвољава да умножите изабране референце у списак исечака (clipboard) притискајући дугме за пречицу (%S) или превлачењем ставки у поље за текст на веб страници.
 
+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=Следеће датотеке већ постоје у одредишном директоријуму и нису умножене:
 dragAndDrop.filesNotFound=Следеће датотеке нису нађене и због тога нису умножене:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Делимично
 
 exportOptions.exportNotes=Извези белешке
 exportOptions.exportFileData=Извези датотеке
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=-ог, -ог, -ег, -ог
 date.abbreviation.year=г
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=Увек прати овај избор.
 
 integration.deleteCitedItem.title=Да ли сте сигурни да желите избацити ову референцу?
 integration.deleteCitedItem.body=Ова референца је цитирана у тексту вашег документа. Брисање ње ће избацити све цитације.
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/sv-SE/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Export">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Quick Copy">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Default Output Format:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Note: Rich-text formatting will be lost on Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Output Format">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Genvägsknappar">
 
 <!ENTITY zotero.preferences.keys.openZotero "Open/Close Zotero Pane">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/sv-SE/zotero/zotero.properties

@@ -381,6 +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.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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Partial
 
 exportOptions.exportNotes=Exportera anteckningar
 exportOptions.exportFileData=Exporter filer
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=å
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/tr-TR/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Dışarı Aktar">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Çabuk Kopyala">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Varsayılan Çıktı Biçimi:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Uyarı: Zengin-metin biçimi Mac OS X&apos;de kaybolacaktır.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(ör. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Çıktı Biçimi">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Kısayol Tuşları">
 
 <!ENTITY zotero.preferences.keys.openZotero "Zotero Bölmesini Aç/Kapa">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "Database Maintenance">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Check Database Integrity">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/tr-TR/zotero/zotero.properties

@@ -381,6 +381,12 @@ 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.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=Aşağıdaki dosyalar hedef dizinde zaten varlar ve kopyalanmadılar:
 dragAndDrop.filesNotFound=The following files were not found and could not be copied:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=bölümsel
 
 exportOptions.exportNotes=Notları Dışarı Aktar
 exportOptions.exportFileData=Dosyaları Dışarı Aktar
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ 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.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/vi-VN/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Xuất khẩu">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "Sao chép nhanh">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "Định dạng mặc định của dữ liệu đầu ra:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Chú ý: Định dạng rich-text sẽ bị mất khi dùng Mac OS X.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(vd: wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Định dạng dữ liệu đầu ra">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "Phím gõ tắt">
 
 <!ENTITY zotero.preferences.keys.openZotero "Mở/Đóng cửa sổ Zotero">
@@ -80,3 +86,6 @@
 
 <!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.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/vi-VN/zotero/zotero.properties

@@ -381,6 +381,12 @@ 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.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=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:
@@ -445,6 +451,7 @@ fulltext.indexState.partial=Bán phần
 
 exportOptions.exportNotes=Xuất khẩu các Ghi chép
 exportOptions.exportFileData=Xuất khẩu các Tập tin
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=năm
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=Luôn luôn theo lựa chọn này.
 
 integration.deleteCitedItem.title=Bạn có chắc bạn muốn xóa tham khảo này không?
 integration.deleteCitedItem.body=Tham khảo này được trích dẫn trong văn bản tài liệu của bạn. Nếu tham khảo này bị xóa, tất cả các trích dẫn tương ứng sẽ được gỡ bỏ khỏi văn bản.
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/zh-CN/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "导出">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "快速复制">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "默认输出格式:">
 <!ENTITY zotero.preferences.quickCopy.macWarning "注意: 富文本格式在Mac OS X下将丢失.">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(e.g. wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "输出格式">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "快捷键">
 
 <!ENTITY zotero.preferences.keys.openZotero "开/关 Zotero 面板">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "数据库维护">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "数据库完整性检测">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/zh-CN/zotero/zotero.properties

@@ -381,6 +381,12 @@ zotero.preferences.export.quickCopy.bibStyles=文献目录样式
 zotero.preferences.export.quickCopy.exportFormats=导出格式
 zotero.preferences.export.quickCopy.instructions=快速复制可以让你通过快捷键(%S)或拖放条目到文本框的方式将所选引文复制到剪切板.
 
+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=下列文件因已在目标文件夹中, 所以没有复制:
 dragAndDrop.filesNotFound=未找到下列文件, 无法复制.
@@ -445,6 +451,7 @@ fulltext.indexState.partial=部分
 
 exportOptions.exportNotes=导出笔记
 exportOptions.exportFileData=导出文件
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=st, nd, rd, th
 date.abbreviation.year=y
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=Always follow this selection.
 
 integration.deleteCitedItem.title=确信要清除此文献吗?
 integration.deleteCitedItem.body=您的文档里引用了此文献. 删除它会清除所有引文.
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/locale/zh-TW/zotero/preferences.dtd

@@ -47,6 +47,10 @@
 
 <!ENTITY zotero.preferences.prefpane.export "匯出">
 
+<!ENTITY zotero.preferences.citationOptions.caption "Citation Options">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Include URLs of paper articles in references">
+<!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "When this option is disabled, Zotero includes URLs when citing journal, magazine, and newspaper articles only if the article does not have a page range specified.">
+
 <!ENTITY zotero.preferences.quickCopy.caption "快速複製">
 <!ENTITY zotero.preferences.quickCopy.defaultOutputFormat "預設輸出格式：">
 <!ENTITY zotero.preferences.quickCopy.macWarning "注意！在 Mac OS X 平台下會失去富文本的格式。">
@@ -55,6 +59,8 @@
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "（例如 wikipedia.org）">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "輸出格式">
 
+<!ENTITY zotero.preferences.export.getAdditionalStyles "Get additional styles...">
+
 <!ENTITY zotero.preferences.prefpane.keys "快速鍵">
 
 <!ENTITY zotero.preferences.keys.openZotero "開／關 Zotero 窗格">
@@ -80,3 +86,6 @@
 
 <!ENTITY zotero.preferences.dbMaintenance "資料庫維修">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "檢查資料庫完整性">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslatorsAndStyles "Reset Translators and Styles...">
+<!ENTITY zotero.preferences.dbMaintenance.resetTranslators "Reset Translators...">
+<!ENTITY zotero.preferences.dbMaintenance.resetStyles "Reset Styles...">

chrome/locale/zh-TW/zotero/zotero.properties

@@ -381,6 +381,12 @@ zotero.preferences.export.quickCopy.bibStyles=參考文獻的樣式
 zotero.preferences.export.quickCopy.exportFormats=匯出格式
 zotero.preferences.export.quickCopy.instructions=快速複製讓你可以按快捷鍵（%S）來把選取的參考文獻複製到剪貼簿，或者拖放項目到網頁的文字輸入區。
 
+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=以下的檔案已經存在目的目錄中，並未被複製：
 dragAndDrop.filesNotFound=找不到以下的檔案而無法加以複製：
@@ -445,6 +451,7 @@ fulltext.indexState.partial=部分的
 
 exportOptions.exportNotes=匯出筆記
 exportOptions.exportFileData=匯出檔案
+exportOptions.UTF8=Export as UTF-8
 
 date.daySuffixes=日, 日, 日, 日
 date.abbreviation.year=年
@@ -481,3 +488,8 @@ integration.regenerate.saveBehavior=每次都作相同的選擇。
 
 integration.deleteCitedItem.title=你確定要移除這個參考資料嗎？
 integration.deleteCitedItem.body=在你文件的內文中有引用到這個參考資料，刪除它將會移除所有的引用文獻。
+
+styles.installStyle=Install style "%1$S" from %2$S?
+styles.updateStyle=Update existing style "%1$S" with "%2$S" from %3$S?
+styles.installed=The style "%S" was installed successfully.
+styles.installError=%S does not appear to be a valid CSL file.

chrome/skin/default/zotero/preferences.css

@@ -100,6 +100,14 @@ grid row hbox:first-child
 	font-size: .85em;
 }
 
+#quickCopy-siteSettings-rows::-moz-tree-cell(quickCopy-copyAsHTML) {
+	/*
+	DEBUG: possible to center checkmark here instead of with spaces?
+	
+	Tried text-align, -moz-box-align, and -moz-box-pack
+	*/
+}
+
 #zotero-quickCopy-format
 {
 	min-height: 1.5em; /* Fix collapse on Windows */

components/zotero-protocol-handler.js

@@ -154,8 +154,8 @@ function ChromeExtensionHandler() {
 						// items were selected
 						includeAllChildItems = false;
 					}
-					// If combining children, add matching parents
+					// If combining children or standalone note/attachment, add matching parents
-					else if (combineChildItems) {
+					else if (combineChildItems || !results[i].isRegularItem()) {
 						itemsHash[results[i].getID()] = items.length;
 						items.push(results[i].toArray(2));
 						// Flag item as a search match
@@ -263,6 +263,10 @@ function ChromeExtensionHandler() {
 				var sorts = sortBy.split(',');
 				for (var i=0; i<sorts.length; i++) {
 					var [field, order] = sorts[i].split('/');
+					// Year field is really date field
+					if (field == 'year') {
+						field = 'date';
+					}
 					switch (order) {
 						case 'd':
 						case 'desc':
@@ -286,10 +290,45 @@ function ChromeExtensionHandler() {
 					
 					// Multidimensional sort
 					do {
-						var cmp = collation.compareString(0,
+						// Note and attachment sorting when combineChildItems is false
-							a[sorts[index].field],
+						if (!combineChildItems && sorts[index].field == 'note') {
-							b[sorts[index].field]
+							if (a.itemType == 'note' || a.itemType == 'attachment') {
-						);
+								var valA = a.note;
+							}
+							else if (a.reportChildren) {
+								var valA = a.reportChildren.notes[0].note;
+							}
+							else {
+								var valA = '';
+							}
+							
+							if (b.itemType == 'note' || b.itemType == 'attachment') {
+								var valB = b.note;
+							}
+							else if (b.reportChildren) {
+								var valB = b.reportChildren.notes[0].note;
+							}
+							else {
+								var valB = '';
+							}
+							
+							// Put items without notes last
+							if (valA == '' && valB != '') {
+								var cmp = 1;
+							}
+							else if (valA != '' && valB == '') {
+								var cmp = -1;
+							}
+							else {
+								var cmp = collation.compareString(0, valA, valB);
+							}
+						}
+						else {
+							var cmp = collation.compareString(0,
+								a[sorts[index].field],
+								b[sorts[index].field]
+							);
+						}
 						
 						if (cmp == 0) {
 							continue;

defaults/preferences/zotero.js

@@ -14,8 +14,8 @@ pref("extensions.zotero.cacheTranslatorData",true);
 pref("extensions.zotero.zoteroPaneOnTop",false);
 pref("extensions.zotero.statusBarIcon", 2);
 pref("extensions.zotero.browserContentContextMenu", true);
-pref("extensions.zotero.openURL.resolver","http://athene.gmu.edu:8888/lfp/LinkFinderPlus/Display");
+pref("extensions.zotero.openURL.resolver","http://worldcatlibraries.org/registry/gateway");
-pref("extensions.zotero.openURL.version","0.1");
+pref("extensions.zotero.openURL.version","1.0");
 pref("extensions.zotero.parseEndNoteMIMETypes",true);
 pref("extensions.zotero.automaticSnapshots",true);
 pref("extensions.zotero.downloadAssociatedFiles",false);
@@ -27,6 +27,7 @@ pref("extensions.zotero.attachmentRenameFormatString", '{%c - }{%y - }{%t{50}}')
 pref("extensions.zotero.capitalizeTitles", true);
 pref("extensions.zotero.launchNonNativeFiles", false);
 pref("extensions.zotero.sortNotesChronologically", false);
+pref("extensions.zotero.sortAttachmentsChronologically", false);
 
 pref("extensions.zotero.lastCreatorFieldMode",0);
 pref("extensions.zotero.lastAbstractExpand",0);
@@ -57,12 +58,12 @@ 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://www.zotero.org/styles/chicago-note.csl');
+pref("extensions.zotero.export.lastStyle", 'http://www.zotero.org/styles/chicago-note');
 pref("extensions.zotero.export.bibliographySettings", 'save-as-rtf');
 pref("extensions.zotero.export.bibliographyLocale", '');
 pref("extensions.zotero.export.citePaperJournalArticleURL", false);
 
-pref("extensions.zotero.export.quickCopy.setting", 'bibliography=http://www.zotero.org/styles/chicago-note.csl');
+pref("extensions.zotero.export.quickCopy.setting", 'bibliography=http://www.zotero.org/styles/chicago-note');
 
 // Integration settings
 pref("extensions.zotero.integration.autoRegenerate", -1);	// -1 = ask; 0 = no; 1 = yes