diff --git a/chrome/content/zotero-platform/mac/overlay.css b/chrome/content/zotero-platform/mac/overlay.css
index 298a9216e9..b449bf6d55 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;
@@ -112,62 +107,87 @@
 }
 
 #zotero-view-tabbox > tabs {
-  -moz-appearance: -moz-mac-unified-toolbar; 
-  padding: 2px;
+	-moz-appearance: none;
+	background: -moz-linear-gradient(top, #ededed, #cccccc);
+	border-style: solid;
+	border-width: 0 0 1px 0;
+	border-color: #5e5e5e;
+	padding: 2px 0 2px 0;
+}
+
+#zotero-view-tabbox > tabs > tab > hbox {
+	padding: 0;
 }
 
 #zotero-view-tabbox > tabs > tab > hbox > .tab-icon {
 	display: none;
 }
 
-#zotero-view-tabbox > tabs > tab > hbox .tab-text {
+#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: 3px 1px 3px 1px;
+}
+
+#zotero-pane[ignoreActiveAttribute] #zotero-view-tabbox > tabs > tab > hbox .tab-text {
+	font-size: 11px;
+	font-weight: bold;
+	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 9px 2px 9px !important;
+}
+
+#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;
+}
+
+/** 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;
   margin: 0;
-  padding: 3px 0 0;
+  padding: 3px 0 1px;
   background-color: transparent;
   border: solid transparent;
   border-width: 0 4px 0 5px;
   -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 +198,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 +241,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 +283,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;
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;
 }
 
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;
 }
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/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/integration/quickFormat.js b/chrome/content/zotero/integration/quickFormat.js
index 732c51e732..1491ac0bbb 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, 
@@ -48,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");
@@ -742,10 +745,18 @@ var Zotero_QuickFormat = new function () {
 			
 			if(!panelFrameHeight) {
 				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-1);
+				numReferences*referenceHeight+numSeparators*separatorHeight+panelFrameHeight);
 			if(!panelShowing) _openReferencePanel();
 		} else if(panelShowing) {
 			referencePanel.hidePopup();
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;
+    }
+  }
+}
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/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/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>
diff --git a/chrome/content/zotero/tools/testTranslators/translatorTester.js b/chrome/content/zotero/tools/testTranslators/translatorTester.js
index cb4d800f35..5bb871fbdb 100644
--- a/chrome/content/zotero/tools/testTranslators/translatorTester.js
+++ b/chrome/content/zotero/tools/testTranslators/translatorTester.js
@@ -54,16 +54,14 @@ 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 = /,'');
-		// 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) {
-			Zotero.logError(e);
+			Zotero.logError(e+" parsing tests for "+translator.label);
+			return;
 		}
 		
 		for(var i=0, n=testObject.length; i<n; i++) {
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)
diff --git a/chrome/content/zotero/xpcom/cite.js b/chrome/content/zotero/xpcom/cite.js
index c7d6b811df..eb2c2a35cf 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;
@@ -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
diff --git a/chrome/content/zotero/xpcom/citeproc.js b/chrome/content/zotero/xpcom/citeproc.js
index 1f16bcba4a..7cdc4037e2 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,12 +126,11 @@ 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: [".", "!", "?", ":",","],
     TERMINAL_PUNCTUATION: [":", ".", ";", "!", "?", " "],
-    SPLICE_PUNCTUATION: [".", "!", "?", ":", ";", ","],
     NONE: 0,
     NUMERIC: 1,
     POSITION: 2,
@@ -1980,7 +1989,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.268";
     this.csl_version = "1.0";
     this.sys = sys;
     this.sys.xml = new CSL.System.Xml.Parsing();
@@ -2537,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'],
@@ -2611,6 +2621,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;
 };
@@ -3721,6 +3732,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);
             }
@@ -6936,6 +6949,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");
@@ -6947,8 +6961,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";
@@ -7363,6 +7380,42 @@ 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")
+                                       && 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];
+                                                    var plural = false;
+                                                    if (splt[i].match(/(?:&|, | and )/)) {
+                                                        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*/, ""));
+                                                }
+                                                if (parsed) {
+                                                    value = lst.join(" ");
+                                                }
+                                            }
+                                        }
+                                    }
+                                    state.output.append(value, this);
+                                }
+                            };
                         } else {
                             func = function (state, Item) {
                                 var value;
@@ -8346,7 +8399,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) {
@@ -10100,7 +10153,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();
@@ -10112,14 +10164,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]];
@@ -11082,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;
@@ -11382,6 +11445,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 {
@@ -11398,19 +11462,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;
@@ -11437,7 +11504,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;
@@ -11478,19 +11545,23 @@ CSL.Disambiguation.prototype.incrementDisambig = function () {
                     }
                 } else {
                     maxed = true;
+                    this.base = CSL.cloneAmbigConfig(this.betterbase);
                     if (this.modeindex < this.modes.length - 1) {
                         this.modeindex += 1;
                     }
                 }
             }
+        } 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;
 };
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/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;
 			};
diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
index a3709ae2d6..f87edff5c7 100644
--- a/chrome/content/zotero/xpcom/data/item.js
+++ b/chrome/content/zotero/xpcom/data/item.js
@@ -2552,7 +2552,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);
@@ -3391,7 +3392,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);
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/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, '');
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);
diff --git a/chrome/content/zotero/xpcom/schema.js b/chrome/content/zotero/xpcom/schema.js
index 8b6593fdeb..1e2d987e37 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();
 			}
@@ -531,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':
@@ -549,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)) {
@@ -1090,7 +1102,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) {
diff --git a/chrome/content/zotero/xpcom/storage/webdav.js b/chrome/content/zotero/xpcom/storage/webdav.js
index 2d91fcd0ff..abc498859b 100644
--- a/chrome/content/zotero/xpcom/storage/webdav.js
+++ b/chrome/content/zotero/xpcom/storage/webdav.js
@@ -613,14 +613,33 @@ Zotero.Sync.Storage.Module.WebDAV = (function () {
 					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'),
+						dialogButtonText: buttonText,
 						dialogButtonCallback: function () {
 							var zp = Zotero.getActiveZoteroPane();
 							zp.loadURI(channel.URI.spec, { shiftKey: true });
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;
 	}
diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js
index 41a87ce9ef..95f0ebd0a6 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);
 			};
 			
@@ -1205,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);
@@ -1506,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);
@@ -1598,7 +1604,8 @@ 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 configOptions = this._sandboxManager.sandbox.ZOTERO_TRANSLATOR_INFO.configOptions;
+	var dataMode = configOptions ? configOptions["dataMode"] : "";
 	
 	var me = this;
 	var initCallback = function(status, err) {
diff --git a/chrome/content/zotero/xpcom/utilities.js b/chrome/content/zotero/xpcom/utilities.js
index e65d1881ba..7bbe74ffd5 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"
@@ -116,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",
@@ -1417,5 +1416,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/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
index a4994b072e..681281c037 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"
 };
 
 /*
@@ -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();
 		}
diff --git a/chrome/content/zotero/zoteroPane.js b/chrome/content/zotero/zoteroPane.js
index bb4086d97e..b5466dba42 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);
@@ -2669,14 +2676,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);
 				}
@@ -3191,6 +3191,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) {
@@ -3393,22 +3395,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 {
@@ -3449,6 +3436,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) {
@@ -3461,27 +3558,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 {
@@ -3532,14 +3617,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/content/zotero/zoteroPane.xul b/chrome/content/zotero/zoteroPane.xul
index 019a376197..f81404991d 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>
diff --git a/chrome/locale/af-ZA/zotero/preferences.dtd b/chrome/locale/af-ZA/zotero/preferences.dtd
index 69f7573a1c..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">
@@ -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 4c586ce0dd..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/ar/zotero/preferences.dtd
index f27cd6ddb9..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 "مدير الانماط">
@@ -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 2010a6679c..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/bg-BG/zotero/preferences.dtd
index ee89a6ede6..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">
@@ -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 dde322312c..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 акаунт за допълнителни опции за съхранение.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/ca-AD/zotero/preferences.dtd
index 6cb3df28ea..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">
@@ -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 54cd304ec4..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/cs-CZ/zotero/preferences.dtd
index 3291a7b685..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">
@@ -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 db030b0a4d..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/da-DK/zotero/preferences.dtd
index 7703840b1f..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">
@@ -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 1213e6c26c..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/de/zotero/preferences.dtd
index 2e061f1e40..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">
@@ -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 af508cf987..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/el-GR/zotero/preferences.dtd
index 7703840b1f..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">
@@ -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 4c586ce0dd..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/en-US/zotero/preferences.dtd
index 081128af4e..974f3b4ac5 100644
--- a/chrome/locale/en-US/zotero/preferences.dtd
+++ b/chrome/locale/en-US/zotero/preferences.dtd
@@ -110,7 +110,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/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index abe84e4c11..052f6012bb 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.
@@ -396,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"
@@ -683,9 +684,10 @@ 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
 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.
@@ -755,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/preferences.dtd b/chrome/locale/es-ES/zotero/preferences.dtd
index ae21411295..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">
@@ -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 389c66decd..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/et-EE/zotero/preferences.dtd
index 64dcbba498..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">
@@ -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 7faca51ef9..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/eu-ES/zotero/preferences.dtd
index 64296054d9..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">
@@ -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 a8b6514037..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"
@@ -681,9 +684,10 @@ 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.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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/fa/zotero/preferences.dtd
index fe1d97f401..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 "مدیریت شیوه‌ها">
@@ -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 11817a1b48..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  را برای گزینه‌های ذخیره بیشتر ببینید.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/fi-FI/zotero/preferences.dtd
index 7703840b1f..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">
@@ -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 3c2e8b8586..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/fr-FR/zotero/preferences.dtd
index ac1220730d..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">
@@ -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 327b8952ad..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/gl-ES/zotero/preferences.dtd
index c143bc5423..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">
@@ -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 2e26ea22e7..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/he-IL/zotero/preferences.dtd
index ce671ed10b..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">
@@ -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 8ba65b93c0..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/hr-HR/zotero/preferences.dtd
index 7703840b1f..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">
@@ -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 4c586ce0dd..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/hu-HU/zotero/preferences.dtd
index e6092bf773..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">
@@ -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 fc2f67569d..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/is-IS/zotero/preferences.dtd
index 0adbe2cc3b..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">
@@ -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 051ccef57b..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/it-IT/zotero/preferences.dtd
index cc249f6505..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">
@@ -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 6636357c5e..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/ja-JP/zotero/preferences.dtd
index aab1165710..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">
@@ -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 61e7e1f856..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/ko-KR/zotero/preferences.dtd
index ecf77bae67..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">
@@ -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 c72f41a02c..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 계정 설정을 표시합니다.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/mn-MN/zotero/preferences.dtd
index 5ea07d23b1..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">
@@ -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 b96143a3fe..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/nb-NO/zotero/preferences.dtd
index c088e15de4..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">
@@ -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 88d597532b..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/nl-NL/zotero/preferences.dtd
index 3b2ba001c6..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">
@@ -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 4e577dd2cf..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/nn-NO/zotero/preferences.dtd
index 7915fdc3e5..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">
@@ -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 f07c93c8b1..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"
@@ -681,9 +684,10 @@ 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.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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/pl-PL/zotero/preferences.dtd
index 56f3e690d1..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">
@@ -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 1da8a20920..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/pt-BR/zotero/preferences.dtd
index 20e77f4d33..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">
@@ -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 fb7775ae8d..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/pt-PT/zotero/preferences.dtd
index 724b70cb86..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">
@@ -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 a356ac816a..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/ro-RO/zotero/preferences.dtd
index 8cc6abe652..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">
@@ -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 0dd614daf4..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/ru-RU/zotero/preferences.dtd
index 5a904a1bc1..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 "Диспетчер стилей">
@@ -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 8b5a7e6dbc..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 для дополнительных возможностей хранения.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/sk-SK/zotero/preferences.dtd
index 83775e22f2..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">
@@ -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 0ec03b82d4..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/sl-SI/zotero/preferences.dtd
index a4ad6ced29..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">
@@ -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 b972b5bb37..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/sr-RS/zotero/preferences.dtd
index 0a67c2a1cd..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">
@@ -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 3e131e107d..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/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 d7f0f64797..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/th-TH/zotero/preferences.dtd
index 34a3cd60db..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">
@@ -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 76d335503b..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/tr-TR/zotero/preferences.dtd
index b9d09acb70..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">
@@ -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 a1592ed1f2..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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/vi-VN/zotero/preferences.dtd
index 1cf5dd94c6..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">
@@ -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 9dee9895e8..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/zh-CN/zotero/preferences.dtd
index 8120344bb9..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">
@@ -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 45c7051365..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"
@@ -681,9 +684,10 @@ 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
 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.
@@ -753,5 +757,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/preferences.dtd b/chrome/locale/zh-TW/zotero/preferences.dtd
index 658c03047f..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">
@@ -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 637f1c64e3..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 的帳號設定有更多的儲存選項。
@@ -753,5 +757,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/skin/default/zotero/overlay.css b/chrome/skin/default/zotero/overlay.css
index d3c82d1712..a838f85dc2 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;
 }
 
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index 18e7094cce..ba6b88f0e4 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);
@@ -163,4 +162,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", "");
diff --git a/styles b/styles
index 0787639b67..a322796a08 160000
--- a/styles
+++ b/styles
@@ -1 +1 @@
-Subproject commit 0787639b6770543c79d6cc7d7af16322f4e2a825
+Subproject commit a322796a088e261718bc7d88e16a338be4143545
diff --git a/translators b/translators
index 004b0b5ddd..6dfbb188e4 160000
--- a/translators
+++ b/translators
@@ -1 +1 @@
-Subproject commit 004b0b5dddec7e4feb6742cad845d6e3cbd709f6
+Subproject commit 6dfbb188e417b0a54f1028e2a7b233483b915204