From 261862cf305dd5f0663091bcecaf6d6134546240 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 17 Jan 2012 01:18:38 -0500
Subject: [PATCH 01/69] Remove debugging info

---
 chrome/content/zotero/xpcom/data/dataObjects.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/chrome/content/zotero/xpcom/data/dataObjects.js b/chrome/content/zotero/xpcom/data/dataObjects.js
index 5896142166..1e1690aba9 100644
--- a/chrome/content/zotero/xpcom/data/dataObjects.js
+++ b/chrome/content/zotero/xpcom/data/dataObjects.js
@@ -366,12 +366,6 @@ Zotero.DataObjects = function (object, objectPlural, id, table) {
 	
 	this.editCheck = function (obj) {
 		if (!Zotero.Sync.Server.updatesInProgress && !Zotero.Sync.Storage.updatesInProgress && !this.isEditable(obj)) {
-			try {
-				asfasf();
-			}
-			catch (e) {
-				Zotero.debug(e);
-			}
 			if (Zotero.Sync.Storage.syncInProgress) {
 				Components.utils.reportError("Storage sync in progress but updatesInProgress not set -- fix?");
 				return;

From 2b2da828c09eff38b40184bbfa15292bc2585a15 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 17 Jan 2012 01:19:29 -0500
Subject: [PATCH 02/69] Restore ".SOURCE" in ZOTERO_CONFIG version

---
 chrome/content/zotero/xpcom/zotero.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index f9889eac37..b0af143ee0 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -35,7 +35,7 @@ const ZOTERO_CONFIG = {
 	API_URL: 'https://api.zotero.org/',
 	PREF_BRANCH: 'extensions.zotero.',
 	BOOKMARKLET_URL: 'https://www.zotero.org/bookmarklet/',
-	VERSION: "3.0rc1"
+	VERSION: "3.0rc1.SOURCE"
 };
 
 /*

From 6750535319ef4584b8ed66d07aea4636ca71a0fb Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Tue, 17 Jan 2012 00:23:59 -0500
Subject: [PATCH 03/69] Fix panel sizing on OS X and Windows

---
 chrome/content/zotero/integration/quickFormat.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js
index 732c51e732..3206db38f7 100644
--- a/chrome/content/zotero/integration/quickFormat.js
+++ b/chrome/content/zotero/integration/quickFormat.js
@@ -741,11 +741,15 @@ var Zotero_QuickFormat = new function () {
 			}
 			
 			if(!panelFrameHeight) {
-				panelFrameHeight = referencePanel.boxObject.height - referencePanel.clientHeight;
+				if(Zotero.isWin || Zotero.isMac) {
+					panelFrameHeight = 1;
+				} else {
+					panelFrameHeight = referencePanel.boxObject.height - referencePanel.clientHeight;
+				}
 			}
 			
 			referencePanel.sizeTo(window.outerWidth-30,
-				numReferences*referenceHeight+numSeparators*separatorHeight+2*panelFrameHeight-1);
+				numReferences*referenceHeight+numSeparators*separatorHeight+2*panelFrameHeight);
 			if(!panelShowing) _openReferencePanel();
 		} else if(panelShowing) {
 			referencePanel.hidePopup();

From bbd686f8bbafd4430ee8197e5aa78a29a3518a5c Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Tue, 17 Jan 2012 00:31:43 -0500
Subject: [PATCH 04/69] A true platform-general solution to the panel sizing
 problem

---
 chrome/content/zotero/integration/quickFormat.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/chrome/content/zotero/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js
index 3206db38f7..ca37251547 100644
--- a/chrome/content/zotero/integration/quickFormat.js
+++ b/chrome/content/zotero/integration/quickFormat.js
@@ -24,6 +24,7 @@
 */
 
 var Zotero_QuickFormat = new function () {
+	const pixelRe = /^([0-9]+)px$/
 	var initialized, io, qfs, qfi, qfiWindow, qfiDocument, qfe, qfb, qfbHeight, keepSorted, 
 		showEditor, referencePanel, referenceBox, referenceHeight = 0, separatorHeight = 0,
 		currentLocator, currentLocatorLabel, currentSearchTime, dragging, panel, 
@@ -741,15 +742,19 @@ var Zotero_QuickFormat = new function () {
 			}
 			
 			if(!panelFrameHeight) {
-				if(Zotero.isWin || Zotero.isMac) {
-					panelFrameHeight = 1;
-				} else {
-					panelFrameHeight = referencePanel.boxObject.height - referencePanel.clientHeight;
+				panelFrameHeight = referencePanel.boxObject.height - referencePanel.clientHeight;
+				var computedStyle = window.getComputedStyle(referenceBox, null);
+				for each(var attr in ["border-top-width", "border-bottom-width"]) {
+					var val = computedStyle.getPropertyValue(attr);
+					if(val) {
+						var m = pixelRe.exec(val);
+						if(m) panelFrameHeight += parseInt(m[1], 10);
+					}
 				}
 			}
 			
 			referencePanel.sizeTo(window.outerWidth-30,
-				numReferences*referenceHeight+numSeparators*separatorHeight+2*panelFrameHeight);
+				numReferences*referenceHeight+numSeparators*separatorHeight+panelFrameHeight);
 			if(!panelShowing) _openReferencePanel();
 		} else if(panelShowing) {
 			referencePanel.hidePopup();

From 0fcf07dd6a9bbb1011783e18a38db32a8df33aee Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Tue, 17 Jan 2012 01:49:09 -0500
Subject: [PATCH 05/69] Teeny tiny cosmetic fix on Windows

---
 chrome/content/zotero-platform/win/integration.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/zotero-platform/win/integration.css b/chrome/content/zotero-platform/win/integration.css
index f466ab7f6a..38432c6c12 100644
--- a/chrome/content/zotero-platform/win/integration.css
+++ b/chrome/content/zotero-platform/win/integration.css
@@ -31,7 +31,7 @@
 }
 
 #zotero-icon {
-	margin: 2px 0 0 3px;
+	margin: -1px 0 0 4px;
 	-moz-appearance: none;
 }
 

From 77a9bac69152a5a1360f1753dbcd8fa510effb38 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Tue, 17 Jan 2012 01:49:45 -0500
Subject: [PATCH 06/69] Fix window dragging on Windows, because for some reason
 the jsm doesn't work properly

---
 .../content/zotero/integration/quickFormat.js |   2 +
 .../zotero/integration/quickFormat.xul        |   7 +-
 .../zotero/integration/windowDraggingUtils.js | 118 ++++++++++++++++++
 3 files changed, 124 insertions(+), 3 deletions(-)
 create mode 100644 chrome/content/zotero/integration/windowDraggingUtils.js

diff --git a/chrome/content/zotero/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js
index ca37251547..1491ac0bbb 100644
--- a/chrome/content/zotero/integration/quickFormat.js
+++ b/chrome/content/zotero/integration/quickFormat.js
@@ -49,6 +49,8 @@ var Zotero_QuickFormat = new function () {
 				document.documentElement.setAttribute("hidechrome", true);
 			}
 			
+			new WindowDraggingElement(document.getElementById("quick-format-dialog"), window);
+			
 			qfs = document.getElementById("quick-format-search");
 			qfi = document.getElementById("quick-format-iframe");
 			qfb = document.getElementById("quick-format-entry");
diff --git a/chrome/content/zotero/integration/quickFormat.xul b/chrome/content/zotero/integration/quickFormat.xul
index fb5df04eca..b82478f9d0 100644
--- a/chrome/content/zotero/integration/quickFormat.xul
+++ b/chrome/content/zotero/integration/quickFormat.xul
@@ -40,9 +40,10 @@
 	onkeypress="Zotero_QuickFormat.onKeyPress(event)">
 	
 	<script src="../include.js"/>
-	<script src="quickFormat.js"/>
+	<script src="windowDraggingUtils.js" type="text/javascript;version=1.8"/>
+	<script src="quickFormat.js" type="text/javascript;version=1.8"/>
 	
-	<windowdragbox orient="horizontal" id="quick-format-entry"> 
+	<box orient="horizontal" id="quick-format-entry"> 
 		<deck id="quick-format-deck" selectedIndex="0" flex="1">
 			<hbox id="quick-format-search" flex="1" align="start">
 				<hbox flex="1">
@@ -64,7 +65,7 @@
 			</hbox>
 			<progressmeter id="quick-format-progress-meter" mode="undetermined" value="0" flex="1"/>
 		</deck>
-	</windowdragbox>
+	</box>
 	<panel id="quick-format-reference-panel" noautofocus="true" norestorefocus="true" noautohide="true" height="0">
 		<richlistbox id="quick-format-reference-list" flex="1"/>
 	</panel>
diff --git a/chrome/content/zotero/integration/windowDraggingUtils.js b/chrome/content/zotero/integration/windowDraggingUtils.js
new file mode 100644
index 0000000000..bbcc23b092
--- /dev/null
+++ b/chrome/content/zotero/integration/windowDraggingUtils.js
@@ -0,0 +1,118 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * 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 mozilla.org Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Markus Stange <mstange@themasta.com>.
+ * Portions created by the Initial Developer are Copyright (C) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+let EXPORTED_SYMBOLS = [ "WindowDraggingElement" ];
+
+function WindowDraggingElement(elem, window) {
+  this._elem = elem;
+  this._window = window;
+  this._elem.addEventListener("mousedown", this, false);
+}
+
+WindowDraggingElement.prototype = {
+  mouseDownCheck: function(e) { return true; },
+  dragTags: ["box", "hbox", "vbox", "spacer", "label", "statusbarpanel", "stack",
+             "toolbaritem", "toolbarseparator", "toolbarspring", "toolbarspacer",
+             "radiogroup", "deck", "scrollbox", "arrowscrollbox", "tabs"],
+  shouldDrag: function(aEvent) {
+    if (aEvent.button != 0 ||
+        this._window.fullScreen ||
+        !this.mouseDownCheck.call(this._elem, aEvent) ||
+        aEvent.getPreventDefault())
+      return false;
+
+    let target = aEvent.originalTarget, parent = aEvent.originalTarget;
+
+    // The target may be inside an embedded iframe or browser. (bug 615152)
+    if (target.ownerDocument.defaultView != this._window)
+      return false;
+
+    while (parent != this._elem) {
+      let mousethrough = parent.getAttribute("mousethrough");
+      if (mousethrough == "always")
+        target = parent.parentNode;
+      else if (mousethrough == "never")
+        break;
+      parent = parent.parentNode;
+    }
+    while (target != this._elem) {
+      if (this.dragTags.indexOf(target.localName) == -1)
+        return false;
+      target = target.parentNode;
+    }
+    return true;
+  },
+  isPanel : function() {
+    return this._elem instanceof Components.interfaces.nsIDOMXULElement &&
+           this._elem.localName == "panel";
+  },
+  handleEvent: function(aEvent) {
+    let isPanel = this.isPanel();
+
+    switch (aEvent.type) {
+      case "mousedown":
+        if (!this.shouldDrag(aEvent))
+          return;
+
+        if (isPanel) {
+          let screenRect = this._elem.getOuterScreenRect();
+          this._deltaX = aEvent.screenX - screenRect.left;
+          this._deltaY = aEvent.screenY - screenRect.top;
+        }
+        else {
+          this._deltaX = aEvent.screenX - this._window.screenX;
+          this._deltaY = aEvent.screenY - this._window.screenY;
+        }
+        this._draggingWindow = true;
+        this._window.addEventListener("mousemove", this, false);
+        this._window.addEventListener("mouseup", this, false);
+        break;
+      case "mousemove":
+        if (this._draggingWindow) {
+          let toDrag = this.isPanel() ? this._elem : this._window;
+          toDrag.moveTo(aEvent.screenX - this._deltaX, aEvent.screenY - this._deltaY);
+        }
+        break;
+      case "mouseup":
+        if (this._draggingWindow) {
+          this._draggingWindow = false;
+          this._window.removeEventListener("mousemove", this, false);
+          this._window.removeEventListener("mouseup", this, false);
+        }
+        break;
+    }
+  }
+}

From 35efd798defcd254b995ae80a789774e64a82c11 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 16 Jan 2012 23:07:56 -0500
Subject: [PATCH 07/69] Save real target URLs from Google search results

"Save Link as Zotero Item" previously saved Google's tracking page
instead of the real destination. This can be extended to other sites
if necessary.
---
 chrome/content/zotero/xpcom/utilities.js | 27 ++++++++++++++++++++++++
 chrome/content/zotero/zoteroPane.js      |  2 ++
 2 files changed, 29 insertions(+)

diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js
index e65d1881ba..bfa170f977 100644
--- a/chrome/content/zotero/xpcom/utilities.js
+++ b/chrome/content/zotero/xpcom/utilities.js
@@ -1417,5 +1417,32 @@ Zotero.Utilities = {
 				}
 			}
 		}
+	},
+	
+	
+	/**
+	 * Get the real target URL from an intermediate URL
+	 */
+	"resolveIntermediateURL":function(url) {
+		var patterns = [
+			// Google search results
+			{
+				regexp: /^https?:\/\/(www.)?google\.(com|(com?\.)?[a-z]{2})\/url\?/,
+				variable: "url"
+			}
+		];
+		
+		for (var i=0, len=patterns.length; i<len; i++) {
+			if (!url.match(patterns[i].regexp)) {
+				continue;
+			}
+			var matches = url.match(new RegExp("&" + patterns[i].variable + "=(.+?)(&|$)"));
+			if (!matches) {
+				continue;
+			}
+			return decodeURIComponent(matches[1]);
+		}
+		
+		return url;
 	}
 }
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index e6df916dfc..d90c7cfece 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -3197,6 +3197,8 @@ var ZoteroPane = new function()
 		
 		var self = this;
 		
+		url = Zotero.Utilities.resolveIntermediateURL(url);
+		
 		Zotero.MIME.getMIMETypeFromURL(url, function (mimeType, hasNativeHandler) {
 			// If native type, save using a hidden browser
 			if (hasNativeHandler) {

From eddaa672ef7692f67ffa4598536b859fc6d3f341 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 18 Jan 2012 03:37:54 -0500
Subject: [PATCH 08/69] Provide link to cert override docs in Standalone Verify
 Server

The button wasn't opening the WebDAV URL within Standalone, and
XULRunner doesn't provide the whitelist interface anyway.

Documentation page still needed
---
 chrome/content/zotero/xpcom/storage/webdav.js | 32 ++++++++++++++-----
 chrome/locale/en-US/zotero/zotero.properties  |  2 ++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/chrome/content/zotero/xpcom/storage/webdav.js b/chrome/content/zotero/xpcom/storage/webdav.js
index 692fc3307c..8efdff489e 100644
--- a/chrome/content/zotero/xpcom/storage/webdav.js
+++ b/chrome/content/zotero/xpcom/storage/webdav.js
@@ -1655,18 +1655,34 @@ Zotero.Sync.Storage.Session.WebDAV.prototype._checkResponse = function (req, obj
 				Zotero.debug(e);
 			}
 			
-			var msg = Zotero.getString('sync.storage.error.webdav.sslCertificateError', host)
-				+ " " + Zotero.getString('sync.storage.error.webdav.loadURLForMoreInfo');
+			var msg = Zotero.getString('sync.storage.error.webdav.sslCertificateError', host);
+			// In Standalone, provide cert_override.txt instructions and a
+			// button to open the Zotero profile directory
+			if (Zotero.isStandalone) {
+				msg += "\n\n" + Zotero.getString('sync.storage.error.webdav.seeCertOverrideDocumentation');
+				var buttonText = Zotero.getString('general.openDocumentation');
+				var func = function () {
+					var zp = Zotero.getActiveZoteroPane();
+					zp.loadURI("http://www.zotero.org/support/kb/cert_override", { shiftKey: true });
+				};
+			}
+			// In Firefox display a button to load the WebDAV URL
+			else {
+				msg += "\n\n" + Zotero.getString('sync.storage.error.webdav.loadURLForMoreInfo');
+				var buttonText = Zotero.getString('sync.storage.error.webdav.loadURL');
+				var func = function () {
+					var zp = Zotero.getActiveZoteroPane();
+					zp.loadURI(channel.URI.spec, { shiftKey: true });
+				};
+			}
+			
 			var e = new Zotero.Error(
 				msg,
 				0,
 				{
 					dialogText: msg,
-					dialogButtonText: Zotero.getString('sync.storage.error.webdav.loadURL'),
-					dialogButtonCallback: function () {
-						var zp = Zotero.getActiveZoteroPane();
-						zp.loadURI(channel.URI.spec, { shiftKey: true });
-					}
+					dialogButtonText: buttonText,
+					dialogButtonCallback: func
 				}
 			);
 			
@@ -1675,7 +1691,7 @@ Zotero.Sync.Storage.Session.WebDAV.prototype._checkResponse = function (req, obj
 		}
 		else if ((secInfo.securityState & Ci.nsIWebProgressListener.STATE_IS_BROKEN) == Ci.nsIWebProgressListener.STATE_IS_BROKEN) {
 			var msg = Zotero.getString('sync.storage.error.webdav.sslConnectionError', host) +
-						Zotero.getString('sync.storage.error.webdav.loadURLForMoreInfo');
+						"\n\n" + Zotero.getString('sync.storage.error.webdav.loadURLForMoreInfo');
 			var e = new Zotero.Error(
 				msg,
 				0,
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index abe84e4c11..110b292df1 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation		= See %S for more information.
 general.enable						= Enable
 general.disable						= Disable
 general.remove						= Remove
+general.openDocumentation			= Open Documentation
 
 general.operationInProgress = A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished = Please wait until it has finished.
@@ -686,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace		= A file upload failed due to insuf
 sync.storage.error.webdav.sslCertificateError	= SSL certificate error connecting to %S.
 sync.storage.error.webdav.sslConnectionError	= SSL connection error connecting to %S.
 sync.storage.error.webdav.loadURLForMoreInfo	= Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation	= See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL				= Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1 	= You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2 	= See your zotero.org account settings for additional storage options.

From 5e2cd44cc83a5fa1cbbaec5b9a313fcedd3ec92f Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 18 Jan 2012 03:41:29 -0500
Subject: [PATCH 09/69] Remove trailing period

---
 chrome/locale/af-ZA/zotero/zotero.properties | 4 ++--
 chrome/locale/ca-AD/zotero/zotero.properties | 4 ++--
 chrome/locale/da-DK/zotero/zotero.properties | 4 ++--
 chrome/locale/el-GR/zotero/zotero.properties | 4 ++--
 chrome/locale/en-US/zotero/zotero.properties | 4 ++--
 chrome/locale/eu-ES/zotero/zotero.properties | 4 ++--
 chrome/locale/fi-FI/zotero/zotero.properties | 4 ++--
 chrome/locale/he-IL/zotero/zotero.properties | 4 ++--
 chrome/locale/hr-HR/zotero/zotero.properties | 4 ++--
 chrome/locale/is-IS/zotero/zotero.properties | 4 ++--
 chrome/locale/it-IT/zotero/zotero.properties | 4 ++--
 chrome/locale/ja-JP/zotero/zotero.properties | 4 ++--
 chrome/locale/mn-MN/zotero/zotero.properties | 4 ++--
 chrome/locale/nb-NO/zotero/zotero.properties | 4 ++--
 chrome/locale/nn-NO/zotero/zotero.properties | 4 ++--
 chrome/locale/sr-RS/zotero/zotero.properties | 4 ++--
 chrome/locale/th-TH/zotero/zotero.properties | 4 ++--
 chrome/locale/vi-VN/zotero/zotero.properties | 4 ++--
 chrome/locale/zh-CN/zotero/zotero.properties | 4 ++--
 19 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties
index 4c586ce0dd..d3e981a2f4 100644
--- a/chrome/locale/af-ZA/zotero/zotero.properties
+++ b/chrome/locale/af-ZA/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties
index 54cd304ec4..baa3771873 100644
--- a/chrome/locale/ca-AD/zotero/zotero.properties
+++ b/chrome/locale/ca-AD/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties
index 1213e6c26c..7b65132353 100644
--- a/chrome/locale/da-DK/zotero/zotero.properties
+++ b/chrome/locale/da-DK/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties
index 4c586ce0dd..d3e981a2f4 100644
--- a/chrome/locale/el-GR/zotero/zotero.properties
+++ b/chrome/locale/el-GR/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 110b292df1..fbf1fc7958 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -684,8 +684,8 @@ sync.storage.error.webdav.invalidURL			= %S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin			= The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied		= You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace		= A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError	= SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError	= SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError	= SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError	= SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo	= Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.seeCertOverrideDocumentation	= See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL				= Load WebDAV URL
diff --git a/chrome/locale/eu-ES/zotero/zotero.properties b/chrome/locale/eu-ES/zotero/zotero.properties
index a8b6514037..213349f3f7 100644
--- a/chrome/locale/eu-ES/zotero/zotero.properties
+++ b/chrome/locale/eu-ES/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S-ek ez du balio WebDAV URL gisa.
 sync.storage.error.webdav.invalidLogin=WebDAV zerbitzariak zure erabiltzailea eta pasahitza ukatu egin ditu
 sync.storage.error.webdav.permissionDenied=Errorea: You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=Errorea: A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=Errorea: SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=Errorea: SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=Errorea: SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=Errorea: SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Zuretzat gordetzen den lekua Zotero zerbitzarian gainezka dago. Zenbait fitxategi ez dira hara bidali. Besteak sinkronizatzen jarraituko dira.
diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties
index 3c2e8b8586..edbbca358b 100644
--- a/chrome/locale/fi-FI/zotero/zotero.properties
+++ b/chrome/locale/fi-FI/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties
index 8ba65b93c0..a4bfea214f 100644
--- a/chrome/locale/he-IL/zotero/zotero.properties
+++ b/chrome/locale/he-IL/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties
index 4c586ce0dd..d3e981a2f4 100644
--- a/chrome/locale/hr-HR/zotero/zotero.properties
+++ b/chrome/locale/hr-HR/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties
index 051ccef57b..afb66f4985 100644
--- a/chrome/locale/is-IS/zotero/zotero.properties
+++ b/chrome/locale/is-IS/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties
index 6636357c5e..30e0c66ef5 100644
--- a/chrome/locale/it-IT/zotero/zotero.properties
+++ b/chrome/locale/it-IT/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties
index 61e7e1f856..3339247e66 100644
--- a/chrome/locale/ja-JP/zotero/zotero.properties
+++ b/chrome/locale/ja-JP/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties
index b96143a3fe..08b76e4345 100644
--- a/chrome/locale/mn-MN/zotero/zotero.properties
+++ b/chrome/locale/mn-MN/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties
index 88d597532b..9a2b6ce63d 100644
--- a/chrome/locale/nb-NO/zotero/zotero.properties
+++ b/chrome/locale/nb-NO/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/nn-NO/zotero/zotero.properties b/chrome/locale/nn-NO/zotero/zotero.properties
index f07c93c8b1..99f60e0142 100644
--- a/chrome/locale/nn-NO/zotero/zotero.properties
+++ b/chrome/locale/nn-NO/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV servar did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A fila upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero Fila Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties
index 3e131e107d..920a40cf03 100644
--- a/chrome/locale/sr-RS/zotero/zotero.properties
+++ b/chrome/locale/sr-RS/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties
index 76d335503b..023e45aed2 100644
--- a/chrome/locale/th-TH/zotero/zotero.properties
+++ b/chrome/locale/th-TH/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties
index 9dee9895e8..d68f94348b 100644
--- a/chrome/locale/vi-VN/zotero/zotero.properties
+++ b/chrome/locale/vi-VN/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties
index 45c7051365..7b6a08e32b 100644
--- a/chrome/locale/zh-CN/zotero/zotero.properties
+++ b/chrome/locale/zh-CN/zotero/zotero.properties
@@ -681,8 +681,8 @@ sync.storage.error.webdav.invalidURL=%S is not a valid WebDAV URL.
 sync.storage.error.webdav.invalidLogin=The WebDAV server did not accept the username and password you entered.
 sync.storage.error.webdav.permissionDenied=You don't have permission to access %S on the WebDAV server.
 sync.storage.error.webdav.insufficientSpace=A file upload failed due to insufficient space on the WebDAV server.
-sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S.
-sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S.
+sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
+sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.

From 8bebd77a578d368f132bbcd4732040ba97e1d4eb Mon Sep 17 00:00:00 2001
From: Frank <biercenator@gmail.com>
Date: Tue, 17 Jan 2012 06:49:49 +0800
Subject: [PATCH 10/69] Upgrade citeproc-js to version 1.0.261. Important fix
 to avoid a processor hang in some circumstances.

---
 chrome/content/zotero/xpcom/citeproc.js | 34 +++++++++++++++----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js
index 1f16bcba4a..82c4fad94e 100644
--- a/chrome/content/zotero/xpcom/citeproc.js
+++ b/chrome/content/zotero/xpcom/citeproc.js
@@ -1980,7 +1980,7 @@ CSL.DateParser = function () {
 };
 CSL.Engine = function (sys, style, lang, forceLang) {
     var attrs, langspec, localexml, locale;
-    this.processor_version = "1.0.260";
+    this.processor_version = "1.0.261";
     this.csl_version = "1.0";
     this.sys = sys;
     this.sys.xml = new CSL.System.Xml.Parsing();
@@ -11398,19 +11398,22 @@ CSL.Disambiguation.prototype.disNames = function (ismax) {
 };
 CSL.Disambiguation.prototype.disExtraText = function () {
     var pos, len, mybase;
-    if (this.clashes[1] === 0) {
-        mybase = CSL.cloneAmbigConfig(this.base);
-        mybase.year_suffix = false;
+    mybase = CSL.cloneAmbigConfig(this.base);
+    mybase.year_suffix = false;
+    if (this.clashes[1] === 0 || this.clashes[1] < this.clashes[0]) {
         this.state.registry.registerAmbigToken(this.akey, "" + this.partners[0].id, mybase);
-        if (this.nonpartners.length === 1) {
-            this.state.registry.registerAmbigToken(this.akey, "" + this.nonpartners[0].id, mybase);
-            this.lists[this.listpos] = [this.base,[]];
-        } else {
-            this.lists[this.listpos] = [this.base, this.nonpartners];
+        for (var i=0, ilen=this.partners.length; i < ilen; i += 1) {
+            this.state.registry.registerAmbigToken(this.akey, "" + this.partners[i].id, mybase);
+        }
+        for (var i=0, ilen=this.nonpartners.length; i < ilen; i += 1) {
+            this.state.registry.registerAmbigToken(this.akey, "" + this.nonpartners[i].id, mybase);
         }
     } else {
-        this.base.disambiguate = false;
+        for (var i=0, ilen=this.partners.length; i < ilen; i += 1) {
+            this.state.registry.registerAmbigToken(this.akey, "" + this.partners[i].id, this.betterbase);
+        }
     }
+    this.lists[this.listpos] = [this.base, []];
 };
 CSL.Disambiguation.prototype.disYears = function () {
     var pos, len, tokens, token, item;
@@ -11483,14 +11486,17 @@ CSL.Disambiguation.prototype.incrementDisambig = function () {
                     }
                 }
             }
+        } else if (increment_name) {
+            maxed = true;
+            if (this.modeindex < this.modes.length - 1) {
+                this.modeindex += 1;
+            }
         }
     }
-    if (!maxed && "disExtraText" === this.modes[this.modeindex]) {
+    if ("disExtraText" === this.modes[this.modeindex]) {
         this.base.disambiguate = true;
-        maxed = true;
     }
-    if (!maxed && "disYears" === this.modes[this.modeindex]) {
-        maxed = true;
+    if ("disYears" === this.modes[this.modeindex]) {
     }
     return maxed;
 };

From 0e9505a2c5137cb054c46f3f6d12bee12ac79300 Mon Sep 17 00:00:00 2001
From: Frank <biercenator@gmail.com>
Date: Tue, 17 Jan 2012 19:49:47 +0800
Subject: [PATCH 11/69] Upgrade citeproc-js to version 1.0.262.

---
 chrome/content/zotero/xpcom/citeproc.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js
index 82c4fad94e..756c8569c8 100644
--- a/chrome/content/zotero/xpcom/citeproc.js
+++ b/chrome/content/zotero/xpcom/citeproc.js
@@ -121,7 +121,6 @@ var CSL = {
     MINIMAL_NAME_FIELDS: ["literal", "family"],
     SWAPPING_PUNCTUATION: [".", "!", "?", ":",","],
     TERMINAL_PUNCTUATION: [":", ".", ";", "!", "?", " "],
-    SPLICE_PUNCTUATION: [".", "!", "?", ":", ";", ","],
     NONE: 0,
     NUMERIC: 1,
     POSITION: 2,
@@ -1980,7 +1979,7 @@ CSL.DateParser = function () {
 };
 CSL.Engine = function (sys, style, lang, forceLang) {
     var attrs, langspec, localexml, locale;
-    this.processor_version = "1.0.261";
+    this.processor_version = "1.0.262";
     this.csl_version = "1.0";
     this.sys = sys;
     this.sys.xml = new CSL.System.Xml.Parsing();
@@ -3721,6 +3720,8 @@ CSL.getCitationCluster = function (inputList, citationID) {
             var tmpstr = composite.pop();
             if (tmpstr && tmpstr.slice(0, 1) === ",") {
                 objects.push(tmpstr);
+            } else if ("string" == typeof objects.slice(-1)[0] && objects.slice(-1)[0].slice(-1) === ",") {
+                objects.push(" " + tmpstr)
             } else if (tmpstr) {
                 objects.push(txt_esc(this.tmp.splice_delimiter) + tmpstr);
             }

From 376ecba496a9cadaca5cbe4c36c6212b7ae54d52 Mon Sep 17 00:00:00 2001
From: Frank <biercenator@gmail.com>
Date: Wed, 18 Jan 2012 16:32:12 +0800
Subject: [PATCH 12/69] Upgrade citeproc-js to version 1.0.263

---
 chrome/content/zotero/xpcom/citeproc.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js
index 756c8569c8..82d331da4f 100644
--- a/chrome/content/zotero/xpcom/citeproc.js
+++ b/chrome/content/zotero/xpcom/citeproc.js
@@ -1979,7 +1979,7 @@ CSL.DateParser = function () {
 };
 CSL.Engine = function (sys, style, lang, forceLang) {
     var attrs, langspec, localexml, locale;
-    this.processor_version = "1.0.262";
+    this.processor_version = "1.0.263";
     this.csl_version = "1.0";
     this.sys = sys;
     this.sys.xml = new CSL.System.Xml.Parsing();
@@ -11383,6 +11383,7 @@ CSL.Disambiguation.prototype.disNames = function (ismax) {
         this.state.registry.registerAmbigToken(this.akey, "" + this.nonpartners[0].id, this.betterbase);
         this.lists[this.listpos] = [this.base, this.partners];
     } else if (this.clashes[1] < this.clashes[0]) {
+        this.betterbase = CSL.cloneAmbigConfig(this.base);
         this.lists[this.listpos] = [this.base, this.partners];
         this.lists.push([this.base, this.nonpartners]);
     } else {
@@ -11441,7 +11442,7 @@ CSL.Disambiguation.prototype.disYears = function () {
 };
 CSL.Disambiguation.prototype.incrementDisambig = function () {
     var val, maxed;
-    maxed = false;
+    var maxed = false;
     if ("disNames" === this.modes[this.modeindex]) {
         var increment_name = false;
         var increment_nameset = false;
@@ -11482,6 +11483,7 @@ CSL.Disambiguation.prototype.incrementDisambig = function () {
                     }
                 } else {
                     maxed = true;
+                    this.base = CSL.cloneAmbigConfig(this.betterbase);
                     if (this.modeindex < this.modes.length - 1) {
                         this.modeindex += 1;
                     }

From 865b3e0b21af5aa0fac71e93dc1a7635a1ae168c Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 18 Jan 2012 23:50:21 -0500
Subject: [PATCH 13/69] Add progress indicator to add item by identifier

---
 chrome/content/zotero/lookup.js      | 14 +++++++++++++-
 chrome/content/zotero/zoteroPane.xul |  7 +++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/lookup.js b/chrome/content/zotero/lookup.js
index a43d041502..99984dfea0 100644
--- a/chrome/content/zotero/lookup.js
+++ b/chrome/content/zotero/lookup.js
@@ -58,6 +58,9 @@ const Zotero_Lookup = new function () {
 		translate.setTranslator(translators);
 		
 		translate.setHandler("done", function(translate, success) {
+			identifierElement.style.opacity = 1;
+			identifierElement.disabled = false;
+			document.getElementById("zotero-lookup-progress").hidden = true;
 			if(success) {
 				document.getElementById("zotero-lookup-panel").hidePopup();
 			} else {
@@ -78,6 +81,10 @@ const Zotero_Lookup = new function () {
 			if(collection) collection.addItem(item.id);
 		});
 		
+		identifierElement.style.opacity = 0.5;
+		identifierElement.disabled = true;
+		document.getElementById("zotero-lookup-progress").hidden = false;
+		
 		translate.translate(libraryID);
 		return false;
 	}
@@ -102,7 +109,12 @@ const Zotero_Lookup = new function () {
 		if(!Zotero.isFx4) {
 			document.getElementById("zotero-lookup-panel").style.padding = "10px";
 		}
-		document.getElementById("zotero-lookup-textbox").focus();
+		
+		document.getElementById("zotero-lookup-progress").hidden = false;
+		var identifierElement = document.getElementById("zotero-lookup-textbox");
+		identifierElement.style.opacity = 1;
+		identifierElement.disabled = false;
+		identifierElement.focus();
 	}
 	
 	/**
diff --git a/chrome/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index 7aff1895d6..1081ce51e1 100644
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@@ -142,10 +142,13 @@
 					<toolbarbutton id="zotero-tb-item-from-page" class="zotero-tb-button" tooltiptext="&zotero.toolbar.newItemFromPage.label;" command="cmd_zotero_newItemFromCurrentPage"/>
 					<toolbarbutton id="zotero-tb-lookup" class="zotero-tb-button" tooltiptext="&zotero.toolbar.lookup.label;" type="panel">
 						<panel id="zotero-lookup-panel" type="arrow" onpopupshown="Zotero_Lookup.onShowing()"
-								onpopuphidden="Zotero_Lookup.onHidden()" noautohide="true">
+								onpopuphidden="Zotero_Lookup.onHidden()">
 							<vbox>
 								<description>&zotero.lookup.description;</description>
-								<textbox id="zotero-lookup-textbox" style="margin: 2px 0 2px 0" onkeypress="return Zotero_Lookup.onKeyPress(event)" flex="1"/>
+								<stack>
+									<progressmeter id="zotero-lookup-progress" mode="undetermined" hidden="true"/>
+									<textbox id="zotero-lookup-textbox" onkeypress="return Zotero_Lookup.onKeyPress(event)" flex="1"/>
+								</stack>
 							</vbox>
 						</panel>
 					</toolbarbutton>

From 6b58d3e2af1c46ba1911400f67a43193e19aad7b Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 19 Jan 2012 02:40:46 -0500
Subject: [PATCH 14/69] Fix erroneously disabled "Empty Trash" (recent
 regression)

---
 chrome/content/zotero/xpcom/collectionTreeView.js | 8 ++++++++
 chrome/content/zotero/zoteroPane.js               | 9 ++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
index 9cb8758112..66977ff85a 100644
--- a/chrome/content/zotero/xpcom/collectionTreeView.js
+++ b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -1980,6 +1980,14 @@ Zotero.ItemGroup.prototype.isWithinGroup = function () {
 	return this.ref && !!this.ref.libraryID;
 }
 
+Zotero.ItemGroup.prototype.isWithinEditableGroup = function () {
+	if (!this.isWithinGroup()) {
+		return false;
+	}
+	var groupID = Zotero.Groups.getGroupIDFromLibraryID(this.ref.libraryID);
+	return Zotero.Groups.get(groupID).editable;
+}
+
 Zotero.ItemGroup.prototype.__defineGetter__('editable', function () {
 	if (this.isTrash() || this.isShare() || this.isBucket()) {
 		return false;
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index d90c7cfece..70a6ec588c 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -2132,11 +2132,18 @@ var ZoteroPane = new function()
 		// Disable some actions if user doesn't have write access
 		//
 		// Some actions are disabled via their commands in onCollectionSelected()
-		var s = [m.newSubcollection, m.editSelectedCollection, m.removeCollection, m.emptyTrash];
+		var s = [m.newSubcollection, m.editSelectedCollection, m.removeCollection];
 		if (itemGroup.isWithinGroup() && !itemGroup.editable && !itemGroup.isDuplicates() && !itemGroup.isUnfiled()) {
 			disable = disable.concat(s);
 		}
 		
+		// If within non-editable group or trash it empty, disable Empty Trash
+		if (itemGroup.isTrash()) {
+			if ((itemGroup.isWithinGroup() && !itemGroup.isWithinEditableGroup()) || !this.itemsView.rowCount) {
+				disable.push(m.emptyTrash);
+			}
+		}
+		
 		// Hide and enable all actions by default (so if they're shown they're enabled)
 		for each(var pos in m) {
 			menu.childNodes[pos].setAttribute('hidden', true);

From f0479993399d967d54d8a183703b68ed9534e022 Mon Sep 17 00:00:00 2001
From: Frank <biercenator@gmail.com>
Date: Thu, 19 Jan 2012 08:09:20 +0800
Subject: [PATCH 15/69] Upgrade citeproc-js to version 1.0.264

---
 chrome/content/zotero/xpcom/citeproc.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js
index 82d331da4f..9c73567fba 100644
--- a/chrome/content/zotero/xpcom/citeproc.js
+++ b/chrome/content/zotero/xpcom/citeproc.js
@@ -1979,7 +1979,7 @@ CSL.DateParser = function () {
 };
 CSL.Engine = function (sys, style, lang, forceLang) {
     var attrs, langspec, localexml, locale;
-    this.processor_version = "1.0.263";
+    this.processor_version = "1.0.264";
     this.csl_version = "1.0";
     this.sys = sys;
     this.sys.xml = new CSL.System.Xml.Parsing();
@@ -2610,6 +2610,7 @@ CSL.Engine.Build = function () {
     this.root = "citation";
     this.extension = "";
     this.substitute_level = new CSL.Stack(0, CSL.LITERAL);
+    this.names_level = 0;
     this.render_nesting_level = 0;
     this.render_seen = false;
 };
@@ -6937,6 +6938,7 @@ CSL.Node.names = {
         }
         if (this.tokentype === CSL.START) {
             state.build.names_flag = true;
+            state.build.names_level += 1;
             func = function (state, Item, item) {
                 state.tmp.can_substitute.push(true);
                 state.parallel.StartVariable("names");
@@ -6948,8 +6950,11 @@ CSL.Node.names = {
             for (var i = 0, ilen = 3; i < ilen; i += 1) {
                 var key = ["family", "given", "et-al"][i];
                 this[key] = state.build[key];
-                state.build[key] = undefined;
+                if (state.build.names_level === 1) {
+                    state.build[key] = undefined;
+                }
             }
+            state.build.names_level += -1;
             this.label = state.build.name_label;
             state.build.name_label = undefined;
             var mywith = "with";

From 1e20c8cb53542dcb79761a6fd8abcc9ae07ee61e Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 19 Jan 2012 15:50:27 -0500
Subject: [PATCH 16/69] Fix saving of "@22" files in snapshots

CSS rules were being made available to WebPageDump with double-quotes in
the url() rules, despite the original rules not containing them. WPD's
regexp for parsing url() rules included the quotes in the captured
strings, which prevented relative URLs from being properly interpeted --
they were instead appended to the base URL, resulting in "@22" (") at the
end and 404s (sometimes with large HTML pages) that were then saved to
disk instead of the image.
---
 chrome/content/zotero/webpagedump/domsaver.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/webpagedump/domsaver.js b/chrome/content/zotero/webpagedump/domsaver.js
index 785c0d3170..cdb381e9bc 100644
--- a/chrome/content/zotero/webpagedump/domsaver.js
+++ b/chrome/content/zotero/webpagedump/domsaver.js
@@ -597,7 +597,8 @@ var wpdDOMSaver = {
 		if ( !aCSStext ) return "";                            
 		
 		// search for "url" entries inside the css
-		var re = new RegExp(/ url\(([^\'\)]+)\)/);
+		// Double-quotes in regexp added by Dan S. for Zotero
+		var re = new RegExp(/ url\("?([^'")]+)"?\)/);
 		var i = 0;
 		while ( aCSStext.match(re) ) {
 			if ( ++i > 20 ) break;  // safer (we try it maximal 20 times for one stylesheet element)

From 8941e610e0f355112f40e0ab004468aec9295db9 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 19 Jan 2012 21:05:35 -0500
Subject: [PATCH 17/69] Fix invalid CSS selector on Windows

I didn't check whether this affects anything. The rule was being ignored
previously.
---
 chrome/content/zotero-platform/win/itembox.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/zotero-platform/win/itembox.css b/chrome/content/zotero-platform/win/itembox.css
index e8d295155b..75cd061c55 100644
--- a/chrome/content/zotero-platform/win/itembox.css
+++ b/chrome/content/zotero-platform/win/itembox.css
@@ -7,7 +7,7 @@ row > vbox
 	padding-bottom: 0 !important;
 }
 
-row vbox[fieldname],
+row vbox[fieldname]
 {
 	margin-left: 1px;
 }

From b1cd48a863e6b31314d2ca62fe2e513faf7213ba Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 19 Jan 2012 21:06:28 -0500
Subject: [PATCH 18/69] Avoid a third "this" in save icon first-run guidance

---
 chrome/locale/af-ZA/zotero/zotero.properties | 2 +-
 chrome/locale/ar/zotero/zotero.properties    | 2 +-
 chrome/locale/bg-BG/zotero/zotero.properties | 2 +-
 chrome/locale/ca-AD/zotero/zotero.properties | 2 +-
 chrome/locale/cs-CZ/zotero/zotero.properties | 2 +-
 chrome/locale/da-DK/zotero/zotero.properties | 2 +-
 chrome/locale/de/zotero/zotero.properties    | 2 +-
 chrome/locale/el-GR/zotero/zotero.properties | 2 +-
 chrome/locale/en-US/zotero/zotero.properties | 2 +-
 chrome/locale/es-ES/zotero/zotero.properties | 2 +-
 chrome/locale/et-EE/zotero/zotero.properties | 2 +-
 chrome/locale/eu-ES/zotero/zotero.properties | 2 +-
 chrome/locale/fa/zotero/zotero.properties    | 2 +-
 chrome/locale/fi-FI/zotero/zotero.properties | 2 +-
 chrome/locale/fr-FR/zotero/zotero.properties | 2 +-
 chrome/locale/gl-ES/zotero/zotero.properties | 2 +-
 chrome/locale/he-IL/zotero/zotero.properties | 2 +-
 chrome/locale/hr-HR/zotero/zotero.properties | 2 +-
 chrome/locale/hu-HU/zotero/zotero.properties | 2 +-
 chrome/locale/is-IS/zotero/zotero.properties | 2 +-
 chrome/locale/it-IT/zotero/zotero.properties | 2 +-
 chrome/locale/ja-JP/zotero/zotero.properties | 2 +-
 chrome/locale/ko-KR/zotero/zotero.properties | 2 +-
 chrome/locale/mn-MN/zotero/zotero.properties | 2 +-
 chrome/locale/nb-NO/zotero/zotero.properties | 2 +-
 chrome/locale/nl-NL/zotero/zotero.properties | 2 +-
 chrome/locale/nn-NO/zotero/zotero.properties | 2 +-
 chrome/locale/pl-PL/zotero/zotero.properties | 2 +-
 chrome/locale/pt-BR/zotero/zotero.properties | 2 +-
 chrome/locale/pt-PT/zotero/zotero.properties | 2 +-
 chrome/locale/ro-RO/zotero/zotero.properties | 2 +-
 chrome/locale/ru-RU/zotero/zotero.properties | 2 +-
 chrome/locale/sk-SK/zotero/zotero.properties | 2 +-
 chrome/locale/sl-SI/zotero/zotero.properties | 2 +-
 chrome/locale/sr-RS/zotero/zotero.properties | 2 +-
 chrome/locale/sv-SE/zotero/zotero.properties | 2 +-
 chrome/locale/th-TH/zotero/zotero.properties | 2 +-
 chrome/locale/tr-TR/zotero/zotero.properties | 2 +-
 chrome/locale/vi-VN/zotero/zotero.properties | 2 +-
 chrome/locale/zh-CN/zotero/zotero.properties | 2 +-
 chrome/locale/zh-TW/zotero/zotero.properties | 2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties
index d3e981a2f4..ff747139d2 100644
--- a/chrome/locale/af-ZA/zotero/zotero.properties
+++ b/chrome/locale/af-ZA/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/ar/zotero/zotero.properties b/chrome/locale/ar/zotero/zotero.properties
index 2010a6679c..4fdbb4e80c 100644
--- a/chrome/locale/ar/zotero/zotero.properties
+++ b/chrome/locale/ar/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties
index dde322312c..b640da803c 100644
--- a/chrome/locale/bg-BG/zotero/zotero.properties
+++ b/chrome/locale/bg-BG/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties
index baa3771873..976b40564b 100644
--- a/chrome/locale/ca-AD/zotero/zotero.properties
+++ b/chrome/locale/ca-AD/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties
index db030b0a4d..61a69f7ec7 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.properties
+++ b/chrome/locale/cs-CZ/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties
index 7b65132353..d005b1411c 100644
--- a/chrome/locale/da-DK/zotero/zotero.properties
+++ b/chrome/locale/da-DK/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/de/zotero/zotero.properties b/chrome/locale/de/zotero/zotero.properties
index af508cf987..1dfa1c8093 100644
--- a/chrome/locale/de/zotero/zotero.properties
+++ b/chrome/locale/de/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties
index d3e981a2f4..ff747139d2 100644
--- a/chrome/locale/el-GR/zotero/zotero.properties
+++ b/chrome/locale/el-GR/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index fbf1fc7958..bf2cd51e51 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -757,5 +757,5 @@ standalone.addonInstallationFailed.body		= The add-on "%S" could not be installe
 connector.error.title				= Zotero Connector Error
 connector.standaloneOpen			= Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon		= Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon		= Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
\ No newline at end of file
diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties
index 389c66decd..513b34b92d 100644
--- a/chrome/locale/es-ES/zotero/zotero.properties
+++ b/chrome/locale/es-ES/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties
index 7faca51ef9..c47dffa931 100644
--- a/chrome/locale/et-EE/zotero/zotero.properties
+++ b/chrome/locale/et-EE/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/eu-ES/zotero/zotero.properties b/chrome/locale/eu-ES/zotero/zotero.properties
index 213349f3f7..227a119332 100644
--- a/chrome/locale/eu-ES/zotero/zotero.properties
+++ b/chrome/locale/eu-ES/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/fa/zotero/zotero.properties b/chrome/locale/fa/zotero/zotero.properties
index 11817a1b48..846c07c554 100644
--- a/chrome/locale/fa/zotero/zotero.properties
+++ b/chrome/locale/fa/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties
index edbbca358b..8993eb30be 100644
--- a/chrome/locale/fi-FI/zotero/zotero.properties
+++ b/chrome/locale/fi-FI/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties
index 327b8952ad..d57184c257 100644
--- a/chrome/locale/fr-FR/zotero/zotero.properties
+++ b/chrome/locale/fr-FR/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties
index 2e26ea22e7..5a7a17f26b 100644
--- a/chrome/locale/gl-ES/zotero/zotero.properties
+++ b/chrome/locale/gl-ES/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties
index a4bfea214f..a947d5edbf 100644
--- a/chrome/locale/he-IL/zotero/zotero.properties
+++ b/chrome/locale/he-IL/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties
index d3e981a2f4..ff747139d2 100644
--- a/chrome/locale/hr-HR/zotero/zotero.properties
+++ b/chrome/locale/hr-HR/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties
index fc2f67569d..dfc93badc1 100644
--- a/chrome/locale/hu-HU/zotero/zotero.properties
+++ b/chrome/locale/hu-HU/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties
index afb66f4985..9aeadb2f9f 100644
--- a/chrome/locale/is-IS/zotero/zotero.properties
+++ b/chrome/locale/is-IS/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties
index 30e0c66ef5..57531f50f9 100644
--- a/chrome/locale/it-IT/zotero/zotero.properties
+++ b/chrome/locale/it-IT/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties
index 3339247e66..128ca0ff5f 100644
--- a/chrome/locale/ja-JP/zotero/zotero.properties
+++ b/chrome/locale/ja-JP/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties
index c72f41a02c..56b0e4a4bb 100644
--- a/chrome/locale/ko-KR/zotero/zotero.properties
+++ b/chrome/locale/ko-KR/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties
index 08b76e4345..afda66495d 100644
--- a/chrome/locale/mn-MN/zotero/zotero.properties
+++ b/chrome/locale/mn-MN/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties
index 9a2b6ce63d..129bd93da0 100644
--- a/chrome/locale/nb-NO/zotero/zotero.properties
+++ b/chrome/locale/nb-NO/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties
index 4e577dd2cf..cfb18baa67 100644
--- a/chrome/locale/nl-NL/zotero/zotero.properties
+++ b/chrome/locale/nl-NL/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/nn-NO/zotero/zotero.properties b/chrome/locale/nn-NO/zotero/zotero.properties
index 99f60e0142..7d9b11aa65 100644
--- a/chrome/locale/nn-NO/zotero/zotero.properties
+++ b/chrome/locale/nn-NO/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties
index 1da8a20920..8b9f031aa3 100644
--- a/chrome/locale/pl-PL/zotero/zotero.properties
+++ b/chrome/locale/pl-PL/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties
index fb7775ae8d..65b69503fb 100644
--- a/chrome/locale/pt-BR/zotero/zotero.properties
+++ b/chrome/locale/pt-BR/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties
index a356ac816a..fdada5815c 100644
--- a/chrome/locale/pt-PT/zotero/zotero.properties
+++ b/chrome/locale/pt-PT/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/ro-RO/zotero/zotero.properties b/chrome/locale/ro-RO/zotero/zotero.properties
index 0dd614daf4..be724c2dd6 100644
--- a/chrome/locale/ro-RO/zotero/zotero.properties
+++ b/chrome/locale/ro-RO/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties
index 8b5a7e6dbc..e86149b89b 100644
--- a/chrome/locale/ru-RU/zotero/zotero.properties
+++ b/chrome/locale/ru-RU/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Ошибка соединения Zotero
 connector.standaloneOpen=Ваша база данных недоступна, поскольку открыто Автономное Zotero. Пожалуйста, посмотрите ваши документы в Автономном Zotero.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/sk-SK/zotero/zotero.properties b/chrome/locale/sk-SK/zotero/zotero.properties
index 0ec03b82d4..71dc4baa88 100644
--- a/chrome/locale/sk-SK/zotero/zotero.properties
+++ b/chrome/locale/sk-SK/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties
index b972b5bb37..f85f2a918c 100644
--- a/chrome/locale/sl-SI/zotero/zotero.properties
+++ b/chrome/locale/sl-SI/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties
index 920a40cf03..c3a77d386c 100644
--- a/chrome/locale/sr-RS/zotero/zotero.properties
+++ b/chrome/locale/sr-RS/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties
index d7f0f64797..5eba5561f0 100644
--- a/chrome/locale/sv-SE/zotero/zotero.properties
+++ b/chrome/locale/sv-SE/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties
index 023e45aed2..740d2ed07c 100644
--- a/chrome/locale/th-TH/zotero/zotero.properties
+++ b/chrome/locale/th-TH/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties
index a1592ed1f2..daaa6752bf 100644
--- a/chrome/locale/tr-TR/zotero/zotero.properties
+++ b/chrome/locale/tr-TR/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties
index d68f94348b..dc5f68d5b6 100644
--- a/chrome/locale/vi-VN/zotero/zotero.properties
+++ b/chrome/locale/vi-VN/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties
index 7b6a08e32b..dd521223fb 100644
--- a/chrome/locale/zh-CN/zotero/zotero.properties
+++ b/chrome/locale/zh-CN/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.
diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties
index 637f1c64e3..cd980e1e48 100644
--- a/chrome/locale/zh-TW/zotero/zotero.properties
+++ b/chrome/locale/zh-TW/zotero/zotero.properties
@@ -753,5 +753,5 @@ standalone.addonInstallationFailed.body=The add-on "%S" could not be installed.
 connector.error.title=Zotero Connector Error
 connector.standaloneOpen=Your database cannot be accessed because Zotero Standalone is currently open. Please view your items in Zotero Standalone.
 
-firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save this reference to your Zotero library.
+firstRunGuidance.saveIcon=Zotero can recognize a reference on this page. Click this icon in the address bar to save the reference to your Zotero library.
 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.

From 0b33e7d1b7b71a1a2c878305415477f5d77a7a85 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Thu, 19 Jan 2012 22:36:14 -0500
Subject: [PATCH 19/69] Replace various space characters in filenames that
 break on Windows

These are all valid Unicode characters, but PDF plugins can't files with
filenames containing them on Windows.
---
 chrome/content/zotero/xpcom/file.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/chrome/content/zotero/xpcom/file.js b/chrome/content/zotero/xpcom/file.js
index a42e7e93d1..03bcb325db 100644
--- a/chrome/content/zotero/xpcom/file.js
+++ b/chrome/content/zotero/xpcom/file.js
@@ -227,6 +227,10 @@ Zotero.File = new function(){
 		fileName = fileName.replace(/[\/\\\?%\*:|"<>]/g, '');
 		// Replace newlines and tabs (which shouldn't be in the string in the first place) with spaces
 		fileName = fileName.replace(/[\n\t]/g, ' ');
+		// Replace various thin spaces
+		fileName = fileName.replace(/[\u2000-\u200A]/g, ' ');
+		// Replace zero-width spaces
+		fileName = fileName.replace(/[\u200B-\u200E]/g, '');
 		if (!skipXML) {
 			// Strip characters not valid in XML, since they won't sync and they're probably unwanted
 			fileName = fileName.replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\ud800-\udfff\ufffe\uffff]/g, '');

From 20afa7e5610847b90534c5ef1a07c0149d483fa5 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 20 Jan 2012 13:58:07 -0500
Subject: [PATCH 20/69] Some debugging output for access date issue

---
 chrome/content/zotero/bindings/itembox.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index 705d03f99c..ad5f4ef105 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -1802,21 +1802,31 @@
 						if (value != '') {
 							switch (fieldName) {
 								case 'accessDate':
+									Zotero.debug('==========');
+									Zotero.debug(value);
 									// If just date, don't convert to UTC
 									if (Zotero.Date.isSQLDate(value)) {
+										Zotero.debug('1');
 										var localDate = Zotero.Date.sqlToDate(value);
 										value = Zotero.Date.dateToSQL(localDate).replace(' 00:00:00', '');
 									}
 									else if (Zotero.Date.isSQLDateTime(value)) {
+										Zotero.debug('2');
 										var localDate = Zotero.Date.sqlToDate(value);
 										value = Zotero.Date.dateToSQL(localDate, true);
 									}
 									else {
+										Zotero.debug('3');
 										var d = Zotero.Date.strToDate(value);
+										Zotero.debug(d);
 										value = null;
 										if (d.year && d.month != undefined && d.day) {
 											d = new Date(d.year, d.month, d.day);
+											Zotero.debug('-');
+											Zotero.debug(d);
 											value = Zotero.Date.dateToSQL(d).replace(' 00:00:00', '');
+											Zotero.debug('=');
+											Zotero.debug(value);
 										}
 									}
 									break;

From 79b1fe30dcb36b810fae27bbae4e1197688bae52 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 20 Jan 2012 15:23:06 -0500
Subject: [PATCH 21/69] Workaround for broken file/URL launching in Standalone
 on Linux

Falls back to /usr/bin/xdg-open by default, configurable via
extensions.zotero.fallbackLauncher.unix (or .windows, though that
should be much rarer). Also used for file revealing.

If xdg-open fails, files launch via the external helper app dialog and
URLs just don't work.
---
 chrome/content/zotero/zoteroPane.js | 156 +++++++++++++++++++++-------
 defaults/preferences/zotero.js      |   6 +-
 2 files changed, 121 insertions(+), 41 deletions(-)

diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index 70a6ec588c..ddf42f604c 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -2682,14 +2682,7 @@ var ZoteroPane = new function()
 			
 			if (Zotero.isStandalone) {
 				if(uri.match(/^https?/)) {
-					var io = Components.classes['@mozilla.org/network/io-service;1']
-								.getService(Components.interfaces.nsIIOService);
-					var uri = io.newURI(uri, null, null);
-					var handler = Components.classes['@mozilla.org/uriloader/external-protocol-service;1']
-								.getService(Components.interfaces.nsIExternalProtocolService)
-								.getProtocolHandlerInfo('http');
-					handler.preferredAction = Components.interfaces.nsIHandlerInfo.useSystemDefault;
-					handler.launchWithURI(uri, null);
+					this.launchURL(uri);
 				} else {
 					ZoteroStandalone.openInViewer(uri);
 				}
@@ -3408,22 +3401,7 @@ var ZoteroPane = new function()
 					this.loadURI(url, event);
 				}
 				else {
-					// Some platforms don't have nsILocalFile.launch, so we just
-					// let the Firefox external helper app window handle it
-					try {
-						file.launch();
-					}
-					catch (e) {
-						Zotero.debug("launch() not supported -- passing file to loadUrl()");
-						
-						var uri = Components.classes["@mozilla.org/network/standard-url;1"].
-									createInstance(Components.interfaces.nsIURI);
-						uri.spec = attachment.getLocalFileURL();
-						
-						var nsIEPS = Components.classes["@mozilla.org/uriloader/external-protocol-service;1"].
-										getService(Components.interfaces.nsIExternalProtocolService);
-						nsIEPS.loadUrl(uri);
-					}
+					this.launchFile(file);
 				}
 			}
 			else {
@@ -3433,6 +3411,116 @@ var ZoteroPane = new function()
 	}
 	
 	
+	/**
+	 * Launch a file, the best way we can
+	 */
+	this.launchFile = function (file) {
+		try {
+			file.launch();
+		}
+		catch (e) {
+			Zotero.debug("launch() not supported -- trying fallback executable");
+			
+			try {
+				if (Zotero.isWin) {
+					var pref = "fallbackLauncher.windows";
+				}
+				else {
+					var pref = "fallbackLauncher.unix";
+				}
+				var path = Zotero.Prefs.get(pref);
+				
+				var exec = Components.classes["@mozilla.org/file/local;1"]
+							.createInstance(Components.interfaces.nsILocalFile);
+				exec.initWithPath(path);
+				if (!exec.exists()) {
+					throw (path + " does not exist");
+				}
+				
+				var proc = Components.classes["@mozilla.org/process/util;1"]
+								.createInstance(Components.interfaces.nsIProcess);
+				proc.init(exec);
+				
+				var args = [file.path];
+				if (!Zotero.isFx36) {
+					proc.runw(true, args, args.length);
+				}
+				else {
+					proc.run(true, args, args.length);
+				}
+			}
+			catch (e) {
+				Zotero.debug(e);
+				Zotero.debug("Launching via executable failed -- passing to loadUrl()");
+				
+				// If nsILocalFile.launch() isn't available and the fallback
+				// executable doesn't exist, we just let the Firefox external
+				// helper app window handle it
+				var nsIFPH = Components.classes["@mozilla.org/network/protocol;1?name=file"]
+								.getService(Components.interfaces.nsIFileProtocolHandler);
+				var uri = nsIFPH.newFileURI(file);
+				
+				var nsIEPS = Components.classes["@mozilla.org/uriloader/external-protocol-service;1"].
+								getService(Components.interfaces.nsIExternalProtocolService);
+				nsIEPS.loadUrl(uri);
+			}
+		}
+	}
+	
+	
+	/**
+	 * Launch an HTTP URL externally, the best way we can
+	 *
+	 * Used only by Standalone
+	 */
+	this.launchURL = function (url) {
+		if (!url.match(/^https?/)) {
+			throw new Error("launchURL() requires an HTTP(S) URL");
+		}
+		
+		try {
+			var io = Components.classes['@mozilla.org/network/io-service;1']
+						.getService(Components.interfaces.nsIIOService);
+			var uri = io.newURI(url, null, null);
+			var handler = Components.classes['@mozilla.org/uriloader/external-protocol-service;1']
+							.getService(Components.interfaces.nsIExternalProtocolService)
+							.getProtocolHandlerInfo('http');
+			handler.preferredAction = Components.interfaces.nsIHandlerInfo.useSystemDefault;
+			handler.launchWithURI(uri, null);
+		}
+		catch (e) {
+			Zotero.debug("launchWithURI() not supported -- trying fallback executable");
+			
+			if (Zotero.isWin) {
+				var pref = "fallbackLauncher.windows";
+			}
+			else {
+				var pref = "fallbackLauncher.unix";
+			}
+			var path = Zotero.Prefs.get(pref);
+			
+			var exec = Components.classes["@mozilla.org/file/local;1"]
+						.createInstance(Components.interfaces.nsILocalFile);
+			exec.initWithPath(path);
+			if (!exec.exists()) {
+				throw ("Fallback executable not found -- check extensions.zotero." + pref + " in about:config");
+			}
+			
+			var proc = Components.classes["@mozilla.org/process/util;1"]
+							.createInstance(Components.interfaces.nsIProcess);
+			proc.init(exec);
+			
+			var args = [url];
+			if (!Zotero.isFx36) {
+				proc.runw(true, args, args.length);
+			}
+			else {
+				proc.run(true, args, args.length);
+			}
+		}
+	}
+	
+	
 	function viewSelectedAttachment(event, noLocateOnMissing)
 	{
 		if (this.itemsView && this.itemsView.selection.count == 1) {
@@ -3445,27 +3533,15 @@ var ZoteroPane = new function()
 		var attachment = Zotero.Items.get(itemID)
 		if (attachment.attachmentLinkMode != Zotero.Attachments.LINK_MODE_LINKED_URL) {
 			var file = attachment.getFile();
-			if (file){
+			if (file) {
 				try {
 					file.reveal();
 				}
 				catch (e) {
 					// On platforms that don't support nsILocalFile.reveal() (e.g. Linux),
-					// "double-click" the parent directory
-					try {
-						var parent = file.parent.QueryInterface(Components.interfaces.nsILocalFile);
-						parent.launch();
-					}
-					// If launch also fails, try the OS handler
-					catch (e) {
-						var uri = Components.classes["@mozilla.org/network/io-service;1"].
-									getService(Components.interfaces.nsIIOService).
-									newFileURI(parent);
-						var protocolService =
-							Components.classes["@mozilla.org/uriloader/external-protocol-service;1"].
-								getService(Components.interfaces.nsIExternalProtocolService);
-						protocolService.loadUrl(uri);
-					}
+					// launch the parent directory
+					var parent = file.parent.QueryInterface(Components.interfaces.nsILocalFile);
+					this.launchFile(parent);
 				}
 			}
 			else {
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index 523c1ae587..9efcf87b91 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -161,4 +161,8 @@ pref("extensions.zotero.ingester.allowedSites", "");
 
 // Connector
 pref("extensions.zotero.connector.repo.lastCheck.localTime", 0);
-pref("extensions.zotero.connector.repo.lastCheck.repoTime", 0);
\ No newline at end of file
+pref("extensions.zotero.connector.repo.lastCheck.repoTime", 0);
+
+// File/URL opening executable if launch() fails
+pref("extensions.zotero.fallbackLauncher.unix", "/usr/bin/xdg-open");
+pref("extensions.zotero.fallbackLauncher.windows", "");
\ No newline at end of file

From b617c508b144128ee4fa446260dbae0966ed2bd3 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Fri, 20 Jan 2012 16:16:15 -0500
Subject: [PATCH 22/69] Propagate errors in child translators to parents

See http://groups.google.com/group/zotero-dev/browse_thread/thread/59dbd15bf6c84133
---
 chrome/content/zotero/xpcom/translation/translate.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
index 41a87ce9ef..c73ff33f4c 100644
--- a/chrome/content/zotero/xpcom/translation/translate.js
+++ b/chrome/content/zotero/xpcom/translation/translate.js
@@ -288,7 +288,7 @@ Zotero.Translate.Sandbox = {
 				return translation.getTranslators();
 			};
 			
-			var doneHandlerSet = false;
+			var errorHandlerSet = false, doneHandlerSet = false;
 			safeTranslator.translate = function() {
 				translate.incrementAsyncProcesses("safeTranslator#translate()");
 				setDefaultHandlers(translate, translation);
@@ -296,6 +296,10 @@ Zotero.Translate.Sandbox = {
 					doneHandlerSet = true;
 					translation.setHandler("done", function() { translate.decrementAsyncProcesses("safeTranslator#translate()") });
 				}
+				if(!errorHandlerSet) {
+					errorHandlerSet = true;
+					translation.setHandler("error", function(obj, error) { translate.complete(false, error) });
+				}
 				return translation.translate(false);
 			};
 			

From 84e59d66019050efe503ab117e6622cbd24a468e Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 20 Jan 2012 17:00:53 -0500
Subject: [PATCH 23/69] Delete chicago-note.csl,
 mhra_note_with_bibliography.csl, aaa.csl

First two are redundant, third has been renamed

Mappings for existing documents forthcoming
---
 chrome/content/zotero/xpcom/schema.js | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
index 6ce58875d7..2d8b4dc755 100644
--- a/chrome/content/zotero/xpcom/schema.js
+++ b/chrome/content/zotero/xpcom/schema.js
@@ -530,8 +530,8 @@ Zotero.Schema = new function(){
 					continue;
 				}
 				
-				// Delete incorrectly named files saved via repo pre-1.5b3
 				switch (file.leafName) {
+					// Delete incorrectly named files saved via repo pre-1.5b3
 					case 'ama':
 					case 'apa':
 					case 'apsa':
@@ -548,8 +548,21 @@ Zotero.Schema = new function(){
 					case 'nature':
 					case 'nlm':
 					case 'vancouver':
+					
+					// Delete renamed/obsolete files
+					case 'chicago-note.csl':
+					case 'mhra_note_without_bibliography.csl':
 						toDelete.push(file);
 						continue;
+					
+					// Be a little more careful with this one, in case someone
+					// created a custom 'aaa' style
+					case 'aaa.csl':
+						var str = Zotero.File.getContents(file, false, 300);
+						if (str.indexOf("<title>American Anthropological Association</title>") != -1) {
+							toDelete.push(file);
+						}
+						continue;
 				}
 				
 				if (forceReinstall || !file.leafName.match(fileNameRE)) {

From b34299998345a9867cf59d9915ce04ac2623b874 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 20 Jan 2012 17:03:38 -0500
Subject: [PATCH 24/69] Update submodule pointers

---
 chrome/content/zotero/locale/csl | 2 +-
 styles                           | 2 +-
 translators                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/locale/csl b/chrome/content/zotero/locale/csl
index 33ece59538..73f3050d7c 160000
--- a/chrome/content/zotero/locale/csl
+++ b/chrome/content/zotero/locale/csl
@@ -1 +1 @@
-Subproject commit 33ece59538bf1fde71a3e9f003136f1b30c68d7a
+Subproject commit 73f3050d7c66caeb338a54c53d79c1b4be0ea8aa
diff --git a/styles b/styles
index 0787639b67..9500918473 160000
--- a/styles
+++ b/styles
@@ -1 +1 @@
-Subproject commit 0787639b6770543c79d6cc7d7af16322f4e2a825
+Subproject commit 9500918473da69d8430598308f26d483bef75e11
diff --git a/translators b/translators
index 004b0b5ddd..6dfbb188e4 160000
--- a/translators
+++ b/translators
@@ -1 +1 @@
-Subproject commit 004b0b5dddec7e4feb6742cad845d6e3cbd709f6
+Subproject commit 6dfbb188e417b0a54f1028e2a7b233483b915204

From c89bb0448475dcf60ea97b86e8cf28f83db9a46d Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 20 Jan 2012 17:25:02 -0500
Subject: [PATCH 25/69] Add mappings for obsolete style ids

---
 chrome/content/zotero/xpcom/style.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/chrome/content/zotero/xpcom/style.js b/chrome/content/zotero/xpcom/style.js
index e62dbef4b6..5202227766 100644
--- a/chrome/content/zotero/xpcom/style.js
+++ b/chrome/content/zotero/xpcom/style.js
@@ -107,6 +107,17 @@ Zotero.Styles = new function() {
 	 * @param {String} id
 	 */
 	this.get = function(id) {
+		// Map some obsolete styles to current ones
+		var mappings = {
+			"http://www.zotero.org/styles/chicago-note": "http://www.zotero.org/styles/chicago-note-bibliography",
+			"http://www.zotero.org/styles/mhra_note_without_bibliography": "http://www.zotero.org/styles/mhra",
+			"http://www.zotero.org/styles/aaa": "http://www.zotero.org/styles/american-anthropological-association"
+		};
+		if(mappings[id]) {
+			Zotero.debug("Mapping " + id + " to " + mappings[id]);
+			id = mappings[id];
+		}
+		
 		if(!_initialized) this.init();
 		return _styles[id] ? _styles[id] : false;
 	}

From 0fd93c2711725f7862ef40830c8122d86c13525d Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 20 Jan 2012 17:26:10 -0500
Subject: [PATCH 26/69] Revove access date debug output

This reverts commit 20afa7e5610847b90534c5ef1a07c0149d483fa5.
---
 chrome/content/zotero/bindings/itembox.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index ad5f4ef105..705d03f99c 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -1802,31 +1802,21 @@
 						if (value != '') {
 							switch (fieldName) {
 								case 'accessDate':
-									Zotero.debug('==========');
-									Zotero.debug(value);
 									// If just date, don't convert to UTC
 									if (Zotero.Date.isSQLDate(value)) {
-										Zotero.debug('1');
 										var localDate = Zotero.Date.sqlToDate(value);
 										value = Zotero.Date.dateToSQL(localDate).replace(' 00:00:00', '');
 									}
 									else if (Zotero.Date.isSQLDateTime(value)) {
-										Zotero.debug('2');
 										var localDate = Zotero.Date.sqlToDate(value);
 										value = Zotero.Date.dateToSQL(localDate, true);
 									}
 									else {
-										Zotero.debug('3');
 										var d = Zotero.Date.strToDate(value);
-										Zotero.debug(d);
 										value = null;
 										if (d.year && d.month != undefined && d.day) {
 											d = new Date(d.year, d.month, d.day);
-											Zotero.debug('-');
-											Zotero.debug(d);
 											value = Zotero.Date.dateToSQL(d).replace(' 00:00:00', '');
-											Zotero.debug('=');
-											Zotero.debug(value);
 										}
 									}
 									break;

From 8831ba51cd3d323834daa085231384db1100e9e4 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 20 Jan 2012 17:28:36 -0500
Subject: [PATCH 27/69] Update styles pointer

---
 styles | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/styles b/styles
index 9500918473..a322796a08 160000
--- a/styles
+++ b/styles
@@ -1 +1 @@
-Subproject commit 9500918473da69d8430598308f26d483bef75e11
+Subproject commit a322796a088e261718bc7d88e16a338be4143545

From f272fc686121437a5fc632847e87c8ece04e86a6 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 20 Jan 2012 17:51:00 -0500
Subject: [PATCH 28/69] Tweak read-only save error message

---
 chrome/content/zotero/browser.js             | 2 +-
 chrome/content/zotero/zoteroPane.js          | 4 ++--
 chrome/locale/en-US/zotero/zotero.properties | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/chrome/content/zotero/browser.js b/chrome/content/zotero/browser.js
index b81672f224..a7d7a0287f 100644
--- a/chrome/content/zotero/browser.js
+++ b/chrome/content/zotero/browser.js
@@ -154,7 +154,7 @@ var Zotero_Browser = new function() {
 			try {
 				if (!ZoteroPane.collectionsView.editable) {
 					Zotero_Browser.progress.changeHeadline(Zotero.getString("ingester.scrapeError"));
-					var desc = Zotero.getString('save.error.cannotMakeChangesToLibrary');
+					var desc = Zotero.getString('save.error.cannotMakeChangesToCollection');
 					Zotero_Browser.progress.addDescription(desc);
 					Zotero_Browser.progress.show();
 					Zotero_Browser.progress.startCloseTimer(8000);
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index ddf42f604c..c101e9c906 100644
--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@@ -3592,14 +3592,14 @@ var ZoteroPane = new function()
 	this.displayCannotEditLibraryMessage = function () {
 		var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
 								.getService(Components.interfaces.nsIPromptService);
-		ps.alert(null, "", Zotero.getString('save.error.cannotMakeChangesToLibrary'));
+		ps.alert(null, "", Zotero.getString('save.error.cannotMakeChangesToCollection'));
 	}
 	
 	
 	this.displayCannotEditLibraryFilesMessage = function () {
 		var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
 								.getService(Components.interfaces.nsIPromptService);
-		ps.alert(null, "", Zotero.getString('save.error.cannotAddFilesToLibrary'));
+		ps.alert(null, "", Zotero.getString('save.error.cannotAddFilesToCollection'));
 	}
 	
 	
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index bf2cd51e51..052f6012bb 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -397,8 +397,8 @@ fileTypes.document				= Document
 save.attachment					= Saving Snapshot…
 save.link						= Saving Link…
 save.link.error					= An error occurred while saving this link.
-save.error.cannotMakeChangesToLibrary = You cannot make changes to the currently selected library.
-save.error.cannotAddFilesToLibrary = You cannot add files to the currently selected library.
+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			= Save to Zotero
 ingester.saveToZoteroUsing		= Save to Zotero using "%S"

From ed6666c4d78b97899b579b1f84e35ba4b678a885 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 20 Jan 2012 17:52:51 -0500
Subject: [PATCH 29/69] Merge locales

---
 chrome/locale/af-ZA/zotero/preferences.dtd   | 1 +
 chrome/locale/af-ZA/zotero/zotero.properties | 4 ++++
 chrome/locale/ar/zotero/preferences.dtd      | 1 +
 chrome/locale/ar/zotero/zotero.properties    | 4 ++++
 chrome/locale/bg-BG/zotero/preferences.dtd   | 1 +
 chrome/locale/bg-BG/zotero/zotero.properties | 4 ++++
 chrome/locale/ca-AD/zotero/preferences.dtd   | 1 +
 chrome/locale/ca-AD/zotero/zotero.properties | 4 ++++
 chrome/locale/cs-CZ/zotero/preferences.dtd   | 1 +
 chrome/locale/cs-CZ/zotero/zotero.properties | 4 ++++
 chrome/locale/da-DK/zotero/preferences.dtd   | 1 +
 chrome/locale/da-DK/zotero/zotero.properties | 4 ++++
 chrome/locale/de/zotero/preferences.dtd      | 1 +
 chrome/locale/de/zotero/zotero.properties    | 4 ++++
 chrome/locale/el-GR/zotero/preferences.dtd   | 1 +
 chrome/locale/el-GR/zotero/zotero.properties | 4 ++++
 chrome/locale/es-ES/zotero/preferences.dtd   | 1 +
 chrome/locale/es-ES/zotero/zotero.properties | 4 ++++
 chrome/locale/et-EE/zotero/preferences.dtd   | 1 +
 chrome/locale/et-EE/zotero/zotero.properties | 4 ++++
 chrome/locale/eu-ES/zotero/preferences.dtd   | 1 +
 chrome/locale/eu-ES/zotero/zotero.properties | 4 ++++
 chrome/locale/fa/zotero/preferences.dtd      | 1 +
 chrome/locale/fa/zotero/zotero.properties    | 4 ++++
 chrome/locale/fi-FI/zotero/preferences.dtd   | 1 +
 chrome/locale/fi-FI/zotero/zotero.properties | 4 ++++
 chrome/locale/fr-FR/zotero/preferences.dtd   | 1 +
 chrome/locale/fr-FR/zotero/zotero.properties | 4 ++++
 chrome/locale/gl-ES/zotero/preferences.dtd   | 1 +
 chrome/locale/gl-ES/zotero/zotero.properties | 4 ++++
 chrome/locale/he-IL/zotero/preferences.dtd   | 1 +
 chrome/locale/he-IL/zotero/zotero.properties | 4 ++++
 chrome/locale/hr-HR/zotero/preferences.dtd   | 1 +
 chrome/locale/hr-HR/zotero/zotero.properties | 4 ++++
 chrome/locale/hu-HU/zotero/preferences.dtd   | 1 +
 chrome/locale/hu-HU/zotero/zotero.properties | 4 ++++
 chrome/locale/is-IS/zotero/preferences.dtd   | 1 +
 chrome/locale/is-IS/zotero/zotero.properties | 4 ++++
 chrome/locale/it-IT/zotero/preferences.dtd   | 1 +
 chrome/locale/it-IT/zotero/zotero.properties | 4 ++++
 chrome/locale/ja-JP/zotero/preferences.dtd   | 1 +
 chrome/locale/ja-JP/zotero/zotero.properties | 4 ++++
 chrome/locale/ko-KR/zotero/preferences.dtd   | 1 +
 chrome/locale/ko-KR/zotero/zotero.properties | 4 ++++
 chrome/locale/mn-MN/zotero/preferences.dtd   | 1 +
 chrome/locale/mn-MN/zotero/zotero.properties | 4 ++++
 chrome/locale/nb-NO/zotero/preferences.dtd   | 1 +
 chrome/locale/nb-NO/zotero/zotero.properties | 4 ++++
 chrome/locale/nl-NL/zotero/preferences.dtd   | 1 +
 chrome/locale/nl-NL/zotero/zotero.properties | 4 ++++
 chrome/locale/nn-NO/zotero/preferences.dtd   | 1 +
 chrome/locale/nn-NO/zotero/zotero.properties | 4 ++++
 chrome/locale/pl-PL/zotero/preferences.dtd   | 1 +
 chrome/locale/pl-PL/zotero/zotero.properties | 4 ++++
 chrome/locale/pt-BR/zotero/preferences.dtd   | 1 +
 chrome/locale/pt-BR/zotero/zotero.properties | 4 ++++
 chrome/locale/pt-PT/zotero/preferences.dtd   | 1 +
 chrome/locale/pt-PT/zotero/zotero.properties | 4 ++++
 chrome/locale/ro-RO/zotero/preferences.dtd   | 1 +
 chrome/locale/ro-RO/zotero/zotero.properties | 4 ++++
 chrome/locale/ru-RU/zotero/preferences.dtd   | 1 +
 chrome/locale/ru-RU/zotero/zotero.properties | 4 ++++
 chrome/locale/sk-SK/zotero/preferences.dtd   | 1 +
 chrome/locale/sk-SK/zotero/zotero.properties | 4 ++++
 chrome/locale/sl-SI/zotero/preferences.dtd   | 1 +
 chrome/locale/sl-SI/zotero/zotero.properties | 4 ++++
 chrome/locale/sr-RS/zotero/preferences.dtd   | 1 +
 chrome/locale/sr-RS/zotero/zotero.properties | 4 ++++
 chrome/locale/sv-SE/zotero/preferences.dtd   | 1 +
 chrome/locale/sv-SE/zotero/zotero.properties | 4 ++++
 chrome/locale/th-TH/zotero/preferences.dtd   | 1 +
 chrome/locale/th-TH/zotero/zotero.properties | 4 ++++
 chrome/locale/tr-TR/zotero/preferences.dtd   | 1 +
 chrome/locale/tr-TR/zotero/zotero.properties | 4 ++++
 chrome/locale/vi-VN/zotero/preferences.dtd   | 1 +
 chrome/locale/vi-VN/zotero/zotero.properties | 4 ++++
 chrome/locale/zh-CN/zotero/preferences.dtd   | 1 +
 chrome/locale/zh-CN/zotero/zotero.properties | 4 ++++
 chrome/locale/zh-TW/zotero/preferences.dtd   | 1 +
 chrome/locale/zh-TW/zotero/zotero.properties | 4 ++++
 80 files changed, 200 insertions(+)

diff --git a/chrome/locale/af-ZA/zotero/preferences.dtd b/chrome/locale/af-ZA/zotero/preferences.dtd
index 69f7573a1c..da8e171afc 100644
--- a/chrome/locale/af-ZA/zotero/preferences.dtd
+++ b/chrome/locale/af-ZA/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Stoorligging">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Doelmaak:">
 <!ENTITY zotero.preferences.dataDir.choose "Kies...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
diff --git a/chrome/locale/af-ZA/zotero/zotero.properties b/chrome/locale/af-ZA/zotero/zotero.properties
index ff747139d2..b3bf23d099 100644
--- a/chrome/locale/af-ZA/zotero/zotero.properties
+++ b/chrome/locale/af-ZA/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=Document
 save.attachment=Saving Snapshot...
 save.link=Saving Link...
 save.link.error=An error occurred while saving this link.
+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=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/ar/zotero/preferences.dtd b/chrome/locale/ar/zotero/preferences.dtd
index f27cd6ddb9..aa18ce6a62 100644
--- a/chrome/locale/ar/zotero/preferences.dtd
+++ b/chrome/locale/ar/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "اظهار خطائص ترميز الحروف عند التصدير">
 
 <!ENTITY zotero.preferences.dataDir "مكان تخزين البيانات">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "تخصيص:">
 <!ENTITY zotero.preferences.dataDir.choose "اختر...">
 <!ENTITY zotero.preferences.dataDir.reveal "عرض مجلد البيانات">
diff --git a/chrome/locale/ar/zotero/zotero.properties b/chrome/locale/ar/zotero/zotero.properties
index 4fdbb4e80c..11c3776a8a 100644
--- a/chrome/locale/ar/zotero/zotero.properties
+++ b/chrome/locale/ar/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=شاهد %S لمزيد من المعلومات.
 general.enable=تمكين
 general.disable=تعطيل
 general.remove=حذف
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=عملية زوتيرو حاليا في التقدم.
 general.operationInProgress.waitUntilFinished=يرجى الانتظار لحين انتهاء.
@@ -396,6 +397,8 @@ fileTypes.document=مستند
 save.attachment=حفظ اللقطة...
 save.link=حفظ الرابط...
 save.link.error=An error occurred while saving this link.
+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=حفظ في زوتيرو
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=فشلت عملية رفع المل
 sync.storage.error.webdav.sslCertificateError=خطأ في شهادة SSL عند الاتصال بـ %S.
 sync.storage.error.webdav.sslConnectionError=خطأ في اتصال SSL عند الاتصال بـ to %S.
 sync.storage.error.webdav.loadURLForMoreInfo=لمزيد من المعلومات قم بزيارة موقع WebDAV.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=لقد بلغت الحد الاقصى من حصتك في السعة التخزينية للملفات. لن يتم رفع بعض الملفات. ولكن سيتم مواصلة تزامن البيانات الاخرى لزوتيرو الى الخادم.
 sync.storage.error.zfs.personalQuotaReached2=للحصول على مساحة تخزين إضافية اطلع على إعدادات حسابك في موقع  zotero.org.
diff --git a/chrome/locale/bg-BG/zotero/preferences.dtd b/chrome/locale/bg-BG/zotero/preferences.dtd
index ee89a6ede6..fdeda0c40d 100644
--- a/chrome/locale/bg-BG/zotero/preferences.dtd
+++ b/chrome/locale/bg-BG/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Показва опция за символният код при експорт.">
 
 <!ENTITY zotero.preferences.dataDir "Място за съхранение">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Потребителски">
 <!ENTITY zotero.preferences.dataDir.choose "Избор...">
 <!ENTITY zotero.preferences.dataDir.reveal "Показва папката с дани">
diff --git a/chrome/locale/bg-BG/zotero/zotero.properties b/chrome/locale/bg-BG/zotero/zotero.properties
index b640da803c..b1f2ba8d89 100644
--- a/chrome/locale/bg-BG/zotero/zotero.properties
+++ b/chrome/locale/bg-BG/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Виж %S за повече информация.
 general.enable=Включва
 general.disable=Изключва
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Операция на Зотеро е активна в момента.
 general.operationInProgress.waitUntilFinished=Моля изчакайте докато приключи.
@@ -396,6 +397,8 @@ fileTypes.document=Документ
 save.attachment=Записва снимка...
 save.link=Записва връзка...
 save.link.error=An error occurred while saving this link.
+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=Съхранява в Зотеро
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=файлът не беше каче
 sync.storage.error.webdav.sslCertificateError=Грешка в SSL сертификата по време на свързването с %S.
 sync.storage.error.webdav.sslConnectionError=Грешка в SSL връзката по време на свързването с %S.
 sync.storage.error.webdav.loadURLForMoreInfo=Заредете WebDAV адреса в браузера за повече информация.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Вие достигнахте лимита на квотата за съхранение на файлове. Част от файловете не бяха качени. Останалите дани на Зотеро ще бъдат синхронизирани със сървъра.
 sync.storage.error.zfs.personalQuotaReached2=Вижте параметрите на вашият zotero.org акаунт за допълнителни опции за съхранение.
diff --git a/chrome/locale/ca-AD/zotero/preferences.dtd b/chrome/locale/ca-AD/zotero/preferences.dtd
index 6cb3df28ea..d4ef86e60d 100644
--- a/chrome/locale/ca-AD/zotero/preferences.dtd
+++ b/chrome/locale/ca-AD/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Lloc d&apos;emmagatzematge">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Personalitzat:">
 <!ENTITY zotero.preferences.dataDir.choose "Escull...">
 <!ENTITY zotero.preferences.dataDir.reveal "Mostra el directori de dades">
diff --git a/chrome/locale/ca-AD/zotero/zotero.properties b/chrome/locale/ca-AD/zotero/zotero.properties
index 976b40564b..93ffc9334b 100644
--- a/chrome/locale/ca-AD/zotero/zotero.properties
+++ b/chrome/locale/ca-AD/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=Document
 save.attachment=Desant captura...
 save.link=Desant enllaç...
 save.link.error=An error occurred while saving this link.
+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=Desa a Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/cs-CZ/zotero/preferences.dtd b/chrome/locale/cs-CZ/zotero/preferences.dtd
index 3291a7b685..f1317751d2 100644
--- a/chrome/locale/cs-CZ/zotero/preferences.dtd
+++ b/chrome/locale/cs-CZ/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Zobrazit při exportu možnost zvolit kódování">
 
 <!ENTITY zotero.preferences.dataDir "Umístění Datového adresáře">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Vlastní:">
 <!ENTITY zotero.preferences.dataDir.choose "Vybrat...">
 <!ENTITY zotero.preferences.dataDir.reveal "Ukázat Datový adresář">
diff --git a/chrome/locale/cs-CZ/zotero/zotero.properties b/chrome/locale/cs-CZ/zotero/zotero.properties
index 61a69f7ec7..718a917a6c 100644
--- a/chrome/locale/cs-CZ/zotero/zotero.properties
+++ b/chrome/locale/cs-CZ/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Pro více informací se podívejte na %S
 general.enable=Povolit
 general.disable=Zakázat
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Právě probíhá operace se Zoterem.
 general.operationInProgress.waitUntilFinished=Počkejte prosím, dokud neskončí.
@@ -396,6 +397,8 @@ fileTypes.document=Dokument
 save.attachment=Ukládá se snímek...
 save.link=Ukládá se odkaz...
 save.link.error=An error occurred while saving this link.
+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=Uložit do Zotera
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Nahrání souboru selhalo z důvodu
 sync.storage.error.webdav.sslCertificateError=Chyba SSL certifikátu při připojování k %S.
 sync.storage.error.webdav.sslConnectionError=Chyba SSL spojení při připojování k %S.
 sync.storage.error.webdav.loadURLForMoreInfo=Nahrajte vaší WebDAV URL do prohlížeče pro více informací.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Dosáhli jste vaší kvóty v Zotero úložišti souborů. Některé soubory nebudou nahrány. Ostatní data Zotera se budou i nadále synchronizovat se serverem.
 sync.storage.error.zfs.personalQuotaReached2=Pro zobrazení dalších možností ukládání použijte nastavení účtu na zotero.org.
diff --git a/chrome/locale/da-DK/zotero/preferences.dtd b/chrome/locale/da-DK/zotero/preferences.dtd
index 7703840b1f..f9dbfae883 100644
--- a/chrome/locale/da-DK/zotero/preferences.dtd
+++ b/chrome/locale/da-DK/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Storage Location">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Custom:">
 <!ENTITY zotero.preferences.dataDir.choose "Choose...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
diff --git a/chrome/locale/da-DK/zotero/zotero.properties b/chrome/locale/da-DK/zotero/zotero.properties
index d005b1411c..d9832b8dcc 100644
--- a/chrome/locale/da-DK/zotero/zotero.properties
+++ b/chrome/locale/da-DK/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=Document
 save.attachment=Saving Snapshot...
 save.link=Saving Link...
 save.link.error=An error occurred while saving this link.
+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=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/de/zotero/preferences.dtd b/chrome/locale/de/zotero/preferences.dtd
index 2e061f1e40..fbfb5a4b5b 100644
--- a/chrome/locale/de/zotero/preferences.dtd
+++ b/chrome/locale/de/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Option für Zeichenkodierung beim Export anzeigen">
 
 <!ENTITY zotero.preferences.dataDir "Speicherort">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Eigene:">
 <!ENTITY zotero.preferences.dataDir.choose "Auswählen...">
 <!ENTITY zotero.preferences.dataDir.reveal "Datenverzeichnis anzeigen">
diff --git a/chrome/locale/de/zotero/zotero.properties b/chrome/locale/de/zotero/zotero.properties
index 1dfa1c8093..bcc3b43f12 100644
--- a/chrome/locale/de/zotero/zotero.properties
+++ b/chrome/locale/de/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Siehe %S für weitere Informationen.
 general.enable=Aktivieren
 general.disable=Deaktivieren
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Zotero ist beschäftigt.
 general.operationInProgress.waitUntilFinished=Bitte warten Sie.
@@ -396,6 +397,8 @@ fileTypes.document=Dokument
 save.attachment=Speichere Schnappschuss...
 save.link=Speichere Link...
 save.link.error=An error occurred while saving this link.
+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=In Zotero speichern
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Ein Datei-Upload ist aufgrund unzure
 sync.storage.error.webdav.sslCertificateError=SSL-Zertifikat-Fehler beim Verbinden mit %S.
 sync.storage.error.webdav.sslConnectionError=SSL-Verbindungsfehler beim Verbinden mit %S.
 sync.storage.error.webdav.loadURLForMoreInfo=Laden Sie Ihre WebDAV-URL im Browser für weitere Informationen.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Sie haben Ihr Zotero-Dateispeicherungskontingent ausgeschöpft. Einige Dateien wurden nicht hochgeladen. Andere Zotero-Daten werden weiterhin zum Server synchronisiert.
 sync.storage.error.zfs.personalQuotaReached2=Gehen Sie zur Ihren zotero.org Accounteinstellungen für weitere Speicheroptionen.
diff --git a/chrome/locale/el-GR/zotero/preferences.dtd b/chrome/locale/el-GR/zotero/preferences.dtd
index 7703840b1f..f9dbfae883 100644
--- a/chrome/locale/el-GR/zotero/preferences.dtd
+++ b/chrome/locale/el-GR/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Storage Location">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Custom:">
 <!ENTITY zotero.preferences.dataDir.choose "Choose...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
diff --git a/chrome/locale/el-GR/zotero/zotero.properties b/chrome/locale/el-GR/zotero/zotero.properties
index ff747139d2..b3bf23d099 100644
--- a/chrome/locale/el-GR/zotero/zotero.properties
+++ b/chrome/locale/el-GR/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=Document
 save.attachment=Saving Snapshot...
 save.link=Saving Link...
 save.link.error=An error occurred while saving this link.
+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=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/es-ES/zotero/preferences.dtd b/chrome/locale/es-ES/zotero/preferences.dtd
index ae21411295..a4a004d34a 100644
--- a/chrome/locale/es-ES/zotero/preferences.dtd
+++ b/chrome/locale/es-ES/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Lugar de almacenamiento">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Especial:">
 <!ENTITY zotero.preferences.dataDir.choose "Elegir...">
 <!ENTITY zotero.preferences.dataDir.reveal "Mostrar el directorio de datos">
diff --git a/chrome/locale/es-ES/zotero/zotero.properties b/chrome/locale/es-ES/zotero/zotero.properties
index 513b34b92d..520d1a396e 100644
--- a/chrome/locale/es-ES/zotero/zotero.properties
+++ b/chrome/locale/es-ES/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Mira en %S para más información
 general.enable=Activar
 general.disable=Desactivar
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Una operación de Zotero se encuentra en progreso.
 general.operationInProgress.waitUntilFinished=Espera hasta que termine.
@@ -396,6 +397,8 @@ fileTypes.document=Documento
 save.attachment=Guardando instantánea...
 save.link=Guardando enlace...
 save.link.error=An error occurred while saving this link.
+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=Guardar en Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Falló una subida de fichero por fal
 sync.storage.error.webdav.sslCertificateError=Error de certificado SSL al conectar con %S
 sync.storage.error.webdav.sslConnectionError=Error de conexión SSL al conectar con %S
 sync.storage.error.webdav.loadURLForMoreInfo=Carga tu URL WebDAV en el navegador para más información.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/et-EE/zotero/preferences.dtd b/chrome/locale/et-EE/zotero/preferences.dtd
index 64dcbba498..340be79339 100644
--- a/chrome/locale/et-EE/zotero/preferences.dtd
+++ b/chrome/locale/et-EE/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Näidata ekspordi puhul tähtede kodeeringut">
 
 <!ENTITY zotero.preferences.dataDir "Lao asukoht">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Oma valik:">
 <!ENTITY zotero.preferences.dataDir.choose "Valida...">
 <!ENTITY zotero.preferences.dataDir.reveal "Andmete kataloogi näitamine">
diff --git a/chrome/locale/et-EE/zotero/zotero.properties b/chrome/locale/et-EE/zotero/zotero.properties
index c47dffa931..db54778459 100644
--- a/chrome/locale/et-EE/zotero/zotero.properties
+++ b/chrome/locale/et-EE/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Edasise info tarbeks vaadake %S.
 general.enable=Lubada
 general.disable=Keelata
 general.remove=Eemaldada
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Zotero parajasti toimetab.
 general.operationInProgress.waitUntilFinished=Palun oodake kuni see lõpeb.
@@ -396,6 +397,8 @@ fileTypes.document=Dokument
 save.attachment=Momentülesvõtte salvestamine...
 save.link=Lingi salvestamine...
 save.link.error=An error occurred while saving this link.
+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=Salvestada Zoterosse
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Faili üleslaadimine ebaõnnestus, s
 sync.storage.error.webdav.sslCertificateError=%S ühendumisel tekkis SSL sertifikaadi viga.
 sync.storage.error.webdav.sslConnectionError=%S ühendumisel tekkis SSL ühenduse viga.
 sync.storage.error.webdav.loadURLForMoreInfo=Edasiseks infoks laadige WebDAV URL brauseris.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Zotero serveris teile eraldatud laoruum on täis saanud. Mõningaid faile ei laaditud üles, ülejäänud zotero andmeid aga sünkroonitakse endiselt.
 sync.storage.error.zfs.personalQuotaReached2=Suurema laoruumi saamiseks vaadake enda zotero.org kontot.
diff --git a/chrome/locale/eu-ES/zotero/preferences.dtd b/chrome/locale/eu-ES/zotero/preferences.dtd
index 64296054d9..0e8da5ee8e 100644
--- a/chrome/locale/eu-ES/zotero/preferences.dtd
+++ b/chrome/locale/eu-ES/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Data Directory Location">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Custom:">
 <!ENTITY zotero.preferences.dataDir.choose "Choose...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
diff --git a/chrome/locale/eu-ES/zotero/zotero.properties b/chrome/locale/eu-ES/zotero/zotero.properties
index 227a119332..7f6d3f1c5e 100644
--- a/chrome/locale/eu-ES/zotero/zotero.properties
+++ b/chrome/locale/eu-ES/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=%S-en informazio gehiago duzu.
 general.enable=Gaitu
 general.disable=Ezgaitu
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Zotero lanean ari da.
 general.operationInProgress.waitUntilFinished=Itxaren ezazu bukatu arte.
@@ -396,6 +397,8 @@ fileTypes.document=Dokumentu
 save.attachment=Kaptura-irudia gordetzen ari...
 save.link=URLa gordetzen ari...
 save.link.error=An error occurred while saving this link.
+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=Zotero-n gorde
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Errorea: A file upload failed due to
 sync.storage.error.webdav.sslCertificateError=Errorea: SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=Errorea: SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Zuretzat gordetzen den lekua Zotero zerbitzarian gainezka dago. Zenbait fitxategi ez dira hara bidali. Besteak sinkronizatzen jarraituko dira.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/fa/zotero/preferences.dtd b/chrome/locale/fa/zotero/preferences.dtd
index fe1d97f401..cc7345a883 100644
--- a/chrome/locale/fa/zotero/preferences.dtd
+++ b/chrome/locale/fa/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "نمایش گزینه کدبندی نویسه‌ها در موقع صدور">
 
 <!ENTITY zotero.preferences.dataDir "محل ذخیره اطلاعات">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "محل دلخواه:">
 <!ENTITY zotero.preferences.dataDir.choose "انتخاب...">
 <!ENTITY zotero.preferences.dataDir.reveal "نمایش محل ذخیره اطلاعات">
diff --git a/chrome/locale/fa/zotero/zotero.properties b/chrome/locale/fa/zotero/zotero.properties
index 846c07c554..2629f0db50 100644
--- a/chrome/locale/fa/zotero/zotero.properties
+++ b/chrome/locale/fa/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=برای اطلاعات بیشتر %S را ببی
 general.enable=فعال
 general.disable=غیرفعال
 general.remove=حذف
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=زوترو در حال انجام کاری است.
 general.operationInProgress.waitUntilFinished=لطفا تا زمان اتمام آن صبر کنید.
@@ -396,6 +397,8 @@ fileTypes.document=سند
 save.attachment=در حال ذخیره تصویر لحظه‌ای...
 save.link=در حال ذخیره پیوند...
 save.link.error=An error occurred while saving this link.
+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=ذخیره در زوترو
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=بارگذاری یک پرونده 
 sync.storage.error.webdav.sslCertificateError=خطای گواهی SSL در زمان اتصال به %S.
 sync.storage.error.webdav.sslConnectionError=خطای اتصال SSL در زمان وصل شدن به %S.
 sync.storage.error.webdav.loadURLForMoreInfo=برای اطلاعات بیشتر WebDAV URL خود را در مرورگر وارد کنید.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=سهمیه «ذخیره پرونده‌های زوترو»ی شما پر شده است. برخی پرونده‌ها، بارگذاری نشدند. همزمان‌سازی سایر داده‌های زوترو با کارگزار همچنان انجام خواهد شد.
 sync.storage.error.zfs.personalQuotaReached2=تنظیمات حساب کاربری خود در zotero.org  را برای گزینه‌های ذخیره بیشتر ببینید.
diff --git a/chrome/locale/fi-FI/zotero/preferences.dtd b/chrome/locale/fi-FI/zotero/preferences.dtd
index 7703840b1f..f9dbfae883 100644
--- a/chrome/locale/fi-FI/zotero/preferences.dtd
+++ b/chrome/locale/fi-FI/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Storage Location">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Custom:">
 <!ENTITY zotero.preferences.dataDir.choose "Choose...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
diff --git a/chrome/locale/fi-FI/zotero/zotero.properties b/chrome/locale/fi-FI/zotero/zotero.properties
index 8993eb30be..40e5041d38 100644
--- a/chrome/locale/fi-FI/zotero/zotero.properties
+++ b/chrome/locale/fi-FI/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=Document
 save.attachment=Saving Snapshot...
 save.link=Saving Link...
 save.link.error=An error occurred while saving this link.
+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=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/fr-FR/zotero/preferences.dtd b/chrome/locale/fr-FR/zotero/preferences.dtd
index ac1220730d..0f7ff64149 100644
--- a/chrome/locale/fr-FR/zotero/preferences.dtd
+++ b/chrome/locale/fr-FR/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Afficher l'option de codage de caractères à l'exportation">
 
 <!ENTITY zotero.preferences.dataDir "Emplacement du répertoire contenant les données">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Personnalisé :">
 <!ENTITY zotero.preferences.dataDir.choose "Sélectionner…">
 <!ENTITY zotero.preferences.dataDir.reveal "Afficher le répertoire contenant les données">
diff --git a/chrome/locale/fr-FR/zotero/zotero.properties b/chrome/locale/fr-FR/zotero/zotero.properties
index d57184c257..260dbf1aca 100644
--- a/chrome/locale/fr-FR/zotero/zotero.properties
+++ b/chrome/locale/fr-FR/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Consultez %S pour plus d'information.
 general.enable=Activer
 general.disable=Désactiver
 general.remove=Supprimer
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Une opération Zotero est actuellement en cours.
 general.operationInProgress.waitUntilFinished=Veuillez attendre jusqu'à ce qu'elle soit terminée.
@@ -396,6 +397,8 @@ fileTypes.document=Document
 save.attachment=Enregistrement de la capture en cours…
 save.link=Enregistrement du lien en cours…
 save.link.error=An error occurred while saving this link.
+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=Enregistrer vers Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Une mise en ligne de fichier a écho
 sync.storage.error.webdav.sslCertificateError=Une erreur de certificat SSL s'est produite en se connectant à %S.
 sync.storage.error.webdav.sslConnectionError=Une erreur de connexion SSL s'est produite en se connectant à %S.
 sync.storage.error.webdav.loadURLForMoreInfo=Entrez votre URL WebDAV dans votre navigateur pour plus d'information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Vous avez atteint votre quota de stockage de fichiers Zotero. Certains fichiers n'ont pas été mis en ligne. D'autres données Zotero continueront d'être synchronisées avec le serveur.
 sync.storage.error.zfs.personalQuotaReached2=Consultez les paramètres de votre compte zotero.org pour plus d'options de stockage.
diff --git a/chrome/locale/gl-ES/zotero/preferences.dtd b/chrome/locale/gl-ES/zotero/preferences.dtd
index c143bc5423..e814f79709 100644
--- a/chrome/locale/gl-ES/zotero/preferences.dtd
+++ b/chrome/locale/gl-ES/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Amosar opción de codificación de caracteres na exportación">
 
 <!ENTITY zotero.preferences.dataDir "Localización de almacenamento">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Personalizado:">
 <!ENTITY zotero.preferences.dataDir.choose "Escoller...">
 <!ENTITY zotero.preferences.dataDir.reveal "Mostrar Directorio de Datos">
diff --git a/chrome/locale/gl-ES/zotero/zotero.properties b/chrome/locale/gl-ES/zotero/zotero.properties
index 5a7a17f26b..96ba7026d3 100644
--- a/chrome/locale/gl-ES/zotero/zotero.properties
+++ b/chrome/locale/gl-ES/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Vexa %S para máis información.
 general.enable=Activar
 general.disable=Desactivar
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Está en marcha unha operación Zotero
 general.operationInProgress.waitUntilFinished=Por favor, agarde ata que teña acabado.
@@ -396,6 +397,8 @@ fileTypes.document=Documento
 save.attachment=Gravando Instantánea
 save.link=Gravando Enlace
 save.link.error=An error occurred while saving this link.
+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=Gravar en Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Fallou unha carga de arquivos debido
 sync.storage.error.webdav.sslCertificateError=Erro de certificado SSL na conexión con %S.
 sync.storage.error.webdav.sslConnectionError=Erro de conexión SSL ao conectar con %S.
 sync.storage.error.webdav.loadURLForMoreInfo=Cargue a súa URL WebDAV no navegador para máis información.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Vostede alcanzou a súa cota de Almacenamento de  Arquivos de Zotero. Algúns arquivos non foron enviados. Outros datos Zotero continuarán a sincronización co servidor.
 sync.storage.error.zfs.personalQuotaReached2=Vexa a configuración da súa conta zotero.org para as opcións de almacenamento adicional.
diff --git a/chrome/locale/he-IL/zotero/preferences.dtd b/chrome/locale/he-IL/zotero/preferences.dtd
index ce671ed10b..c1b6871d28 100644
--- a/chrome/locale/he-IL/zotero/preferences.dtd
+++ b/chrome/locale/he-IL/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "מיקום אחסון">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "מותאם אישית:">
 <!ENTITY zotero.preferences.dataDir.choose "בחר...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
diff --git a/chrome/locale/he-IL/zotero/zotero.properties b/chrome/locale/he-IL/zotero/zotero.properties
index a947d5edbf..93789c0ebd 100644
--- a/chrome/locale/he-IL/zotero/zotero.properties
+++ b/chrome/locale/he-IL/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=מסמך
 save.attachment=Saving Snapshot...
 save.link=Saving Link...
 save.link.error=An error occurred while saving this link.
+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=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/hr-HR/zotero/preferences.dtd b/chrome/locale/hr-HR/zotero/preferences.dtd
index 7703840b1f..f9dbfae883 100644
--- a/chrome/locale/hr-HR/zotero/preferences.dtd
+++ b/chrome/locale/hr-HR/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Storage Location">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Custom:">
 <!ENTITY zotero.preferences.dataDir.choose "Choose...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
diff --git a/chrome/locale/hr-HR/zotero/zotero.properties b/chrome/locale/hr-HR/zotero/zotero.properties
index ff747139d2..b3bf23d099 100644
--- a/chrome/locale/hr-HR/zotero/zotero.properties
+++ b/chrome/locale/hr-HR/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=Document
 save.attachment=Saving Snapshot...
 save.link=Saving Link...
 save.link.error=An error occurred while saving this link.
+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=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/hu-HU/zotero/preferences.dtd b/chrome/locale/hu-HU/zotero/preferences.dtd
index e6092bf773..66bf97d2bb 100644
--- a/chrome/locale/hu-HU/zotero/preferences.dtd
+++ b/chrome/locale/hu-HU/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "A karakterkódolás beállításainak mutatása exportálás során">
 
 <!ENTITY zotero.preferences.dataDir "Adatok mentése ide:">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Egyéni:">
 <!ENTITY zotero.preferences.dataDir.choose "Tallózás...">
 <!ENTITY zotero.preferences.dataDir.reveal "Az adatkönyvtár mutatása">
diff --git a/chrome/locale/hu-HU/zotero/zotero.properties b/chrome/locale/hu-HU/zotero/zotero.properties
index dfc93badc1..37bce75046 100644
--- a/chrome/locale/hu-HU/zotero/zotero.properties
+++ b/chrome/locale/hu-HU/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=A %S bővebb információkat tartalmaz.
 general.enable=Bekapcsolás
 general.disable=Kikapcsolás
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero dolgozik.
 general.operationInProgress.waitUntilFinished=Kérjük várjon, amíg a művelet befejeződik.
@@ -396,6 +397,8 @@ 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.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"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A fájl feltöltése helyhiány miat
 sync.storage.error.webdav.sslCertificateError=Hiba az SSL tanúsítvánnyal az %S szerverhez való kapcsolódás közben.
 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.zfs.personalQuotaReached1=Betelt a kvóta, ezért néhány fájl nem lett felöltve. A többi Zotero adat szinkronizálása folytatódik.
 sync.storage.error.zfs.personalQuotaReached2=További információk a zotero.org fiók beállítások pontja alatt.
diff --git a/chrome/locale/is-IS/zotero/preferences.dtd b/chrome/locale/is-IS/zotero/preferences.dtd
index 0adbe2cc3b..9b6fcba696 100644
--- a/chrome/locale/is-IS/zotero/preferences.dtd
+++ b/chrome/locale/is-IS/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Storage Location">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Custom:">
 <!ENTITY zotero.preferences.dataDir.choose "Choose...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
diff --git a/chrome/locale/is-IS/zotero/zotero.properties b/chrome/locale/is-IS/zotero/zotero.properties
index 9aeadb2f9f..905e474078 100644
--- a/chrome/locale/is-IS/zotero/zotero.properties
+++ b/chrome/locale/is-IS/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=Document
 save.attachment=Saving Snapshot...
 save.link=Saving Link...
 save.link.error=An error occurred while saving this link.
+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=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/it-IT/zotero/preferences.dtd b/chrome/locale/it-IT/zotero/preferences.dtd
index cc249f6505..cb54882205 100644
--- a/chrome/locale/it-IT/zotero/preferences.dtd
+++ b/chrome/locale/it-IT/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Posizione salvataggio">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Personalizza:">
 <!ENTITY zotero.preferences.dataDir.choose "Sfoglia...">
 <!ENTITY zotero.preferences.dataDir.reveal "Visualizza la cartella dati">
diff --git a/chrome/locale/it-IT/zotero/zotero.properties b/chrome/locale/it-IT/zotero/zotero.properties
index 57531f50f9..08cbdc17ac 100644
--- a/chrome/locale/it-IT/zotero/zotero.properties
+++ b/chrome/locale/it-IT/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=Documento
 save.attachment=Salvataggio istantanea in corso...
 save.link=Salvataggio collegamento in corso...
 save.link.error=An error occurred while saving this link.
+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=Salva in Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/ja-JP/zotero/preferences.dtd b/chrome/locale/ja-JP/zotero/preferences.dtd
index aab1165710..e197d2e3b9 100644
--- a/chrome/locale/ja-JP/zotero/preferences.dtd
+++ b/chrome/locale/ja-JP/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "保管場所">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "カストム：">
 <!ENTITY zotero.preferences.dataDir.choose "選択する...">
 <!ENTITY zotero.preferences.dataDir.reveal "データ･ディレクトリーを表示">
diff --git a/chrome/locale/ja-JP/zotero/zotero.properties b/chrome/locale/ja-JP/zotero/zotero.properties
index 128ca0ff5f..e5286ba49f 100644
--- a/chrome/locale/ja-JP/zotero/zotero.properties
+++ b/chrome/locale/ja-JP/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=より詳細な情報は、%Sを調べてみてく
 general.enable=オンにする
 general.disable=オフにする
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=既にZotero操作が進行中です。
 general.operationInProgress.waitUntilFinished=完了するまでお待ちください。
@@ -396,6 +397,8 @@ fileTypes.document=原稿
 save.attachment=スナップショットを保存...
 save.link=リンクを保存...
 save.link.error=An error occurred while saving this link.
+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=Zoteroに保存
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/ko-KR/zotero/preferences.dtd b/chrome/locale/ko-KR/zotero/preferences.dtd
index ecf77bae67..c70837619a 100644
--- a/chrome/locale/ko-KR/zotero/preferences.dtd
+++ b/chrome/locale/ko-KR/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "저장 위치">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "사용자 지정:">
 <!ENTITY zotero.preferences.dataDir.choose "선택...">
 <!ENTITY zotero.preferences.dataDir.reveal "자료 디렉토리 표시">
diff --git a/chrome/locale/ko-KR/zotero/zotero.properties b/chrome/locale/ko-KR/zotero/zotero.properties
index 56b0e4a4bb..af6ae02649 100644
--- a/chrome/locale/ko-KR/zotero/zotero.properties
+++ b/chrome/locale/ko-KR/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=자세한 것은 $S(을)를 참조하세요.
 general.enable=사용
 general.disable=사용안함
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Zotero 작업이 현재 진행중입니다.
 general.operationInProgress.waitUntilFinished=끝날때까지 기다려주세요.
@@ -396,6 +397,8 @@ fileTypes.document=문서
 save.attachment=스냅샷 저장...
 save.link=링크 저장...
 save.link.error=An error occurred while saving this link.
+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=Zotero로 저장
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=%S에 연결중 SSL 인증 오류.
 sync.storage.error.webdav.sslConnectionError=%S에 연결중 SSL 접속 오류.
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=추가 저장소 선택사항을 위해 당신의 zotero.org 계정 설정을 표시합니다.
diff --git a/chrome/locale/mn-MN/zotero/preferences.dtd b/chrome/locale/mn-MN/zotero/preferences.dtd
index 5ea07d23b1..c39f160e3a 100644
--- a/chrome/locale/mn-MN/zotero/preferences.dtd
+++ b/chrome/locale/mn-MN/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Storage Location">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Custom:">
 <!ENTITY zotero.preferences.dataDir.choose "Choose...">
 <!ENTITY zotero.preferences.dataDir.reveal "Show Data Directory">
diff --git a/chrome/locale/mn-MN/zotero/zotero.properties b/chrome/locale/mn-MN/zotero/zotero.properties
index afda66495d..fa04415010 100644
--- a/chrome/locale/mn-MN/zotero/zotero.properties
+++ b/chrome/locale/mn-MN/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=Баримт бичиг
 save.attachment=Saving Snapshot...
 save.link=Холбоосыг хадгалж байна...
 save.link.error=An error occurred while saving this link.
+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=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/nb-NO/zotero/preferences.dtd b/chrome/locale/nb-NO/zotero/preferences.dtd
index c088e15de4..e9b5102c1a 100644
--- a/chrome/locale/nb-NO/zotero/preferences.dtd
+++ b/chrome/locale/nb-NO/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Lagringsplass">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Egendefinert:">
 <!ENTITY zotero.preferences.dataDir.choose "Velg...">
 <!ENTITY zotero.preferences.dataDir.reveal "Vis datamappe">
diff --git a/chrome/locale/nb-NO/zotero/zotero.properties b/chrome/locale/nb-NO/zotero/zotero.properties
index 129bd93da0..eda27c8b4e 100644
--- a/chrome/locale/nb-NO/zotero/zotero.properties
+++ b/chrome/locale/nb-NO/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=Dokument
 save.attachment=Lagrer snapshot...
 save.link=Lagrer lenke...
 save.link.error=An error occurred while saving this link.
+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=Lagre i Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/nl-NL/zotero/preferences.dtd b/chrome/locale/nl-NL/zotero/preferences.dtd
index 3b2ba001c6..ab67f2949b 100644
--- a/chrome/locale/nl-NL/zotero/preferences.dtd
+++ b/chrome/locale/nl-NL/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Tekensetcodering kiezen bij exporteren">
 
 <!ENTITY zotero.preferences.dataDir "Opslaglocatie">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Aangepast:">
 <!ENTITY zotero.preferences.dataDir.choose "Kiezen...">
 <!ENTITY zotero.preferences.dataDir.reveal "Opslagmap tonen">
diff --git a/chrome/locale/nl-NL/zotero/zotero.properties b/chrome/locale/nl-NL/zotero/zotero.properties
index cfb18baa67..8038a3647a 100644
--- a/chrome/locale/nl-NL/zotero/zotero.properties
+++ b/chrome/locale/nl-NL/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Bekijk %S voor meer informatie.
 general.enable=Aanzetten
 general.disable=Uitzetten
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Zotero is bezig.
 general.operationInProgress.waitUntilFinished=Wacht tot Zotero klaar is.
@@ -396,6 +397,8 @@ fileTypes.document=Document
 save.attachment=Snapshot wordt opgeslagen...
 save.link=Koppeling wordt opgeslagen...
 save.link.error=An error occurred while saving this link.
+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=Opslaan in Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Het uploaden van een bestand is misl
 sync.storage.error.webdav.sslCertificateError=SSL certificaatfout bij het leggen van een verbinding naar %S.
 sync.storage.error.webdav.sslConnectionError=SSL verbindingsfout bij het leggen van een verbinding naar %S.
 sync.storage.error.webdav.loadURLForMoreInfo=Laad uw WebDAV URL in uw browser voor meer informatie.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=U heeft het quotum van de Zotero File Storage bereikt. Sommige bestanden zijn niet geüpload. De overige Zotero-gegevens worden wel gesynchroniseerd.
 sync.storage.error.zfs.personalQuotaReached2=Bekijk de zotero.org account instellingen voor de mogelijkheden om meer opslagcapaciteit te krijgen.
diff --git a/chrome/locale/nn-NO/zotero/preferences.dtd b/chrome/locale/nn-NO/zotero/preferences.dtd
index 7915fdc3e5..08e2605ba4 100644
--- a/chrome/locale/nn-NO/zotero/preferences.dtd
+++ b/chrome/locale/nn-NO/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Lagringsplass">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Egendefinert:">
 <!ENTITY zotero.preferences.dataDir.choose "Vel...">
 <!ENTITY zotero.preferences.dataDir.reveal "Vis datamappe">
diff --git a/chrome/locale/nn-NO/zotero/zotero.properties b/chrome/locale/nn-NO/zotero/zotero.properties
index 7d9b11aa65..a68ef18bd8 100644
--- a/chrome/locale/nn-NO/zotero/zotero.properties
+++ b/chrome/locale/nn-NO/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it vert hatt finished.
@@ -396,6 +397,8 @@ fileTypes.document=Dokument
 save.attachment=Lagrar snapshot...
 save.link=Lagrar lenkje...
 save.link.error=An error occurred while saving this link.
+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=Lagre i Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A fila upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero Fila Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/pl-PL/zotero/preferences.dtd b/chrome/locale/pl-PL/zotero/preferences.dtd
index 56f3e690d1..5c5f45fe17 100644
--- a/chrome/locale/pl-PL/zotero/preferences.dtd
+++ b/chrome/locale/pl-PL/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Wyświetl opcje kodowania znaków przy eksporcie">
 
 <!ENTITY zotero.preferences.dataDir "Miejsce przechowywania:">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Określ katalog:">
 <!ENTITY zotero.preferences.dataDir.choose "Przeglądaj">
 <!ENTITY zotero.preferences.dataDir.reveal "Wyświetl katalog bazy danych">
diff --git a/chrome/locale/pl-PL/zotero/zotero.properties b/chrome/locale/pl-PL/zotero/zotero.properties
index 8b9f031aa3..f3a217c867 100644
--- a/chrome/locale/pl-PL/zotero/zotero.properties
+++ b/chrome/locale/pl-PL/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Zobacz %S aby uzyskać więcej informacji.
 general.enable=Włącz
 general.disable=Wyłącz
 general.remove=Usuń
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Proszę poczekać na zakończenie.
@@ -396,6 +397,8 @@ fileTypes.document=Dokument
 save.attachment=Zapisywanie zrzutu ekranu...
 save.link=Zapisywanie odnośnika...
 save.link.error=An error occurred while saving this link.
+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=Zapisz w Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=Błąd certyfikatu SSL podczas łączenia z %S.
 sync.storage.error.webdav.sslConnectionError=Błąd połączenia SSL podczas łączenia z %S.
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/pt-BR/zotero/preferences.dtd b/chrome/locale/pt-BR/zotero/preferences.dtd
index 20e77f4d33..83e729d88e 100644
--- a/chrome/locale/pt-BR/zotero/preferences.dtd
+++ b/chrome/locale/pt-BR/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Exibir opção de codificação de caracteres ao exportar">
 
 <!ENTITY zotero.preferences.dataDir "Localização do armazenamento">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Personalizado:">
 <!ENTITY zotero.preferences.dataDir.choose "Escolha...">
 <!ENTITY zotero.preferences.dataDir.reveal "Exibir diretório de dados">
diff --git a/chrome/locale/pt-BR/zotero/zotero.properties b/chrome/locale/pt-BR/zotero/zotero.properties
index 65b69503fb..6e1a067bbb 100644
--- a/chrome/locale/pt-BR/zotero/zotero.properties
+++ b/chrome/locale/pt-BR/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Ver %S para mais informações.
 general.enable=Habilitar
 general.disable=Desabilitar
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Uma operação Zotero está atualmente em progresso.
 general.operationInProgress.waitUntilFinished=Por favor, aguarde até que ela termine.
@@ -396,6 +397,8 @@ fileTypes.document=Documento
 save.attachment=Salvando instantâneo...
 save.link=Salvando link...
 save.link.error=An error occurred while saving this link.
+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=Salvar em Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Um envio de arquivo falhou devido à
 sync.storage.error.webdav.sslCertificateError=Erro de certificado SSL ao conectar a %S.
 sync.storage.error.webdav.sslConnectionError=Erro de conexão SSL ao conectar a %S.
 sync.storage.error.webdav.loadURLForMoreInfo=Abra seu endereço WebDAV em seu navegador para mais informações.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Você excedeu sua cota do Armazenamento de Arquivos Zotero. Alguns arquivos não foram enviados. Outros dados Zotero continuarão a ser sincronizados com o servidor.
 sync.storage.error.zfs.personalQuotaReached2=Veja as configurações de sua conta zotero.org para opções adicionais de armazenamento.
diff --git a/chrome/locale/pt-PT/zotero/preferences.dtd b/chrome/locale/pt-PT/zotero/preferences.dtd
index 724b70cb86..8372a0d4e4 100644
--- a/chrome/locale/pt-PT/zotero/preferences.dtd
+++ b/chrome/locale/pt-PT/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Mostrar opção de codificação de caracteres ao exportar">
 
 <!ENTITY zotero.preferences.dataDir "Local de Armazenamento">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Outra:">
 <!ENTITY zotero.preferences.dataDir.choose "Escolher...">
 <!ENTITY zotero.preferences.dataDir.reveal "Mostrar Pasta de Dados">
diff --git a/chrome/locale/pt-PT/zotero/zotero.properties b/chrome/locale/pt-PT/zotero/zotero.properties
index fdada5815c..8896e6f8cd 100644
--- a/chrome/locale/pt-PT/zotero/zotero.properties
+++ b/chrome/locale/pt-PT/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Ver %S para mais informações.
 general.enable=Activar
 general.disable=Desactivar
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Está em curso uma operação do Zotero.
 general.operationInProgress.waitUntilFinished=Por favor espere que termine.
@@ -396,6 +397,8 @@ fileTypes.document=Documento
 save.attachment=Guardando Captura...
 save.link=Guardando Ligação...
 save.link.error=An error occurred while saving this link.
+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=Guardar no Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Falhou um carregamento de arquivo de
 sync.storage.error.webdav.sslCertificateError=Erro de certificado SSL ao ligar a %S.
 sync.storage.error.webdav.sslConnectionError=Erro de ligação SSL ao ligar a %S.
 sync.storage.error.webdav.loadURLForMoreInfo=Carregue o seu URL de WebDAV no navegador para obter mais informação.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Atingiu o limite da sua quota de Armazenamento de Arquivos Zotero. Alguns arquivos não foram carregados. Outros dados do Zotero continuarão a ser sincronizados com o servidor.
 sync.storage.error.zfs.personalQuotaReached2=Veja as opções da sua conta zotero.org para mais possibilidades de armazenamento.
diff --git a/chrome/locale/ro-RO/zotero/preferences.dtd b/chrome/locale/ro-RO/zotero/preferences.dtd
index 8cc6abe652..6e348c4bf1 100644
--- a/chrome/locale/ro-RO/zotero/preferences.dtd
+++ b/chrome/locale/ro-RO/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Afișează la export opțiunea pentru codificarea caracterelor">
 
 <!ENTITY zotero.preferences.dataDir "Locație pentru stocare">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Personalizare:">
 <!ENTITY zotero.preferences.dataDir.choose "Alege...">
 <!ENTITY zotero.preferences.dataDir.reveal "Afișează directorul de date">
diff --git a/chrome/locale/ro-RO/zotero/zotero.properties b/chrome/locale/ro-RO/zotero/zotero.properties
index be724c2dd6..0baa5cf1b2 100644
--- a/chrome/locale/ro-RO/zotero/zotero.properties
+++ b/chrome/locale/ro-RO/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Vezi %S pentru mai multe informații.
 general.enable=Activare
 general.disable=Dezactivare
 general.remove=Șterge
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=O operațiune Zotero este în momentul de față în desfășurare.
 general.operationInProgress.waitUntilFinished=Te rog să aștepți până se încheie.
@@ -396,6 +397,8 @@ fileTypes.document=Document
 save.attachment=Salvează instantaneu...
 save.link=Salvează legătură...
 save.link.error=An error occurred while saving this link.
+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=Salvează în Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Încărcarea unui fișier a eșuat d
 sync.storage.error.webdav.sslCertificateError=Eroare de certificare SSL la conectarea cu %S.
 sync.storage.error.webdav.sslConnectionError=Eroare de conectare SSL la conectarea cu %S.
 sync.storage.error.webdav.loadURLForMoreInfo=Încarcă-ți URL-ul WebDAV în browser pentru mai multe informații.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Ai atins limita ta maximă de stocare a fișierelor în Zotero. Unele fișiere nu au fost încărcate. Alte date Zotero vor continua să se sincronizeze cu serverul.
 sync.storage.error.zfs.personalQuotaReached2=Vezi configurările contului tău zotero.org pentru opțiuni de stocare adiționale.
diff --git a/chrome/locale/ru-RU/zotero/preferences.dtd b/chrome/locale/ru-RU/zotero/preferences.dtd
index 5a904a1bc1..c4f369ca54 100644
--- a/chrome/locale/ru-RU/zotero/preferences.dtd
+++ b/chrome/locale/ru-RU/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Показывать окно выбора кодировки символов при экспорте">
 
 <!ENTITY zotero.preferences.dataDir "Расположение папки с данными">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Пользовательская:">
 <!ENTITY zotero.preferences.dataDir.choose "Выбрать…">
 <!ENTITY zotero.preferences.dataDir.reveal "Показать папку с данными">
diff --git a/chrome/locale/ru-RU/zotero/zotero.properties b/chrome/locale/ru-RU/zotero/zotero.properties
index e86149b89b..18ca61d789 100644
--- a/chrome/locale/ru-RU/zotero/zotero.properties
+++ b/chrome/locale/ru-RU/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Смотрите %S для дополнитель
 general.enable=Включить
 general.disable=Выключить
 general.remove=Убрать
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=В настоящий момент Zotero выполняет действие.
 general.operationInProgress.waitUntilFinished=Пожалуйста, подождите, пока оно закончится.
@@ -396,6 +397,8 @@ fileTypes.document=Документ
 save.attachment=Сохранение снимка…
 save.link=Сохранение ссылки…
 save.link.error=При сохранении этой ссылки произошла ошибка.
+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=Сохранить в Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Загрузка файла не у
 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=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Вы достигли своей квоты на хранение файлов на сервере Zotero. Некоторые файлы не были загружены на сервер. Остальные данные Zotero продолжат синхронизацию с сервером.
 sync.storage.error.zfs.personalQuotaReached2=Посмотрите настройки вашей учетной записи на zotero.org для дополнительных возможностей хранения.
diff --git a/chrome/locale/sk-SK/zotero/preferences.dtd b/chrome/locale/sk-SK/zotero/preferences.dtd
index 83775e22f2..4de88e2261 100644
--- a/chrome/locale/sk-SK/zotero/preferences.dtd
+++ b/chrome/locale/sk-SK/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Zobraziť voľbu kódovania pri exportovaní">
 
 <!ENTITY zotero.preferences.dataDir "Umiestnenie priečinku s dátami">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Vlastné umiestnenie:">
 <!ENTITY zotero.preferences.dataDir.choose "Prehľadávať...">
 <!ENTITY zotero.preferences.dataDir.reveal "Zobraziť priečinok s dátami">
diff --git a/chrome/locale/sk-SK/zotero/zotero.properties b/chrome/locale/sk-SK/zotero/zotero.properties
index 71dc4baa88..9bdee36a2c 100644
--- a/chrome/locale/sk-SK/zotero/zotero.properties
+++ b/chrome/locale/sk-SK/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Pre viac informácií pozri %S.
 general.enable=Povoliť
 general.disable=Zakázať
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Zotero práve vykonáva operáciu.
 general.operationInProgress.waitUntilFinished=Prosím počkajte, kým sa neukončí.
@@ -396,6 +397,8 @@ fileTypes.document=Dokument
 save.attachment=Ukladám snímku...
 save.link=Ukladám odkaz...
 save.link.error=An error occurred while saving this link.
+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=Uložiť do Zotera
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Nahrávanie súboru zlyhalo pre nedo
 sync.storage.error.webdav.sslCertificateError=Chyba bezpečnostného certifikátu SSL pri pripájaní sa na %S.
 sync.storage.error.webdav.sslConnectionError=Chyba zabezpečeného SSL pripojenia k %S.
 sync.storage.error.webdav.loadURLForMoreInfo=Pre viac informácií otvorte URL WebDAV servera vo vašom internetovom prehliadači.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Prekročili ste vašu kvótu na Úložisku Zotero a preto niektoré zo súborov neboli nahraté. Ostatné dáta (okrem súborov) budú so serverom aj naďalej synchronizované.
 sync.storage.error.zfs.personalQuotaReached2=Pozrite si nastavenia vášho účtu na zotero.org pre možnosti, ako je možné získať viac priestoru pre vaše dáta.
diff --git a/chrome/locale/sl-SI/zotero/preferences.dtd b/chrome/locale/sl-SI/zotero/preferences.dtd
index a4ad6ced29..7ac93674c6 100644
--- a/chrome/locale/sl-SI/zotero/preferences.dtd
+++ b/chrome/locale/sl-SI/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Pri izvozu ponudi možnost kodiranja znakov">
 
 <!ENTITY zotero.preferences.dataDir "Mesto shranjevanja">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Po meri:">
 <!ENTITY zotero.preferences.dataDir.choose "Izberi ...">
 <!ENTITY zotero.preferences.dataDir.reveal "Pokaži mapo s podatki">
diff --git a/chrome/locale/sl-SI/zotero/zotero.properties b/chrome/locale/sl-SI/zotero/zotero.properties
index f85f2a918c..45a3c16ec3 100644
--- a/chrome/locale/sl-SI/zotero/zotero.properties
+++ b/chrome/locale/sl-SI/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Oglejte si %S za več informacij.
 general.enable=Omogoči
 general.disable=Onemogoči
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Trenutno je v teku operacija Zotero.
 general.operationInProgress.waitUntilFinished=Počakajte, da se dokonča.
@@ -396,6 +397,8 @@ fileTypes.document=Dokument
 save.attachment=Shranjevanje slike ...
 save.link=Shranjevanje povezave ...
 save.link.error=An error occurred while saving this link.
+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=Shrani v Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Prenos na strežnik ni uspel zaradi
 sync.storage.error.webdav.sslCertificateError=Napaka potrdila SSL pri povezovanju s %S.
 sync.storage.error.webdav.sslConnectionError=Napaka povezave SSL pri povezovanju s %S.
 sync.storage.error.webdav.loadURLForMoreInfo=Naložite URL svojega WebDAV v brskalniku, če želite več informacij.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Dosegli ste mejno kvoto hrambe datotek Zotero. Nekatere datoteke niso bile prenesene na strežnik. Drugi podatki Zotero se bodo še naprej usklajevali s strežnikom.
 sync.storage.error.zfs.personalQuotaReached2=Oglejte si nastavitve svojega računa zotero.org, kjer najdete dodatne možnosti hrambe.
diff --git a/chrome/locale/sr-RS/zotero/preferences.dtd b/chrome/locale/sr-RS/zotero/preferences.dtd
index 0a67c2a1cd..93eb8b23c2 100644
--- a/chrome/locale/sr-RS/zotero/preferences.dtd
+++ b/chrome/locale/sr-RS/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Место за складиштење">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Прилагођено:">
 <!ENTITY zotero.preferences.dataDir.choose "Изабери...">
 <!ENTITY zotero.preferences.dataDir.reveal "Прикажи директоријум података">
diff --git a/chrome/locale/sr-RS/zotero/zotero.properties b/chrome/locale/sr-RS/zotero/zotero.properties
index c3a77d386c..3ff6257576 100644
--- a/chrome/locale/sr-RS/zotero/zotero.properties
+++ b/chrome/locale/sr-RS/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Погледајте %S за више информ
 general.enable=Укључи
 general.disable=Искључи
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Зотерова операција се обавља.
 general.operationInProgress.waitUntilFinished=Сачекајте док се не заврши.
@@ -396,6 +397,8 @@ fileTypes.document=Документ
 save.attachment=Чувам снимак...
 save.link=Чувам везу...
 save.link.error=An error occurred while saving this link.
+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=Сачувај у Зотеру
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/sv-SE/zotero/preferences.dtd b/chrome/locale/sv-SE/zotero/preferences.dtd
index e8549a7a3f..f0a88ec779 100644
--- a/chrome/locale/sv-SE/zotero/preferences.dtd
+++ b/chrome/locale/sv-SE/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Visa val för teckenkod vid export">
 
 <!ENTITY zotero.preferences.dataDir "Lagringsplats">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Egen:">
 <!ENTITY zotero.preferences.dataDir.choose "Välj...">
 <!ENTITY zotero.preferences.dataDir.reveal "Visa datakatalog">
diff --git a/chrome/locale/sv-SE/zotero/zotero.properties b/chrome/locale/sv-SE/zotero/zotero.properties
index 5eba5561f0..bf72aca1da 100644
--- a/chrome/locale/sv-SE/zotero/zotero.properties
+++ b/chrome/locale/sv-SE/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Se %S för mer information.
 general.enable=Sätt på
 general.disable=Stäng av
 general.remove=Ta bort
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Zotero arbetar just nu.
 general.operationInProgress.waitUntilFinished=Vänta till åtgärden är klar.
@@ -396,6 +397,8 @@ fileTypes.document=Dokument
 save.attachment=Sparar lokal kopia...
 save.link=Sparar länk...
 save.link.error=An error occurred while saving this link.
+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=Spara i Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=Uppladdningen misslyckades, utrymmet
 sync.storage.error.webdav.sslCertificateError=Fel i SSL-certifikatet när %S kontaktades.
 sync.storage.error.webdav.sslConnectionError=Fel i SSL-förbindelsen när %S kontaktades.
 sync.storage.error.webdav.loadURLForMoreInfo=Surfa till din WebDAV-adress för mer information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Du har uppnått din tillåtna sparkvot på Zotero File Storage. Några filer laddades inte upp. Övrig Zoterodata kommer att fortsätta synkroniseras med servern.
 sync.storage.error.zfs.personalQuotaReached2=Kolla dina kontoinställningar på zotero.org för andra sparval.
diff --git a/chrome/locale/th-TH/zotero/preferences.dtd b/chrome/locale/th-TH/zotero/preferences.dtd
index 34a3cd60db..471674494d 100644
--- a/chrome/locale/th-TH/zotero/preferences.dtd
+++ b/chrome/locale/th-TH/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "ที่ตั้งของพื้นที่เก็บข้อมูล">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Custom:">
 <!ENTITY zotero.preferences.dataDir.choose "โปรดเลือก...">
 <!ENTITY zotero.preferences.dataDir.reveal "แสดงไดเรคทอรีข้อมูล">
diff --git a/chrome/locale/th-TH/zotero/zotero.properties b/chrome/locale/th-TH/zotero/zotero.properties
index 740d2ed07c..01890fbb54 100644
--- a/chrome/locale/th-TH/zotero/zotero.properties
+++ b/chrome/locale/th-TH/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=Document
 save.attachment=Saving Snapshot...
 save.link=Saving Link...
 save.link.error=An error occurred while saving this link.
+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=Save to Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/tr-TR/zotero/preferences.dtd b/chrome/locale/tr-TR/zotero/preferences.dtd
index b9d09acb70..d737899f2a 100644
--- a/chrome/locale/tr-TR/zotero/preferences.dtd
+++ b/chrome/locale/tr-TR/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Dışarı aktarırken karakter kodlama seçeneğini göster">
 
 <!ENTITY zotero.preferences.dataDir "Veri Dizini Konumu">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Özel:">
 <!ENTITY zotero.preferences.dataDir.choose "Seç...">
 <!ENTITY zotero.preferences.dataDir.reveal "Veri Dizinini Göster">
diff --git a/chrome/locale/tr-TR/zotero/zotero.properties b/chrome/locale/tr-TR/zotero/zotero.properties
index daaa6752bf..bd08851ba0 100644
--- a/chrome/locale/tr-TR/zotero/zotero.properties
+++ b/chrome/locale/tr-TR/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=Daha fazla bilgi için bakınız %S
 general.enable=Seçilir Kıl:
 general.disable=Seçilemez Kıl
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Zotero işlemi çalışıyor.
 general.operationInProgress.waitUntilFinished=Lütfen bitene kadar bekleyiniz.
@@ -396,6 +397,8 @@ fileTypes.document=Doküman
 save.attachment=Enstantene Kaydediliyor...
 save.link=Bağlantıyı Kaydet...
 save.link.error=An error occurred while saving this link.
+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=Zotero'ya Kaydet
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=WeDAV sunucusunda yetersiz yer sebeb
 sync.storage.error.webdav.sslCertificateError=%S bağlanırken SSL sertifika hatası.
 sync.storage.error.webdav.sslConnectionError=%S bağlanırken SSL bağlantı hatası.
 sync.storage.error.webdav.loadURLForMoreInfo=Daha fazla bilgi için WebDAV URL'nizi tarayıcıya yükleyin.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=Zotero Dosya Depolama limitinizi ulaştı. Bazı dosyalar yüklenmeyecek. Diğer Zoter verisi ise eşlenmeye devam edecek.
 sync.storage.error.zfs.personalQuotaReached2=Daha fazla depolama seçenekleri için zotero.org hesap ayarlarınıza bakınız.
diff --git a/chrome/locale/vi-VN/zotero/preferences.dtd b/chrome/locale/vi-VN/zotero/preferences.dtd
index 1cf5dd94c6..6ea715d705 100644
--- a/chrome/locale/vi-VN/zotero/preferences.dtd
+++ b/chrome/locale/vi-VN/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "Nơi lưu trữ dữ liệu">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "Tùy biến:">
 <!ENTITY zotero.preferences.dataDir.choose "Chọn...">
 <!ENTITY zotero.preferences.dataDir.reveal "Hiển thị Thư mục dữ liệu">
diff --git a/chrome/locale/vi-VN/zotero/zotero.properties b/chrome/locale/vi-VN/zotero/zotero.properties
index dc5f68d5b6..485f6b84b6 100644
--- a/chrome/locale/vi-VN/zotero/zotero.properties
+++ b/chrome/locale/vi-VN/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=Tài liệu
 save.attachment=Đang ghi lại Bản lưu trang Web...
 save.link=Đang ghi lại đường dẫn Web...
 save.link.error=An error occurred while saving this link.
+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=Lưu vào Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/zh-CN/zotero/preferences.dtd b/chrome/locale/zh-CN/zotero/preferences.dtd
index 8120344bb9..ee834f9737 100644
--- a/chrome/locale/zh-CN/zotero/preferences.dtd
+++ b/chrome/locale/zh-CN/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "Display character encoding option on export">
 
 <!ENTITY zotero.preferences.dataDir "存储位置">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "自定义:">
 <!ENTITY zotero.preferences.dataDir.choose "选择...">
 <!ENTITY zotero.preferences.dataDir.reveal "显示数据目录">
diff --git a/chrome/locale/zh-CN/zotero/zotero.properties b/chrome/locale/zh-CN/zotero/zotero.properties
index dd521223fb..d300ad5e4a 100644
--- a/chrome/locale/zh-CN/zotero/zotero.properties
+++ b/chrome/locale/zh-CN/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=See %S for more information.
 general.enable=Enable
 general.disable=Disable
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=A Zotero operation is currently in progress.
 general.operationInProgress.waitUntilFinished=Please wait until it has finished.
@@ -396,6 +397,8 @@ fileTypes.document=文档
 save.attachment=保存快照...
 save.link=保存链接...
 save.link.error=An error occurred while saving this link.
+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=保存到Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=A file upload failed due to insuffic
 sync.storage.error.webdav.sslCertificateError=SSL certificate error connecting to %S
 sync.storage.error.webdav.sslConnectionError=SSL connection error connecting to %S
 sync.storage.error.webdav.loadURLForMoreInfo=Load your WebDAV URL in the browser for more information.
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=You have reached your Zotero File Storage quota. Some files were not uploaded. Other Zotero data will continue to sync to the server.
 sync.storage.error.zfs.personalQuotaReached2=See your zotero.org account settings for additional storage options.
diff --git a/chrome/locale/zh-TW/zotero/preferences.dtd b/chrome/locale/zh-TW/zotero/preferences.dtd
index 658c03047f..7a13f055a1 100644
--- a/chrome/locale/zh-TW/zotero/preferences.dtd
+++ b/chrome/locale/zh-TW/zotero/preferences.dtd
@@ -167,6 +167,7 @@
 <!ENTITY zotero.preferences.charset.displayExportOption "匯出時顯示字元編碼的選項">
 
 <!ENTITY zotero.preferences.dataDir "儲存位置">
+<!ENTITY zotero.preferences.dataDir.useProfile "Use profile directory">
 <!ENTITY zotero.preferences.dataDir.custom "自訂：">
 <!ENTITY zotero.preferences.dataDir.choose "選擇…">
 <!ENTITY zotero.preferences.dataDir.reveal "顯示資料目錄">
diff --git a/chrome/locale/zh-TW/zotero/zotero.properties b/chrome/locale/zh-TW/zotero/zotero.properties
index cd980e1e48..9e88afb735 100644
--- a/chrome/locale/zh-TW/zotero/zotero.properties
+++ b/chrome/locale/zh-TW/zotero/zotero.properties
@@ -34,6 +34,7 @@ general.seeForMoreInformation=更多資訊請看 %S
 general.enable=啟用
 general.disable=停用
 general.remove=Remove
+general.openDocumentation=Open Documentation
 
 general.operationInProgress=Zotero 有動作正在進行中。
 general.operationInProgress.waitUntilFinished=請稍候，直到動作完成。
@@ -396,6 +397,8 @@ fileTypes.document=文件
 save.attachment=儲存快照中…
 save.link=儲存鏈結中…
 save.link.error=An error occurred while saving this link.
+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=儲存到 Zotero
 ingester.saveToZoteroUsing=Save to Zotero using "%S"
@@ -684,6 +687,7 @@ sync.storage.error.webdav.insufficientSpace=因為 WebDAV 伺服器的空間不
 sync.storage.error.webdav.sslCertificateError=連接到 %S 時產生了 SSL 證書錯誤。
 sync.storage.error.webdav.sslConnectionError=連接到 %S 時產生了 SSL 連接錯誤。
 sync.storage.error.webdav.loadURLForMoreInfo=用瀏覽器載入你的 WebDAV 網址來取得更多資訊。
+sync.storage.error.webdav.seeCertOverrideDocumentation=See the certificate override documentation for more information.
 sync.storage.error.webdav.loadURL=Load WebDAV URL
 sync.storage.error.zfs.personalQuotaReached1=你已經到達 Zotero 檔案儲存的限額。有些檔案沒有上傳。其他的 Zotero 資料會繼續同步化到伺服器。
 sync.storage.error.zfs.personalQuotaReached2=你在 zotero.org 的帳號設定有更多的儲存選項。

From fad4dc996973739403e4f602461028aa44a8343d Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sat, 21 Jan 2012 01:20:40 -0500
Subject: [PATCH 30/69] Fix TinyMCE HTML window, part 1

---
 chrome/content/zotero/standalone/basicViewer.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/zotero/standalone/basicViewer.xul b/chrome/content/zotero/standalone/basicViewer.xul
index 35e01dba14..438475264e 100644
--- a/chrome/content/zotero/standalone/basicViewer.xul
+++ b/chrome/content/zotero/standalone/basicViewer.xul
@@ -146,7 +146,7 @@
 	
 	<hbox flex="1" id="browser">
 		<vbox id="appcontent" flex="1">
-			<browser id="my-browser" type="content" flex="1"/>
+			<browser id="my-browser" type="content-primary" flex="1"/>
 		</vbox>
 	</hbox>
 </window>

From 0a92a584d0dbde28cc778d40fa097137bef467fb Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 21 Jan 2012 04:05:28 -0500
Subject: [PATCH 31/69] More debugging info for access date issue

---
 chrome/content/zotero/bindings/itembox.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index 705d03f99c..bce5330a68 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -1860,6 +1860,12 @@
 						
 						this._modifyField(fieldName, value, this.saveOnEdit);
 						
+						if (fieldName == 'accessDate') {
+							Zotero.debug('========');
+							Zotero.debug(value);
+							Zotero.debug(this.item.getField(fieldName));
+						}
+						
 						elem = this.createValueElement(
 							this.item.getField(fieldName),
 							fieldName,

From f04d396d738c17003ef09d4ee7f1e78ad0646595 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 22 Jan 2012 10:11:01 -0500
Subject: [PATCH 32/69] Revert mapping from inventor to author, since we
 already map primary creator types to CSL author

---
 chrome/content/zotero/xpcom/utilities.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js
index bfa170f977..23740fc06b 100644
--- a/chrome/content/zotero/xpcom/utilities.js
+++ b/chrome/content/zotero/xpcom/utilities.js
@@ -37,7 +37,6 @@ const CSL_NAMES_MAPPINGS = {
 	"bookAuthor":"container-author",
 	"composer":"composer",
 	"interviewer":"interviewer",
-	"inventor":"author",
 	"recipient":"recipient",
 	"seriesEditor":"collection-editor",
 	"translator":"translator"

From b8781bf254f9a55c309f4a6e029ec3358bbb0493 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 22 Jan 2012 10:15:48 -0500
Subject: [PATCH 33/69] Update to citeproc-js 1.0.266

---
 chrome/content/zotero/xpcom/citeproc.js | 63 ++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 7 deletions(-)

diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js
index 9c73567fba..5c59e3b1db 100644
--- a/chrome/content/zotero/xpcom/citeproc.js
+++ b/chrome/content/zotero/xpcom/citeproc.js
@@ -57,6 +57,16 @@ if (!Array.indexOf) {
     };
 }
 var CSL = {
+    STATUTE_SUBDIV_GROUPED_REGEX: /((?:^| )(?:pt\.|ch\.|subch\.|sec\.|art\.|para\.))/g,
+    STATUTE_SUBDIV_PLAIN_REGEX: /(?:(?:^| )(?:pt\.|ch\.|subch\.|sec\.|art\.|para\.))/,
+    STATUTE_SUBDIV_STRINGS: {
+        "pt.": "part",
+        "ch.": "chapter",
+        "subch.": "subchapter",
+        "sec.": "section",
+        "art.": "article",
+        "para.": "paragraph"
+    },
     NestedBraces: [
         ["(", "["],
         [")", "]"]
@@ -116,7 +126,7 @@ var CSL = {
     MARK_TRAILING_NAMES: true,
     POSITION_TEST_VARS: ["position", "first-reference-note-number", "near-note"],
     AREAS: ["citation", "citation_sort", "bibliography", "bibliography_sort"],
-    MULTI_FIELDS: ["publisher", "publisher-place", "event-place", "title", "container-title", "collection-title", "authority","edition","genre","title-short"],
+    MULTI_FIELDS: ["event", "publisher", "publisher-place", "event-place", "title", "container-title", "collection-title", "authority","edition","genre","title-short"],
     CITE_FIELDS: ["first-reference-note-number", "locator", "locator-revision"],
     MINIMAL_NAME_FIELDS: ["literal", "family"],
     SWAPPING_PUNCTUATION: [".", "!", "?", ":",","],
@@ -1979,7 +1989,7 @@ CSL.DateParser = function () {
 };
 CSL.Engine = function (sys, style, lang, forceLang) {
     var attrs, langspec, localexml, locale;
-    this.processor_version = "1.0.264";
+    this.processor_version = "1.0.266";
     this.csl_version = "1.0";
     this.sys = sys;
     this.sys.xml = new CSL.System.Xml.Parsing();
@@ -7369,6 +7379,35 @@ CSL.Node.text = {
                                     state.output.append(value, this);
                                 }
                             };
+                        } else if (this.variables_real[0] === "section") {
+                            func = function (state, Item) {
+                                var value;
+                                value = state.getVariable(Item, this.variables[0], form);
+                                if (value) {
+                                    if (Item.type === "bill" || Item.type === "legislation") {
+                                        var m = value.match(CSL.STATUTE_SUBDIV_GROUPED_REGEX);
+                                        if (m) {
+                                            var splt = value.split(CSL.STATUTE_SUBDIV_PLAIN_REGEX);
+                                            var lst = [];
+                                            if (!lst[0]) {
+                                                for (var i=1, ilen=splt.length; i < ilen; i += 1) {
+                                                    var subdiv = m[i - 1].replace(/^\s*/, "");
+                                                    subdiv = CSL.STATUTE_SUBDIV_STRINGS[subdiv];
+                                                    var plural = false;
+                                                    if (splt[i].match(/(?:&|, | and )/)) {
+                                                        plural = true;
+                                                    }
+                                                    subdiv = state.getTerm(subdiv, "symbol", plural);
+                                                    lst.push(subdiv);
+                                                    lst.push(splt[i].replace(/\s*,*\s*$/, "").replace(/^\s*,*\s*/, ""));
+                                                }
+                                                value = lst.join(" ");
+                                            }
+                                        }
+                                    }
+                                    state.output.append(value, this);
+                                }
+                            };
                         } else {
                             func = function (state, Item) {
                                 var value;
@@ -8352,7 +8391,7 @@ CSL.Transform = function (state) {
         if (["publisher", "authority"].indexOf(myabbrev_family) > -1) {
             myabbrev_family = "institution-part";
         }
-        if (["genre"].indexOf(myabbrev_family) > -1) {
+        if (["genre", "event"].indexOf(myabbrev_family) > -1) {
             myabbrev_family = "title";
         }
         if (["title-short"].indexOf(myabbrev_family) > -1) {
@@ -10106,7 +10145,6 @@ CSL.Util.FlipFlopper = function (state) {
 };
 CSL.Util.FlipFlopper.prototype.init = function (str, blob) {
     this.txt_esc = CSL.getSafeEscape(this.state);
-    str = this._normalizeString(str);
     if (!blob) {
         this.strs = this.getSplitStrings(str);
         this.blob = new CSL.Blob();
@@ -10118,14 +10156,25 @@ CSL.Util.FlipFlopper.prototype.init = function (str, blob) {
     this.blobstack = new CSL.Stack(this.blob);
 };
 CSL.Util.FlipFlopper.prototype._normalizeString = function (str) {
-    for (var i = 0, ilen = 2; i < ilen; i += 1) {
-        str = str.replace(this.quotechars[i + 2], this.quotechars[0]);
-        str = str.replace(this.quotechars[i + 4], this.quotechars[1]);
+    if (str.indexOf(this.quotechars[0]) > -1) {
+        for (var i = 0, ilen = 2; i < ilen; i += 1) {
+            if (this.quotechars[i + 2]) {
+                str = str.replace(this.quotechars[i + 2], this.quotechars[0]);
+            }
+        }
+    }
+    if (str.indexOf(this.quotechars[1]) > -1) {
+        for (var i = 0, ilen = 2; i < ilen; i += 1) {
+            if (this.quotechars[i + 4]) {
+                str = str.replace(this.quotechars[i + 4], this.quotechars[1]);
+            }
+        }
     }
     return str;
 };
 CSL.Util.FlipFlopper.prototype.getSplitStrings = function (str) {
     var strs, pos, len, newstr, head, tail, expected_closers, expected_openers, expected_flips, tagstack, badTagStack, posA, sameAsOpen, openRev, flipRev, tag, ibeenrunned, posB, wanted_closer, posC, sep, resplice, params, lenA, lenB, lenC, badTagPos, mx, myret;
+    str = this._normalizeString(str);
     mx = str.match(this.allTagsRexMatch);
     strs = str.split(this.allTagsRexSplit);
     myret = [strs[0]];

From 476e0f87d604389f289e6d863136e94625e906df Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 22 Jan 2012 10:28:13 -0500
Subject: [PATCH 34/69] Locale debugging

---
 chrome/content/zotero/xpcom/cite.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js
index c7d6b811df..7670c7c88c 100644
--- a/chrome/content/zotero/xpcom/cite.js
+++ b/chrome/content/zotero/xpcom/cite.js
@@ -124,6 +124,7 @@ Zotero.Cite.System.retrieveItem = function(item) {
 };
 
 Zotero.Cite.System.retrieveLocale = function(lang) {
+	Zotero.debug('=========' + lang);
 	var protHandler = Components.classes["@mozilla.org/network/protocol;1?name=chrome"]
 		.createInstance(Components.interfaces.nsIProtocolHandler);
 	var channel = protHandler.newChannel(protHandler.newURI("chrome://zotero/content/locale/csl/locales-"+lang+".xml", "UTF-8", null));

From 94bb513d9241e5ef01f989be35c103c707f3b141 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 22 Jan 2012 10:41:35 -0500
Subject: [PATCH 35/69] Remove debug output

---
 chrome/content/zotero/xpcom/cite.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js
index 7670c7c88c..c7d6b811df 100644
--- a/chrome/content/zotero/xpcom/cite.js
+++ b/chrome/content/zotero/xpcom/cite.js
@@ -124,7 +124,6 @@ Zotero.Cite.System.retrieveItem = function(item) {
 };
 
 Zotero.Cite.System.retrieveLocale = function(lang) {
-	Zotero.debug('=========' + lang);
 	var protHandler = Components.classes["@mozilla.org/network/protocol;1?name=chrome"]
 		.createInstance(Components.interfaces.nsIProtocolHandler);
 	var channel = protHandler.newChannel(protHandler.newURI("chrome://zotero/content/locale/csl/locales-"+lang+".xml", "UTF-8", null));

From 04fb50528c11a3f27bd6103049d28c8262df863f Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 22 Jan 2012 11:23:35 -0500
Subject: [PATCH 36/69] Move locales.xml retrieval into try

Fixes "Access to restricted URI denied" issue on Ubuntu
---
 chrome/content/zotero/xpcom/cite.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js
index c7d6b811df..e343f0c7fd 100644
--- a/chrome/content/zotero/xpcom/cite.js
+++ b/chrome/content/zotero/xpcom/cite.js
@@ -126,8 +126,8 @@ Zotero.Cite.System.retrieveItem = function(item) {
 Zotero.Cite.System.retrieveLocale = function(lang) {
 	var protHandler = Components.classes["@mozilla.org/network/protocol;1?name=chrome"]
 		.createInstance(Components.interfaces.nsIProtocolHandler);
-	var channel = protHandler.newChannel(protHandler.newURI("chrome://zotero/content/locale/csl/locales-"+lang+".xml", "UTF-8", null));
 	try {
+		var channel = protHandler.newChannel(protHandler.newURI("chrome://zotero/content/locale/csl/locales-"+lang+".xml", "UTF-8", null));
 		var rawStream = channel.open();
 	} catch(e) {
 		return false;

From 35642b465f61bcab002c7bc4c69eea21259359ee Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 22 Jan 2012 11:17:42 -0500
Subject: [PATCH 37/69] Fix for broken locale retrieval with Ubuntu Firefox
 Modifications

---
 chrome/content/zotero/xpcom/zotero.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index b0af143ee0..4a5767b78b 100644
--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@@ -257,8 +257,18 @@ const ZOTERO_CONFIG = {
 		
 		// Locale
 		var prefs = Components.classes["@mozilla.org/preferences-service;1"]
-						.getService(Components.interfaces.nsIPrefService);
-		this.locale = prefs.getBranch("general.useragent.").getCharPref("locale");
+						.getService(Components.interfaces.nsIPrefService),
+			uaPrefs = prefs.getBranch("general.useragent.");
+		try {
+			this.locale = uaPrefs.getComplexValue("locale", Components.interfaces.nsIPrefLocalizedString);
+		} catch (e) {}
+		
+		if(this.locale) {
+			this.locale = this.locale.toString();
+		} else {
+			this.locale = uaPrefs.getCharPref("locale");
+		}
+		
 		if (this.locale.length == 2) {
 			this.locale = this.locale + '-' + this.locale.toUpperCase();
 		}

From 4a86b2112d62073dca9088b84529db0114716102 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 22 Jan 2012 12:11:05 -0500
Subject: [PATCH 38/69] Update to citeproc-js 1.0.267

---
 chrome/content/zotero/xpcom/citeproc.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js
index 5c59e3b1db..d0f20516cf 100644
--- a/chrome/content/zotero/xpcom/citeproc.js
+++ b/chrome/content/zotero/xpcom/citeproc.js
@@ -1989,7 +1989,7 @@ CSL.DateParser = function () {
 };
 CSL.Engine = function (sys, style, lang, forceLang) {
     var attrs, langspec, localexml, locale;
-    this.processor_version = "1.0.266";
+    this.processor_version = "1.0.267";
     this.csl_version = "1.0";
     this.sys = sys;
     this.sys.xml = new CSL.System.Xml.Parsing();
@@ -2546,6 +2546,7 @@ CSL.Engine.Opt = function () {
     this.development_extensions.raw_date_parsing = true;
     this.development_extensions.clean_up_csl_flaws = true;
     this.development_extensions.flip_parentheses_to_braces = true;
+    this.development_extensions.parse_section_variable = true;
     this.gender = {};
 	this['cite-lang-prefs'] = {
 		persons:['orig'],
@@ -7384,12 +7385,14 @@ CSL.Node.text = {
                                 var value;
                                 value = state.getVariable(Item, this.variables[0], form);
                                 if (value) {
-                                    if (Item.type === "bill" || Item.type === "legislation") {
+                                    if ((Item.type === "bill" || Item.type === "legislation")
+                                       && state.opt.development_extensions.parse_section_variable) {
                                         var m = value.match(CSL.STATUTE_SUBDIV_GROUPED_REGEX);
                                         if (m) {
                                             var splt = value.split(CSL.STATUTE_SUBDIV_PLAIN_REGEX);
                                             var lst = [];
                                             if (!lst[0]) {
+                                                var parsed = false;
                                                 for (var i=1, ilen=splt.length; i < ilen; i += 1) {
                                                     var subdiv = m[i - 1].replace(/^\s*/, "");
                                                     subdiv = CSL.STATUTE_SUBDIV_STRINGS[subdiv];
@@ -7398,10 +7401,15 @@ CSL.Node.text = {
                                                         plural = true;
                                                     }
                                                     subdiv = state.getTerm(subdiv, "symbol", plural);
+                                                    if (subdiv) {
+                                                        parsed = true;
+                                                    }
                                                     lst.push(subdiv);
                                                     lst.push(splt[i].replace(/\s*,*\s*$/, "").replace(/^\s*,*\s*/, ""));
                                                 }
-                                                value = lst.join(" ");
+                                                if (parsed) {
+                                                    value = lst.join(" ");
+                                                }
                                             }
                                         }
                                     }

From 7202e8c2ba101a21ef15f7c6b64e4c806bfdebe6 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 22 Jan 2012 13:29:15 -0500
Subject: [PATCH 39/69] Fix Zotero.CreatorTypes.getTypesForItemType in
 connector

---
 chrome/content/zotero/xpcom/connector/cachedTypes.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/xpcom/connector/cachedTypes.js b/chrome/content/zotero/xpcom/connector/cachedTypes.js
index 28469f469d..5e72b672c5 100644
--- a/chrome/content/zotero/xpcom/connector/cachedTypes.js
+++ b/chrome/content/zotero/xpcom/connector/cachedTypes.js
@@ -107,8 +107,8 @@ Zotero.Connector_Types = new function() {
 				
 				for(var i=0; i<n; i++) {
 					var creatorType = creatorTypes[itemCreatorTypes[i]];
-					outputTypes.push({"id":creatorType[0]/* id */,
-						"name":creatorType[1]/* name */});
+					outputTypes[i] = {"id":creatorType[0]/* id */,
+						"name":creatorType[1]/* name */};
 				}
 				return outputTypes;
 			};

From a32c7b6bf96a95141f9a54119cb0374833191b80 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 22 Jan 2012 13:37:13 -0500
Subject: [PATCH 40/69] Read configOptions out of parsed translator

---
 chrome/content/zotero/xpcom/translation/translate.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
index c73ff33f4c..962300240f 100644
--- a/chrome/content/zotero/xpcom/translation/translate.js
+++ b/chrome/content/zotero/xpcom/translation/translate.js
@@ -1209,8 +1209,9 @@ Zotero.Translate.Base.prototype = {
 		Zotero.debug("Translate: Parsing code for "+translator.label, 4);
 		
 		try {
-			this._sandboxManager.eval("var exports = {}, translatorInfo = "+translator.code,
-				["detect"+this._entryFunctionSuffix, "do"+this._entryFunctionSuffix, "exports"],
+			this._sandboxManager.eval("var exports = {}, ZOTERO_TRANSLATOR_INFO = "+translator.code,
+				["detect"+this._entryFunctionSuffix, "do"+this._entryFunctionSuffix, "exports",
+					"ZOTERO_TRANSLATOR_INFO"],
 				(translator.file ? translator.file.path : translator.label));
 		} catch(e) {
 			this.complete(false, e);
@@ -1602,7 +1603,7 @@ Zotero.Translate.Import.prototype._loadTranslator = function(translator, callbac
  * Prepare translator IO
  */
 Zotero.Translate.Import.prototype._loadTranslatorPrepareIO = function(translator, callback) {
-	var dataMode = (translator ? translator : this._potentialTranslators[0]).configOptions["dataMode"];
+	var dataMode = this._sandboxManager.sandbox.ZOTERO_TRANSLATOR_INFO.configOptions["dataMode"];
 	
 	var me = this;
 	var initCallback = function(status, err) {

From 63724c2625a586cc80844c8ee136553564d66397 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 22 Jan 2012 14:30:11 -0500
Subject: [PATCH 41/69] Don't break import with translators without
 configOptions specified

---
 chrome/content/zotero/xpcom/translation/translate.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
index 962300240f..eae48fed28 100644
--- a/chrome/content/zotero/xpcom/translation/translate.js
+++ b/chrome/content/zotero/xpcom/translation/translate.js
@@ -1603,7 +1603,8 @@ Zotero.Translate.Import.prototype._loadTranslator = function(translator, callbac
  * Prepare translator IO
  */
 Zotero.Translate.Import.prototype._loadTranslatorPrepareIO = function(translator, callback) {
-	var dataMode = this._sandboxManager.sandbox.ZOTERO_TRANSLATOR_INFO.configOptions["dataMode"];
+	var configOptions = this._sandboxManager.sandbox.ZOTERO_TRANSLATOR_INFO.configOptions;
+	var dataMode = configOptions ? configOptions : {};
 	
 	var me = this;
 	var initCallback = function(status, err) {

From c3ad5fd6f90f1c01d89e856101a8364e21ae2ac9 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 22 Jan 2012 14:30:33 -0500
Subject: [PATCH 42/69] Don't kill translator tester on invalid test data

---
 .../content/zotero/tools/testTranslators/translatorTester.js   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/tools/testTranslators/translatorTester.js b/chrome/content/zotero/tools/testTranslators/translatorTester.js
index cb4d800f35..017aae06bc 100644
--- a/chrome/content/zotero/tools/testTranslators/translatorTester.js
+++ b/chrome/content/zotero/tools/testTranslators/translatorTester.js
@@ -63,7 +63,8 @@ Zotero_TranslatorTester = function(translator, type, debug) {
 		try {
 			var testObject = JSON.parse(test);
 		} catch (e) {
-			Zotero.logError(e);
+			Zotero.logError(e+" parsing tests for "+translator.label);
+			return;
 		}
 		
 		for(var i=0, n=testObject.length; i<n; i++) {

From 448d68295b279a790f2016ae462892bd495b286c Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 22 Jan 2012 14:35:55 -0500
Subject: [PATCH 43/69] Be more lenient about spacing

---
 chrome/content/zotero/tools/testTranslators/translatorTester.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/zotero/tools/testTranslators/translatorTester.js b/chrome/content/zotero/tools/testTranslators/translatorTester.js
index 017aae06bc..1c979dd65a 100644
--- a/chrome/content/zotero/tools/testTranslators/translatorTester.js
+++ b/chrome/content/zotero/tools/testTranslators/translatorTester.js
@@ -55,7 +55,7 @@ Zotero_TranslatorTester = function(translator, type, debug) {
 	var testEnd   = code.indexOf("/** END TEST CASES **/"); 
 	if (testStart !== -1 && testEnd !== -1) {
 		var test = code.substring(testStart + 24, testEnd);
-		test = test.replace(/var testCases = /,'');
+		test = test.replace(/var testCases = /,'').trim();
 		// The JSON parser doesn't like final semicolons
 		if (test.lastIndexOf(';') == (test.length-1)) {
 			test = test.slice(0,-1);

From e54b6b4e77ebb621389f4326dfd1b1750f4a3d67 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 22 Jan 2012 17:55:50 -0500
Subject: [PATCH 44/69] Update versions

---
 install.rdf | 2 +-
 update.rdf  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install.rdf b/install.rdf
index 18cf51c957..b638abb162 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
   
     <em:id>zotero@chnm.gmu.edu</em:id>
     <em:name>Zotero</em:name>
-    <em:version>3.0b3.SOURCE</em:version>
+    <em:version>3.0rc1.SOURCE</em:version>
     <em:creator>Center for History and New Media<br/>George Mason University</em:creator>
     <em:contributor>Dan Cohen</em:contributor>
     <em:contributor>Sean Takats</em:contributor>
diff --git a/update.rdf b/update.rdf
index 1f8c26bf65..f12f7ab7b1 100644
--- a/update.rdf
+++ b/update.rdf
@@ -7,7 +7,7 @@
     <RDF:Seq>
       <RDF:li>
         <RDF:Description>
-          <version>3.0b3.SOURCE</version>
+          <version>3.0rc1.SOURCE</version>
           <targetApplication>
             <RDF:Description>
               <id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</id>

From ab145f1af79bcf51f36fc4d2e08aa83541662109 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 22 Jan 2012 18:02:31 -0500
Subject: [PATCH 45/69] Fix translation

---
 chrome/content/zotero/xpcom/translation/translate.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
index eae48fed28..ed059b86af 100644
--- a/chrome/content/zotero/xpcom/translation/translate.js
+++ b/chrome/content/zotero/xpcom/translation/translate.js
@@ -1604,7 +1604,7 @@ Zotero.Translate.Import.prototype._loadTranslator = function(translator, callbac
  */
 Zotero.Translate.Import.prototype._loadTranslatorPrepareIO = function(translator, callback) {
 	var configOptions = this._sandboxManager.sandbox.ZOTERO_TRANSLATOR_INFO.configOptions;
-	var dataMode = configOptions ? configOptions : {};
+	var dataMode = configOptions ? configOptions["dataMode"] : "";
 	
 	var me = this;
 	var initCallback = function(status, err) {

From c00820c12863cdfdbbf4c6c7eb36709aceba74b1 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 22 Jan 2012 19:17:39 -0500
Subject: [PATCH 46/69] Fix IE 8 compatibility

---
 .../zotero/tools/testTranslators/translatorTester.js     | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/chrome/content/zotero/tools/testTranslators/translatorTester.js b/chrome/content/zotero/tools/testTranslators/translatorTester.js
index 1c979dd65a..5bb871fbdb 100644
--- a/chrome/content/zotero/tools/testTranslators/translatorTester.js
+++ b/chrome/content/zotero/tools/testTranslators/translatorTester.js
@@ -54,12 +54,9 @@ Zotero_TranslatorTester = function(translator, type, debug) {
 	var testStart = code.indexOf("/** BEGIN TEST CASES **/");
 	var testEnd   = code.indexOf("/** END TEST CASES **/"); 
 	if (testStart !== -1 && testEnd !== -1) {
-		var test = code.substring(testStart + 24, testEnd);
-		test = test.replace(/var testCases = /,'').trim();
-		// The JSON parser doesn't like final semicolons
-		if (test.lastIndexOf(';') == (test.length-1)) {
-			test = test.slice(0,-1);
-		}
+		var test = code.substring(testStart + 24, testEnd)
+			.replace(/^[\s\r\n]*var testCases = /, '')
+			.replace(/;[\s\r\n]*$/, '');
 		try {
 			var testObject = JSON.parse(test);
 		} catch (e) {

From 3079bf3e83a63aab5e97dceff4670509e2153606 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Sun, 22 Jan 2012 23:31:45 -0500
Subject: [PATCH 47/69] Fix translator error reports

---
 chrome/content/zotero/xpcom/translation/translate.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
index ed059b86af..95f0ebd0a6 100644
--- a/chrome/content/zotero/xpcom/translation/translate.js
+++ b/chrome/content/zotero/xpcom/translation/translate.js
@@ -1511,9 +1511,10 @@ Zotero.Translate.Web.prototype.complete = function(returnValue, error) {
 			}
 		}
 		
+		var translator = this.translator[0];
 		Zotero.getSystemInfo(function(info) {
-			var postBody = "id=" + encodeURIComponent(this.translator[0].translatorID) +
-						   "&lastUpdated=" + encodeURIComponent(this.translator[0].lastUpdated) +
+			var postBody = "id=" + encodeURIComponent(translator.translatorID) +
+						   "&lastUpdated=" + encodeURIComponent(translator.lastUpdated) +
 						   "&diagnostic=" + encodeURIComponent(info) +
 						   "&errorData=" + encodeURIComponent(errorString);
 			Zotero.HTTP.doPost("http://www.zotero.org/repo/report", postBody);

From 9b9c186b4c09584f9159c2cbcfc4d34a9d7d121f Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 23 Jan 2012 13:16:58 -0500
Subject: [PATCH 48/69] More accessDate debugging

---
 chrome/content/zotero/bindings/itembox.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index bce5330a68..9d862a7e0c 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -1260,21 +1260,30 @@
 						case 'dateSent':
 						case 'dateDue':
 						case 'accepted':
+							Zotero.debug('============');
+							Zotero.debug(fieldName);
+							Zotero.debug(valueText);
 							if (valueText) {
 								var date = Zotero.Date.sqlToDate(valueText, true);
+								Zotero.debug(date + '');
 								if (date) {
 									// If no time, interpret as local, not UTC
 									if (Zotero.Date.isSQLDate(valueText)) {
+										Zotero.debug('=');
 										date = Zotero.Date.sqlToDate(valueText);
+										Zotero.debug(date + '');
 										valueText = date.toLocaleDateString();
 									}
 									else {
+										Zotero.debug('-');
 										valueText = date.toLocaleString();
 									}
 								}
 								else {
 									valueText = '';
 								}
+								Zotero.debug('==');
+								Zotero.debug(valueText);
 							}
 							break;
 					}
@@ -1860,12 +1869,6 @@
 						
 						this._modifyField(fieldName, value, this.saveOnEdit);
 						
-						if (fieldName == 'accessDate') {
-							Zotero.debug('========');
-							Zotero.debug(value);
-							Zotero.debug(this.item.getField(fieldName));
-						}
-						
 						elem = this.createValueElement(
 							this.item.getField(fieldName),
 							fieldName,

From 6d9260934d06974f12f685057d16c20e78f8f1f0 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 23 Jan 2012 14:37:11 -0500
Subject: [PATCH 49/69] Remove accessDate debugging

---
 chrome/content/zotero/bindings/itembox.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/chrome/content/zotero/bindings/itembox.xml b/chrome/content/zotero/bindings/itembox.xml
index 9d862a7e0c..705d03f99c 100644
--- a/chrome/content/zotero/bindings/itembox.xml
+++ b/chrome/content/zotero/bindings/itembox.xml
@@ -1260,30 +1260,21 @@
 						case 'dateSent':
 						case 'dateDue':
 						case 'accepted':
-							Zotero.debug('============');
-							Zotero.debug(fieldName);
-							Zotero.debug(valueText);
 							if (valueText) {
 								var date = Zotero.Date.sqlToDate(valueText, true);
-								Zotero.debug(date + '');
 								if (date) {
 									// If no time, interpret as local, not UTC
 									if (Zotero.Date.isSQLDate(valueText)) {
-										Zotero.debug('=');
 										date = Zotero.Date.sqlToDate(valueText);
-										Zotero.debug(date + '');
 										valueText = date.toLocaleDateString();
 									}
 									else {
-										Zotero.debug('-');
 										valueText = date.toLocaleString();
 									}
 								}
 								else {
 									valueText = '';
 								}
-								Zotero.debug('==');
-								Zotero.debug(valueText);
 							}
 							break;
 					}

From 64fe2c3ac3904c14b685d13169c652080aa44d59 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 24 Jan 2012 02:28:32 -0500
Subject: [PATCH 50/69] Fix item.getAttachments() when
 sortAttachmentsChronologically is true

Caused a duplicate merging error, and possibly others
---
 chrome/content/zotero/xpcom/data/item.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
index e9029404c1..3094fcf2fa 100644
--- a/chrome/content/zotero/xpcom/data/item.js
+++ b/chrome/content/zotero/xpcom/data/item.js
@@ -3285,7 +3285,8 @@ Zotero.Item.prototype.getAttachments = function(includeTrashed) {
 		
 	if (Zotero.Prefs.get('sortAttachmentsChronologically')) {
 		sql +=  " ORDER BY dateAdded";
-		return Zotero.DB.columnQuery(sql, this.id);
+		var results = Zotero.DB.columnQuery(sql, this.id);
+		return results ? results : [];
 	}
 	
 	var attachments = Zotero.DB.query(sql, this.id);

From 1b2a8d38e6640384b6d68c95b85d51033dfc38da Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 24 Jan 2012 04:46:44 -0500
Subject: [PATCH 51/69] Fix getNotes() with sortNotesChronologically

---
 chrome/content/zotero/xpcom/data/item.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
index 3094fcf2fa..53d6d7de1b 100644
--- a/chrome/content/zotero/xpcom/data/item.js
+++ b/chrome/content/zotero/xpcom/data/item.js
@@ -2484,7 +2484,8 @@ Zotero.Item.prototype.getNotes = function(includeTrashed) {
 	
 	if (Zotero.Prefs.get('sortNotesChronologically')) {
 		sql += " ORDER BY dateAdded";
-		return Zotero.DB.columnQuery(sql, this.id);
+		var results = Zotero.DB.columnQuery(sql, this.id);
+		return results ? results : [];
 	}
 	
 	var notes = Zotero.DB.query(sql, this.id);

From c612058577d3275ae37a42140b2130e87614f65a Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 24 Jan 2012 18:42:55 -0500
Subject: [PATCH 52/69] Add csl-left-margin fix from 0ea6c6acf to client

---
 chrome/content/zotero/xpcom/cite.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js
index e343f0c7fd..eb2c2a35cf 100644
--- a/chrome/content/zotero/xpcom/cite.js
+++ b/chrome/content/zotero/xpcom/cite.js
@@ -319,6 +319,9 @@ Zotero.Cite.makeFormattedBibliography = function(cslEngine, format) {
 				}
 			}
 			
+			var leftMarginDivs = xml..div.(@class == "csl-left-margin");
+			var clearEntries = leftMarginDivs.length() > 0;
+			
 			// csl-entry
 			var divs = xml..div.(@class == "csl-entry");
 			var num = divs.length();
@@ -327,6 +330,10 @@ Zotero.Cite.makeFormattedBibliography = function(cslEngine, format) {
 				var first = i == 0;
 				var last = i == num - 1;
 				
+				if (clearEntries) {
+					div.@style += "clear: left; ";
+				}
+				
 				if(entrySpacing) {
 					if(!last) {
 						div.@style += "margin-bottom: " + entrySpacing + "em;";
@@ -341,7 +348,7 @@ Zotero.Cite.makeFormattedBibliography = function(cslEngine, format) {
 			var rightPadding = .5;
 			
 			// div.csl-left-margin
-			for each(var div in xml..div.(@class == "csl-left-margin")) {
+			for each(var div in leftMarginDivs) {
 				div.@style = "float: left; padding-right: " + rightPadding + "em;";
 				
 				// Right-align the labels if aligning second line, since it looks

From bd74c29bce2a000e7b771edb16737d5a6c2a6deb Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 25 Jan 2012 03:09:49 -0500
Subject: [PATCH 53/69] Fix buttons in Nightly

---
 .../content/zotero-platform/mac/overlay.css   | 159 +++++++++---------
 1 file changed, 77 insertions(+), 82 deletions(-)

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index 298a9216e9..0e64735272 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -112,25 +112,52 @@
 }
 
 #zotero-view-tabbox > tabs {
-  -moz-appearance: -moz-mac-unified-toolbar; 
-  padding: 2px;
+	-moz-appearance: toolbar; 
+	padding: 4px 0 4px 0;
+}
+
+#zotero-view-tabbox > tabs > tab > hbox {
+	padding: 0;
 }
 
 #zotero-view-tabbox > tabs > tab > hbox > .tab-icon {
 	display: none;
 }
 
+#zotero-view-tabbox > tabs > tab {
+	-moz-box-orient: vertical;
+	-moz-box-align: center;
+	-moz-appearance: toolbarbutton;
+	-moz-user-focus: none;
+	text-align: center;
+	margin: 0;
+	padding: 0 1px;
+	height: 22px;
+}
+
 #zotero-view-tabbox > tabs > tab > hbox .tab-text {
+	font: menu;
+	margin: 2px 6px 2px 7px !important;
+	text-shadow: 0 1px rgba(255, 255, 255, .4);
+}
+
+#zotero-view-tabbox > tabs > tab[selected=true] > hbox .tab-text {
+	color: #FFF !important;
+	text-shadow: rgba(0, 0, 0, 0.4) 0 1px;
+}
+
+/** RULES FOR FX 3.6 **/
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab > hbox .tab-text {
   text-shadow: rgba(255, 255, 255, 0.4) 0 1px !important;
   font-size: 11px;
   font-weight: bold;
 }
-#zotero-view-tabbox > tabs > tab:active:hover > hbox > .tab-text,
-#zotero-view-tabbox > tabs > tab[selected=true] > hbox > .tab-text {
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab:active:hover > hbox > .tab-text,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab[selected=true] > hbox > .tab-text {
   text-shadow: none !important;
 }
 
-#zotero-view-tabbox > tabs > tab {
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab {
   -moz-box-orient: vertical;
   -moz-box-align: center;
   -moz-appearance: none;
@@ -142,32 +169,21 @@
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle.png") 0 4 0 5 repeat stretch;
 }
 
-#zotero-view-tabbox > tabs > tab:active:hover {
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab:active:hover {
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-down.png") 0 4 0 5 repeat stretch;
   text-shadow: none !important;
 }
 
-#zotero-view-tabbox > tabs > tab[selected=true] {
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab[selected=true] {
   color: #FFF !important;
   text-shadow: rgba(0, 0, 0, 0.4) 0 1px;
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-selected.png") 0 4 0 5 repeat stretch;
 }
 
-#zotero-view-tabbox > tabs > tab[selected=true]:active:hover {
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab[selected=true]:active:hover {
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-selected-down.png") 0 4 0 5 repeat stretch;
 }
 
-#zotero-view-tabbox:-moz-window-inactive > tabs > * {
-  color: #7C7C7C !important;
-  -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-inactive.png") 0 4 0 5 repeat stretch;
-}
-
-#zotero-view-tabbox:-moz-window-inactive > tabs > tab[selected=true] {
-  color: #FFF !important;
-  -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-selected-inactive.png") 0 4 0 5 repeat stretch;
-}
-
-/* Since Fx < 4 doesn't recognize the -moz-window-inactive pseudoclass as valid, these have to be separate (duplicate) rules to be parsed */
 :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > * {
   color: #7C7C7C !important;
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-inactive.png") 0 4 0 5 repeat stretch;
@@ -178,58 +194,42 @@
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-middle-selected-inactive.png") 0 4 0 5 repeat stretch;
 }
 
-#zotero-view-tabbox > tabs > :first-child,
-#zotero-view-tabbox > tabs > [first-visible],
-#zotero-view-tabbox > tabs[chromedir=rtl] > :last-child,
-#zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] {
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > :first-child,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > [first-visible],
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > :last-child,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] {
   border-width: 0 4px 0 6px;
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left.png") 0 4 0 6 repeat stretch;
 }
 
-#zotero-view-tabbox > tabs > :first-child:active:hover,
-#zotero-view-tabbox > tabs > [first-visible]:active:hover,
-#zotero-view-tabbox > tabs[chromedir=rtl] > :last-child:active:hover,
-#zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible]:active:hover {
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > :first-child:active:hover,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > [first-visible]:active:hover,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > :last-child:active:hover,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible]:active:hover {
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-down.png") 0 4 0 6 repeat stretch;
 }
 
-#zotero-view-tabbox > tabs > tab:first-child[selected=true],
-#zotero-view-tabbox > tabs > tab[first-visible][selected=true],
-#zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true],
-#zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true] {
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab:first-child[selected=true],
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab[first-visible][selected=true],
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true],
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true] {
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-selected.png") 0 4 0 6 repeat stretch;
 }
 
-#zotero-view-tabbox > tabs > tab:first-child[selected=true]:active:hover,
-#zotero-view-tabbox > tabs > tab[first-visible][selected=true]:active:hover,
-#zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true]:active:hover,
-#zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true]:active:hover {
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab:first-child[selected=true]:active:hover,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab[first-visible][selected=true]:active:hover,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true]:active:hover,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[last-visible][selected=true]:active:hover {
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-selected-down.png") 0 4 0 6 repeat stretch;
 }
 
-#zotero-view-tabbox:-moz-window-inactive > tabs > :first-child,
-#zotero-view-tabbox:-moz-window-inactive > tabs > [first-visible],
-#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > :last-child,
-#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > [last-visible] {
-  -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-inactive.png") 0 4 0 6 repeat stretch;
-}
-
-/* Since Fx4 doesn't recognize the -moz-window-inactive pseudoclass as valid, these have to be separate (duplicate) rules to be parsed */
-
-:root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > :first-child,
-:root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > [first-visible],
-:root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > :last-child,
-:root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] {
+#zotero-pane:not([ignoreActiveAttribute]) :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > :first-child,
+#zotero-pane:not([ignoreActiveAttribute]) :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > [first-visible],
+#zotero-pane:not([ignoreActiveAttribute]) :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > :last-child,
+#zotero-pane:not([ignoreActiveAttribute]) :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > [last-visible] {
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-inactive.png") 0 4 0 6 repeat stretch;
 }  
 
-#zotero-view-tabbox:-moz-window-inactive > tabs > tab:first-child[selected=true],
-#zotero-view-tabbox:-moz-window-inactive > tabs > tab[first-visible][selected=true],
-#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > tab:last-child[selected=true],
-#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > tab[last-visible][selected=true] {
-  -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-selected-inactive.png") 0 4 0 6 repeat stretch;
-}
-
 :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab:first-child[selected=true],
 :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab[first-visible][selected=true],
 :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:last-child[selected=true],
@@ -237,46 +237,39 @@
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-left-selected-inactive.png") 0 4 0 6 repeat stretch;
 }
 
-#zotero-view-tabbox > tabs > :last-child,
-#zotero-view-tabbox > tabs > [last-visible],
-#zotero-view-tabbox > tabs[chromedir=rtl] > :first-child,
-#zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] {
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > :last-child,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > [last-visible],
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > :first-child,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] {
   border-width: 0 6px 0 5px;
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right.png") 0 6 0 5 repeat stretch;
 }
 
-#zotero-view-tabbox > tabs > :last-child:active:hover,
-#zotero-view-tabbox > tabs > [last-visible]:active:hover,
-#zotero-view-tabbox > tabs[chromedir=rtl] > :first-child:active:hover,
-#zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible]:active:hover {
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > :last-child:active:hover,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > [last-visible]:active:hover,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > :first-child:active:hover,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible]:active:hover {
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-down.png") 0 6 0 5 repeat stretch;
 }
 
-#zotero-view-tabbox > tabs > tab:last-child[selected=true],
-#zotero-view-tabbox > tabs > tab[last-visible][selected=true],
-#zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true],
-#zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true] {
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab:last-child[selected=true],
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab[last-visible][selected=true],
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true],
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true] {
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-selected.png") 0 6 0 5 repeat stretch;
 }
 
-#zotero-view-tabbox > tabs > tab:last-child[selected=true]:active:hover,
-#zotero-view-tabbox > tabs > tab[last-visible][selected=true]:active:hover,
-#zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true]:active:hover,
-#zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true]:active:hover {
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab:last-child[selected=true]:active:hover,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab[last-visible][selected=true]:active:hover,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true]:active:hover,
+#zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true]:active:hover {
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-selected-down.png") 0 6 0 5 repeat stretch;
 }
 
-#zotero-view-tabbox:-moz-window-inactive > tabs > :last-child,
-#zotero-view-tabbox:-moz-window-inactive > tabs > [last-visible],
-#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > :first-child,
-#zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > [first-visible] {
-  -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-inactive.png") 0 6 0 5 repeat stretch;
-}
-
-:root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > :last-child,
-:root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > [last-visible],
-:root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > :first-child,
-:root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] {
+#zotero-pane:not([ignoreActiveAttribute]) :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > :last-child,
+#zotero-pane:not([ignoreActiveAttribute]) :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > [last-visible],
+#zotero-pane:not([ignoreActiveAttribute]) :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > :first-child,
+#zotero-pane:not([ignoreActiveAttribute]) :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > [first-visible] {
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-inactive.png") 0 6 0 5 repeat stretch;
 }
 
@@ -286,12 +279,14 @@
 #zotero-view-tabbox:-moz-window-inactive > tabs[chromedir=rtl] > tab[first-visible][selected=true] {
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-selected-inactive.png") 0 6 0 5 repeat stretch;
 }
+
 :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab:last-child[selected=true],
 :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs > tab[last-visible][selected=true],
 :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab:first-child[selected=true],
 :root:not([active]) #zotero-pane:not([ignoreActiveAttribute]) #zotero-view-tabbox > tabs[chromedir=rtl] > tab[first-visible][selected=true] {
   -moz-border-image: url("chrome://zotero/skin/mac/viewbutton-right-selected-inactive.png") 0 6 0 5 repeat stretch;
 }
+/** END RULES FOR FX 3.6 **/
 
 #zotero-collections-tree {
 	-moz-appearance: none;

From ef1deb36910b84666261f7e508c9b7bb9757a37e Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 25 Jan 2012 03:18:17 -0500
Subject: [PATCH 54/69] Fix text position

---
 chrome/content/zotero-platform/mac/overlay.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index 0e64735272..858ed54dd5 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -137,10 +137,15 @@
 
 #zotero-view-tabbox > tabs > tab > hbox .tab-text {
 	font: menu;
-	margin: 2px 6px 2px 7px !important;
+	margin: 2px 6px 2px 8px !important;
 	text-shadow: 0 1px rgba(255, 255, 255, .4);
 }
 
+/* This seems to be necessary to center the tabs. Not sure why. */
+#zotero-view-tabbox > tabs > tab:last-of-type > hbox .tab-text {
+	margin: 2px 8px 2px 8px !important;
+}
+
 #zotero-view-tabbox > tabs > tab[selected=true] > hbox .tab-text {
 	color: #FFF !important;
 	text-shadow: rgba(0, 0, 0, 0.4) 0 1px;

From 93643b012ea49d62c04c1c2b4d43a4b2cff6e3af Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 25 Jan 2012 03:26:10 -0500
Subject: [PATCH 55/69] Return to 11px bold text

---
 chrome/content/zotero-platform/mac/overlay.css | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index 858ed54dd5..c12b49dab4 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -124,29 +124,29 @@
 	display: none;
 }
 
-#zotero-view-tabbox > tabs > tab {
+#zotero-pane[ignoreActiveAttribute] #zotero-view-tabbox > tabs > tab {
 	-moz-box-orient: vertical;
 	-moz-box-align: center;
 	-moz-appearance: toolbarbutton;
 	-moz-user-focus: none;
 	text-align: center;
 	margin: 0;
-	padding: 0 1px;
-	height: 22px;
+	padding: 1px 1px;
 }
 
-#zotero-view-tabbox > tabs > tab > hbox .tab-text {
-	font: menu;
-	margin: 2px 6px 2px 8px !important;
+#zotero-pane[ignoreActiveAttribute] #zotero-view-tabbox > tabs > tab > hbox .tab-text {
+	font-size: 11px;
+	font-weight: bold;
+	margin: 2px 4px 2px 6px !important;
 	text-shadow: 0 1px rgba(255, 255, 255, .4);
 }
 
 /* This seems to be necessary to center the tabs. Not sure why. */
-#zotero-view-tabbox > tabs > tab:last-of-type > hbox .tab-text {
-	margin: 2px 8px 2px 8px !important;
+#zotero-pane[ignoreActiveAttribute] #zotero-view-tabbox > tabs > tab:last-of-type > hbox .tab-text {
+	margin: 2px 6px 2px 6px !important;
 }
 
-#zotero-view-tabbox > tabs > tab[selected=true] > hbox .tab-text {
+#zotero-pane[ignoreActiveAttribute]#zotero-view-tabbox > tabs > tab[selected=true] > hbox .tab-text {
 	color: #FFF !important;
 	text-shadow: rgba(0, 0, 0, 0.4) 0 1px;
 }

From 26a49cf8b8a54dd1c5d70cf62cdadc2689382eda Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 25 Jan 2012 03:33:55 -0500
Subject: [PATCH 56/69] Slightly wider, fix highlight

---
 chrome/content/zotero-platform/mac/overlay.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index c12b49dab4..04c1724c42 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -137,16 +137,16 @@
 #zotero-pane[ignoreActiveAttribute] #zotero-view-tabbox > tabs > tab > hbox .tab-text {
 	font-size: 11px;
 	font-weight: bold;
-	margin: 2px 4px 2px 6px !important;
+	margin: 2px 6px 2px 8px !important;
 	text-shadow: 0 1px rgba(255, 255, 255, .4);
 }
 
 /* This seems to be necessary to center the tabs. Not sure why. */
 #zotero-pane[ignoreActiveAttribute] #zotero-view-tabbox > tabs > tab:last-of-type > hbox .tab-text {
-	margin: 2px 6px 2px 6px !important;
+	margin: 2px 8px 2px 8px !important;
 }
 
-#zotero-pane[ignoreActiveAttribute]#zotero-view-tabbox > tabs > tab[selected=true] > hbox .tab-text {
+#zotero-pane[ignoreActiveAttribute] #zotero-view-tabbox > tabs > tab[selected=true] > hbox .tab-text {
 	color: #FFF !important;
 	text-shadow: rgba(0, 0, 0, 0.4) 0 1px;
 }

From 5610f77943d4e4eaaa269c2f1b7019b2c71eccc0 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 25 Jan 2012 03:49:07 -0500
Subject: [PATCH 57/69] Flirt with styling the tab bar differently from the
 toolbar

---
 chrome/content/zotero-platform/mac/overlay.css | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index 04c1724c42..120e43931e 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -112,8 +112,11 @@
 }
 
 #zotero-view-tabbox > tabs {
-	-moz-appearance: toolbar; 
-	padding: 4px 0 4px 0;
+	background: -moz-linear-gradient(top, #f2f2f2, #cccccc);
+	border-style: solid;
+	border-width: 0 0 1px 0;
+	border-color: #5e5e5e;
+	padding: 2px 0 2px 0;
 }
 
 #zotero-view-tabbox > tabs > tab > hbox {

From fe59c353ad1538b5fc827e4b57ee72890aa461d5 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 25 Jan 2012 04:02:26 -0500
Subject: [PATCH 58/69] More playing around

---
 chrome/content/zotero-platform/mac/overlay.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index 120e43931e..a905e4ea3b 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -112,11 +112,11 @@
 }
 
 #zotero-view-tabbox > tabs {
-	background: -moz-linear-gradient(top, #f2f2f2, #cccccc);
+	background: -moz-linear-gradient(top, #ffffff, #e0e0e0);
 	border-style: solid;
 	border-width: 0 0 1px 0;
 	border-color: #5e5e5e;
-	padding: 2px 0 2px 0;
+	padding: 5px 0 4px 0;
 }
 
 #zotero-view-tabbox > tabs > tab > hbox {
@@ -134,7 +134,7 @@
 	-moz-user-focus: none;
 	text-align: center;
 	margin: 0;
-	padding: 1px 1px;
+	padding: 2px 1px;
 }
 
 #zotero-pane[ignoreActiveAttribute] #zotero-view-tabbox > tabs > tab > hbox .tab-text {

From a4afb67d9140f5ac195d8144e202500ad2fd13c6 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Wed, 25 Jan 2012 16:44:48 -0500
Subject: [PATCH 59/69] Point directly to 3.0 plugins page from preferences

Not sure why this is localized, though
---
 chrome/locale/af-ZA/zotero/preferences.dtd | 2 +-
 chrome/locale/ar/zotero/preferences.dtd    | 2 +-
 chrome/locale/bg-BG/zotero/preferences.dtd | 2 +-
 chrome/locale/ca-AD/zotero/preferences.dtd | 2 +-
 chrome/locale/cs-CZ/zotero/preferences.dtd | 2 +-
 chrome/locale/da-DK/zotero/preferences.dtd | 2 +-
 chrome/locale/de/zotero/preferences.dtd    | 2 +-
 chrome/locale/el-GR/zotero/preferences.dtd | 2 +-
 chrome/locale/en-US/zotero/preferences.dtd | 2 +-
 chrome/locale/es-ES/zotero/preferences.dtd | 2 +-
 chrome/locale/et-EE/zotero/preferences.dtd | 2 +-
 chrome/locale/eu-ES/zotero/preferences.dtd | 2 +-
 chrome/locale/fa/zotero/preferences.dtd    | 2 +-
 chrome/locale/fi-FI/zotero/preferences.dtd | 2 +-
 chrome/locale/fr-FR/zotero/preferences.dtd | 2 +-
 chrome/locale/gl-ES/zotero/preferences.dtd | 2 +-
 chrome/locale/he-IL/zotero/preferences.dtd | 2 +-
 chrome/locale/hr-HR/zotero/preferences.dtd | 2 +-
 chrome/locale/hu-HU/zotero/preferences.dtd | 2 +-
 chrome/locale/is-IS/zotero/preferences.dtd | 2 +-
 chrome/locale/it-IT/zotero/preferences.dtd | 2 +-
 chrome/locale/ja-JP/zotero/preferences.dtd | 2 +-
 chrome/locale/ko-KR/zotero/preferences.dtd | 2 +-
 chrome/locale/mn-MN/zotero/preferences.dtd | 2 +-
 chrome/locale/nb-NO/zotero/preferences.dtd | 2 +-
 chrome/locale/nl-NL/zotero/preferences.dtd | 2 +-
 chrome/locale/nn-NO/zotero/preferences.dtd | 2 +-
 chrome/locale/pl-PL/zotero/preferences.dtd | 2 +-
 chrome/locale/pt-BR/zotero/preferences.dtd | 2 +-
 chrome/locale/pt-PT/zotero/preferences.dtd | 2 +-
 chrome/locale/ro-RO/zotero/preferences.dtd | 2 +-
 chrome/locale/ru-RU/zotero/preferences.dtd | 2 +-
 chrome/locale/sk-SK/zotero/preferences.dtd | 2 +-
 chrome/locale/sl-SI/zotero/preferences.dtd | 2 +-
 chrome/locale/sr-RS/zotero/preferences.dtd | 2 +-
 chrome/locale/th-TH/zotero/preferences.dtd | 2 +-
 chrome/locale/tr-TR/zotero/preferences.dtd | 2 +-
 chrome/locale/vi-VN/zotero/preferences.dtd | 2 +-
 chrome/locale/zh-CN/zotero/preferences.dtd | 2 +-
 chrome/locale/zh-TW/zotero/preferences.dtd | 2 +-
 40 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/chrome/locale/af-ZA/zotero/preferences.dtd b/chrome/locale/af-ZA/zotero/preferences.dtd
index da8e171afc..d723fc2c1f 100644
--- a/chrome/locale/af-ZA/zotero/preferences.dtd
+++ b/chrome/locale/af-ZA/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/ar/zotero/preferences.dtd b/chrome/locale/ar/zotero/preferences.dtd
index aa18ce6a62..d16b2d305b 100644
--- a/chrome/locale/ar/zotero/preferences.dtd
+++ b/chrome/locale/ar/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!ENTITY zotero.preferences.cite.wordProcessors "معالجات النصوص">
 <!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "الوظائف الاضافية لمعالجات النصوص غير مثبته حالياً">
 <!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "أحصل على الوظائف الاضافية لمعالجات النصوص...">
-<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "مدير الانماط">
diff --git a/chrome/locale/bg-BG/zotero/preferences.dtd b/chrome/locale/bg-BG/zotero/preferences.dtd
index fdeda0c40d..14a62cbe7c 100644
--- a/chrome/locale/bg-BG/zotero/preferences.dtd
+++ b/chrome/locale/bg-BG/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/ca-AD/zotero/preferences.dtd b/chrome/locale/ca-AD/zotero/preferences.dtd
index d4ef86e60d..1ec8b4c599 100644
--- a/chrome/locale/ca-AD/zotero/preferences.dtd
+++ b/chrome/locale/ca-AD/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/cs-CZ/zotero/preferences.dtd b/chrome/locale/cs-CZ/zotero/preferences.dtd
index f1317751d2..98cea7516e 100644
--- a/chrome/locale/cs-CZ/zotero/preferences.dtd
+++ b/chrome/locale/cs-CZ/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/da-DK/zotero/preferences.dtd b/chrome/locale/da-DK/zotero/preferences.dtd
index f9dbfae883..05554688df 100644
--- a/chrome/locale/da-DK/zotero/preferences.dtd
+++ b/chrome/locale/da-DK/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/de/zotero/preferences.dtd b/chrome/locale/de/zotero/preferences.dtd
index fbfb5a4b5b..950829cf3c 100644
--- a/chrome/locale/de/zotero/preferences.dtd
+++ b/chrome/locale/de/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/el-GR/zotero/preferences.dtd b/chrome/locale/el-GR/zotero/preferences.dtd
index f9dbfae883..05554688df 100644
--- a/chrome/locale/el-GR/zotero/preferences.dtd
+++ b/chrome/locale/el-GR/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/en-US/zotero/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index c4ebd4b51f..e210de3999 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url	"http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager				"Style Manager">
diff --git a/chrome/locale/es-ES/zotero/preferences.dtd b/chrome/locale/es-ES/zotero/preferences.dtd
index a4a004d34a..b5f9cc6dd9 100644
--- a/chrome/locale/es-ES/zotero/preferences.dtd
+++ b/chrome/locale/es-ES/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/et-EE/zotero/preferences.dtd b/chrome/locale/et-EE/zotero/preferences.dtd
index 340be79339..09d9818e0b 100644
--- a/chrome/locale/et-EE/zotero/preferences.dtd
+++ b/chrome/locale/et-EE/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!ENTITY zotero.preferences.cite.wordProcessors "Tekstiredaktorid">
 <!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "Ühtegi tekstiredaktori lisa ei ole paigaldatud.">
 <!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "Lisade hankimine...">
-<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Stiilide haldamine">
diff --git a/chrome/locale/eu-ES/zotero/preferences.dtd b/chrome/locale/eu-ES/zotero/preferences.dtd
index 0e8da5ee8e..7e921c3445 100644
--- a/chrome/locale/eu-ES/zotero/preferences.dtd
+++ b/chrome/locale/eu-ES/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/fa/zotero/preferences.dtd b/chrome/locale/fa/zotero/preferences.dtd
index cc7345a883..8b7e641489 100644
--- a/chrome/locale/fa/zotero/preferences.dtd
+++ b/chrome/locale/fa/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!ENTITY zotero.preferences.cite.wordProcessors "واژه‌پردازها">
 <!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "هیچ افزونه‌ای برای ارتباط با واژه‌پردازها نصب نشده است.">
 <!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "دریافت افزونه واژه‌پرداز...">
-<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "مدیریت شیوه‌ها">
diff --git a/chrome/locale/fi-FI/zotero/preferences.dtd b/chrome/locale/fi-FI/zotero/preferences.dtd
index f9dbfae883..05554688df 100644
--- a/chrome/locale/fi-FI/zotero/preferences.dtd
+++ b/chrome/locale/fi-FI/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/fr-FR/zotero/preferences.dtd b/chrome/locale/fr-FR/zotero/preferences.dtd
index 0f7ff64149..dfcfcf4d4a 100644
--- a/chrome/locale/fr-FR/zotero/preferences.dtd
+++ b/chrome/locale/fr-FR/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!ENTITY zotero.preferences.cite.wordProcessors "Traitements de texte">
 <!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "Aucune extension pour traitement de texte n'est installée.">
 <!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "Obtenir des extensions pour traitement de texte…">
-<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Gestionnaire de styles">
diff --git a/chrome/locale/gl-ES/zotero/preferences.dtd b/chrome/locale/gl-ES/zotero/preferences.dtd
index e814f79709..d66374e5c1 100644
--- a/chrome/locale/gl-ES/zotero/preferences.dtd
+++ b/chrome/locale/gl-ES/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/he-IL/zotero/preferences.dtd b/chrome/locale/he-IL/zotero/preferences.dtd
index c1b6871d28..9d11205fbf 100644
--- a/chrome/locale/he-IL/zotero/preferences.dtd
+++ b/chrome/locale/he-IL/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/hr-HR/zotero/preferences.dtd b/chrome/locale/hr-HR/zotero/preferences.dtd
index f9dbfae883..05554688df 100644
--- a/chrome/locale/hr-HR/zotero/preferences.dtd
+++ b/chrome/locale/hr-HR/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/hu-HU/zotero/preferences.dtd b/chrome/locale/hu-HU/zotero/preferences.dtd
index 66bf97d2bb..c61b8081dd 100644
--- a/chrome/locale/hu-HU/zotero/preferences.dtd
+++ b/chrome/locale/hu-HU/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/is-IS/zotero/preferences.dtd b/chrome/locale/is-IS/zotero/preferences.dtd
index 9b6fcba696..aa38cfb219 100644
--- a/chrome/locale/is-IS/zotero/preferences.dtd
+++ b/chrome/locale/is-IS/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/it-IT/zotero/preferences.dtd b/chrome/locale/it-IT/zotero/preferences.dtd
index cb54882205..334bf0f338 100644
--- a/chrome/locale/it-IT/zotero/preferences.dtd
+++ b/chrome/locale/it-IT/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/ja-JP/zotero/preferences.dtd b/chrome/locale/ja-JP/zotero/preferences.dtd
index e197d2e3b9..ae7f79e118 100644
--- a/chrome/locale/ja-JP/zotero/preferences.dtd
+++ b/chrome/locale/ja-JP/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/ko-KR/zotero/preferences.dtd b/chrome/locale/ko-KR/zotero/preferences.dtd
index c70837619a..a9c47408cb 100644
--- a/chrome/locale/ko-KR/zotero/preferences.dtd
+++ b/chrome/locale/ko-KR/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/mn-MN/zotero/preferences.dtd b/chrome/locale/mn-MN/zotero/preferences.dtd
index c39f160e3a..cd8f6bb57f 100644
--- a/chrome/locale/mn-MN/zotero/preferences.dtd
+++ b/chrome/locale/mn-MN/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/nb-NO/zotero/preferences.dtd b/chrome/locale/nb-NO/zotero/preferences.dtd
index e9b5102c1a..f52d7a9b48 100644
--- a/chrome/locale/nb-NO/zotero/preferences.dtd
+++ b/chrome/locale/nb-NO/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/nl-NL/zotero/preferences.dtd b/chrome/locale/nl-NL/zotero/preferences.dtd
index ab67f2949b..0f16a0ac89 100644
--- a/chrome/locale/nl-NL/zotero/preferences.dtd
+++ b/chrome/locale/nl-NL/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/nn-NO/zotero/preferences.dtd b/chrome/locale/nn-NO/zotero/preferences.dtd
index 08e2605ba4..7d9e5953df 100644
--- a/chrome/locale/nn-NO/zotero/preferences.dtd
+++ b/chrome/locale/nn-NO/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/pl-PL/zotero/preferences.dtd b/chrome/locale/pl-PL/zotero/preferences.dtd
index 5c5f45fe17..1461016a24 100644
--- a/chrome/locale/pl-PL/zotero/preferences.dtd
+++ b/chrome/locale/pl-PL/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!ENTITY zotero.preferences.cite.wordProcessors "Procesory tekstu">
 <!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "Brak aktualnie zainstalowanych wtyczek procesorów tekstu.">
 <!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "Pobierz wtyczki procesorów tekstu...">
-<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Zarządzanie stylami">
diff --git a/chrome/locale/pt-BR/zotero/preferences.dtd b/chrome/locale/pt-BR/zotero/preferences.dtd
index 83e729d88e..938a98e621 100644
--- a/chrome/locale/pt-BR/zotero/preferences.dtd
+++ b/chrome/locale/pt-BR/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/pt-PT/zotero/preferences.dtd b/chrome/locale/pt-PT/zotero/preferences.dtd
index 8372a0d4e4..4f78565506 100644
--- a/chrome/locale/pt-PT/zotero/preferences.dtd
+++ b/chrome/locale/pt-PT/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/ro-RO/zotero/preferences.dtd b/chrome/locale/ro-RO/zotero/preferences.dtd
index 6e348c4bf1..142ad3d0d2 100644
--- a/chrome/locale/ro-RO/zotero/preferences.dtd
+++ b/chrome/locale/ro-RO/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!ENTITY zotero.preferences.cite.wordProcessors "Procesoare de text">
 <!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "Niciu plug-in pentru procesorul de text nu este instalat în acest moment.">
 <!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "Obține plug-in-urile pentru procesorul de text...">
-<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Manager de stiluri">
diff --git a/chrome/locale/ru-RU/zotero/preferences.dtd b/chrome/locale/ru-RU/zotero/preferences.dtd
index c4f369ca54..10803f2fbb 100644
--- a/chrome/locale/ru-RU/zotero/preferences.dtd
+++ b/chrome/locale/ru-RU/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!ENTITY zotero.preferences.cite.wordProcessors "Текстовые редакторы">
 <!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "Плагины для текстовых редакторов не установлены.">
 <!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "Скачать плагины для текстовых редакторов…">
-<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Диспетчер стилей">
diff --git a/chrome/locale/sk-SK/zotero/preferences.dtd b/chrome/locale/sk-SK/zotero/preferences.dtd
index 4de88e2261..b7c479516e 100644
--- a/chrome/locale/sk-SK/zotero/preferences.dtd
+++ b/chrome/locale/sk-SK/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/sl-SI/zotero/preferences.dtd b/chrome/locale/sl-SI/zotero/preferences.dtd
index 7ac93674c6..872cd6ffce 100644
--- a/chrome/locale/sl-SI/zotero/preferences.dtd
+++ b/chrome/locale/sl-SI/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/sr-RS/zotero/preferences.dtd b/chrome/locale/sr-RS/zotero/preferences.dtd
index 93eb8b23c2..7b3a0af0c7 100644
--- a/chrome/locale/sr-RS/zotero/preferences.dtd
+++ b/chrome/locale/sr-RS/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/th-TH/zotero/preferences.dtd b/chrome/locale/th-TH/zotero/preferences.dtd
index 471674494d..cae8b0633b 100644
--- a/chrome/locale/th-TH/zotero/preferences.dtd
+++ b/chrome/locale/th-TH/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/tr-TR/zotero/preferences.dtd b/chrome/locale/tr-TR/zotero/preferences.dtd
index d737899f2a..04a19cf609 100644
--- a/chrome/locale/tr-TR/zotero/preferences.dtd
+++ b/chrome/locale/tr-TR/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/vi-VN/zotero/preferences.dtd b/chrome/locale/vi-VN/zotero/preferences.dtd
index 6ea715d705..38ddcde36f 100644
--- a/chrome/locale/vi-VN/zotero/preferences.dtd
+++ b/chrome/locale/vi-VN/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/zh-CN/zotero/preferences.dtd b/chrome/locale/zh-CN/zotero/preferences.dtd
index ee834f9737..8297981524 100644
--- a/chrome/locale/zh-CN/zotero/preferences.dtd
+++ b/chrome/locale/zh-CN/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">
diff --git a/chrome/locale/zh-TW/zotero/preferences.dtd b/chrome/locale/zh-TW/zotero/preferences.dtd
index 7a13f055a1..a6aee961cb 100644
--- a/chrome/locale/zh-TW/zotero/preferences.dtd
+++ b/chrome/locale/zh-TW/zotero/preferences.dtd
@@ -106,7 +106,7 @@
 <!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.cite.wordProcessors.getPlugins.url "http://www.zotero.org/support/word_processor_plugin_installation">
+<!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.styles.styleManager "Style Manager">

From 163fd52efda394940b0dd50ede71a9d1c2923410 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 25 Jan 2012 17:42:28 -0500
Subject: [PATCH 60/69] Revert to last iteration

---
 chrome/content/zotero-platform/mac/overlay.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index a905e4ea3b..a6682b49f3 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -112,11 +112,12 @@
 }
 
 #zotero-view-tabbox > tabs {
-	background: -moz-linear-gradient(top, #ffffff, #e0e0e0);
+	-moz-appearance: none;
+	background: -moz-linear-gradient(top, #ededed, #cccccc);
 	border-style: solid;
 	border-width: 0 0 1px 0;
 	border-color: #5e5e5e;
-	padding: 5px 0 4px 0;
+	padding: 2px 0 2px 0;
 }
 
 #zotero-view-tabbox > tabs > tab > hbox {

From 0f71d2456e4e726f18c783a5b6be83e2bd04fb41 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 25 Jan 2012 18:11:38 -0500
Subject: [PATCH 61/69] Small tweak for Fx 3.6

---
 chrome/content/zotero-platform/mac/overlay.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index a6682b49f3..e4a8ac7034 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -171,7 +171,7 @@
   -moz-box-align: center;
   -moz-appearance: none;
   margin: 0;
-  padding: 3px 0 0;
+  padding: 3px 0 1px;
   background-color: transparent;
   border: solid transparent;
   border-width: 0 4px 0 5px;

From 0a66ad3c69663479867b9c068e8bd87357b1b629 Mon Sep 17 00:00:00 2001
From: Frank <biercenator@gmail.com>
Date: Wed, 25 Jan 2012 16:04:54 +0800
Subject: [PATCH 62/69] Ugrade citeproc-js to version 1.0.268

---
 chrome/content/zotero/xpcom/citeproc.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js
index d0f20516cf..7cdc4037e2 100644
--- a/chrome/content/zotero/xpcom/citeproc.js
+++ b/chrome/content/zotero/xpcom/citeproc.js
@@ -1989,7 +1989,7 @@ CSL.DateParser = function () {
 };
 CSL.Engine = function (sys, style, lang, forceLang) {
     var attrs, langspec, localexml, locale;
-    this.processor_version = "1.0.267";
+    this.processor_version = "1.0.268";
     this.csl_version = "1.0";
     this.sys = sys;
     this.sys.xml = new CSL.System.Xml.Parsing();
@@ -11145,8 +11145,8 @@ CSL.Registry.NameReg = function (state) {
         if ("undefined" === typeof this.namereg[pkey] || "undefined" === typeof this.namereg[pkey].ikey[ikey]) {
             return param;
         }
-        if (gdropt_orig === "by-cite" && param < request_base) {
-            param = request_base;
+        if (gdropt_orig === "by-cite" && param <= request_base) {
+            return request_base;
         }
         if (!dagopt) {
             return param;

From bf10b7192bfa082312db24f1ea19d5e06ab22bbb Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 25 Jan 2012 19:16:06 -0500
Subject: [PATCH 63/69] Set pane padding to 0 on Linux

---
 chrome/content/zotero-platform/mac/overlay.css | 5 -----
 chrome/content/zotero-platform/win/overlay.css | 4 ----
 chrome/skin/default/zotero/overlay.css         | 1 -
 3 files changed, 10 deletions(-)

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index e4a8ac7034..edd1b3c986 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -1,8 +1,3 @@
-#zotero-pane
-{
-	padding: 0 !important;
-}
-
 #zotero-splitter
 {
 	border-top: none;
diff --git a/chrome/content/zotero-platform/win/overlay.css b/chrome/content/zotero-platform/win/overlay.css
index 2373ef4528..a2c5df7e60 100644
--- a/chrome/content/zotero-platform/win/overlay.css
+++ b/chrome/content/zotero-platform/win/overlay.css
@@ -48,10 +48,6 @@
 	padding-right: .7em;
 }
 
-#zotero-pane {
-	padding: 0;
-}
-
 #zotero-toolbar {
 	-moz-appearance: none !important;
 	background-image: -moz-linear-gradient(rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0));
diff --git a/chrome/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index 0e87369f23..2aec8622e1 100644
--- a/chrome/skin/default/zotero/overlay.css
+++ b/chrome/skin/default/zotero/overlay.css
@@ -28,7 +28,6 @@
 #zotero-pane
 {
 	min-height: 32px; /* must match value in ZoteroPane.updateTagSelectorSize() */
-	padding: 0 7px 4px;
 	overflow: hidden;
 }
 

From 5a09ea6bc46c86a9baaebf878e84681dab7346ae Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Wed, 25 Jan 2012 19:42:31 -0500
Subject: [PATCH 64/69] Fix Edit Bibliography

---
 chrome/content/zotero/xpcom/integration.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index 17f7ff38ab..03e6160dac 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -732,7 +732,7 @@ Zotero.Integration.Document.prototype.editBibliography = function(callback) {
 			}
 			
 			fieldGetter.updateSession(function() {
-				me._session.editBibliography(this._doc, function() {
+				me._session.editBibliography(me._doc, function() {
 					me._doc.activate();
 					fieldGetter.updateDocument(FORCE_CITATIONS_FALSE, true, false, function() {
 						Zotero.Integration.complete(me._doc);

From 516189aeaf189a93457edd1e1711b6618427e0f7 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Thu, 26 Jan 2012 00:31:35 -0500
Subject: [PATCH 65/69] Map blogPost to post-weblog and forumPost to post in
 CSL

---
 chrome/content/zotero/xpcom/utilities.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js
index 23740fc06b..7bbe74ffd5 100644
--- a/chrome/content/zotero/xpcom/utilities.js
+++ b/chrome/content/zotero/xpcom/utilities.js
@@ -115,9 +115,9 @@ const CSL_TYPE_MAPPINGS = {
 	'statute':"bill",				// ??
 	'email':"personal_communication",
 	'map':"map",
-	'blogPost':"webpage",
+	'blogPost':"post-weblog",
 	'instantMessage':"personal_communication",
-	'forumPost':"webpage",
+	'forumPost':"post",
 	'audioRecording':"song",		// ??
 	'presentation':"speech",
 	'videoRecording':"motion_picture",

From 540abc70da357ef4d1b7ed4293d2cbc74f6e3e18 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Thu, 26 Jan 2012 02:37:11 -0500
Subject: [PATCH 66/69] Add a little more spacing

---
 chrome/content/zotero-platform/mac/overlay.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index edd1b3c986..b449bf6d55 100644
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@@ -130,19 +130,19 @@
 	-moz-user-focus: none;
 	text-align: center;
 	margin: 0;
-	padding: 2px 1px;
+	padding: 3px 1px 3px 1px;
 }
 
 #zotero-pane[ignoreActiveAttribute] #zotero-view-tabbox > tabs > tab > hbox .tab-text {
 	font-size: 11px;
 	font-weight: bold;
-	margin: 2px 6px 2px 8px !important;
+	margin: 2px 7px 2px 9px !important;
 	text-shadow: 0 1px rgba(255, 255, 255, .4);
 }
 
 /* This seems to be necessary to center the tabs. Not sure why. */
 #zotero-pane[ignoreActiveAttribute] #zotero-view-tabbox > tabs > tab:last-of-type > hbox .tab-text {
-	margin: 2px 8px 2px 8px !important;
+	margin: 2px 9px 2px 9px !important;
 }
 
 #zotero-pane[ignoreActiveAttribute] #zotero-view-tabbox > tabs > tab[selected=true] > hbox .tab-text {

From d3ddc03dc6d6f131247243690743b9465618f87e Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Thu, 26 Jan 2012 23:44:21 -0500
Subject: [PATCH 67/69] Remove dbLockExclusive hidden preference

---
 chrome/content/zotero/xpcom/db.js | 14 ++++++++------
 defaults/preferences/zotero.js    |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/chrome/content/zotero/xpcom/db.js b/chrome/content/zotero/xpcom/db.js
index 127f38051f..5a1775dc91 100644
--- a/chrome/content/zotero/xpcom/db.js
+++ b/chrome/content/zotero/xpcom/db.js
@@ -23,6 +23,11 @@
     ***** END LICENSE BLOCK *****
 */
 
+// Exclusive locking mode (default) prevents access to Zotero database while Firefox is open.
+// Normal mode is more convenient for development, but risks database corruption, particularly if
+// the same database is accessed simultaneously by multiple Zotero instances.
+const DB_LOCK_EXCLUSIVE = true;
+
 Zotero.DBConnection = function(dbName) {
 	if (!dbName) {
 		throw ('DB name not provided in Zotero.DBConnection()');
@@ -869,10 +874,9 @@ Zotero.DBConnection.prototype.backupDatabase = function (suffix) {
 	
 	// Turn off DB locking before backup and reenable after, since otherwise
 	// the lock is lost
-	var dbLockExclusive = Zotero.Prefs.get('dbLockExclusive');
 	var hadDummyStatement = !!this._dummyStatement;
 	try {
-		if (dbLockExclusive) {
+		if (DB_LOCK_EXCLUSIVE) {
 			this.query("PRAGMA locking_mode=NORMAL");
 		}
 		if (hadDummyStatement) {
@@ -889,7 +893,7 @@ Zotero.DBConnection.prototype.backupDatabase = function (suffix) {
 		return false;
 	}
 	finally {
-		if (dbLockExclusive) {
+		if (DB_LOCK_EXCLUSIVE) {
 			this.query("PRAGMA locking_mode=EXCLUSIVE");
 		}
 		if (hadDummyStatement) {
@@ -1183,9 +1187,7 @@ Zotero.DBConnection.prototype._getDBConnection = function () {
 		throw (e);
 	}
 	
-	// Exclusive locking mode (default) prevents access to Zotero database
-	// while Firefox is open -- normal mode is more convenient for development
-	if (Zotero.Prefs.get('dbLockExclusive')) {
+	if (DB_LOCK_EXCLUSIVE) {
 		Zotero.DB.query("PRAGMA locking_mode=EXCLUSIVE");
 	}
 	else {
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index 9efcf87b91..df398ed043 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -9,7 +9,6 @@ pref("extensions.zotero@chnm.gmu.edu.description", "chrome://zotero/locale/zoter
 pref("extensions.zotero.useDataDir", false);
 pref("extensions.zotero.dataDir", '');
 pref("extensions.zotero.lastDataDir", '');
-pref("extensions.zotero.dbLockExclusive", true);
 pref("extensions.zotero.debug.log",false);
 pref("extensions.zotero.debug.stackTrace", false);
 pref("extensions.zotero.debug.store",false);

From a0d747285966ab29e6f3d346fad2bdbe204186b1 Mon Sep 17 00:00:00 2001
From: Simon Kornblith <simon@simonster.com>
Date: Fri, 27 Jan 2012 00:02:20 -0500
Subject: [PATCH 68/69] Don't spin a nested event loop on most startups

---
 chrome/content/zotero/xpcom/schema.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
index 2d8b4dc755..7686271a45 100644
--- a/chrome/content/zotero/xpcom/schema.js
+++ b/chrome/content/zotero/xpcom/schema.js
@@ -131,9 +131,8 @@ Zotero.Schema = new function(){
 			// If upgrading userdata, make backup of database first
 			if (dbVersion < schemaVersion){
 				Zotero.DB.backupDatabase(dbVersion);
-			}
-			
-			Zotero.wait(1000);
+				Zotero.wait(1000);
+			}			
 			
 			Zotero.DB.beginTransaction();
 			
@@ -159,14 +158,14 @@ Zotero.Schema = new function(){
 				if (Zotero.DB.tableExists('customItemTypes')) {
 					this.updateCustomTables(up2);
 				}
-				Zotero.wait();
+				if(up2) Zotero.wait();
 				var up1 = _migrateUserDataSchema(dbVersion);
 				var up3 = _updateSchema('triggers');
 				// Update custom tables again in case custom fields were changed during user data migration
 				if (up1) {
 					this.updateCustomTables();
 				}
-				Zotero.wait();
+				if(up1) Zotero.wait();
 				
 				Zotero.DB.commitTransaction();
 			}

From 9cc26951dc20070e047adbf2d4c761305c4457d5 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Fri, 27 Jan 2012 00:15:50 -0500
Subject: [PATCH 69/69] Add additional test to db integrity check

---
 chrome/content/zotero/xpcom/schema.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
index 7686271a45..f2aca18927 100644
--- a/chrome/content/zotero/xpcom/schema.js
+++ b/chrome/content/zotero/xpcom/schema.js
@@ -1101,7 +1101,9 @@ Zotero.Schema = new function(){
 			//"SELECT COUNT(*) FROM syncDeleteLog WHERE libraryID != 0 AND libraryID NOT IN (SELECT libraryID FROM libraries)"
 			"SELECT COUNT(*) FROM syncDeleteLog WHERE libraryID != 0 AND libraryID NOT IN (SELECT libraryID FROM groups)",
 			
-			"SELECT COUNT(*) FROM creatorData WHERE firstName='' AND lastName=''"
+			"SELECT COUNT(*) FROM creatorData WHERE firstName='' AND lastName=''",
+			
+			"SELECT COUNT(*) FROM itemAttachments JOIN items USING (itemID) WHERE itemTypeID != 14"
 		];
 		
 		for each(var sql in queries) {