diff --git a/chrome/content/zotero/bindings/styled-textbox.xml b/chrome/content/zotero/bindings/styled-textbox.xml
index 9cb967fa8..6b23deecb 100644
--- a/chrome/content/zotero/bindings/styled-textbox.xml
+++ b/chrome/content/zotero/bindings/styled-textbox.xml
@@ -123,6 +123,11 @@
 							var self = this;
 							
 							this._eventHandler = function (event) {
+								// Necessary in Fx32+
+								if (event.wrappedJSObject) {
+									event = event.wrappedJSObject;
+								}
+								
 								//Zotero.debug(event.type);
 								switch (event.type) {
 									case 'keydown':
@@ -418,7 +423,13 @@
 						
 						if (!SJOW.zoteroInit) {
 							SJOW.zoteroInit = function(editor) {
-								self._editor = editor;
+								// Necessary in Fx32+
+								if (editor.wrappedJSObject) {
+									self._editor = editor.wrappedJSObject;
+								}
+								else {
+									self._editor = editor;
+								}
 								if (self._value) {
 									self.value = self._value;
 								}
@@ -430,13 +441,17 @@
 								
 								// Add CSS rules to notes
 								if (self.mode == 'note') {
+									let fontSize = Zotero.Prefs.get('note.fontSize');
+									// Fix empty old font prefs before a value was enforced
+									if (fontSize < 6) {
+										fontSize = 11;
+									}
 									var css = "body#zotero-tinymce-note.mceContentBody, "
 										+ "body#zotero-tinymce-note.mceContentBody p, "
 										+ "body#zotero-tinymce-note.mceContentBody th, "
 										+ "body#zotero-tinymce-note.mceContentBody td, "
 										+ "body#zotero-tinymce-note.mceContentBody pre { "
-											+ "font-size: "
-											+ Zotero.Prefs.get('note.fontSize') + "px; "
+											+ "font-size: " + fontSize + "px; "
 										+ "} "
 										+ "body#zotero-tinymce-note.mceContentBody, "
 										+ "body#zotero-tinymce-note.mceContentBody p { "
diff --git a/chrome/content/zotero/browser.js b/chrome/content/zotero/browser.js
index 5e6ae997e..af9fcecf2 100644
--- a/chrome/content/zotero/browser.js
+++ b/chrome/content/zotero/browser.js
@@ -102,15 +102,45 @@ var Zotero_Browser = new function() {
 	 * Initialize some variables and prepare event listeners for when chrome is done loading
 	 */
 	function init() {
-		if (!Zotero || Zotero.skipLoading || !window.hasOwnProperty("gBrowser")) {
+		if (!window.hasOwnProperty("gBrowser")) {
 			return;
 		}
 		
-		window.addEventListener("load",
-			function(e) { Zotero_Browser.chromeLoad(e) }, false);
+		var zoteroInitDone;
+		if (!Zotero || Zotero.skipLoading) {
+			// Zotero either failed to load or is reloading in Connector mode
+			// In case of the latter, listen for the 'zotero-loaded' event (once) and retry
+			var zoteroInitDone_deferred = Q.defer();
+			var obs = Components.classes["@mozilla.org/observer-service;1"]
+				.getService(Components.interfaces.nsIObserverService);
+			var observer = {
+				"observe":function() {
+					obs.removeObserver(observer, 'zotero-loaded')
+					zoteroInitDone_deferred.resolve();
+				}
+			};
+			obs.addObserver(observer, 'zotero-loaded', false);
+			
+			zoteroInitDone = zoteroInitDone_deferred.promise;
+		} else {
+			zoteroInitDone = Q();
+		}
 		
-		ZoteroPane_Local.addReloadListener(reload);
-		reload();
+		var chromeLoaded = Q.defer();
+		window.addEventListener("load", function(e) { chromeLoaded.resolve() }, false);
+		
+		// Wait for Zotero to init and chrome to load before proceeding
+		Q.all([
+			zoteroInitDone.then(function() {
+				ZoteroPane_Local.addReloadListener(reload);
+				reload();
+			}),
+			chromeLoaded.promise
+		])
+		.then(function() {
+			Zotero_Browser.chromeLoad()
+		})
+		.done();
 	}
 	
 	/**
@@ -542,8 +572,8 @@ var Zotero_Browser = new function() {
 			if(!returnValue) {
 				Zotero_Browser.progress.show();
 				Zotero_Browser.progress.changeHeadline(Zotero.getString("ingester.scrapeError"));
-				// Include link to Known Translator Issues page
-				var url = "http://www.zotero.org/documentation/known_translator_issues";
+				// Include link to translator troubleshooting page
+				var url = "https://www.zotero.org/support/troubleshooting_translator_issues";
 				var linkText = '<a href="' + url + '" tooltiptext="' + url + '">'
 					+ Zotero.getString('ingester.scrapeErrorDescription.linkText') + '</a>';
 				Zotero_Browser.progress.addDescription(Zotero.getString("ingester.scrapeErrorDescription", linkText));
diff --git a/chrome/content/zotero/charsetMenu.js b/chrome/content/zotero/charsetMenu.js
index 0296e4430..29ced2678 100644
--- a/chrome/content/zotero/charsetMenu.js
+++ b/chrome/content/zotero/charsetMenu.js
@@ -42,40 +42,76 @@ var Zotero_Charset_Menu = new function() {
 		var charsetSeparator = document.createElement("menuseparator");
 		charsetPopup.appendChild(charsetSeparator);
 		
-		var charsetConverter = Components.classes["@mozilla.org/charset-converter-manager;1"].
-			getService(Components.interfaces.nsICharsetConverterManager);
-		var charsets = charsetConverter.getEncoderList();
-		
-		// add charsets to popup in order
-		while(charsets.hasMore()) {
-			var charset = charsets.getNext();
-			try {
-				var label = charsetConverter.getCharsetTitle(charset);
-			} catch(e) {
-				continue;
+		var charsets = [];
+
+		if(Zotero.platformMajorVersion >= 32) {
+			Components.utils.import("resource://gre/modules/CharsetMenu.jsm");
+			var cmData = CharsetMenu.getData();
+			for each(var charsetList in [cmData.pinnedCharsets, cmData.otherCharsets]) {
+				for each(var charsetInfo in charsetList) {
+					if(charsetInfo.value == "UTF-8") {
+						charsets.push({
+							"label":"Unicode (UTF-8)",
+							"value":"UTF-8"
+						});
+					} else {
+						charsets.push({
+							"label":charsetInfo.label,
+							"value":charsetInfo.value
+						});
+					}
+				}
 			}
-			
-			var isUTF16 = charset.length >= 6 && charset.substr(0, 6) == "UTF-16";
-			
-			// Show UTF-16 element appropriately depending on exportMenu
-			if(isUTF16 && exportMenu == (charset == "UTF-16") ||
-					(!exportMenu && charset == "UTF-32LE")) {
-				continue;
-			} else if(charset == "x-mac-roman") {
-				// use the IANA name
-				charset = "macintosh";
-			} else if(!exportMenu && charset == "UTF-32BE") {
-				label = "Unicode (UTF-32)";
-				charset = "UTF-32";
+			charsets = charsets.concat([
+				{"label":"UTF-16LE", "value":"UTF-16LE"},
+				{"label":"UTF-16BE", "value":"UTF-16BE"},
+				{"label":"Western (IBM-850)", "value":"IBM850"},
+				{"label":"Western (MacRoman)", "value":"macintosh"}
+			]);
+		} else {
+			var charsetConverter = Components.classes["@mozilla.org/charset-converter-manager;1"].
+				getService(Components.interfaces.nsICharsetConverterManager);
+			var ccCharsets = charsetConverter.getEncoderList();
+			// add charsets to popup in order
+			while(ccCharsets.hasMore()) {
+				var charset = ccCharsets.getNext();
+				try {
+					var label = charsetConverter.getCharsetTitle(charset);
+				} catch(e) {
+					continue;
+				}
+
+				var isUTF16 = charset.length >= 6 && charset.substr(0, 6) == "UTF-16";
+
+				// Show UTF-16 element appropriately depending on exportMenu
+				if(isUTF16 && exportMenu == (charset == "UTF-16") ||
+						(!exportMenu && charset == "UTF-32LE")) {
+					continue;
+				} else if(charset == "x-mac-roman") {
+					// use the IANA name
+					charset = "macintosh";
+				} else if(!exportMenu && charset == "UTF-32BE") {
+					label = "Unicode (UTF-32)";
+					charset = "UTF-32";
+				}
+				charsets.push({
+					"label":label,
+					"value":charset
+				});
 			}
-			
+		}
+
+		for(var i=0; i<charsets.length; i++) {
+			var charset = charsets[i].value,
+			    label = charsets[i].label;
+
 			// add element
 			var itemNode = document.createElement("menuitem");
 			itemNode.setAttribute("label", label);
 			itemNode.setAttribute("value", charset);
 			
 			charsetMap[charset] = itemNode;
-			if(isUTF16 || (label.length > 7 &&
+			if(isUTF16 || (label.length >= 7 &&
 					label.substr(0, 7) == "Western")) {
 				charsetPopup.insertBefore(itemNode, charsetSeparator);
 			} else if(charset == "UTF-8") {
diff --git a/chrome/content/zotero/errorReport.xul b/chrome/content/zotero/errorReport.xul
index eff8c9196..82e65158f 100644
--- a/chrome/content/zotero/errorReport.xul
+++ b/chrome/content/zotero/errorReport.xul
@@ -6,7 +6,8 @@
 <!DOCTYPE window SYSTEM "chrome://zotero/locale/zotero.dtd">
 
 <wizard xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-	id="zotero-error-report" title="&zotero.errorReport.title;">
+	id="zotero-error-report" title="&zotero.errorReport.title;"
+	width="550" height="450">
 	
 	<script>
 	<![CDATA[
@@ -18,47 +19,66 @@
 			var Zotero = obj.Zotero;
 			var data = obj.data;
 			var msg = data.msg;
-			var e = data.e;
+			var errorData = data.errorData;
 			var extraData = data.extraData ? data.extraData : '';
+			var diagnosticInfo = false;
+			
 			
 			function init() {
 				var wizard = document.getElementById('zotero-error-report');
+				var continueButton = wizard.getButton('next');
+				continueButton.disabled = true;
 				
-				if (document.getElementById('zotero-failure-message').hasChildNodes()) {
-					var textNode = document.getElementById('zotero-failure-message').firstChild;
-					document.getElementById('zotero-failure-message').removeChild(textNode);
-				}
-				document.getElementById('zotero-failure-message').appendChild(document.createTextNode(msg));
-				document.getElementById('zotero-error-message').value = e;
-				
-				var continueButtonName = wizard.getButton('next').getAttribute('label');
-				var str = Zotero.getString('errorReport.advanceMessage', continueButtonName);
-				document.getElementById('zotero-advance-message').setAttribute('value', str);
+				Zotero.getSystemInfo(function(info) {
+					var errorDataText = errorData.length
+						? data.errorData.join('\n')
+						: Zotero.getString('errorReport.noErrorsLogged', Zotero.appName);
+					
+					diagnosticInfo = info;
+					
+					var logText = errorDataText + '\n\n'
+						+ (extraData !== '' ? extraData + '\n\n' : '')
+						+ diagnosticInfo;
+					
+					if (document.getElementById('zotero-failure-message').hasChildNodes()) {
+						var textNode = document.getElementById('zotero-failure-message').firstChild;
+						document.getElementById('zotero-failure-message').removeChild(textNode);
+					}
+					
+					document.getElementById('zotero-failure-message').appendChild(document.createTextNode(msg));
+					document.getElementById('zotero-error-message').value = logText;
+					
+					continueButton.disabled = false;
+					continueButton.focus();
+					var str = Zotero.getString(
+						'errorReport.advanceMessage', continueButton.getAttribute('label')
+					);
+					document.getElementById('zotero-advance-message').setAttribute('value', str);
+				});
 			}
 			
 			function sendErrorReport() {
 				var wizard = document.getElementById('zotero-error-report');
-				var continueButtonName = wizard.getButton('next').disabled = true;
+				var continueButton = wizard.getButton('next');
+				continueButton.disabled = true;
 				
-				Zotero.getSystemInfo(function(info) {
-					var parts = {
-						error: "true",
-						errorData: Zotero.getErrors(true).join('\n'),
-						extraData: extraData,
-						diagnostic: info
-					};
-					
-					var body = '';
-					for (var key in parts) {
-						body += key + '=' + encodeURIComponent(parts[key]) + '&';
-					}
-					body = body.substr(0, body.length - 1);
-					var url = 'https://repo.zotero.org/repo/report';
-					Zotero.HTTP.promise('POST', url,
-						{ body: body, successCodes: false, foreground: true })
-					.then(_sendErrorReportCallback)
-					.done();
-				});
+				var parts = {
+					error: "true",
+					errorData: errorData.join('\n'),
+					extraData: extraData,
+					diagnostic: diagnosticInfo
+				};
+				
+				var body = '';
+				for (var key in parts) {
+					body += key + '=' + encodeURIComponent(parts[key]) + '&';
+				}
+				body = body.substr(0, body.length - 1);
+				var url = 'https://repo.zotero.org/repo/report';
+				Zotero.HTTP.promise('POST', url,
+					{ body: body, successCodes: false, foreground: true })
+				.then(_sendErrorReportCallback)
+				.done();
 			}
 			
 			
@@ -113,11 +133,11 @@
 				}
 				
 				wizard.advance();
-				wizard.getButton('cancel').setAttribute('disabled', true);
+				wizard.getButton('cancel').disabled = true;;
 				wizard.canRewind = false;
 				var reportID = reported[0].getAttribute('reportID');
 				document.getElementById('zotero-report-id').setAttribute('value', reportID);
-				document.getElementById('zotero-report-result').setAttribute('hidden', false);
+				document.getElementById('zotero-report-result').hidden = false;
 			}
 		}
 	]]>
@@ -125,7 +145,7 @@
 	
 	<wizardpage onpageshow="Zotero_Error_Report.init()" label=" ">
 		<description id="zotero-failure-message"/>
-		<textbox id="zotero-error-message" class="plain" readonly="true" multiline="true" rows="6"/>
+		<textbox id="zotero-error-message" class="plain" readonly="true" multiline="true" flex="1"/>
 		<description id="zotero-unrelated-message">&zotero.general.note; &zotero.errorReport.unrelatedMessages;</description>
 		<description id="zotero-advance-message"/>
 	</wizardpage>
diff --git a/chrome/content/zotero/exportOptions.xul b/chrome/content/zotero/exportOptions.xul
index a54dbdea8..03ab1893b 100644
--- a/chrome/content/zotero/exportOptions.xul
+++ b/chrome/content/zotero/exportOptions.xul
@@ -3,8 +3,6 @@
 <!DOCTYPE window [
 <!ENTITY % zoteroDTD SYSTEM "chrome://zotero/locale/zotero.dtd" >
 %zoteroDTD;
-<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetOverlay.dtd" >
-%charsetDTD;
 ]>
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/chrome/content/zotero/locale/csl b/chrome/content/zotero/locale/csl
index 7486588e7..6c4c38a01 160000
--- a/chrome/content/zotero/locale/csl
+++ b/chrome/content/zotero/locale/csl
@@ -1 +1 @@
-Subproject commit 7486588e73e5b1168afcadf92b2c430eaf694bb5
+Subproject commit 6c4c38a013f58dea82d683e4c8b70ff25da8172c
diff --git a/chrome/content/zotero/longTagFixer.js b/chrome/content/zotero/longTagFixer.js
index b48b03a04..5b559d560 100644
--- a/chrome/content/zotero/longTagFixer.js
+++ b/chrome/content/zotero/longTagFixer.js
@@ -157,7 +157,7 @@ var Zotero_Long_Tag_Fixer = new function () {
 			case 0:
 				// Get checked tags
 				var listbox = document.getElementById('zotero-new-tag-list');
-				var len = listbox.children.length;
+				var len = listbox.childElementCount;
 				var newTags = [];
 				for (var i=0; i<len; i++) {
 					var li = listbox.childNodes[i];
diff --git a/chrome/content/zotero/note.js b/chrome/content/zotero/note.js
index c4cb38ecc..0de594413 100644
--- a/chrome/content/zotero/note.js
+++ b/chrome/content/zotero/note.js
@@ -34,17 +34,12 @@ function onLoad() {
 	// Set font size from pref
 	Zotero.setFontSize(noteEditor);
 	
-	var params = [];
-	var b = document.location.href.substr(document.location.href.indexOf('?')+1).split('&');
-	for(var i = 0; i < b.length; i++)
-	{
-		var mid = b[i].indexOf('=');
-		
-		params[b[i].substr(0,mid)] = b[i].substr(mid+1);
+	if (window.arguments) {
+		var io = window.arguments[0];
 	}
-	var itemID = params.id;
-	var collectionID = params.coll;
-	var parentItemID = params.p;
+	var itemID = io.itemID;
+	var collectionID = io.collectionID;
+	var parentItemID = io.parentItemID;
 	
 	if (itemID) {
 		var ref = Zotero.Items.get(itemID);
diff --git a/chrome/content/zotero/note.xul b/chrome/content/zotero/note.xul
index 2a83fd819..ec4ea7e4b 100644
--- a/chrome/content/zotero/note.xul
+++ b/chrome/content/zotero/note.xul
@@ -11,6 +11,7 @@
 	height="350"
 	title="&zotero.items.menu.attach.note;"
 	persist="screenX screenY width height"
+	windowtype="zotero:note"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 	<script src="include.js"/>
diff --git a/chrome/content/zotero/preferences/preferences_general.js b/chrome/content/zotero/preferences/preferences_general.js
index 82b3750ff..58f244a7b 100644
--- a/chrome/content/zotero/preferences/preferences_general.js
+++ b/chrome/content/zotero/preferences/preferences_general.js
@@ -42,6 +42,8 @@ Zotero_Preferences.General = {
 				statusBarRow.hidden = false;
 			}
 		}
+		
+		document.getElementById('noteFontSize').value = Zotero.Prefs.get('note.fontSize');
 	},
 	
 	/**
diff --git a/chrome/content/zotero/preferences/preferences_general.xul b/chrome/content/zotero/preferences/preferences_general.xul
index 58d9c7d91..2654273bb 100644
--- a/chrome/content/zotero/preferences/preferences_general.xul
+++ b/chrome/content/zotero/preferences/preferences_general.xul
@@ -32,7 +32,6 @@
 		
 		<preferences id="zotero-prefpane-general-preferences">
 			<preference id="pref-fontSize" name="extensions.zotero.fontSize" type="string"/>
-			<preference id="pref-noteFontSize" name="extensions.zotero.note.fontSize" type="string"/>
 			<preference id="pref-automaticScraperUpdates" name="extensions.zotero.automaticScraperUpdates" type="bool"/>
 			<preference id="pref-reportTranslationFailure" name="extensions.zotero.reportTranslationFailure" type="bool"/>
 			<preference id="pref-automaticSnapshots" name="extensions.zotero.automaticSnapshots" type="bool"/>
@@ -73,7 +72,8 @@
 							<label value="&zotero.preferences.fontSize.notes;" control="noteFontSize"/>
 						</hbox>
 						<hbox>
-							<menulist id="noteFontSize" preference="pref-noteFontSize" editable="true">
+							<menulist id="noteFontSize" editable="true"
+									onblur="Zotero.Prefs.set('note.fontSize', this.value); this.value = Zotero.Prefs.get('note.fontSize');">
 								<menupopup>
 									<menuitem label="11"/>
 									<menuitem label="12"/>
diff --git a/chrome/content/zotero/standalone/basicViewer.xul b/chrome/content/zotero/standalone/basicViewer.xul
index ec4fdafa5..420f6ba79 100644
--- a/chrome/content/zotero/standalone/basicViewer.xul
+++ b/chrome/content/zotero/standalone/basicViewer.xul
@@ -33,7 +33,6 @@
 
 <!DOCTYPE window [
 	<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
-	<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetOverlay.dtd" > %charsetDTD;
 	<!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" > %textcontextDTD;
 	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" > %standaloneDTD;
 	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD;
diff --git a/chrome/content/zotero/standalone/standalone.xul b/chrome/content/zotero/standalone/standalone.xul
index ff0cc912a..15c7db22b 100644
--- a/chrome/content/zotero/standalone/standalone.xul
+++ b/chrome/content/zotero/standalone/standalone.xul
@@ -35,7 +35,6 @@
 
 <!DOCTYPE window [
 	<!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd"> %globalDTD;
-	<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetOverlay.dtd" > %charsetDTD;
 	<!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" > %textcontextDTD;
 	<!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" > %standaloneDTD;
 	<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > %brandDTD;
diff --git a/chrome/content/zotero/tab.xul b/chrome/content/zotero/tab.xul
index de1b7b1e9..fba04011f 100644
--- a/chrome/content/zotero/tab.xul
+++ b/chrome/content/zotero/tab.xul
@@ -10,8 +10,6 @@
 <!DOCTYPE window [
 <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
 %globalDTD;
-<!ENTITY % charsetDTD SYSTEM "chrome://global/locale/charsetOverlay.dtd" >
-%charsetDTD;
 <!ENTITY % textcontextDTD SYSTEM "chrome://global/locale/textcontext.dtd" >
 %textcontextDTD;
 <!ENTITY % standaloneDTD SYSTEM "chrome://zotero/locale/standalone.dtd" >
diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js
index 6c5feaaa7..fb38d5228 100644
--- a/chrome/content/zotero/xpcom/citeproc.js
+++ b/chrome/content/zotero/xpcom/citeproc.js
@@ -1,49 +1,72 @@
 /*
- * Copyright (c) 2009-2013 Frank G. Bennett, Jr. All Rights
- * Reserved.
- *
- * The contents of this file are subject to the Common Public
- * Attribution License Version 1.0 (the “License”); you may not use
- * this file except in compliance with the License. You may obtain a
- * copy of the License at:
- *
+ * Copyright (c) 2009-2014 Frank G. Bennett
+ * 
+ * Unless otherwise indicated, the files in this repository are subject
+ * to the Common Public Attribution License Version 1.0 (the “License”);
+ * you may not use this file except in compliance with the License. You
+ * may obtain a copy of the License at:
+ * 
  * http://bitbucket.org/fbennett/citeproc-js/src/tip/LICENSE.
- *
+ * 
+ * (See also the note on attribution information below)
+ * 
  * The License is based on the Mozilla Public License Version 1.1 but
  * Sections 1.13, 14 and 15 have been added to cover use of software over a
  * computer network and provide for limited attribution for the
  * Original Developer. In addition, Exhibit A has been modified to be
  * consistent with Exhibit B.
- *
+ * 
  * Software distributed under the License is distributed on an “AS IS”
  * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
  * the License for the specific language governing rights and limitations
  * under the License.
- *
+ * 
  * The Original Code is the citation formatting software known as
  * "citeproc-js" (an implementation of the Citation Style Language
  * [CSL]), including the original test fixtures and software located
  * under the ./tests subdirectory of the distribution archive.
- *
+ * 
  * The Original Developer is not the Initial Developer and is
  * __________. If left blank, the Original Developer is the Initial
  * Developer.
- *
- * The Initial Developer of the Original Code is Frank G. Bennett,
- * Jr. All portions of the code written by Frank G. Bennett, Jr. are
- * Copyright (c) 2009-2013 Frank G. Bennett, Jr. All Rights Reserved.
- *
- * Alternatively, the contents of this file may be used under the
- * terms of the GNU Affero General Public License (the [AGPLv3]
- * License), in which case the provisions of [AGPLv3] License are
- * applicable instead of those above. If you wish to allow use of your
- * version of this file only under the terms of the [AGPLv3] License
- * and not to allow others to use your version of this file under the
- * CPAL, indicate your decision by deleting the provisions above and
- * replace them with the notice and other provisions required by the
- * [AGPLv3] License. If you do not delete the provisions above, a
- * recipient may use your version of this file under either the CPAL
- * or the [AGPLv3] License.”
+ * 
+ * The Initial Developer of the Original Code is Frank Bennett. All
+ * portions of the code written by Frank Bennett are Copyright (c)
+ * 2009-2014 Frank Bennett.
+ * 
+ * ***
+ * 
+ * Alternatively, the files in this repository may be used under the
+ * terms of the GNU Affero General Public License (the [AGPLv3] License),
+ * in which case the provisions of [AGPLv3] License are applicable
+ * instead of those above. If you wish to allow use of your version of
+ * this file only under the terms of the [AGPLv3] License and not to
+ * allow others to use your version of this file under the CPAL, indicate
+ * your decision by deleting the provisions above and replace them with
+ * the notice and other provisions required by the [AGPLv3] License. If
+ * you do not delete the provisions above, a recipient may use your
+ * version of this file under either the CPAL or the [AGPLv3] License.
+ * 
+ * ***
+ * 
+ * Attribution Information (CPAL)
+ * 
+ * Attribution Copyright Notice: [no separate attribution copyright notice is required]
+ * 
+ * Attribution Phrase: "Citations by CSL (citeproc-js)"
+ * 
+ * Attribution URL: http://citationstyles.org/
+ * 
+ * Graphic Image: [there is no requirement to display a Graphic Image]
+ * 
+ * Display of Attribution Information is REQUIRED in Larger Works which
+ * are defined in the CPAL as a work which combines Covered Code or
+ * portions thereof with code not governed by the terms of the CPAL.
+ * 
+ * Display of Attribution Information is also REQUIRED on Associated
+ * Websites.
+ * 
+ * [ citeproc-js license :: version 1.1 :: 2012.06.30 ]
  */
 if (!Array.indexOf) {
     Array.prototype.indexOf = function (obj) {
@@ -57,7 +80,7 @@ if (!Array.indexOf) {
     };
 }
 var CSL = {
-    PROCESSOR_VERSION: "1.0.517",
+    PROCESSOR_VERSION: "1.0.536",
     CONDITION_LEVEL_TOP: 1,
     CONDITION_LEVEL_BOTTOM: 2,
     PLAIN_HYPHEN_REGEX: /(?:[^\\]-|\u2013)/,
@@ -696,9 +719,13 @@ CSL_CHROME.prototype.clean = function (xml) {
     xml = xml.replace(/^\n*/, "");
     return xml;
 };
-CSL_CHROME.prototype.getStyleId = function (myxml) {
+CSL_CHROME.prototype.getStyleId = function (myxml, styleName) {
     var text = "";
-    var node = myxml.getElementsByTagName("id");
+    var tagName = "id";
+    if (styleName) {
+        tagName = "title";
+    }
+    var node = myxml.getElementsByTagName(tagName);
     if (node && node.length) {
         node = node.item(0);
     }
@@ -780,7 +807,7 @@ CSL_CHROME.prototype.getAttributeValue = function (myxml,name,namespace) {
     return ret;
 }
 CSL_CHROME.prototype.getNodeValue = function (myxml,name) {
-    var ret = "";
+    var ret = null;
     if (name){
         var vals = myxml.getElementsByTagName(name);
         if (vals.length > 0) {
@@ -792,18 +819,19 @@ CSL_CHROME.prototype.getNodeValue = function (myxml,name) {
                 ret = vals[0].text;
             }
         }
-    } else {
-        ret = myxml;
     }
-    if (ret && ret.childNodes && (ret.childNodes.length == 0 || (ret.childNodes.length == 1 && ret.firstChild.nodeName == "#text"))) {
-        if ("undefined" != typeof ret.textContent) {
-            ret = ret.textContent;
-        } else if ("undefined" != typeof ret.innerText) {
-            ret = ret.innerText;
+    if (ret === null && myxml && myxml.childNodes && (myxml.childNodes.length == 0 || (myxml.childNodes.length == 1 && myxml.firstChild.nodeName == "#text"))) {
+        if ("undefined" != typeof myxml.textContent) {
+            ret = myxml.textContent;
+        } else if ("undefined" != typeof myxml.innerText) {
+            ret = myxml.innerText;
         } else {
-            ret = ret.text;
+            ret = myxml.text;
         }
     }
+    if (ret === null) {
+        ret = myxml;
+    }
     return ret;
 }
 CSL_CHROME.prototype.setAttributeOnNodeIdentifiedByNameAttribute = function (myxml,nodename,partname,attrname,val) {
@@ -1004,53 +1032,12 @@ CSL.getSortCompare = function (default_locale) {
     if (!default_locale) {
         default_locale = "en-US";
     }
-    try {
-        var localeService = Components.classes["@mozilla.org/intl/nslocaleservice;1"]
-            .getService(Components.interfaces.nsILocaleService);
-        var collationFactory = Components.classes["@mozilla.org/intl/collation-factory;1"]
-            .getService(Components.interfaces.nsICollationFactory);
-        var collation = collationFactory.CreateCollation(localeService.newLocale(default_locale));
-        strcmp = function(a, b) {
-            return collation.compareString(1, a, b);
-        };
-        CSL.debug("Using collation sort: "+default_locale);
-    } catch (e) {
-        CSL.debug("Using localeCompare sort");
-        strcmp = function (a, b) {
-            return a.toLocaleLowerCase().localeCompare(b.toLocaleLowerCase());
-        };
-    }
-    var isKana = /^[\[\]\'\"]*[\u3040-\u309f\u30a0-\u30ff]/;
+    strcmp = function (a, b) {
+        return a.toLocaleLowerCase().localeCompare(b.toLocaleLowerCase());
+    };
     var stripPunct = function (str) {
         return str.replace(/^[\[\]\'\"]*/g, "");
     }
-    var getKanaPreSort = function () {
-        if (strcmp("\u3044", "\u3046")) {
-            return false;
-        } else {
-            return function (a, b) {
-                a = stripPunct(a);
-                b = stripPunct(b);
-                var ak = isKana.exec(a);
-                var bk = isKana.exec(b);
-                if (ak || bk) {
-                    if (!ak) {
-                        return -1;
-                    } else if (!bk) {
-                        return 1;
-                    } else if (a < b) {
-                        return -1;
-                    } else if (a > b) {
-                        return 1;
-                    } else {
-                        return 0;
-                    }
-                } else {
-                    return false;
-                }
-            };
-        }
-    }
     var getBracketPreSort = function () {
         if (!strcmp("[x","x")) {
             return false;
@@ -1060,15 +1047,8 @@ CSL.getSortCompare = function (default_locale) {
             }
         }
     }
-    var kanaPreSort = getKanaPreSort();
     var bracketPreSort = getBracketPreSort();
     var sortCompare = function (a, b) {
-        if (kanaPreSort) {
-            var ret = kanaPreSort(a, b);
-            if (false !== ret) {
-                return ret;
-            }
-        }
         if (bracketPreSort) {
             return bracketPreSort(a, b);
         } else {
@@ -1258,6 +1238,8 @@ CSL.XmlToToken = function (state, tokentype) {
             }
         }
         token.decorations = decorations;
+    } else if (tokentype === CSL.END && attributes['@variable']) {
+        token.hasVariable = true;
     }
     target = state[state.build.area].tokens;
     CSL.Node[name].build.call(token, state, target);
@@ -1645,6 +1627,9 @@ CSL.Engine = function (sys, style, lang, forceLang) {
     this.processor_version = CSL.PROCESSOR_VERSION;
     this.csl_version = "1.0";
     this.sys = sys;
+    if (sys.variableWrapper) {
+        CSL.VARIABLE_WRAPPER_PREPUNCT_REX = new RegExp('^([' + [" "].concat(CSL.SWAPPING_PUNCTUATION).join("") + ']*)(.*)');
+    }
     this.sys.xml = new CSL.System.Xml.Parsing();
     if ("undefined" === typeof CSL_JSON && "string" !== typeof style) {
         style = "";
@@ -1673,7 +1658,7 @@ CSL.Engine = function (sys, style, lang, forceLang) {
     this.output = new CSL.Output.Queue(this);
     this.dateput = new CSL.Output.Queue(this);
     this.cslXml = this.sys.xml.makeXml(style);
-    if (this.opt.development_extensions.csl_reverse_lookup_support) {
+    if (this.opt.development_extensions.csl_reverse_lookup_support || this.sys.csl_reverse_lookup_support) {
         this.build.cslNodeId = 0;
         this.setCslNodeIds = function(myxml, nodename) {
             var children = this.sys.xml.children(myxml);
@@ -1701,6 +1686,10 @@ CSL.Engine = function (sys, style, lang, forceLang) {
     this.setStyleAttributes();
     this.opt.xclass = sys.xml.getAttributeValue(this.cslXml, "class");
     this.opt.styleID = this.sys.xml.getStyleId(this.cslXml);
+    this.opt.styleName = this.sys.xml.getStyleId(this.cslXml, true);
+    if (CSL.getSuppressJurisdictions) {
+        this.opt.suppressJurisdictions = CSL.getSuppressJurisdictions(this.opt.styleID);
+    }
     if (this.opt.version.slice(0,4) === "1.1m") {
         this.opt.development_extensions.static_statute_locator = true;
         this.opt.development_extensions.handle_parallel_articles = true;
@@ -1745,6 +1734,7 @@ CSL.Engine = function (sys, style, lang, forceLang) {
         return ret;
     }
     this.locale[this.opt.lang].opts["skip-words-regexp"] = makeRegExp(this.locale[this.opt.lang].opts["skip-words"]);
+    this.output.adjust = new CSL.Output.Queue.adjust(this.getOpt('punctuation-in-quote'));
     this.registry = new CSL.Registry(this);
     this.buildTokenLists("citation");
     this.buildTokenLists("bibliography");
@@ -1816,8 +1806,15 @@ CSL.Engine.prototype.buildTokenLists = function (area) {
 CSL.Engine.prototype.setStyleAttributes = function () {
     var dummy, attr, key, attributes, attrname;
     dummy = {};
-    dummy.name = this.sys.xml.nodename(this.cslXml);
-    attributes = this.sys.xml.attributes(this.cslXml);
+    var cslXml = this.cslXml;
+    var tagName = this.cslXml.tagName ? ("" + this.cslXml.tagName).toLowerCase() : "";
+    if (tagName !== 'style' && tagName !== 'cslstyle') {
+        if (this.cslXml.getElementsByTagName) {
+            var cslXml = this.cslXml.getElementsByTagName('style')[0];
+        }
+    }
+    dummy.name = this.sys.xml.nodename(cslXml);
+    attributes = this.sys.xml.attributes(cslXml);
     for (attrname in attributes) {
         if (attributes.hasOwnProperty(attrname)) {
             CSL.Attributes[attrname].call(dummy, this, attributes[attrname]);
@@ -2092,20 +2089,21 @@ CSL.Engine.prototype.retrieveItem = function (id) {
             Item.legislation_id = legislation_id.join("::");
         }
     }
+    if (!Item["title-short"]) {
+        Item["title-short"] = Item.shortTitle;
+    }
     if (this.opt.development_extensions.main_title_from_short_title) {
         Item["title-main"] = Item.title;
         Item["title-sub"] = false;
-        if (Item.title && Item.shortTitle) {
-            offset = Item.shortTitle.length;
-            if (Item.title.slice(0,offset) === Item.shortTitle && Item.title.slice(offset).match(/^\s*:/)) {
+        if (Item.title && Item['title-short']) {
+            var shortTitle = Item['title-short'];
+            offset = shortTitle.length;
+            if (Item.title.slice(0,offset) === shortTitle && Item.title.slice(offset).match(/^\s*:/)) {
                 Item["title-main"] = Item.title.slice(0,offset).replace(/\s+$/,"");
                 Item["title-sub"] = Item.title.slice(offset).replace(/^\s*:\s*/,"");
             }
         }
     }
-    if (!Item["title-short"]) {
-        Item["title-short"] = Item.shortTitle;
-    }
     var isLegalType = ["legal_case","legislation","gazette","regulation"].indexOf(Item.type) > -1;
     if (!isLegalType && Item.title && this.sys.getAbbreviation) {
         var noHints = false;
@@ -2121,10 +2119,10 @@ CSL.Engine.prototype.retrieveItem = function (id) {
     }
     Item["container-title-short"] = Item.journalAbbreviation;
     if (Item["container-title"] && this.sys.getAbbreviation) {
-        var jurisdiction = this.transform.loadAbbreviation(Item.jurisdiction, "title", Item["container-title"]);
-        if (this.transform.abbrevs[jurisdiction].title) {
-            if (this.transform.abbrevs[jurisdiction].title[Item["container-title"]]) {
-                Item["container-title-short"] = this.transform.abbrevs[jurisdiction].title[Item["container-title"]];
+        var jurisdiction = this.transform.loadAbbreviation(Item.jurisdiction, "container-title", Item["container-title"]);
+        if (this.transform.abbrevs[jurisdiction]["container-title"]) {
+            if (this.transform.abbrevs[jurisdiction]["container-title"][Item["container-title"]]) {
+                Item["container-title-short"] = this.transform.abbrevs[jurisdiction]["container-title"][Item["container-title"]];
             }
         }
     }
@@ -2796,7 +2794,7 @@ CSL.Output.Queue.prototype.append = function (str, tokname, notSerious, ignorePr
         }
         for (var i = blob.decorations.length - 1; i > -1; i += -1) {
             if (blob.decorations[i][0] === "@quotes" && blob.decorations[i][1] === "true") {
-                blob.punctuation_in_quote = this.state.getOpt("punctuation-in-quote")
+                blob.punctuation_in_quote = this.state.getOpt("punctuation-in-quote");
             }
             if (!blob.blobs.match(CSL.ROMANESQUE_REGEXP)) {
                 if (blob.decorations[i][0] === "@font-style") {
@@ -2853,16 +2851,16 @@ CSL.Output.Queue.prototype.string = function (state, myblobs, blob) {
                         if (state.normalDecorIsOrphan(blobjr, params)) {
                             continue;
                         }
-                        b = state.fun.decorate[params[0]][params[1]](state, b, params[2]);
+                        b = state.fun.decorate[params[0]][params[1]].call(blobjr, state, b, params[2]);
                     }
                 }
                 if (b && b.length) {
                     b = txt_esc(blobjr.strings.prefix, state.tmp.nestedBraces) + b + txt_esc(blobjr.strings.suffix, state.tmp.nestedBraces);
-                    if (state.opt.development_extensions.csl_reverse_lookup_support && !state.tmp.suppress_decorations) {
+                    if ((state.opt.development_extensions.csl_reverse_lookup_support || state.sys.csl_reverse_lookup_support) && !state.tmp.suppress_decorations) {
                         for (j = 0, jlen = blobjr.decorations.length; j < jlen; j += 1) {
                             params = blobjr.decorations[j];
                             if (params[0] === "@showid") {
-                                b = state.fun.decorate[params[0]][params[1]](state, b, params[2]);
+                                b = state.fun.decorate[params[0]][params[1]].call(blobjr, state, b, params[2]);
                             }
                         }
                     }
@@ -2915,7 +2913,7 @@ CSL.Output.Queue.prototype.string = function (state, myblobs, blob) {
                     continue;
                 }
                 if ("string" === typeof blobs_start) {
-                    blobs_start = state.fun.decorate[params[0]][params[1]](state, blobs_start, params[2]);
+                    blobs_start = state.fun.decorate[params[0]][params[1]].call(blob, state, blobs_start, params[2]);
                 }
             }
         }
@@ -2935,7 +2933,9 @@ CSL.Output.Queue.prototype.string = function (state, myblobs, blob) {
                 if (["@cite","@bibliography", "@display", "@showid"].indexOf(params[0]) === -1) {
                     continue;
                 }
-                blobs_start = state.fun.decorate[params[0]][params[1]].call(blob, state, blobs_start, params[2]);
+                if ("string" === typeof blobs_start) {
+                    blobs_start = state.fun.decorate[params[0]][params[1]].call(blob, state, blobs_start, params[2]);
+                }
             }
         }
     }
@@ -2985,6 +2985,7 @@ CSL.Output.Queue.prototype.renderBlobs = function (blobs, delim, in_cite, parent
         blobs[0].strings.prefix = parent.strings.prefix + blobs[0].strings.prefix;
         blobs[0].strings.suffix = blobs[0].strings.suffix + parent.strings.suffix;
         blobs[0].decorations = blobs[0].decorations.concat(parent.decorations);
+        blobs[0].params = parent.params;
         return blobs[0];
     }
     var start = true;
@@ -3039,7 +3040,7 @@ CSL.Output.Queue.prototype.renderBlobs = function (blobs, delim, in_cite, parent
                     if (state.normalDecorIsOrphan(blob, params)) {
                         continue;
                     }
-                    str = state.fun.decorate[params[0]][params[1]](state, str, params[2]);
+                    str = state.fun.decorate[params[0]][params[1]].call(blob, state, str, params[2]);
                 }
             }
             str = txt_esc(blob.strings.prefix) + str + txt_esc(blob.strings.suffix);
@@ -3062,321 +3063,409 @@ CSL.Output.Queue.prototype.renderBlobs = function (blobs, delim, in_cite, parent
     }
     return ret;
 };
-CSL.Output.Queue.purgeEmptyBlobs = function (myblobs, endOnly) {
-    var res, i, ilen, j, jlen, tmpblobs;
-    if ("string" === typeof myblobs || !myblobs.length) {
+CSL.Output.Queue.purgeEmptyBlobs = function (parent) {
+    if ("object" !== typeof parent || "object" !== typeof parent.blobs || !parent.blobs.length) {
         return;
     }
-    for (i = myblobs.length - 1; i > -1; i += -1) {
-        if ("undefined" === typeof myblobs[i].blobs) {
-            myblobs[i].blobs = [];
-        }
-        CSL.Output.Queue.purgeEmptyBlobs(myblobs[i].blobs, endOnly);
-    }
-    for (i = myblobs.length - 1; i > -1; i += -1) {
-        if (!myblobs[i].blobs.length) {
-            tmpblobs = myblobs.slice(i + 1);
-            for (j = i, jlen = myblobs.length; j < jlen; j += 1) {
-                myblobs.pop();
+    for (var i=parent.blobs.length-1;i>-1;i--) {
+        CSL.Output.Queue.purgeEmptyBlobs(parent.blobs[i]);
+        var child = parent.blobs[i];
+        if (!child || !child.blobs || !child.blobs.length) {
+            var buf = [];
+            while ((parent.blobs.length-1) > i) {
+                buf.push(parent.blobs.pop());
             }
-            for (j = 0, jlen = tmpblobs.length; j < jlen; j += 1) {
-                myblobs.push(tmpblobs[j]);
+            parent.blobs.pop();
+            while (buf.length) {
+                parent.blobs.push(buf.pop());
             }
         }
-        if (endOnly) {
-            break;
-        }
     }
 };
-CSL.Output.Queue.purgeNearsidePrefixChars = function(myblob, chr) {
-    if (!chr) {
-        return;
+CSL.Output.Queue.adjust = function (punctInQuote) {
+    var NO_SWAP_IN = {
+        ";": true,
+        ":": true
     }
-    if ("object" === typeof myblob) {
-        if ((CSL.TERMINAL_PUNCTUATION.indexOf(chr) > -1
-             && CSL.TERMINAL_PUNCTUATION.slice(0, -1).indexOf(myblob.strings.prefix.slice(0, 1)) > -1)
-            && !(myblob.strings.prefix.slice(0,1) === ";" && chr === ".")) {
-            myblob.strings.prefix = myblob.strings.prefix.slice(1);
-        } else if ("object" === typeof myblob.blobs) {
-            CSL.Output.Queue.purgeNearsidePrefixChars(myblob.blobs[0], chr);
+    var NO_SWAP_OUT = {
+        ".": true,
+        "!": true,
+        "?": true
+    }
+    this.upward = upward;
+    this.leftward = leftward;
+    this.downward = downward;
+    this.fix = fix;
+    var LtoR_MAP = {
+        "!": {
+            ".": "!",
+            "?": "!?",
+            ":": "!",
+            ",": "!,",
+            ";": "!;"
+        },
+        "?": {
+            "!": "?!",
+            ".": "?",
+            ":": "?",
+            ",": "?,",
+            ";": "?;"
+        },
+        ".": {
+            "!": ".!",
+            "?": ".?",
+            ":": ".:",
+            ",": ".,",
+            ";": ".;"
+        },
+        ":": {
+            "!": "!",
+            "?": "?",
+            ".": ":",
+            ",": ":,",
+            ";": ":;"
+        },
+        ",": {
+            "!": ",!",
+            "?": ",?",
+            ":": ",:",
+            ".": ",.",
+            ";": ",;"
+        },
+        ";": {
+            "!": "!",
+            "?": "?",
+            ":": ";",
+            ",": ";,",
+            ".": ";"
         }
     }
-};
-CSL.Output.Queue.purgeNearsidePrefixSpaces = function(myblob, chr) {
-    if ("object" === typeof myblob) {
-        if (" " === chr && " " === myblob.strings.prefix.slice(0, 1)) {
-            myblob.strings.prefix = myblob.strings.prefix.slice(1);
-        } else if ("object" === typeof myblob.blobs) {
-            CSL.Output.Queue.purgeNearsidePrefixSpaces(myblob.blobs[0], chr);
+    var SWAP_IN = {};
+    var SWAP_OUT = {};
+    var PUNCT = {};
+    var PUNCT_OR_SPACE = {};
+    for (var key in LtoR_MAP) {
+        PUNCT[key] = true;
+        PUNCT_OR_SPACE[key] = true;
+        if (!NO_SWAP_IN[key]) {
+            SWAP_IN[key] = true;
+        }
+        if (!NO_SWAP_OUT[key]) {
+            SWAP_OUT[key] = true;
         }
     }
-};
-CSL.Output.Queue.purgeNearsideSuffixSpaces = function(myblob, chr) {
-    if ("object" === typeof myblob) {
-        if (" " === chr && " " === myblob.strings.suffix.slice(-1)) {
-            myblob.strings.suffix = myblob.strings.suffix.slice(0, -1);
-        } else if ("object" === typeof myblob.blobs) {
-            if (!chr) {
-                chr = myblob.strings.suffix.slice(-1);
+    PUNCT_OR_SPACE[" "] = true;
+    PUNCT_OR_SPACE[" "] = true;
+    var RtoL_MAP = {};
+    for (var key in LtoR_MAP) {
+        for (var subkey in LtoR_MAP[key]) {
+            if (!RtoL_MAP[subkey]) {
+                RtoL_MAP[subkey] = {};
             }
-            chr = CSL.Output.Queue.purgeNearsideSuffixSpaces(myblob.blobs[myblob.blobs.length - 1], chr);
-        } else {
-            chr = myblob.strings.suffix.slice(-1);
+            RtoL_MAP[subkey][key] = LtoR_MAP[key][subkey];
         }
     }
-    return chr;
-};
-CSL.Output.Queue.adjustPunctuation = function (state, myblobs, stk) {
-    var chr, suffix, dpref, blob, delimiter, suffixX, dprefX, blobX, delimiterX, prefix, prefixX, dsuffX, dsuff, slast, dsufff, dsufffX, lastchr, firstchr, exposed_suffixes, exposed, j, jlen, i, ilen;
-    var TERMS = CSL.TERMINAL_PUNCTUATION.slice(0, -1);
-    var TERM_OR_SPACE = CSL.TERMINAL_PUNCTUATION;
-    var SWAPS = CSL.SWAPPING_PUNCTUATION;
-    if (!stk) {
-        stk = [{suffix: "", delimiter: "", lastNode:true}];        
-    }
-    slast = stk.length - 1;
-    delimiter = stk[slast].delimiter;
-    dpref = stk[slast].dpref;
-    dsuff = stk[slast].dsuff;
-    dsufff = stk[slast].dsufff;
-    prefix = stk[slast].prefix;
-    suffix = stk[slast].suffix;
-    blob = stk[slast].blob;
-    if ("string" === typeof myblobs) {
-        if (suffix) {
-            if (blob && 
-                TERMS.indexOf(myblobs.slice(-1)) > -1 &&
-                TERMS.slice(1).indexOf(suffix) > -1 &&
-                blob.strings.suffix !== " ") {
-                    blob.strings.suffix = blob.strings.suffix.slice(1);
-            }
+    function blobIsNumber(blob) {
+        return ("number" === typeof blob.num || (blob.blobs && blob.blobs.length === 1 && "number" === typeof blob.blobs[0].num));
+    };
+    function blobEndsInNumber(blob) {
+        if ("number" === typeof blob.num) {
+            return true;
         }
-        lastchr = myblobs.slice(-1);
-        firstchr = myblobs.slice(0,1);
-    } else {
-        if (dpref) {
-            for (j = 0, jlen = myblobs.length - 1; j < jlen; j += 1) {
-                var t = myblobs[j].strings.suffix.slice(-1);
-                if (TERMS.indexOf(t) === -1 ||
-                    TERMS.indexOf(dpref) === -1) {
-                    if (dpref !== " " || dpref !== myblobs[j].strings.suffix.slice(-1)) {
-                        myblobs[j].strings.suffix += dpref;                        
-                    }
+        if (!blob.blobs || "object" !==  typeof blob.blobs) return false;
+        if (blobEndsInNumber(blob.blobs[blob.blobs.length-1])) return true;
+    }
+    function blobHasDecorations(blob,includeQuotes) {
+        var ret = false;
+        var decorlist = ['@font-style','@font-variant','@font-weight','@text-decoration','@vertical-align'];
+        if (includeQuotes) {
+            decorlist.push('@quotes');
+        }
+        if (blob.decorations) {
+            for (var i=0,ilen=blob.decorations.length;i<ilen;i++) {
+                if (decorlist.indexOf(blob.decorations[i][0]) > -1) {
+                    ret = true;
+                    break;
                 }
             }
         }
-        if (suffix === " ") {
-            CSL.Output.Queue.purgeNearsideSuffixSpaces(myblobs[myblobs.length - 1], " ");
+        return ret;
+    };
+    function blobHasDescendantQuotes(blob) {
+        if (blob.decorations) {
+            for (var i=0,ilen=blob.decorations.length;i<ilen;i++) {
+                if (blob.decorations[i][0] === '@quotes') {
+                    return true;
+                }
+            }
         }
-        var lst = [];
-        var doblob;
-        for (i = 0, ilen = myblobs.length - 1; i < ilen; i += 1) {
-            doblob = myblobs[i];
-            var following_prefix = myblobs[i + 1].strings.prefix;
-            chr = false;
-            var ret = CSL.Output.Queue.purgeNearsideSuffixSpaces(doblob, chr);
-            if (!dsuff) {
-                lst.push(ret);
+        if ("object" !== typeof blob.blobs) return false;
+        if (blobHasDescendantQuotes(blob.blobs[blob.blobs.length-1])) return true;
+        return false;
+    }
+    function matchLastChar(blob, chr) {
+        if (blob.strings.suffix.slice(0, 1) === chr) {
+            return true;
+        } else if ("string" === typeof blob.blobs) {
+            if (blob.blobs.slice(-1) === chr) {
+                return true;
             } else {
-                lst.push(false);
+                return false;
             }
         }
-        chr = false;
-        for (i = 1, ilen = myblobs.length; i < ilen; i += 1) {
-            doblob = myblobs[i];
-            chr = "";
-            var preceding_suffix = myblobs[i - 1].strings.suffix;
-            if (dsuff === " ") {
-                chr = dsuff;
-            } else if (preceding_suffix) {
-                chr = preceding_suffix.slice(-1);
-            } else if (lst[i - 1]) {
-                chr = lst[i - 1];
+        for (var i=0,ilen=blob.blobs.length;i<ilen;i++) {
+            if (matchLastChar(blob.blobs[i])) return true;
+        }
+        return false;
+    };
+    function mergeChars (First, first, Second, second, merge_right) {
+        FirstStrings = "blobs" === first ? First : First.strings;
+        SecondStrings = "blobs" === second ? Second: Second.strings;
+        var firstChar = FirstStrings[first].slice(-1);
+        var secondChar = SecondStrings[second].slice(0,1);
+        function cullRight () {
+            SecondStrings[second] = SecondStrings[second].slice(1);
+        };
+        function cullLeft () {
+            FirstStrings[first] = FirstStrings[first].slice(0,-1);
+        };
+        function addRight (chr) {
+            SecondStrings[second] = chr + SecondStrings[second];
+        }
+        function addLeft (chr) {
+            FirstStrings[first] += chr;
+        }
+        var cull = merge_right ? cullLeft : cullRight;
+        function matchOnRight () {
+            return RtoL_MAP[secondChar];
+        }
+        function matchOnLeft () {
+            var chr = FirstStrings[first].slice(-1);
+            return LtoR_MAP[firstChar];
+        }
+        var match = merge_right ? matchOnLeft : matchOnRight;
+        function mergeToRight () {
+            var chr = LtoR_MAP[firstChar][secondChar];
+            if ("string" === typeof chr) {
+                cullLeft();
+                cullRight();
+                addRight(chr);
+            } else {
+                addRight(firstChar);
+                cullLeft();
             }
-            CSL.Output.Queue.purgeNearsidePrefixSpaces(doblob, chr);
         }
-        if (dsufff) {
-            CSL.Output.Queue.purgeNearsidePrefixSpaces(myblobs[0], " ");
-        } else if (prefix === " ") {
-            CSL.Output.Queue.purgeNearsidePrefixSpaces(myblobs[0], " ");
+        function mergeToLeft () {
+            var chr = RtoL_MAP[secondChar][firstChar];
+            if ("string" === typeof chr) {
+                cullLeft();
+                cullRight();
+                addLeft(chr);
+            } else {
+                addLeft(secondChar);
+                cullRight();
+            }
         }
-        for (i = 0, ilen = myblobs.length; i < ilen; i += 1) {
-            doblob = myblobs[i];
-            CSL.Output.Queue.purgeNearsidePrefixChars(doblob, lastchr);
+        var merge = merge_right ? mergeToRight: mergeToLeft;
+        var isDuplicate = firstChar === secondChar;
+        if (isDuplicate) {
+            cull();
+        } else {
+            if (match()) {
+                merge();
+            }
+        }
+    };
+    function upward (parent) {
+        if ("object" !== typeof parent || "object" !== typeof parent.blobs || !parent.blobs.length) {
+            return;
+        }
+        var parentDecorations = blobHasDecorations(parent,true);
+        for (var i=parent.blobs.length-1;i>-1;i--) {
+            var endFlag = i === (parent.blobs.length-1);
+            this.upward(parent.blobs[i]);
+            var parentStrings = parent.strings;
+            var childStrings = parent.blobs[i].strings;
             if (i === 0) {
-                if (prefix) {
-                    if (doblob.strings.prefix.slice(0, 1) === " ") {
+                if (" " === parentStrings.prefix.slice(-1) && " " === childStrings.prefix.slice(0, 1)) {
+                    childStrings.prefix = childStrings.prefix.slice(1);
+                }
+                var childChar = childStrings.prefix.slice(0, 1);
+                if (!parentDecorations && PUNCT_OR_SPACE[childChar] && !parentStrings.prefix) {
+                    parentStrings.prefix += childChar;
+                    childStrings.prefix = childStrings.prefix.slice(1);
+                }
+            }
+            if (i === (parent.blobs.length - 1)) {
+                var childChar = childStrings.suffix.slice(-1);
+                if (!parentDecorations && [" "].indexOf(childChar) > -1) {
+                    if (parentStrings.suffix.slice(0,1) !== childChar) {
+                        parentStrings.suffix = childChar + parentStrings.suffix;
+                    }
+                    childStrings.suffix = childStrings.suffix.slice(0, -1);
+                }
+            }
+            if (parentStrings.delimiter && i > 0) {
+                if (PUNCT_OR_SPACE[parentStrings.delimiter.slice(-1)]
+                    && parentStrings.delimiter.slice(-1) === childStrings.prefix.slice(0, 1)) {
+                    childStrings.prefix = childStrings.prefix.slice(1);
+                }
+            }
+        }
+    };
+    function leftward (parent) {
+        if ("object" !== typeof parent || "object" !== typeof parent.blobs || !parent.blobs.length) {
+            return;
+        }
+        for (var i=parent.blobs.length-1;i>-1;i--) {
+            this.leftward(parent.blobs[i]);
+            if ((i < parent.blobs.length -1) && !parent.strings.delimiter) {
+                var child = parent.blobs[i];
+                var childChar = child.strings.suffix.slice(-1);
+                var sibling = parent.blobs[i+1];
+                var siblingChar = sibling.strings.prefix.slice(0, 1);
+                var hasDecorations = blobHasDecorations(child) || blobHasDecorations(sibling);
+                var hasNumber = "number" === typeof childChar || "number" === typeof siblingChar;
+                if (!hasDecorations && !hasNumber && PUNCT[siblingChar] && !hasNumber) {
+                    var suffixAndPrefixMatch = siblingChar === child.strings.suffix.slice(-1);
+                    var suffixAndFieldMatch = (!child.strings.suffix && "string" === typeof child.blobs && child.blobs.slice(-1) === siblingChar);
+                    if (!suffixAndPrefixMatch && !suffixAndFieldMatch) {
+                        mergeChars(child, 'suffix', sibling, 'prefix');
+                    } else {
+                        sibling.strings.prefix = sibling.strings.prefix.slice(1);
                     }
                 }
             }
-            if (dsufff) {
-                if (doblob.strings.prefix) {
-                    if (i === 0) {
-                        if (doblob.strings.prefix.slice(0, 1) === " ") {
-                        }
-                    }
-                }
+        }
+    };
+    function downward (parent) {
+        if ("object" !== typeof parent || "object" !== typeof parent.blobs || !parent.blobs.length) {
+            return;
+        }
+        var parentStrings = parent.strings;
+        var someChildrenAreNumbers = false;
+        for (var i=0,ilen=parent.blobs.length;i<ilen;i++) {
+            if (blobIsNumber(parent.blobs[i])) {
+                someChildrenAreNumbers = true;
+                break;
             }
-            if (dsuff) {
-                if (i > 0) {
-                    if (doblob.strings.prefix.slice(0, 1) === " ") {
-                    }
+        }
+        if (!someChildrenAreNumbers) {
+            if (parentStrings.delimiter && PUNCT[parentStrings.delimiter.slice(0, 1)]) {
+                var delimChar = parentStrings.delimiter.slice(0, 1);
+                for (var i=parent.blobs.length-2;i>-1;i--) {
+                    var childStrings = parent.blobs[i].strings;
+                    childStrings.suffix += delimChar;
                 }
+                parentStrings.delimiter = parentStrings.delimiter.slice(1);
             }
-            if (i < (myblobs.length - 1)) {
-                var nextprefix = myblobs[i + 1].strings.prefix;
-                if (!delimiter) {
-                    if (nextprefix) {
-                        var nxtchr = nextprefix.slice(0, 1);
-                        if (SWAPS.indexOf(nxtchr) > -1) {
-                            myblobs[i + 1].strings.prefix = nextprefix.slice(1);
-                            if (TERMS.indexOf(nxtchr) === -1 ||
-                                (TERMS.indexOf(nxtchr) > -1 &&
-                                 TERMS.indexOf(doblob.strings.suffix.slice(-1)) === -1)) {
-                                     doblob.strings.suffix += nxtchr;
+        }
+        var parentDecorations = blobHasDecorations(parent, true);
+        var parentIsNumber = blobIsNumber(parent);
+        for (var i=parent.blobs.length-1;i>-1;i--) {
+            var child = parent.blobs[i];
+            var childStrings = parent.blobs[i].strings;
+            var childDecorations = blobHasDecorations(child, true);
+            var childIsNumber = blobIsNumber(child);
+            if (i === (parent.blobs.length - 1)) {
+                if (true || !someChildrenAreNumbers) {
+                    if (!parentDecorations || blobHasDescendantQuotes(child)) {
+                        var parentChar = parentStrings.suffix.slice(0, 1);
+                        if (PUNCT[parentChar]) {
+                            if (!blobEndsInNumber(child)) {
+                                mergeChars(child, 'suffix', parent, 'suffix');
                             }
-                        } else if (nxtchr === " " &&
-                                    doblob.strings.suffix.slice(-1) === " ") {
-                            doblob.strings.suffix = doblob.strings.suffix.slice(0, -1);
                         }
-                    }
-                }
-            }
-            if (i === (myblobs.length - 1)) {
-                if (suffix) {
-                    if (doblob.strings.suffix && 
-                        (TERMS.slice(1).indexOf(suffix) > -1 &&
-                          TERMS.indexOf(doblob.strings.suffix.slice(-1)) > -1)) {
-                            blob.strings.suffix = blob.strings.suffix.slice(1);
-                    }
-                }
-            }
-            if (state.getOpt('punctuation-in-quote')) {
-                var decorations = doblob.decorations;
-                for (j = 0, jlen = decorations.length; j < jlen; j += 1) {
-                    if (decorations[j][0] === '@quotes' && (decorations[j][1] === 'true' || decorations[j][1] === 'inner')) {
-                        doblob.punctuation_in_quote = true;
-                        stk[slast].lastNode = true;
-                    }
-                }
-            }
-            if (doblob.punctuation_in_quote && stk[slast].lastNode) {
-                var swapchar = doblob.strings.suffix.slice(0, 1);
-                var swapblob = false;
-                if (SWAPS.indexOf(swapchar) > -1) {
-                    swapblob = doblob;
-                } else if (SWAPS.indexOf(suffix) > -1 && i === (myblobs.length - 1)) {
-                    swapchar = suffix;
-                    swapblob = blob;
-                } else {
-                    swapchar = false;
-                }
-                if (swapchar) {
-                    if ("string" === typeof doblob.blobs) {
-                        if (SWAPS.indexOf(doblob.blobs.slice(-1)) === -1 ||
-                            (TERMS.indexOf(doblob.blobs.slice(-1)) > -1 &&
-                             SWAPS.indexOf(swapchar) > -1 &&
-                             TERMS.indexOf(swapchar) === -1)) {
-                            doblob.blobs += swapchar;
+                        if (childStrings.suffix.slice(-1) === " " && parentStrings.suffix.slice(0,1)) {
+                            parentStrings.suffix = parentStrings.suffix.slice(1);
                         }
                     } else {
-                        if (SWAPS.indexOf(doblob.blobs.slice(-1)[0].strings.suffix.slice(-1)) === -1 ||
-                            (TERMS.indexOf(doblob.blobs.slice(-1)[0].strings.suffix.slice(-1)) > -1 &&
-                             SWAPS.indexOf(swapchar) > -1 &&
-                             TERMS.indexOf(swapchar) === -1)) {
-                            doblob.blobs.slice(-1)[0].strings.suffix += swapchar;
+                        if (matchLastChar(child,parent.strings.suffix.slice(0,1))) {
+                            parent.strings.suffix = parent.strings.suffix.slice(1);
+                        }   
+                    }
+                    if (PUNCT_OR_SPACE[childStrings.suffix.slice(0,1)]) {
+                        if ("string" === typeof child.blobs && child.blobs.slice(-1) === childStrings.suffix.slice(0,1)) {
+                            childStrings.suffix = childStrings.suffix.slice(1);
+                        }
+                        if (childStrings.suffix.slice(-1) === parentStrings.suffix.slice(0, 1)) {
+                            childStrings.suffix = childStrings.suffix.slice(0, -1);
                         }
                     }
-                    swapblob.strings.suffix = swapblob.strings.suffix.slice(1);
                 }
-            }
-            if (i === (myblobs.length - 1)) {
-                if (doblob.strings.suffix) {
-                    suffixX = doblob.strings.suffix.slice(0, 1);
-                    blobX = doblob;
-                } else {
-                    suffixX = stk[stk.length - 1].suffix;
-                    blobX = stk[stk.length - 1].blob;
+            } else if (parentStrings.delimiter) {
+                if (PUNCT_OR_SPACE[parentStrings.delimiter.slice(0,1)]
+                    && parentStrings.delimiter.slice(0, 1) === childStrings.suffix.slice(-1)) {
+                    parent.blobs[i].strings.suffix = parent.blobs[i].strings.suffix.slice(0, -1);
                 }
             } else {
-                if (doblob.strings.suffix) {
-                    suffixX = doblob.strings.suffix.slice(0, 1);
-                    blobX = doblob;
-                } else {
-                    suffixX = "";
-                    blobX = false;
+                var siblingStrings = parent.blobs[i+1].strings;
+                if (!blobIsNumber(child) 
+                    && !childDecorations
+                    && PUNCT_OR_SPACE[childStrings.suffix.slice(-1)]
+                    && childStrings.suffix.slice(-1) === siblingStrings.prefix.slice(0, 1)) {
+                    siblingStrings.prefix = siblingStrings.prefix.slice(1);
                 }
             }
-            if (SWAPS.concat([" "]).indexOf(suffixX) === -1) {
-                suffixX = "";
-                blobX = false;
+            if (!childIsNumber && !childDecorations && PUNCT[childStrings.suffix.slice(0,1)]
+                && "string" === typeof child.blobs) {
+                mergeChars(child, 'blobs', child, 'suffix')
             }
-            if (doblob.strings.delimiter && 
-                doblob.blobs.length > 1) {
-                dprefX = doblob.strings.delimiter.slice(0, 1);
-                if (SWAPS.concat([" "]).indexOf(dprefX) > -1) {
-                    doblob.strings.delimiter = doblob.strings.delimiter.slice(1);
-                } else {
-                    dprefX = "";
-                }
-            } else {
-                dprefX = "";
-            }
-            if (doblob.strings.prefix) {
-                if (doblob.strings.prefix.slice(-1) === " ") {
-                    prefixX = " ";
-                } else {
-                    prefixX = "";
-                }
-            } else {
-                if (i === 0) {
-                    prefixX = prefix;                    
-                } else {
-                    prefixX = "";
-                }
-            }
-            if (dsuff) {
-                dsufffX = dsuff;
-            } else {
-                if (i === 0) {
-                    dsufffX = dsufff;                    
-                } else {
-                    dsufffX = "";
-                }
-            }
-            if (doblob.strings.delimiter) {
-                if (doblob.strings.delimiter.slice(-1) === " " &&
-                    "object" === typeof doblob.blobs && doblob.blobs.length > 1) {
-                       dsuffX = doblob.strings.delimiter.slice(-1);
-                } else {
-                    dsuffX = "";                        
-                }
-            } else {
-                dsuffX = "";                    
-            }
-            delimiterX = doblob.strings.delimiter;
-            var lastNode
-            if (i === (myblobs.length - 1) && stk[slast].lastNode) {
-                lastNode = true;
-            } else {
-                lastNode = false;
-            }
-            stk.push({suffix: suffixX, dsuff:dsuffX, blob:blobX, delimiter:delimiterX, prefix:prefixX, dpref: dprefX, dsufff: dsufffX, lastNode: lastNode});
-            lastchr = CSL.Output.Queue.adjustPunctuation(state, doblob.blobs, stk);
+            this.downward(parent.blobs[i]);
         }
-        if (myblobs && myblobs.length) {
-            var last_suffix = myblobs[myblobs.length - 1].strings.suffix;
-            if (last_suffix) {
-                lastchr = last_suffix.slice(-1);
+    };
+    function fix (parent) {
+        if ("object" !== typeof parent || "object" !== typeof parent.blobs || !parent.blobs.length) {
+            return;
+        }
+        var lastChar;
+        for (var i=0,ilen=parent.blobs.length;i<ilen;i++) {
+            var child = parent.blobs[i];
+            var quoteSwap = false;
+            for (var j=0,jlen=child.decorations.length;j<jlen;j++) {
+                var decoration = child.decorations[j];
+                if (decoration[0] === "@quotes") {
+                    quoteSwap = true;
+                }
+            }
+            if (quoteSwap) {
+                if (punctInQuote) {
+                    var childChar = child.strings.suffix.slice(0,1);
+                    if ("string" === typeof child.blobs) {
+                        while (SWAP_IN[childChar]) {
+                            mergeChars(child, 'blobs', child, 'suffix');
+                            childChar = child.strings.suffix.slice(0,1);
+                        }                                
+                    } else {
+                        while (SWAP_IN[childChar]) {
+                            mergeChars(child.blobs[child.blobs.length-1], 'suffix', child, 'suffix');
+                            childChar = child.strings.suffix.slice(0,1);
+                        }
+                    }
+                } else {
+                    if ("string" === typeof child.blobs) {
+                        var childChar = child.blobs.slice(-1);
+                        while (SWAP_OUT[childChar]) {
+                            mergeChars(child, 'blobs', child, 'suffix', true);
+                            childChar = child.blobs.slice(-1);
+                        }
+                    } else {
+                        var childChar = child.blobs[child.blobs.length-1].strings.suffix.slice(-1);
+                        while (SWAP_OUT[childChar]) {
+                            mergeChars(child.blobs[child.blobs.length-1], 'suffix', child, 'suffix', true);
+                            childChar = child.blobs[child.blobs.length-1].strings.suffix.slice(-1);
+                        }
+                    }
+                }
+            }
+            lastChar = this.fix(parent.blobs[i]);
+            if (child.blobs && "string" === typeof child.blobs) {
+                lastChar = child.blobs.slice(-1);
             }
         }
-    }
-    if (stk.length > 1) {
-        stk.pop();
-    }
-    state.tmp.last_chr = lastchr;
-    return lastchr;
-};
+        return lastChar;
+    };
+}
 CSL.Engine.Opt = function () {
     this.has_disambiguate = false;
     this.mode = "html";
@@ -3701,6 +3790,7 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
     }
     this.tmp.taintedCitationIDs = {};
     var sortedItems = [];
+    var rerunAkeys = {};
     for (i = 0, ilen = citation.citationItems.length; i < ilen; i += 1) {
         item = {};
         for (key in citation.citationItems[i]) {
@@ -3877,9 +3967,34 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
                     oldvalue["near-note"] = item[1]["near-note"];
                     item[1]["first-reference-note-number"] = 0;
                     item[1]["near-note"] = false;
+                    if (this.registry.citationreg.citationsByItemId[myid]) {
+                        if (this.opt.xclass === 'note' && this.opt.has_disambiguate) {
+                            var oldCount = this.registry.registry[myid]["citation-count"]
+                            var newCount = this.registry.citationreg.citationsByItemId[myid].length;
+                            this.registry.registry[myid]["citation-count"] = this.registry.citationreg.citationsByItemId[myid].length;
+                            if ("number" === typeof oldCount) {
+                                var oldCountCheck = (oldCount < 2);
+                                var newCountCheck = (newCount < 2);
+                                if (oldCountCheck !== newCountCheck) {
+                                    for (var l=0,llen=this.registry.citationreg.citationsByItemId[myid].length;l<llen;l++) {
+                                        rerunAkeys[this.registry.registry[myid].ambig] = true;
+                                        this.tmp.taintedCitationIDs[this.registry.citationreg.citationsByItemId[myid][l].citationID] = true;
+                                    }
+                                }
+                            } else {
+                                for (var l=0,llen=this.registry.citationreg.citationsByItemId[myid].length;l<llen;l++) {
+                                    rerunAkeys[this.registry.registry[myid].ambig] = true;
+                                    this.tmp.taintedCitationIDs[this.registry.citationreg.citationsByItemId[myid][l].citationID] = true;
+                                }
+                            }
+                        }
+                    }
                     var oldlastid;
                     if ("undefined" === typeof first_ref[myid]) {
                         first_ref[myid] = onecitation.properties.noteIndex;
+                        if (this.registry.registry[myid]) {
+                            this.registry.registry[myid]['first-reference-note-number'] = onecitation.properties.noteIndex;
+                        }
                         last_ref[myid] = onecitation.properties.noteIndex;
                         item[1].position = CSL.POSITION_FIRST;
                     } else {
@@ -3975,6 +4090,11 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
                         if (suprame || ibidme) {
                             if (first_ref[myid] != onecitation.properties.noteIndex) {
                                 item[1]["first-reference-note-number"] = first_ref[myid];
+                                if (this.registry.registry[myid]) {
+                                    var oldFirst = this.registry.citationreg.citationsByItemId[myid][0].properties.noteIndex;
+                                    var newFirst = onecitation.properties.noteIndex;
+                                    this.registry.registry[myid]['first-reference-note-number'] = newFirst < oldFirst ? newFirst: oldFirst;
+                                }
                             }
                         }
                     }
@@ -3990,10 +4110,20 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
                         for (n = 0, nlen = CSL.POSITION_TEST_VARS.length; n < nlen; n += 1) {
                             var param = CSL.POSITION_TEST_VARS[n];
                             if (item[1][param] !== oldvalue[param]) {
+                                if (param === 'first-reference-note-number') {
+                                    rerunAkeys[this.registry.registry[myid].ambig] = true;
+                                }
                                 this.tmp.taintedCitationIDs[onecitation.citationID] = true;
+                                if (param === 'first-reference-note-number') {
+                                    this.tmp.taintedItemIDs[myid] = true;
+                                }
                             }
                         }
                     }
+                    if (this.sys.variableWrapper) {
+                        item[1].index = onecitation.properties.index;
+                        item[1].noteIndex = onecitation.properties.noteIndex;
+                    }
                 }
             }
         }
@@ -4039,6 +4169,9 @@ CSL.Engine.prototype.processCitationCluster = function (citation, citationsPre,
             }
         }
     } else {
+        for (var rerunAkey in rerunAkeys) {
+            this.disambiguate.run(rerunAkey, citation);
+        }
         var obj;
         for (key in this.tmp.taintedCitationIDs) {
             if (key == citation.citationID) {
@@ -4116,7 +4249,7 @@ CSL.Engine.prototype.makeCitationCluster = function (rawList) {
     str = CSL.getCitationCluster.call(this, inputList);
     return str;
 };
-CSL.getAmbiguousCite = function (Item, disambig) {
+CSL.getAmbiguousCite = function (Item, disambig, visualForm) {
     var use_parallels, ret;
     var oldTermSiblingLayer = this.tmp.group_context.value().slice();
     if (disambig) {
@@ -4124,15 +4257,33 @@ CSL.getAmbiguousCite = function (Item, disambig) {
     } else {
         this.tmp.disambig_request = false;
     }
+    var itemSupp = {
+        position: 1
+    };
+    if (this.registry.registry[Item.id] 
+        && this.registry.citationreg.citationsByItemId
+        && this.registry.citationreg.citationsByItemId[Item.id].length 
+        && visualForm) {
+        if (this.citation.opt["givenname-disambiguation-rule"] === "by-cite") {
+            itemSupp['first-reference-note-number'] = this.registry.registry[Item.id]['first-reference-note-number'];
+        }
+    }
     this.tmp.area = "citation";
     use_parallels = this.parallel.use_parallels;
     this.parallel.use_parallels = false;
     this.tmp.suppress_decorations = true;
     this.tmp.just_looking = true;
-    CSL.getCite.call(this, Item, {position: 1});
-    CSL.Output.Queue.purgeEmptyBlobs(this.output.queue);
+    CSL.getCite.call(this, Item, itemSupp);
+    for (var i=0,ilen=this.output.queue.length;i<ilen;i+=1) {
+        CSL.Output.Queue.purgeEmptyBlobs(this.output.queue[i]);
+    }
     if (this.opt.development_extensions.clean_up_csl_flaws) {
-        CSL.Output.Queue.adjustPunctuation(this, this.output.queue);
+        for (var j=0,jlen=this.output.queue.length;j<jlen;j+=1) {
+            this.output.adjust.upward(this.output.queue[j]);
+            this.output.adjust.leftward(this.output.queue[j]);
+            this.output.adjust.downward(this.output.queue[j]);
+            this.output.adjust.fix(this.output.queue[j]);
+        }
     }
     ret = this.output.string(this, this.output.queue);
     this.tmp.just_looking = false;
@@ -4294,17 +4445,26 @@ CSL.getCitationCluster = function (inputList, citationID) {
     if (CSL.TERMINAL_PUNCTUATION.slice(0, -1).indexOf(delimiter.slice(0, 1)) > -1) {
         delimiter = delimiter.slice(0, 1);
     }
-    var mystk = [
-        {
-            suffix: "",
-            delimiter: delimiter,
-            blob: fakeblob,
-            lastNode: true
-        }
-    ];
     var use_layout_suffix = suffix;
-    for (pos = 0, len = myblobs.length; pos < len; pos += 1) {
-        CSL.Output.Queue.purgeEmptyBlobs(this.output.queue, true);
+    for (var i=0,ilen=this.output.queue.length;i<ilen;i+=1) {
+        CSL.Output.Queue.purgeEmptyBlobs(this.output.queue[i]);
+    }
+    if (!this.tmp.suppress_decorations && this.output.queue.length) {
+        if (!(this.opt.development_extensions.apply_citation_wrapper
+              && this.sys.wrapCitationEntry
+              && !this.tmp.just_looking
+              && this.tmp.area === "citation")) { 
+            this.output.queue[this.output.queue.length - 1].strings.suffix = use_layout_suffix;
+            this.output.queue[0].strings.prefix = this.citation.opt.layout_prefix;
+        }
+    }
+    if (this.opt.development_extensions.clean_up_csl_flaws) {
+        for (var j=0,jlen=this.output.queue.length;j<jlen;j+=1) {
+            this.output.adjust.upward(this.output.queue[j]);
+            this.output.adjust.leftward(this.output.queue[j]);
+            this.output.adjust.downward(this.output.queue[j]);
+            this.tmp.last_chr = this.output.adjust.fix(this.output.queue[j]);
+        }
     }
     for (pos = 0, len = myblobs.length; pos < len; pos += 1) {
         this.output.queue = [myblobs[pos]];
@@ -4314,12 +4474,6 @@ CSL.getCitationCluster = function (inputList, citationID) {
             this.tmp.splice_delimiter = myblobs[pos].parallel_delimiter;
         }
         this.tmp.have_collapsed = myparams[pos].have_collapsed;
-        if (pos === (myblobs.length - 1)) {
-            mystk[0].suffix = use_layout_suffix;
-        }
-        if (this.opt.development_extensions.clean_up_csl_flaws) {
-            CSL.Output.Queue.adjustPunctuation(this, this.output.queue, mystk);
-        }
         composite = this.output.string(this, this.output.queue);
         this.tmp.suppress_decorations = false;
         if ("string" === typeof composite) {
@@ -4330,7 +4484,10 @@ CSL.getCitationCluster = function (inputList, citationID) {
             if (this.tmp.has_purged_parallel) {
                 composite.push("");
             } else {
-                composite.push("[CSL STYLE ERROR: reference with no printed form.]");
+                var errStr = "[CSL STYLE ERROR: reference with no printed form.]";
+                var preStr = pos === 0 ? txt_esc(this.citation.opt.layout_prefix) : "";
+                var sufStr = pos === (myblobs.length - 1) ? txt_esc(this.citation.opt.layout_suffix) : "";
+                composite.push(preStr + errStr + sufStr);
             }
         }
         if (objects.length && "string" === typeof composite[0]) {
@@ -4371,17 +4528,7 @@ CSL.getCitationCluster = function (inputList, citationID) {
     }
     result += this.output.renderBlobs(objects);
     if (result) {
-        if (CSL.TERMINAL_PUNCTUATION.indexOf(this.tmp.last_chr) > -1 
-            && this.tmp.last_chr === use_layout_suffix.slice(0, 1)) {
-            use_layout_suffix = use_layout_suffix.slice(1);
-        }
         this.output.nestedBraces = false;
-        if (!(this.opt.development_extensions.apply_citation_wrapper
-            && this.sys.wrapCitationEntry
-            && !this.tmp.just_looking
-              && this.tmp.area === "citation")) { 
-            result = txt_esc(this.citation.opt.layout_prefix) + result + txt_esc(use_layout_suffix);
-        }
         if (!this.tmp.suppress_decorations) {
             len = this.citation.opt.layout_decorations.length;
             for (pos = 0; pos < len; pos += 1) {
@@ -4774,8 +4921,15 @@ CSL.getBibliographyEntries = function (bibsection) {
             }
             topblobs[0].strings.prefix = this.bibliography.opt.layout_prefix + topblobs[0].strings.prefix;
         }
-        CSL.Output.Queue.purgeEmptyBlobs(this.output.queue);
-        CSL.Output.Queue.adjustPunctuation(this, this.output.queue);
+        for (var j=0,jlen=this.output.queue.length;j<jlen;j+=1) {
+            CSL.Output.Queue.purgeEmptyBlobs(this.output.queue[j]);
+        }
+        for (var j=0,jlen=this.output.queue.length;j<jlen;j+=1) {
+            this.output.adjust.upward(this.output.queue[j]);
+            this.output.adjust.leftward(this.output.queue[j]);
+            this.output.adjust.downward(this.output.queue[j]);
+            this.output.adjust.fix(this.output.queue[j]);
+        }
         res = this.output.string(this, this.output.queue)[0];
         if (!res) {
             res = "\n[CSL STYLE ERROR: reference with no printed form.]\n";
@@ -6102,6 +6256,9 @@ CSL.Node.key = {
         var end_key = new CSL.Token("key", CSL.END);
         func = function (state, Item) {
             var keystring = state.output.string(state, state.output.queue);
+            if (state.sys.normalizeUnicode) {
+                keystring = state.sys.normalizeUnicode(keystring);
+            }
             if ("" === keystring) {
                 keystring = undefined;
             }
@@ -6245,13 +6402,15 @@ CSL.Node.layout = {
                     var sp;
                     if (item && item.prefix) {
                         sp = "";
-                        var prefix = item.prefix.replace(/<[^>]+>/g, "").replace(/["'\u201d\u2019]/g,"").replace(/\s+$/, "").replace(/^[.\s]+/, "");
-                        if (prefix.match(CSL.ENDSWITH_ROMANESQUE_REGEXP)) {
+                        var test_prefix = item.prefix.replace(/<[^>]+>/g, "").replace(/["'\u201d\u2019]/g,"").replace(/\s+$/, "").replace(/^[.\s]+/, "");
+                        if (test_prefix.match(CSL.ENDSWITH_ROMANESQUE_REGEXP)) {
+                            sp = " ";
+                        } else if (CSL.TERMINAL_PUNCTUATION.slice(0,-1).indexOf(test_prefix.slice(-1))) {
                             sp = " ";
                         }
                         var ignorePredecessor = false;
-                        if (CSL.TERMINAL_PUNCTUATION.slice(0,-1).indexOf(prefix.slice(-1)) > -1
-                            && prefix.slice(0, 1) != prefix.slice(0, 1).toLowerCase()) {
+                        if (CSL.TERMINAL_PUNCTUATION.slice(0,-1).indexOf(test_prefix.slice(-1)) > -1
+                            && test_prefix.slice(0, 1) != test_prefix.slice(0, 1).toLowerCase()) {
                             state.tmp.term_predecessor = false;
                             ignorePredecessor = true;
                         }
@@ -6335,7 +6494,8 @@ CSL.Node.layout = {
                         var sp;
                         if (item && item.suffix) {
                             sp = "";
-                            if (item.suffix.match(CSL.STARTSWITH_ROMANESQUE_REGEXP)) {
+                            if (item.suffix.match(CSL.STARTSWITH_ROMANESQUE_REGEXP)
+                                || ['[','('].indexOf(item.suffix.slice(0,1)) > -1) {
                                 sp = " ";
                             }
                             state.output.append((sp + item.suffix), this);
@@ -6968,6 +7128,9 @@ CSL.NameOutput.prototype._join = function (blobs, delimiter, single, multiple, t
     if (!blobs.length) {
         return false;
     } else if (single && blobs.length === 2) {
+        if (single) {
+            single = new CSL.Blob(single.blobs,single);
+        }
         blobs = [blobs[0], single, blobs[1]];
     } else {
         var delimiter_offset;
@@ -6982,8 +7145,12 @@ CSL.NameOutput.prototype._join = function (blobs, delimiter, single, multiple, t
         if (blobs.length > 1) {
             var blob = blobs.pop();
             if (multiple) {
+                multiple = new CSL.Blob(multiple.blobs,multiple);
                 blobs.push(multiple);
             } else {
+                if (single) {
+                    single = new CSL.Blob(single.blobs,single);
+                }
                 blobs.push(single);
             }
             blobs.push(blob);
@@ -8262,7 +8429,7 @@ CSL.evaluateLabel = function (node, state, Item, item) {
             }
             plural = state.tmp.shadow_numbers[myterm].plural;
         }
-        if (node.decorations && state.opt.development_extensions.csl_reverse_lookup_support) {
+        if (node.decorations && (state.opt.development_extensions.csl_reverse_lookup_support || state.sys.csl_reverse_lookup_support)) {
             node.decorations.reverse();
             node.decorations.push(["@showid","true", node.cslid]);
             node.decorations.reverse();
@@ -8930,7 +9097,7 @@ CSL.Node.text = {
                         var parallel_variable = this.variables[0];
                         if (parallel_variable === "title" 
                             && (form === "short" || Item["title-short"])) { 
-                            parallel_variable = "shortTitle";
+                            parallel_variable = "title-short";
                         }
                         state.parallel.StartVariable(parallel_variable);
                         state.parallel.AppendToVariable(Item[parallel_variable],parallel_variable);
@@ -8945,7 +9112,7 @@ CSL.Node.text = {
                             if (this.variables_real[0] === "container-title") {
                                 altvar = "journalAbbreviation";
                             } else if (this.variables_real[0] === "title") {
-                                altvar = "shortTitle";
+                                altvar = "title-short";
                             }
                         } else {
                             abbrevfam = false;
@@ -9085,16 +9252,23 @@ CSL.Attributes["@disambiguate"] = function (state, arg) {
     if (arg === "true") {
         state.opt.has_disambiguate = true;
         var func = function (Item, item) {
-            var ret;
             state.tmp.disambiguate_maxMax += 1;
             if (state.tmp.disambig_settings.disambiguate
-               && state.tmp.disambiguate_count < state.tmp.disambig_settings.disambiguate) {
+                && state.tmp.disambiguate_count < state.tmp.disambig_settings.disambiguate) {
                 state.tmp.disambiguate_count += 1;
                 return true;
             }
             return false;
         };
         this.tests.push(func);
+    } else if (arg === "check-ambiguity-and-backreference") {
+        var func = function (Item, item) {
+            if (state.registry.registry[Item.id].disambig.disambiguate && state.registry.registry[Item.id]["citation-count"] > 1) {
+                return true;
+            }
+            return false;
+        };
+        this.tests.push(func);
     }
 };
 CSL.Attributes["@is-numeric"] = function (state, arg, joiner) {
@@ -9266,11 +9440,27 @@ CSL.Attributes["@variable"] = function (state, arg) {
                 if (variable === "authority"
                     && "string" === typeof Item[variable]
                     && "names" === this.name) {
-                    Item[variable] = [{family:Item[variable],isInstitution:true}];
+                    var creatorParent = {
+                        family:Item[variable],
+                        isInstitution:true,
+                        multi:{
+                            _key:{}
+                        }
+                    };
+                    if (Item.multi && Item.multi._keys && Item.multi._keys[variable]) {
+                        for (var langTag in Item.multi._keys[variable]) {
+                            creatorChild = {
+                                family:Item.multi._keys[variable][langTag],
+                                isInstitution:true
+                            }
+                            creatorParent.multi._key[langTag] = creatorChild;
+                        }
+                    }
+                    Item[variable] = [creatorParent];
                 }
                 if (this.strings.form === "short" && !Item[variable]) {
                     if (variable === "title") {
-                        variable = "shortTitle";
+                        variable = "title-short";
                     } else if (variable === "container-title") {
                         variable = "journalAbbreviation";
                     }
@@ -9938,7 +10128,7 @@ CSL.Attributes["@disambiguate-add-givenname"] = function (state, arg) {
     }
 };
 CSL.Attributes["@disambiguate-add-year-suffix"] = function (state, arg) {
-    if (arg === "true") {
+    if (arg === "true" && state.opt.xclass !== "numeric") {
         state.opt["disambiguate-add-year-suffix"] = true;
     }
 };
@@ -10572,7 +10762,6 @@ CSL.Util.Match = function () {
             return false;
         };
     };
-    this[undefined] = this.any;
     this.none = function (token, state, tests) {
         return function (Item, item) {
             for (var i=0,ilen=tests.length;i<ilen;i+=1) {
@@ -10595,6 +10784,7 @@ CSL.Util.Match = function () {
             return true;
         };
     };
+    this[undefined] = this.all;
     this.nand = function (token, state, tests) {
         return function (Item, item) {
             for (var i=0,ilen=tests.length;i<ilen;i+=1) {
@@ -10795,6 +10985,12 @@ CSL.Transform = function (state) {
             if (!variables[0] || (!Item[variables[0]] && !Item[alternative_varname])) {
                 return null;
             }
+            if (state.opt.suppressJurisdictions
+                && variables[0] === "jurisdiction" 
+                && state.opt.suppressJurisdictions[Item.jurisdiction]
+                && ["legal_case","gazette","regulation","legislation"].indexOf(Item.type) > -1) {
+                return null;
+            }
             var slot = {primary:false, secondary:false, tertiary:false};
             if (state.tmp.area.slice(-5) === "_sort") {
                 slot.primary = 'locale-sort';
@@ -11042,7 +11238,7 @@ CSL.Blob = function (str, token, levelname) {
 CSL.Blob.prototype.push = function (blob) {
     if ("string" === typeof this.blobs) {
         throw "Attempt to push blob onto string object";
-    } else {
+    } else if (false !== blob) {
         blob.alldecor = blob.alldecor.concat(this.alldecor);
         this.blobs.push(blob);
     }
@@ -11649,7 +11845,7 @@ CSL.Util.substituteStart = function (state, target) {
         }
     };
     this.execs.push(func);
-    if (this.decorations && state.opt.development_extensions.csl_reverse_lookup_support) {
+    if (this.decorations && (state.opt.development_extensions.csl_reverse_lookup_support || state.sys.csl_reverse_lookup_support)) {
         this.decorations.reverse();
         this.decorations.push(["@showid","true", this.cslid]);
         this.decorations.reverse();
@@ -11713,9 +11909,70 @@ CSL.Util.substituteStart = function (state, target) {
         if_start.test = state.fun.match.any(this, state, if_start.tests);
         target.push(if_start);
     }
+    if (state.sys.variableWrapper
+        && this.variables_real
+        && this.variables_real.length) {
+        func = function (state, Item, item) {
+            if (!state.tmp.just_looking && !state.tmp.suppress_decorations) {
+                variable_entry = new CSL.Token("text", CSL.START);
+                variable_entry.decorations = [["@showid", "true"]];
+                state.output.startTag("variable_entry", variable_entry);
+                var position = null;
+                if (item) {
+                    position = item.position;
+                }
+                if (!position) position = 0;
+                var positionMap = [
+                    "first",
+                    "subsequent",
+                    "ibid",
+                    "ibid-with-locator"
+                ]
+                var noteNumber = 0;
+                if (item && item.noteIndex) {
+                    noteNumber = item.noteIndex;
+                }
+                var firstReferenceNoteNumber = 0;
+                if (item && item['first-reference-note-number']) {
+                    firstReferenceNoteNumber = item['first-reference-note-number'];
+                }
+                var citationNumber = 0;
+                if (item && item['citation-number']) {
+                    citationNumber = item['citation-number'];
+                }
+                var index = 0;
+                if (item && item.index) {
+                    index = item.index;
+                }
+                var params = {
+                    itemData: Item,
+                    variableNames: this.variables,
+                    context: state.tmp.area,
+                    xclass: state.opt.xclass,
+                    position: positionMap[position],
+                    "note-number": noteNumber,
+                    "first-reference-note-number": firstReferenceNoteNumber,
+                    "citation-number": citationNumber,
+                    "index": index,
+                    "mode": state.opt.mode
+                };
+                state.output.current.value().params = params;
+            }
+        }
+        this.execs.push(func);
+    }
 };
 CSL.Util.substituteEnd = function (state, target) {
     var func, bib_first_end, bib_other, if_end, choose_end, toplevel, hasval, author_substitute, str;
+    if (state.sys.variableWrapper
+        && (this.hasVariable || (this.variables_real && this.variables_real.length))) {
+        func = function (state,Item) {
+            if (!state.tmp.just_looking && !state.tmp.suppress_decorations) {
+                state.output.endTag("variable_entry");
+            }
+        }
+        this.execs.push(func);
+    }
     func = function (state, Item) {
         for (var i = 0, ilen = this.decorations.length; i < ilen; i += 1) {
             if ("@strip-periods" === this.decorations[i][0] && "true" === this.decorations[i][1]) {
@@ -11776,8 +12033,8 @@ CSL.Util.substituteEnd = function (state, target) {
                         for (i = 0, ilen = state.tmp.name_node.children.length; i < ilen; i += 1) {
                             var name = state.tmp.rendered_name[i];
                             if (dosub
-                                && state.tmp.last_rendered_name && state.tmp.last_rendered_name.length > i - 1
-                                && state.tmp.last_rendered_name[i] === name) {
+                                && state.tmp.last_rendered_name && state.tmp.last_rendered_name.length > (i - 1)
+                                && name && !name.localeCompare(state.tmp.last_rendered_name[i])) {
                                 str = new CSL.Blob(state[state.tmp.area].opt["subsequent-author-substitute"]);
                                 state.tmp.name_node.children[i].blobs = [str];
                                 if ("partial-first" === subrule) {
@@ -11792,7 +12049,7 @@ CSL.Util.substituteEnd = function (state, target) {
                     } else if ("complete-each" === subrule) {
                         var rendered_name = state.tmp.rendered_name.join(",");
                         if (rendered_name) {
-                            if (rendered_name === state.tmp.last_rendered_name) {
+                            if (!rendered_name.localeCompare(state.tmp.last_rendered_name)) {
                                 for (i = 0, ilen = state.tmp.name_node.children.length; i < ilen; i += 1) {
                                     str = new CSL.Blob(state[state.tmp.area].opt["subsequent-author-substitute"]);
                                     state.tmp.name_node.children[i].blobs = [str];
@@ -11803,7 +12060,7 @@ CSL.Util.substituteEnd = function (state, target) {
                     } else {
                         var rendered_name = state.tmp.rendered_name.join(",");
                         if (rendered_name) {
-                            if (rendered_name === state.tmp.last_rendered_name) {
+                            if (!rendered_name.localeCompare(state.tmp.last_rendered_name)) {
                                 str = new CSL.Blob(state[state.tmp.area].opt["subsequent-author-substitute"]);
                                 if (state.tmp.label_blob) {
                                     state.tmp.name_node.top.blobs = [str,state.tmp.label_blob];
@@ -12152,9 +12409,11 @@ CSL.Util.PageRangeMangler.getFunction = function (state, rangeType) {
         ret = ret.replace(/([^\\])\-/g, "$1"+state.getTerm(rangeType + "-range-delimiter"));
         return ret;
     };
-    listify = function (str, hyphens) {
+    listify = function (str) {
         var m, lst, ret;
-        str = str.replace(/([^\\])\u2013/g, "$1-").replace(/\s+\u2013\s+/g, " - ");
+        var hyphens = "\\s+\\-\\s+";
+        var delimRex = new RegExp("([^\\\\])[" + range_delimiter + "\\u2013]", "g");
+        str = str.replace(delimRex, "$1 - ").replace(/\s+-\s+/g, " - ");
         var rexm = new RegExp("([a-zA-Z]*[0-9]+" + hyphens + "[a-zA-Z]*[0-9]+)", "g");
         var rexlst = new RegExp("[a-zA-Z]*[0-9]+" + hyphens + "[a-zA-Z]*[0-9]+");
         m = str.match(rexm);
@@ -12170,9 +12429,9 @@ CSL.Util.PageRangeMangler.getFunction = function (state, rangeType) {
         }
         return ret;
     };
-    expand = function (str, hyphens) {
+    expand = function (str) {
         str = "" + str;
-        lst = listify(str, hyphens);
+        lst = listify(str);
         len = lst.length;
         for (pos = 1; pos < len; pos += 2) {
             m = lst[pos].match(rangerex);
@@ -12250,14 +12509,8 @@ CSL.Util.PageRangeMangler.getFunction = function (state, rangeType) {
     var sniff = function (str, func, minchars, isyear) {
         var ret;
         str = "" + str;
-        var lst;
-        if (!str.match(/[^\-\u20130-9 ,&]/)) {
-            lst = expand(str, "-");
-            ret = func(lst, minchars, isyear);
-        } else {
-            lst = expand(str, "\\s+\\-\\s+");
-            ret = func(lst, minchars, isyear);
-        }
+        var lst = expand(str);
+        var ret = func(lst, minchars, isyear);
         return ret;
     }
     if (!state.opt[rangeType + "-range-format"]) {
@@ -12718,7 +12971,7 @@ CSL.Output.Formatters.title = function (state, string) {
     }
     for (var i=0,ilen=lst.length;i<ilen;i+=2) {
         var words = lst[i].split(/([:?!]*\s+|-)/);
-        for (k=0,klen=words.length;k<klen;k+=2) {
+        for (var k=0,klen=words.length;k<klen;k+=2) {
             if (words[k].length !== 0) {
                 upperCaseVariant = words[k].toUpperCase();
                 lowerCaseVariant = words[k].toLowerCase();
@@ -12867,7 +13120,28 @@ CSL.Output.Formats.prototype.html = {
         return "<div class=\"csl-indent\">" + str + "</div>\n  ";
     },
     "@showid/true": function (state, str, cslid) {
-        return "<span class=\"" + state.opt.nodenames[cslid] + "\" cslid=\"" + cslid + "\">" + str + "</span>";
+        if (!state.tmp.just_looking && ! state.tmp.suppress_decorations) {
+            if (cslid) {
+                return "<span class=\"" + state.opt.nodenames[cslid] + "\" cslid=\"" + cslid + "\">" + str + "</span>";
+            } else if ("string" === typeof str) {
+                var prePunct = "";
+                if (str) {
+                    var m = str.match(CSL.VARIABLE_WRAPPER_PREPUNCT_REX);
+                    prePunct = m[1];
+                    str = m[2];
+                }
+                var postPunct = "";
+                if (str && CSL.SWAPPING_PUNCTUATION.indexOf(str.slice(-1)) > -1) {
+                    postPunct = str.slice(-1);
+                    str = str.slice(0,-1);
+                }
+                return state.sys.variableWrapper(this.params, prePunct, str, postPunct);
+            } else {
+                return str;
+            }
+        } else {
+            return str;
+        }
     },
     "@URL/true": function (state, str) {
         return "<a href=\"" + str + "\">" + str + "</a>";
@@ -12932,6 +13206,9 @@ CSL.Output.Formats.prototype.text = {
     "@display/indent": function (state, str) {
         return "\n    "+str;
     },
+    "@showid/true": function (state, str, cslid) {
+        return str;
+    },
     "@URL/true": function (state, str) {
         return str;
     },
@@ -13004,6 +13281,24 @@ CSL.Output.Formats.prototype.rtf = {
     "@display/indent": function (state, str) {
         return "\n\\tab "+str;
     },
+    "@showid/true": function (state, str, cslid) {
+        if (!state.tmp.just_looking && ! state.tmp.suppress_decorations) {
+            var prePunct = "";
+            if (str) {
+                var m = str.match(CSL.VARIABLE_WRAPPER_PREPUNCT_REX);
+                prePunct = m[1];
+                str = m[2];
+            }
+            var postPunct = "";
+            if (str && CSL.SWAPPING_PUNCTUATION.indexOf(str.slice(-1)) > -1) {
+                postPunct = str.slice(-1);
+                str = str.slice(0,-1);
+            }
+            return state.sys.variableWrapper(this.params, prePunct, str, postPunct);
+        } else {
+            return str;
+        }
+    },
     "@URL/true": function (state, str) {
         return str;
     },
@@ -13181,6 +13476,9 @@ CSL.Registry.prototype.doinserts = function (mylist) {
                 "ref": Item
             };
             this.registry[item] = newitem;
+            if (this.citationreg.citationsByItemId && this.citationreg.citationsByItemId[item]) {
+                this.registry[item]["first-reference-note-number"] = this.citationreg.citationsByItemId[item][0].properties.noteIndex;
+            }
             abase = CSL.getAmbigConfig.call(this.state);
             this.registerAmbigToken(akey, item, abase);
             this.touched[item] = true;
@@ -13393,9 +13691,9 @@ CSL.Registry.NameReg = function (state) {
     set_keys = function (state, itemid, nameobj) {
         pkey = strip_periods(nameobj.family);
         skey = strip_periods(nameobj.given);
-        var m = skey.match(/,\!* [^,]$/);
+        var m = skey.match(/[,\!]* ([^,]+)$/);
         if (m && m[1] === m[1].toLowerCase()) {
-            skey = skey.replace(/,\!* [^,]$/, "");
+            skey = skey.replace(/[,\!]* [^,]+$/, "");
         }
         ikey = CSL.Util.Names.initializeWith(state, skey, "%s");
         if (state.citation.opt["givenname-disambiguation-rule"] === "by-cite") {
@@ -13644,7 +13942,7 @@ CSL.Disambiguation.prototype.runDisambig = function () {
 CSL.Disambiguation.prototype.scanItems = function (list) {
     var pos, len, Item, otherItem, ItemCite, ignore, base;
     this.Item = list[1][0];
-    this.ItemCite = CSL.getAmbiguousCite.call(this.state, this.Item, this.base);
+    this.ItemCite = CSL.getAmbiguousCite.call(this.state, this.Item, this.base, true);
     this.scanlist = list[1];
     this.partners = [];
     this.partners.push(this.Item);
@@ -13652,7 +13950,7 @@ CSL.Disambiguation.prototype.scanItems = function (list) {
     var clashes = 0;
     for (pos = 1, len = list[1].length; pos < len; pos += 1) {
         otherItem = list[1][pos];
-        var otherItemCite = CSL.getAmbiguousCite.call(this.state, otherItem, this.base);
+        var otherItemCite = CSL.getAmbiguousCite.call(this.state, otherItem, this.base, true);
         if (this.ItemCite === otherItemCite) {
             clashes += 1;
             this.partners.push(otherItem);
@@ -13710,7 +14008,11 @@ CSL.Disambiguation.prototype.disNames = function (ismax) {
 };
 CSL.Disambiguation.prototype.disExtraText = function () {
     var pos, len, mybase;
-    if (!this.base.disambiguate || this.state.tmp.disambiguate_count !== this.state.tmp.disambiguate_maxMax) {
+    var done = false;
+    if (this.clashes[1] === 0 && this.nonpartners.length < 2) {
+        done = true;
+    }
+    if (!done && (!this.base.disambiguate || this.state.tmp.disambiguate_count !== this.state.tmp.disambiguate_maxMax)) {
         this.modeindex = 0;
         this.base.disambiguate = this.state.tmp.disambiguate_count;
         this.betterbase.disambiguate = this.state.tmp.disambiguate_count;
@@ -13723,8 +14025,8 @@ CSL.Disambiguation.prototype.disExtraText = function () {
         } else {
             this.disNames();
         }
-    } else if (this.state.tmp.disambiguate_count === this.state.tmp.disambiguate_maxMax) {
-        if (this.modeindex === this.modes.length - 1) {
+    } else if (done || this.state.tmp.disambiguate_count === this.state.tmp.disambiguate_maxMax) {
+        if (done || this.modeindex === this.modes.length - 1) {
             var base = this.lists[this.listpos][0];
             for (var i = 0, ilen = this.lists[this.listpos][1].length; i < ilen; i += 1) {
                 this.state.tmp.taintedItemIDs[this.lists[this.listpos][1][i].id] = true;
diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
index 45d8055fe..09ec03038 100644
--- a/chrome/content/zotero/xpcom/collectionTreeView.js
+++ b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -575,6 +575,29 @@ Zotero.CollectionTreeView.prototype.isSelectable = function (row, col) {
 }
 
 
+/**
+ * Tree method for whether to allow inline editing (not to be confused with this.editable)
+ */
+Zotero.CollectionTreeView.prototype.isEditable = function (row, col) {
+	return this.itemGroup.isCollection() && this.editable;
+}
+
+
+Zotero.CollectionTreeView.prototype.setCellText = function (row, col, val) {
+	val = val.trim();
+	if (val === "") {
+		return;
+	}
+	var itemGroup = this._getItemAtRow(row);
+	itemGroup.ref.name = val;
+	itemGroup.ref.save();
+}
+
+
+
+/**
+ * Returns TRUE if the underlying view is editable
+ */
 Zotero.CollectionTreeView.prototype.__defineGetter__('editable', function () {
 	return this._getItemAtRow(this.selection.currentIndex).editable;
 });
@@ -1808,7 +1831,6 @@ Zotero.CollectionTreeView.prototype.drop = function(row, orient, dataTransfer)
 ////////////////////////////////////////////////////////////////////////////////
 
 Zotero.CollectionTreeView.prototype.isSorted = function() 							{ return false; }
-Zotero.CollectionTreeView.prototype.isEditable = function(row, idx) 				{ return false; }
 
 /* Set 'highlighted' property on rows set by setHighlightedRows */
 Zotero.CollectionTreeView.prototype.getRowProperties = function(row, prop) {
diff --git a/chrome/content/zotero/xpcom/data/tag.js b/chrome/content/zotero/xpcom/data/tag.js
index 5d3556f5a..f7a1a0914 100644
--- a/chrome/content/zotero/xpcom/data/tag.js
+++ b/chrome/content/zotero/xpcom/data/tag.js
@@ -359,7 +359,9 @@ Zotero.Tag.prototype.save = function (full) {
 		catch (e) {
 			// If an incoming tag is the same as an existing tag, but with a different key,
 			// then delete the old tag and add its linked items to the new tag
-			if (typeof e == 'string' && e.indexOf('columns libraryID, name, type are not unique') != -1) {
+			if (typeof e == 'string' &&
+					(e.indexOf('columns libraryID, name, type are not unique') != -1
+						|| e.indexOf('NS_ERROR_STORAGE_CONSTRAINT') != -1)) {
 				Zotero.debug("Tag matches existing tag with different key -- delete old tag and merging items");
 				
 				// GET existing tag
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
index ceb4e7d16..23e1ac159 100644
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -1370,7 +1370,7 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 			
 			// Use unformatted part of date strings (YYYY-MM-DD) for sorting
 			case 'date':
-				var val = row.ref.getField('date', true);
+				var val = row.ref.getField('date', true, true);
 				if (val) {
 					val = val.substr(0, 10);
 					if (val.indexOf('0000') == 0) {
@@ -1380,7 +1380,7 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 				return val;
 			
 			case 'year':
-				var val = row.ref.getField('date', true);
+				var val = row.ref.getField('date', true, true);
 				if (val) {
 					val = val.substr(0, 4);
 					if (val == '0000') {
diff --git a/chrome/content/zotero/xpcom/search.js b/chrome/content/zotero/xpcom/search.js
index 1853d70f0..a351ed73c 100644
--- a/chrome/content/zotero/xpcom/search.js
+++ b/chrome/content/zotero/xpcom/search.js
@@ -2274,10 +2274,10 @@ Zotero.SearchConditions = new function(){
 			_conditions[conditions[i]['name']] = conditions[i];
 		}
 		
-		var sortKeys = [];
-		var sortValues = [];
+		_standardConditions = [];
 		
 		var baseMappedFields = Zotero.ItemFields.getBaseMappedFields();
+		var locale = Zotero.locale;
 		
 		// Separate standard conditions for menu display
 		for (var i in _conditions){
@@ -2299,23 +2299,26 @@ Zotero.SearchConditions = new function(){
 				continue;
 			}
 			
-			var localized = self.getLocalizedName(i);
+			let localized = self.getLocalizedName(i);
+			// Hack to use a different name for "issue" in French locale,
+			// where 'number' and 'issue' are translated the same
+			// https://forums.zotero.org/discussion/14942/
+			if (fieldID == 5 && locale.substr(0, 2).toLowerCase() == 'fr') {
+				localized = "Num\u00E9ro (p\u00E9riodique)";
+			}
 			
-			sortKeys.push(localized);
-			sortValues[localized] = {
+			_standardConditions.push({
 				name: i,
 				localized: localized,
 				operators: _conditions[i]['operators'],
 				flags: _conditions[i]['flags']
-			};
+			});
 		}
 		
-		// Alphabetize by localized name
-		// TODO: locale collation sort
-		sortKeys = sortKeys.sort();
-		for each(var i in sortKeys){
-			_standardConditions.push(sortValues[i]);
-		}
+		var collation = Zotero.getLocaleCollation();
+		_standardConditions.sort(function(a, b) {
+			return collation.compareString(1, a.localized, b.localized);
+		});
 		
 		_initialized = true;
 	}
diff --git a/chrome/content/zotero/xpcom/server.js b/chrome/content/zotero/xpcom/server.js
index 120ebb696..034832c14 100755
--- a/chrome/content/zotero/xpcom/server.js
+++ b/chrome/content/zotero/xpcom/server.js
@@ -24,7 +24,7 @@
 */
 
 Zotero.Server = new function() {
-	var _onlineObserverRegistered;
+	var _onlineObserverRegistered, serv;
 	this.responseCodes = {
 		200:"OK",
 		201:"Created",
@@ -47,8 +47,13 @@ Zotero.Server = new function() {
 			return;
 		}
 		
+		if(serv) {
+			Zotero.debug("Already listening on port " + serv.port);
+			return;
+		}
+		
 		// start listening on socket
-		var serv = Components.classes["@mozilla.org/network/server-socket;1"]
+		serv = Components.classes["@mozilla.org/network/server-socket;1"]
 					.createInstance(Components.interfaces.nsIServerSocket);
 		try {
 			// bind to a random port on loopback only
@@ -56,13 +61,25 @@ Zotero.Server = new function() {
 			serv.asyncListen(Zotero.Server.SocketListener);
 			
 			Zotero.debug("HTTP server listening on "+(bindAllAddr ? "*": " 127.0.0.1")+":"+serv.port);
+			
+			Zotero.addShutdownListener(this.close.bind(this));
 		} catch(e) {
 			Zotero.debug("Not initializing HTTP server");
+			serv = undefined;
 		}
 		
 		_registerOnlineObserver()
 	}
 	
+	/**
+	 * releases bound port
+	 */
+	this.close = function() {
+		if(!serv) return;
+		serv.close();
+		serv = undefined;
+	};
+	
 	/**
 	 * Parses a query string into a key => value object
 	 * @param {String} queryString Query string
diff --git a/chrome/content/zotero/xpcom/storage/streamListener.js b/chrome/content/zotero/xpcom/storage/streamListener.js
index 18bcab64e..8a8e28295 100644
--- a/chrome/content/zotero/xpcom/storage/streamListener.js
+++ b/chrome/content/zotero/xpcom/storage/streamListener.js
@@ -192,7 +192,7 @@ Zotero.Sync.Storage.StreamListener.prototype = {
 		Zotero.debug('Request ended with status ' + status);
 		var cancelled = status == 0x804b0002; // NS_BINDING_ABORTED
 		
-		if (!cancelled && request instanceof Components.interfaces.nsIHttpChannel) {
+		if (!cancelled && status == 0 && request instanceof Components.interfaces.nsIHttpChannel) {
 			request.QueryInterface(Components.interfaces.nsIHttpChannel);
 			try {
 				status = request.responseStatus;
@@ -203,6 +203,9 @@ Zotero.Sync.Storage.StreamListener.prototype = {
 			}
 			request.QueryInterface(Components.interfaces.nsIRequest);
 		}
+		else {
+			status = 0;
+		}
 		
 		if (this._data.streams) {
 			for each(var stream in this._data.streams) {
diff --git a/chrome/content/zotero/xpcom/storage/zfs.js b/chrome/content/zotero/xpcom/storage/zfs.js
index 274e14a1d..7e3880d50 100644
--- a/chrome/content/zotero/xpcom/storage/zfs.js
+++ b/chrome/content/zotero/xpcom/storage/zfs.js
@@ -32,7 +32,9 @@ Zotero.Sync.Storage.ZFS = (function () {
 	};
 	var _cachedCredentials = false;
 	var _s3Backoff = 1;
+	var _s3ConsecutiveFailures = 0;
 	var _maxS3Backoff = 60;
+	var _maxS3ConsecutiveFailures = 5;
 	
 	/**
 	 * Get file metadata on storage server
@@ -466,26 +468,35 @@ Zotero.Sync.Storage.ZFS = (function () {
 				onStop: function (httpRequest, status, response, data) {
 					data.request.setChannel(false);
 					
-					// For timeouts from S3, which seem to happen intermittently,
+					// For timeouts and failures from S3, which happen intermittently,
 					// wait a little and try again
 					let timeoutMessage = "Your socket connection to the server was not read from or "
 						+ "written to within the timeout period.";
-					if (status == 400 && response.indexOf(timeoutMessage) != -1) {
-						let libraryKey = Zotero.Items.getLibraryKeyHash(item);
-						let msg = "S3 returned 400 in Zotero.Sync.Storage.ZFS.onUploadComplete()"
-							+ " (" + libraryKey + ") -- retrying"
-						Components.utils.reportError(msg);
-						Zotero.debug(msg, 1);
-						Zotero.debug(response, 1);
-						if (_s3Backoff < _maxS3Backoff) {
-							_s3Backoff *= 2;
+					if (status == 0 || (status == 400 && response.indexOf(timeoutMessage) != -1)) {
+						if (_s3ConsecutiveFailures >= _maxS3ConsecutiveFailures) {
+							Zotero.debug(_s3ConsecutiveFailures
+								+ " consecutive S3 failures -- aborting", 1);
+							_s3ConsecutiveFailures = 0;
+						}
+						else {
+							let libraryKey = Zotero.Items.getLibraryKeyHash(item);
+							let msg = "S3 returned " + status
+								+ " (" + libraryKey + ") -- retrying upload"
+							Components.utils.reportError(msg);
+							Zotero.debug(msg, 1);
+							Zotero.debug(response, 1);
+							if (_s3Backoff < _maxS3Backoff) {
+								_s3Backoff *= 2;
+							}
+							_s3ConsecutiveFailures++;
+							Zotero.debug("Delaying " + libraryKey + " upload for "
+								+ _s3Backoff + " seconds", 2);
+							Q.delay(_s3Backoff * 1000)
+							.then(function () {
+								deferred.resolve(postFile(request, item, url, uploadKey, params));
+							});
+							return;
 						}
-						Zotero.debug("Delaying " + libraryKey + " upload for " + _s3Backoff + " seconds");
-						Q.delay(_s3Backoff * 1000)
-						.then(function () {
-							deferred.resolve(postFile(request, item, url, uploadKey, params));
-						});
-						return;
 					}
 					
 					deferred.resolve(onUploadComplete(httpRequest, status, response, data));
@@ -531,6 +542,8 @@ Zotero.Sync.Storage.ZFS = (function () {
 					if (_s3Backoff > 1) {
 						_s3Backoff /= 2;
 					}
+					// And reset consecutive failures
+					_s3ConsecutiveFailures = 0;
 					break;
 				
 				case 500:
@@ -738,6 +751,8 @@ Zotero.Sync.Storage.ZFS = (function () {
 			throw new Error("Item '" + request.name + "' not found");
 		}
 		
+		var self = this;
+		
 		// Retrieve file info from server to store locally afterwards
 		return getStorageFileInfo(item, request)
 			.then(function (info) {
@@ -839,16 +854,43 @@ Zotero.Sync.Storage.ZFS = (function () {
 							data.request.setChannel(false);
 							
 							if (status != 200) {
+								if (status == 404) {
+									deferred.resolve(false);
+									return;
+								}
+								
+								if (status == 0) {
+									if (_s3ConsecutiveFailures >= _maxS3ConsecutiveFailures) {
+										Zotero.debug(_s3ConsecutiveFailures
+											+ " consecutive S3 failures -- aborting", 1);
+										_s3ConsecutiveFailures = 0;
+									}
+									else {
+										let libraryKey = Zotero.Items.getLibraryKeyHash(item);
+										let msg = "S3 returned " + status
+											+ " (" + libraryKey + ") -- retrying download"
+										Components.utils.reportError(msg);
+										Zotero.debug(msg, 1);
+										if (_s3Backoff < _maxS3Backoff) {
+											_s3Backoff *= 2;
+										}
+										_s3ConsecutiveFailures++;
+										Zotero.debug("Delaying " + libraryKey + " download for "
+											+ _s3Backoff + " seconds", 2);
+										Q.delay(_s3Backoff * 1000)
+										.then(function () {
+											deferred.resolve(self._downloadFile(data.request));
+										});
+										return;
+									}
+								}
+								
 								var msg = "Unexpected status code " + status
 									+ " for request " + data.request.name
 									+ " in Zotero.Sync.Storage.ZFS.downloadFile()";
 								Zotero.debug(msg, 1);
 								Components.utils.reportError(msg);
 								// Ignore files not found in S3
-								if (status == 404) {
-									deferred.resolve(false);
-									return;
-								}
 								try {
 									Zotero.debug(Zotero.File.getContents(destFile, null, 4096), 1);
 								}
diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js
index 069972c62..840d79afd 100644
--- a/chrome/content/zotero/xpcom/sync.js
+++ b/chrome/content/zotero/xpcom/sync.js
@@ -1627,9 +1627,7 @@ Zotero.Sync.Server = new function () {
 					_error(e);
 				}
 				
-				Components.utils.import("resource://gre/modules/Task.jsm");
-				
-				Task.spawn(Zotero.Sync.Server.Data.processUpdatedXML(
+				Q.async(Zotero.Sync.Server.Data.processUpdatedXML(
 					responseNode.getElementsByTagName('updated')[0],
 					lastLocalSyncDate,
 					syncSession,
@@ -1838,7 +1836,7 @@ Zotero.Sync.Server = new function () {
 							Zotero.HTTP.doPost(url, body, uploadCallback);
 						}
 					}
-				))
+				))()
 				.then(
 					null,
 					function (e) {
@@ -2678,6 +2676,8 @@ Zotero.Sync.Server.Data = new function() {
 	
 	
 	this.processUpdatedXML = function (updatedNode, lastLocalSyncDate, syncSession, defaultLibraryID, callback) {
+		yield true;
+		
 		updatedNode.xpath = function (path) {
 			return Zotero.Utilities.xpath(this, path);
 		};
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
index 920e1f5ca..888cd44f8 100644
--- a/chrome/content/zotero/xpcom/translation/translate.js
+++ b/chrome/content/zotero/xpcom/translation/translate.js
@@ -247,35 +247,17 @@ Zotero.Translate.Sandbox = {
 				translation.setHandler(arg1, 
 					function(obj, item) {
 						try {
+							item = item.wrappedJSObject ? item.wrappedJSObject : item;
 							if(arg1 == "itemDone") {
+								var sbZotero = translate._sandboxManager.sandbox.Zotero;
+								if(sbZotero.wrappedJSObject) sbZotero = sbZotero.wrappedJSObject;
 								if(Zotero.isFx && !Zotero.isBookmarklet
 										&& (translate instanceof Zotero.Translate.Web
 										|| translate instanceof Zotero.Translate.Search)) {
 									// Necessary to get around object wrappers in Firefox
-									var attachments = item.attachments;
-									
-									item.attachments = [];
-									item = translate._sandboxManager.sandbox.Zotero._transferItem(JSON.stringify(item));
-									
-									// Manually copy attachments in case there are documents, which
-									// can't be serialized and don't need to be
-									if(attachments) {
-										for(var i=0; i<attachments.length; i++) {
-											var attachment = attachments[i];
-											var doc = (attachment.document ? attachment.document : undefined);
-											delete attachment.document;
-											
-											attachment = translate._sandboxManager.sandbox.Zotero._transferItem(JSON.stringify(attachment));
-											
-											if(doc) attachment.document = doc;
-											
-											item.attachments.push(attachment);
-										}
-									}
-								} else {
-									// otherwise, just use parent translator's complete function
-									item.complete = translate._sandboxManager.sandbox.Zotero.Item.prototype.complete;
+									item = translate._sandboxManager._copyObject(item);
 								}
+								item.complete = translate._sandboxZotero.Item.prototype.complete;
 							}
 							arg2(obj, item);
 						} catch(e) {
@@ -1486,12 +1468,7 @@ Zotero.Translate.Base.prototype = {
 		
 		if(Zotero.isFx && !Zotero.isBookmarklet) {
 			// workaround for inadvertant attempts to pass E4X back from sandbox
-			src += "Zotero._transferItem = function(itemString) {"+
-					"var item = JSON.parse(itemString);"+
-					"item.complete = Zotero.Item.prototype.complete;"+
-					"return item;"+
-				"};"+
-				"Zotero.Item.prototype.complete = function() { "+
+			src += "Zotero.Item.prototype.complete = function() { "+
 					"for(var key in this) {"+
 					"if("+createArrays+".indexOf(key) !== -1) {"+
 						"for each(var item in this[key]) {"+
@@ -1511,22 +1488,29 @@ Zotero.Translate.Base.prototype = {
 		
 		src += "Zotero._itemDone(this);"+
 		"}";
-		
+
 		this._sandboxManager.eval(src);
 		this._sandboxManager.importObject(this.Sandbox, this);
 		this._sandboxManager.importObject({"Utilities":new Zotero.Utilities.Translate(this)});
-		this._sandboxManager.sandbox.Zotero.Utilities.HTTP = this._sandboxManager.sandbox.Zotero.Utilities;
+
+		this._sandboxZotero = this._sandboxManager.sandbox.Zotero;
+
+		if(Zotero.isFx) {
+			if(this._sandboxZotero.wrappedJSObject) this._sandboxZotero = this._sandboxZotero.wrappedJSObject;
+		}
+		this._sandboxZotero.Utilities.HTTP = this._sandboxZotero.Utilities;
 		
-		this._sandboxManager.sandbox.Zotero.isBookmarklet = Zotero.isBookmarklet || false;
-		this._sandboxManager.sandbox.Zotero.isConnector = Zotero.isConnector || false;
-		this._sandboxManager.sandbox.Zotero.isServer = Zotero.isServer || false;
-		this._sandboxManager.sandbox.Zotero.parentTranslator = this._parentTranslator
+		this._sandboxZotero.isBookmarklet = Zotero.isBookmarklet || false;
+		this._sandboxZotero.isConnector = Zotero.isConnector || false;
+		this._sandboxZotero.isServer = Zotero.isServer || false;
+		this._sandboxZotero.parentTranslator = this._parentTranslator
 			&& this._parentTranslator._currentTranslator ? 
 			this._parentTranslator._currentTranslator.translatorID : null;
 		
 		// create shortcuts
-		this._sandboxManager.sandbox.Z = this._sandboxManager.sandbox.Zotero;
-		this._sandboxManager.sandbox.ZU = this._sandboxManager.sandbox.Zotero.Utilities;
+		this._sandboxManager.sandbox.Z = this._sandboxZotero;
+		this._sandboxManager.sandbox.ZU = this._sandboxZotero.Utilities;
+		this._transferItem = this._sandboxZotero._transferItem;
 	},
 	
 	/**
@@ -2222,7 +2206,9 @@ Zotero.Translate.Search.prototype.complete = function(returnValue, error) {
  * Pass search item to detect* and do* functions
  */
 Zotero.Translate.Search.prototype._getParameters = function() {
-	if(Zotero.isFx) return [this._sandboxManager.sandbox.Zotero._transferItem(JSON.stringify(this.search))];
+	if(Zotero.isFx) {
+		return [this._sandboxManager._copyObject(this.search)];
+	}
 	return [this.search];
 };
 
diff --git a/chrome/content/zotero/xpcom/translation/translate_firefox.js b/chrome/content/zotero/xpcom/translation/translate_firefox.js
index 45ae76db2..5d3e3ed99 100644
--- a/chrome/content/zotero/xpcom/translation/translate_firefox.js
+++ b/chrome/content/zotero/xpcom/translation/translate_firefox.js
@@ -446,6 +446,7 @@ Zotero.Translate.SandboxManager.prototype = {
 	 */
 	"importObject":function(object, passAsFirstArgument, attachTo) {
 		if(!attachTo) attachTo = this.sandbox.Zotero;
+		if(attachTo.wrappedJSObject) attachTo = attachTo.wrappedJSObject;
 		var newExposedProps = false,
 			sandbox = this.sandbox,
 			me = this;
@@ -461,6 +462,16 @@ Zotero.Translate.SandboxManager.prototype = {
 				if(isFunction) {
 					attachTo[localKey] = function() {
 						var args = Array.prototype.slice.apply(arguments);
+						if(Zotero.platformMajorVersion >= 32) {
+							// This is necessary on Nightly and works
+							// fine on 31, but apparently breaks
+							// ZU.xpath in an unusual way on 24
+							for(var i=0; i<args.length; i++) {
+								if(typeof args[i] === "object" && args[i] !== null && args[i].wrappedJSObject) {
+									args[i] = args[i].wrappedJSObject;
+								}
+							}
+						}
 						if(passAsFirstArgument) args.unshift(passAsFirstArgument);
 						return me._copyObject(object[localKey].apply(object, args));
 					};
@@ -483,6 +494,15 @@ Zotero.Translate.SandboxManager.prototype = {
 			attachTo.__exposedProps__ = object.__exposedProps__;
 		}
 	},
+
+	"_canCopy":function(obj) {
+		if(typeof obj !== "object" || obj === null) return false;
+		if((obj.constructor.name !== "Object" && obj.constructor.name !== "Array") ||
+		   "__exposedProps__" in obj) {
+			return false;
+		}
+		return true;
+	},
 	
 	/**
 	 * Copies a JavaScript object to this sandbox
@@ -490,27 +510,23 @@ Zotero.Translate.SandboxManager.prototype = {
 	 * @return {Object}
 	 */
 	"_copyObject":function(obj, wm) {
-		if(typeof obj !== "object" || obj === null
-				|| (obj.__proto__ !== Object.prototype && obj.__proto__ !== Array.prototype)
-				|| "__exposedProps__" in obj) {
-			return obj;
-		}
+		if(!this._canCopy(obj)) return obj
 		if(!wm) wm = new WeakMap();
 		var obj2 = (obj instanceof Array ? this.sandbox.Array() : this.sandbox.Object());
+		var wobj2 = obj2.wrappedJSObject ? obj2.wrappedJSObject : obj2;
 		for(var i in obj) {
 			if(!obj.hasOwnProperty(i)) continue;
 			
 			var prop1 = obj[i];
-			if(typeof prop1 === "object" && prop1 !== null
-					&& (prop1.__proto__ === Object.prototype || prop1.__proto__ === Array.prototype)) {
+			if(this._canCopy(prop1)) {
 				var prop2 = wm.get(prop1);
 				if(prop2 === undefined) {
 					prop2 = this._copyObject(prop1, wm);
 					wm.set(prop1, prop2);
 				}
-				obj2[i] = prop2;
+				wobj2[i] = prop2;
 			} else {
-				obj2[i] = prop1;
+				wobj2[i] = prop1;
 			}
 		}
 		return obj2;
@@ -583,12 +599,14 @@ Zotero.Translate.IO.Read = function(file, mode) {
 				const encodingRe = /encoding=['"]([^'"]+)['"]/;
 				var m = encodingRe.exec(firstPart);
 				if(m) {
+					// Make sure encoding is valid
 					try {
-						var charconv = Components.classes["@mozilla.org/charset-converter-manager;1"]
-											   .getService(Components.interfaces.nsICharsetConverterManager)
-											   .getCharsetTitle(m[1]);
-						if(charconv) this._charset = m[1];
-					} catch(e) {}
+						var charconv = Components.classes["@mozilla.org/intl/scriptableunicodeconverter"]
+						                         .getService(Components.interfaces.nsIScriptableUnicodeConverter);
+						charconv.charset = m[1];
+					} catch(e) {
+						Zotero.debug("Translate: Ignoring unknown XML encoding "+m[1]);
+					}
 				}
 				
 				if(this._charset) {
diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js
index 8d823af98..c4808c982 100644
--- a/chrome/content/zotero/xpcom/utilities.js
+++ b/chrome/content/zotero/xpcom/utilities.js
@@ -54,16 +54,16 @@ const CSL_TEXT_MAPPINGS = {
 	"collection-number":["seriesNumber"],
 	"publisher":["publisher", "distributor"], /* distributor should move to SQL mapping tables */
 	"publisher-place":["place"],
-	"authority":["court","legislativeBody"],
+	"authority":["court","legislativeBody", "issuingAuthority"],
 	"page":["pages"],
 	"volume":["volume", "codeNumber"],
-	"issue":["issue"],
+	"issue":["issue", "priorityNumbers"],
 	"number-of-volumes":["numberOfVolumes"],
 	"number-of-pages":["numPages"],	
 	"edition":["edition"],
 	"version":["version"],
-	"section":["section"],
-	"genre":["type"],
+	"section":["section", "committee"],
+	"genre":["type", "programmingLanguage"],
 	"source":["libraryCatalog"],
 	"dimensions": ["artworkSize", "runningTime"],
 	"medium":["medium", "system"],
@@ -77,13 +77,14 @@ const CSL_TEXT_MAPPINGS = {
 	"DOI":["DOI"],
 	"ISBN":["ISBN"],
 	"ISSN":["ISSN"],
-	"call-number":["callNumber"],
+	"call-number":["callNumber", "applicationNumber"],
 	"note":["extra"],
 	"number":["number"],
 	"chapter-number":["session"],
-	"references":["history"],
+	"references":["history", "references"],
 	"shortTitle":["shortTitle"],
 	"journalAbbreviation":["journalAbbreviation"],
+	"status":["legalStatus"],
 	"language":["language"]
 }
 
@@ -92,7 +93,8 @@ const CSL_TEXT_MAPPINGS = {
  */
 const CSL_DATE_MAPPINGS = {
 	"issued":"date",
-	"accessed":"accessDate"
+	"accessed":"accessDate",
+	"submitted":"filingDate"
 }
 
 /*
@@ -1620,11 +1622,10 @@ Zotero.Utilities = {
 				
 				if(Zotero.ItemFields.isValidForType(fieldID, itemTypeID)) {
 					var date = "";
-					if(cslDate.literal) {
+					if(cslDate.literal || cslDate.raw) {
+						date = cslDate.literal || cslDate.raw;
 						if(variable === "accessed") {
-							date = strToISO(cslDate.literal);
-						} else {
-							date = cslDate.literal;
+							date = Zotero.Date.strToISO(date);
 						}
 					} else {
 						var newDate = Zotero.Utilities.deepCopy(cslDate);
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index 224e577b1..4ede8e264 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -66,7 +66,6 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 	this.safeDebug = safeDebug;
 	this.getString = getString;
 	this.localeJoin = localeJoin;
-	this.getLocaleCollation = getLocaleCollation;
 	this.setFontSize = setFontSize;
 	this.flattenArguments = flattenArguments;
 	this.getAncestorByTagName = getAncestorByTagName;
@@ -258,7 +257,6 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 		this.platformVersion = appInfo.platformVersion;
 		this.platformMajorVersion = parseInt(appInfo.platformVersion.match(/^[0-9]+/)[0]);
 		this.isFx = true;
-		
 		this.isStandalone = Services.appinfo.ID == ZOTERO_CONFIG['GUID'];
 		return Q.fcall(function () {
 			if(Zotero.isStandalone) {
@@ -1472,10 +1470,50 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 	}
 	
 	
-	function getLocaleCollation() {
-		var collationFactory = Components.classes["@mozilla.org/intl/collation-factory;1"]
-			.getService(Components.interfaces.nsICollationFactory);
-		return collationFactory.CreateCollation(Services.locale.getApplicationLocale());
+	this.getLocaleCollation = function () {
+		if (this.collation) {
+			return this.collation;
+		}
+		
+		var localeService = Components.classes["@mozilla.org/intl/nslocaleservice;1"]
+				.getService(Components.interfaces.nsILocaleService);
+		var appLocale = localeService.getApplicationLocale();
+		
+		// Use nsICollation before Fx30
+		if (Zotero.platformMajorVersion < 30) {
+			var localeService = Components.classes["@mozilla.org/intl/nslocaleservice;1"]
+				.getService(Components.interfaces.nsILocaleService);
+			var collationFactory = Components.classes["@mozilla.org/intl/collation-factory;1"]
+				.getService(Components.interfaces.nsICollationFactory);
+			return this.collation = collationFactory.CreateCollation(appLocale);
+		}
+		
+		try {
+			var locale = appLocale.getCategory('NSILOCALE_COLLATE');
+			// Extract a valid language tag
+			locale = locale.match(/^[a-z]{2}(\-[A-Z]{2})?/)[0];
+			var collator = new Intl.Collator(locale, {
+				ignorePunctuation: true,
+				numeric: true
+			});
+		}
+		catch (e) {
+			Zotero.debug(e, 1);
+			
+			// If there's an error, just skip sorting
+			collator = {
+				compare: function (a, b) {
+					return 0;
+				}
+			};
+		}
+		
+		// Until old code is updated, pretend we're returning an nsICollation
+		return this.collation = {
+			compareString: function (_, a, b) {
+				return collator.compare(a, b);
+			}
+		};
 	}
 	
 	
@@ -2034,7 +2072,11 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 			'[JavaScript Error: "this.docShell is null"',
 			'[JavaScript Error: "downloadable font:',
 			'[JavaScript Error: "Image corrupt or truncated:',
-			'[JavaScript Error: "The character encoding of the'
+			'[JavaScript Error: "The character encoding of the',
+			'nsLivemarkService.js',
+			'Sync.Engine.Tabs',
+			'content-sessionStore.js',
+			'org.mozilla.appSessions'
 		];
 		
 		for (var i=0; i<blacklist.length; i++) {
@@ -2336,6 +2378,13 @@ Zotero.Prefs = new function(){
 				}
 				break;
 			
+			case "note.fontSize":
+				var val = this.get('note.fontSize');
+				if (val < 6) {
+					this.set('note.fontSize', 11);
+				}
+				break;
+			
 			case "zoteroDotOrgVersionHeader":
 				if (this.get("zoteroDotOrgVersionHeader")) {
 					Zotero.VersionHeader.register();
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 0432187c2..019b981cd 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -3016,7 +3016,7 @@ var ZoteroPane = new function()
 			
 			var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
 					.getService(Components.interfaces.nsIWindowMediator);
-			var e = wm.getEnumerator('');
+			var e = wm.getEnumerator('zotero:note');
 			while (e.hasMoreElements()) {
 				var w = e.getNext();
 				if (w.name == name) {
@@ -3026,10 +3026,8 @@ var ZoteroPane = new function()
 			}
 		}
 		
-		window.open('chrome://zotero/content/note.xul?v=1'
-			+ (itemID ? '&id=' + itemID : '') + (col ? '&coll=' + col : '')
-			+ (parentItemID ? '&p=' + parentItemID : ''),
-			name, 'chrome,resizable,centerscreen');
+		var io = { itemID: itemID, collectionID: col, parentItemID: parentItemID };
+		window.openDialog('chrome://zotero/content/note.xul', name, 'chrome,resizable,centerscreen,dialog=false', io);
 	}
 	
 	
@@ -3949,12 +3947,11 @@ var ZoteroPane = new function()
 	
 	
 	function reportErrors() {
-		var errors = Zotero.getErrors(true);
 		var ww = Components.classes["@mozilla.org/embedcomp/window-watcher;1"]
 				   .getService(Components.interfaces.nsIWindowWatcher);
 		var data = {
-			msg: Zotero.getString('errorReport.followingErrors', Zotero.appName),
-			e: errors.join('\n\n'),
+			msg: Zotero.getString('errorReport.followingReportWillBeSubmitted'),
+			errorData: Zotero.getErrors(true),
 			askForSteps: true
 		};
 		var io = { wrappedJSObject: { Zotero: Zotero, data:  data } };
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index 467b4ea48..7bb90bea8 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -103,7 +103,7 @@
 					<toolbarbutton id="zotero-tb-group-add" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newGroup;" oncommand="ZoteroPane_Local.newGroup()"/>
 					<spacer flex="1"/>
 					<toolbarbutton id="zotero-tb-actions-menu" class="zotero-tb-button" tooltiptext="&zotero.toolbar.actions.label;" type="menu">
-						<menupopup id="zotero-tb-actions-popup" onpopupshowing="document.getElementById('cmd_zotero_reportErrors').setAttribute('disabled', Zotero.getErrors().length == 0)">
+						<menupopup id="zotero-tb-actions-popup">
 							<menuitem id="zotero-tb-actions-import" label="&zotero.toolbar.import.label;" command="cmd_zotero_import"/>
 							<menuitem id="zotero-tb-actions-import-clipboard" label="&zotero.toolbar.importFromClipboard;" command="cmd_zotero_importFromClipboard"/>
 							<menuitem id="zotero-tb-actions-export" label="&zotero.toolbar.export.label;" command="cmd_zotero_exportLibrary"/>
@@ -301,7 +301,7 @@
 					<tree id="zotero-collections-tree" hidecolumnpicker="true" context="zotero-collectionmenu"
 						onmouseover="ZoteroPane_Local.collectionsView.setHighlightedRows();"
 						onselect="ZoteroPane_Local.onCollectionSelected();"
-						seltype="cell" flex="1">
+						seltype="cell" flex="1" editable="true">
 						<treecols>
 							<treecol
 								id="zotero-collections-name-column"
diff --git a/chrome/locale/af-ZA/zotero/zotero.dtd b/chrome/locale/af-ZA/zotero/zotero.dtd
index f4e36fffc..4198c82d5 100644
--- a/chrome/locale/af-ZA/zotero/zotero.dtd
+++ b/chrome/locale/af-ZA/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "The error log may include messages unrelated to Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Wag asseblief terwyl die foutboodskap voorgelê word">
 <!ENTITY zotero.errorReport.submitted "Die foutboodskap is voorgelê">
 <!ENTITY zotero.errorReport.reportID "Verslag-ID:">
diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties
index 93a3a8dd6..cbf110f11 100644
--- a/chrome/locale/af-ZA/zotero/zotero.properties
+++ b/chrome/locale/af-ZA/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=If you continue to receive this message, restart
 errorReport.reportError=Report Error...
 errorReport.reportErrors=Report Errors...
 errorReport.reportInstructions=You can report this error by selecting "%S" from the Actions (gear) menu.
-errorReport.followingErrors=The following errors have occurred since starting %S:
-errorReport.advanceMessage=Press %S to send an error report to the Zotero developers.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Steps to Reproduce:
 errorReport.expectedResult=Expected result:
 errorReport.actualResult=Actual result:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Item Saved
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
-ingester.scrapeErrorDescription.linkText=Known Translator Issues
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/ar/zotero/zotero.dtd b/chrome/locale/ar/zotero/zotero.dtd
index 46bced8dd..454ac7f44 100644
--- a/chrome/locale/ar/zotero/zotero.dtd
+++ b/chrome/locale/ar/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "قد يتضمن سجل الاخطاء على رسائل ليس لها علاقة بزوتيرو.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "برجاء الانتظار لحين الانتهاء من ارسال التقرير عن الخطأ.">
 <!ENTITY zotero.errorReport.submitted "تم ارسال التقرير عن الخطأ.">
 <!ENTITY zotero.errorReport.reportID "رقم التقرير:">
diff --git a/chrome/locale/ar/zotero/zotero.properties b/chrome/locale/ar/zotero/zotero.properties
index e76daede5..a0055fcca 100644
--- a/chrome/locale/ar/zotero/zotero.properties
+++ b/chrome/locale/ar/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=في حالة استمرار ظهور هذه ا
 errorReport.reportError=الإبلاغ عن خطأ...
 errorReport.reportErrors=الإبلاغ عن أخطاء...
 errorReport.reportInstructions=يمكنك الإبلاغ عن هذا الخطأ باختيار "%S" من قائمة (ترس) عمليات.
-errorReport.followingErrors=حدثت الأخطاء التالية منذ بدء %S:
-errorReport.advanceMessage=اضغط على %S لإرسال بلاغ عن خطأ إلى مطوري زوتيرو.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=خطوات لإعادة ظهور الخطأ:
 errorReport.expectedResult=النتيجة المتوقعة:
 errorReport.actualResult=النتيجة الفعلية:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=تم حفظ العنصر
 ingester.scrapeError=تعذر حفظ العنصر
 ingester.scrapeErrorDescription=حدث خطأ أثناء حفظ العنصر. قم بمراجعة %S لمزيد من المعلومات.
-ingester.scrapeErrorDescription.linkText=مشاكل مترجمات معروفة
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=فشلت عملية الحفظ بسبب وجود خطأ سابق في زوتيرو.
 
 ingester.importReferRISDialog.title=استيراد زوتيرو لملفات RIS/Refer
diff --git a/chrome/locale/bg-BG/zotero/zotero.dtd b/chrome/locale/bg-BG/zotero/zotero.dtd
index c3efb4015..4495c1c3f 100644
--- a/chrome/locale/bg-BG/zotero/zotero.dtd
+++ b/chrome/locale/bg-BG/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "Дневника с грешките може да съдържа съобщения несвързани с Зотеро.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Моля изчакайте докато бъде подаден отчета с грешките.">
 <!ENTITY zotero.errorReport.submitted "Отчета с грешките беше подаден.">
 <!ENTITY zotero.errorReport.reportID "Идентификационен номер на отчета:">
diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties
index 7352fdb2a..d3dc886c5 100644
--- a/chrome/locale/bg-BG/zotero/zotero.properties
+++ b/chrome/locale/bg-BG/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Ако продължите да шполуча
 errorReport.reportError=Докладва грешката...
 errorReport.reportErrors=Докладва грешките...
 errorReport.reportInstructions=Можете да докладвате тази грешка като изберете "%S" от менюто за действия (икона със зъбчато колело)
-errorReport.followingErrors=Следните грешки възникнаха след стартирането на %S:
-errorReport.advanceMessage=Натиснете %S за да изпратите отчет с грешките до разработчиците на Зотеро.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Стъпки за възпроизвеждане:
 errorReport.expectedResult=Очакван резултат:
 errorReport.actualResult=Получен резултат:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Записа е съхранен.
 ingester.scrapeError=Записа не беше съхранен.
 ingester.scrapeErrorDescription=По време на записа на този запис възникна грешка. Моля опитайте отново. Ако тази грешка продължава да се появява, моля свържете се с автора на преводача.
-ingester.scrapeErrorDescription.linkText=Известни проблеми с преводача
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Записът е прекратен поради предходяща грешка в Зотеро.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/ca-AD/zotero/zotero.dtd b/chrome/locale/ca-AD/zotero/zotero.dtd
index 83cdb9c6f..68a930f1b 100644
--- a/chrome/locale/ca-AD/zotero/zotero.dtd
+++ b/chrome/locale/ca-AD/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel·la">
 
 <!ENTITY zotero.errorReport.title "Informe d'error de Zotero">
-<!ENTITY zotero.errorReport.unrelatedMessages "El registre d&apos;error pot incloure missatges no relacionats amb el Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Espereu mentre s&apos;envia l&apos;informe d&apos;error.">
 <!ENTITY zotero.errorReport.submitted "L&apos;informe d&apos;error ha estat enviat correctament.">
 <!ENTITY zotero.errorReport.reportID "Número de referència de l&apos;informe:">
diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties
index 96e0fd816..aaf88cb56 100644
--- a/chrome/locale/ca-AD/zotero/zotero.properties
+++ b/chrome/locale/ca-AD/zotero/zotero.properties
@@ -25,7 +25,7 @@ general.actionCannotBeUndone=Aquesta acció no es pot desfer.
 general.install=Instal·la
 general.updateAvailable=Hi ha una actualització disponible
 general.noUpdatesFound=No s'han trobat actualitzacions
-general.isUpToDate=%S is up to date.
+general.isUpToDate=%S està actualitzat.
 general.upgrade=Actualitza
 general.yes=Sí
 general.no=No
@@ -81,14 +81,15 @@ upgrade.couldNotMigrate.restart=Si continueu rebent aquest missatge, reinicieu l
 errorReport.reportError=Notifica un error...
 errorReport.reportErrors=Notifica errors...
 errorReport.reportInstructions=Podeu notificar aquest error seleccionat "%S" des del menú Accions (engranatge)
-errorReport.followingErrors=Els errors següents han ocorregut des de l'inici de %S:
-errorReport.advanceMessage=Premeu %S per enviar un informe d'error als desenvolupadors del Zotero
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Passos per a reproduir-lo:
 errorReport.expectedResult=Resultat esperat:
 errorReport.actualResult=Resultat real:
 errorReport.noNetworkConnection=No hi ha connexió a la xarxa
-errorReport.invalidResponseRepository=Invalid response from repository
-errorReport.repoCannotBeContacted=Repository cannot be contacted
+errorReport.invalidResponseRepository=Resposta del dipòsit invàlida.
+errorReport.repoCannotBeContacted=No es pot contactar amb el dipòsit.
 
 
 attachmentBasePath.selectDir=Tria el directori base
@@ -192,7 +193,7 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Fins a %S etiquetes de cada biblioteca poden tenir colors assignats.
 
 pane.items.loading=Carregant la llista d'elements...
-pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.moreColumns=Més columnes
 pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
@@ -236,11 +237,11 @@ pane.item.unselected.zero=No hi ha elements en aquesta visualització
 pane.item.unselected.singular=%S element en aquesta visualització
 pane.item.unselected.plural=%S elements en aquesta visualització
 
-pane.item.duplicates.selectToMerge=Select items to merge
-pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.selectToMerge=Seleccioneu elements per combinar
+pane.item.duplicates.mergeItems=Combina %S elements
 pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
 pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
-pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
+pane.item.duplicates.onlySameItemType=Els elements combinats han de ser elements del mateix tipus.
 
 pane.item.changeType.title=Canvia el tipus d'element
 pane.item.changeType.text=Segur que voleu canviar el tipus d'element?\n\n Es perdran els camps següents:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Desa a
 ingester.scrapeComplete=Element desat.
 ingester.scrapeError=No s'ha pogut desar l'element.
 ingester.scrapeErrorDescription=S'ha produït un error quan es desava aquest element. Comprova %S per a més informació
-ingester.scrapeErrorDescription.linkText=Incidències conegudes per aquest traductor
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=El procés de desar ha fallat a causa d'un error anterior de Zotero.
 
 ingester.importReferRISDialog.title=Importació RIS/Refer de Zotero
@@ -522,8 +523,8 @@ zotero.preferences.openurl.resolversFound.plural=%S resoledor found
 
 zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
 zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
-zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
-zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.purgeStorage.confirmButton=Purga els fitxers ara
+zotero.preferences.sync.purgeStorage.cancelButton=No els purguis
 zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
 zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
 zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
@@ -581,7 +582,7 @@ fileInterface.import=Importa
 fileInterface.export=Exporta
 fileInterface.exportedItems=Elements exportats
 fileInterface.imported=Importat
-fileInterface.unsupportedFormat=The selected file is not in a supported format.
+fileInterface.unsupportedFormat=El fitxer seleccionat té un format no admès.
 fileInterface.viewSupportedFormats=Mostra els formats compatibles...
 fileInterface.untitledBibliography=Bibliografia sense títol
 fileInterface.bibliographyHTMLTitle=Bibliografia
@@ -775,12 +776,12 @@ sync.error.clickSyncIcon=Fes clic a la icona de sincronització per sincronitzar
 sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
 sync.error.sslConnectionError=SSL connection error
 sync.error.checkConnection=Error connecting to server. Check your Internet connection.
-sync.error.emptyResponseServer=Empty response from server.
+sync.error.emptyResponseServer=Resposta buida del servidor.
 sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
 
 sync.lastSyncWithDifferentAccount=This Zotero database was last synced with a different zotero.org account ('%1$S') from the current one ('%2$S').
 sync.localDataWillBeCombined=If you continue, local Zotero data will be combined with data from the '%S' account stored on the server.
-sync.localGroupsWillBeRemoved1=Local groups, including any with changed items, will also be removed.
+sync.localGroupsWillBeRemoved1=Els grups locals, incloent-hi els que tenen elements modificats, s'eliminaran.
 sync.avoidCombiningData=To avoid combining or losing data, revert to the '%S' account or use the Reset options in the Sync pane of the Zotero preferences.
 sync.localGroupsWillBeRemoved2=If you continue, local groups, including any with changed items, will be removed and replaced with groups linked to the '%1$S' account.\n\nTo avoid losing local changes to groups, be sure you have synced with the '%2$S' account before syncing with the '%1$S' account.
 
@@ -804,7 +805,7 @@ sync.conflict.tag.addedToRemote=S'ha afegit als següents elements remots:
 sync.conflict.tag.addedToLocal=S'ha afegit als següents elements locals:
 
 sync.conflict.fileChanged=El següent fitxer s'ha canviat en múltiples ubicacions.
-sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.itemChanged=L'element següent ha canviat en múltiples ubicacions.
 sync.conflict.chooseVersionToKeep=Tria la versió que t'agradaria conservar i fes click a %S.
 sync.conflict.chooseThisVersion=Tria aquesta versió
 
@@ -842,7 +843,7 @@ sync.storage.error.permissionDeniedAtAddress=No teniu permís per crear un direc
 sync.storage.error.checkFileSyncSettings=Comproveu la configuració de sincronització dels fitxers o poseu-vos en contacte amb l'administrador del servidor.
 sync.storage.error.verificationFailed=La verificació de %S ha fallat. Verifique la configuració de sincronització de fitxers al panell de sincronització de les preferències del Zotero.
 sync.storage.error.fileNotCreated=No s'ha pogut crear el fitxer '%S' al directori d'"emmagatzematge" del Zotero.
-sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
+sync.storage.error.encryptedFilenames=Error en crear el fitxer '%S'.\n\n\nVisiteu l'enllaç http://www.zotero.org/support/kb/encrypted_filenames per a més informació.
 sync.storage.error.fileEditingAccessLost=Ja no teniu accés d'edició de fitxers del grup del Zotero '%S' i els fitxers que heu afegit o editat no es poden sincronitzar amb el servidor.
 sync.storage.error.copyChangedItems=Cancel·leu la sincronització ara si voleu tenir l'oportunitat de copiar els elements i els fitxers modificats en un altre lloc, .
 sync.storage.error.fileUploadFailed=La càrrega de fitxers ha fallat.
@@ -902,7 +903,7 @@ recognizePDF.fileNotFound=No s'ha trobat el fitxer
 recognizePDF.limit=Google Scholar query limit reached. Try again later.
 recognizePDF.error=S'ha produït un error inesperat.
 recognizePDF.stopped=Cancel·lat
-recognizePDF.complete.label=Metadata Retrieval Complete
+recognizePDF.complete.label=Recuperació de metadades completa
 recognizePDF.cancelled.label=Metadata Retrieval Cancelled
 recognizePDF.close.label=Tanca
 recognizePDF.captcha.title=Introduïu el codi CAPTCHA
@@ -922,7 +923,7 @@ file.accessError.cannotBe=no pot ser
 file.accessError.created=creat
 file.accessError.updated=actualitzat
 file.accessError.deleted=esborrat
-file.accessError.message.windows=Check that the file is not currently in use, that its permissions allow write access, and that it has a valid filename.
+file.accessError.message.windows=Comproveu que el fitxer no estigui actualment en ús, perquè té permisos que permeten l'escriptura i el nom del fitxer és vàlid.
 file.accessError.message.other=Comproveu que el fitxer no estigui obert i que tingui els permisos per poder-hi escriure.
 file.accessError.restart=Reiniciar l'ordinador o desactivar el programari de seguretat us hi pot ajudar.
 file.accessError.showParentDir=Mostra el directori principal
diff --git a/chrome/locale/cs-CZ/zotero/zotero.dtd b/chrome/locale/cs-CZ/zotero/zotero.dtd
index a87c888f6..99172568c 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.dtd
+++ b/chrome/locale/cs-CZ/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Zrušit">
 
 <!ENTITY zotero.errorReport.title "Chybová zpráva Zotera">
-<!ENTITY zotero.errorReport.unrelatedMessages "Záznam o chybách může obsahovat informace nesouvisející se Zoterem.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Čekejte, prosím, dokud nebude zpráva o chybách odeslána.">
 <!ENTITY zotero.errorReport.submitted "Zpráva o chybách byla odeslána.">
 <!ENTITY zotero.errorReport.reportID "ID hlášení:">
diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties
index 57feca2eb..07039da9d 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.properties
+++ b/chrome/locale/cs-CZ/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Pokud se tato zpráva objevuje opakovaně, resta
 errorReport.reportError=Zpráva o chybě...
 errorReport.reportErrors=Nahlásit chyby...
 errorReport.reportInstructions=Můžete nahlásit tuto chybu volbou "%S" z menu Akce (ozubené kolečko).
-errorReport.followingErrors=Od startu %S nastaly následující chyby:
-errorReport.advanceMessage=Stisknutím %S pošlete hlášení o chybách vývojářům aplikace Zotero.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Kroky k zopakování:
 errorReport.expectedResult=Očekávaný výsledek:
 errorReport.actualResult=Dosažený výsledek:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Ukládám do
 ingester.scrapeComplete=Položka uložena
 ingester.scrapeError=Nebylo možné uložit položku
 ingester.scrapeErrorDescription=Při ukládání této položky nastala chyba. Zkontrolujte %S pro více informací.
-ingester.scrapeErrorDescription.linkText=Známý problém překladače
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Ukládání selhalo z důvodu předchozí chyby v Zoteru.
 
 ingester.importReferRISDialog.title=Import RIS/Refer do Zotera
diff --git a/chrome/locale/da-DK/zotero/zotero.dtd b/chrome/locale/da-DK/zotero/zotero.dtd
index 9f823b865..6c6cb590b 100644
--- a/chrome/locale/da-DK/zotero/zotero.dtd
+++ b/chrome/locale/da-DK/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Annullér">
 
 <!ENTITY zotero.errorReport.title "Zotero fejlrapport">
-<!ENTITY zotero.errorReport.unrelatedMessages "Logfilen for fejl kan indeholde meddelelser der ikke har med Zotero at gøre.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Vent venligst mens fejlrapporten registreres.">
 <!ENTITY zotero.errorReport.submitted "Din fejlrapport er registreret.">
 <!ENTITY zotero.errorReport.reportID "Rapport-ID:">
diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties
index c88bc7259..775c0e3b8 100644
--- a/chrome/locale/da-DK/zotero/zotero.properties
+++ b/chrome/locale/da-DK/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Hvis du fortsat får denne meddelelse, så genst
 errorReport.reportError=Send rapport om fejl...
 errorReport.reportErrors=Send rapport om fejl....
 errorReport.reportInstructions=Du kan sende denne fejlmelding ved at vælge "%S" fra Handlinger-menuen (tandhjulikonet).
-errorReport.followingErrors=Følgende fejl er opstået siden %S blev startet:
-errorReport.advanceMessage=Tryk %S for at sende en fejlmelding til holdet bag Zotero.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Følgende skridt kan genskabe situationen:
 errorReport.expectedResult=Forventet resultat:
 errorReport.actualResult=Faktisk resultat:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Gemmer i
 ingester.scrapeComplete=Elementet er gemt
 ingester.scrapeError=Elementet kunne ikke gemmes
 ingester.scrapeErrorDescription=En fejl opstod under forsøget på at gemme elementet. Tjek %S for mere information.
-ingester.scrapeErrorDescription.linkText=Kendte problemer med "oversættere"
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Processen kunne ikke udføres pga. en tidligere Zotero-fejl.
 
 ingester.importReferRISDialog.title=Import til Zotero med RIS/Refer 
diff --git a/chrome/locale/de/zotero/searchbox.dtd b/chrome/locale/de/zotero/searchbox.dtd
index 9d9969cf5..442607660 100644
--- a/chrome/locale/de/zotero/searchbox.dtd
+++ b/chrome/locale/de/zotero/searchbox.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.search.name "Name:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "In Bibliothek suchen:">
 
 <!ENTITY zotero.search.joinMode.prefix "Ergebnisse finden mit">
 <!ENTITY zotero.search.joinMode.any "beliebigem">
diff --git a/chrome/locale/de/zotero/zotero.dtd b/chrome/locale/de/zotero/zotero.dtd
index d4bba6746..4a72d9138 100644
--- a/chrome/locale/de/zotero/zotero.dtd
+++ b/chrome/locale/de/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Abbrechen">
 
 <!ENTITY zotero.errorReport.title "Zotero Fehlerbericht">
-<!ENTITY zotero.errorReport.unrelatedMessages "Dieses Fehlerprotokoll kann unter Umständen Nachrichten enthalten, die nicht mit Zotero in Verbindung stehen.">
+<!ENTITY zotero.errorReport.unrelatedMessages "Unter Umständen sind Nachrichten enthalten, die nicht mit Zotero in Verbindung stehen.">
 <!ENTITY zotero.errorReport.submissionInProgress "Bitte warten Sie, während der Fehlerbericht übermittelt wird.">
 <!ENTITY zotero.errorReport.submitted "Der Fehlerbericht wurde übermittelt.">
 <!ENTITY zotero.errorReport.reportID "Bericht-ID:">
@@ -45,7 +45,7 @@
 <!ENTITY zotero.collections.showUnfiledItems "Einträge ohne Sammlung anzeigen">
 
 <!ENTITY zotero.items.itemType "Eintragsart">
-<!ENTITY zotero.items.type_column "Item Type">
+<!ENTITY zotero.items.type_column "Eintragsart">
 <!ENTITY zotero.items.title_column "Titel">
 <!ENTITY zotero.items.creator_column "Ersteller">
 <!ENTITY zotero.items.date_column "Datum">
@@ -65,7 +65,7 @@
 <!ENTITY zotero.items.archiveLocation_column "Standort im Archiv">
 <!ENTITY zotero.items.place_column "Ort">
 <!ENTITY zotero.items.volume_column "Volumen">
-<!ENTITY zotero.items.edition_column "Ausgabe">
+<!ENTITY zotero.items.edition_column "Auflage">
 <!ENTITY zotero.items.pages_column "Seiten">
 <!ENTITY zotero.items.issue_column "Ausgabe">
 <!ENTITY zotero.items.series_column "Reihe">
diff --git a/chrome/locale/de/zotero/zotero.properties b/chrome/locale/de/zotero/zotero.properties
index 6fff3f477..ee429202e 100644
--- a/chrome/locale/de/zotero/zotero.properties
+++ b/chrome/locale/de/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Wenn Sie diese Nachricht weiterhin erhalten, sta
 errorReport.reportError=Fehler melden...
 errorReport.reportErrors=Fehler melden...
 errorReport.reportInstructions=Sie können diesen Fehler melden, indem Sie "%S" im Aktivitäten-Menü (Zahnrad) auswählen.
-errorReport.followingErrors=Die folgenden Fehler sind seit dem Start von %S aufgetreten:
-errorReport.advanceMessage=Drücken Sie %S, um einen Fehlerbericht an die Zotero-Entwickler zu senden.
+errorReport.followingReportWillBeSubmitted=Der folgende Bericht wird gesendet:
+errorReport.noErrorsLogged=Es wurden keine Fehler registriert, seitdem %S gestartet ist. 
+errorReport.advanceMessage=Drücken Sie %S, um den Bericht an das Zotero-Team zu senden.
 errorReport.stepsToReproduce=Schritte zur Reproduktion:
 errorReport.expectedResult=Erwartetes Ergebnis:
 errorReport.actualResult=Tatsächliches Ergebnis:
@@ -192,8 +193,8 @@ tagColorChooser.numberKeyInstructions=Sie können dieses Tag mit der $NUMBER Tas
 tagColorChooser.maxTags=Sie können bis zu %S Tags in jeder Bibliothek Farben zuweisen.
 
 pane.items.loading=Lade die Liste der Einträge...
-pane.items.columnChooser.moreColumns=More Columns
-pane.items.columnChooser.secondarySort=Secondary Sort (%S)
+pane.items.columnChooser.moreColumns=Weitere Spalten
+pane.items.columnChooser.secondarySort=Sekundäre Sortierung (%S)
 pane.items.attach.link.uri.title=Link zu einer URI anhängen
 pane.items.attach.link.uri=URI eingeben:
 pane.items.trash.title=In den Papierkorb verschieben
@@ -482,7 +483,7 @@ ingester.scrapingTo=Speichern nach
 ingester.scrapeComplete=Eintrag gespeichert.
 ingester.scrapeError=Eintrag konnte nicht gespeichert werden.
 ingester.scrapeErrorDescription=Ein Fehler ist aufgetreten beim Versuch, diesen Artikel zu speichern. Überprüfen Sie %S für weitere Informationen.
-ingester.scrapeErrorDescription.linkText=Bekannte Konvertierungsprobleme
+ingester.scrapeErrorDescription.linkText=Probleme mit dem Übersetzer beheben
 ingester.scrapeErrorDescription.previousError=Der Speichervorgang ist fehlgeschlagen aufgrund eines vorhergehenden Zotero-Fehlers.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/el-GR/zotero/zotero.dtd b/chrome/locale/el-GR/zotero/zotero.dtd
index ddc6708e0..2ab55fcd8 100644
--- a/chrome/locale/el-GR/zotero/zotero.dtd
+++ b/chrome/locale/el-GR/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "The error log may include messages unrelated to Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Please wait while the error report is submitted.">
 <!ENTITY zotero.errorReport.submitted "Your error report has been submitted.">
 <!ENTITY zotero.errorReport.reportID "Report ID:">
diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties
index 93a3a8dd6..cbf110f11 100644
--- a/chrome/locale/el-GR/zotero/zotero.properties
+++ b/chrome/locale/el-GR/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=If you continue to receive this message, restart
 errorReport.reportError=Report Error...
 errorReport.reportErrors=Report Errors...
 errorReport.reportInstructions=You can report this error by selecting "%S" from the Actions (gear) menu.
-errorReport.followingErrors=The following errors have occurred since starting %S:
-errorReport.advanceMessage=Press %S to send an error report to the Zotero developers.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Steps to Reproduce:
 errorReport.expectedResult=Expected result:
 errorReport.actualResult=Actual result:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Item Saved
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
-ingester.scrapeErrorDescription.linkText=Known Translator Issues
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 2db5d59c5..b006aed9d 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel								"Cancel">
 
 <!ENTITY zotero.errorReport.title							"Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages				"The error log may include messages unrelated to Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages				"This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress			"Please wait while the error report is submitted.">
 <!ENTITY zotero.errorReport.submitted						"Your error report has been submitted.">
 <!ENTITY zotero.errorReport.reportID						"Report ID:">
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index b05da82a3..5e672d312 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart		= If you continue to receive this message, rest
 errorReport.reportError				= Report Error…
 errorReport.reportErrors			= Report Errors…
 errorReport.reportInstructions		= You can report this error by selecting "%S" from the Actions (gear) menu.
-errorReport.followingErrors			= The following errors have occurred since starting %S:
-errorReport.advanceMessage			= Press %S to send an error report to the Zotero developers.
+errorReport.followingReportWillBeSubmitted = The following report will be submitted:
+errorReport.noErrorsLogged         = No errors have been logged since %S started.
+errorReport.advanceMessage			= Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce		= Steps to Reproduce:
 errorReport.expectedResult			= Expected result:
 errorReport.actualResult			= Actual result:
@@ -482,7 +483,7 @@ ingester.scrapingTo				= Saving to
 ingester.scrapeComplete			= Item Saved
 ingester.scrapeError			= Could Not Save Item
 ingester.scrapeErrorDescription	= An error occurred while saving this item. Check %S for more information.
-ingester.scrapeErrorDescription.linkText = Known Translator Issues
+ingester.scrapeErrorDescription.linkText = Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError = The saving process failed due to a previous Zotero error.
 
 ingester.importReferRISDialog.title	= Zotero RIS/Refer Import
diff --git a/chrome/locale/es-ES/zotero/searchbox.dtd b/chrome/locale/es-ES/zotero/searchbox.dtd
index aeca73d05..de80446bd 100644
--- a/chrome/locale/es-ES/zotero/searchbox.dtd
+++ b/chrome/locale/es-ES/zotero/searchbox.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.search.name "Nombre:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "Buscar en biblioteca:">
 
 <!ENTITY zotero.search.joinMode.prefix "Patrón">
 <!ENTITY zotero.search.joinMode.any "cualquiera de">
diff --git a/chrome/locale/es-ES/zotero/zotero.dtd b/chrome/locale/es-ES/zotero/zotero.dtd
index a09022296..069402e85 100644
--- a/chrome/locale/es-ES/zotero/zotero.dtd
+++ b/chrome/locale/es-ES/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancelar">
 
 <!ENTITY zotero.errorReport.title "Informe de errores de Zotero">
-<!ENTITY zotero.errorReport.unrelatedMessages "El informe de errores puede incluir mensajes sin relación con Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "Esto puede incluir mensajes no relacionados con Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Por favor, espera mientras se envía el informe de error.">
 <!ENTITY zotero.errorReport.submitted "Se ha enviado el informe de error.">
 <!ENTITY zotero.errorReport.reportID "Identificador de informe:">
@@ -45,7 +45,7 @@
 <!ENTITY zotero.collections.showUnfiledItems "Mostrar ítems unificados">
 
 <!ENTITY zotero.items.itemType "Tipo de ítem">
-<!ENTITY zotero.items.type_column "Item Type">
+<!ENTITY zotero.items.type_column "Tipo de ítem">
 <!ENTITY zotero.items.title_column "Título">
 <!ENTITY zotero.items.creator_column "Creador">
 <!ENTITY zotero.items.date_column "Fecha">
diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties
index bc002e8d6..6972df87d 100644
--- a/chrome/locale/es-ES/zotero/zotero.properties
+++ b/chrome/locale/es-ES/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Si recibes este mensaje más veces, reinicia tu
 errorReport.reportError=Informar de errores...
 errorReport.reportErrors=Informar de errores...
 errorReport.reportInstructions=Puedes comunicar este error seleccionando "%S" en el menú Acciones (rueda dentada).
-errorReport.followingErrors=Han ocurrido los siguientes errores desde que se inició %S:
-errorReport.advanceMessage=Pulsa %S para enviar un informe de error a los creadores de Zotero.
+errorReport.followingReportWillBeSubmitted=El siguiente informe será presentado:
+errorReport.noErrorsLogged=Ningún error se ha registrado desde que %S se inició.
+errorReport.advanceMessage=Pulse %S para enviar el informe a los desarrolladores de Zotero.
 errorReport.stepsToReproduce=Pasos para reproducirlo:
 errorReport.expectedResult=Resultado esperado:
 errorReport.actualResult=Resultado real:
@@ -192,8 +193,8 @@ tagColorChooser.numberKeyInstructions=Puedes añadir esta etiqueta  a los ítems
 tagColorChooser.maxTags=Se puede asignar colores a hasta %S etiquetas de cada biblioteca.
 
 pane.items.loading=Cargando la lista de ítems...
-pane.items.columnChooser.moreColumns=More Columns
-pane.items.columnChooser.secondarySort=Secondary Sort (%S)
+pane.items.columnChooser.moreColumns=Más columnas
+pane.items.columnChooser.secondarySort=Orden secundario (%S)
 pane.items.attach.link.uri.title=Adjuntar enlace a URI
 pane.items.attach.link.uri=Introducir una URI:
 pane.items.trash.title=Enviar a la papelera
@@ -482,7 +483,7 @@ ingester.scrapingTo=Guardando en
 ingester.scrapeComplete=Ítem guardado
 ingester.scrapeError=No he podido guardar el ítem
 ingester.scrapeErrorDescription=Ha ocurrido un error al grabar este ítem. Mira en %S para más información.
-ingester.scrapeErrorDescription.linkText=Problemas conocidos del traductor
+ingester.scrapeErrorDescription.linkText=Asuntos relacionados con el traductor en la solución de problemas
 ingester.scrapeErrorDescription.previousError=La grabación ha fallado debido a un error anterior en Zotero.
 
 ingester.importReferRISDialog.title=Importador Zotero RIS/Remitir
diff --git a/chrome/locale/et-EE/zotero/preferences.dtd b/chrome/locale/et-EE/zotero/preferences.dtd
index 1d3db9890..f4ef1c368 100644
--- a/chrome/locale/et-EE/zotero/preferences.dtd
+++ b/chrome/locale/et-EE/zotero/preferences.dtd
@@ -3,7 +3,7 @@
 <!ENTITY zotero.preferences.default "Vaikimisi:">
 <!ENTITY zotero.preferences.items "kirjet">
 <!ENTITY zotero.preferences.period ".">
-<!ENTITY zotero.preferences.settings "Settings">
+<!ENTITY zotero.preferences.settings "Seaded">
 
 <!ENTITY zotero.preferences.prefpane.general "Üldine">
 
@@ -11,7 +11,7 @@
 <!ENTITY zotero.preferences.showIn "Laadida Zotero:">
 <!ENTITY zotero.preferences.showIn.browserPane "Brauseri paanil">
 <!ENTITY zotero.preferences.showIn.separateTab "Eraldi">
-<!ENTITY zotero.preferences.showIn.appTab "Rakendus tab">
+<!ENTITY zotero.preferences.showIn.appTab "Rakenduse tab">
 <!ENTITY zotero.preferences.statusBarIcon "Staatusriba ikoon:">
 <!ENTITY zotero.preferences.statusBarIcon.none "Puudub">
 <!ENTITY zotero.preferences.fontSize "Fondi suurus:">
@@ -22,12 +22,12 @@
 <!ENTITY zotero.preferences.fontSize.notes "Märkuse fondisuurus">
 
 <!ENTITY zotero.preferences.miscellaneous "Mitmesugust">
-<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
+<!ENTITY zotero.preferences.autoUpdate "Otsida automaatsed stiile ja tõlkijaid">
 <!ENTITY zotero.preferences.updateNow "Uuendada nüüd">
 <!ENTITY zotero.preferences.reportTranslationFailure "Anda teada vigastest tõlkijatest">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Lubada zotero.org modifitseerida sisu vastavalt Zotero versioonile">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader.tooltip "Kui valitud, siis praegune Zotero versioon lisatakse HTTP päringutele zotero.org-ist.">
-<!ENTITY zotero.preferences.parseRISRefer "Use Zotero for downloaded BibTeX/RIS/Refer files">
+<!ENTITY zotero.preferences.parseRISRefer "Kasutada Zoterot BibTeX/RIS/Refer failide avamisel">
 <!ENTITY zotero.preferences.automaticSnapshots "Teha momentülesvõtted kui luuakse kirjeid lehekülgedest">
 <!ENTITY zotero.preferences.downloadAssociatedFiles "Kirje lisamisel salvestada automaatselt seotud PDF-id ja teised elemendid">
 <!ENTITY zotero.preferences.automaticTags "Lisada automaatselt märksõnad ja teemapealkirjad lipikutesse">
@@ -35,11 +35,11 @@
 <!ENTITY zotero.preferences.trashAutoEmptyDaysPost "päeva tagasi">
 
 <!ENTITY zotero.preferences.groups "Grupid">
-<!ENTITY zotero.preferences.groups.whenCopyingInclude "Kirjete kopeerimisel raamatukogude vahel lisada:">
+<!ENTITY zotero.preferences.groups.whenCopyingInclude "Kirjete kopeerimisel kataloogide vahel lisada:">
 <!ENTITY zotero.preferences.groups.childNotes "seotud märkused">
 <!ENTITY zotero.preferences.groups.childFiles "seotud momentülesvõtted ja imporditud failid">
 <!ENTITY zotero.preferences.groups.childLinks "seotud lingid">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "lipikud">
 
 <!ENTITY zotero.preferences.openurl.caption "OpenURL">
 
@@ -55,21 +55,21 @@
 <!ENTITY zotero.preferences.sync.createAccount "Loo kasutaja">
 <!ENTITY zotero.preferences.sync.lostPassword "Salasõna kadunud?">
 <!ENTITY zotero.preferences.sync.syncAutomatically "Sünkroonida automaatselt">
-<!ENTITY zotero.preferences.sync.syncFullTextContent "Sync full-text content">
-<!ENTITY zotero.preferences.sync.syncFullTextContent.desc "Zotero can sync the full-text content of files in your Zotero libraries with zotero.org and other linked devices, allowing you to easily search for your files wherever you are. The full-text content of your files will not be shared publicly.">
+<!ENTITY zotero.preferences.sync.syncFullTextContent "Sünkroniseerida täistekst sisu">
+<!ENTITY zotero.preferences.sync.syncFullTextContent.desc "Zotero on võimeline sünkroniseerima teie failide täistekst sisu zotero.org kaudu teiste ühendatud seadmetega, võimaldades lihtsat ligipääsu failidele. Teie failide täistekst sisu ei jagata avalikult. ">
 <!ENTITY zotero.preferences.sync.about "Sünkroonimise kohta">
 <!ENTITY zotero.preferences.sync.fileSyncing "Failide sünkroonimine">
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "Minu raamatukogus olevate lisade sünkroonimine kasutades">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Minu grupi raamatukogus olevate lisade sünkroonimine kasutades Zotero hoidlat">
-<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
-<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
-<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Failide allalaadimine">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "sünkroonimise ajal">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "vajadusel">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Kasutades Zotero hoidlat, nõustute järgmiste">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "tingimuste ja piirangutega">
-<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
-<!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
-<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
+<!ENTITY zotero.preferences.sync.reset.warning1 "Järgnevad toimingud on mõeldud vaid erakordseteks ja spetsiifilisteks olukordadeks ja neid ei tohiks kasutada üldiseks probleemide lahendamiseks. Paljudel juhtudel võib algseadistamine lisaprobleeme põhjustada. Vt ">
+<!ENTITY zotero.preferences.sync.reset.warning2 "Sünkroniseerimise alglaadimise seaded">
+<!ENTITY zotero.preferences.sync.reset.warning3 "edasine info.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Zotero serveriga täissünkroonimine">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "Liita kohalikele Zotero andmetele sünkroon-serveris olevad andmed, jättes tähelepanuta sünkroonimise ajaloo">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Taastada Zotero serverist">
@@ -78,7 +78,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "Kustutada kõik sünkroon-serveri andmed ja taastada need kohalikust hoidlast">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "Algseadistada failide sünkroonimise ajalugu">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Rakendada hoidla serveri kontrolli kõigi kohalikele lisatud failidele.">
-<!ENTITY zotero.preferences.sync.reset "Reset">
+<!ENTITY zotero.preferences.sync.reset "Algseadistada">
 <!ENTITY zotero.preferences.sync.reset.button "Algseadistada...">
 
 
@@ -128,12 +128,12 @@
 <!ENTITY zotero.preferences.prefpane.keys "Kiirvaliku klahvid">
 
 <!ENTITY zotero.preferences.keys.openZotero "Avada/Sulgeda Zotero aken">
-<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
+<!ENTITY zotero.preferences.keys.saveToZotero "Salvestada Zoterosse (aadressiriba ikoon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Täisekraan režiim">
-<!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
+<!ENTITY zotero.preferences.keys.focusLibrariesPane "Kataloogide paan fookusesse">
 <!ENTITY zotero.preferences.keys.quicksearch "Kiirotsing">
-<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
-<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
+<!ENTITY zotero.preferences.keys.newItem "Uue kirje loomine">
+<!ENTITY zotero.preferences.keys.newNote "Uue märkuse loomine">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Lipikuvalija olek">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kopeerida valitud kirje tsiteeringud lõikepuhvrisse">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kopeerida valitud kirjed lõikepuhvrisse">
@@ -163,7 +163,7 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Suvaline string">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Täpsemalt">
-<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Failid ja kataloogid">
 
 <!ENTITY zotero.preferences.prefpane.locate "Otsing">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Artikli otsingumootori haldaja">
@@ -183,11 +183,11 @@
 <!ENTITY zotero.preferences.dataDir.choose "Valida...">
 <!ENTITY zotero.preferences.dataDir.reveal "Andmete kataloogi näitamine">
 
-<!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
-<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
-<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
-<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
-<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+<!ENTITY zotero.preferences.attachmentBaseDir.caption "Lingitud manuse baaskataloog">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero kasutab lingitud manuste puhul suhtelisi radasid baaskataloogis. Selliseilt on võimalik failidele ligipääs erinevates arvutites, tingimusel, et failistruktuur baaskataloogis on sama.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Baaskataloog:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Valida...">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Absoluutsetele radadele üleminek...">
 
 <!ENTITY zotero.preferences.dbMaintenance "Andmebaasi hooldus">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Andmebaasi sidususe kontroll">
@@ -206,4 +206,4 @@
 <!ENTITY zotero.preferences.openAboutConfig "Avada about:config">
 <!ENTITY zotero.preferences.openCSLEdit "Avada CSL redaktor">
 <!ENTITY zotero.preferences.openCSLPreview "Avada CSL eelvaade">
-<!ENTITY zotero.preferences.openAboutMemory "Open about:memory">
+<!ENTITY zotero.preferences.openAboutMemory "Avada about:memory">
diff --git a/chrome/locale/et-EE/zotero/searchbox.dtd b/chrome/locale/et-EE/zotero/searchbox.dtd
index 0bbf7a98c..f6a46bd27 100644
--- a/chrome/locale/et-EE/zotero/searchbox.dtd
+++ b/chrome/locale/et-EE/zotero/searchbox.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.search.name "Nimi:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "Otsing kataloogist:">
 
 <!ENTITY zotero.search.joinMode.prefix "Valik">
 <!ENTITY zotero.search.joinMode.any "üks">
@@ -20,6 +20,6 @@
 <!ENTITY zotero.search.date.units.months "kuid">
 <!ENTITY zotero.search.date.units.years "aastaid">
 
-<!ENTITY zotero.search.search "Otsida">
-<!ENTITY zotero.search.clear "Puhastada">
+<!ENTITY zotero.search.search "Otsing">
+<!ENTITY zotero.search.clear "Tühjendada">
 <!ENTITY zotero.search.saveSearch "Otsing salvestada">
diff --git a/chrome/locale/et-EE/zotero/zotero.dtd b/chrome/locale/et-EE/zotero/zotero.dtd
index 6da6dd124..286a38e2f 100644
--- a/chrome/locale/et-EE/zotero/zotero.dtd
+++ b/chrome/locale/et-EE/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "Vealogi võib sisaldada teateid, mis ei puutu Zoterosse.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Palun oodake kuni veateadet saadetakse.">
 <!ENTITY zotero.errorReport.submitted "Teie veateade on saadetud.">
 <!ENTITY zotero.errorReport.reportID "Veateate ID:">
diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties
index 9db12d34b..b9ca89a50 100644
--- a/chrome/locale/et-EE/zotero/zotero.properties
+++ b/chrome/locale/et-EE/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Kui te saate seda veateadet juba mitmendat korda
 errorReport.reportError=Teatage veast...
 errorReport.reportErrors=Andke vigadest teada...
 errorReport.reportInstructions=Sellest veast saate teatada valides "%S" Toimingute (hammasratas) menüüst.
-errorReport.followingErrors=%S käivitamisest alates on juhtunud järgnevad vead:
-errorReport.advanceMessage=Veateate saatmiseks Zotero arendajatele vajutage %S.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Kuidas viga tekib:
 errorReport.expectedResult=Loodetud tulemus:
 errorReport.actualResult=Tegelik tulemus:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Kirje salvestatud
 ingester.scrapeError=Kirje salvestamine ei õnnestunud
 ingester.scrapeErrorDescription=Selle kirje salvestamisel tekkis viga. Lisainformatsiooniks vaadake %S.
-ingester.scrapeErrorDescription.linkText=Teadaolevad tõlkija vead
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Salvestamine nurjus Zotero eelneva vea tõttu.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer import
diff --git a/chrome/locale/eu-ES/zotero/zotero.dtd b/chrome/locale/eu-ES/zotero/zotero.dtd
index e67e1c877..b39d701f4 100644
--- a/chrome/locale/eu-ES/zotero/zotero.dtd
+++ b/chrome/locale/eu-ES/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "The error log may include messages unrelated to Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Please wait while the error report is submitted.">
 <!ENTITY zotero.errorReport.submitted "Your error report has been submitted.">
 <!ENTITY zotero.errorReport.reportID "Report ID:">
diff --git a/chrome/locale/eu-ES/zotero/zotero.properties b/chrome/locale/eu-ES/zotero/zotero.properties
index 6f32d8c38..364bb1b6a 100644
--- a/chrome/locale/eu-ES/zotero/zotero.properties
+++ b/chrome/locale/eu-ES/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Mezu hau maizago agertzen bazaizu, berrabiarazi
 errorReport.reportError=Errore-txostena...
 errorReport.reportErrors=Errore-txostena...
 errorReport.reportInstructions=Bidali txostena "%S" Ekintzak-menuan sakatuz.
-errorReport.followingErrors=Ondorengo erroreak gertatu dira %S abiatu denetik:
-errorReport.advanceMessage=Sakatu %S Zotero garatzaileei errore-txostena bidaltzeko.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Steps to Reproduce:
 errorReport.expectedResult=Expected result:
 errorReport.actualResult=Actual result:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Itema gorde egin da.
 ingester.scrapeError=Itema ezin izan da gorde.
 ingester.scrapeErrorDescription=Errore bat gertatu da gordetzekotan. Sakatu %S gehiago jakiteko.
-ingester.scrapeErrorDescription.linkText=Known Translator Issues
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/fa/zotero/zotero.dtd b/chrome/locale/fa/zotero/zotero.dtd
index a25ae6025..be049c630 100644
--- a/chrome/locale/fa/zotero/zotero.dtd
+++ b/chrome/locale/fa/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "گزارش خطا ممکن است شامل پیام‌های غیر مرتبط با زوترو باشد.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "لطفا تا پایان ارسال گزارش خطا، صبر کنید.">
 <!ENTITY zotero.errorReport.submitted "گزارش خطا ارسال شد.">
 <!ENTITY zotero.errorReport.reportID "شناسه گزارش:">
diff --git a/chrome/locale/fa/zotero/zotero.properties b/chrome/locale/fa/zotero/zotero.properties
index 637640235..7d229b39f 100644
--- a/chrome/locale/fa/zotero/zotero.properties
+++ b/chrome/locale/fa/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=اگر باز هم این پیام را دریا
 errorReport.reportError=گزارش خطا...
 errorReport.reportErrors=گزارش خطاها...
 errorReport.reportInstructions=می‌توانید این خطا را با انتخاب "%S" از منوی تنظیمات (چرخ‌دنده) گزارش کنید.
-errorReport.followingErrors=از زمان شروع %S این خطاها رخ داده‌اند:
-errorReport.advanceMessage=%S را برای ارسال یک گزارش خطا به توسعه‌دهندگان زوترو بزنید.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=گام‌های مورد نیاز برای تولید دوباره:
 errorReport.expectedResult=نتیجه مورد انتظار:
 errorReport.actualResult=نتیجه واقعی:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=ذخیره شد
 ingester.scrapeError=ذخیره امکان‌پذیر نیست
 ingester.scrapeErrorDescription=در زمان ذخیره این آیتم‌، خطایی رخ داد. %S را برای اطلاعات بیشتر چک کنید.
-ingester.scrapeErrorDescription.linkText=مشکلات شناخته شده مترجم
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=فرایند ذخیره به خاطر خطای قبلی زوترو با شکست مواجه شد.
 
 ingester.importReferRISDialog.title=درون‌برد RIS/Refer زوترو
diff --git a/chrome/locale/fi-FI/zotero/zotero.dtd b/chrome/locale/fi-FI/zotero/zotero.dtd
index 18194a78a..bde09289b 100644
--- a/chrome/locale/fi-FI/zotero/zotero.dtd
+++ b/chrome/locale/fi-FI/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Peruuta">
 
 <!ENTITY zotero.errorReport.title "Zoteron virheraportti">
-<!ENTITY zotero.errorReport.unrelatedMessages "Virhepäiväkirjassa saattaa olla mukana Zoteroon liittymättömiä viestejä.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Odota">
 <!ENTITY zotero.errorReport.submitted "Virheraporttisi on toimitettu.">
 <!ENTITY zotero.errorReport.reportID "Raportin tunnus:">
diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties
index 4e4bafd66..2682a361e 100644
--- a/chrome/locale/fi-FI/zotero/zotero.properties
+++ b/chrome/locale/fi-FI/zotero/zotero.properties
@@ -12,24 +12,24 @@ general.restartRequiredForChanges=Muutokset vaikuttavat vasta %Sin uudelleenkäy
 general.restartNow=Käynnistä uudelleen nyt
 general.restartLater=Käynnistä uudelleen myöhemmin
 general.restartApp=Käynnistä %S uudelleen
-general.quitApp=Quit %S
+general.quitApp=Lopeta %S
 general.errorHasOccurred=On tapahtunut virhe
 general.unknownErrorOccurred=Tapahtui tuntematon virhe.
-general.invalidResponseServer=Invalid response from server.
-general.tryAgainLater=Please try again in a few minutes.
-general.serverError=The server returned an error. Please try again.
+general.invalidResponseServer=Palvelin antoi virheellisen vastauksen.
+general.tryAgainLater=Yritä uudelleen muutaman minuutin päästä.
+general.serverError=Palvelin antoi virheilmoituksen. Yritä myöhemmin uudestaan.
 general.restartFirefox=Käynnistä Firefox uudelleen.
 general.restartFirefoxAndTryAgain=Käynnistä Firefox uudelleen ja kokeile uudestaan
-general.checkForUpdate=Check for Update
+general.checkForUpdate=Tarkista päivitykset
 general.actionCannotBeUndone=Tätä toimintoa ei voi perua.
 general.install=Asenna
 general.updateAvailable=Päivitys on saatavana
-general.noUpdatesFound=No Updates Found
-general.isUpToDate=%S is up to date.
+general.noUpdatesFound=Päivityksiä ei löytynyt
+general.isUpToDate=%S on ajan tasalla.
 general.upgrade=Päivitä
 general.yes=Kyllä
 general.no=Ei
-general.notNow=Not Now
+general.notNow=Ei nyt
 general.passed=Onnistui
 general.failed=Epäonnistui
 general.and=ja
@@ -39,19 +39,19 @@ general.permissionDenied=Ei riittäviä oikeuksia
 general.character.singular=kirjain
 general.character.plural=kirjaimet
 general.create=Luo
-general.delete=Delete
-general.moreInformation=More Information
+general.delete=Poista
+general.moreInformation=Lisätietoja
 general.seeForMoreInformation=Katso %S, jos haluat tietää lisää.
 general.enable=Laita päälle
 general.disable=Ota pois päältä
 general.remove=Poista
 general.reset=Reset
-general.hide=Hide
-general.quit=Quit
-general.useDefault=Use Default
+general.hide=Kätke
+general.quit=Lopeta
+general.useDefault=Käytä oletusarvoa
 general.openDocumentation=Avaa käyttöohje
 general.numMore=%S more…
-general.openPreferences=Open Preferences
+general.openPreferences=Avaa asetukset
 general.keys.ctrlShift=Ctrl+Shift+
 general.keys.cmdShift=Cmd+Shift+
 
@@ -81,12 +81,13 @@ upgrade.couldNotMigrate.restart=Jos saat toistuvasti tämän viestin, käynnist
 errorReport.reportError=Report Error...
 errorReport.reportErrors=Kerro virheestä...
 errorReport.reportInstructions=Voit raportoida tämän virheen valitsemalla "%S" Toimintovalikosta (hammasratas).
-errorReport.followingErrors=Seuraavat virheet ovat tapahtuneet sen jälkeen, kun %S on käynnistetty:
-errorReport.advanceMessage=Paina %S lähettääksesi virheraportin Zoteron kehittäjille
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Paina %S lähettääksesi raportin Zoteron kehittäjille.
 errorReport.stepsToReproduce=Virheen saa aikaan tekemällä näin:
 errorReport.expectedResult=Odottamani lopputulos:
 errorReport.actualResult=Todellinen lopputulos:
-errorReport.noNetworkConnection=No network connection
+errorReport.noNetworkConnection=Ei verkkoyhteyttä
 errorReport.invalidResponseRepository=Invalid response from repository
 errorReport.repoCannotBeContacted=Repository cannot be contacted
 
@@ -111,7 +112,7 @@ dataDir.selectedDirNonEmpty.title=Kansio ei ole tyhjä
 dataDir.selectedDirNonEmpty.text=Valitsemasi kansio ei ole tyhjä eikä ilmeisesti Zoteron datakansio.\n\nLuodaanko Zoteron tiedot tähän kansioon siitä huolimatta?
 dataDir.selectedDirEmpty.title=Directory Empty
 dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually move files from the existing data directory to the new location after %1$S has closed.
-dataDir.selectedDirEmpty.useNewDir=Use the new directory?
+dataDir.selectedDirEmpty.useNewDir=Käytetäänkö uutta hakemistoa?
 dataDir.moveFilesToNewLocation=Be sure to move files from your existing Zotero data directory to the new location before reopening %1$S.
 dataDir.incompatibleDbVersion.title=Incompatible Database Version
 dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
@@ -145,13 +146,13 @@ date.relative.daysAgo.multiple=%S päivää sitten
 date.relative.yearsAgo.one=1 vuosi sitten
 date.relative.yearsAgo.multiple=%S vuotta sitten
 
-pane.collections.delete.title=Delete Collection
+pane.collections.delete.title=Poista kokoelma
 pane.collections.delete=Haluatko varmasti poistaa valitun kokoelman?
 pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=Delete Collection and Items
-pane.collections.deleteWithItems=Are you sure you want to delete the selected collection and move all items within it to the Trash?
+pane.collections.deleteWithItems.title=Poista kokoelma ja nimikkeet
+pane.collections.deleteWithItems=Haluatko varmasti poistaa valitun kokoelman ja siirtää kaikki siihen kuuluvat nimikkeet roskakoriin?
 
-pane.collections.deleteSearch.title=Delete Search
+pane.collections.deleteSearch.title=Poista haku
 pane.collections.deleteSearch=Haluatko varmasti poistaa valitun haun?
 pane.collections.emptyTrash=Haluatko varmasti poistaa roskakorissa olevat nimikkeet pysyvästi?
 pane.collections.newCollection=Uusi kokoelma
@@ -168,9 +169,9 @@ pane.collections.duplicate=Kaksoiskappaleet
 
 pane.collections.menu.rename.collection=Nimeä kokoelma uudelleen...
 pane.collections.menu.edit.savedSearch=Muokkaa tallennettua hakua
-pane.collections.menu.delete.collection=Delete Collection…
-pane.collections.menu.delete.collectionAndItems=Delete Collection and Items…
-pane.collections.menu.delete.savedSearch=Delete Saved Search…
+pane.collections.menu.delete.collection=Poista kokoelma...
+pane.collections.menu.delete.collectionAndItems=Poista kokoelma ja nimikkeet..
+pane.collections.menu.delete.savedSearch=Poista tallennettu haku...
 pane.collections.menu.export.collection=Vie kokoelma...
 pane.collections.menu.export.savedSearch=Vie tallennettu haku...
 pane.collections.menu.createBib.collection=Luo kirjallisuusluettelo kokoelmasta...
@@ -192,7 +193,7 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Ladataan kohdeluettelo...
-pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.moreColumns=Lisää sarakkeita
 pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
@@ -204,8 +205,8 @@ pane.items.delete=Haluatko varmasti poistaa valitun kohteen?
 pane.items.delete.multiple=Haluatko varmasti poistaa valitut kohteet?
 pane.items.menu.remove=Poista valittu kohde
 pane.items.menu.remove.multiple=Poista valitut kohteet
-pane.items.menu.moveToTrash=Move Item to Trash…
-pane.items.menu.moveToTrash.multiple=Move Items to Trash…
+pane.items.menu.moveToTrash=Siirrä nimike roskakoriin...
+pane.items.menu.moveToTrash.multiple=Siirrä nimikkeet roskakoriin...
 pane.items.menu.export=Vie valittu kohde...
 pane.items.menu.export.multiple=Vie valitut kohteet...
 pane.items.menu.createBib=Luo kirjallisuusluettelo valitusta kohteesta...
@@ -266,9 +267,9 @@ pane.item.attachments.count.zero=%S liitettä:
 pane.item.attachments.count.singular=%S liite:
 pane.item.attachments.count.plural=%S liitettä:
 pane.item.attachments.select=Valitse tiedosto
-pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.title=PDF-työkaluja ei ole asennettu
 pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Search pane of the Zotero preferences.
-pane.item.attachments.filename=Filename
+pane.item.attachments.filename=Tiedostonimi
 pane.item.noteEditor.clickHere=napsauta tästä
 pane.item.tags.count.zero=%S merkkiä:
 pane.item.tags.count.singular=%S merkki:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Nimike tallennettu
 ingester.scrapeError=Nimikettä ei voitu tallentaa
 ingester.scrapeErrorDescription=Nimikkeen tallentamisessa tapahtui virhe. Katso %S, jos haluat tietää lisää.
-ingester.scrapeErrorDescription.linkText=Tunnetut sivustotulkkien ongelmat
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Tallennusprosessi epäonnistui aiemman Zoteron virheen vuoksi.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer-tuonti
@@ -515,7 +516,7 @@ db.integrityCheck.reportInForums=Voit ilmoittaa tästä ongelmasta Zoteron kesku
 zotero.preferences.update.updated=Päivitetty
 zotero.preferences.update.upToDate=Ajan tasalla
 zotero.preferences.update.error=Virhe
-zotero.preferences.launchNonNativeFiles=Open PDFs and other files within %S when possible
+zotero.preferences.launchNonNativeFiles=Avaa PDF:t ja muut tiedostot %S:n sisällä, jos mahdollista
 zotero.preferences.openurl.resolversFound.zero=%S linkkipalvelinta löytyi
 zotero.preferences.openurl.resolversFound.singular=%S linkkipalvelin löytyi
 zotero.preferences.openurl.resolversFound.plural=%S linkkipalvelinta löytyi
@@ -592,8 +593,8 @@ fileInterface.bibliographyGenerationError=Lähdeluetteloa luotaessa tapahtui vir
 fileInterface.exportError=Valittua tiedostoa vietäessä tapahtui virhe.
 
 quickSearch.mode.titleCreatorYear=Title, Creator, Year
-quickSearch.mode.fieldsAndTags=All Fields & Tags
-quickSearch.mode.everything=Everything
+quickSearch.mode.fieldsAndTags=Kaikki kentät ja avainsanat
+quickSearch.mode.everything=Kaikki
 
 advancedSearchMode=Tarkennettu haku — paina Enter etsiäksesi.
 searchInProgress=Haku käynnissä — odota hetki.
@@ -699,7 +700,7 @@ integration.cited.loading=Ladataan siteerattuja nimikkeitä...
 integration.ibid=mt
 integration.emptyCitationWarning.title=tyhjä sitaatti
 integration.emptyCitationWarning.body=Määrittelemäsi sitaatti olisi tyhjä valitussa tyylissä. Haluatko varmasti lisätä sen?
-integration.openInLibrary=Open in %S
+integration.openInLibrary=Avaa %S:ssä
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
 integration.error.incompatibleVersion2=Zotero %1$S edellytyksenä on %2$S %3$S tai uudempi. Lataa %2$S:n uusin versio osoitteesta zotero.org.
@@ -730,8 +731,8 @@ integration.citationChanged=Olet muokannut sitaatti sen jälkeen kuin Zotero gen
 integration.citationChanged.description=Jos painat "Kyllä", Zotero ei voi päivittää tätä sitaattia, vaikka lisäisi uusia sitaatteja, vaihtaisit tyylejä tai muokkaisit nimikettä, johon sitaatti viittaa. Jos painat "Ei", muutoksesi poistetaan.
 integration.citationChanged.edit=Olet muokannut tätä sitaattia sen jälkeen kun Zotero generoi sen. Muokkaaminen poistaa muutokset. Haluatko jatkaa?
 
-styles.install.title=Install Style
-styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
+styles.install.title=Asenna tyyli
+styles.install.unexpectedError=Odottamaton virhe "%1$S":n asennuksessa
 styles.installStyle=Asennetaanko tyyli "%1$S" lähteestä %2$S?
 styles.updateStyle=Päivitetäänkö aiempi tyyli "%1$S" tyylillä "%2$S" lähteestä %3$S?
 styles.installed=Tyyli "%S" asennettiin onnistuneesti.
@@ -741,11 +742,11 @@ styles.installSourceError=%1$S viittaa epäkelpoon tai olemattoon CSL-tiedostoon
 styles.deleteStyle=Haluatko varmasti poistaa tyylin "%1$S"?
 styles.deleteStyles=Haluatko varmasti poistaa valitut tyylit?
 
-styles.abbreviations.title=Load Abbreviations
+styles.abbreviations.title=Lataa lyhenteet
 styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
 styles.abbreviations.missingInfo=The abbreviations file "%1$S" does not specify a complete info block.
 
-sync.sync=Sync
+sync.sync=Synkronoi
 sync.cancel=Peruuta synkronointi
 sync.openSyncPreferences=Open Sync Preferences...
 sync.resetGroupAndSync=Resetoi ryhmä ja synkronointi
@@ -760,7 +761,7 @@ sync.error.passwordNotSet=Salasanaa ei määritetty
 sync.error.invalidLogin=Virheellinen käyttäjänimi tai salasana
 sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Anna salasana.
-sync.error.loginManagerInaccessible=Zotero cannot access your login information.
+sync.error.loginManagerInaccessible=Zotero ei saanut oikeuksia kirjautumistietoihisi.
 sync.error.checkMasterPassword=If you are using a master password in %S, make sure you have entered it successfully.
 sync.error.corruptedLoginManager=This could also be due to a corrupted %1$S login manager database. To check, close %1$S, remove signons.sqlite from your %1$S profile directory, and re-enter your Zotero login information in the Sync pane of the Zotero preferences.
 sync.error.loginManagerCorrupted1=Zotero cannot access your login information, possibly due to a corrupted %S login manager database.
@@ -826,8 +827,8 @@ sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%S kt jäljellä
 sync.storage.filesRemaining=%1$S/%2$S tiedostoa
 sync.storage.none=Ei mitään
-sync.storage.downloads=Downloads:
-sync.storage.uploads=Uploads:
+sync.storage.downloads=Vastaanotettu data:
+sync.storage.uploads=Lähetetty data:
 sync.storage.localFile=Paikallinen tiedosto
 sync.storage.remoteFile=Etätiedosto
 sync.storage.savedFile=Tallennettu tiedosto
@@ -898,11 +899,11 @@ proxies.recognized.add=Lisää välityspalvelin
 recognizePDF.noOCR=PDF-tiedosto ei sisällä OCRed-tekstiä.
 recognizePDF.couldNotRead=PDF-tiedoston tekstiä ei voi lukea.
 recognizePDF.noMatches=No matching references found
-recognizePDF.fileNotFound=File not found
+recognizePDF.fileNotFound=Tiedostoa ei löytynyt
 recognizePDF.limit=Google Scholar query limit reached. Try again later.
-recognizePDF.error=An unexpected error occurred.
-recognizePDF.stopped=Cancelled
-recognizePDF.complete.label=Metadata Retrieval Complete
+recognizePDF.error=Tapahtui odottamaton virhe.
+recognizePDF.stopped=Peruttu
+recognizePDF.complete.label=Metadata on haettu
 recognizePDF.cancelled.label=Metadata Retrieval Cancelled
 recognizePDF.close.label=Sulje
 recognizePDF.captcha.title=Please enter CAPTCHA
@@ -917,11 +918,11 @@ rtfScan.scannedFileSuffix=(Skannattu)
 
 
 file.accessError.theFile=The file '%S'
-file.accessError.aFile=A file
-file.accessError.cannotBe=cannot be
-file.accessError.created=created
-file.accessError.updated=updated
-file.accessError.deleted=deleted
+file.accessError.aFile=Tiedosto
+file.accessError.cannotBe=ei voi olla
+file.accessError.created=luotu
+file.accessError.updated=päivitetty
+file.accessError.deleted=poistettu
 file.accessError.message.windows=Check that the file is not currently in use, that its permissions allow write access, and that it has a valid filename.
 file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
 file.accessError.restart=Restarting your computer or disabling security software may also help.
diff --git a/chrome/locale/fr-FR/zotero/searchbox.dtd b/chrome/locale/fr-FR/zotero/searchbox.dtd
index 4a87b0312..0003516f4 100644
--- a/chrome/locale/fr-FR/zotero/searchbox.dtd
+++ b/chrome/locale/fr-FR/zotero/searchbox.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.search.name "Nom :">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "Chercher dans la bibliothèque :">
 
 <!ENTITY zotero.search.joinMode.prefix "Correspond">
 <!ENTITY zotero.search.joinMode.any "au moins à une">
diff --git a/chrome/locale/fr-FR/zotero/zotero.dtd b/chrome/locale/fr-FR/zotero/zotero.dtd
index f78c259f1..3af5c8bda 100644
--- a/chrome/locale/fr-FR/zotero/zotero.dtd
+++ b/chrome/locale/fr-FR/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Annuler">
 
 <!ENTITY zotero.errorReport.title "Rapport d'erreur Zotero">
-<!ENTITY zotero.errorReport.unrelatedMessages "Le journal des erreurs peut comprendre des messages sans rapport avec Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "Il peut y avoir des messages sans lien avec Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Veuillez patienter pendant la transmission du rapport d'erreur.">
 <!ENTITY zotero.errorReport.submitted "Le rapport d'erreur a été transmis.">
 <!ENTITY zotero.errorReport.reportID "ID du rapport :">
@@ -45,7 +45,7 @@
 <!ENTITY zotero.collections.showUnfiledItems "Afficher les documents sans collection">
 
 <!ENTITY zotero.items.itemType "Type de document">
-<!ENTITY zotero.items.type_column "Item Type">
+<!ENTITY zotero.items.type_column "Type de document">
 <!ENTITY zotero.items.title_column "Titre">
 <!ENTITY zotero.items.creator_column "Créateur">
 <!ENTITY zotero.items.date_column "Date">
diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties
index 473b7bfc6..963433a9b 100644
--- a/chrome/locale/fr-FR/zotero/zotero.properties
+++ b/chrome/locale/fr-FR/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Si vous recevez ce message à nouveau, redémarr
 errorReport.reportError=Rapporter l'erreur…
 errorReport.reportErrors=Rapport d'erreurs…
 errorReport.reportInstructions=Vous pouvez signaler cette erreur en sélectionnant "%S" du menu Actions (engrenages).
-errorReport.followingErrors=Les erreurs suivantes sont survenues depuis le démarrage %S :
-errorReport.advanceMessage=Appuyez sur %S pour envoyer un rapport d'erreur aux développeurs de Zotero.
+errorReport.followingReportWillBeSubmitted=Le rapport suivant va être transmis :
+errorReport.noErrorsLogged=Aucune erreur n'a été enregistrée depuis le démarrage de %S.
+errorReport.advanceMessage=Appuyez sur %S pour envoyer le rapport aux développeurs de Zotero.
 errorReport.stepsToReproduce=Étapes à reproduire :
 errorReport.expectedResult=Résultat attendu :
 errorReport.actualResult=Résultat obtenu :
@@ -192,8 +193,8 @@ tagColorChooser.numberKeyInstructions=Vous pouvez ajouter ce marqueur aux docume
 tagColorChooser.maxTags=Jusqu'à %S marqueurs dans chaque bibliothèque peuvent se voir attribuer une couleur.
 
 pane.items.loading=Chargement de la liste des objets…
-pane.items.columnChooser.moreColumns=More Columns
-pane.items.columnChooser.secondarySort=Secondary Sort (%S)
+pane.items.columnChooser.moreColumns=Plus de colonnes
+pane.items.columnChooser.secondarySort=Critère de tri secondaire (%S)
 pane.items.attach.link.uri.title=Joindre un lien vers l'URI
 pane.items.attach.link.uri=Saisissez une URI :
 pane.items.trash.title=Mettre à la corbeille
@@ -481,8 +482,8 @@ ingester.scraping=Enregistrement du document en cours…
 ingester.scrapingTo=Enregistrer dans
 ingester.scrapeComplete=Document enregistré
 ingester.scrapeError=Échec de l'enregistrement
-ingester.scrapeErrorDescription=Une erreur s'est produite lors de l'enregistrement de ce document. Veuillez consulter %s pour davantage de précisions.
-ingester.scrapeErrorDescription.linkText=Problèmes connus de collecteur
+ingester.scrapeErrorDescription=Une erreur s'est produite lors de l'enregistrement de ce document. Consultez %S pour davantage de précisions.
+ingester.scrapeErrorDescription.linkText=Résoudre les problèmes de convertisseur
 ingester.scrapeErrorDescription.previousError=Le processus de sauvegarde a échoué à cause d'une erreur antérieure de Zotero.
 
 ingester.importReferRISDialog.title=Importation RIS/Refer dans Zotero
diff --git a/chrome/locale/gl-ES/zotero/zotero.dtd b/chrome/locale/gl-ES/zotero/zotero.dtd
index d8aced210..43579e341 100644
--- a/chrome/locale/gl-ES/zotero/zotero.dtd
+++ b/chrome/locale/gl-ES/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancelar">
 
 <!ENTITY zotero.errorReport.title "Informe de erros de Zotero">
-<!ENTITY zotero.errorReport.unrelatedMessages "O rexistro de erros pode incluír mensaxes que non gardan relación con Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Espere mentres que se presenta o informe de erro.">
 <!ENTITY zotero.errorReport.submitted "Presentouse o informe de erro .">
 <!ENTITY zotero.errorReport.reportID "ID do informe:">
diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties
index d41ba86b3..16c461588 100644
--- a/chrome/locale/gl-ES/zotero/zotero.properties
+++ b/chrome/locale/gl-ES/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Reinicie o ordenador se continúa a recibir esta
 errorReport.reportError=Informar dun erro ...
 errorReport.reportErrors=Informar de erros ...
 errorReport.reportInstructions=Pode informar deste erro seleccionando «%S» no menú de accións.
-errorReport.followingErrors=Dende o inicio producíronse os seguintes erros %S:
-errorReport.advanceMessage=Prema %S para enviar un informe de erros aos desenvolvedores de Zotero.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Pasos a reproducir:
 errorReport.expectedResult=Resultado esperado:
 errorReport.actualResult=Resultado real:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Gardando en
 ingester.scrapeComplete=Gardouse o elemento
 ingester.scrapeError=Non se puido gardar o elemento
 ingester.scrapeErrorDescription=Produciuse un erro ao gardalo. Comprobe %S para obter máis información.
-ingester.scrapeErrorDescription.linkText=Problemas coñecidos en relación coa tradución
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=O proceso de gardado fallou debido a un erro previo de Zotero.
 
 ingester.importReferRISDialog.title=Importar RIS/Refer para Zotero
diff --git a/chrome/locale/he-IL/zotero/zotero.dtd b/chrome/locale/he-IL/zotero/zotero.dtd
index ba3bf9915..205e3adbe 100644
--- a/chrome/locale/he-IL/zotero/zotero.dtd
+++ b/chrome/locale/he-IL/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "The error log may include messages unrelated to Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Please wait while the error report is submitted.">
 <!ENTITY zotero.errorReport.submitted "Your error report has been submitted.">
 <!ENTITY zotero.errorReport.reportID "Report ID:">
diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties
index 92d519130..f63747ceb 100644
--- a/chrome/locale/he-IL/zotero/zotero.properties
+++ b/chrome/locale/he-IL/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=If you continue to receive this message, restart
 errorReport.reportError=Report Error...
 errorReport.reportErrors=Report Errors...
 errorReport.reportInstructions=You can report this error by selecting "%S" from the Actions (gear) menu.
-errorReport.followingErrors=The following errors have occurred since starting %S:
-errorReport.advanceMessage=Press %S to send an error report to the Zotero developers.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Steps to Reproduce:
 errorReport.expectedResult=Expected result:
 errorReport.actualResult=Actual result:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=פריט נשמר.
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
-ingester.scrapeErrorDescription.linkText=Known Translator Issues
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/hr-HR/zotero/zotero.dtd b/chrome/locale/hr-HR/zotero/zotero.dtd
index ddc6708e0..2ab55fcd8 100644
--- a/chrome/locale/hr-HR/zotero/zotero.dtd
+++ b/chrome/locale/hr-HR/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "The error log may include messages unrelated to Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Please wait while the error report is submitted.">
 <!ENTITY zotero.errorReport.submitted "Your error report has been submitted.">
 <!ENTITY zotero.errorReport.reportID "Report ID:">
diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties
index 93a3a8dd6..cbf110f11 100644
--- a/chrome/locale/hr-HR/zotero/zotero.properties
+++ b/chrome/locale/hr-HR/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=If you continue to receive this message, restart
 errorReport.reportError=Report Error...
 errorReport.reportErrors=Report Errors...
 errorReport.reportInstructions=You can report this error by selecting "%S" from the Actions (gear) menu.
-errorReport.followingErrors=The following errors have occurred since starting %S:
-errorReport.advanceMessage=Press %S to send an error report to the Zotero developers.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Steps to Reproduce:
 errorReport.expectedResult=Expected result:
 errorReport.actualResult=Actual result:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Item Saved
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
-ingester.scrapeErrorDescription.linkText=Known Translator Issues
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/hu-HU/zotero/about.dtd b/chrome/locale/hu-HU/zotero/about.dtd
index de33f46cd..60aa82d6a 100644
--- a/chrome/locale/hu-HU/zotero/about.dtd
+++ b/chrome/locale/hu-HU/zotero/about.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.version "verzió">
 <!ENTITY zotero.createdby "Létrehozta:">
-<!ENTITY zotero.director "Director:">
+<!ENTITY zotero.director "Igazgató:">
 <!ENTITY zotero.directors "Igazgatók:">
 <!ENTITY zotero.developers "Fejlesztők:">
 <!ENTITY zotero.alumni "Korábbi munkatársak:">
@@ -9,5 +9,5 @@
 <!ENTITY zotero.executiveProducer "Producer:">
 <!ENTITY zotero.thanks "Külön köszönet:">
 <!ENTITY zotero.about.close "Bezárás">
-<!ENTITY zotero.moreCreditsAndAcknowledgements "More Credits &amp; Acknowledgements">
-<!ENTITY zotero.citationProcessing "Citation &amp; Bibliography Processing">
+<!ENTITY zotero.moreCreditsAndAcknowledgements "További hozzájárulók és elismerések">
+<!ENTITY zotero.citationProcessing "Hivatkozás és bibliográfia feldolgozása">
diff --git a/chrome/locale/hu-HU/zotero/preferences.dtd b/chrome/locale/hu-HU/zotero/preferences.dtd
index 79879c539..1cf1d0aa8 100644
--- a/chrome/locale/hu-HU/zotero/preferences.dtd
+++ b/chrome/locale/hu-HU/zotero/preferences.dtd
@@ -3,43 +3,43 @@
 <!ENTITY zotero.preferences.default "Alapértelmezett">
 <!ENTITY zotero.preferences.items "elemek">
 <!ENTITY zotero.preferences.period ".">
-<!ENTITY zotero.preferences.settings "Settings">
+<!ENTITY zotero.preferences.settings "Beállítások">
 
 <!ENTITY zotero.preferences.prefpane.general "Általános">
 
 <!ENTITY zotero.preferences.userInterface "Felhasználói felület">
-<!ENTITY zotero.preferences.showIn "Load Zotero in:">
-<!ENTITY zotero.preferences.showIn.browserPane "Browser pane">
-<!ENTITY zotero.preferences.showIn.separateTab "Separate tab">
-<!ENTITY zotero.preferences.showIn.appTab "App tab">
+<!ENTITY zotero.preferences.showIn "Zotero futtatása:">
+<!ENTITY zotero.preferences.showIn.browserPane "Böngésző ablak">
+<!ENTITY zotero.preferences.showIn.separateTab "Új lap">
+<!ENTITY zotero.preferences.showIn.appTab "Lap rögzítése">
 <!ENTITY zotero.preferences.statusBarIcon "Ikon az állapotsorban:">
 <!ENTITY zotero.preferences.statusBarIcon.none "Egyik sem">
 <!ENTITY zotero.preferences.fontSize "Betűméret">
 <!ENTITY zotero.preferences.fontSize.small "Kicsi">
 <!ENTITY zotero.preferences.fontSize.medium "Közepes">
 <!ENTITY zotero.preferences.fontSize.large "Nagy">
-<!ENTITY zotero.preferences.fontSize.xlarge "X-Large">
+<!ENTITY zotero.preferences.fontSize.xlarge "Óriási">
 <!ENTITY zotero.preferences.fontSize.notes "Jegyzet betűmérete:">
 
 <!ENTITY zotero.preferences.miscellaneous "Egyéb">
-<!ENTITY zotero.preferences.autoUpdate "Automatically check for updated translators and styles">
+<!ENTITY zotero.preferences.autoUpdate "Fordítók- és stílusfrissítések automatikus ellenőrzése">
 <!ENTITY zotero.preferences.updateNow "Frissítés indítása">
 <!ENTITY zotero.preferences.reportTranslationFailure "Hibás adatkonverterek jelentése">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "A Zotero verziójának megfelelő tartalmak mutatása a zotero.org oldalon">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader.tooltip "Ha ez be van kapcsolva, a zotero.orgra küldött HTTP kérésekhez hozzáfűzi a Zotero verzióját.">
-<!ENTITY zotero.preferences.parseRISRefer "Use Zotero for downloaded BibTeX/RIS/Refer files">
+<!ENTITY zotero.preferences.parseRISRefer "A Zotero használata BibTeX/RIS/Refer fájlok letöltésére">
 <!ENTITY zotero.preferences.automaticSnapshots "Weboldalon alapuló elem létrehozásakor automatikus pillanatfelvétel készítése">
 <!ENTITY zotero.preferences.downloadAssociatedFiles "A kapcsolódó PDF és más fájlok automatikus csatolása">
 <!ENTITY zotero.preferences.automaticTags "Kulcsszavak és tárgyszavak automatikus hozzárendelése címkeként">
-<!ENTITY zotero.preferences.trashAutoEmptyDaysPre "Automatically remove items in the trash deleted more than">
-<!ENTITY zotero.preferences.trashAutoEmptyDaysPost "days ago">
+<!ENTITY zotero.preferences.trashAutoEmptyDaysPre "Automatikusan törölje a kukából azokat az elemeket, amelyek">
+<!ENTITY zotero.preferences.trashAutoEmptyDaysPost "napnál régebbiek">
 
 <!ENTITY zotero.preferences.groups "Csoportok">
 <!ENTITY zotero.preferences.groups.whenCopyingInclude "Amikor könyvtárak között másol elemeket, az alábbiakat másolja:">
 <!ENTITY zotero.preferences.groups.childNotes "kapcsolódó jegyzetek">
 <!ENTITY zotero.preferences.groups.childFiles "kapcsolódó pillanatfelvételek és importált fájlok">
 <!ENTITY zotero.preferences.groups.childLinks "kapcsolódó hivatkozások">
-<!ENTITY zotero.preferences.groups.tags "tags">
+<!ENTITY zotero.preferences.groups.tags "címkék">
 
 <!ENTITY zotero.preferences.openurl.caption "OpenURL">
 
@@ -55,21 +55,21 @@
 <!ENTITY zotero.preferences.sync.createAccount "Új felhasználói fiók">
 <!ENTITY zotero.preferences.sync.lostPassword "Elveszett jelszó?">
 <!ENTITY zotero.preferences.sync.syncAutomatically "Automatikus szinkronizálás">
-<!ENTITY zotero.preferences.sync.syncFullTextContent "Sync full-text content">
-<!ENTITY zotero.preferences.sync.syncFullTextContent.desc "Zotero can sync the full-text content of files in your Zotero libraries with zotero.org and other linked devices, allowing you to easily search for your files wherever you are. The full-text content of your files will not be shared publicly.">
-<!ENTITY zotero.preferences.sync.about "About Syncing">
+<!ENTITY zotero.preferences.sync.syncFullTextContent "Teljes szöveg szinkronizálása">
+<!ENTITY zotero.preferences.sync.syncFullTextContent.desc "A Zotero szinkronizálhatja a Zotero könyvtáraiban található fájlok teljes szövegét a zotero.org-gal és egyéb csatolt eszközökkel, lehetővé téve, hogy bárhol könnyedén keressen a fájljaira. A fájlok teljes szövege nem válik nyilvánossá.">
+<!ENTITY zotero.preferences.sync.about "Bővebben a szinkronizálásról">
 <!ENTITY zotero.preferences.sync.fileSyncing "Fájlok szinkronizálása">
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
 <!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "A könyvtáramban található fájlok szinkronizálása">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "A csoport könyvtárához tartozó fájlok szinkronizálása a Zotero tárhely használatával">
-<!ENTITY zotero.preferences.sync.fileSyncing.download "Download files">
-<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "at sync time">
-<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "as needed">
+<!ENTITY zotero.preferences.sync.fileSyncing.download "Fájlok letöltése">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "szinkronizáláskor">
+<!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "szükség szerint">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "A Zotero tárhely használata esetén elfogadom a">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "felhasználási feltételeket">
-<!ENTITY zotero.preferences.sync.reset.warning1 "The following operations are for use only in rare, specific situations and should not be used for general troubleshooting. In many cases, resetting will cause additional problems. See ">
+<!ENTITY zotero.preferences.sync.reset.warning1 "Az alábbi műveletek kizárólag ritka, egyedi esetekre valók, alkalmazásuk nem javasolt általános hibaelhárításra. A visszaállítás sok esetben további problémákat okoz. Lásd ">
 <!ENTITY zotero.preferences.sync.reset.warning2 "Sync Reset Options">
-<!ENTITY zotero.preferences.sync.reset.warning3 " for more information.">
+<!ENTITY zotero.preferences.sync.reset.warning3 " további információért.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Teljes szinkornizáció a Zotero szerverrel">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "A helyi adatok összefésülése a szerveren található adatokkal, a szinkronizációs előzmények figyelmen kívül hagyása.">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Visszaállítás a Zotero szerverről">
@@ -78,7 +78,7 @@
 <!ENTITY zotero.preferences.sync.reset.restoreToServer.desc "A szerveren található adatok törlése és frissítése a helyi adatokkal.">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory "A szinkronizációs előzmények törlése">
 <!ENTITY zotero.preferences.sync.reset.resetFileSyncHistory.desc "Valamennyi helyi csatolmány ellenőrzése a tárhely szerveren">
-<!ENTITY zotero.preferences.sync.reset "Reset">
+<!ENTITY zotero.preferences.sync.reset "Visszaállítás">
 <!ENTITY zotero.preferences.sync.reset.button "Visszaállítás">
 
 
@@ -106,34 +106,34 @@
 <!ENTITY zotero.preferences.quickCopy.copyAsHTML "Másolás HTML-ként">
 <!ENTITY zotero.preferences.quickCopy.macWarning "Megjegyzés: A formázás Mac OS X alatt elveszik.">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.setings "Weboldal-specifikus beállítások:">
-<!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath "Domain/Path">
+<!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath "Domén/Útvonal">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.domainPath.example "(pl: wikipedia.org)">
 <!ENTITY zotero.preferences.quickCopy.siteEditor.outputFormat "Kimeneti formátum">
 <!ENTITY zotero.preferences.quickCopy.dragLimit "A gyorsmásolás kikapcsolása, amikor az elemek száma több, mint">
 
-<!ENTITY zotero.preferences.prefpane.cite "Cite">
-<!ENTITY zotero.preferences.cite.styles "Styles">
-<!ENTITY zotero.preferences.cite.wordProcessors "Word Processors">
-<!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "No word processor plug-ins are currently installed.">
-<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "Get word processor plug-ins...">
+<!ENTITY zotero.preferences.prefpane.cite "Hivatkozás">
+<!ENTITY zotero.preferences.cite.styles "Stílusok">
+<!ENTITY zotero.preferences.cite.wordProcessors "Szövegszerkesztők">
+<!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "Nincs szövegszerkesztő plug-in telepítve">
+<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "Szövegszerkesztő plug-inek letöltése…">
 <!ENTITY zotero.preferences.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation_for_zotero_2.1">
-<!ENTITY zotero.preferences.cite.wordProcessors.useClassicAddCitationDialog "Use classic Add Citation dialog">
+<!ENTITY zotero.preferences.cite.wordProcessors.useClassicAddCitationDialog "A klasszikus Add Citation ablak használata">
 
-<!ENTITY zotero.preferences.cite.styles.styleManager "Style Manager">
-<!ENTITY zotero.preferences.cite.styles.styleManager.title "Title">
-<!ENTITY zotero.preferences.cite.styles.styleManager.updated "Updated">
+<!ENTITY zotero.preferences.cite.styles.styleManager "Stílus Kezelő">
+<!ENTITY zotero.preferences.cite.styles.styleManager.title "Cím">
+<!ENTITY zotero.preferences.cite.styles.styleManager.updated "Frissítve">
 <!ENTITY zotero.preferences.cite.styles.styleManager.csl "CSL">
 <!ENTITY zotero.preferences.export.getAdditionalStyles "További stílusok telepítése...">
 
 <!ENTITY zotero.preferences.prefpane.keys "Billentyűparancsok">
 
 <!ENTITY zotero.preferences.keys.openZotero "Zotero megnyitása/bezárása">
-<!ENTITY zotero.preferences.keys.saveToZotero "Save to Zotero (address bar icon)">
+<!ENTITY zotero.preferences.keys.saveToZotero "Mentés Zotero-ba (adress bar icon)">
 <!ENTITY zotero.preferences.keys.toggleFullscreen "Teljesképernyős üzemmód">
 <!ENTITY zotero.preferences.keys.focusLibrariesPane "Focus Libraries Pane">
 <!ENTITY zotero.preferences.keys.quicksearch "Gyorskeresés">
-<!ENTITY zotero.preferences.keys.newItem "Create a New Item">
-<!ENTITY zotero.preferences.keys.newNote "Create a New Note">
+<!ENTITY zotero.preferences.keys.newItem "Új elem létrehozása">
+<!ENTITY zotero.preferences.keys.newNote "Új jegyzet létrehozása">
 <!ENTITY zotero.preferences.keys.toggleTagSelector "Címkeválasztó mutatása/elrejtése">
 <!ENTITY zotero.preferences.keys.copySelectedItemCitationsToClipboard "Kiválasztott hivatkozás másolása a vágólapra">
 <!ENTITY zotero.preferences.keys.copySelectedItemsToClipboard "Kiválasztott elemek másolása a vágólapra">
@@ -147,8 +147,8 @@
 <!ENTITY zotero.preferences.proxies.desc_link "proxy leírást">
 <!ENTITY zotero.preferences.proxies.desc_after_link "további információkért.">
 <!ENTITY zotero.preferences.proxies.transparent "Emlékezzen a proxyn keresztül megtekintett erőforrásokra">
-<!ENTITY zotero.preferences.proxies.autoRecognize "Automatically recognize proxied resources">
-<!ENTITY zotero.preferences.proxies.disableByDomain "Disable proxy redirection when my domain name contains ">
+<!ENTITY zotero.preferences.proxies.autoRecognize "Proxy-források automatikus felismerése">
+<!ENTITY zotero.preferences.proxies.disableByDomain "Proxy átirányítás tiltása, ha a domén nevem tartalmaz">
 <!ENTITY zotero.preferences.proxies.configured "Proxyk">
 <!ENTITY zotero.preferences.proxies.hostname "Host neve">
 <!ENTITY zotero.preferences.proxies.scheme "Séma">
@@ -163,15 +163,15 @@
 <!ENTITY zotero.preferences.proxies.a_variable "&#37;a - Bármilyen szöveg">
 
 <!ENTITY zotero.preferences.prefpane.advanced "Haladó">
-<!ENTITY zotero.preferences.advanced.filesAndFolders "Files and Folders">
+<!ENTITY zotero.preferences.advanced.filesAndFolders "Fájlok és mappák">
 
-<!ENTITY zotero.preferences.prefpane.locate "Locate">
+<!ENTITY zotero.preferences.prefpane.locate "Elhelyezni">
 <!ENTITY zotero.preferences.locate.locateEngineManager "Article Lookup Engine Manager">
-<!ENTITY zotero.preferences.locate.description "Description">
-<!ENTITY zotero.preferences.locate.name "Name">
+<!ENTITY zotero.preferences.locate.description "Leírás">
+<!ENTITY zotero.preferences.locate.name "Név">
 <!ENTITY zotero.preferences.locate.locateEnginedescription "A Lookup Engine extends the capability of the Locate drop down in the Info pane. By enabling Lookup Engines in the list below they will be added to the drop down and can be used to locate resources from your library on the web.">
 <!ENTITY zotero.preferences.locate.addDescription "To add a Lookup Engine that is not on the list, visit the desired search engine in your browser and select 'Add' from the Firefox Search Bar. When you reopen this preference pane you will have the option to enable the new Lookup Engine.">
-<!ENTITY zotero.preferences.locate.restoreDefaults "Restore Defaults">
+<!ENTITY zotero.preferences.locate.restoreDefaults "Visszaállítás alapértelmezettre">
 
 <!ENTITY zotero.preferences.charset "Karakterkódolás">
 <!ENTITY zotero.preferences.charset.importCharset "Karakterkódolás importálása">
@@ -184,10 +184,10 @@
 <!ENTITY zotero.preferences.dataDir.reveal "Az adatkönyvtár mutatása">
 
 <!ENTITY zotero.preferences.attachmentBaseDir.caption "Linked Attachment Base Directory">
-<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
-<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Base directory:">
-<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Choose…">
-<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Revert to Absolute Paths…">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "A Zotero relatív útvonalakat használ a csatolt fájlokhoz az alap könyvtáron belül , ezzel elérhetővé teszi a fájlokat különböző számítógépeken, amennyiben a fájlszerkezet az alap könyvtárban változatlan.">
+<!ENTITY zotero.preferences.attachmentBaseDir.basePath "Alap könyvtár:">
+<!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Tallózás…">
+<!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Visszavonás…">
 
 <!ENTITY zotero.preferences.dbMaintenance "Adatbázis karbantartás">
 <!ENTITY zotero.preferences.dbMaintenance.integrityCheck "Az adatbázis integritásának ellenőrzése">
@@ -203,7 +203,7 @@
 <!ENTITY zotero.preferences.debugOutputLogging.clearOutput "Output törlése">
 <!ENTITY zotero.preferences.debugOutputLogging.submitToServer "Elküldés a Zotero szervernek">
 
-<!ENTITY zotero.preferences.openAboutConfig "Open about:config">
-<!ENTITY zotero.preferences.openCSLEdit "Open CSL Editor">
-<!ENTITY zotero.preferences.openCSLPreview "Open CSL Preview">
-<!ENTITY zotero.preferences.openAboutMemory "Open about:memory">
+<!ENTITY zotero.preferences.openAboutConfig "Az about:config megnyitása">
+<!ENTITY zotero.preferences.openCSLEdit "CSL Szerkesztő megnyitása">
+<!ENTITY zotero.preferences.openCSLPreview "CSL előnézet megnyitása">
+<!ENTITY zotero.preferences.openAboutMemory "Az about:memory megnyitása">
diff --git a/chrome/locale/hu-HU/zotero/searchbox.dtd b/chrome/locale/hu-HU/zotero/searchbox.dtd
index bc2c3d3f2..581a88d2e 100644
--- a/chrome/locale/hu-HU/zotero/searchbox.dtd
+++ b/chrome/locale/hu-HU/zotero/searchbox.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.search.name "Név:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "Keresés könyvtárban:">
 
 <!ENTITY zotero.search.joinMode.prefix "Találat">
 <!ENTITY zotero.search.joinMode.any "bármelyik">
@@ -13,7 +13,7 @@
 
 <!ENTITY zotero.search.textModes.phrase "Kifejezés">
 <!ENTITY zotero.search.textModes.phraseBinary "Kifejezés (bináris állományokban is)">
-<!ENTITY zotero.search.textModes.regexp "Regexp">
+<!ENTITY zotero.search.textModes.regexp "Reguláris kifejezés">
 <!ENTITY zotero.search.textModes.regexpCS "Regexp (kis és nagybetűk megkülönböztetése)">
 
 <!ENTITY zotero.search.date.units.days "nap">
diff --git a/chrome/locale/hu-HU/zotero/standalone.dtd b/chrome/locale/hu-HU/zotero/standalone.dtd
index f65b337ff..d44db64da 100644
--- a/chrome/locale/hu-HU/zotero/standalone.dtd
+++ b/chrome/locale/hu-HU/zotero/standalone.dtd
@@ -1,101 +1,101 @@
-<!ENTITY preferencesCmdMac.label "Preferences…">
+<!ENTITY preferencesCmdMac.label "Beállítások…">
 <!ENTITY preferencesCmdMac.commandkey ",">
-<!ENTITY servicesMenuMac.label "Services">
-<!ENTITY hideThisAppCmdMac.label "Hide &brandShortName;">
+<!ENTITY servicesMenuMac.label "Szolgáltatások">
+<!ENTITY hideThisAppCmdMac.label "Névjegy elrejtése;">
 <!ENTITY hideThisAppCmdMac.commandkey "H">
-<!ENTITY hideOtherAppsCmdMac.label "Hide Others">
+<!ENTITY hideOtherAppsCmdMac.label "A többi elrejtése">
 <!ENTITY hideOtherAppsCmdMac.commandkey "H">
-<!ENTITY showAllAppsCmdMac.label "Show All">
-<!ENTITY quitApplicationCmdMac.label "Quit Zotero">
+<!ENTITY showAllAppsCmdMac.label "Összes megjelenítése">
+<!ENTITY quitApplicationCmdMac.label "Zotero bezárása">
 <!ENTITY quitApplicationCmdMac.key "Q">
 
 
-<!ENTITY fileMenu.label "File">
+<!ENTITY fileMenu.label "Fájl">
 <!ENTITY fileMenu.accesskey "F">
-<!ENTITY saveCmd.label "Save…">
+<!ENTITY saveCmd.label "Mentés…">
 <!ENTITY saveCmd.key "S">
 <!ENTITY saveCmd.accesskey "A">
-<!ENTITY pageSetupCmd.label "Page Setup…">
-<!ENTITY pageSetupCmd.accesskey "U">
-<!ENTITY printCmd.label "Print…">
+<!ENTITY pageSetupCmd.label "Oldalbeállítások…">
+<!ENTITY pageSetupCmd.accesskey "F">
+<!ENTITY printCmd.label "Nyomtatás…">
 <!ENTITY printCmd.key "P">
 <!ENTITY printCmd.accesskey "P">
-<!ENTITY closeCmd.label "Close">
+<!ENTITY closeCmd.label "Bezárás">
 <!ENTITY closeCmd.key "W">
-<!ENTITY closeCmd.accesskey "C">
-<!ENTITY quitApplicationCmdWin.label "Exit">
+<!ENTITY closeCmd.accesskey "B">
+<!ENTITY quitApplicationCmdWin.label "Kilépés">
 <!ENTITY quitApplicationCmdWin.accesskey "x">
-<!ENTITY quitApplicationCmd.label "Quit">
+<!ENTITY quitApplicationCmd.label "Bezárás">
 <!ENTITY quitApplicationCmd.accesskey "Q">
 
 
-<!ENTITY editMenu.label "Edit">
-<!ENTITY editMenu.accesskey "E">
-<!ENTITY undoCmd.label "Undo">
+<!ENTITY editMenu.label "Szerkesztés">
+<!ENTITY editMenu.accesskey "S">
+<!ENTITY undoCmd.label "Visszavonás">
 <!ENTITY undoCmd.key "Z">
-<!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Redo">
+<!ENTITY undoCmd.accesskey "F">
+<!ENTITY redoCmd.label "Mégis">
 <!ENTITY redoCmd.key "Y">
 <!ENTITY redoCmd.accesskey "R">
-<!ENTITY cutCmd.label "Cut">
+<!ENTITY cutCmd.label "Kivágás">
 <!ENTITY cutCmd.key "X">
 <!ENTITY cutCmd.accesskey "t">
-<!ENTITY copyCmd.label "Copy">
+<!ENTITY copyCmd.label "Másolás">
 <!ENTITY copyCmd.key "C">
 <!ENTITY copyCmd.accesskey "C">
-<!ENTITY copyCitationCmd.label "Copy Citation">
-<!ENTITY copyBibliographyCmd.label "Copy Bibliography">
-<!ENTITY pasteCmd.label "Paste">
+<!ENTITY copyCitationCmd.label "Hivatkozás másolása">
+<!ENTITY copyBibliographyCmd.label "Bibliográfia másolása">
+<!ENTITY pasteCmd.label "Beillesztés">
 <!ENTITY pasteCmd.key "V">
 <!ENTITY pasteCmd.accesskey "P">
-<!ENTITY deleteCmd.label "Delete">
+<!ENTITY deleteCmd.label "Törlés">
 <!ENTITY deleteCmd.key "D">
 <!ENTITY deleteCmd.accesskey "D">
-<!ENTITY selectAllCmd.label "Select All">
+<!ENTITY selectAllCmd.label "Mindet kijelöli">
 <!ENTITY selectAllCmd.key "A">
 <!ENTITY selectAllCmd.accesskey "A">
-<!ENTITY preferencesCmd.label "Preferences">
+<!ENTITY preferencesCmd.label "Beállítások">
 <!ENTITY preferencesCmd.accesskey "O">
-<!ENTITY preferencesCmdUnix.label "Preferences">
+<!ENTITY preferencesCmdUnix.label "Beállítások">
 <!ENTITY preferencesCmdUnix.accesskey "n">
-<!ENTITY findCmd.label "Find">
+<!ENTITY findCmd.label "Keresés">
 <!ENTITY findCmd.accesskey "F">
 <!ENTITY findCmd.commandkey "f">
-<!ENTITY bidiSwitchPageDirectionItem.label "Switch Page Direction">
+<!ENTITY bidiSwitchPageDirectionItem.label "Oldal irányának megfordítása">
 <!ENTITY bidiSwitchPageDirectionItem.accesskey "g">
-<!ENTITY bidiSwitchTextDirectionItem.label "Switch Text Direction">
+<!ENTITY bidiSwitchTextDirectionItem.label "Szöveg irányának megfordítása">
 <!ENTITY bidiSwitchTextDirectionItem.accesskey "w">
 <!ENTITY bidiSwitchTextDirectionItem.commandkey "X">
 
 
-<!ENTITY toolsMenu.label "Tools">
-<!ENTITY toolsMenu.accesskey "T">
-<!ENTITY addons.label "Add-ons">
+<!ENTITY toolsMenu.label "Eszközök">
+<!ENTITY toolsMenu.accesskey "E">
+<!ENTITY addons.label "Kiegészítők">
 
 
 <!ENTITY minimizeWindow.key "m">
-<!ENTITY minimizeWindow.label "Minimize">
-<!ENTITY bringAllToFront.label "Bring All to Front">
-<!ENTITY zoomWindow.label "Zoom">
-<!ENTITY windowMenu.label "Window">
+<!ENTITY minimizeWindow.label "Kis méret">
+<!ENTITY bringAllToFront.label "Mindet előrehozni">
+<!ENTITY zoomWindow.label "Nagyítás">
+<!ENTITY windowMenu.label "Ablak">
 
 
-<!ENTITY helpMenu.label "Help">
-<!ENTITY helpMenu.accesskey "H">
+<!ENTITY helpMenu.label "Súgó">
+<!ENTITY helpMenu.accesskey "S">
 
 
-<!ENTITY helpMenuWin.label "Help">
-<!ENTITY helpMenuWin.accesskey "H">
+<!ENTITY helpMenuWin.label "Súgó">
+<!ENTITY helpMenuWin.accesskey "S">
 <!ENTITY helpMac.commandkey "?">
-<!ENTITY aboutProduct.label "About &brandShortName;">
-<!ENTITY aboutProduct.accesskey "A">
-<!ENTITY productHelp.label "Support and Documentation">
+<!ENTITY aboutProduct.label "Névjegy">
+<!ENTITY aboutProduct.accesskey "N">
+<!ENTITY productHelp.label "Támogatás és dokumentáció">
 <!ENTITY productHelp.accesskey "D">
-<!ENTITY helpTroubleshootingInfo.label "Troubleshooting Information">
+<!ENTITY helpTroubleshootingInfo.label "Hibaelhárítás">
 <!ENTITY helpTroubleshootingInfo.accesskey "T">
-<!ENTITY helpFeedbackPage.label "Submit Feedback…">
+<!ENTITY helpFeedbackPage.label "Visszajelzés küldése…">
 <!ENTITY helpFeedbackPage.accesskey "S">
-<!ENTITY helpReportErrors.label "Report Errors to Zotero…">
+<!ENTITY helpReportErrors.label "Hiba jelentése a Zotero-nak…">
 <!ENTITY helpReportErrors.accesskey "R">
-<!ENTITY helpCheckForUpdates.label "Check for Updates…">
-<!ENTITY helpCheckForUpdates.accesskey "U">
+<!ENTITY helpCheckForUpdates.label "Frissítések keresése…">
+<!ENTITY helpCheckForUpdates.accesskey "F">
diff --git a/chrome/locale/hu-HU/zotero/timeline.properties b/chrome/locale/hu-HU/zotero/timeline.properties
index a61a3b424..451381dc9 100644
--- a/chrome/locale/hu-HU/zotero/timeline.properties
+++ b/chrome/locale/hu-HU/zotero/timeline.properties
@@ -1,5 +1,5 @@
 general.title=Zotero kronológia
-general.filter=Filter:
+general.filter=Szürő:
 general.highlight=Kiemelés:
 general.clearAll=Összes törlése
 general.jumpToYear=Évre ugrás:
diff --git a/chrome/locale/hu-HU/zotero/zotero.dtd b/chrome/locale/hu-HU/zotero/zotero.dtd
index fed504ff0..3cc739040 100644
--- a/chrome/locale/hu-HU/zotero/zotero.dtd
+++ b/chrome/locale/hu-HU/zotero/zotero.dtd
@@ -5,17 +5,17 @@
 <!ENTITY zotero.general.edit "Szerkesztés">
 <!ENTITY zotero.general.delete "Törlés">
 <!ENTITY zotero.general.ok "OK">
-<!ENTITY zotero.general.cancel "Cancel">
+<!ENTITY zotero.general.cancel "Mégse">
 
-<!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "A hibanapló a Zoterohoz nem kapcsolódó bejegyzéseket is tartalmazhat">
+<!ENTITY zotero.errorReport.title "Zotero hibajelentés">
+<!ENTITY zotero.errorReport.unrelatedMessages "Tartalmazhat a Zotero-tól független üzeneteket.">
 <!ENTITY zotero.errorReport.submissionInProgress "Várjon a hibajelentés elküldéséig.">
 <!ENTITY zotero.errorReport.submitted "A hibajelentés elküldve.">
 <!ENTITY zotero.errorReport.reportID "Jelentés azonosítója:">
 <!ENTITY zotero.errorReport.postToForums "Küldje el a Zotero fórumba (forums.zotero.hu) a probléma leírását, hogy hogyan jutott idáig, ill. a hibaüzenet ID-jét .">
 <!ENTITY zotero.errorReport.notReviewed "A fórumba be nem küldött hibaüzenetek nem kerülnek kivizsgálásra.">
 
-<!ENTITY zotero.upgrade.title "Zotero Upgrade Wizard">
+<!ENTITY zotero.upgrade.title "Zotero frissítés varázsló">
 <!ENTITY zotero.upgrade.newVersionInstalled "A Zotero új verziójának telepítése sikerült.">
 <!ENTITY zotero.upgrade.upgradeRequired "Frissíteni kell a Zotero adatbázist, hogy működjön az új verzióval.">
 <!ENTITY zotero.upgrade.autoBackup "Az adatbázisról a módosítás előtt biztonsági másolat készül.">
@@ -42,10 +42,10 @@
 <!ENTITY zotero.notes.separate "Szerkesztés külön ablakban">
 
 <!ENTITY zotero.toolbar.duplicate.label "Duplumok listázása">
-<!ENTITY zotero.collections.showUnfiledItems "Show Unfiled Items">
+<!ENTITY zotero.collections.showUnfiledItems "Besorolatlan elemek mutatása">
 
-<!ENTITY zotero.items.itemType "Item Type">
-<!ENTITY zotero.items.type_column "Item Type">
+<!ENTITY zotero.items.itemType "Forrás típusa">
+<!ENTITY zotero.items.type_column "Forrás típusa">
 <!ENTITY zotero.items.title_column "Cím">
 <!ENTITY zotero.items.creator_column "Létrehozó">
 <!ENTITY zotero.items.date_column "Dátum">
@@ -55,26 +55,26 @@
 <!ENTITY zotero.items.journalAbbr_column "Rövidített cím">
 <!ENTITY zotero.items.language_column "Nyelv">
 <!ENTITY zotero.items.accessDate_column "Hozzáférés dátuma">
-<!ENTITY zotero.items.libraryCatalog_column "Library Catalog">
+<!ENTITY zotero.items.libraryCatalog_column "Könyvtár Katalógus">
 <!ENTITY zotero.items.callNumber_column "Raktári jelzet">
 <!ENTITY zotero.items.rights_column "Jogok">
 <!ENTITY zotero.items.dateAdded_column "Hozzáadás dátuma">
 <!ENTITY zotero.items.dateModified_column "Módosítás dátuma">
 <!ENTITY zotero.items.extra_column "Extra">
-<!ENTITY zotero.items.archive_column "Archive">
+<!ENTITY zotero.items.archive_column "Archívum">
 <!ENTITY zotero.items.archiveLocation_column "Loc. in Archive">
-<!ENTITY zotero.items.place_column "Place">
-<!ENTITY zotero.items.volume_column "Volume">
-<!ENTITY zotero.items.edition_column "Edition">
-<!ENTITY zotero.items.pages_column "Pages">
-<!ENTITY zotero.items.issue_column "Issue">
-<!ENTITY zotero.items.series_column "Series">
-<!ENTITY zotero.items.seriesTitle_column "Series Title">
+<!ENTITY zotero.items.place_column "Hely">
+<!ENTITY zotero.items.volume_column "Kötet">
+<!ENTITY zotero.items.edition_column "Kiadás">
+<!ENTITY zotero.items.pages_column "Oldalak">
+<!ENTITY zotero.items.issue_column "Szám">
+<!ENTITY zotero.items.series_column "Sorozat">
+<!ENTITY zotero.items.seriesTitle_column "Sorozat címe">
 <!ENTITY zotero.items.court_column "Court">
-<!ENTITY zotero.items.medium_column "Medium/Format">
-<!ENTITY zotero.items.genre_column "Genre">
-<!ENTITY zotero.items.system_column "System">
-<!ENTITY zotero.items.moreColumns.label "More Columns">
+<!ENTITY zotero.items.medium_column "Közepes/Formátum">
+<!ENTITY zotero.items.genre_column "Műfaj">
+<!ENTITY zotero.items.system_column "Rendszer">
+<!ENTITY zotero.items.moreColumns.label "Több oszlop">
 <!ENTITY zotero.items.restoreColumnOrder.label "Restore Column Order">
 
 <!ENTITY zotero.items.menu.showInLibrary "Megjelenítés a könyvtárban">
@@ -82,13 +82,13 @@
 <!ENTITY zotero.items.menu.attach "Csatolmány hozzáadása">
 <!ENTITY zotero.items.menu.attach.snapshot "Az aktuális oldal csatolása pillanatfelvételként">
 <!ENTITY zotero.items.menu.attach.link "Az aktuális oldal csatolása hivatkozásként">
-<!ENTITY zotero.items.menu.attach.link.uri "Attach Link to URI…">
+<!ENTITY zotero.items.menu.attach.link.uri "Link csatolása az URI-hez…">
 <!ENTITY zotero.items.menu.attach.file "Helyben tárolt példány csatolása">
 <!ENTITY zotero.items.menu.attach.fileLink "Fájlra mutató hivatkozás csatolása">
 
-<!ENTITY zotero.items.menu.restoreToLibrary "Restore to Library">
+<!ENTITY zotero.items.menu.restoreToLibrary "Visszaállítás könyvtárba">
 <!ENTITY zotero.items.menu.duplicateItem "Kiválasztott elem duplikálása">
-<!ENTITY zotero.items.menu.mergeItems "Merge Items…">
+<!ENTITY zotero.items.menu.mergeItems "Elemek összefésülése…">
 
 <!ENTITY zotero.duplicatesMerge.versionSelect "Choose the version of the item to use as the master item:">
 <!ENTITY zotero.duplicatesMerge.fieldSelect "Select fields to keep from other versions of the item:">
@@ -122,12 +122,12 @@
 <!ENTITY zotero.item.attachment.file.show "Fájl mutatása">
 <!ENTITY zotero.item.textTransform "Szöveg átalakítása">
 <!ENTITY zotero.item.textTransform.titlecase "Szókezdő">
-<!ENTITY zotero.item.textTransform.sentencecase "Sentence case">
-<!ENTITY zotero.item.creatorTransform.nameSwap "Swap first/last names">
+<!ENTITY zotero.item.textTransform.sentencecase "Mondatkezdő">
+<!ENTITY zotero.item.creatorTransform.nameSwap "Keresztnév/vezetéknév felcserélése">
 
-<!ENTITY zotero.toolbar.newNote "New Note">
+<!ENTITY zotero.toolbar.newNote "Új jegyzet">
 <!ENTITY zotero.toolbar.note.standalone "Új önálló jegyzet">
-<!ENTITY zotero.toolbar.note.child "Add Child Note">
+<!ENTITY zotero.toolbar.note.child "Aljegyzet hozzáadása">
 <!ENTITY zotero.toolbar.lookup "Keresés azonosító alapján...">
 <!ENTITY zotero.toolbar.attachment.linked "Fájlra mutató hivatkozás...">
 <!ENTITY zotero.toolbar.attachment.add "Helyi másolat tárolása...">
@@ -146,13 +146,13 @@
 <!ENTITY zotero.tagSelector.deleteTag "Címke törlése...">
 
 <!ENTITY zotero.tagColorChooser.title "Choose a Tag Color and Position">
-<!ENTITY zotero.tagColorChooser.color "Color:">
-<!ENTITY zotero.tagColorChooser.position "Position:">
-<!ENTITY zotero.tagColorChooser.setColor "Set Color">
-<!ENTITY zotero.tagColorChooser.removeColor "Remove Color">
+<!ENTITY zotero.tagColorChooser.color "Szín:">
+<!ENTITY zotero.tagColorChooser.position "Helyzet:">
+<!ENTITY zotero.tagColorChooser.setColor "Szín beállítása">
+<!ENTITY zotero.tagColorChooser.removeColor "Szín eltávolítása">
 
 <!ENTITY zotero.lookup.description "Adja meg az ISBN, DOI vagy PMID azonosítót az alábbi dobozban.">
-<!ENTITY zotero.lookup.button.search "Search">
+<!ENTITY zotero.lookup.button.search "Keresés">
 
 <!ENTITY zotero.selectitems.title "Elemek kiválasztása">
 <!ENTITY zotero.selectitems.intro.label "A könyvtárhoz hozzáadni kíván elemek kiválasztása">
@@ -172,7 +172,7 @@
 <!ENTITY zotero.integration.docPrefs.title "Dokumentum beállításai">
 <!ENTITY zotero.integration.addEditCitation.title "Hivatkozás hozzáadása/szerkesztése">
 <!ENTITY zotero.integration.editBibliography.title "Bibliográfia szerkesztése">
-<!ENTITY zotero.integration.quickFormatDialog.title "Quick Format Citation">
+<!ENTITY zotero.integration.quickFormatDialog.title "Hivatkozás gyorsformázása">
 
 <!ENTITY zotero.progress.title "Folyamatban">
 
@@ -220,8 +220,8 @@
 <!ENTITY zotero.integration.prefs.storeReferences.label "Store references in document">
 <!ENTITY zotero.integration.prefs.storeReferences.caption "Storing references in your document slightly increases file size, but will allow you to share your document with others without using a Zotero group. Zotero 3.0 or later is required to update documents created with this option.">
 
-<!ENTITY zotero.integration.showEditor.label "Show Editor">
-<!ENTITY zotero.integration.classicView.label "Classic View">
+<!ENTITY zotero.integration.showEditor.label "Editor megjelenítése">
+<!ENTITY zotero.integration.classicView.label "Klasszikus nézet">
 
 <!ENTITY zotero.integration.references.label "Hivatkozások a bibliográfiában">
 
@@ -248,39 +248,39 @@
 <!ENTITY zotero.proxy.recognized.title "Proxy felismerve">
 <!ENTITY zotero.proxy.recognized.warning "Only add proxies linked from your library, school, or corporate website">
 <!ENTITY zotero.proxy.recognized.warning.secondary "Adding other proxies allows malicious sites to masquerade as sites you trust.">
-<!ENTITY zotero.proxy.recognized.disable.label "Do not automatically redirect requests through previously recognized proxies">
-<!ENTITY zotero.proxy.recognized.ignore.label "Ignore">
+<!ENTITY zotero.proxy.recognized.disable.label "Ne irányítsa át automatikusan a kéréseket az előzőleg felismert proxyikra.">
+<!ENTITY zotero.proxy.recognized.ignore.label "Elutasít">
 
-<!ENTITY zotero.recognizePDF.recognizing.label "Retrieving Metadata...">
-<!ENTITY zotero.recognizePDF.cancel.label "Cancel">
-<!ENTITY zotero.recognizePDF.pdfName.label "PDF Name">
-<!ENTITY zotero.recognizePDF.itemName.label "Item Name">
+<!ENTITY zotero.recognizePDF.recognizing.label "Metaadatok kigyűjtése...">
+<!ENTITY zotero.recognizePDF.cancel.label "Mégse">
+<!ENTITY zotero.recognizePDF.pdfName.label "PDF neve">
+<!ENTITY zotero.recognizePDF.itemName.label "Elem neve">
 
-<!ENTITY zotero.rtfScan.title "RTF Scan">
-<!ENTITY zotero.rtfScan.cancel.label "Cancel">
-<!ENTITY zotero.rtfScan.citation.label "Citation">
-<!ENTITY zotero.rtfScan.itemName.label "Item Name">
-<!ENTITY zotero.rtfScan.unmappedCitations.label "Unmapped Citations">
-<!ENTITY zotero.rtfScan.ambiguousCitations.label "Ambiguous Citations">
-<!ENTITY zotero.rtfScan.mappedCitations.label "Mapped Citations">
-<!ENTITY zotero.rtfScan.introPage.label "Introduction">
-<!ENTITY zotero.rtfScan.introPage.description "Zotero can automatically extract and reformat citations and insert a bibliography into RTF files. The RTF Scan feature currently supports citations in variations upon the following formats:">
-<!ENTITY zotero.rtfScan.introPage.description2 "To get started, select an RTF input file and an output file below:">
-<!ENTITY zotero.rtfScan.scanPage.label "Scanning for Citations">
-<!ENTITY zotero.rtfScan.scanPage.description "Zotero is scanning your document for citations. Please be patient.">
-<!ENTITY zotero.rtfScan.citationsPage.label "Verify Cited Items">
+<!ENTITY zotero.rtfScan.title "RTF átvizsgálása…">
+<!ENTITY zotero.rtfScan.cancel.label "Mégse">
+<!ENTITY zotero.rtfScan.citation.label "Hivatkozás">
+<!ENTITY zotero.rtfScan.itemName.label "Elem neve">
+<!ENTITY zotero.rtfScan.unmappedCitations.label "Nem felismert hivatkozások">
+<!ENTITY zotero.rtfScan.ambiguousCitations.label "Bizonytalan hivatkozások">
+<!ENTITY zotero.rtfScan.mappedCitations.label "Felismert">
+<!ENTITY zotero.rtfScan.introPage.label "Bevezetés">
+<!ENTITY zotero.rtfScan.introPage.description "A Zotero automatikusan képes kinyerni és újraformázni a hivatkozásokat és bibliográfiát beilleszteni RTF fájlokba. Az RTF Scan jelenleg az alábbi formátumokban támogatja a hivatkozásokat:">
+<!ENTITY zotero.rtfScan.introPage.description2 "A kezdéshez, válasszon egy RTF bemeneti fájlt és egy kimenti fájlt alább:">
+<!ENTITY zotero.rtfScan.scanPage.label "Hivatkozások keresése">
+<!ENTITY zotero.rtfScan.scanPage.description "A Zotero hivatkozásokat keres a dokumentumban. Kérem várjon.">
+<!ENTITY zotero.rtfScan.citationsPage.label "Hivatkozott elemek ellenőrzése">
 <!ENTITY zotero.rtfScan.citationsPage.description "Please review the list of recognized citations below to ensure that Zotero has selected the corresponding items correctly. Any unmapped or ambiguous citations must be resolved before proceeding to the next step.">
-<!ENTITY zotero.rtfScan.stylePage.label "Document Formatting">
-<!ENTITY zotero.rtfScan.formatPage.label "Formatting Citations">
-<!ENTITY zotero.rtfScan.formatPage.description "Zotero is processing and formatting your RTF file. Please be patient.">
-<!ENTITY zotero.rtfScan.completePage.label "RTF Scan Complete">
+<!ENTITY zotero.rtfScan.stylePage.label "Dokumentum formázása">
+<!ENTITY zotero.rtfScan.formatPage.label "Hivatkozás formázása">
+<!ENTITY zotero.rtfScan.formatPage.description "A Zotero feldolgozza és formázza az RTF fájlt. Kérem várjon.">
+<!ENTITY zotero.rtfScan.completePage.label "Az RTF átvizsgálása befejeződött">
 <!ENTITY zotero.rtfScan.completePage.description "Your document has now been scanned and processed. Please ensure that it is formatted correctly.">
-<!ENTITY zotero.rtfScan.inputFile.label "Input File">
-<!ENTITY zotero.rtfScan.outputFile.label "Output File">
+<!ENTITY zotero.rtfScan.inputFile.label "Bemeneti fájl">
+<!ENTITY zotero.rtfScan.outputFile.label "Kimeneti fájl">
 
 <!ENTITY zotero.file.choose.label "Choose File...">
-<!ENTITY zotero.file.noneSelected.label "No file selected">
+<!ENTITY zotero.file.noneSelected.label "Nincs fájl kiválasztva">
 
-<!ENTITY zotero.downloadManager.label "Save to Zotero">
+<!ENTITY zotero.downloadManager.label "Mentés Zotero-ba">
 <!ENTITY zotero.downloadManager.saveToLibrary.description "Attachments cannot be saved to the currently selected library. This item will be saved to your library instead.">
 <!ENTITY zotero.downloadManager.noPDFTools.description "To use this feature, you must first install the PDF tools in the Search pane of the Zotero preferences.">
diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties
index ed6ee88d0..8fb879120 100644
--- a/chrome/locale/hu-HU/zotero/zotero.properties
+++ b/chrome/locale/hu-HU/zotero/zotero.properties
@@ -11,47 +11,47 @@ general.restartRequiredForChange=A módosítás érvénybe lépéséhez újra ke
 general.restartRequiredForChanges=A módosítások érvénybe lépéséhez újra kell indítani a %St.
 general.restartNow=Újraindítás most
 general.restartLater=Újraindítás később
-general.restartApp=Restart %S
-general.quitApp=Quit %S
+general.restartApp=A(z) %S újraindítása
+general.quitApp=Kilépés %S
 general.errorHasOccurred=Hiba lépett fel.
 general.unknownErrorOccurred=Ismeretlen hiba.
-general.invalidResponseServer=Invalid response from server.
-general.tryAgainLater=Please try again in a few minutes.
+general.invalidResponseServer=Érvénytelen válasz a szervertől.
+general.tryAgainLater=Kérem, próbálkozzon újra néhány perc múlva.
 general.serverError=The server returned an error. Please try again.
 general.restartFirefox=Indítsa újra a Firefoxot.
 general.restartFirefoxAndTryAgain=Indítsa újra a Firefoxot és próbálja meg újra.
-general.checkForUpdate=Check for Update
-general.actionCannotBeUndone=This action cannot be undone.
+general.checkForUpdate=Frissítések keresése
+general.actionCannotBeUndone=Ez a művelet nem vonható vissza.
 general.install=Telepítés
 general.updateAvailable=Van elérhető frissítés
-general.noUpdatesFound=No Updates Found
-general.isUpToDate=%S is up to date.
+general.noUpdatesFound=Nem találhatóak frissítések
+general.isUpToDate=A %S naprakész.
 general.upgrade=Frissítés
 general.yes=Igen
 general.no=Nem
-general.notNow=Not Now
+general.notNow=Máskor
 general.passed=Sikeres
 general.failed=Sikertelen
 general.and=és
-general.etAl=et al.
-general.accessDenied=Access Denied
+general.etAl=és mtsai.
+general.accessDenied=Hozzáférés elutasítva
 general.permissionDenied=Hozzáférés megtagadva
 general.character.singular=karakter
 general.character.plural=karakter
 general.create=Új
-general.delete=Delete
+general.delete=Törlés
 general.moreInformation=More Information
 general.seeForMoreInformation=A %S bővebb információkat tartalmaz.
 general.enable=Bekapcsolás
 general.disable=Kikapcsolás
-general.remove=Remove
-general.reset=Reset
-general.hide=Hide
-general.quit=Quit
-general.useDefault=Use Default
-general.openDocumentation=Open Documentation
+general.remove=Eltávolítás
+general.reset=Visszaállítás
+general.hide=Elrejtés
+general.quit=Kilépés
+general.useDefault=Alapértelmezett
+general.openDocumentation=Dokumentáció megnyitása
 general.numMore=%S more…
-general.openPreferences=Open Preferences
+general.openPreferences=Beállítások megnyitása
 general.keys.ctrlShift=Ctrl+Shift+
 general.keys.cmdShift=Cmd+Shift+
 
@@ -59,8 +59,8 @@ general.operationInProgress=A Zotero dolgozik.
 general.operationInProgress.waitUntilFinished=Kérjük várjon, amíg a művelet befejeződik.
 general.operationInProgress.waitUntilFinishedAndTryAgain=Kérjük várjon, amíg a művelet befejeződik, és próbálja meg újra.
 
-punctuation.openingQMark="
-punctuation.closingQMark="
+punctuation.openingQMark=„
+punctuation.closingQMark=”
 punctuation.colon=:
 punctuation.ellipsis=…
 
@@ -81,12 +81,13 @@ upgrade.couldNotMigrate.restart=Ha továbbra is ezt az üzenetet kapja, indítsa
 errorReport.reportError=Hiba bejelentése...
 errorReport.reportErrors=Hibák jelentése...
 errorReport.reportInstructions=A hiba jelentéséhez válassza a Műveletek menü "%S" menüpontját.
-errorReport.followingErrors=The following errors have occurred since starting %S:
-errorReport.advanceMessage=Nyomja meg a %S gombot a hibajelentés elküldéséhez.
+errorReport.followingReportWillBeSubmitted=A következő jelentés kerül elküldésre:
+errorReport.noErrorsLogged=A %S indítása óta nem jelentkeztek hibák.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Hiba reprodukálásához szükséges lépések:
 errorReport.expectedResult=Elvárt működés:
 errorReport.actualResult=Tényleges működés:
-errorReport.noNetworkConnection=No network connection
+errorReport.noNetworkConnection=Nincs hálózati kapcsolat
 errorReport.invalidResponseRepository=Invalid response from repository
 errorReport.repoCannotBeContacted=Repository cannot be contacted
 
@@ -97,7 +98,7 @@ attachmentBasePath.chooseNewPath.message=Linked file attachments below this dire
 attachmentBasePath.chooseNewPath.existingAttachments.singular=One existing attachment was found within the new base directory.
 attachmentBasePath.chooseNewPath.existingAttachments.plural=%S existing attachments were found within the new base directory.
 attachmentBasePath.chooseNewPath.button=Change Base Directory Setting
-attachmentBasePath.clearBasePath.title=Revert to Absolute Paths
+attachmentBasePath.clearBasePath.title=Visszavonás
 attachmentBasePath.clearBasePath.message=New linked file attachments will be saved using absolute paths.
 attachmentBasePath.clearBasePath.existingAttachments.singular=One existing attachment within the old base directory will be converted to use an absolute path.
 attachmentBasePath.clearBasePath.existingAttachments.plural=%S existing attachments within the old base directory will be converted to use absolute paths.
@@ -109,25 +110,25 @@ dataDir.useProfileDir=A Firefox profilkönyvtár használata
 dataDir.selectDir=Válassza ki a Zotero adatokat tartalmazó mappát
 dataDir.selectedDirNonEmpty.title=A mappa nem üres
 dataDir.selectedDirNonEmpty.text=A kiválasztott mappa nem üres és nem tartalmaz Zotero adatokat.\n\nEnnek ellenére hozza létre a Zotero fájlokat?
-dataDir.selectedDirEmpty.title=Directory Empty
+dataDir.selectedDirEmpty.title=A könyvtár üres
 dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually move files from the existing data directory to the new location after %1$S has closed.
 dataDir.selectedDirEmpty.useNewDir=Use the new directory?
 dataDir.moveFilesToNewLocation=Be sure to move files from your existing Zotero data directory to the new location before reopening %1$S.
-dataDir.incompatibleDbVersion.title=Incompatible Database Version
+dataDir.incompatibleDbVersion.title=Inkompatibilis adatbázis
 dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
-dataDir.standaloneMigration.title=Existing Zotero Library Found
+dataDir.standaloneMigration.title=Létező Zotero könyvtár észlelve
 dataDir.standaloneMigration.description=This appears to be your first time using %1$S. Would you like %1$S to import settings from %2$S and use your existing data directory?
 dataDir.standaloneMigration.multipleProfiles=%1$S will share its data directory with the most recently used profile.
-dataDir.standaloneMigration.selectCustom=Custom Data Directory…
+dataDir.standaloneMigration.selectCustom=Saját adatkönyvtár…
 
 app.standalone=Zotero Standalone
-app.firefox=Zotero for Firefox
+app.firefox=Zotero Firefoxhoz
 
 startupError=Hiba a Zotero indítása közben.
 startupError.databaseInUse=Your Zotero database is currently in use. Only one instance of Zotero using the same database may be opened simultaneously at this time.
-startupError.closeStandalone=If Zotero Standalone is open, please close it and restart Firefox.
-startupError.closeFirefox=If Firefox with the Zotero extension is open, please close it and restart Zotero Standalone.
-startupError.databaseCannotBeOpened=The Zotero database cannot be opened.
+startupError.closeStandalone=Ha a Zotero Standalone fut, kérem zárja be és indítsa újra a Firefoxot.
+startupError.closeFirefox=Ha a Firefox a Zotero bővítménnyel fut, kérem zárja be és indítsa újra a Zotero Standalone-t.
+startupError.databaseCannotBeOpened=A Zotero adatbázist nem lehet megnyitni.
 startupError.checkPermissions=Győződjön meg róla, hogy a Zotero az adatkönyvtár valamennyi fájlját írni és olvasni tudja.
 startupError.zoteroVersionIsOlder=A Zotero ezen változata régebbi, mint amit az adatbázis használ.
 startupError.zoteroVersionIsOlder.upgrade=Frissítsen a legújabb változatra a zotero.org oldalon.
@@ -145,15 +146,15 @@ date.relative.daysAgo.multiple=%S órával ezelőtt
 date.relative.yearsAgo.one=1 évvel ezelőtt
 date.relative.yearsAgo.multiple=%S évvel ezelőtt
 
-pane.collections.delete.title=Delete Collection
+pane.collections.delete.title=Gyűjtemény törlése
 pane.collections.delete=A kijelölt gyűjtemény törlésének megerősítése?
 pane.collections.delete.keepItems=Items within this collection will not be deleted.
-pane.collections.deleteWithItems.title=Delete Collection and Items
-pane.collections.deleteWithItems=Are you sure you want to delete the selected collection and move all items within it to the Trash?
+pane.collections.deleteWithItems.title=Gyűjtemény és elemek törlése
+pane.collections.deleteWithItems=Biztos benne, hogy minden kijelölt gyűjtemény és elem áthelyezhető a Kukába?
 
-pane.collections.deleteSearch.title=Delete Search
+pane.collections.deleteSearch.title=Keresés törlése
 pane.collections.deleteSearch=A kijelölt keresés törlésének megerősítése?
-pane.collections.emptyTrash=Are you sure you want to permanently remove items in the Trash?
+pane.collections.emptyTrash=Biztos benne, hogy végleg törölni akarja az elemeket a Lomtárból?
 pane.collections.newCollection=Új gyűjtemény
 pane.collections.name=Gyűjtemény neve:
 pane.collections.newSavedSeach=Új mentett keresés
@@ -161,16 +162,16 @@ pane.collections.savedSearchName=Adjon meg egy új nevet az elmentett keresésne
 pane.collections.rename=Új név:
 pane.collections.library=Teljes könyvtár
 pane.collections.groupLibraries=Group Libraries
-pane.collections.trash=Trash
+pane.collections.trash=Kuka
 pane.collections.untitled=cím nélkül
-pane.collections.unfiled=Unfiled Items
-pane.collections.duplicate=Duplicate Items
+pane.collections.unfiled=Besorolatlan elemek
+pane.collections.duplicate=Duplikált elemek
 
 pane.collections.menu.rename.collection=Gyűjtemény átnevezése...
 pane.collections.menu.edit.savedSearch=Mentett keresés szerkesztése
-pane.collections.menu.delete.collection=Delete Collection…
-pane.collections.menu.delete.collectionAndItems=Delete Collection and Items…
-pane.collections.menu.delete.savedSearch=Delete Saved Search…
+pane.collections.menu.delete.collection=Gyűjtemény törlése…
+pane.collections.menu.delete.collectionAndItems=Gyűjtemény és elemek törlése…
+pane.collections.menu.delete.savedSearch=Mentett keresések törlése…
 pane.collections.menu.export.collection=Gyűjtemény exportálása...
 pane.collections.menu.export.savedSearch=Mentett keresés exportálása...
 pane.collections.menu.createBib.collection=Bibliográfia létrehozása a gyűjteményből...
@@ -194,18 +195,18 @@ tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 pane.items.loading=Elemek listájának betöltése...
 pane.items.columnChooser.moreColumns=More Columns
 pane.items.columnChooser.secondarySort=Secondary Sort (%S)
-pane.items.attach.link.uri.title=Attach Link to URI
-pane.items.attach.link.uri=Enter a URI:
-pane.items.trash.title=Áthelyezés a kukába
-pane.items.trash=A kukába helyezés megerősítése?
-pane.items.trash.multiple=A kukába helyezés megerősítése?
+pane.items.attach.link.uri.title=Link csatolása az URI-hez
+pane.items.attach.link.uri=Adja meg az URI-t:
+pane.items.trash.title=Áthelyezés a Kukába
+pane.items.trash=A Kukába helyezés megerősítése?
+pane.items.trash.multiple=A Kukába helyezés megerősítése?
 pane.items.delete.title=Törlés
 pane.items.delete=A kijelölt elem törlésének megerősítése?
 pane.items.delete.multiple=A kijelölt elemek törlésének megerősítése?
 pane.items.menu.remove=Kijelölt elem törlése
 pane.items.menu.remove.multiple=Kijelölt elemek törlése
-pane.items.menu.moveToTrash=Move Item to Trash…
-pane.items.menu.moveToTrash.multiple=Move Items to Trash…
+pane.items.menu.moveToTrash=Elem mozgatása a Kukába…
+pane.items.menu.moveToTrash.multiple=Elem mozgatása a Kukába…
 pane.items.menu.export=Kiválasztott elem exportálása...
 pane.items.menu.export.multiple=Kiválasztott elemek exportálása...
 pane.items.menu.createBib=Bibliográfia létrehozása a kiválasztott elemből
@@ -214,8 +215,8 @@ pane.items.menu.generateReport=Jelentés készítése a kiválasztott elemből
 pane.items.menu.generateReport.multiple=Jelentés készítése a kiválasztott elemekből
 pane.items.menu.reindexItem=Elem újraindexelése
 pane.items.menu.reindexItem.multiple=Elemek újraindexelése
-pane.items.menu.recognizePDF=Retrieve Metadata for PDF
-pane.items.menu.recognizePDF.multiple=Retrieve Metadata for PDFs
+pane.items.menu.recognizePDF=A metaadat visszaállítása a PDF számára
+pane.items.menu.recognizePDF.multiple=A metaadat visszaállítása a PDF-ek számára
 pane.items.menu.createParent=Szülőelem létrehozása a kijelölt elem alapján
 pane.items.menu.createParent.multiple=Szülőelemek létrehozása a kijelölt elemek alapján
 pane.items.menu.renameAttachments=A fájl átnevezése a szülő metaadata alapján
@@ -232,15 +233,15 @@ pane.items.interview.manyParticipants=Interjú (készítette: %S et al.)
 
 pane.item.selected.zero=Nincs kiválasztva elem
 pane.item.selected.multiple=%S elem kiválasztva
-pane.item.unselected.zero=No items in this view
-pane.item.unselected.singular=%S item in this view
-pane.item.unselected.plural=%S items in this view
+pane.item.unselected.zero=Nincs megjeleníthető elem
+pane.item.unselected.singular=%S elem ebben a nézetben
+pane.item.unselected.plural=%S elem ebben a nézetben
 
-pane.item.duplicates.selectToMerge=Select items to merge
-pane.item.duplicates.mergeItems=Merge %S items
+pane.item.duplicates.selectToMerge=Kiválasztott elemek összefésülése
+pane.item.duplicates.mergeItems=%S elemek összefésülése
 pane.item.duplicates.writeAccessRequired=Library write access is required to merge items.
 pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
-pane.item.duplicates.onlySameItemType=Merged items must all be of the same item type.
+pane.item.duplicates.onlySameItemType=Az összefésült elemeknek mind ugyanabba a típusba kell tartozniuk.
 
 pane.item.changeType.title=Elem típusának módosítása
 pane.item.changeType.text=Az elemtípus módosításának megerősítése?\n\nA következő mezők elvesznek.
@@ -249,8 +250,8 @@ pane.item.defaultLastName=vezetéknév
 pane.item.defaultFullName=teljes név
 pane.item.switchFieldMode.one=Váltás egy mezőre
 pane.item.switchFieldMode.two=Váltás két mezőre
-pane.item.creator.moveUp=Move Up
-pane.item.creator.moveDown=Move Down
+pane.item.creator.moveUp=Mozgatás felfelé
+pane.item.creator.moveDown=Mozgatás lefelé
 pane.item.notes.untitled=Cím nélküli jegyzet
 pane.item.notes.delete.confirm=Jegyzet törlésének megerősítése?
 pane.item.notes.count.zero=%S jegyzet:
@@ -266,9 +267,9 @@ pane.item.attachments.count.zero=%S csatolmány:
 pane.item.attachments.count.singular=%S csatolmány:
 pane.item.attachments.count.plural=%S csatolmány:
 pane.item.attachments.select=Fájl kiválasztása
-pane.item.attachments.PDF.installTools.title=PDF Tools Not Installed
+pane.item.attachments.PDF.installTools.title=A PDF Tools nincs telepítve
 pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Search pane of the Zotero preferences.
-pane.item.attachments.filename=Filename
+pane.item.attachments.filename=Fájlnév
 pane.item.noteEditor.clickHere=kattintson ide
 pane.item.tags.count.zero=%S címke:
 pane.item.tags.count.singular=%S címke:
@@ -278,7 +279,7 @@ pane.item.tags.icon.automatic=Automatikus címke
 pane.item.related.count.zero=%S kapcsolat:
 pane.item.related.count.singular=% kapcsolat:
 pane.item.related.count.plural=% kapcsolat:
-pane.item.parentItem=Parent Item:
+pane.item.parentItem=Szülő elem
 
 noteEditor.editNote=Jegyzet szerkesztése
 
@@ -372,8 +373,8 @@ itemFields.codeNumber=Törvénykönyv száma
 itemFields.artworkMedium=Műalkotás médiuma
 itemFields.number=Sorszám
 itemFields.artworkSize=Műalkotás mérete
-itemFields.libraryCatalog=Library Catalog
-itemFields.videoRecordingFormat=Format
+itemFields.libraryCatalog=Könyvtár Katalógus
+itemFields.videoRecordingFormat=Formátum
 itemFields.interviewMedium=Médium
 itemFields.letterType=Típus
 itemFields.manuscriptType=Típus
@@ -381,7 +382,7 @@ itemFields.mapType=Típus
 itemFields.scale=Arány
 itemFields.thesisType=Típus
 itemFields.websiteType=Weboldal típusa
-itemFields.audioRecordingFormat=Format
+itemFields.audioRecordingFormat=Formátum
 itemFields.label=Címke
 itemFields.presentationType=Típus
 itemFields.meetingName=Találkozó neve
@@ -416,20 +417,20 @@ itemFields.applicationNumber=Bejelentés száma
 itemFields.forumTitle=Fórum/listserv címe
 itemFields.episodeNumber=Epizód száma
 itemFields.blogTitle=Blog címe
-itemFields.medium=Medium
+itemFields.medium=Médium
 itemFields.caseName=Eset neve
 itemFields.nameOfAct=Törvény címe
 itemFields.subject=Téma
 itemFields.proceedingsTitle=Kiadvány címe
 itemFields.bookTitle=Könyv címe
 itemFields.shortTitle=Rövid cím
-itemFields.docketNumber=Docket Number
-itemFields.numPages=# of Pages
-itemFields.programTitle=Program Title
+itemFields.docketNumber=Ügyiratszám
+itemFields.numPages=Terjedelem
+itemFields.programTitle=Program címe
 itemFields.issuingAuthority=Issuing Authority
-itemFields.filingDate=Filing Date
-itemFields.genre=Genre
-itemFields.archive=Archive
+itemFields.filingDate=Iktatás időpontja
+itemFields.genre=Típus
+itemFields.archive=Archívum
 
 creatorTypes.author=Szerző
 creatorTypes.contributor=Közreműködő
@@ -459,7 +460,7 @@ creatorTypes.guest=Vendég
 creatorTypes.podcaster=Podcaster
 creatorTypes.reviewedAuthor=Recenzált mű szerzője
 creatorTypes.cosponsor=Cosponsor
-creatorTypes.bookAuthor=Book Author
+creatorTypes.bookAuthor=Könyv szerzője
 
 fileTypes.webpage=Weboldal
 fileTypes.image=Kép
@@ -471,30 +472,30 @@ fileTypes.document=Dokumentum
 
 save.attachment=Pillanatfelvétel mentése...
 save.link=Hivatkozás mentése...
-save.link.error=An error occurred while saving this link.
+save.link.error=Hiba történt a link mentésekor.
 save.error.cannotMakeChangesToCollection=You cannot make changes to the currently selected collection.
 save.error.cannotAddFilesToCollection=You cannot add files to the currently selected collection.
 
 ingester.saveToZotero=Mentés a Zoteroba
-ingester.saveToZoteroUsing=Save to Zotero using "%S"
+ingester.saveToZoteroUsing=Mentés Zotero-ba "%S" használatával
 ingester.scraping=Elem mentése...
-ingester.scrapingTo=Saving to
+ingester.scrapingTo=Mentés
 ingester.scrapeComplete=Elem elmentve.
 ingester.scrapeError=Elem mentése sikertelen.
 ingester.scrapeErrorDescription=Hiba az elem mentése során. Próbálja meg újra. Ha a hiba továbbra is fenn áll, lépjen kapcsolatba az adatkonverter készítőjével.
 ingester.scrapeErrorDescription.linkText=Ismert konverter hibák
 ingester.scrapeErrorDescription.previousError=A mentés egy korábbi Zotero hiba miatt sikertelen.
 
-ingester.importReferRISDialog.title=Zotero RIS/Refer Import
-ingester.importReferRISDialog.text=Do you want to import items from "%1$S" into Zotero?\n\nYou can disable automatic RIS/Refer import in the Zotero preferences.
-ingester.importReferRISDialog.checkMsg=Always allow for this site
+ingester.importReferRISDialog.title=Zotero RIS/Refer importálás
+ingester.importReferRISDialog.text=Biztosan szeretnél importálni "%1$S"-ból Zotero-ba?\n\nKikapcsolható az automatikus RIS/Refer importálás a Zotero beállításai között.
+ingester.importReferRISDialog.checkMsg=Mindig engedélyezze ezen az oldalon
 
-ingester.importFile.title=Import File
-ingester.importFile.text=Do you want to import the file "%S"?
-ingester.importFile.intoNewCollection=Import into new collection
+ingester.importFile.title=Fájl importálása
+ingester.importFile.text=Biztosan importálja a "%S" fájlt?
+ingester.importFile.intoNewCollection=Importálás új gyűjteménybe
 
-ingester.lookup.performing=Performing Lookup…
-ingester.lookup.error=An error occurred while performing lookup for this item.
+ingester.lookup.performing=Kikeresés folyamatban…
+ingester.lookup.error=Hiba történt az elem keresésekor.
 
 db.dbCorrupted=A '%S' Zotero adatbázis hibás.
 db.dbCorrupted.restart=Az automatikus visszaállításhoz újra kell indítani a Firefoxot.
@@ -504,10 +505,10 @@ db.dbRestoreFailed=A Zotero adatbázis hibás, és az adatok automatikus vissza
 
 db.integrityCheck.passed=Nincsenek hibák az adatbázisban.
 db.integrityCheck.failed=Hibák a Zotero adatbázisban!
-db.integrityCheck.dbRepairTool=You can use the database repair tool at http://zotero.org/utils/dbfix to attempt to correct these errors.
+db.integrityCheck.dbRepairTool=Használhatja az adatbázsi-helyerállító eszközt a következő oldalon https://www.zotero.org/utils/dbfix/ hogy megkísérelje kijavítani a hibákat.
 db.integrityCheck.repairAttempt=Zotero can attempt to correct these errors.
 db.integrityCheck.appRestartNeeded=%S will need to be restarted.
-db.integrityCheck.fixAndRestart=Fix Errors and Restart %S
+db.integrityCheck.fixAndRestart=Hibák javítása és újraindítás %S
 db.integrityCheck.errorsFixed=The errors in your Zotero database have been corrected.
 db.integrityCheck.errorsNotFixed=Zotero was unable to correct all the errors in your database.
 db.integrityCheck.reportInForums=You can report this problem in the Zotero Forums.
@@ -520,10 +521,10 @@ zotero.preferences.openurl.resolversFound.zero=%S linkfeloldó található
 zotero.preferences.openurl.resolversFound.singular=%S linkfeloldó található
 zotero.preferences.openurl.resolversFound.plural=%S linkfeloldó található
 
-zotero.preferences.sync.purgeStorage.title=Purge Attachment Files on Zotero Servers?
+zotero.preferences.sync.purgeStorage.title=Megtisztítja a Zotero szervereken a csatolt fájlokat?
 zotero.preferences.sync.purgeStorage.desc=If you plan to use WebDAV for file syncing and you previously synced attachment files in My Library to the Zotero servers, you can purge those files from the Zotero servers to give you more storage space for groups.\n\nYou can purge files at any time from your account settings on zotero.org.
-zotero.preferences.sync.purgeStorage.confirmButton=Purge Files Now
-zotero.preferences.sync.purgeStorage.cancelButton=Do Not Purge
+zotero.preferences.sync.purgeStorage.confirmButton=Fájlok tisztítása most
+zotero.preferences.sync.purgeStorage.cancelButton=Nincs tisztítás
 zotero.preferences.sync.reset.userInfoMissing=You must enter a username and password in the %S tab before using the reset options.
 zotero.preferences.sync.reset.restoreFromServer=All data in this copy of Zotero will be erased and replaced with data belonging to user '%S' on the Zotero server.
 zotero.preferences.sync.reset.replaceLocalData=Replace Local Data
@@ -559,7 +560,7 @@ 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.export.quickCopy.citationInstructions=For bibliography styles, you can copy citations or footnotes by pressing %S or holding down Shift before dragging items.
-zotero.preferences.styles.addStyle=Add Style
+zotero.preferences.styles.addStyle=Stílus hozzáadása
 
 zotero.preferences.advanced.resetTranslatorsAndStyles=Fordítók és stílusok visszaállítása
 zotero.preferences.advanced.resetTranslatorsAndStyles.changesLost=Az új vagy módosított fordítók és stílusok elvesznek.
@@ -582,7 +583,7 @@ fileInterface.export=Exportálás
 fileInterface.exportedItems=Exportált elemek
 fileInterface.imported=Importálva
 fileInterface.unsupportedFormat=The selected file is not in a supported format.
-fileInterface.viewSupportedFormats=View Supported Formats…
+fileInterface.viewSupportedFormats=Támogatott formátumok megtekintése…
 fileInterface.untitledBibliography=Cím nélküli bibliográfia
 fileInterface.bibliographyHTMLTitle=Bibliográfia
 fileInterface.importError=Hiba az kiválasztott fájl importálása során. Győződjön meg róla, hogy a fájl érvényes, és próbálja meg újra.
@@ -591,9 +592,9 @@ fileInterface.noReferencesError=A kiválasztott elemek nem tartalmaznak hivatkoz
 fileInterface.bibliographyGenerationError=Hiba az bibliográfia előállítása során. Próbálja meg újra.
 fileInterface.exportError=Hiba az kiválasztott fájl exportálása során.
 
-quickSearch.mode.titleCreatorYear=Title, Creator, Year
-quickSearch.mode.fieldsAndTags=All Fields & Tags
-quickSearch.mode.everything=Everything
+quickSearch.mode.titleCreatorYear=Cím, Szerző, Év
+quickSearch.mode.fieldsAndTags=Összes mező & címke
+quickSearch.mode.everything=Összes
 
 advancedSearchMode=Haladó keresés - a keresés az Enter billentyű leütésével indul
 searchInProgress=Keresés folyamatban
@@ -620,7 +621,7 @@ searchConditions.creator=Létrehozó
 searchConditions.type=Típus
 searchConditions.thesisType=Szakdolgozat típusa
 searchConditions.reportType=Jelentés típusa
-searchConditions.videoRecordingFormat=Video Recording Format
+searchConditions.videoRecordingFormat=Video felvételi formátum
 searchConditions.audioFileType=Audió fájl típusa
 searchConditions.audioRecordingFormat=Audio Recording Format
 searchConditions.letterType=Levél típusa
@@ -643,23 +644,23 @@ fulltext.indexState.partial=Részleges
 exportOptions.exportNotes=Jegyzetek exportálása
 exportOptions.exportFileData=Fájlok exportálása
 exportOptions.useJournalAbbreviation=Use Journal Abbreviation
-charset.UTF8withoutBOM=Unicode (UTF-8 without BOM)
-charset.autoDetect=(auto detect)
+charset.UTF8withoutBOM=Unicode (UTF-8 BOM nélkül)
+charset.autoDetect=(automatikus felismerés)
 
 date.daySuffixes=., ., ., .
 date.abbreviation.year=év
 date.abbreviation.month=hónap
 date.abbreviation.day=nap
-date.yesterday=yesterday
-date.today=today
-date.tomorrow=tomorrow
+date.yesterday=tegnap
+date.today=ma
+date.tomorrow=holnap
 
 citation.multipleSources=Több forrás...
 citation.singleSource=Egy forrás...
 citation.showEditor=Szerkesztő megjelenítése...
 citation.hideEditor=Szerkesztő elrejtése...
-citation.citations=Citations
-citation.notes=Notes
+citation.citations=Hivatkozások
+citation.notes=Jegyzetek
 
 report.title.default=Zotero jelentés
 report.parentItem=Szülő elem:
@@ -677,46 +678,46 @@ annotations.oneWindowWarning=A pillanatfelvételhez kapcsolódó jegyzeteket egy
 integration.fields.label=Mezők
 integration.referenceMarks.label=Hivatkozási jelek
 integration.fields.caption=Microsoft Word mezők esetében nem valószínű a véletlen módosítás, de nem kompatibilis az OpenOffice-gal.
-integration.fields.fileFormatNotice=The document must be saved in the .doc file format.
+integration.fields.fileFormatNotice=A dokumentumot csak .doc formátumban lehet elmenteni.
 integration.referenceMarks.caption=OpenOffice hivatkozási jelek esetében nem valószínű a véletlen módosítás, de nem kompatibilis a Microsoft Worddel.
-integration.referenceMarks.fileFormatNotice=The document must be saved in the .odt file format.
+integration.referenceMarks.fileFormatNotice=A dokumentumot csak .odt formátumban lehet elmenteni.
 
 integration.regenerate.title=A hivatkozás újragenerálása?
 integration.regenerate.body=A hivatkozásszerkesztőben elvégzett módosítások elvesznek.
 integration.regenerate.saveBehavior=Beállítás megőrzése.
 
-integration.revertAll.title=Are you sure you want to revert all edits to your bibliography?
-integration.revertAll.body=If you choose to continue, all references cited in the text will appear in the bibliography with their original text, and any references manually added will be removed from the bibliography.
-integration.revertAll.button=Revert All
-integration.revert.title=Are you sure you want to revert this edit?
+integration.revertAll.title=Biztos benne, hogy visszavon minden szerkesztést a bibliográfiában?
+integration.revertAll.body=Ha a folytatást választja, minden szövegbeli hivatkozás az eredeti szövegével jelenik meg a bibliográfiában és a kézzel hozzáadott hivatkozásokat a Zotero eltávolítja a bibliográfiából.\n\n
+integration.revertAll.button=Minden visszavonása
+integration.revert.title=Biztos benne, hogy visszavonja ezt a szerkesztést?
 integration.revert.body=If you choose to continue, the text of the bibliography entries corresponded to the selected item(s) will be replaced with the unmodified text specified by the selected style.
-integration.revert.button=Revert
-integration.removeBibEntry.title=The selected reference is cited within your document.
-integration.removeBibEntry.body=Are you sure you want to omit it from your bibliography?
+integration.revert.button=Visszavonás
+integration.removeBibEntry.title=A dokumentum tartalmazza a kiválasztott hivatkozást.
+integration.removeBibEntry.body=Biztos, hogy kihagyja ezt a bibliográfiából?
 
-integration.cited=Cited
-integration.cited.loading=Loading Cited Items…
-integration.ibid=ibid
-integration.emptyCitationWarning.title=Blank Citation
-integration.emptyCitationWarning.body=The citation you have specified would be empty in the currently selected style. Are you sure you want to add it?
-integration.openInLibrary=Open in %S
+integration.cited=Hivatkozva
+integration.cited.loading=Hivatkozott elemek betöltése…
+integration.ibid=uo.
+integration.emptyCitationWarning.title=Üres hivatkozás
+integration.emptyCitationWarning.body=A kívánt hivatkozás üres a jelenlegi stílusban. Biztos, hogy hozzá akarja adni?
+integration.openInLibrary=Megnyitás %S
 
 integration.error.incompatibleVersion=This version of the Zotero word processor plugin ($INTEGRATION_VERSION) is incompatible with the currently installed version of the Zotero Firefox extension (%1$S). Please ensure you are using the latest versions of both components.
-integration.error.incompatibleVersion2=Zotero %1$S requires %2$S %3$S or later. Please download the latest version of %2$S from zotero.org.
-integration.error.title=Zotero Integration Error
+integration.error.incompatibleVersion2=A Zotero %1$S hez %2$S %3$S vagy újabb verzió szükséges. Kérem töltse le a %2$S legújabb verzióját a zotero.org oldalról.
+integration.error.title=Zotero illesztési hiba
 integration.error.notInstalled=Firefox could not load the component required to communicate with your word processor. Please ensure that the appropriate Firefox extension is installed, then try again.
-integration.error.generic=Zotero experienced an error updating your document.
-integration.error.mustInsertCitation=You must insert a citation before performing this operation.
-integration.error.mustInsertBibliography=You must insert a bibliography before performing this operation.
-integration.error.cannotInsertHere=Zotero fields cannot be inserted here.
-integration.error.notInCitation=You must place the cursor in a Zotero citation to edit it.
-integration.error.noBibliography=The current bibliographic style does not define a bibliography. If you wish to add a bibliography, please choose another style.
-integration.error.deletePipe=The pipe that Zotero uses to communicate with the word processor could not be initialized. Would you like Zotero to attempt to correct this error? You will be prompted for your password.
-integration.error.invalidStyle=The style you have selected does not appear to be valid. If you have created this style yourself, please ensure that it passes validation as described at https://github.com/citation-style-language/styles/wiki/Validation. Alternatively, try selecting another style.
-integration.error.fieldTypeMismatch=Zotero cannot update this document because it was created by a different word processing application with an incompatible field encoding. In order to make a document compatible with both Word and OpenOffice.org/LibreOffice/NeoOffice, open the document in the word processor with which it was originally created and switch the field type to Bookmarks in the Zotero Document Preferences.
+integration.error.generic=A Zotero hibát észlelt a dokumentum frissítése közben.
+integration.error.mustInsertCitation=Be kell illesztenie egy hivatkozást.
+integration.error.mustInsertBibliography=Be kell illesztenie egy bibliográfiát.
+integration.error.cannotInsertHere=A Zotero nem tudja beilleszteni a hivatkozást.
+integration.error.notInCitation=Helyezze a kurzort a hivatkozásra a szerkesztéshez.
+integration.error.noBibliography=A jelenlegi hivatkozási stílus nem tartalmaz bibliográfiát. Ha szeretne bibliográfiát hozzáadni, kérem válasszon másik stílust.
+integration.error.deletePipe=A csatorna amit a Zotero a szövegszerkesztővel való kommunikációhoz használ, nem inicializálható. Szeretné ha a Zotero megpróbálná kijavítani ezt a hibát? Kérem majd adja meg a jelszavát.
+integration.error.invalidStyle=A kiválasztott stílus nem tűnük érvényesnek. Amennyiben ez egy saját stílus, úgy győződjön meg, hogy érvényes, melyről leírást a https://github.com/citation-style-language/styles/wiki/Validation talál. Esetleg válasszon másik stílust.
+integration.error.fieldTypeMismatch=A Zotero nem tudja frissíteni a dokumentumot, mert egy másik szövegszerkesztő alkalmazással készült inkompatibilis mezőkóddal. Ahhoz, hogy a dokumentumot kompatibilissé tegye a Word és OpenOffice.org/LibreOffice/NeoOffice számára, nyissa meg a dokumentumot azzal a szövegszerkesztővel, amivel készült és állítsa a formázás típusát Könyvjelzőre a Zotero dokumentumbeállításokban.
 
-integration.replace=Replace this Zotero field?
-integration.missingItem.single=The highlighted citation no longer exists in your Zotero database. Do you want to select a substitute item?
+integration.replace=Eltávolítja ezt a Zotero mezőt?
+integration.missingItem.single=A kiemelt hivatkozás már nem létezik a Zotero adatbázisában. Szeretné helyettesíteni egy másik elemmel?
 integration.missingItem.multiple=Item %1$S in the highlighted citation no longer exists in your Zotero database. Do you want to select a substitute item?
 integration.missingItem.description=Clicking "No" will delete the field codes for citations containing this item, preserving the citation text but deleting it from your bibliography.
 integration.removeCodesWarning=Removing field codes will prevent Zotero from updating citations and bibliographies in this document. Are you sure you want to continue?
@@ -726,20 +727,20 @@ integration.corruptField=The Zotero field code corresponding to this citation, w
 integration.corruptField.description=Clicking "No" will delete the field codes for citations containing this item, preserving the citation text but potentially deleting it from your bibliography.
 integration.corruptBibliography=The Zotero field code for your bibliography is corrupted. Should Zotero clear this field code and generate a new bibliography?
 integration.corruptBibliography.description=All items cited in the text will appear in the new bibliography, but modifications you made in the "Edit Bibliography" dialog will be lost.
-integration.citationChanged=You have modified this citation since Zotero generated it. Do you want to keep your modifications and prevent future updates?
-integration.citationChanged.description=Clicking "Yes" will prevent Zotero from updating this citation if you add additional citations, switch styles, or modify the item to which it refers. Clicking "No" will erase your changes.
-integration.citationChanged.edit=You have modified this citation since Zotero generated it. Editing will clear your modifications. Do you want to continue?
+integration.citationChanged=Módosította ezt a hivatkozást, amióta a Zotero generálta. Megtartja a módosításokat és megakadályozza a jövőbeli frissítésüket?
+integration.citationChanged.description=Kattintson az „Igen” gombra, ha nem akarja, hogy a Zotero frissítse ezt a hivatkozást további hivatkozások hozzáadásakor, stílusváltáskor, vagy az elem módosításakor. Ha a „Nem”-re kattint elvesznek a módosításai.
+integration.citationChanged.edit=Módosította ezt a hivatkozást, amióta a Zotero generálta. A szerkesztéssel elvesznek a módosítások. Folytatja?
 
-styles.install.title=Install Style
+styles.install.title=Stílus telepítése
 styles.install.unexpectedError=An unexpected error occurred while installing "%1$S"
 styles.installStyle=A "%1$S" stílus importálása a %2$S-ból?
 styles.updateStyle=A "%1$S" stílus lecserélése %2$S-re a %3$S-ból?
 styles.installed=A "%1$S" stílus importálása sikerült.
-styles.installError="%S" is not a valid style file.
+styles.installError=A(z) "%S" nem érvényes stílus.
 styles.validationWarning="%S" is not a valid CSL 1.0.1 style file, and may not work properly with Zotero.\n\nAre you sure you want to continue?
-styles.installSourceError=%1$S references an invalid or non-existent CSL file at %2$S as its source.
-styles.deleteStyle=Are you sure you want to delete the style "%1$S"?
-styles.deleteStyles=Are you sure you want to delete the selected styles?
+styles.installSourceError=A %1$S érvénytelen vagy nem létező CSL fájlt jelöl meg forrásaként itt: %2$S.
+styles.deleteStyle=Biztosan törölni akarja a stílust "%1$S"?
+styles.deleteStyles=Biztosan törölni akarja a kijelölt stílusokat?
 
 styles.abbreviations.title=Load Abbreviations
 styles.abbreviations.parseError=The abbreviations file "%1$S" is not valid JSON.
@@ -760,20 +761,20 @@ sync.error.passwordNotSet=A jelszó nincs megadva
 sync.error.invalidLogin=Hibás felhasználónév vagy jelszó
 sync.error.invalidLogin.text=The Zotero sync server did not accept your username and password.\n\nPlease check that you have entered your zotero.org login information correctly in the Zotero sync preferences.
 sync.error.enterPassword=Adja meg a jelszót.
-sync.error.loginManagerInaccessible=Zotero cannot access your login information.
+sync.error.loginManagerInaccessible=A Zotero nem fér hozzá a bejelentkezési adatokhoz.
 sync.error.checkMasterPassword=If you are using a master password in %S, make sure you have entered it successfully.
 sync.error.corruptedLoginManager=This could also be due to a corrupted %1$S login manager database. To check, close %1$S, remove signons.sqlite from your %1$S profile directory, and re-enter your Zotero login information in the Sync pane of the Zotero preferences.
 sync.error.loginManagerCorrupted1=Zotero cannot access your login information, possibly due to a corrupted %S login manager database.
 sync.error.loginManagerCorrupted2=Close %1$S, remove signons.sqlite from your %2$S profile directory, and re-enter your Zotero login information in the Sync pane of the Zotero preferences.
 sync.error.syncInProgress=A szinkronizáció már folyamatban.
 sync.error.syncInProgress.wait=Várja meg, amíg a szinkronizáció befejeződik vagy indítsa újra a Firefoxot.
-sync.error.writeAccessLost=You no longer have write access to the Zotero group '%S', and items you've added or edited cannot be synced to the server.
+sync.error.writeAccessLost=Nincs már írásjogosultsága a Zotero '%S' csoportjához, és a hozzáadott vagy szerkesztett elemek nem szinkronizálhatók a szerverrel.
 sync.error.groupWillBeReset=Ha folytatja, a helyi változások elvesznek, és a szerveren található változat kerül a helyi gépre.
 sync.error.copyChangedItems=Ha jogosultságot szeretne kérni vagy egy másik csoporttal szinkronizálni, vesse el a szinkronizációt.
 sync.error.manualInterventionRequired=Az automatikus szinkronizáció hibát talált, ezért beavatkozásra van szükség.
 sync.error.clickSyncIcon=Kattintson a szinkronizációs ikonra a szinkronizáció kézi indításához.
 sync.error.invalidClock=The system clock is set to an invalid time. You will need to correct this to sync with the Zotero server.
-sync.error.sslConnectionError=SSL connection error
+sync.error.sslConnectionError=SSL csatlakozási hiba
 sync.error.checkConnection=Error connecting to server. Check your Internet connection.
 sync.error.emptyResponseServer=Empty response from server.
 sync.error.invalidCharsFilename=The filename '%S' contains invalid characters.\n\nRename the file and try again. If you rename the file via the OS, you will need to relink it in Zotero.
@@ -793,18 +794,18 @@ sync.conflict.localVersionKept=The local version has been kept.
 sync.conflict.recentVersionsKept=The most recent versions have been kept.
 sync.conflict.recentVersionKept=The most recent version, '%S', has been kept.
 sync.conflict.viewErrorConsole=View the %S Error Console for the full list of such changes.
-sync.conflict.localVersion=Local version: %S
-sync.conflict.remoteVersion=Remote version: %S
-sync.conflict.deleted=[deleted]
+sync.conflict.localVersion=Helyi verzió: %S
+sync.conflict.remoteVersion=Távoli verzió: %S
+sync.conflict.deleted=[törölve]
 sync.conflict.collectionItemMerge.alert=One or more Zotero items have been added to and/or removed from the same collection on multiple computers since the last sync.
-sync.conflict.collectionItemMerge.log=Zotero items in the collection '%S' have been added and/or removed on multiple computers since the last sync. The following items have been added to the collection:
+sync.conflict.collectionItemMerge.log=A „%S” gyűjteményhez Zotero elemek lettek hozzáadva és/vagy törölve több számítógépen a legutóbbi szinkronizálás óta. A következő elemek lettek a gyűjteményhez hozzáadva:
 sync.conflict.tagItemMerge.alert=One or more Zotero tags have been added to and/or removed from items on multiple computers since the last sync. The different sets of tags have been combined.
 sync.conflict.tagItemMerge.log=The Zotero tag '%S' has been added to and/or removed from items on multiple computers since the last sync.
-sync.conflict.tag.addedToRemote=It has been added to the following remote items:
-sync.conflict.tag.addedToLocal=It has been added to the following local items:
+sync.conflict.tag.addedToRemote=Hozzá lett adva a következő távoli elemekhez:
+sync.conflict.tag.addedToLocal=Hozzá lett adva a következő helyi elemekhez:
 
-sync.conflict.fileChanged=The following file has been changed in multiple locations.
-sync.conflict.itemChanged=The following item has been changed in multiple locations.
+sync.conflict.fileChanged=Az alábbi fájl megváltozott több helyen.
+sync.conflict.itemChanged=Az alábbi elem megváltozott több helyen.
 sync.conflict.chooseVersionToKeep=Choose the version you would like to keep, and then click %S.
 sync.conflict.chooseThisVersion=Choose this version
 
@@ -817,17 +818,17 @@ sync.status.uploadingData=Adatok feltöltése a szinkronizációs szerverre
 sync.status.uploadAccepted=A feltöltés elfogadva — várakozás a szinkronizációs szerverre
 sync.status.syncingFiles=Fájlok szinkronizálása
 
-sync.fulltext.upgradePrompt.title=New: Full-Text Content Syncing
+sync.fulltext.upgradePrompt.title=Új: Teljes szöveg szinkronizálása
 sync.fulltext.upgradePrompt.text=Zotero can now sync the full-text content of files in your Zotero libraries with zotero.org and other linked devices, allowing you to easily search for your files wherever you are. The full-text content of your files will not be shared publicly.
 sync.fulltext.upgradePrompt.changeLater=You can change this setting later from the Sync pane of the Zotero preferences.
-sync.fulltext.upgradePrompt.enable=Use Full-Text Syncing
+sync.fulltext.upgradePrompt.enable=Szinkronizálja a teljes szöveget
 
 sync.storage.mbRemaining=%SMB remaining
 sync.storage.kbRemaining=%SKB remaining
 sync.storage.filesRemaining=%1$S/%2$S files
-sync.storage.none=None
-sync.storage.downloads=Downloads:
-sync.storage.uploads=Uploads:
+sync.storage.none=Egyik sem
+sync.storage.downloads=Letöltések:
+sync.storage.uploads=Feltöltések:
 sync.storage.localFile=Helyi fájl
 sync.storage.remoteFile=Távoli fájl
 sync.storage.savedFile=Mentett fájl
@@ -861,9 +862,9 @@ sync.storage.error.webdav.sslCertificateError=Hiba az SSL tanúsítvánnyal az %
 sync.storage.error.webdav.sslConnectionError=SSL kapcsolódási hiba az %S szerverhez való kapcsolódás közben.
 sync.storage.error.webdav.loadURLForMoreInfo=További informáációkért töltse be a WebDAV URL-t a böngészőben.
 sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
-sync.storage.error.webdav.loadURL=Load WebDAV URL
+sync.storage.error.webdav.loadURL=WebDAV URL betöltése
 sync.storage.error.webdav.fileMissingAfterUpload=A potential problem was found with your WebDAV server.\n\nAn uploaded file was not immediately available for download. There may be a short delay between when you upload files and when they become available, particularly if you are using a cloud storage service.\n\nIf Zotero file syncing appears to work normally, you can ignore this message. If you have trouble, please post to the Zotero Forums.
-sync.storage.error.webdav.nonexistentFileNotMissing=Your WebDAV server is claiming that a nonexistent file exists. Contact your WebDAV server administrator for assistance.
+sync.storage.error.webdav.nonexistentFileNotMissing=Az ön WebDAV szervere szerint egy nemlétező fájl létezik. Vegye fel a kapcsolatot a WebDAV szerverének adminisztrátorával további segítségért.
 sync.storage.error.webdav.serverConfig.title=WebDAV Server Configuration Error
 sync.storage.error.webdav.serverConfig=Your WebDAV server returned an internal error.
 
@@ -880,8 +881,8 @@ sync.longTagFixer.saveTags=Címke mentése
 sync.longTagFixer.deleteTag=Címke törlése
 
 proxies.multiSite=Multi-Site
-proxies.error=Information Validation Error
-proxies.error.scheme.noHTTP=Valid proxy schemes must start with "http://" or "https://"
+proxies.error=Érvénytelen Proxy beállítások
+proxies.error.scheme.noHTTP=Az érvényes proxy sémának "http://" vagy "https//" formával kell kezdődnie.
 proxies.error.host.invalid=You must enter a full hostname for the site served by this proxy (e.g., jstor.org).
 proxies.error.scheme.noHost=A multi-site proxy scheme must contain the host variable (%h).
 proxies.error.scheme.noPath=A valid proxy scheme must contain either the path variable (%p) or the directory and filename variables (%d and %f).
@@ -893,71 +894,71 @@ proxies.notification.redirected.label=Zotero automatically redirected your reque
 proxies.notification.enable.button=Enable...
 proxies.notification.settings.button=Proxy Settings...
 proxies.recognized.message=Adding this proxy will allow Zotero to recognize items from its pages and will automatically redirect future requests to %1$S through %2$S.
-proxies.recognized.add=Add Proxy
+proxies.recognized.add=Proxy hozzáadása
 
-recognizePDF.noOCR=PDF does not contain OCRed text.
-recognizePDF.couldNotRead=Could not read text from PDF.
-recognizePDF.noMatches=No matching references found
-recognizePDF.fileNotFound=File not found
-recognizePDF.limit=Google Scholar query limit reached. Try again later.
+recognizePDF.noOCR=A PDF nem tartalmaz felismerhető szöveget.
+recognizePDF.couldNotRead=Nem lehet szöveget olvasni a PDF-ből.
+recognizePDF.noMatches=Nincs egyező hivatkozás
+recognizePDF.fileNotFound=A fájl nem található
+recognizePDF.limit=A Google Scholar túlterhelt. Próbálkozzon később.
 recognizePDF.error=An unexpected error occurred.
-recognizePDF.stopped=Cancelled
-recognizePDF.complete.label=Metadata Retrieval Complete
-recognizePDF.cancelled.label=Metadata Retrieval Cancelled
-recognizePDF.close.label=Close
-recognizePDF.captcha.title=Please enter CAPTCHA
-recognizePDF.captcha.description=Zotero uses Google Scholar to help identify PDFs. To continue using Google Scholar, please enter the text from the image below.
+recognizePDF.stopped=Törölve
+recognizePDF.complete.label=A metaadat visszaállítás befejeződött
+recognizePDF.cancelled.label=A metaadat visszaállítás sikertelen
+recognizePDF.close.label=Bezárás
+recognizePDF.captcha.title=Kérem gépelje be a CAPTCHA kódot
+recognizePDF.captcha.description=A Zotero a Google Scholar-t használja a PDF fájlok azonosításához. A Google Scholar használatához, kérem gépelje be az alábbi képről a szöveget.
 
-rtfScan.openTitle=Select a file to scan
-rtfScan.scanning.label=Scanning RTF Document...
+rtfScan.openTitle=Válasszon ki egy fájlt a vizsgálatra
+rtfScan.scanning.label=RTF dokumentum átvizsgálása…
 rtfScan.saving.label=Formatting RTF Document...
 rtfScan.rtf=Rich Text Format (.rtf)
-rtfScan.saveTitle=Select a location in which to save the formatted file
-rtfScan.scannedFileSuffix=(Scanned)
+rtfScan.saveTitle=Válasszon egy helyet, ahová menteni szeretné a formázott fájlt
+rtfScan.scannedFileSuffix=(Vizsgálat)
 
 
 file.accessError.theFile=The file '%S'
 file.accessError.aFile=A file
-file.accessError.cannotBe=cannot be
-file.accessError.created=created
-file.accessError.updated=updated
-file.accessError.deleted=deleted
+file.accessError.cannotBe=nem lehet
+file.accessError.created=létrehozni
+file.accessError.updated=frissítve
+file.accessError.deleted=törölni
 file.accessError.message.windows=Check that the file is not currently in use, that its permissions allow write access, and that it has a valid filename.
 file.accessError.message.other=Check that the file is not currently in use and that its permissions allow write access.
 file.accessError.restart=Restarting your computer or disabling security software may also help.
-file.accessError.showParentDir=Show Parent Directory
+file.accessError.showParentDir=Szülőkönyvtár mutatása
 
-lookup.failure.title=Lookup Failed
+lookup.failure.title=A keresés nem sikerült.
 lookup.failure.description=Zotero could not find a record for the specified identifier. Please verify the identifier and try again.
 lookup.failureToID.description=Zotero could not find any identifiers in your input. Please verify your input and try again.
 
-locate.online.label=View Online
-locate.online.tooltip=Go to this item online
-locate.pdf.label=View PDF
-locate.pdf.tooltip=Open PDF using the selected viewer
-locate.snapshot.label=View Snapshot
+locate.online.label=Online megtekintés
+locate.online.tooltip=Az elem elérése online
+locate.pdf.label=PDF megtekintése
+locate.pdf.tooltip=A PDF megnyitása a kiválasztott programmal
+locate.snapshot.label=Az állapot megtekintése
 locate.snapshot.tooltip=View snapshot for this item
-locate.file.label=View File
-locate.file.tooltip=Open file using the selected viewer
-locate.externalViewer.label=Open in External Viewer
-locate.externalViewer.tooltip=Open file in another application
-locate.internalViewer.label=Open in Internal Viewer
-locate.internalViewer.tooltip=Open file in this application
-locate.showFile.label=Show File
-locate.showFile.tooltip=Open the directory in which this file resides
+locate.file.label=Fájl megtekintése
+locate.file.tooltip=A fájl megnyitása a kiválasztott programmal
+locate.externalViewer.label=Megnyitás külső megjelenítővel
+locate.externalViewer.tooltip=Fájl megnyitás másik alkalmazásban
+locate.internalViewer.label=Megnyitás belső nézegetővel
+locate.internalViewer.tooltip=Fájl megnyitása ezzel az alkalmazással
+locate.showFile.label=Fájl megjelenítése
+locate.showFile.tooltip=A fájlt tartalmazó könyvtár megnyitása
 locate.libraryLookup.label=Library Lookup
 locate.libraryLookup.tooltip=Look up this item using the selected OpenURL resolver
 locate.manageLocateEngines=Manage Lookup Engines...
 
 standalone.corruptInstallation=Your Zotero Standalone installation appears to be corrupted due to a failed auto-update. While Zotero may continue to function, to avoid potential bugs, please download the latest version of Zotero Standalone from http://zotero.org/support/standalone as soon as possible.
-standalone.addonInstallationFailed.title=Add-on Installation Failed
+standalone.addonInstallationFailed.title=A kiegészítő telepítése nem sikerült
 standalone.addonInstallationFailed.body=The add-on "%S" could not be installed. It may be incompatible with this version of Zotero Standalone.
 standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
-standalone.rootWarning.exit=Exit
-standalone.rootWarning.continue=Continue
+standalone.rootWarning.exit=Kilépés
+standalone.rootWarning.continue=Folytatás
 standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
 
-connector.error.title=Zotero Connector Error
+connector.error.title=Zotero Connector hiba
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 connector.loadInProgress=Zotero Standalone was launched but is not accessible. If you experienced an error opening Zotero Standalone, restart Firefox.
 
@@ -965,5 +966,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
-firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.new=A Zotero megnyitásához kattintásához kattintson ide, vagy használja a %S billentyűparancsot.
 firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
diff --git a/chrome/locale/id-ID/zotero/zotero.dtd b/chrome/locale/id-ID/zotero/zotero.dtd
index 81d429860..15a1ba801 100644
--- a/chrome/locale/id-ID/zotero/zotero.dtd
+++ b/chrome/locale/id-ID/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "Log kesalahan mungkin mengandung pesan yang tidak terkait dengan Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Mohon tunggu sampai laporan kesalahan dikirimkan.">
 <!ENTITY zotero.errorReport.submitted "Laporan kesalahan Anda telah dikirimkan.">
 <!ENTITY zotero.errorReport.reportID "ID Laporan:">
diff --git a/chrome/locale/id-ID/zotero/zotero.properties b/chrome/locale/id-ID/zotero/zotero.properties
index 4cdfdf29c..164becf2b 100644
--- a/chrome/locale/id-ID/zotero/zotero.properties
+++ b/chrome/locale/id-ID/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Jika Anda tetap menerima pesan ini, restart komp
 errorReport.reportError=Laporkan Kesalahan...
 errorReport.reportErrors=Laporkan Kesalahan...
 errorReport.reportInstructions=Anda dapat melaporkan kesalahan ini dengan cara memilih "%S" dari menu Tindakan (gerigi).
-errorReport.followingErrors=Kesalahan-kesalahan berikut ini telah terjadi sejak memulai %S:
-errorReport.advanceMessage=Tekan %S untuk mengirimkan laporan kesalahan kepada pengembang Zotero.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Langkah-langkah untuk Mereproduksi:
 errorReport.expectedResult=Hasil yang diharapkan:
 errorReport.actualResult=Hasil sesungguhnya:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Item Tersimpan
 ingester.scrapeError=Tidak Dapat Menyimpan Item
 ingester.scrapeErrorDescription=Terjadi kesalahan saat menyimpan item ini. Cek %S untuk informasi lebih lanjut.
-ingester.scrapeErrorDescription.linkText=Masalah Translator yang Dikenal
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Proses penyimpanan gagal karena kesalahan Zotero terdahulu.
 
 ingester.importReferRISDialog.title=Impor RIS/Refer Zotero
diff --git a/chrome/locale/is-IS/zotero/zotero.dtd b/chrome/locale/is-IS/zotero/zotero.dtd
index 653d7deb5..1a5ae1af1 100644
--- a/chrome/locale/is-IS/zotero/zotero.dtd
+++ b/chrome/locale/is-IS/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "Villuskráin gæti innihaldið skilaboð sem ekki tengjast Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Vinsamlegast bíðið á meðan villuskýrsla er send.">
 <!ENTITY zotero.errorReport.submitted "Villuskýrsla þín hefur verið send.">
 <!ENTITY zotero.errorReport.reportID "Auðkennisnúmer (ID) skýrslu:">
diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties
index 7f7346ed9..a84df5370 100644
--- a/chrome/locale/is-IS/zotero/zotero.properties
+++ b/chrome/locale/is-IS/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Ef þú heldur áfram að fá þessi skilaboð s
 errorReport.reportError=Tilkynna villu...
 errorReport.reportErrors=Tilkynna villur...
 errorReport.reportInstructions=Þú getur tilkynnt þessa villu með því að velja "%S" í tóla (tannhjóla) valseðlinum.
-errorReport.followingErrors=Þessar villur hafa átt sér stað frá því keyrsla %S hófst:
-errorReport.advanceMessage=Ýttu á %S til að senda villuskilaboð til hönnuða Zotero.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Aðgerðir til endurtekningar:
 errorReport.expectedResult=Væntanlegar niðurstöður:
 errorReport.actualResult=Fengnar niðurstöður:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Færsla vistuð
 ingester.scrapeError=Gat ekki vistað færslu.
 ingester.scrapeErrorDescription=Villa átti sér stað við vistun þessarar færslu. Skoðaðu %S til frekari upplýsinga.
-ingester.scrapeErrorDescription.linkText=Þekkt þýðingavandamál
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Vistunarferlið mistókst vegna fyrri villu í Zotero.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer innflutningur
diff --git a/chrome/locale/it-IT/zotero/zotero.dtd b/chrome/locale/it-IT/zotero/zotero.dtd
index cdfb0f9ab..ebb8d6b6e 100644
--- a/chrome/locale/it-IT/zotero/zotero.dtd
+++ b/chrome/locale/it-IT/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Annulla">
 
 <!ENTITY zotero.errorReport.title "Resoconto di errore Zotero">
-<!ENTITY zotero.errorReport.unrelatedMessages "Il log degli errori potrebbe includere messaggi non riferibili a Zotero">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Attendere, rapporto di errore in fase di invio.">
 <!ENTITY zotero.errorReport.submitted "Il rapporto di errore è stato inviato.">
 <!ENTITY zotero.errorReport.reportID "ID rapporto:">
diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties
index e96101c69..2f9128332 100644
--- a/chrome/locale/it-IT/zotero/zotero.properties
+++ b/chrome/locale/it-IT/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Se si continua a ricevere questo messaggio riavv
 errorReport.reportError=Report Error...
 errorReport.reportErrors=Segnala errori...
 errorReport.reportInstructions=È possibile segnalare questo errore selezionando '%S' dal menu Azioni
-errorReport.followingErrors=Dall'avvio di %S si sono verificati i seguenti errori:
-errorReport.advanceMessage=Premere '%S' per inviare un rapporto di errore agli sviluppatori di Zotero
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Passaggio da riprodurre:
 errorReport.expectedResult=Risultato previsto:
 errorReport.actualResult=Risultato verificatosi:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Elemento salvato
 ingester.scrapeError=Impossibile salvare elemento
 ingester.scrapeErrorDescription=Si è verificato un errore durante il salvataggio dell'elemento. Consultare %S per ulteriori informazioni
-ingester.scrapeErrorDescription.linkText=Errore noto del motore di ricerca
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Processo di salvataggio non riuscito a causa di un precedente errore di Zotero.
 
 ingester.importReferRISDialog.title=Importazione RIS/Refer in Zotero
diff --git a/chrome/locale/ja-JP/zotero/preferences.dtd b/chrome/locale/ja-JP/zotero/preferences.dtd
index 5f84d7207..603b43b58 100644
--- a/chrome/locale/ja-JP/zotero/preferences.dtd
+++ b/chrome/locale/ja-JP/zotero/preferences.dtd
@@ -60,7 +60,7 @@
 <!ENTITY zotero.preferences.sync.about "同期（シンク）について">
 <!ENTITY zotero.preferences.sync.fileSyncing "ファイルの同期">
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL:">
-<!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "マイ・ライブラリにある添付ファイルを同期するとき右のプログラムを使う:">
+<!ENTITY zotero.preferences.sync.fileSyncing.myLibrary "マイ・ライブラリ内の添付ファイルの同期に右のプログラムを使う:">
 <!ENTITY zotero.preferences.sync.fileSyncing.groups "Zotero ストレジを利用してグループ・ライブラリの添付ファイルを同期する">
 <!ENTITY zotero.preferences.sync.fileSyncing.download "必要に応じて">
 <!ENTITY zotero.preferences.sync.fileSyncing.download.atSyncTime "同期する際に">
@@ -69,7 +69,7 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "使用許諾条件">
 <!ENTITY zotero.preferences.sync.reset.warning1 "次の操作は、稀に起こる特別な状況のためだけのもので、一般的な問題解決に用いられるべきではありません。多くの場合、リセットすることで更なる問題を引き起こします。以下をご参照ください。">
 <!ENTITY zotero.preferences.sync.reset.warning2 "同期リセットの設定">
-<!ENTITY zotero.preferences.sync.reset.warning3 "により詳しい情報がございます。">
+<!ENTITY zotero.preferences.sync.reset.warning3 "により詳しい情報があります。">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Zotero サーバと完全に同期（シンク）させる">
 <!ENTITY zotero.preferences.sync.reset.fullSync.desc "同期の履歴を無視し、ローカル（手元）の Zotero データと同期サーバのデータを融合する。">
 <!ENTITY zotero.preferences.sync.reset.restoreFromServer "Zotero サーバーから復元（リストア）する">
diff --git a/chrome/locale/ja-JP/zotero/searchbox.dtd b/chrome/locale/ja-JP/zotero/searchbox.dtd
index bf336db49..ad1ce04b5 100644
--- a/chrome/locale/ja-JP/zotero/searchbox.dtd
+++ b/chrome/locale/ja-JP/zotero/searchbox.dtd
@@ -1,13 +1,13 @@
 <!ENTITY zotero.search.name "検索式名：">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "ライブラリの中を検索">
 
 <!ENTITY zotero.search.joinMode.prefix "次の条件">
 <!ENTITY zotero.search.joinMode.any "のいずれか">
-<!ENTITY zotero.search.joinMode.all "すべて">
+<!ENTITY zotero.search.joinMode.all "のすべて">
 <!ENTITY zotero.search.joinMode.suffix "を満たす:">
 
-<!ENTITY zotero.search.recursive.label "サブフォルダを検索する">
+<!ENTITY zotero.search.recursive.label "サブコレクションを検索する">
 <!ENTITY zotero.search.noChildren "最上位階層のアイテムのみを表示">
 <!ENTITY zotero.search.includeParentsAndChildren "一致するアイテムの親アイテムと子アイテムを表示">
 
@@ -21,5 +21,5 @@
 <!ENTITY zotero.search.date.units.years "年間">
 
 <!ENTITY zotero.search.search "検索実行">
-<!ENTITY zotero.search.clear "クリア">
+<!ENTITY zotero.search.clear "消去">
 <!ENTITY zotero.search.saveSearch "検索条件を保存">
diff --git a/chrome/locale/ja-JP/zotero/zotero.dtd b/chrome/locale/ja-JP/zotero/zotero.dtd
index fcd547cea..b10dc8069 100644
--- a/chrome/locale/ja-JP/zotero/zotero.dtd
+++ b/chrome/locale/ja-JP/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "キャンセル">
 
 <!ENTITY zotero.errorReport.title "Zotero エラーレポート">
-<!ENTITY zotero.errorReport.unrelatedMessages "エラー・ログは Zotero とは無関係のメッセージを含んでいる可能性があります。">
+<!ENTITY zotero.errorReport.unrelatedMessages "エラーの記録にはZotero に無関係のメッセージが含まれている恐れがあります。">
 <!ENTITY zotero.errorReport.submissionInProgress "エラーレポートが送信されるまでお待ちください。">
 <!ENTITY zotero.errorReport.submitted "エラーレポートが送信されました。">
 <!ENTITY zotero.errorReport.reportID "レポート ID:">
@@ -45,7 +45,7 @@
 <!ENTITY zotero.collections.showUnfiledItems "未整理のアイテムを表示">
 
 <!ENTITY zotero.items.itemType "アイテムの種類">
-<!ENTITY zotero.items.type_column "Item Type">
+<!ENTITY zotero.items.type_column "アイテムの種類">
 <!ENTITY zotero.items.title_column "題名">
 <!ENTITY zotero.items.creator_column "編著者名">
 <!ENTITY zotero.items.date_column "日時">
diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties
index 505141ff2..0f517638f 100644
--- a/chrome/locale/ja-JP/zotero/zotero.properties
+++ b/chrome/locale/ja-JP/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=もし、この案内が繰り返し表示され
 errorReport.reportError=エラーを報告する...
 errorReport.reportErrors=エラーを報告する...
 errorReport.reportInstructions=エラーを報告するため、アクションメニュー (歯車形) から"%S"を選択して下さい。
-errorReport.followingErrors=以下のエラーが %S を起動してから発生しました。
-errorReport.advanceMessage=エラーを Zotero 開発者に報告するため、%S を押してください。
+errorReport.followingReportWillBeSubmitted=下記の報告が送信されます。
+errorReport.noErrorsLogged=%S が起動してからエラーは記録されていません。
+errorReport.advanceMessage=Zotero 開発者へ報告するためには %S を押してください。
 errorReport.stepsToReproduce=再現手順:
 errorReport.expectedResult=期待される結果:
 errorReport.actualResult=実際の結果:
@@ -192,8 +193,8 @@ tagColorChooser.numberKeyInstructions=キーボードの $NUMBER キーを押す
 tagColorChooser.maxTags=各ライブラリ内につき、 最大 %S 個のタグまでしか色を指定できません。
 
 pane.items.loading=アイテムリストを読み込んでいます...
-pane.items.columnChooser.moreColumns=More Columns
-pane.items.columnChooser.secondarySort=Secondary Sort (%S)
+pane.items.columnChooser.moreColumns=列を増やす
+pane.items.columnChooser.secondarySort=二番目の並び順 (%S)
 pane.items.attach.link.uri.title=URIへのリンクを添付する
 pane.items.attach.link.uri=URIを入力して下さい:
 pane.items.trash.title=ゴミ箱に移動する
@@ -482,7 +483,7 @@ ingester.scrapingTo=保存先
 ingester.scrapeComplete=アイテムを保存しました
 ingester.scrapeError=アイテムを保存できませんでした
 ingester.scrapeErrorDescription=アイテムの保存中にエラーが発生しました。 さらに詳しくは %S をご確認ください。
-ingester.scrapeErrorDescription.linkText=既知のトランスレータ不具合
+ingester.scrapeErrorDescription.linkText=トランスレータの不具合を解決
 ingester.scrapeErrorDescription.previousError=以前の Zotero エラーによって保存中にエラーが発生しました。
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer インポート
@@ -592,7 +593,7 @@ fileInterface.bibliographyGenerationError=参考文献目録を作成中にエ
 fileInterface.exportError=選択されたファイルをエクスポート中にエラーが発生しました。
 
 quickSearch.mode.titleCreatorYear=題名、編著者名、年
-quickSearch.mode.fieldsAndTags=すべてのフィールドとタグ
+quickSearch.mode.fieldsAndTags=全フィールドとタグ
 quickSearch.mode.everything=すべて
 
 advancedSearchMode=詳細検索モード — Enterキーを押すと検索できます。
@@ -965,5 +966,5 @@ firstRunGuidance.saveIcon=Zotero はこのページの文献を認識するこ
 firstRunGuidance.authorMenu=Zotero では、編集者と翻訳者についても指定することができます。このメニューから選択することによって、作者を編集者または翻訳者へと切り替えることができます。
 firstRunGuidance.quickFormat=題名か著者名を入力して文献を探してください。\n\n選択が完了したら、必要に応じて、泡をクリックするか Ctrl-\u2193を押して、ページ番号、接頭辞、接尾辞を追加してください。検索語句にページ番号を含めれば、ページ番号を直接追加することもできます。\n\n出典表記はワードプロセッサ文書中で直接編集することが可能です。
 firstRunGuidance.quickFormatMac=題名か著者名を入力して文献を探してください。\n\n選択が完了したら、必要に応じて、泡をクリックするか Cmd-\u2193を押して、ページ番号、接頭辞、接尾辞を追加してください。検索語句にページ番号を含めれば、ページ番号を直接追加することもできます。\n\n出典表記はワードプロセッサ文書中で直接編集することが可能です。
-firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
-firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.new=ここをクリックしてZoteroを開くか、%S のキーボードショートカットを使用してください
+firstRunGuidance.toolbarButton.upgrade=Zotero アイコンは Firefox ツールバーに表示されます。アイコンをクリックしてZoteroを起動するか、%S のキーボードショートカットを使用してください
diff --git a/chrome/locale/km/zotero/zotero.dtd b/chrome/locale/km/zotero/zotero.dtd
index d94a7562e..9fae4f081 100644
--- a/chrome/locale/km/zotero/zotero.dtd
+++ b/chrome/locale/km/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "កំណត់ហេតុកំហុសអាចបញ្ចូលសារដែលមិនពាក់ព័ន្ធទៅកាន់ហ្ស៊ូតេរ៉ូ។">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "សូមរង់ចាំ ខណៈពេលកំពុងធ្វើរបាយការណ៍អំពីកំហុស។">
 <!ENTITY zotero.errorReport.submitted "កំហុសបានធ្វើរបាយការណ៍រួចហើយ។">
 <!ENTITY zotero.errorReport.reportID "អត្តលេខរបាយការណ៍:">
diff --git a/chrome/locale/km/zotero/zotero.properties b/chrome/locale/km/zotero/zotero.properties
index a12069e74..1f4268aa5 100644
--- a/chrome/locale/km/zotero/zotero.properties
+++ b/chrome/locale/km/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=សូមចាប់ផ្តើមកំព្
 errorReport.reportError=រាយការណ៍កំហុស...
 errorReport.reportErrors=រាយការណ៍កំហុស...
 errorReport.reportInstructions=អ្នកអាចរាយការណ៍កំហុសតាមការជ្រើសរើស "%S" ពីតារាងបញ្ជី​សកម្មភាព (មាននិម្មិតសញ្ញារូបស្ពី)។
-errorReport.followingErrors=កំហុសដូចខាងក្រោមនេះបានកើតឡើងតាំងពីចាប់ផ្តើម %S:
-errorReport.advanceMessage=សូមចុច %S ដើម្បីបញ្ជូនកំហុសទៅកាន់អ្នកបង្កើតហ្ស៊ូតេរ៉ូ។
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=ជំហានក្នុងការផលិតឡើងវិញៈ
 errorReport.expectedResult=លទ្ធផលដែលបានរំពឹងទុកៈ
 errorReport.actualResult=លទ្ធផលជាក់ស្តែងៈ
@@ -482,7 +483,7 @@ ingester.scrapingTo=កំពុងរក្សាទុកទៅកាន់
 ingester.scrapeComplete=ឯកសារត្រូវបានទាញរក្សាទុក
 ingester.scrapeError=មិនអាចទាញឯកសាររក្សាទុកបាន
 ingester.scrapeErrorDescription=កំហុសបានកើតឡើង ខណៈពេលទាញឯកសារនេះមករក្សាទុក។​ សូមមើល %S សម្រាប់ព័ត៌បន្ថែម។
-ingester.scrapeErrorDescription.linkText=មានបញ្ហាជាមួយនិងកូដចម្លង
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=ដំណើរការទាញុឯកសាររក្សាទុកបានបរាជ័យ ដោយសារតែកំហុស​ហ្ស៊ូតេរ៉ូពីមុន។
 
 ingester.importReferRISDialog.title=ការទាញចូលឯកសារយោង/អ៊ែរអាយអេសហ្ស៊ូតេរ៉ូ
diff --git a/chrome/locale/ko-KR/zotero/zotero.dtd b/chrome/locale/ko-KR/zotero/zotero.dtd
index 90f416f3b..d8220952b 100644
--- a/chrome/locale/ko-KR/zotero/zotero.dtd
+++ b/chrome/locale/ko-KR/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "오류 로그에는 Zotero와 관련이 없는 메시지가 포함될 수 있습니다.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "오류 보고가 제출되는 동안 기다려 주세요.">
 <!ENTITY zotero.errorReport.submitted "오류 보고가 제출되었습니다.">
 <!ENTITY zotero.errorReport.reportID "보고서 ID:">
diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties
index 880ac5e54..9d9092a8c 100644
--- a/chrome/locale/ko-KR/zotero/zotero.properties
+++ b/chrome/locale/ko-KR/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=만약 이 메시지를 계속해서 받는다
 errorReport.reportError=오류 보고...
 errorReport.reportErrors=오류 보고...
 errorReport.reportInstructions=동작 (장치) 메뉴에서 "%S"(을)를 선택해 이 오류를 보고할 수 있습니다.
-errorReport.followingErrors=%S의 동작이후 다음의 오류가 발생했습니다:
-errorReport.advanceMessage=%S (을)를 눌러 Zotero 개발자들에게 오류 보고서를 보내주세요.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=재현 방법:
 errorReport.expectedResult=예상 결과:
 errorReport.actualResult=실제 결과:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=항목 저장됨.
 ingester.scrapeError=항목을 저장할 수 없습니다.
 ingester.scrapeErrorDescription=항목 저장중 오류가 발생했습니다. 더 많은 정보를 원하면 %S를(을) 확인하세요.
-ingester.scrapeErrorDescription.linkText=알려진 중계기 문제
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=저장 과정이 이전 Zotero의 오류 때문에 실패했습니다.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/lt-LT/zotero/searchbox.dtd b/chrome/locale/lt-LT/zotero/searchbox.dtd
index 6353197d4..9fd58a6be 100644
--- a/chrome/locale/lt-LT/zotero/searchbox.dtd
+++ b/chrome/locale/lt-LT/zotero/searchbox.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.search.name "Pavadinimas:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "Ieškoti bibliotekoje">
 
 <!ENTITY zotero.search.joinMode.prefix "Taikyti">
 <!ENTITY zotero.search.joinMode.any "bet kuriuos">
diff --git a/chrome/locale/lt-LT/zotero/zotero.dtd b/chrome/locale/lt-LT/zotero/zotero.dtd
index 2ed9ebcd6..02e4cc0cb 100644
--- a/chrome/locale/lt-LT/zotero/zotero.dtd
+++ b/chrome/locale/lt-LT/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Atšaukti">
 
 <!ENTITY zotero.errorReport.title "Pranešimas apie klaidą Zotero programoje">
-<!ENTITY zotero.errorReport.unrelatedMessages "Klaidų sąraše gali būti žinučių nesusijųsių su Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Prašome palaukti kol siunčiamas klaidų sąrašas.">
 <!ENTITY zotero.errorReport.submitted "Jūsų klaidų sąrašas buvo nusiųstas.">
 <!ENTITY zotero.errorReport.reportID "Pranešimo ID:">
@@ -45,7 +45,7 @@
 <!ENTITY zotero.collections.showUnfiledItems "Rodyti neužpildytus">
 
 <!ENTITY zotero.items.itemType "Įrašo tipas">
-<!ENTITY zotero.items.type_column "Item Type">
+<!ENTITY zotero.items.type_column "Įrašo tipas">
 <!ENTITY zotero.items.title_column "Antraštė">
 <!ENTITY zotero.items.creator_column "Autorius">
 <!ENTITY zotero.items.date_column "Data">
@@ -86,7 +86,7 @@
 <!ENTITY zotero.items.menu.attach.file "Pridėti turimą failo kopiją...">
 <!ENTITY zotero.items.menu.attach.fileLink "Pridėti failo nuorodą...">
 
-<!ENTITY zotero.items.menu.restoreToLibrary "Atkurti biblioteką">
+<!ENTITY zotero.items.menu.restoreToLibrary "Atkurti į biblioteką">
 <!ENTITY zotero.items.menu.duplicateItem "Sukurti įrašo kopiją">
 <!ENTITY zotero.items.menu.mergeItems "Apjungti įrašus...">
 
diff --git a/chrome/locale/lt-LT/zotero/zotero.properties b/chrome/locale/lt-LT/zotero/zotero.properties
index 950000104..8106df4d2 100644
--- a/chrome/locale/lt-LT/zotero/zotero.properties
+++ b/chrome/locale/lt-LT/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Jei vis dar matote šiuos pranešimus, iš naujo
 errorReport.reportError=Pranešti apie klaidą...
 errorReport.reportErrors=Pranešti apie klaidas...
 errorReport.reportInstructions=Apie šią klaidą galite pranešti iš Veiksmų (krumpliaračio) meniu pasirinkę „%S“.
-errorReport.followingErrors=Paleidus %S, buvo tokios klaidos:
-errorReport.advanceMessage=Norėdami išsiųsti pranešimą apie klaidą Zotero programos kūrėjams, spauskite %S.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Žingsniai, kurie iššaukia problemą
 errorReport.expectedResult=Tai, ko tikėjotės:
 errorReport.actualResult=Tai, kas iš tikrųjų atsitinka:
@@ -192,8 +193,8 @@ tagColorChooser.numberKeyInstructions=Įrašams šią gairę galite priskirti sp
 tagColorChooser.maxTags=Spalvas galite priskirti ne daugiau kaip %S gairėms(-ių).
 
 pane.items.loading=Įkeliamas įrašų sąrašas...
-pane.items.columnChooser.moreColumns=More Columns
-pane.items.columnChooser.secondarySort=Secondary Sort (%S)
+pane.items.columnChooser.moreColumns=Papildomi stulpeliai
+pane.items.columnChooser.secondarySort=Antrinis rūšiavimas (%S)
 pane.items.attach.link.uri.title=Prisegti nuorodą į URI
 pane.items.attach.link.uri=Įveskite adresą:
 pane.items.trash.title=Perkelti į šiukšlinę
@@ -482,7 +483,7 @@ ingester.scrapingTo=Įrašyti į
 ingester.scrapeComplete=Elementas įrašytas
 ingester.scrapeError=Elemento įrašyti nepavyko
 ingester.scrapeErrorDescription=Klaida įrašant šį įrašą. Daugiau informacijos rasite čia: %S.
-ingester.scrapeErrorDescription.linkText=Žinomos transliatoriaus klaidos
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Įrašyti nepavyko dėl ankstesnės Zotero klaidos.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer importavimas
diff --git a/chrome/locale/mn-MN/zotero/zotero.dtd b/chrome/locale/mn-MN/zotero/zotero.dtd
index 17a3d11dd..bfc9ed7de 100644
--- a/chrome/locale/mn-MN/zotero/zotero.dtd
+++ b/chrome/locale/mn-MN/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "The error log may include messages unrelated to Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Please wait while the error report is submitted.">
 <!ENTITY zotero.errorReport.submitted "Your error report has been submitted.">
 <!ENTITY zotero.errorReport.reportID "Report ID:">
diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties
index 737535626..9c95c85d0 100644
--- a/chrome/locale/mn-MN/zotero/zotero.properties
+++ b/chrome/locale/mn-MN/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=If you continue to receive this message, restart
 errorReport.reportError=Report Error...
 errorReport.reportErrors=Алдаануудыг илгээх...
 errorReport.reportInstructions=You can report this error by selecting "%S" from the Actions (gear) menu.
-errorReport.followingErrors=The following errors have occurred since starting %S:
-errorReport.advanceMessage=Press %S to send an error report to the Zotero developers.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Steps to Reproduce:
 errorReport.expectedResult=Expected result:
 errorReport.actualResult=Actual result:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=бүтээл хадгалсан
 ingester.scrapeError=Could Not Save Item
 ingester.scrapeErrorDescription=An error occurred while saving this item. Check %S for more information.
-ingester.scrapeErrorDescription.linkText=Known Translator Issues
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=The saving process failed due to a previous Zotero error.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/nb-NO/zotero/zotero.dtd b/chrome/locale/nb-NO/zotero/zotero.dtd
index 8dd6f3a44..098555f4b 100644
--- a/chrome/locale/nb-NO/zotero/zotero.dtd
+++ b/chrome/locale/nb-NO/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "Denne feilloggen kan inneholde meldinger som ikke har noe med Zotero å gjøre.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Vennligst vent mens feilrapporten blir levert.">
 <!ENTITY zotero.errorReport.submitted "Feilrapporten er levert.">
 <!ENTITY zotero.errorReport.reportID "Rapport-ID:">
diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties
index 3bacc7741..76024eef4 100644
--- a/chrome/locale/nb-NO/zotero/zotero.properties
+++ b/chrome/locale/nb-NO/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=If you continue to receive this message, restart
 errorReport.reportError=Report Error...
 errorReport.reportErrors=Rapporter feil...
 errorReport.reportInstructions=Du kan rapportere denne feilen ved å velge "%S" fra Handling-menyen (tannhjulet).
-errorReport.followingErrors=The following errors have occurred since starting %S:
-errorReport.advanceMessage=Velg %S for å sende en feilrapport til Zotero-utviklerne.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Trinn for å reprodusere feilen:
 errorReport.expectedResult=Forventet resultat:
 errorReport.actualResult=Faktisk resultat:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Element lagret.
 ingester.scrapeError=Kunne ikke lagre element.
 ingester.scrapeErrorDescription=En feil oppsto mens dette elementet ble forsøkt lagret. Se %S for mer informasjon.
-ingester.scrapeErrorDescription.linkText=Kjente feil med oversetteren
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Lagring mislyktes på grunn av en foregående feil.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/nl-NL/zotero/zotero.dtd b/chrome/locale/nl-NL/zotero/zotero.dtd
index e55c45db3..539352c5a 100644
--- a/chrome/locale/nl-NL/zotero/zotero.dtd
+++ b/chrome/locale/nl-NL/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Annuleren">
 
 <!ENTITY zotero.errorReport.title "Zotero-foutrapportage">
-<!ENTITY zotero.errorReport.unrelatedMessages "Het foutenlogboek kan berichten bevatten die niet gerelateerd zijn aan Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Even geduld a.u.b. totdat het foutenrapport is verstuurd.">
 <!ENTITY zotero.errorReport.submitted "Het foutenrapport is verstuurd.">
 <!ENTITY zotero.errorReport.reportID "Rapport ID:">
diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties
index e55564676..88e1c6c5f 100644
--- a/chrome/locale/nl-NL/zotero/zotero.properties
+++ b/chrome/locale/nl-NL/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Herstart uw computer als u deze boodschap blijft
 errorReport.reportError=Fout rapporteren…
 errorReport.reportErrors=Fouten rapporteren…
 errorReport.reportInstructions=U kunt deze fout rapporteren door "%S" te selecteren in het Acties-menu (tandwiel-pictogram).
-errorReport.followingErrors=De volgende fouten zijn opgetreden sinds het opstarten van %S:
-errorReport.advanceMessage=Druk op %S om een foutrapport te versturen naar de Zotero-ontwikkelaars.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Stappen om te reproduceren:
 errorReport.expectedResult=Verwacht resultaat:
 errorReport.actualResult=Werkelijk resultaat:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Sla op naar
 ingester.scrapeComplete=Item is opgeslagen
 ingester.scrapeError=Item kon niet opgeslagen worden.
 ingester.scrapeErrorDescription=Er is een fout opgetreden bij het opslaan van dit item. Zie %S voor meer informatie.
-ingester.scrapeErrorDescription.linkText=Bekende problemen met vertalers
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Het opslaan is mislukt door een eerdere Zotero-fout.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer-import
diff --git a/chrome/locale/nn-NO/zotero/zotero.dtd b/chrome/locale/nn-NO/zotero/zotero.dtd
index 1072a2f34..4729ad175 100644
--- a/chrome/locale/nn-NO/zotero/zotero.dtd
+++ b/chrome/locale/nn-NO/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "Denne feilloggen kan innehalde meldingar som ikkje har noko med Zotero å gjere.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Vennligst vent medan feilrapporten vert levert.">
 <!ENTITY zotero.errorReport.submitted "Feilrapporten er levert.">
 <!ENTITY zotero.errorReport.reportID "Rapport-ID:">
diff --git a/chrome/locale/nn-NO/zotero/zotero.properties b/chrome/locale/nn-NO/zotero/zotero.properties
index b97c33b72..ca1f54da9 100644
--- a/chrome/locale/nn-NO/zotero/zotero.properties
+++ b/chrome/locale/nn-NO/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Dersom du held fram me å få denne meldinga, s
 errorReport.reportError=Meld frå om feil …
 errorReport.reportErrors=Meld frå om feil …
 errorReport.reportInstructions=Du kan rapportera denne feilen ved å velja "%S" frå Handling-menyen (tannhjulet).
-errorReport.followingErrors=Følgjande feil har oppstått etter start av %S:
-errorReport.advanceMessage=Vel %S for å senda ein feilrapport til Zotero-utviklarane.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Trinn for å reprodusera feilen:
 errorReport.expectedResult=Forventa resultat:
 errorReport.actualResult=Faktisk resultat:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Element lagra.
 ingester.scrapeError=Kunne ikkje lagra element.
 ingester.scrapeErrorDescription=Ein feil oppstod medan dette elementet vart freista lagra. Sjå %S for meir informasjon.
-ingester.scrapeErrorDescription.linkText=Kjende feil med omsetjaren
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Lagring mislukkast på grunn av ein føregåande feil.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer-import
diff --git a/chrome/locale/pl-PL/zotero/preferences.dtd b/chrome/locale/pl-PL/zotero/preferences.dtd
index ce1435475..ecaa8a474 100644
--- a/chrome/locale/pl-PL/zotero/preferences.dtd
+++ b/chrome/locale/pl-PL/zotero/preferences.dtd
@@ -184,7 +184,7 @@
 <!ENTITY zotero.preferences.dataDir.reveal "Wyświetl katalog bazy danych">
 
 <!ENTITY zotero.preferences.attachmentBaseDir.caption "Katalog podstawowy załączników">
-<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero will use relative paths for linked file attachments within the base directory, allowing you to access files on different computers as long as the file structure within the base directory remains the same.">
+<!ENTITY zotero.preferences.attachmentBaseDir.message "Zotero użyje względnych ścieżek dla plików załączników w katalogu bazowym. Pozwoli ci to na dostęp do tych plików na różnych komputerach, tak długo, dopóki stuktura katalogów w katalogach bazowych pozostanie taka sama.">
 <!ENTITY zotero.preferences.attachmentBaseDir.basePath "Katalog podstawowy:">
 <!ENTITY zotero.preferences.attachmentBaseDir.selectBasePath "Wybierz...">
 <!ENTITY zotero.preferences.attachmentBaseDir.resetBasePath "Przywróć absolutne ścieżki...">
diff --git a/chrome/locale/pl-PL/zotero/searchbox.dtd b/chrome/locale/pl-PL/zotero/searchbox.dtd
index 4603796e4..53b51192c 100644
--- a/chrome/locale/pl-PL/zotero/searchbox.dtd
+++ b/chrome/locale/pl-PL/zotero/searchbox.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.search.name "Nazwa:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "Wyszukaj w bibliotece:">
 
 <!ENTITY zotero.search.joinMode.prefix "Zawiera">
 <!ENTITY zotero.search.joinMode.any "jakikolwiek">
diff --git a/chrome/locale/pl-PL/zotero/zotero.dtd b/chrome/locale/pl-PL/zotero/zotero.dtd
index c79046e6a..8c45cf92d 100644
--- a/chrome/locale/pl-PL/zotero/zotero.dtd
+++ b/chrome/locale/pl-PL/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Anuluj">
 
 <!ENTITY zotero.errorReport.title "Raport błędów Zotero">
-<!ENTITY zotero.errorReport.unrelatedMessages "Wykaz błędów może zawierać informacje nie związane z Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "Może zawierać informacje niezwiązane z Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Proszę czekać... Informacje o błędzie są wysyłane.">
 <!ENTITY zotero.errorReport.submitted "Informacje o błędzie zostały wysłane.">
 <!ENTITY zotero.errorReport.reportID "ID raportu:">
@@ -45,7 +45,7 @@
 <!ENTITY zotero.collections.showUnfiledItems "Pokaż Niepowiązane pliki">
 
 <!ENTITY zotero.items.itemType "Typ elementu">
-<!ENTITY zotero.items.type_column "Item Type">
+<!ENTITY zotero.items.type_column "Typ elementu">
 <!ENTITY zotero.items.title_column "Tytuł">
 <!ENTITY zotero.items.creator_column "Twórca">
 <!ENTITY zotero.items.date_column "Data">
diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties
index 618b051e3..51abbcb21 100644
--- a/chrome/locale/pl-PL/zotero/zotero.properties
+++ b/chrome/locale/pl-PL/zotero/zotero.properties
@@ -5,7 +5,7 @@ general.error=Błąd
 general.warning=Ostrzeżenie
 general.dontShowWarningAgain=Nie pokazuj tego ostrzeżenia ponownie.
 general.browserIsOffline=%S jest aktualnie w trybie offline.
-general.locate=Lokalizuj
+general.locate=Lokalizuj...
 general.restartRequired=Wymagane jest ponowne uruchomienie
 general.restartRequiredForChange=Aby zastosować zmianę %S musi zostać ponownie uruchomiony.
 general.restartRequiredForChanges=Aby zastosować zmiany %S musi zostać ponownie uruchomiony.
@@ -33,7 +33,7 @@ general.notNow=Nie teraz
 general.passed=Wykonano
 general.failed=Niepowodzenie
 general.and=i
-general.etAl=et al.
+general.etAl=i in.
 general.accessDenied=Odmowa dostępu
 general.permissionDenied=Brak uprawnienia
 general.character.singular=znak
@@ -57,7 +57,7 @@ general.keys.cmdShift=Cmd+Shift+
 
 general.operationInProgress=Operacja Zotero jest aktualnie w trakcie.
 general.operationInProgress.waitUntilFinished=Proszę poczekać na zakończenie.
-general.operationInProgress.waitUntilFinishedAndTryAgain=Proszę poczekać na zakończenie, a następnie spróbować ponownie..
+general.operationInProgress.waitUntilFinishedAndTryAgain=Proszę poczekać na zakończenie, a następnie spróbować ponownie.
 
 punctuation.openingQMark="
 punctuation.closingQMark="
@@ -70,7 +70,7 @@ install.quickStartGuide.message.view=Zobacz przewodnik Szybki Start, aby dowiedz
 install.quickStartGuide.message.thanks=Dziękujemy za zainstalowanie Zotero.
 
 upgrade.failed.title=Niepowodzenie aktualizacji
-upgrade.failed=Aktualizacja bazy danych Zotero nie powiodła się.
+upgrade.failed=Aktualizacja bazy danych Zotero nie powiodła się:
 upgrade.advanceMessage=Naciśnij %S, aby zaktualizować teraz.
 upgrade.dbUpdateRequired=Baza danych Zotero musi zostać zaktualizowana.
 upgrade.integrityCheckFailed=Twoja baza danych Zotero musi zostać naprawiona zanim aktualizacja będzie mogła być dokończona.
@@ -79,10 +79,11 @@ upgrade.couldNotMigrate=Zotero nie mógł przenieść wszystkich wymaganych plik
 upgrade.couldNotMigrate.restart=Jeśli ponownie zobaczysz ten komunikat, uruchom ponownie swój komputer.
 
 errorReport.reportError=Zgłoś błąd...
-errorReport.reportErrors=Zgłoś błędy
+errorReport.reportErrors=Zgłoś błędy...
 errorReport.reportInstructions=Można zgłosić ten błąd wybierając "%S" z menu "Funkcje".
-errorReport.followingErrors=Następujące błędy wystąpiły od czasu uruchomienia %S:
-errorReport.advanceMessage=Naciśnij przycisk %S, aby zgłosić błąd twórcom Zotero.
+errorReport.followingReportWillBeSubmitted=Następujący raport będzie wysłany:
+errorReport.noErrorsLogged=Nie zalogowano żadnych błędów od czasu uruchomienia %S.
+errorReport.advanceMessage=Wciśnij %S aby wysłać raport do programistów Zotero.
 errorReport.stepsToReproduce=Kroki do odtworzenia:
 errorReport.expectedResult=Oczekiwane wyniki:
 errorReport.actualResult=Rzeczywisty rezultat:
@@ -108,14 +109,14 @@ dataDir.previousDir=Poprzedni katalog:
 dataDir.useProfileDir=Użyj katalogu profilu %S
 dataDir.selectDir=Wybierz katalog danych Zotero
 dataDir.selectedDirNonEmpty.title=Katalog zawiera elementy
-dataDir.selectedDirNonEmpty.text=Wybrany katalog zawiera elementy i nie jest katalogiem danych Zotero.\n\nCzy mimo wszystko chcesz utworzyć pliki Zotero?
+dataDir.selectedDirNonEmpty.text=Wybrany katalog nie jest pusty i nie jest katalogiem danych Zotero.\n\nCzy mimo wszystko chcesz utworzyć pliki Zotero w tym katalogu?
 dataDir.selectedDirEmpty.title=Katalog jest pusty
 dataDir.selectedDirEmpty.text=The directory you selected is empty. To move an existing Zotero data directory, you will need to manually move files from the existing data directory to the new location after %1$S has closed.
 dataDir.selectedDirEmpty.useNewDir=Użyć nowego katalogu?
-dataDir.moveFilesToNewLocation=Be sure to move files from your existing Zotero data directory to the new location before reopening %1$S.
+dataDir.moveFilesToNewLocation=Upewnij się, że pliki z twojego istniejącego katalogu danych Zotero zostały przeniesione w nowe miejsce, zanim ponownie otworzysz %1$S.
 dataDir.incompatibleDbVersion.title=Niepasująca wersja bazy danych
 dataDir.incompatibleDbVersion.text=The currently selected data directory is not compatible with Zotero Standalone, which can share a database only with Zotero for Firefox 2.1b3 or later.\n\nUpgrade to the latest version of Zotero for Firefox first or select a different data directory for use with Zotero Standalone.
-dataDir.standaloneMigration.title=Informacja migracji Zotero
+dataDir.standaloneMigration.title=Znaleziono istniejącą bibliotekę Zotero
 dataDir.standaloneMigration.description=Wygląda na to, że pierwszy raz używasz %1$S. Czy chcesz aby %1$S zaimportował ustawienia z %2$S i użył twojego istniejącego katalogu danych?
 dataDir.standaloneMigration.multipleProfiles=%1$S będzie dzielić swój katalog danych z najczęściej ostatnio używanym profilem.
 dataDir.standaloneMigration.selectCustom=Własny katalog danych…
@@ -166,20 +167,20 @@ pane.collections.untitled=Bez nazwy
 pane.collections.unfiled=Niepowiązane elementy
 pane.collections.duplicate=Zduplikowane elementy
 
-pane.collections.menu.rename.collection=Zmień nazwę kolekcji
+pane.collections.menu.rename.collection=Zmień nazwę kolekcji...
 pane.collections.menu.edit.savedSearch=Edytuj wynik wyszukiwania
 pane.collections.menu.delete.collection=Usuń kolekcję...
 pane.collections.menu.delete.collectionAndItems=Usuń kolekcję i elementy...
 pane.collections.menu.delete.savedSearch=Usuń zapisane wyszukiwanie...
-pane.collections.menu.export.collection=Eksportuj kolekcję
-pane.collections.menu.export.savedSearch=Eksportuj wynik wyszukiwania
-pane.collections.menu.createBib.collection=Utwórz bibliografię z kolekcji
-pane.collections.menu.createBib.savedSearch=Utwórz bibliografię z wyniku wyszukiwania
+pane.collections.menu.export.collection=Eksportuj kolekcję...
+pane.collections.menu.export.savedSearch=Eksportuj wynik wyszukiwania...
+pane.collections.menu.createBib.collection=Utwórz bibliografię z kolekcji...
+pane.collections.menu.createBib.savedSearch=Utwórz bibliografię z wyniku wyszukiwania...
 
-pane.collections.menu.generateReport.collection=Utwórz raport z kolekcji
-pane.collections.menu.generateReport.savedSearch=Utwórz raport z wyniku wyszukiwania
+pane.collections.menu.generateReport.collection=Utwórz raport z kolekcji...
+pane.collections.menu.generateReport.savedSearch=Utwórz raport z wyniku wyszukiwania...
 
-pane.tagSelector.rename.title=Zmiana nazwy etykiety
+pane.tagSelector.rename.title=Zmień nazwę etykiety
 pane.tagSelector.rename.message=Proszę wprowadzić nową nazwę etykiety.\n\nNazwa etykiety zostanie zmieniona we wszystkich powiązanych elementach.
 pane.tagSelector.delete.title=Usuń etykietę
 pane.tagSelector.delete.message=Czy na pewno chcesz usunąć tę etykietę?\n\nEtykieta zostanie usunięta ze wszystkich elementów.
@@ -188,11 +189,11 @@ pane.tagSelector.numSelected.singular=Wybrano %S etykietę
 pane.tagSelector.numSelected.plural=Wybrano %S etykiet(y)
 pane.tagSelector.maxColoredTags=Only %S tags in each library can have colors assigned.
 
-tagColorChooser.numberKeyInstructions=You can add this tag to selected items by pressing the $NUMBER key on the keyboard.
+tagColorChooser.numberKeyInstructions=Możesz dodać ten znacznik do wybranych elementów wciskając klawisz $NUMBER na klawiaturze.
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.
 
 pane.items.loading=Wczytywanie listy elementów...
-pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.moreColumns=Więcej kolumn
 pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Dołącz odsyłacz do URI
 pane.items.attach.link.uri=Wprowadź URI:
@@ -202,18 +203,18 @@ pane.items.trash.multiple=Czy na pewno przenieść zaznaczone elementy do Kosza?
 pane.items.delete.title=Usuń
 pane.items.delete=Czy na pewno chcesz usunąć zaznaczony element?
 pane.items.delete.multiple=Czy na pewno chcesz usunąć zaznaczone elementy?
-pane.items.menu.remove=Usuń zaznaczony element
-pane.items.menu.remove.multiple=Usuń zaznaczone elementy
+pane.items.menu.remove=Usuń element z kolekcji
+pane.items.menu.remove.multiple=Usuń elementy z kolekcji
 pane.items.menu.moveToTrash=Przenieś element do Kosza...
 pane.items.menu.moveToTrash.multiple=Przenieś elementy do Kosza...
-pane.items.menu.export=Eksportuj zaznaczony element
-pane.items.menu.export.multiple=Eksportuj zaznaczone elementy
-pane.items.menu.createBib=Utwórz bibliografię z zaznaczonego elementu
-pane.items.menu.createBib.multiple=Utwórz bibliografię z zaznaczonych elementów
-pane.items.menu.generateReport=Utwórz raport z zaznaczonego elementu
-pane.items.menu.generateReport.multiple=Utwórz raport z zaznaczonych elementów
-pane.items.menu.reindexItem=Zindeksuj element powtórnie
-pane.items.menu.reindexItem.multiple=Zindeksuj elementy powtórnie
+pane.items.menu.export=Eksportuj element...
+pane.items.menu.export.multiple=Eksportuj elementy...
+pane.items.menu.createBib=Utwórz bibliografię z elementu...
+pane.items.menu.createBib.multiple=Utwórz bibliografię z elementów...
+pane.items.menu.generateReport=Utwórz raport z elementu...
+pane.items.menu.generateReport.multiple=Utwórz raport z elementów...
+pane.items.menu.reindexItem=Zindeksuj element ponownie
+pane.items.menu.reindexItem.multiple=Zindeksuj elementy ponownie
 pane.items.menu.recognizePDF=Pobierz metadane dla pliku PDF
 pane.items.menu.recognizePDF.multiple=Pobierz metadane dla plików PDF
 pane.items.menu.createParent=Utwórz element nadrzędny z wybranego elementu
@@ -239,7 +240,7 @@ pane.item.unselected.plural=%S elementów w tym widoku
 pane.item.duplicates.selectToMerge=Wybierz elementy do złączenia
 pane.item.duplicates.mergeItems=Łączenie %S elementów
 pane.item.duplicates.writeAccessRequired=Aby dokonać złączenia elementów wymagany jest prawo zapisu w bibliotece.
-pane.item.duplicates.onlyTopLevel=Only top-level full items can be merged.
+pane.item.duplicates.onlyTopLevel=Połączyć można tylko pełne elementy podstawowe.
 pane.item.duplicates.onlySameItemType=Łączone elementy muszą wszystkie być tego samego typu.
 
 pane.item.changeType.title=Zmień typ elementu
@@ -267,7 +268,7 @@ pane.item.attachments.count.singular=%S załącznik
 pane.item.attachments.count.plural=%S załączniki(ów)
 pane.item.attachments.select=Wybierz plik
 pane.item.attachments.PDF.installTools.title=Program PDF Tools nie jest zainstalowany
-pane.item.attachments.PDF.installTools.text=To use this feature, you must first install the PDF tools in the Search pane of the Zotero preferences.
+pane.item.attachments.PDF.installTools.text=Aby używać tej funkcji, musisz najpierw zainstalować narzędzia PDF w zakładce Wyszukiwanie w ustawieniach Zotero.
 pane.item.attachments.filename=Nazwa pliku
 pane.item.noteEditor.clickHere=kliknij tutaj
 pane.item.tags.count.zero=%S etykiet:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Zapisywanie do
 ingester.scrapeComplete=Element zapisano.
 ingester.scrapeError=Nie można zapisać elementu.
 ingester.scrapeErrorDescription=Podczas zapisywania tego elementu wystąpił błąd. Aby uzyskać więcej informacji zobacz %S.
-ingester.scrapeErrorDescription.linkText=Znane błędy translacji
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Zapisywanie nie powiodło się z powodu wcześniejszego błędu Zotero.
 
 ingester.importReferRISDialog.title=Importowanie Zotero RIS/Refer
@@ -762,8 +763,8 @@ sync.error.invalidLogin.text=Serwer synchronizacji Zotero nie zaakceptował twoj
 sync.error.enterPassword=Proszę podać hasło.
 sync.error.loginManagerInaccessible=Zotero nie może uzyskać dostępu do twoich danych logowania.
 sync.error.checkMasterPassword=Jeśli używasz hasła głównego w %S upewnij się, że zostało ono wprowadzone poprawnie.
-sync.error.corruptedLoginManager=This could also be due to a corrupted %1$S login manager database. To check, close %1$S, remove signons.sqlite from your %1$S profile directory, and re-enter your Zotero login information in the Sync pane of the Zotero preferences.
-sync.error.loginManagerCorrupted1=Zotero cannot access your login information, possibly due to a corrupted %S login manager database.
+sync.error.corruptedLoginManager=Może to być także spowodowane uszkodzoną bazą danych haseł %1$S. Aby sprawdzić, zamknij %1$S, usuń plik signons.sqlite ze swojego katalogu profilu %1$S, a następnie ponownie wprowadź swoje dane logowania Zotero w panelu Synchronizacja w ustawieniach Zotero.
+sync.error.loginManagerCorrupted1=Zotero nie może uzyskać dostępu do twoich danych logowania, prawdopodobnie z powodu uszkodzonej bazy danych haseł %S.
 sync.error.loginManagerCorrupted2=Close %1$S, remove signons.sqlite from your %2$S profile directory, and re-enter your Zotero login information in the Sync pane of the Zotero preferences.
 sync.error.syncInProgress=Synchronizacja jest aktualnie w trakcie.
 sync.error.syncInProgress.wait=Poczekaj na zakończenie poprzedniej synchronizacji albo uruchom ponownie %S.
@@ -792,7 +793,7 @@ sync.conflict.localVersionsKept=Zachowano wersje lokalne.
 sync.conflict.localVersionKept=Zachowano wersję lokalną.
 sync.conflict.recentVersionsKept=Zachowano najnowsze wersje.
 sync.conflict.recentVersionKept=Zachowano najnowszą wersję '%S'.
-sync.conflict.viewErrorConsole=View the %S Error Console for the full list of such changes.
+sync.conflict.viewErrorConsole=Zobacz konsolę błędów %S, aby przejżeć pełną listę zmian.
 sync.conflict.localVersion=Lokalna wersja: %S
 sync.conflict.remoteVersion=Zdalna wersja: %S
 sync.conflict.deleted=[usunięty]
@@ -842,7 +843,7 @@ sync.storage.error.permissionDeniedAtAddress=Nie masz uprawnień do utworzenia k
 sync.storage.error.checkFileSyncSettings=Proszę sprawdzić swoje ustawienia synchronizacji plików lub skontaktować się ze swoim administratorem serwera.
 sync.storage.error.verificationFailed=Weryfikacja %S nie powiodła się. Sprawdź swoje ustawienia synchronizacji plików w panelu Synchronizacja w ustawieniach Zotero.
 sync.storage.error.fileNotCreated=Nie można utworzyć pliku '%S' w katalogu danych Zotero.
-sync.storage.error.encryptedFilenames=Error creating file '%S'.\n\nSee http://www.zotero.org/support/kb/encrypted_filenames for more information.
+sync.storage.error.encryptedFilenames=Błąd tworzenia pliku "%S".\n\nZobacz http://www.zotero.org/support/kb/encrypted_filenames, aby uzyskać więcej informacji.
 sync.storage.error.fileEditingAccessLost=Nie masz już prawa modyfikowania plików w grupie '%S', w związku z czym pliki które dodałeś lub zmieniłeś nie mogą być zsynchronizowane z serwerem.
 sync.storage.error.copyChangedItems=Jeśli chcesz mieć możliwość skopiowania zmienionych elementów i plików w inne miejsce, anuluj teraz synchronizację.
 sync.storage.error.fileUploadFailed=Wysyłanie pliku nie powiodło się.
@@ -867,7 +868,7 @@ sync.storage.error.webdav.nonexistentFileNotMissing=Your WebDAV server is claimi
 sync.storage.error.webdav.serverConfig.title=Błąd konfiguracji serwera WebDAV
 sync.storage.error.webdav.serverConfig=Twój serwer WebDAV zwrócił błąd wewnętrzny.
 
-sync.storage.error.zfs.restart=A file sync error occurred. Please restart %S and/or your computer and try syncing again.\n\nIf the error persists, there may be a problem with either your computer or your network: security software, proxy server, VPN, etc. Try disabling any security/firewall software you're using or, if this is a laptop, try from a different network.
+sync.storage.error.zfs.restart=Wystąpił błąd synchronizacji. Proszę uruchomić ponownie %S i/lub komputer i spróbować synchronizacji ponownie.\n\nJeśli błąd się powtarza, być może masz problem z twoim komputerem lub siecią: oprogramowaniem zabezpieczającym, serwerem proxy, VPN itp. Spróbuj wyłączyć aktywne oprogramowanie zabezpieczające/firewall. Jeśli używasz laptopa, spróbuj synchronizacji z innej sieci.
 sync.storage.error.zfs.tooManyQueuedUploads=Masz zbyt dużo wysyłań w kolejce. Proszę spróbuj ponownie za %S minut.
 sync.storage.error.zfs.personalQuotaReached1=Twój limit przechowywania plików w Zotero został osiągnięty. Niektóre pliki nie zostały przesłane. Pozostałe dane Zotero zostaną zsynchronizowane z serwerem.
 sync.storage.error.zfs.personalQuotaReached2=Dla dodatkowych opcji przechowywania plików sprawdź swoje ustawienia konta na zotero.org.
@@ -922,7 +923,7 @@ file.accessError.cannotBe=nie może zostać
 file.accessError.created=utworzony
 file.accessError.updated=zaktualizowany
 file.accessError.deleted=usunięty
-file.accessError.message.windows=Check that the file is not currently in use, that its permissions allow write access, and that it has a valid filename.
+file.accessError.message.windows=Sprawdź, czy plik nie jest obecnie w użyciu, czy jego uprawnienia pozwalają na zapis oraz czy ma poprawną nazwę.
 file.accessError.message.other=Sprawdź, czy plik nie jest aktualnie w użyciu i czy prawa dostępu do niego zezwalają na zapis.
 file.accessError.restart=Ponowne uruchomienie komputera lub wyłączenie oprogramowania zabezpieczającego (np. antywirusowego) również może pomóc.
 file.accessError.showParentDir=Wyświetl katalog nadrzędny
@@ -955,15 +956,15 @@ standalone.addonInstallationFailed.body=Nie można zainstalować dodatku "%S". M
 standalone.rootWarning=You appear to be running Zotero Standalone as root. This is insecure and may prevent Zotero from functioning when launched from your user account.\n\nIf you wish to install an automatic update, modify the Zotero program directory to be writeable by your user account.
 standalone.rootWarning.exit=Wyjście
 standalone.rootWarning.continue=Kontynuuj
-standalone.updateMessage=A recommended update is available, but you do not have permission to install it. To update automatically, modify the Zotero program directory to be writeable by your user account.
+standalone.updateMessage=Dostępna jest zalecana aktualizacja, ale nie masz uprawnień do jej zainstalowania. Aby dokonać automatycznej aktualizacji, zmodyfikuj uprawnienia katalogu, w którym znajduje się program Zotero, tak aby mieć w nim prawo zapisu.
 
 connector.error.title=Błąd połączenia Zotero
 connector.standaloneOpen=Nie można uzyskać dostępu do twojej bazy danych, ponieważ samodzielny program Zotero jest uruchomiony. Możesz przeglądać swoje zbiory w samodzielnym programie Zotero.
-connector.loadInProgress=Zotero Standalone was launched but is not accessible. If you experienced an error opening Zotero Standalone, restart Firefox.
+connector.loadInProgress=Samodzielny program Zotero został uruchomiony, ale nie jest dostępny. Jeśli podczas uruchamiania samodzielnego programu Zotero pojawił się błąd, uruchom ponownie Firefoksa.
 
 firstRunGuidance.saveIcon=Zotero rozpoznaje cytowanie na tej stronie. Kliknij tą ikonę na pasku adresu, aby zapisać cytowania w twojej bibliotece Zotero.
 firstRunGuidance.authorMenu=Zotero pozwala także na dodawanie redaktorów i tłumaczy. Można zmienić autora na tłumacza wybierając z tego menu.
 firstRunGuidance.quickFormat=Wpisz tytuł lub autora aby szukać pozycji w bibliotece.\n\nGdy dokonasz wyboru, kliknij bąbelek lub wciśnij Ctrl-\↓ aby dodać numery stron, przedrostki lub przyrostki. Możesz również wpisać numery stron wraz z wyszukiwanymi frazami, aby dodać je bezpośrednio.\n\nMożesz zmieniać odnośniki bezpośrednio w dokumencie edytora tekstu.
 firstRunGuidance.quickFormatMac=Wpisz tytuł lub autora aby szukać pozycji w bibliotece.\n\nGdy dokonasz wyboru, kliknij bąbelek lub wciśnij Cmd-\↓ aby dodać numery stron, przedrostki lub przyrostki. Możesz również wpisać numery stron wraz z wyszukiwanymi frazami, aby dodać je bezpośrednio.\n\nMożesz zmieniać odnośniki bezpośrednio w dokumencie edytora tekstu.
-firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
-firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.new=Kliknij tutaj, aby otworzyć Zotero lub użyj skrótu klawiaturowego %S.
+firstRunGuidance.toolbarButton.upgrade=Ikonę Zotero znajdziesz teraz w pasku narzędzi Firefoksa. Kliknij ikonę, aby uruchomić Zotero lub użyj skrótu klawiaturowego %S.
diff --git a/chrome/locale/pt-BR/zotero/zotero.dtd b/chrome/locale/pt-BR/zotero/zotero.dtd
index 8054c431b..07aa07f19 100644
--- a/chrome/locale/pt-BR/zotero/zotero.dtd
+++ b/chrome/locale/pt-BR/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancelar">
 
 <!ENTITY zotero.errorReport.title "Relatório de erros do Zotero">
-<!ENTITY zotero.errorReport.unrelatedMessages "O registro de erro pode conter mensagens não relacionadas a Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Por favor, aguarde enquanto o relatório de erro é enviado.">
 <!ENTITY zotero.errorReport.submitted "Seu relatório de erro foi enviado.">
 <!ENTITY zotero.errorReport.reportID "Número de identificação do relatório:">
diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties
index 2161d739e..7d8f0a248 100644
--- a/chrome/locale/pt-BR/zotero/zotero.properties
+++ b/chrome/locale/pt-BR/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Se você continuar a receber esta mensagem, rein
 errorReport.reportError=Relatar erro...
 errorReport.reportErrors=Relatar erros...
 errorReport.reportInstructions=Você pode relatar este erro selecionando "%S" no menu de Ações (engrenagem).
-errorReport.followingErrors=Os seguintes erros ocorreram desde a inicialização de %S:
-errorReport.advanceMessage=Pressione %S para enviar um relatório de erro para os desenvolvedores Zotero.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Passos para reproduzr:
 errorReport.expectedResult=Resultado experado:
 errorReport.actualResult=Resultado efetivo:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Salvar para
 ingester.scrapeComplete=Item salvo.
 ingester.scrapeError=Não foi possível salvar item.
 ingester.scrapeErrorDescription=Um erro ocorreu ao salvar este item. Verifique %S para mais informações.
-ingester.scrapeErrorDescription.linkText=Questões conhecidas relativas a tradutores
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=O processo de salvamento falhou devido a um erro Zotero anterior.
 
 ingester.importReferRISDialog.title=Importar RIS/Refer para o Zotero 
diff --git a/chrome/locale/pt-PT/zotero/searchbox.dtd b/chrome/locale/pt-PT/zotero/searchbox.dtd
index 0f936d618..bea3b22de 100644
--- a/chrome/locale/pt-PT/zotero/searchbox.dtd
+++ b/chrome/locale/pt-PT/zotero/searchbox.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.search.name "Nome:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "Procurar na biblioteca:">
 
 <!ENTITY zotero.search.joinMode.prefix "Fazer corresponder">
 <!ENTITY zotero.search.joinMode.any "qualquer dos">
diff --git a/chrome/locale/pt-PT/zotero/zotero.dtd b/chrome/locale/pt-PT/zotero/zotero.dtd
index e7eb21dfb..ce19815ca 100644
--- a/chrome/locale/pt-PT/zotero/zotero.dtd
+++ b/chrome/locale/pt-PT/zotero/zotero.dtd
@@ -5,10 +5,10 @@
 <!ENTITY zotero.general.edit "Editar">
 <!ENTITY zotero.general.delete "Remover">
 <!ENTITY zotero.general.ok "OK">
-<!ENTITY zotero.general.cancel "Cancel">
+<!ENTITY zotero.general.cancel "Cancelar">
 
 <!ENTITY zotero.errorReport.title "Relatório de Erros do Zotero">
-<!ENTITY zotero.errorReport.unrelatedMessages "O registo de erros pode incluir mensagens alheias ao Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Por favor aguarde enquanto o relatório de erro é enviado.">
 <!ENTITY zotero.errorReport.submitted "O relatório de erro foi enviado.">
 <!ENTITY zotero.errorReport.reportID "ID de Relatório:">
@@ -45,7 +45,7 @@
 <!ENTITY zotero.collections.showUnfiledItems "Mostrar Itens por Arquivar">
 
 <!ENTITY zotero.items.itemType "Tipo de Item">
-<!ENTITY zotero.items.type_column "Item Type">
+<!ENTITY zotero.items.type_column "Tipo de Item">
 <!ENTITY zotero.items.title_column "Título">
 <!ENTITY zotero.items.creator_column "Criador">
 <!ENTITY zotero.items.date_column "Data">
diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties
index 44ed77463..3d6e29f8b 100644
--- a/chrome/locale/pt-PT/zotero/zotero.properties
+++ b/chrome/locale/pt-PT/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Se continuar a receber esta mensagem, reinicie o
 errorReport.reportError=Reportar Erro...
 errorReport.reportErrors=Reportar Erros...
 errorReport.reportInstructions=Pode reportar este erro seleccionando "%S" no menu de Acções (roda dentada).
-errorReport.followingErrors=Ocorreram os seguintes erros desde o início de %S:
-errorReport.advanceMessage=Carregue em %S para reportar um erro aos desenvolvedores do Zotero.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Passos para Reproduzir:
 errorReport.expectedResult=Resultado esperado:
 errorReport.actualResult=Resultado obtido:
@@ -192,8 +193,8 @@ tagColorChooser.numberKeyInstructions=Pode adicionar esta etiqueta aos itens sel
 tagColorChooser.maxTags=Pode-se atribuir cores a até %S etiquetas por biblioteca.
 
 pane.items.loading=Carregando lista de itens...
-pane.items.columnChooser.moreColumns=More Columns
-pane.items.columnChooser.secondarySort=Secondary Sort (%S)
+pane.items.columnChooser.moreColumns=Mais Colunas
+pane.items.columnChooser.secondarySort=Ordenação Secundária (%S)
 pane.items.attach.link.uri.title=Anexar Ligação a URI
 pane.items.attach.link.uri=Introduza um URI:
 pane.items.trash.title=Mover para o Lixo
@@ -482,7 +483,7 @@ ingester.scrapingTo=Guardando em
 ingester.scrapeComplete=Item Guardado
 ingester.scrapeError=Impossível Guardar Item
 ingester.scrapeErrorDescription=Ocorreu um erro ao guardar este item. Consulte %S para mais informação.
-ingester.scrapeErrorDescription.linkText=Problemas de Tradução Conhecidos
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Não foi possível guardar devido a um erro anterior no Zotero.
 
 ingester.importReferRISDialog.title=Importação de RIS/Refer do Zotero
@@ -762,9 +763,9 @@ sync.error.invalidLogin.text=O servidor de sincronização Zotero não aceitou o
 sync.error.enterPassword=Por favor introduza uma palavra-passe.
 sync.error.loginManagerInaccessible=O Zotero não consegue aceder à sua informação de autenticação.
 sync.error.checkMasterPassword=Se está a usar uma palavra-passe mestra em %S, assegure-se de que a introduziu com sucesso.
-sync.error.corruptedLoginManager=This could also be due to a corrupted %1$S login manager database. To check, close %1$S, remove signons.sqlite from your %1$S profile directory, and re-enter your Zotero login information in the Sync pane of the Zotero preferences.
+sync.error.corruptedLoginManager=Isto também se pode dever a uma base de dados corrompida do do gestor de autenticação %1$S. Para verificar, feche %1$S, remova o arquivo signons.sqlite da sua pasta de perfil %1$S e volte a introduzir a sua informação de autenticação no separador Sincronização das preferências do Zotero.
 sync.error.loginManagerCorrupted1=O zotero não consegue aceder à sua informação de autenticação, possivelmente devido a uma corrupção da base de dados do gestor de autenticação %S.
-sync.error.loginManagerCorrupted2=Close %1$S, remove signons.sqlite from your %2$S profile directory, and re-enter your Zotero login information in the Sync pane of the Zotero preferences.
+sync.error.loginManagerCorrupted2=Feche %1$S, remova o arquivo signons.sqlite da sua pasta de perfil %2$S e reintroduza as suas credenciais Zotero no painel Sincronização das preferências do Zotero.
 sync.error.syncInProgress=Está em curso uma outra operação de sincronização.
 sync.error.syncInProgress.wait=Espere pelo fim da operação de sincronização anterior ou reinicie o Firefox.
 sync.error.writeAccessLost=Deixou de ter acesso para escrita ao grupo Zotero '%S', por isso os itens que adicionou ou editou não podem ser sincronizados com o servidor.
@@ -897,16 +898,16 @@ proxies.recognized.add=Adicionar Cópia Local
 
 recognizePDF.noOCR=O PDF não contem texto opticamente reconhecido.
 recognizePDF.couldNotRead=Não foi possível ler texto do PDF.
-recognizePDF.noMatches=No matching references found
-recognizePDF.fileNotFound=File not found
-recognizePDF.limit=Google Scholar query limit reached. Try again later.
+recognizePDF.noMatches=Nenhuma referência correspondente encontrada
+recognizePDF.fileNotFound=Arquivo não encontrado
+recognizePDF.limit=Atingido o limite de pedidos ao Google Scholar. Tente mais tarde.
 recognizePDF.error=Ocorreu um erro inesperado.
-recognizePDF.stopped=Cancelled
-recognizePDF.complete.label=Metadata Retrieval Complete
-recognizePDF.cancelled.label=Metadata Retrieval Cancelled
+recognizePDF.stopped=Cancelada
+recognizePDF.complete.label=Recuperação de Metadados Completa
+recognizePDF.cancelled.label=Recuperação de Metadados Cancelada
 recognizePDF.close.label=Fechar
-recognizePDF.captcha.title=Please enter CAPTCHA
-recognizePDF.captcha.description=Zotero uses Google Scholar to help identify PDFs. To continue using Google Scholar, please enter the text from the image below.
+recognizePDF.captcha.title=Por favor introduza o CAPTCHA
+recognizePDF.captcha.description=O Zotero usa o Google Scholar para ajudar a identificar PDF. Para continuar a usar o Google Scholar, por favor introduza o texto da imagem abaixo.
 
 rtfScan.openTitle=Seleccionar um arquivo a analisar
 rtfScan.scanning.label=Analisando Documento RTF...
@@ -965,5 +966,5 @@ firstRunGuidance.saveIcon=O Zotero reconhece uma referência nesta página. Carr
 firstRunGuidance.authorMenu=O Zotero também lhe permite especificar editores e tradutores. Pode transformar um autor num editor ou num tradutor fazendo a sua escolha neste menu.
 firstRunGuidance.quickFormat=Introduza um título ou um autor para procurar uma referência.\n\nDepois de fazer a sua selecção, carregue na bolha ou carregue em Ctrl-\u2193 para adicionar números de páginas, prefixos ou sufixos. Pode também incluir um número de página junto com os termos da sua pesquisa para o adicionar directamente.\n\nPode editar as citações directamente no documento do processador de texto.
 firstRunGuidance.quickFormatMac=Introduza um título ou um autor para procurar uma referência.\n\nDepois de fazer a sua selecção, carregue na bolha ou carregue em Cmd-\u2193 para adicionar números de páginas, prefixos ou sufixos. Pode também incluir um número de página junto com os termos da sua pesquisa para o adicionar directamente.\n\nPode editar as citações directamente no documento do processador de texto.
-firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
-firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.new=Clique aqui para abrir o Zotero ou use o atalho do teclado %S.
+firstRunGuidance.toolbarButton.upgrade=O ícone do Zotero pode agora ser encontrado na barra de ferramentas do Firefox. Clique no ícone para abrir o Zotero ou use o atalho do teclado %S.
diff --git a/chrome/locale/ro-RO/zotero/zotero.dtd b/chrome/locale/ro-RO/zotero/zotero.dtd
index bd6bb2daa..0a7dec57e 100644
--- a/chrome/locale/ro-RO/zotero/zotero.dtd
+++ b/chrome/locale/ro-RO/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Anulare">
 
 <!ENTITY zotero.errorReport.title "Raportul de erori Zotero">
-<!ENTITY zotero.errorReport.unrelatedMessages "Jurnalul de erori poate include mesaje fără legătură cu Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Așteaptă, te rog, ca raportul de eroare să fie trimis.">
 <!ENTITY zotero.errorReport.submitted "Raportul de eroare a fost trimis.">
 <!ENTITY zotero.errorReport.reportID "ID raport:">
diff --git a/chrome/locale/ro-RO/zotero/zotero.properties b/chrome/locale/ro-RO/zotero/zotero.properties
index e80845c71..71bd4a740 100644
--- a/chrome/locale/ro-RO/zotero/zotero.properties
+++ b/chrome/locale/ro-RO/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Dacă primești în continuare acest mesaj, repo
 errorReport.reportError=Raportează eroarea...
 errorReport.reportErrors=Raportează erori...
 errorReport.reportInstructions=Poți raporta această eroare selectând "%S" din meniul Acțiuni (roata dințată).
-errorReport.followingErrors=De la pornirea %S au apărut următoarele erori:
-errorReport.advanceMessage=Apasă %S pentru a trimite un raport de erori dezvoltatorilor Zotero
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Pași pentru a reproduce:
 errorReport.expectedResult=Rezultat așteptat:
 errorReport.actualResult=Rezultat actual:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Salvare în
 ingester.scrapeComplete=Înregistrare salvată
 ingester.scrapeError=Înregistrarea n-a putut fi salvată
 ingester.scrapeErrorDescription=A apărut o eroare în timpul salvării acestei înregistrări. Controlați %S pentru mai multe informații.
-ingester.scrapeErrorDescription.linkText=Alte traduceri ale traducătorului
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Procesul de salvare a eșuat din cauza unei erori anterioare din Zotero.
 
 ingester.importReferRISDialog.title=Import Zotero RIS/Refer
diff --git a/chrome/locale/ru-RU/zotero/zotero.dtd b/chrome/locale/ru-RU/zotero/zotero.dtd
index 919c2a28e..294b4b6f7 100644
--- a/chrome/locale/ru-RU/zotero/zotero.dtd
+++ b/chrome/locale/ru-RU/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Отчет об ошибке Zotero">
-<!ENTITY zotero.errorReport.unrelatedMessages "Журнал ошибок может содержать сообщения не относящиеся к Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Подождите, пока отчет об ошибке будет отослан.">
 <!ENTITY zotero.errorReport.submitted "Отчет об ошибке отослан.">
 <!ENTITY zotero.errorReport.reportID "Номер отчета:">
diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties
index 9160fabae..10adfca9e 100644
--- a/chrome/locale/ru-RU/zotero/zotero.properties
+++ b/chrome/locale/ru-RU/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Если данное сообщение про
 errorReport.reportError=Сообщить об ошибке…
 errorReport.reportErrors=Сообщите об ошибках…
 errorReport.reportInstructions=Вы можете сообщить об этой ошибке выбрав "%S" в меню Действия (шестерня).
-errorReport.followingErrors=Следующие ошибки возникли после запуска %S:
-errorReport.advanceMessage=Нажмите %S, чтобы послать отчет об ошибке разработчикам Zotero.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Предпринимаемые Шаги:
 errorReport.expectedResult=Ожидаемый результат:
 errorReport.actualResult=Реальный результат:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Сохранение в
 ingester.scrapeComplete=Документ сохранен
 ingester.scrapeError=Не получилось сохранить документ
 ingester.scrapeErrorDescription=Произошла ошибка при сохранении этого документа. Смотрите %S для дополнительной информации.
-ingester.scrapeErrorDescription.linkText=Известные проблемы транслятора
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Процесс сохранения не завершен из-за предыдущей ошибки Zotero.
 
 ingester.importReferRISDialog.title=Импортирование RIS/Refer в Zotero
diff --git a/chrome/locale/sk-SK/zotero/searchbox.dtd b/chrome/locale/sk-SK/zotero/searchbox.dtd
index 97b698916..f3b8eb161 100644
--- a/chrome/locale/sk-SK/zotero/searchbox.dtd
+++ b/chrome/locale/sk-SK/zotero/searchbox.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.search.name "Meno:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "Hľadať v knižnici:">
 
 <!ENTITY zotero.search.joinMode.prefix "Zodpovedá">
 <!ENTITY zotero.search.joinMode.any "ktorémukoľvek">
diff --git a/chrome/locale/sk-SK/zotero/zotero.dtd b/chrome/locale/sk-SK/zotero/zotero.dtd
index 05aaf010a..0b966d4c1 100644
--- a/chrome/locale/sk-SK/zotero/zotero.dtd
+++ b/chrome/locale/sk-SK/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Zrušiť">
 
 <!ENTITY zotero.errorReport.title "Výkaz chýb Zotera">
-<!ENTITY zotero.errorReport.unrelatedMessages "Hlásenie o chybe môže obsahovať informácie nesúvisiace so Zoterom.">
+<!ENTITY zotero.errorReport.unrelatedMessages "Toto môže obsahovať hlásenia nesúvisiace so Zoterom.">
 <!ENTITY zotero.errorReport.submissionInProgress "Prosím počkajte, kým sa hlásenie o chybe neodošle.">
 <!ENTITY zotero.errorReport.submitted "Hlásenie o chybe bolo odoslané.">
 <!ENTITY zotero.errorReport.reportID "ID hlásenia:">
@@ -45,7 +45,7 @@
 <!ENTITY zotero.collections.showUnfiledItems "Zobraziť nezaradené exempláre">
 
 <!ENTITY zotero.items.itemType "Typ exemplára">
-<!ENTITY zotero.items.type_column "Item Type">
+<!ENTITY zotero.items.type_column "Typ exemplára">
 <!ENTITY zotero.items.title_column "Názov">
 <!ENTITY zotero.items.creator_column "Autor">
 <!ENTITY zotero.items.date_column "Dátum">
diff --git a/chrome/locale/sk-SK/zotero/zotero.properties b/chrome/locale/sk-SK/zotero/zotero.properties
index ced799108..801f4e87a 100644
--- a/chrome/locale/sk-SK/zotero/zotero.properties
+++ b/chrome/locale/sk-SK/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Ak sa vám táto správa zjavuje opakovane, pros
 errorReport.reportError=Ohlásenie chyby...
 errorReport.reportErrors=Ohlásiť chyby...
 errorReport.reportInstructions=Túto chybu môžete nahlásiť zvolením "%S" z menu Akcie (ozubené koliesko).
-errorReport.followingErrors=Od spustenia sa vyskytli nasledovné chyby %S:
-errorReport.advanceMessage=Pre nahlásenie chyby vývojárom stlačte %S.
+errorReport.followingReportWillBeSubmitted=Odošle sa nasledovné hlásenie:
+errorReport.noErrorsLogged=Od štartu %S neboli zaznamenané žiadne chyby.
+errorReport.advanceMessage=Pre odoslanie hlásenia vývojárom stlačte %S.
 errorReport.stepsToReproduce=Kroky, ktoré viedli ku chybe:
 errorReport.expectedResult=Očakávaný výsledok:
 errorReport.actualResult=Skutočný výsledok:
@@ -192,8 +193,8 @@ tagColorChooser.numberKeyInstructions=Túto značku môžete pridať k vybraném
 tagColorChooser.maxTags=Najviac %S značiek v každej knižnici môže mať pridelené farby.
 
 pane.items.loading=Nahrávam zoznam položiek...
-pane.items.columnChooser.moreColumns=More Columns
-pane.items.columnChooser.secondarySort=Secondary Sort (%S)
+pane.items.columnChooser.moreColumns=Viac stĺpcov
+pane.items.columnChooser.secondarySort=Druhotné triedenie (%S)
 pane.items.attach.link.uri.title=Pripojiť odkaz na URI
 pane.items.attach.link.uri=Vložiť URI:
 pane.items.trash.title=Presunúť do koša
@@ -482,7 +483,7 @@ ingester.scrapingTo=Ukladá sa do
 ingester.scrapeComplete=Položka bola uložená
 ingester.scrapeError=Nemôžem uložiť položku
 ingester.scrapeErrorDescription=Pri ukladaní položky sa vyskytla chyba. Pre viac informácií si pozrite %S.
-ingester.scrapeErrorDescription.linkText=Známe problémy s konvertormi
+ingester.scrapeErrorDescription.linkText=Riešenie problémov s konvertormi
 ingester.scrapeErrorDescription.previousError=Kvôli predchádzajúcej chybe Zotera ukladanie zlyhalo.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/sl-SI/zotero/searchbox.dtd b/chrome/locale/sl-SI/zotero/searchbox.dtd
index 0e60cb510..e554f9056 100644
--- a/chrome/locale/sl-SI/zotero/searchbox.dtd
+++ b/chrome/locale/sl-SI/zotero/searchbox.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.search.name "Ime:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "Išči v knjižnici:">
 
 <!ENTITY zotero.search.joinMode.prefix "Ujemanje">
 <!ENTITY zotero.search.joinMode.any "s katerimkoli">
diff --git a/chrome/locale/sl-SI/zotero/zotero.dtd b/chrome/locale/sl-SI/zotero/zotero.dtd
index a1d5acc26..9a0cb7ad9 100644
--- a/chrome/locale/sl-SI/zotero/zotero.dtd
+++ b/chrome/locale/sl-SI/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Prekliči">
 
 <!ENTITY zotero.errorReport.title "Poročilo o napaki Zotero">
-<!ENTITY zotero.errorReport.unrelatedMessages "Zapisnik napak lahko vključuje sporočila, ki se ne nanašajo na Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "Vključuje lahko sporočila, ki se ne nanašajo na Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Počakajte, da je poročilo o napaki oddano.">
 <!ENTITY zotero.errorReport.submitted "Poročilo o napaki je bilo oddano.">
 <!ENTITY zotero.errorReport.reportID "ID poročila:">
@@ -45,7 +45,7 @@
 <!ENTITY zotero.collections.showUnfiledItems "Pokaži nerazvrščene vnose">
 
 <!ENTITY zotero.items.itemType "Vrsta vnosa">
-<!ENTITY zotero.items.type_column "Item Type">
+<!ENTITY zotero.items.type_column "Vrsta vnosa">
 <!ENTITY zotero.items.title_column "Naslov">
 <!ENTITY zotero.items.creator_column "Ustvaril">
 <!ENTITY zotero.items.date_column "Datum">
diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties
index 5526ef04b..1d0b12cf9 100644
--- a/chrome/locale/sl-SI/zotero/zotero.properties
+++ b/chrome/locale/sl-SI/zotero/zotero.properties
@@ -81,7 +81,8 @@ upgrade.couldNotMigrate.restart=Če še naprej prejemate to sporočilo, ponovon
 errorReport.reportError=Poročaj o napaki ...
 errorReport.reportErrors=Poročaj o napakah ...
 errorReport.reportInstructions=To napako lahko sporočite z izbiro »%S« v meniju Dejanja (zobnik).
-errorReport.followingErrors=Od zagona %S je prišlo do naslednjih napak:
+errorReport.followingReportWillBeSubmitted=Oddano bo naslednje poročilo:
+errorReport.noErrorsLogged=Od zahona %S ni zabeleženih nobenih napak.
 errorReport.advanceMessage=Pritisnite %S, če želite poslati poročilo o napaki razvijalcem Zotera.
 errorReport.stepsToReproduce=Koraki do napake:
 errorReport.expectedResult=Pričakovan rezultat:
@@ -192,8 +193,8 @@ tagColorChooser.numberKeyInstructions=To značko lahko dodate izbranim vnosom s
 tagColorChooser.maxTags=Največ %S značk v vsaki knjižnici ima lahko dodeljeno barvo.
 
 pane.items.loading=Nalaganje seznama vnosov ...
-pane.items.columnChooser.moreColumns=More Columns
-pane.items.columnChooser.secondarySort=Secondary Sort (%S)
+pane.items.columnChooser.moreColumns=Več stolpcev
+pane.items.columnChooser.secondarySort=Drugotno razvrščanje (%S)
 pane.items.attach.link.uri.title=URI pripni povezavo
 pane.items.attach.link.uri=Vnesite URI:
 pane.items.trash.title=Premakni v koš
@@ -482,7 +483,7 @@ ingester.scrapingTo=Shranjevanje v
 ingester.scrapeComplete=Vnos shranjen
 ingester.scrapeError=Vnosa ni mogoče shraniti
 ingester.scrapeErrorDescription=Napaka pri shranjevanju tega vnosa. Preverite %S za več podatkov.
-ingester.scrapeErrorDescription.linkText=Znane težave prevajalnikov
+ingester.scrapeErrorDescription.linkText=Reševanje težav prevajalnikov
 ingester.scrapeErrorDescription.previousError=Postopek shranjevanja ni uspel zaradi prejšnje napake Zotero.
 
 ingester.importReferRISDialog.title=Uvoz RIS/Refer Zotero
diff --git a/chrome/locale/sr-RS/zotero/zotero.dtd b/chrome/locale/sr-RS/zotero/zotero.dtd
index 7d506cfe4..751db58e3 100644
--- a/chrome/locale/sr-RS/zotero/zotero.dtd
+++ b/chrome/locale/sr-RS/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "Дневник грешака може да садржи поруке невезане за Зотеро.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Сачекајте док се извештај о грешци шаље.">
 <!ENTITY zotero.errorReport.submitted "Извештај о грешци је послат.">
 <!ENTITY zotero.errorReport.reportID "Број извештаја:">
diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties
index 18b107287..f8d2b939d 100644
--- a/chrome/locale/sr-RS/zotero/zotero.properties
+++ b/chrome/locale/sr-RS/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Ако и даље будете добијали
 errorReport.reportError=Грешка у извештају...
 errorReport.reportErrors=Направи извештај о грешкама...
 errorReport.reportInstructions=Можете известити ову грешку избором „%S” из менија за Радње (зупчаник).
-errorReport.followingErrors=The following errors have occurred since starting %S:
-errorReport.advanceMessage=Притисните %S да пошаљете извештај о грешци програмерима Зотера
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Кораци за репродукцију:
 errorReport.expectedResult=Очекивани резултати:
 errorReport.actualResult=Стварни резултат:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Ставка сачувана.
 ingester.scrapeError=Нисам могао сачувати ставку.
 ingester.scrapeErrorDescription=Грешка је начињена током чувања ове ставке. Погледајте %S за више података.
-ingester.scrapeErrorDescription.linkText=Познати проблеми преводиоца
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Процес чувања није успео због предходне грешке у Зотеру.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/sv-SE/zotero/preferences.dtd b/chrome/locale/sv-SE/zotero/preferences.dtd
index 472484b82..3ab5c3943 100644
--- a/chrome/locale/sv-SE/zotero/preferences.dtd
+++ b/chrome/locale/sv-SE/zotero/preferences.dtd
@@ -19,7 +19,7 @@
 <!ENTITY zotero.preferences.fontSize.medium "Mellan">
 <!ENTITY zotero.preferences.fontSize.large "Stor">
 <!ENTITY zotero.preferences.fontSize.xlarge "Större">
-<!ENTITY zotero.preferences.fontSize.notes "Teckenstorlek på anteckningar">
+<!ENTITY zotero.preferences.fontSize.notes "Teckenstorlek för anteckningar">
 
 <!ENTITY zotero.preferences.miscellaneous "Övrigt">
 <!ENTITY zotero.preferences.autoUpdate "Kolla automatiskt efter uppdaterade källfångare och stilar">
@@ -67,7 +67,7 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "efter behov">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Genom att använda Zotero Storage går du med på tjänstens">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "avtalsvillkor">
-<!ENTITY zotero.preferences.sync.reset.warning1 "Följande åtgärder är endast till för sällsynta, särskilda situationer och ska inte användas för vanlig felsökning. I många fall kan återställning istället ge upphov till nya problem. Se">
+<!ENTITY zotero.preferences.sync.reset.warning1 "Följande åtgärder är endast till för sällsynta, särskilda situationer och ska inte användas för vanlig felsökning. I många fall kan en återställning istället orsaka nya problem. Se">
 <!ENTITY zotero.preferences.sync.reset.warning2 "Återställningsalternativ för synkronisering">
 <!ENTITY zotero.preferences.sync.reset.warning3 "för mer information.">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Komplett synkronisering med Zotero Server">
diff --git a/chrome/locale/sv-SE/zotero/searchbox.dtd b/chrome/locale/sv-SE/zotero/searchbox.dtd
index d9ada55c1..52d5fd066 100644
--- a/chrome/locale/sv-SE/zotero/searchbox.dtd
+++ b/chrome/locale/sv-SE/zotero/searchbox.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.search.name "Namn:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "Sök i bibliotek:">
 
 <!ENTITY zotero.search.joinMode.prefix "Hitta">
 <!ENTITY zotero.search.joinMode.any "vilken som helst">
diff --git a/chrome/locale/sv-SE/zotero/zotero.dtd b/chrome/locale/sv-SE/zotero/zotero.dtd
index c27c7c393..dfd33c183 100644
--- a/chrome/locale/sv-SE/zotero/zotero.dtd
+++ b/chrome/locale/sv-SE/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Avbryt">
 
 <!ENTITY zotero.errorReport.title "Zotero-felrapporting">
-<!ENTITY zotero.errorReport.unrelatedMessages "Felloggen kan innehålla meddelanden som inte har med Zotero att göra.">
+<!ENTITY zotero.errorReport.unrelatedMessages "Det kan innehålla meddelanden som inte har med Zotero att göra.">
 <!ENTITY zotero.errorReport.submissionInProgress "Var vänlig vänta medan felrapporten skickas.">
 <!ENTITY zotero.errorReport.submitted "Felrapporten har skickats.">
 <!ENTITY zotero.errorReport.reportID "Rapport-ID:">
@@ -45,7 +45,7 @@
 <!ENTITY zotero.collections.showUnfiledItems "Visa oregistererade källor">
 
 <!ENTITY zotero.items.itemType "Källtyp">
-<!ENTITY zotero.items.type_column "Item Type">
+<!ENTITY zotero.items.type_column "Källtyp">
 <!ENTITY zotero.items.title_column "Titel">
 <!ENTITY zotero.items.creator_column "Skapare">
 <!ENTITY zotero.items.date_column "Datum">
diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties
index c67158850..ee211534c 100644
--- a/chrome/locale/sv-SE/zotero/zotero.properties
+++ b/chrome/locale/sv-SE/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Om du fortsätter få det här meddelandet bör
 errorReport.reportError=Rapportera felet...
 errorReport.reportErrors=Rapportera felen...
 errorReport.reportInstructions=Du kan rapportera det här felet genom att välja "%S" från menyn Åtgärder (kugghjulet).
-errorReport.followingErrors=Följande fel har uppstått sedan %S startades:
-errorReport.advanceMessage=Tryck %S för att skicka en felrapport till utvecklarna av Zotero.
+errorReport.followingReportWillBeSubmitted=Följande rapport kommer att skickas:
+errorReport.noErrorsLogged=Inga fel har loggats sedan %S startades.
+errorReport.advanceMessage=Tryck %S för att skicka rapporten till utvecklarna av Zotero.
 errorReport.stepsToReproduce=Vad gör man för att återskapa felet?
 errorReport.expectedResult=Förväntat resultat:
 errorReport.actualResult=Faktiskt resultat:
@@ -192,8 +193,8 @@ tagColorChooser.numberKeyInstructions=Du kan lägga till denna etikett till vald
 tagColorChooser.maxTags=Upp till %S etiketter i varje katalog kan förses med en färg.
 
 pane.items.loading=Laddar lista med källor...
-pane.items.columnChooser.moreColumns=More Columns
-pane.items.columnChooser.secondarySort=Secondary Sort (%S)
+pane.items.columnChooser.moreColumns=Fler kolumner
+pane.items.columnChooser.secondarySort=Sekundär sortering (%S)
 pane.items.attach.link.uri.title=Bifoga länk till URI
 pane.items.attach.link.uri=Ange en URI:
 pane.items.trash.title=Flytta till papperskorgen
@@ -482,7 +483,7 @@ ingester.scrapingTo=Spara till
 ingester.scrapeComplete=Källa sparad
 ingester.scrapeError=Källan kunde inte sparas
 ingester.scrapeErrorDescription=Ett fel uppstod när källan skulle sparas. Se %S för mer information.
-ingester.scrapeErrorDescription.linkText=Kända problem med källfångare
+ingester.scrapeErrorDescription.linkText=Felsök problem med källfångare
 ingester.scrapeErrorDescription.previousError=Sparandet misslyckades p.g.a. ett tidigare Zotero-fel.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/th-TH/zotero/zotero.dtd b/chrome/locale/th-TH/zotero/zotero.dtd
index 73998f6b8..4422a09e3 100644
--- a/chrome/locale/th-TH/zotero/zotero.dtd
+++ b/chrome/locale/th-TH/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "บันทึกความผิดพลาดอาจรวมข้อความที่ไม่เกี่ยวกับ Zotero ไว้ด้วย">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "โปรดรอในระหว่างที่รายงานข้อผิดพลาดกำลังส่งอยู่">
 <!ENTITY zotero.errorReport.submitted "รายงานข้อผิดพลาดถูกส่งเรียบร้อยแล้ว">
 <!ENTITY zotero.errorReport.reportID "รหัสรายงาน:">
diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties
index 9da838696..60df0ab45 100644
--- a/chrome/locale/th-TH/zotero/zotero.properties
+++ b/chrome/locale/th-TH/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=ถ้าคุณยังคงได้รั
 errorReport.reportError=รายงานความผิดพลาด...
 errorReport.reportErrors=รายงานความผิดพลาด...
 errorReport.reportInstructions=คุณสามารถรายงานข้อผิดพลาดนี้ได้โดยการเลือก "%S" จากเมนูปฏิบัติการ (รูปเกียร์)
-errorReport.followingErrors=ความผิดพลาดนี้ถูกพบตั้งแต่เริ่ม %S:
-errorReport.advanceMessage=กด %S เพื่อรายงานข้อผิดพลาดไปยังผู้พัฒนา Zotero
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=ขั้นตอนเพื่อที่จะทำให้เกิดขึ้นอีก:
 errorReport.expectedResult=ผลลัพธ์ที่คาดหวัง:
 errorReport.actualResult=ผลลัพธ์จริง:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=รายการถูกบันทึกแล้ว
 ingester.scrapeError=ไม่สามารถบันทึกรายการได้
 ingester.scrapeErrorDescription=พบความผิดพลาดขณะบันทึกรายการนี้ รายละเอียดเพิ่มเติมดูได้จาก %S
-ingester.scrapeErrorDescription.linkText=ปัญหาโปรแกรมแปลข้อมูลเมทาที่ทราบ
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=การบันทึกล้มเหลวเนื่องจากความผิดพลาดของ Zotero ก่อนหน้านี้
 
 ingester.importReferRISDialog.title=นำเข้า RIS/อ้างอิง สู่ Zotero
diff --git a/chrome/locale/tr-TR/zotero/preferences.dtd b/chrome/locale/tr-TR/zotero/preferences.dtd
index 3f2d14177..f12571d57 100644
--- a/chrome/locale/tr-TR/zotero/preferences.dtd
+++ b/chrome/locale/tr-TR/zotero/preferences.dtd
@@ -67,7 +67,7 @@
 <!ENTITY zotero.preferences.sync.fileSyncing.download.onDemand "Gerek duyulduğunda">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos1 "Zotero deposunu kullandığınızda, bu koşulları kabul etmiş oluyorsunuz:">
 <!ENTITY zotero.preferences.sync.fileSyncing.tos2 "Şartlar ve Koşullar">
-<!ENTITY zotero.preferences.sync.reset.warning1 "Aşağıdaki işlemler, yalnızca ender ve özel durumlar altında kullanılmalı, ve genel sorun göderme amaçlı kullanılmamalıdırlar. Çoğu durumda, sıfırlama ek sorunlara neden olacaktır. Bakınız:">
+<!ENTITY zotero.preferences.sync.reset.warning1 "Aşağıdaki işlemler, yalnızca ender ve özel durumlar altında kullanılmalı, ve genel sorun giderme amaçlı kullanılmamalıdırlar. Birçok durumda, sıfırlama ek sorunlara neden olacaktır. Bakınız:">
 <!ENTITY zotero.preferences.sync.reset.warning2 "Eşitlemeyi Sıfırlama Seçenekleri">
 <!ENTITY zotero.preferences.sync.reset.warning3 "Daha fazla bilgi için">
 <!ENTITY zotero.preferences.sync.reset.fullSync "Zetoro Sunucusu ile Tam Eşitleme">
diff --git a/chrome/locale/tr-TR/zotero/searchbox.dtd b/chrome/locale/tr-TR/zotero/searchbox.dtd
index fe03472a4..b49211ceb 100644
--- a/chrome/locale/tr-TR/zotero/searchbox.dtd
+++ b/chrome/locale/tr-TR/zotero/searchbox.dtd
@@ -1,6 +1,6 @@
 <!ENTITY zotero.search.name "İsim:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "Kitaplıkta ara:">
 
 <!ENTITY zotero.search.joinMode.prefix "Aşağıdakilerden">
 <!ENTITY zotero.search.joinMode.any "herhangi birine">
diff --git a/chrome/locale/tr-TR/zotero/zotero.dtd b/chrome/locale/tr-TR/zotero/zotero.dtd
index 1f0968716..45ef3004c 100644
--- a/chrome/locale/tr-TR/zotero/zotero.dtd
+++ b/chrome/locale/tr-TR/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "İptal Et">
 
 <!ENTITY zotero.errorReport.title "Zotero Hata Raporu">
-<!ENTITY zotero.errorReport.unrelatedMessages "Hata kaydı Zotero ile ilgili olmayan iletileri de içerebilir.">
+<!ENTITY zotero.errorReport.unrelatedMessages "Bu, Zotero ile ilgili olmayan mesajlar içerebilir.">
 <!ENTITY zotero.errorReport.submissionInProgress "Lütfen hata raporu gönderilene kadar bekleyiniz.">
 <!ENTITY zotero.errorReport.submitted "Hata raporu gönderilmiştir.">
 <!ENTITY zotero.errorReport.reportID "Rapor Kimlik Numarası:">
@@ -45,7 +45,7 @@
 <!ENTITY zotero.collections.showUnfiledItems "Dosyalanmamış Eserleri Göster">
 
 <!ENTITY zotero.items.itemType "Eser Türü">
-<!ENTITY zotero.items.type_column "Item Type">
+<!ENTITY zotero.items.type_column "Eser Türü">
 <!ENTITY zotero.items.title_column "Başlık">
 <!ENTITY zotero.items.creator_column "Yaratan">
 <!ENTITY zotero.items.date_column "Tarih">
diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties
index 7580a2658..298156034 100644
--- a/chrome/locale/tr-TR/zotero/zotero.properties
+++ b/chrome/locale/tr-TR/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=Eğer bu iletiyi almaya devam ediyorsanız, bilg
 errorReport.reportError=Hatayı Bildir...
 errorReport.reportErrors=Hataları Bildir...
 errorReport.reportInstructions=Menü çubuğundan Eylemler (dişli) menüsünden "%S"i seçerek bu hatayı bildirebilirsiniz.
-errorReport.followingErrors=%S başlatıldığından beri aşağıdaki hatalar oluştu.
-errorReport.advanceMessage=Zotero geliştiricilerine bir hata raporu göndermek için %S'e basınız.
+errorReport.followingReportWillBeSubmitted=Bu rapor gönderilecektir:
+errorReport.noErrorsLogged=%S başladığından beri hiçbir hata günlüğe kaydedilmedi.
+errorReport.advanceMessage=Zotero geliştiricilerine bir rapor göndermek için %S'e basınız.
 errorReport.stepsToReproduce=Bu hatayı yeniden yaratabilmek için adımlar:
 errorReport.expectedResult=Beklenen sonuç:
 errorReport.actualResult=Gerçekleşen sonuç:
@@ -192,8 +193,8 @@ tagColorChooser.numberKeyInstructions=Bu etiketi klavyedeki $NUMBER tuşuna basa
 tagColorChooser.maxTags=Her kitaplıkta sadece %S etikete renk atanmış olabilir.
 
 pane.items.loading=Eserlerin listesi yükleniyor...
-pane.items.columnChooser.moreColumns=More Columns
-pane.items.columnChooser.secondarySort=Secondary Sort (%S)
+pane.items.columnChooser.moreColumns=Başka Sütun
+pane.items.columnChooser.secondarySort=İkincil Sıralama (%S)
 pane.items.attach.link.uri.title=URI'ye Bağlantı Ekle.
 pane.items.attach.link.uri=Bir URI giriniz:
 pane.items.trash.title=Çöpe Gönder
@@ -482,7 +483,7 @@ ingester.scrapingTo=Buraya kaydediyor:
 ingester.scrapeComplete=Eser Kaydedildi.
 ingester.scrapeError=Eser Kaydedilemiyor.
 ingester.scrapeErrorDescription=Bu eseri kaydederken bir hata meydana geldi. Lütfen tekrar deneyiniz. Eğer bu hata kalıcı ise, çevirmen ile bağlantıya geçiniz.
-ingester.scrapeErrorDescription.linkText=Bilinen Çevirmen Sorunları
+ingester.scrapeErrorDescription.linkText=Çevirmen Sorunlarını Giderme
 ingester.scrapeErrorDescription.previousError=Önceki Zotero hatasına göre kayıt işlemi başarısız oldu.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer İçeri Aktarması
diff --git a/chrome/locale/uk-UA/zotero/about.dtd b/chrome/locale/uk-UA/zotero/about.dtd
index eff4adc16..e86aec0d6 100644
--- a/chrome/locale/uk-UA/zotero/about.dtd
+++ b/chrome/locale/uk-UA/zotero/about.dtd
@@ -1,13 +1,13 @@
 <!ENTITY zotero.version "версія">
-<!ENTITY zotero.createdby "Створено:">
+<!ENTITY zotero.createdby "Розробник:">
 <!ENTITY zotero.director "Директор:">
-<!ENTITY zotero.directors "Директори:">
+<!ENTITY zotero.directors "Керівники:">
 <!ENTITY zotero.developers "Розробники:">
 <!ENTITY zotero.alumni "Колишні розробники:">
-<!ENTITY zotero.about.localizations "Локалізації:">
+<!ENTITY zotero.about.localizations "Локалізація:">
 <!ENTITY zotero.about.additionalSoftware "Програмне забезпечення сторонніх виробників і стандарти:">
-<!ENTITY zotero.executiveProducer "Виконавчий продюсер:">
+<!ENTITY zotero.executiveProducer "Голова розробки:">
 <!ENTITY zotero.thanks "Особливі подяки:">
 <!ENTITY zotero.about.close "Закрити">
 <!ENTITY zotero.moreCreditsAndAcknowledgements "Більше інформації та подяки">
-<!ENTITY zotero.citationProcessing "Цитування та бібліографічна обробка">
+<!ENTITY zotero.citationProcessing "Обробка цитування та бібліографії ">
diff --git a/chrome/locale/uk-UA/zotero/preferences.dtd b/chrome/locale/uk-UA/zotero/preferences.dtd
index 5a5208e66..65a4bfae0 100644
--- a/chrome/locale/uk-UA/zotero/preferences.dtd
+++ b/chrome/locale/uk-UA/zotero/preferences.dtd
@@ -1,4 +1,4 @@
-<!ENTITY zotero.preferences.title "Налащтування Zotero">
+<!ENTITY zotero.preferences.title "Налаштування Zotero">
 
 <!ENTITY zotero.preferences.default "За замовчуванням:">
 <!ENTITY zotero.preferences.items "документа">
@@ -25,7 +25,7 @@
 <!ENTITY zotero.preferences.autoUpdate "Автоматично перевіряти на наявність оновлених трансляторів та стилів">
 <!ENTITY zotero.preferences.updateNow "Оновити зараз">
 <!ENTITY zotero.preferences.reportTranslationFailure "Повідомити про транслтори сатів, що не працюють">
-<!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Дозволити zotero.org моифікувати зміст на снові поточної версії Zotero">
+<!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Дозволити zotero.org модифікувати зміст на основі поточної версії Zotero">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader.tooltip "Якщо включено, поточна версія Zotero  буде додаватись до HTTP запитам на  zotero.org.">
 <!ENTITY zotero.preferences.parseRISRefer "Використовувати Zotero для завантаження файлів BibTeX/RIS/Refer">
 <!ENTITY zotero.preferences.automaticSnapshots "Автоматично робити знімки при створенні документів з веб-сторінок">
@@ -56,7 +56,7 @@
 <!ENTITY zotero.preferences.sync.lostPassword "Забули пароль?">
 <!ENTITY zotero.preferences.sync.syncAutomatically "Синхронізувати автоматично">
 <!ENTITY zotero.preferences.sync.syncFullTextContent "Синхронізувати повнотекстовий вміст">
-<!ENTITY zotero.preferences.sync.syncFullTextContent.desc "Zotero можете синхронізувати повнотекстовий вміст файлів у ваших бібліотеках Zotero з zotero.org та інших пов'язаних пристроїв, що дозволяє легко знайти ваші файли, де б ви були. Повнотекстовий вміст ваших файлів не передаватиметься публічно.">
+<!ENTITY zotero.preferences.sync.syncFullTextContent.desc "Zotero можете синхронізувати повнотекстовий вміст файлів у ваших бібліотеках Zotero з zotero.org та інших пов'язаних пристроїв, що дозволяє легко знайти ваші файли, де б ви не були. Повнотекстовий вміст ваших файлів не передаватиметься публічно.">
 <!ENTITY zotero.preferences.sync.about "Про синхронізацію">
 <!ENTITY zotero.preferences.sync.fileSyncing "Синхрнізація фалів">
 <!ENTITY zotero.preferences.sync.fileSyncing.url "URL-адреса:">
@@ -97,7 +97,7 @@
 
 <!ENTITY zotero.preferences.prefpane.export "Експорт">
 
-<!ENTITY zotero.preferences.citationOptions.caption "НАлашьування цитування">
+<!ENTITY zotero.preferences.citationOptions.caption "Налашьування цитування">
 <!ENTITY zotero.preferences.export.citePaperJournalArticleURL "Включати URL паперових статей в посилання">
 <!ENTITY zotero.preferences.export.citePaperJournalArticleURL.description "Коли ця опція відключена, при цитуванні журнальних або газетних статей Zotero додає URL тільки при відсутності у сторінки діапазону сторінок.">
 
@@ -147,13 +147,13 @@
 <!ENTITY zotero.preferences.proxies.desc_link "документацію про проксі">
 <!ENTITY zotero.preferences.proxies.desc_after_link "для додаткової інформації.">
 <!ENTITY zotero.preferences.proxies.transparent "Використати перенаправлення">
-<!ENTITY zotero.preferences.proxies.autoRecognize "АВтоматично розпізнвати проксі, що використовується">
+<!ENTITY zotero.preferences.proxies.autoRecognize "Автоматично розпізнвати проксі, що використовується">
 <!ENTITY zotero.preferences.proxies.disableByDomain "Відключити перенаправлення, коли моє доменне ім'я містить">
 <!ENTITY zotero.preferences.proxies.configured "Налаштовані проксі">
 <!ENTITY zotero.preferences.proxies.hostname "Ім'я хоста">
 <!ENTITY zotero.preferences.proxies.scheme "Схема">
 
-<!ENTITY zotero.preferences.proxies.multiSite "ля багатьох сайтів">
+<!ENTITY zotero.preferences.proxies.multiSite "для багатьох сайтів">
 <!ENTITY zotero.preferences.proxies.autoAssociate "Автоматично зіставляти нові хости">
 <!ENTITY zotero.preferences.proxies.variables "Ви можете використовувати наступні змінні в схемі проксі:">
 <!ENTITY zotero.preferences.proxies.h_variable "&#37;h - Ім'я хоста сайту, що перенаправляється (наприклад, www.zotero.org)">
@@ -169,15 +169,15 @@
 <!ENTITY zotero.preferences.locate.locateEngineManager "Диспетчер систем пошуку статей">
 <!ENTITY zotero.preferences.locate.description "Опис">
 <!ENTITY zotero.preferences.locate.name "Нзва">
-<!ENTITY zotero.preferences.locate.locateEnginedescription "Пошукова система розширює можливості меню, що випадає, &quot;Виявити&quot; в панелі &quot;Інформація&quot;. Включенні Пошукової системи в наведеному списку додасть її і це меню, що випадає, і її можна буде використовувати для пошуку ресурсів в вашій бібліотеці через Інтернет.">
-<!ENTITY zotero.preferences.locate.addDescription "Для додавання Пошукової системи, яка відсутня в списку, відвідайте сторінку бажаної системи в браузері та виберіть &#34;Додати&#34 в панелі пошуку Zotero">
+<!ENTITY zotero.preferences.locate.locateEnginedescription "Пошукова система розширює можливості меню, що випадає, 'Виявити' в панелі 'Інформація'. Включенні Пошукової системи в наведеному списку додасть її і це меню, що випадає, і її можна буде використовувати для пошуку ресурсів в вашій бібліотеці через Інтернет.">
+<!ENTITY zotero.preferences.locate.addDescription "Для додавання Пошукової системи, яка відсутня в списку, відвідайте сторінку бажаної системи в браузері та виберіть 'Додати' в панелі пошуку Zotero">
 <!ENTITY zotero.preferences.locate.restoreDefaults "Відновити знчення за замовчуванням">
 
 <!ENTITY zotero.preferences.charset "Кодування символів">
 <!ENTITY zotero.preferences.charset.importCharset "Кодування символів при імпорті">
 <!ENTITY zotero.preferences.charset.displayExportOption "Показувати вікно вибору кодування символів при експорті">
 
-<!ENTITY zotero.preferences.dataDir "РОзташування каталогу з даними">
+<!ENTITY zotero.preferences.dataDir "Розташування каталогу з даними">
 <!ENTITY zotero.preferences.dataDir.useProfile "Використовувати каталог профілю">
 <!ENTITY zotero.preferences.dataDir.custom "Користувацька:">
 <!ENTITY zotero.preferences.dataDir.choose "Вибрати...">
@@ -197,7 +197,7 @@
 
 <!ENTITY zotero.preferences.debugOutputLogging "Запис інформації відладки">
 <!ENTITY zotero.preferences.debugOutputLogging.message "Інформація відладки може допомогти розробникам Zotero діагностувати помилки, що виникли. Записк інфрмації відладки сповільнить роботу Zotero, тому зазвичай її варто включати, тільки якщо про це просить розробник.">
-<!ENTITY zotero.preferences.debugOutputLogging.linesLogged "рядків щаписано">
+<!ENTITY zotero.preferences.debugOutputLogging.linesLogged "рядків записано">
 <!ENTITY zotero.preferences.debugOutputLogging.enableAfterRestart "Включити після перезапуску">
 <!ENTITY zotero.preferences.debugOutputLogging.viewOutput "Подивитись запис">
 <!ENTITY zotero.preferences.debugOutputLogging.clearOutput "Очистити запис">
diff --git a/chrome/locale/uk-UA/zotero/searchbox.dtd b/chrome/locale/uk-UA/zotero/searchbox.dtd
index 8155e3c7c..56925b059 100644
--- a/chrome/locale/uk-UA/zotero/searchbox.dtd
+++ b/chrome/locale/uk-UA/zotero/searchbox.dtd
@@ -1,14 +1,14 @@
 <!ENTITY zotero.search.name "Назва:">
 
-<!ENTITY zotero.search.searchInLibrary "Search in library:">
+<!ENTITY zotero.search.searchInLibrary "Шукати в бібліотеці:">
 
-<!ENTITY zotero.search.joinMode.prefix "Збінаються з">
+<!ENTITY zotero.search.joinMode.prefix "Збігаються з">
 <!ENTITY zotero.search.joinMode.any "будь-яким">
 <!ENTITY zotero.search.joinMode.all "всіма">
 <!ENTITY zotero.search.joinMode.suffix "з нижченаведеного:">
 
-<!ENTITY zotero.search.recursive.label "Шукати в пыдпапках">
-<!ENTITY zotero.search.noChildren "Показувати документи тільки верхнього рывня">
+<!ENTITY zotero.search.recursive.label "Шукати в підпапках">
+<!ENTITY zotero.search.noChildren "Показувати документи тільки верхнього рівня">
 <!ENTITY zotero.search.includeParentsAndChildren "Включити батьківські та дочірні документи, що збігають з шуканим">
 
 <!ENTITY zotero.search.textModes.phrase "Фраза">
diff --git a/chrome/locale/uk-UA/zotero/standalone.dtd b/chrome/locale/uk-UA/zotero/standalone.dtd
index 585ed0b78..1d889847e 100644
--- a/chrome/locale/uk-UA/zotero/standalone.dtd
+++ b/chrome/locale/uk-UA/zotero/standalone.dtd
@@ -34,7 +34,7 @@
 <!ENTITY undoCmd.label "Скасувати ввід">
 <!ENTITY undoCmd.key "Z">
 <!ENTITY undoCmd.accesskey "U">
-<!ENTITY redoCmd.label "Повторити ввід">
+<!ENTITY redoCmd.label "Повторити ввод">
 <!ENTITY redoCmd.key "Y">
 <!ENTITY redoCmd.accesskey "R">
 <!ENTITY cutCmd.label "Вирізати">
@@ -70,7 +70,7 @@
 
 <!ENTITY toolsMenu.label "Інструменти">
 <!ENTITY toolsMenu.accesskey "T">
-<!ENTITY addons.label "Доповнення">
+<!ENTITY addons.label "Надбудови">
 
 
 <!ENTITY minimizeWindow.key "m">
diff --git a/chrome/locale/uk-UA/zotero/zotero.dtd b/chrome/locale/uk-UA/zotero/zotero.dtd
index c64da2135..5f71f87ef 100644
--- a/chrome/locale/uk-UA/zotero/zotero.dtd
+++ b/chrome/locale/uk-UA/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Відміна">
 
 <!ENTITY zotero.errorReport.title "Звіт про помилку в Zotero">
-<!ENTITY zotero.errorReport.unrelatedMessages "Журнал помилок може включати в себе повідомлення не пов'язані з Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "Це може включати повідомлення, які не відносяться до Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Почекайте, поки звіт про помилку буде передано.">
 <!ENTITY zotero.errorReport.submitted "Ваш звіт про помилку був переданий.">
 <!ENTITY zotero.errorReport.reportID "Номер звіту:">
@@ -36,7 +36,7 @@
 
 <!ENTITY zotero.tabs.info.label "Інформація">
 <!ENTITY zotero.tabs.notes.label "Примітки">
-<!ENTITY zotero.tabs.attachments.label "Додатки">
+<!ENTITY zotero.tabs.attachments.label "Вкладення">
 <!ENTITY zotero.tabs.tags.label "Теги">
 <!ENTITY zotero.tabs.related.label "Пов'язані">
 <!ENTITY zotero.notes.separate "Редагувати в окремому вікні">
@@ -47,7 +47,7 @@
 <!ENTITY zotero.items.itemType "Тип документу">
 <!ENTITY zotero.items.type_column "Тип документа">
 <!ENTITY zotero.items.title_column "Назва">
-<!ENTITY zotero.items.creator_column "Створив">
+<!ENTITY zotero.items.creator_column "Автор">
 <!ENTITY zotero.items.date_column "Дата">
 <!ENTITY zotero.items.year_column "Рік">
 <!ENTITY zotero.items.publisher_column "Видавник">
@@ -79,11 +79,11 @@
 
 <!ENTITY zotero.items.menu.showInLibrary "Покзати в бібліотеці">
 <!ENTITY zotero.items.menu.attach.note "Додати примітку">
-<!ENTITY zotero.items.menu.attach "Додати додаток">
+<!ENTITY zotero.items.menu.attach "Додати вкладення">
 <!ENTITY zotero.items.menu.attach.snapshot "Прикріпити знімок поточної сторінки">
 <!ENTITY zotero.items.menu.attach.link "Прикріпити посилання на поточну сторінку">
 <!ENTITY zotero.items.menu.attach.link.uri "Прикріпити посилання на URI…">
-<!ENTITY zotero.items.menu.attach.file "Пркріпити копію фалу...">
+<!ENTITY zotero.items.menu.attach.file "Прикріпити копію фалу...">
 <!ENTITY zotero.items.menu.attach.fileLink "Прикріпити посилання на файл...">
 
 <!ENTITY zotero.items.menu.restoreToLibrary "Відновити в бібліотеці">
@@ -136,7 +136,7 @@
 
 <!ENTITY zotero.tagSelector.noTagsToDisplay "Немає тегів для відображення">
 <!ENTITY zotero.tagSelector.filter "Фільтр:">
-<!ENTITY zotero.tagSelector.showAutomatic "Показувати автоматично">
+<!ENTITY zotero.tagSelector.showAutomatic "Показувати автоматичні">
 <!ENTITY zotero.tagSelector.displayAllInLibrary "Показувати всі теги в бібліотеці">
 <!ENTITY zotero.tagSelector.selectVisible "Вибрати видимі">
 <!ENTITY zotero.tagSelector.clearVisible "Відмінити вибір видимих">
diff --git a/chrome/locale/uk-UA/zotero/zotero.properties b/chrome/locale/uk-UA/zotero/zotero.properties
index 135b102da..c06b44680 100644
--- a/chrome/locale/uk-UA/zotero/zotero.properties
+++ b/chrome/locale/uk-UA/zotero/zotero.properties
@@ -37,14 +37,14 @@ general.etAl=et al.
 general.accessDenied=Немає доступу
 general.permissionDenied=Немає дозволу
 general.character.singular=символ
-general.character.plural=символу(ів)
+general.character.plural=символів
 general.create=Створити
 general.delete=Видалити
 general.moreInformation=Додаткова інформація
 general.seeForMoreInformation=Дивись %S для отримання додаткової інформації.
 general.enable=Включити
 general.disable=Вимкнути
-general.remove=Прибрати
+general.remove=Видалити
 general.reset=Скинути
 general.hide=Сховати
 general.quit=Вийти
@@ -64,7 +64,7 @@ punctuation.closingQMark="
 punctuation.colon=:
 punctuation.ellipsis=…
 
-install.quickStartGuide=Перші Кроки в Zotero
+install.quickStartGuide=Перші кроки в Zotero
 install.quickStartGuide.message.welcome=Ласкаво просимо в Zotero!
 install.quickStartGuide.message.view=Подивіться Перші Кроки в Zotero, щоб навчитися почати збирати, управляти, цитувати і ділитися своїми науковими джерелами.
 install.quickStartGuide.message.thanks=Дякуємо за установку Zotero.
@@ -74,15 +74,16 @@ upgrade.failed=Не вдалося оновити базу Zotero:
 upgrade.advanceMessage=Натисніть %S, щоб оновити зараз.
 upgrade.dbUpdateRequired=Необхідно оновити базу даних Zotero.
 upgrade.integrityCheckFailed=Необхідно полагодити базу даних Zotero перш ніж продовжити оновлення.
-upgrade.loadDBRepairTool=Завантажити Інструмент Ремонту Бази Даних
-upgrade.couldNotMigrate=Zotero не міг перенести всі необхідні файли.\n\nБудь ласка, закрийте всі відкриті файли вкладень і перезавантажте %S, щоб спробувати виконати оновлення ще раз.
-upgrade.couldNotMigrate.restart=Якщо дане повідомлення продовжує з'являтися, перезавантажте свій комп'ютер.
+upgrade.loadDBRepairTool=Завантажити Інструмент ремонту бази даних
+upgrade.couldNotMigrate=Zotero не зміг перенести всі необхідні файли.\nБудь ласка, закрийте всі відкриті файли вкладень і перезавантажте %S, щоб спробувати виконати оновлення ще раз.
+upgrade.couldNotMigrate.restart=Якщо ви надалі будете отримувати це повідомлення, перезавантажте свій комп'ютер.
 
 errorReport.reportError=Повідомити про помилку...
 errorReport.reportErrors=Повідомити про помилки...
-errorReport.reportInstructions=Ви можете повідомити про цю помилку вибравши "%S" в меню Дії (шестерня).
-errorReport.followingErrors=Наступні помилки виникли після запуску %S:
-errorReport.advanceMessage=Натисніть % S, щоб надіслати звіт про помилку розробникам Zotero.
+errorReport.reportInstructions=Ви можете повідомити про цю помилку вибравши '%S' в меню Дії (шестерня).
+errorReport.followingReportWillBeSubmitted=Буде відправлений наступний звіт:
+errorReport.noErrorsLogged=Після запуску %S помилок зафіксовано не було.
+errorReport.advanceMessage=Натисніть %S щоб відправити звіт розробникам Zotero.
 errorReport.stepsToReproduce=Зроблені кроки:
 errorReport.expectedResult=Очікуваний результат:
 errorReport.actualResult=Реальний результат:
@@ -103,9 +104,9 @@ attachmentBasePath.clearBasePath.existingAttachments.singular=Вкладення
 attachmentBasePath.clearBasePath.existingAttachments.plural=%S існуючих вкладень в старому базовому каталозі будуть перетворені з використанням абсолютних шляхів.
 attachmentBasePath.clearBasePath.button=Видалати налаштування базового каталогу
 
-dataDir.notFound=Каталог даних Zotero не може бути знайдений.
+dataDir.notFound=Не знайдений каталог даних Zotero.
 dataDir.previousDir=Попередній каталог:
-dataDir.useProfileDir=Використовувати папку %S з профілем
+dataDir.useProfileDir=Використовувати каталог %S з профілю
 dataDir.selectDir=Виберіть каталог даних Zotero
 dataDir.selectedDirNonEmpty.title=Каталог не порожній
 dataDir.selectedDirNonEmpty.text=Каталог, який ви обрали не порожній і не є каталогом даних Zotero. \n\nТим не менш, створити файли Zotero в цьому каталозі?
@@ -164,7 +165,7 @@ pane.collections.groupLibraries=Групування бібіліотек
 pane.collections.trash=Кошик
 pane.collections.untitled=Без назви
 pane.collections.unfiled=Незаповнені документи
-pane.collections.duplicate=Жублікати документів
+pane.collections.duplicate=Дублікати документів
 
 pane.collections.menu.rename.collection=Перейменувати колекцію...
 pane.collections.menu.edit.savedSearch=Редагувати збережений пошук
@@ -261,8 +262,8 @@ pane.item.attachments.rename.renameAssociatedFile=Перейменувати п
 pane.item.attachments.rename.error=Виникла помилка при перейменуванні файлу.
 pane.item.attachments.fileNotFound.title=Файл не знайдено
 pane.item.attachments.fileNotFound.text=Прикріплений файл не знайдений.\n\nМожливо, він був переміщений або видалений.
-pane.item.attachments.delete.confirm=Ви впевнені, що бажаєте видалити цей додаток?
-pane.item.attachments.count.zero=%S додатків:
+pane.item.attachments.delete.confirm=Ви впевнені, що бажаєте видалити це вкладення?
+pane.item.attachments.count.zero=%S вкладень:
 pane.item.attachments.count.singular=%S вкладення:
 pane.item.attachments.count.plural=%S вкладень:
 pane.item.attachments.select=Виберіть файл
@@ -297,16 +298,16 @@ itemTypes.film=Фільм
 itemTypes.artwork=Витвір мистецтва
 itemTypes.webpage=Веб сторінка
 itemTypes.report=Звіт
-itemTypes.bill=Закон
+itemTypes.bill=Законопроект
 itemTypes.case=Справа
 itemTypes.hearing=Слухання
 itemTypes.patent=Патент
-itemTypes.statute=Закон
+itemTypes.statute=Статут
 itemTypes.email=E-mail
 itemTypes.map=Карта
-itemTypes.blogPost=Запис з блозі
+itemTypes.blogPost=Запис в блозі
 itemTypes.instantMessage=Миттєве повідомлення
-itemTypes.forumPost=Зпис на форумі
+itemTypes.forumPost=Запис на форумі
 itemTypes.audioRecording=Аудіозапис
 itemTypes.presentation=Презентація
 itemTypes.videoRecording=Відео запис
@@ -330,7 +331,7 @@ itemFields.attachments=Вкладення
 itemFields.related=Пов'язаний
 itemFields.url=URL
 itemFields.rights=Права
-itemFields.series=Серії
+itemFields.series=Серія
 itemFields.volume=Том
 itemFields.issue=Випуск
 itemFields.edition=Видання
@@ -415,7 +416,7 @@ itemFields.country=Країна
 itemFields.applicationNumber=Номер заявки
 itemFields.forumTitle=Форум/Listserv 
 itemFields.episodeNumber=Номер епізоду
-itemFields.blogTitle=Номер блогу
+itemFields.blogTitle=Назва блогу
 itemFields.medium=Засіб
 itemFields.caseName=Номер справи
 itemFields.nameOfAct=Назва постанови
@@ -482,7 +483,7 @@ ingester.scrapingTo=Зберегти в
 ingester.scrapeComplete=Документ збережено
 ingester.scrapeError=Не вдалось зберегти документ
 ingester.scrapeErrorDescription=Виникла помилка при збереженні документу. Дивіться %S для додаткової інформації.
-ingester.scrapeErrorDescription.linkText=Відомі проблеми транслятору
+ingester.scrapeErrorDescription.linkText=Виявлення помилок з транслятором
 ingester.scrapeErrorDescription.previousError=Процес збереження не завершено через попередню помилку Zotero.
 
 ingester.importReferRISDialog.title=Імпортування RIS/Refer в Zotero
@@ -521,7 +522,7 @@ zotero.preferences.openurl.resolversFound.singular=знайден %S серве
 zotero.preferences.openurl.resolversFound.plural=знайдено %S серверів
 
 zotero.preferences.sync.purgeStorage.title=Очистити вкладення на серверах Zotero?
-zotero.preferences.sync.purgeStorage.desc=Якщо ви плануєте використовувати WebDAV для синхронізації файлів і ви раніше синхронізовували прикріплені файли до Моїй бібліотеці з даними серверів Zotero, ви можете очистити ці файли з серверів Zotero, щоб дати вам більше місця для зберігання груп. \n\nВи можете очистити файли в будь-який час з налаштувань облікового запису на zotero.org.
+zotero.preferences.sync.purgeStorage.desc=Якщо ви плануєте використовувати WebDAV для синхронізації файлів і ви раніше синхронізовували прикріплені файли до Моїй бібліотеці з даними серверів Zotero, ви можете очистити ці файли з серверів Zotero, щоб дати вам більше місця для зберігання груп.\n\nВи можете очистити файли в будь-який час з налаштувань облікового запису на zotero.org.
 zotero.preferences.sync.purgeStorage.confirmButton=Виконати очищення файлів негайно
 zotero.preferences.sync.purgeStorage.cancelButton=Не виповняти очищеня
 zotero.preferences.sync.reset.userInfoMissing=Ви повинні ввести ім'я користувача і пароль на вкладці %S перед використанням опції скидання.
@@ -530,7 +531,7 @@ zotero.preferences.sync.reset.replaceLocalData=Замінити локальні
 zotero.preferences.sync.reset.restartToComplete=Необхідно перезапустити, щоб завертити відновлення.
 zotero.preferences.sync.reset.restoreToServer=Всі дані користувача '%S' на сервері Zotero будуть стерті й замінені даними з цієї копії Zotero. \n\nЧас доступу до даних користувача на сервері залежить від розміру вашої бібліотеки.
 zotero.preferences.sync.reset.replaceServerData=Заміна даних на сервері
-zotero.preferences.sync.reset.fileSyncHistory=Вся історія синхронізації файлів буде видалена. \n\nБудь-які локальні файли вкладень, які відсутні на сервері зберігання будуть завантажені при наступній синхронізації.
+zotero.preferences.sync.reset.fileSyncHistory=Вся історія синхронізації файлів буде видалена. \n\nБудь-які локальні файли вкладень, які відсутні на сервері зберігання будуть вивантажені при наступній синхронізації.
 
 zotero.preferences.search.rebuildIndex=Перебудувати індекс
 zotero.preferences.search.rebuildWarning=Ви бажаєте перебудувати весь індекс? Це може зайняти деякий час.\n\nЩоб переіндексувати тільки непроіндексовні документи, використайте %S.
@@ -755,7 +756,7 @@ sync.remoteObject=Видалений об'єкт
 sync.mergedObject=Об'єднаний об'єкт
 
 sync.error.usernameNotSet=Ім'я користувача не встановлено
-sync.error.usernameNotSet.text=Для синхронізації з сервером Zotero ви повинні ввести  ім'я користувача та пароль для zotero.org в налаштуваннях Zotero.
+sync.error.usernameNotSet.text=Для синхронізації з сервером Zotero ви повинні ввести ім'я користувача та пароль для zotero.org в налаштуваннях Zotero.
 sync.error.passwordNotSet=Пароль не встановлено
 sync.error.invalidLogin=Невірне ім'я користувача та пароль
 sync.error.invalidLogin.text=Сервер синхронізації Zotero не прийняв ваше ім'я користувача та пароль.\n\nБудь ласка, переконайтеся, що ви ввели реєстраційну інформацію для zotero.org правильно в налаштуваннях синхронізації Zotero .
@@ -813,8 +814,8 @@ sync.status.lastSync=Попередня синхронізація:
 sync.status.loggingIn=Реєстрація на сервері синхронізації
 sync.status.gettingUpdatedData=Отримання оновлених даних з серверу синхронізації
 sync.status.processingUpdatedData=Обробка оновлених даних
-sync.status.uploadingData=Завантаження даних на сервер синхронізації
-sync.status.uploadAccepted=Завантаження прийняте – очікування серверу синхронізаії
+sync.status.uploadingData=Вивантаження даних на сервер синхронізації
+sync.status.uploadAccepted=Вивантаження прийняте – очікування серверу синхронізаії
 sync.status.syncingFiles=Синхронізація файлів
 
 sync.fulltext.upgradePrompt.title=Нове: Повнотекстова синхронізація вмісту 
@@ -842,10 +843,10 @@ sync.storage.error.permissionDeniedAtAddress=Ви не маєте дозволу
 sync.storage.error.checkFileSyncSettings=Будь ласка, перевірте ваші налаштування синхронізації файлів або зв'яжіться з адміністратором вашого серверу WebDAV.
 sync.storage.error.verificationFailed=Перевірка %S не вдалася. Перевірте налаштування синхронізації файлів в панелі Синхронізація налаштувань Zotero.
 sync.storage.error.fileNotCreated=Файл '%S' не може бути створений в каталозі зберігання Zotero.
-sync.storage.error.encryptedFilenames=Помилка при створенні файлу '%S'. \n\nПодивіться http://www.zotero.org/support/kb/encrypted_filenames для отримання додаткової інфопмації.
+sync.storage.error.encryptedFilenames=Помилка при створенні файлу '%S'.\n\nПодивіться http://www.zotero.org/support/kb/encrypted_filenames для отримання додаткової інфопмації.
 sync.storage.error.fileEditingAccessLost=Ви більше не маєте прав редагування файлів в групі Zotero '%S', а файли, які ви додали або відредагували не можуть бути синхронізовані з сервером.
 sync.storage.error.copyChangedItems=Якщо ви хотіли скопіювати змінені документи та файли в іншому місці, скасуйте синхронізацію зараз.
-sync.storage.error.fileUploadFailed=Завантаження файлу не вдалось.
+sync.storage.error.fileUploadFailed=Вивантаження файлу не вдалось.
 sync.storage.error.directoryNotFound=Каталог не знайден.
 sync.storage.error.doesNotExist=%S не існує.
 sync.storage.error.createNow=Ви бажаєте створити його зараз?
@@ -856,22 +857,22 @@ sync.storage.error.webdav.enterURL=Укажіть URL-адресу для WebDAV
 sync.storage.error.webdav.invalidURL=%S не є припустимим URL для WebDAV .
 sync.storage.error.webdav.invalidLogin=Сервер WebDAV не прийняв ім'я користувача та пароль, які ви ввели.
 sync.storage.error.webdav.permissionDenied=У вас немає доступу до %S на сервері WebDAV.
-sync.storage.error.webdav.insufficientSpace=Завантаження файлу не вдалось через недостатність вільного місця на сервері WebDAV.
+sync.storage.error.webdav.insufficientSpace=Вивантаження файлу не вдалось через недостатність вільного місця на сервері WebDAV.
 sync.storage.error.webdav.sslCertificateError=Помилка сертифіката SSL при приєднанні до %S
 sync.storage.error.webdav.sslConnectionError=Помилка з'єднання SSL при приєднанні до %S
 sync.storage.error.webdav.loadURLForMoreInfo=Завантажте URL для WebDAV в браузері для додаткової інформації.
 sync.storage.error.webdav.seeCertOverrideDocumentation=Подробиці в документації про роботу з сертифікатами.
 sync.storage.error.webdav.loadURL=Заванажити URL для WebDAV 
-sync.storage.error.webdav.fileMissingAfterUpload=Виявлена потенційна проблема ​​з сервером WebDAV.\n\nЗавантажений файл не був негайно доступний для скачування. Така невелика затримка доступу до файлів можлива, особливо якщо ви використовуєте послугу хмарного зберігання.\n\nІгноруйте це повідомлення, якщо синхронізації файлів Zotero виконується нормально. Якщо у вас виникли проблеми, будь ласка, напишіть на форум Zotero.
+sync.storage.error.webdav.fileMissingAfterUpload=Виявлена потенційна проблема ​​з сервером WebDAV.\n\nВивантажений файл не був негайно доступний для скачування. Така невелика затримка доступу до файлів можлива, особливо якщо ви використовуєте послугу хмарного зберігання.\n\nІгноруйте це повідомлення, якщо синхронізації файлів Zotero виконується нормально. Якщо у вас виникли проблеми, будь ласка, напишіть на форум Zotero.
 sync.storage.error.webdav.nonexistentFileNotMissing=Ваш сервер WebDAV, стверджує про наявність файлу, який не існує. Зверніться до адміністратора вашого сервера WebDAV за допомогою.
 sync.storage.error.webdav.serverConfig.title=Помилка конфігурації серверу WebDAV
 sync.storage.error.webdav.serverConfig=Сервером WebDAV повернута внутрішня помилка.
 
 sync.storage.error.zfs.restart=Сталася помилка синхронізації файлів. Будь ласка, перезавантажте %S і/або комп'ютер та спробуйте синхронізувати знову.\n\nЯкщо помилку не усунуто, можуть бути проблеми з комп'ютером або безпосередньо вашою мережею: антивірусне програмне забезпечення, проксі-сервер, VPN і т.д. Спробуйте відключити всі антивірусні програми/брандмауер, або, якщо це ноутбук, спробуйте підключитись до іншої мережі.
 sync.storage.error.zfs.tooManyQueuedUploads=Занадто багато вивантажень в черзі. Повторіть спробу через %S хвилин.
-sync.storage.error.zfs.personalQuotaReached1=Ви досягли своєї квоти зберігання файлів на сервері Zotero. Деякі файли не були завантажені. Інші дані Zotero продовжать синхронізацію з сервером.
+sync.storage.error.zfs.personalQuotaReached1=Ви досягли своєї квоти зберігання файлів на сервері Zotero. Деякі файли не були вивантажені. Інші дані Zotero продовжать синхронізацію з сервером.
 sync.storage.error.zfs.personalQuotaReached2=Дивіться налаштування вашого облікового запису на zotero.org для додаткових варіантів зберігання.
-sync.storage.error.zfs.groupQuotaReached1=Група '%S' досягла своєї квоти зберігання файлів на сервері Zotero. Деякі файли не були завантажені. Інші дані Zotero продовжать синхронізацію з сервером.
+sync.storage.error.zfs.groupQuotaReached1=Група '%S' досягла своєї квоти зберігання файлів на сервері Zotero. Деякі файли не були вивантажені. Інші дані Zotero продовжать синхронізацію з сервером.
 sync.storage.error.zfs.groupQuotaReached2=Власник групи може збільшити доступне місце для зберігання в панелі налаштувань Зберігання на zotero.org.
 sync.storage.error.zfs.fileWouldExceedQuota=Файл '%S' перевищуватиме вашу квоту зберігання файлів Zotero 
 
@@ -950,7 +951,7 @@ locate.libraryLookup.tooltip=Знайти даний документ, вико
 locate.manageLocateEngines=Диспетчер системи пошуку...
 
 standalone.corruptInstallation=Встановлений Автономний Zotero, здається, був пошкоджений через невдале автооновлення. У той час як Zotero може продовжувати функціонувати, щоб уникнути можливих помилок, будь ласка, якомога швидше завантажте останню версію Автономний Zotero з http://zotero.org/support/standalone.
-standalone.addonInstallationFailed.title=Не вдається встановити розширення
+standalone.addonInstallationFailed.title=Не вдається встановити надбудову
 standalone.addonInstallationFailed.body=Надбудова на '%S' не може бути встановлена. Вона може бути несумісна з даною версією Zotero Standalone.
 standalone.rootWarning=Здається, Zotero Standalone запущений з правами адміністратора. Це небезпечно і може викликати неможливість працювати при запуску з облікового запису користувача. \n\nЯкщо ви хочете встановити автоматичне оновлення, встановіть дозвіл на запис до каталогу програми Zotero для облікового запису користувача.
 standalone.rootWarning.exit=Вихід
diff --git a/chrome/locale/vi-VN/zotero/zotero.dtd b/chrome/locale/vi-VN/zotero/zotero.dtd
index 884ce6cd9..87bc52c26 100644
--- a/chrome/locale/vi-VN/zotero/zotero.dtd
+++ b/chrome/locale/vi-VN/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "Cancel">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "Sổ nhật ký lỗi có thể chứa các thông báo lỗi không liên quan tới Zotero.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "Xin vui lòng chờ trong khi báo cáo lỗi được gửi đi.">
 <!ENTITY zotero.errorReport.submitted "Báo cáo lỗi đã được gửi đi">
 <!ENTITY zotero.errorReport.reportID "ID của Báo cáo:">
diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties
index 02ee54ac1..70c7263bd 100644
--- a/chrome/locale/vi-VN/zotero/zotero.properties
+++ b/chrome/locale/vi-VN/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=If you continue to receive this message, restart
 errorReport.reportError=Report Error...
 errorReport.reportErrors=Báo cáo lỗi...
 errorReport.reportInstructions=Bạn có thể báo cáo lỗi này bằng cách chọn "%S" trong menu Hành động (nút có hình bánh răng cưa).
-errorReport.followingErrors=The following errors have occurred since starting %S:
-errorReport.advanceMessage=Ấn %S để gửi một báo cáo lỗi cho các tác giả của Zotero.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=Các bước để tái lập lỗi:
 errorReport.expectedResult=Kết quả mong đợi:
 errorReport.actualResult=Kết quả thực sự đã nhận được:
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=Biểu ghi đã được lưu dữ
 ingester.scrapeError=Không thể lưu dữ Biểu ghi
 ingester.scrapeErrorDescription=Đã xảy ra một lỗi trong quá trình lưu dữ biểu ghi này. Đọc %S để có thêm thông tin.
-ingester.scrapeErrorDescription.linkText=Các vấn đề đã gặp liên quan đến bộ chuyển đổi
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=Quá trình lưu dữ đã thất bại do một lỗi trước đó trong Zotero.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer Import
diff --git a/chrome/locale/zh-CN/zotero/zotero.dtd b/chrome/locale/zh-CN/zotero/zotero.dtd
index 36c6bf4e7..87a98ae85 100644
--- a/chrome/locale/zh-CN/zotero/zotero.dtd
+++ b/chrome/locale/zh-CN/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "取消">
 
 <!ENTITY zotero.errorReport.title "Zotero 错误报告">
-<!ENTITY zotero.errorReport.unrelatedMessages "错误日志里可能会包含一些与 Zotero 无关的信息.">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "正在提交错误报告, 请稍候.">
 <!ENTITY zotero.errorReport.submitted "错误报告已经提交.">
 <!ENTITY zotero.errorReport.reportID "报告ID:">
diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties
index 7a078f608..1a7d899bd 100644
--- a/chrome/locale/zh-CN/zotero/zotero.properties
+++ b/chrome/locale/zh-CN/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=如果您持续收到此讯息, 请重新启动
 errorReport.reportError=汇报错误...
 errorReport.reportErrors=汇报错误...
 errorReport.reportInstructions=您可以通过选择操作(齿轮)菜单的 "%S" 来汇报此错误.
-errorReport.followingErrors=自打开 %S 以来, 发生了下列错误:
-errorReport.advanceMessage=按 %S 给 Zotero 开发人员发送错误报告.
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=用于重现的步骤:
 errorReport.expectedResult=预期结果:
 errorReport.actualResult=实际结果:
@@ -482,7 +483,7 @@ ingester.scrapingTo=保存到
 ingester.scrapeComplete=条目已保存
 ingester.scrapeError=无法保存条目
 ingester.scrapeErrorDescription=保存此条目时出错. 查看%S以获取更多信息.
-ingester.scrapeErrorDescription.linkText=已知的转换器问题
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=由于上一个 Zotero 的错误, 保存失败.
 
 ingester.importReferRISDialog.title=Zotero RIS/Refer 导入
diff --git a/chrome/locale/zh-TW/zotero/zotero.dtd b/chrome/locale/zh-TW/zotero/zotero.dtd
index 7400e4961..ccb5c880f 100644
--- a/chrome/locale/zh-TW/zotero/zotero.dtd
+++ b/chrome/locale/zh-TW/zotero/zotero.dtd
@@ -8,7 +8,7 @@
 <!ENTITY zotero.general.cancel "取消">
 
 <!ENTITY zotero.errorReport.title "Zotero Error Report">
-<!ENTITY zotero.errorReport.unrelatedMessages "錯誤記錄可能包括了一些和 Zotero 不相關的訊息。">
+<!ENTITY zotero.errorReport.unrelatedMessages "This may include messages unrelated to Zotero.">
 <!ENTITY zotero.errorReport.submissionInProgress "請等候錯誤報告送出。">
 <!ENTITY zotero.errorReport.submitted "錯誤報告已經送出。">
 <!ENTITY zotero.errorReport.reportID "報告識別號：">
diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties
index f2ebc3eda..01b44489c 100644
--- a/chrome/locale/zh-TW/zotero/zotero.properties
+++ b/chrome/locale/zh-TW/zotero/zotero.properties
@@ -81,8 +81,9 @@ upgrade.couldNotMigrate.restart=如果你繼續收到這個訊息，請重新啟
 errorReport.reportError=回報錯誤……
 errorReport.reportErrors=回報錯誤…
 errorReport.reportInstructions=你可以從行動（齒輪）選單中選「%S」來回報這個錯誤。
-errorReport.followingErrors=開始 %S 時發生了以下的錯誤：
-errorReport.advanceMessage=按 %S 鍵來寄送一份錯誤報告給 Zotero 的開發人員。
+errorReport.followingReportWillBeSubmitted=The following report will be submitted:
+errorReport.noErrorsLogged=No errors have been logged since %S started.
+errorReport.advanceMessage=Press %S to send the report to the Zotero developers.
 errorReport.stepsToReproduce=重現錯誤的步驟：
 errorReport.expectedResult=預期的給果：
 errorReport.actualResult=實際的結果：
@@ -482,7 +483,7 @@ ingester.scrapingTo=Saving to
 ingester.scrapeComplete=項目己儲存
 ingester.scrapeError=無法儲存項目
 ingester.scrapeErrorDescription=儲存這個項目時發生了錯誤。可檢查 %S 以取得更多資訊。
-ingester.scrapeErrorDescription.linkText=已知的轉譯器問題
+ingester.scrapeErrorDescription.linkText=Troubleshooting Translator Issues
 ingester.scrapeErrorDescription.previousError=因先前 Zotero 的錯誤，儲存程序失敗了。
 
 ingester.importReferRISDialog.title=Zotero 的 RIS/Refer 匯入
diff --git a/chrome/skin/default/zotero/errorReport.css b/chrome/skin/default/zotero/errorReport.css
index 69196e04a..5cee2bb48 100644
--- a/chrome/skin/default/zotero/errorReport.css
+++ b/chrome/skin/default/zotero/errorReport.css
@@ -4,11 +4,15 @@ description {
 
 /* Intro pane */
 #zotero-error-message {
-	font-style: italic;
+	background: #FFF;
+}
+
+#zotero-error-message .textbox-textarea {
+	padding: 5px !important
 }
 
 #zotero-unrelated-message {
-	margin: 1em 0 .5em;
+	margin: 1.5em 0 .5em;
 }
 
 #zotero-advance-message {
diff --git a/install.rdf b/install.rdf
index b16ec3189..4cbb9a9f1 100644
--- a/install.rdf
+++ b/install.rdf
@@ -25,7 +25,7 @@
       <Description>
         <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
         <em:minVersion>24.0</em:minVersion>
-        <em:maxVersion>29.*</em:maxVersion>
+        <em:maxVersion>30.*</em:maxVersion>
       </Description>
     </em:targetApplication>
     
diff --git a/resource/q.js b/resource/q.js
index 9d2745b13..f899c48a3 100644
--- a/resource/q.js
+++ b/resource/q.js
@@ -1279,7 +1279,14 @@ function async(makeGenerator) {
                 return when(result, callback, errback);
             }
         }
-        var generator = makeGenerator.apply(this, arguments);
+        // Added by Dan
+        // If already a generator, use that
+        if (makeGenerator.send) {
+        	var generator = makeGenerator;
+        }
+        else {
+			var generator = makeGenerator.apply(this, arguments);
+		}
         var callback = continuer.bind(continuer, "send");
         var errback = continuer.bind(continuer, "throw");
         return callback();
diff --git a/resource/schema/renamed-styles.json b/resource/schema/renamed-styles.json
index 6edcd539b..e3c4809d3 100644
--- a/resource/schema/renamed-styles.json
+++ b/resource/schema/renamed-styles.json
@@ -8,7 +8,6 @@
     "american-chemical-society-with-titles-brackets": "american-chemical-society-with-titles",
     "american-journal-of-cardiology": "the-american-journal-of-cardiology",
     "american-journal-of-clinical-nutrition": "the-american-journal-of-clinical-nutrition",
-    "american-journal-of-emergency-medicine": "the-american-journal-of-emergency-medicine",
     "american-journal-of-medicine": "the-american-journal-of-medicine",
     "american-journal-of-pathology": "the-american-journal-of-pathology",
     "american-journal-of-sports-medicine": "the-american-journal-of-sports-medicine",
@@ -17,6 +16,7 @@
     "american-medical-writers-association": "american-medical-writers-association-journal",
     "american-surgeon": " the-american-surgeon",
     "amiens": "universite-de-picardie-jules-verne-ufr-de-medecine",
+    "analytical-abstracts": "royal-society-of-chemistry",
     "annalen-des-naturhistorischen-museums-wien": "annalen-des-naturhistorischen-museums-in-wien",
     "annals-of-allergy": "annals-of-allergy-asthma-and-immunology",
     "annals-of-thoracic-surgery": "the-annals-of-thoracic-surgery",
@@ -26,26 +26,36 @@
     "apsa": "american-political-science-association",
     "archives-of-dermatology": "jama-dermatology",
     "asa": "american-sociological-association",
+    "australian-law-journal": "the-australian-law-journal",
+    "automated-experimentation": "biomed-central",
     "bba-biochimica-et-biophysica-acta": "biochimica-et-biophysica-acta",
     "bio-medical-reviews": "biomedical-reviews",
-    "bmc-pharmacology": "bmc-pharmacology-and-toxicology",
+    "bmc-blood-disorders": "biomed-central",
+    "bmc-chemical-biology": "biomed-central",
+    "bmc-clinical-pharmacology": "biomed-central",
+    "bmc-pharmacology": "biomed-central",
     "bmj-supportive-palliative-care": "bmj-supportive-and-palliative-care",
     "brain-and-development-english-language": "brain-and-development",
     "british-journal-of-medical-economics": "journal-of-medical-economics",
     "british-volume-of-the-journal-of-bone-and-joint-surgery": "the-journal-of-bone-and-joint-surgery",
     "bulletin-of-the-medical-library-association": "journal-of-the-medical-library-association",
     "canadian-journal-of-anaesthesia": "canadian-journal-of-anesthesia",
+    "canadian-journal-of-behavioral-science": "canadian-journal-of-behavioural-science",
     "canadian-journal-of-hospital-pharmacy": "the-canadian-journal-of-hospital-pharmacy",
     "canadian-medical-association-journal": "cmaj",
     "canadian-veterinary-journal": "the-canadian-veterinary-journal",
     "cancer-epidemiology-biomarkers-prevention": "cancer-epidemiology-biomarkers-and-prevention",
     "cardiovascular-pharmacology-and-therapeutics": "journal-of-cardiovascular-pharmacology-and-therapeutics",
+    "catalysts-and-catalysed-reactions": "royal-society-of-chemistry",
     "central-african-journal-of-medicine": "the-central-african-journal-of-medicine",
     "ceylon-journal-of-medical-science": "the-ceylon-journal-of-medical-science",
     "ceylon-medical-journal": "the-ceylon-medical-journal",
+    "chemical-hazards-in-industry": "royal-society-of-chemistry",
     "chicago-note": "chicago-note-bibliography",
     "chronic-diseases-in-canada": "chronic-diseases-and-injuries-in-canada",
     "college-of-physicians-and-surgeons-pakistan": "journal-of-the-college-of-physicians-and-surgeons-pakistan",
+    "comparative-effectiveness-research": "journal-of-comparative-effectiveness-research",
+    "comparative-hepatology": "biomed-central",
     "cuadernos-filologia-clasica": "cuadernos-de-filologia-clasica",
     "current-opinion-biotechnology": "current-opinion-in-biotechnology",
     "current-opinion-cell-biology": "current-opinion-in-cell-biology",
@@ -145,8 +155,8 @@
     "frontiers-in-immunological-tolerance": "frontiers",
     "frontiers-in-immunotherapies-and-vaccines": "frontiers",
     "frontiers-in-impulsivity-compulsivity-and-behavioral-dyscontrol": "frontiers",
-    "frontiers-in-inflammation-pharmacology": "frontiers",
     "frontiers-in-inflammation": "frontiers",
+    "frontiers-in-inflammation-pharmacology": "frontiers",
     "frontiers-in-integrative-and-regenerative-pharmacology": "frontiers",
     "frontiers-in-integrative-physiology": "frontiers",
     "frontiers-in-invertebrate-physiology": "frontiers",
@@ -242,6 +252,7 @@
     "frontiers-in-womens-cancer": "frontiers",
     "future-science": "future-science-journals",
     "geistes-und-kulturwissenschaften-teilmann": "geistes-und-kulturwissenschaften-heilmann",
+    "genetic-vaccines-and-therapy": "biomed-central",
     "geological-society-america-bulletin": "geological-society-of-america-bulletin",
     "geological-society-of-america": "the-geological-society-of-america",
     "gost-r-7-0-5-2008-csl-1-0": "gost-r-7-0-5-2008",
@@ -256,27 +267,34 @@
     "harvard1-unisa-gbfe": "harvard-gesellschaft-fur-bildung-und-forschung-in-europa",
     "harvard3": "harvard-swinburne-university-of-technology",
     "hbp": "hpb",
+    "head-and-neck-oncology": "biomed-central",
+    "heart-and-lung-the-journal-of-critical-care": "heart-and-lung-the-journal-of-acute-and-critical-care",
     "hwr-berlin": "hochschule-fur-wirtschaft-und-recht-berlin",
     "ices-jms": "ices-journal-of-marine-science",
     "ieee-w-url": "ieee-with-url",
     "institute-of-electronics-information-and-communication-engineers": "the-institute-of-electronics-information-and-communication-engineers",
+    "integrative-omics-and-molecular-biology": "biomed-central",
     "international-archives-of-allergy-and-applied-immunology": "international-archives-of-allergy-and-immunology",
     "international-journal-cross-cultural-management": "international-journal-of-cross-cultural-management",
     "international-journal-of-psychiatry-in-medicine": "the-international-journal-of-psychiatry-in-medicine",
     "international-journal-of-psychoanalysis": "the-international-journal-of-psychoanalysis",
     "international-journal-of-tropical-biology-and-conservation": "revista-de-biologia-tropical",
+    "iranian-journal-of-environmental-health-science-and-engineering": "biomed-central",
     "iso690-author-date-fr-without-abstract": "iso690-author-date-fr-no-abstract",
     "jid-symposium-proceedings": "journal-of-investigative-dermatology-symposium-proceedings",
     "journal-of-aapos": "journal-of-american-association-for-pediatric-ophthalmology-and-strabismus",
     "journal-of-allergy-and-clinical-immunology": "the-journal-of-allergy-and-clinical-immunology",
+    "journal-of-bioscience-and-medicine": "biomed-central",
     "journal-of-bone-and-joint-surgery": "the-journal-of-bone-and-joint-surgery",
     "journal-of-cardiovascular-surgery": "the-journal-of-cardiovascular-surgery",
     "journal-of-cell-biology": "the-journal-of-cell-biology",
     "journal-of-chemical-physics": "the-journal-of-chemical-physics",
+    "journal-of-circadian-rhythms": "biomed-central",
     "journal-of-clinical-endocrinology-and-metabolism": "the-journal-of-clinical-endocrinology-and-metabolism",
     "journal-of-clinical-investigation": "the-journal-of-clinical-investigation",
     "journal-of-clinical-psychiatry": "the-journal-of-clinical-psychiatry",
     "journal-of-experimental-medicine": "the-journal-of-experimental-medicine",
+    "journal-of-experimental-psychology-animal-behavior-processes": "journal-of-experimental-psychology-animal-learning-and-cognition",
     "journal-of-general-physiology": "the-journal-of-general-physiology",
     "journal-of-hand-surgery": "the-journal-of-hand-surgery",
     "journal-of-heart-and-lung-transplantation": "the-journal-of-heart-and-lung-transplantation",
@@ -299,6 +317,7 @@
     "journal-of-the-american-medical-association": "jama",
     "journal-of-the-american-medical-informatics-association": "jamia",
     "journal-of-the-american-osteopathic-association": "the-journal-of-the-american-osteopathic-association",
+    "journal-of-the-geological-society-of-london": "journal-of-the-geological-society",
     "journal-of-the-indian-society-of-pedodontics-and-preventative-dentistry": "journal-of-the-indian-society-of-pedodontics-and-preventive-dentistry",
     "journal-of-the-institute-of-medicine": "journal-of-institute-of-medicine",
     "journal-of-the-torrey-botanical-society": "the-journal-of-the-torrey-botanical-society",
@@ -307,6 +326,7 @@
     "juristische-zitierweise-deutsch": "juristische-zitierweise",
     "korean-journal-of-gynecologic-oncology": "journal-of-gynecologic-oncology",
     "la-revue-de-linfirmicre": "la-revue-de-linfirmiere",
+    "laboratory-hazards-bulletin": "royal-society-of-chemistry",
     "lancet": "the-lancet",
     "lancet-infectious-diseases": "the-lancet-infectious-diseases",
     "lancet-neurology": "the-lancet-neurology",
@@ -321,6 +341,7 @@
     "mcrj7": "mcgill-fr",
     "medical-journal-of-australia": "the-medical-journal-of-australia",
     "medicina-militar": "sanidad-militar",
+    "methods-in-organic-synthesis": "royal-society-of-chemistry",
     "methods-information-medicine": "methods-of-information-in-medicine",
     "mhra": "modern-humanities-research-association",
     "mhra-author-date": "modern-humanities-research-association-author-date",
@@ -332,15 +353,19 @@
     "modern-language-association-note": "modern-language-association-6th-edition-note",
     "molecular-biochemical-parasitology": "molecular-and-biochemical-parasitology",
     "national-library-of-medicine-grant": "national-library-of-medicine-grant-proposals",
+    "natural-product-updates": "royal-society-of-chemistry",
     "nature-neuroscience-brief-communication": "nature-neuroscience-brief-communications",
     "netherlands-journal-of-medicine": "the-netherlands-journal-of-medicine",
     "neumologica-y-cirugia-de-torax-neurofibromatosis": "neumologia-y-cirugia-de-torax",
+    "neural-systems-and-circuits": "biomed-central",
     "new-england-journal-of-medicine": "the-new-england-journal-of-medicine",
     "new-iraqi-journal-of-medicine": "the-new-iraqi-journal-of-medicine",
     "new-zealand-journal-of-medical-laboratory-technology": "new-zealand-journal-of-medical-laboratory-science",
     "new-zealand-medical-journal": "the-new-zealand-medical-journal",
     "nlm": "national-library-of-medicine",
+    "nonlinear-biomedical-physics": "biomed-central",
     "north-west-university-harvard": "harvard-north-west-university",
+    "open-network-biology": "biomed-central",
     "ophthalmic-surgery-lasers-and-imaging": "ophthalmic-surgery-lasers-and-imaging-retina",
     "optical-society-of-america": "the-optical-society",
     "oxford-brookes-university-faculty-of-health-and-life-sciences": "harvard-oxford-brookes-university-faculty-of-health-and-life-sciences",
@@ -352,21 +377,28 @@
     "progrcs-en-urologie": "progres-en-urologie",
     "progrcs-en-urologie-fmc": "progres-en-urologie",
     "quaderni-avogadro-colloquia": "quaderni-degli-avogadro-colloquia",
+    "queensland-lawyer": "the-queensland-lawyer",
     "review-of-financial-studies": "the-review-of-financial-studies",
     "revista-brasileira-de-botanica": "brazilian-journal-of-botany",
     "rockefeller-university-press": "the-rockefeller-university-press",
     "sbl-fullnote-bibliography": "society-of-biblical-literature-fullnote-bibliography",
     "scandinavian-journal-of-clinical-and-laboratory-investigation": "the-scandinavian-journal-of-clinical-and-laboratory-investigation",
     "science-without-title": "science-without-titles",
+    "silence": "biomed-central",
     "small-wiley": "small",
+    "smartt": "biomed-central",
     "soil-biology-biochemistry": "soil-biology-and-biochemistry",
     "sozialwissenschaften-teilmann": "sozialwissenschaften-heilmann",
+    "sports-medicine-arthroscopy-rehabilitation-therapy-and-technology": "biomed-central",
     "springer-plasmonics": "plasmonics",
     "springer-protocols": "springerprotocols",
+    "sustainable-healthcare": "biomed-central",
     "tah-gkw": "geistes-und-kulturwissenschaften-teilmann",
     "tah-soz": "sozialwissenschaften-teilmann",
     "taylor-and-francis-reference-style-f": "taylor-and-francis-chicago-f",
     "the-academy-of-management-review": "academy-of-management-review",
+    "the-american-journal-of-emergency-medicine": "american-journal-of-emergency-medicine",
+    "tort-law-review": "the-tort-law-review",
     "trends-journal": "trends-journals",
     "tu-wien-dissertation": "technische-universitat-wien",
     "ulster-medical-journal": "the-ulster-medical-journal",
diff --git a/resource/schema/repotime.txt b/resource/schema/repotime.txt
index 78ffe238b..ea0164d7f 100644
--- a/resource/schema/repotime.txt
+++ b/resource/schema/repotime.txt
@@ -1 +1 @@
-2014-04-29 04:00:01
+2014-06-24 00:00:01
diff --git a/styles b/styles
index e6a736644..feb40111b 160000
--- a/styles
+++ b/styles
@@ -1 +1 @@
-Subproject commit e6a736644b81855fae658d68718e8a7bc3bf40b1
+Subproject commit feb40111bacae97b61cfbf8b4948054ead1b4570
diff --git a/translators b/translators
index 0c7b09949..1c919d5c3 160000
--- a/translators
+++ b/translators
@@ -1 +1 @@
-Subproject commit 0c7b09949ae951836d5d746b9b5f92798f8a68d0
+Subproject commit 1c919d5c3d9e6be7106c36cbacd34ae850167497
diff --git a/update.rdf b/update.rdf
index cabece801..ca1fd25e5 100644
--- a/update.rdf
+++ b/update.rdf
@@ -12,7 +12,7 @@
             <RDF:Description>
               <id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>
               <minVersion>24.0</minVersion>
-              <maxVersion>29.*</maxVersion>
+              <maxVersion>30.*</maxVersion>
               <updateLink>http://download.zotero.org/extension/zotero.xpi</updateLink>
               <updateHash>sha1:</updateHash>
             </RDF:Description>