Merge branch '4.0'

Conflicts: chrome/content/zotero/xpcom/collectionTreeView.js chrome/content/zotero/xpcom/libraryTreeView.js chrome/content/zotero/xpcom/zotero.js install.rdf update.rdf
2014-05-08 15:52:31 -04:00 · 2014-05-08 15:52:31 -04:00 · 57116fa892
commit 57116fa892
parent a1189fe28e fd9452adbc
93 changed files with 934 additions and 505 deletions
--- a/chrome/content/zotero-platform/mac/overlay.css
+++ b/chrome/content/zotero-platform/mac/overlay.css
@ -190,13 +190,11 @@
 }

 #zotero-collections-tree treechildren::-moz-tree-twisty(selected) {
-	-moz-appearance: none;
-	list-style-image: url("chrome://zotero/skin/mac/twisty-selected.png");
+	list-style-image: url("chrome://zotero/skin/mac/twisty-selected.svg");
 }

 #zotero-collections-tree treechildren::-moz-tree-twisty(selected, open) {
-	-moz-appearance: none;
-	list-style-image: url("chrome://zotero/skin/mac/twisty-selected-open.png");
+	list-style-image: url("chrome://zotero/skin/mac/twisty-selected-open.svg");
 }

 #zotero-collections-splitter, #zotero-items-splitter
@ -272,18 +270,18 @@

 treechildren::-moz-tree-twisty {
 	-moz-appearance: none;
-	width: 11px;
-	height: 11px;
-	list-style-image: url("chrome://zotero/skin/mac/twisty.png");
+	width: 16px;
+	height: 16px;
+	list-style-image: url("chrome://zotero/skin/mac/twisty.svg");
 	-moz-padding-start: 5px;
 	-moz-padding-end: 6px;
 }

 treechildren::-moz-tree-twisty(open) {
 	-moz-appearance: none;
-	width: 11px;
-	height: 11px;
-	list-style-image: url("chrome://zotero/skin/mac/twisty-open.png");
+	width: 16px;
+	height: 16px;
+	list-style-image: url("chrome://zotero/skin/mac/twisty-open.svg");
 	-moz-padding-start: 4px;
 	-moz-padding-end: 7px;
 }
@ -291,23 +289,23 @@ treechildren::-moz-tree-twisty(open) {
 /* How to get active twisty?
 treechildren::-moz-tree-twisty(active) {
 	-moz-appearance: none;
-	list-style-image: url("chrome://zotero/skin/mac/twisty-active.png") !important;
+	list-style-image: url("chrome://zotero/skin/mac/twisty-active.svg") !important;
 }

 treechilren::-moz-tree-twisty(active) {
 	-moz-appearance: none;
-	list-style-image: url("chrome://zotero/skin/mac/twisty-active-open.png");
+	list-style-image: url("chrome://zotero/skin/mac/twisty-active-open.svg");
 }
 */

 tree:focus treechildren::-moz-tree-twisty(selected) {
 	-moz-appearance: none;
-	list-style-image: url("chrome://zotero/skin/mac/twisty-selected.png");
+	list-style-image: url("chrome://zotero/skin/mac/twisty-selected.svg");
 }

 tree:focus treechildren::-moz-tree-twisty(selected, open) {
 	-moz-appearance: none;
-	list-style-image: url("chrome://zotero/skin/mac/twisty-selected-open.png");
+	list-style-image: url("chrome://zotero/skin/mac/twisty-selected-open.svg");
 }

 treechildren::-moz-tree-image {
--- a/chrome/content/zotero/bindings/columnpicker.xml
+++ b/chrome/content/zotero/bindings/columnpicker.xml
@ -1,146 +0,0 @@
-<?xml version="1.0"?>
-<!--
-    ***** BEGIN LICENSE BLOCK *****
-    
-    Copyright © 2012 Center for History and New Media
-                     George Mason University, Fairfax, Virginia, USA
-                     http://zotero.org
-    
-    The Initial Developer of this code is Gracile. Portions created by the
-    Initial Developer are Copyright © 2012 the Initial Developer.
-    
-    This file contains code derived from Mozilla's tree.xml, © 2012 its
-    developers.
-    
-    This file is part of Zotero.
-    
-    Zotero is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-    
-    Zotero is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-    
-    You should have received a copy of the GNU Affero General Public License
-    along with Zotero.  If not, see <http://www.gnu.org/licenses/>.
-    
-    ***** END LICENSE BLOCK *****
-->
-
-<!DOCTYPE bindings SYSTEM "chrome://zotero/locale/zotero.dtd">
-
-<bindings xmlns="http://www.mozilla.org/xbl"
-			xmlns:xbl="http://www.mozilla.org/xbl"
-			xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-	<binding id="extended-columnpicker" display="xul:button"
-				 extends="chrome://global/content/bindings/tree.xml#tree-base">
-		<content>
-			<xul:image class="tree-columnpicker-icon"/>
-			<xul:menupopup anonid="zotero-items-column-main-menu">
-				<xul:menuseparator/>
-				<xul:menu label="&zotero.items.moreColumns.label;">
-					<xul:menupopup anonid="zotero-items-column-sub-menu"/>
-				</xul:menu>
-				<xul:menuseparator/>
-				<xul:menuitem anonid="menuitem" label="&zotero.items.restoreColumnOrder.label;"/>
-			</xul:menupopup>
-		</content>
-
-		<implementation implements="nsIAccessibleProvider">
-			<property name="accessibleType" readonly="true">
-				<getter>
-					return Components.interfaces.nsIAccessibleProvider.XULButton;
-				</getter>
-			</property>
-
-			<method name="buildPopup">
-				<parameter name="aPopup"/>
-				<parameter name="bPopup"/>
-				<body>
-					<![CDATA[
-					// We no longer cache the picker content, remove the old content.
-					while (aPopup.childNodes.length > 4) {
-						aPopup.removeChild(aPopup.firstChild);
-					}
-					while (bPopup.childNodes.length > 0) {
-						bPopup.removeChild(bPopup.firstChild);
-					}
-					var refChild = aPopup.firstChild;
-					var refChild2 = bPopup.firstChild;
-					
-					var tree = this.parentNode.parentNode;
-					for (var currCol = tree.columns.getFirstColumn(); currCol; currCol = currCol.getNext()) {
-						var currElement = currCol.element;
-					
-						// Construct an entry for each column in the row, unless
-						// it is not being shown.
-						if ((!currElement.hasAttribute("ignoreincolumnpicker")) && (!currElement.hasAttribute("submenu"))) {
-							var popupChild = document.createElement("menuitem");
-							popupChild.setAttribute("type", "checkbox");
-							var columnName = currElement.getAttribute("display") || currElement.getAttribute("label");
-							popupChild.setAttribute("label", columnName);
-							popupChild.setAttribute("colindex", currCol.index);
-							if (currElement.getAttribute("hidden") != "true") {
-								popupChild.setAttribute("checked", "true");
-							}
-							if (currCol.primary) {
-								popupChild.setAttribute("disabled", "true");
-							}
-							aPopup.insertBefore(popupChild, refChild);
-						}
-					
-						//Idem for the submenu
-						if ((!currElement.hasAttribute("ignoreincolumnpicker")) && (currElement.hasAttribute("submenu"))) {
-							var popupChild = document.createElement("menuitem");
-							popupChild.setAttribute("type", "checkbox");
-							var columnName = currElement.getAttribute("display") || currElement.getAttribute("label");
-							popupChild.setAttribute("label", columnName);
-							popupChild.setAttribute("colindex", currCol.index);
-							if (currElement.getAttribute("hidden") != "true") {
-								popupChild.setAttribute("checked", "true");
-							}
-							bPopup.insertBefore(popupChild, refChild2);
-						}
-					}
-					]]>
-				</body>
-			</method>
-		</implementation>
-
-		<handlers>
-			<handler event="command">
-				<![CDATA[
-				if (event.originalTarget == this) {
-					var popup = document.getAnonymousElementByAttribute(this, "anonid", "zotero-items-column-main-menu");
-					var popup2 = document.getAnonymousElementByAttribute(this, "anonid", "zotero-items-column-sub-menu");
-					this.buildPopup(popup, popup2);
-					popup.showPopup(this, -1, -1, "popup", "bottomright", "topright");
-
-				} else {
-					var tree = this.parentNode.parentNode;
-					tree.stopEditing(true);
-					var menuitem = document.getAnonymousElementByAttribute(this, "anonid", "menuitem");
-					if (event.originalTarget == menuitem) {
-						tree.columns.restoreNaturalOrder();
-						tree._ensureColumnOrder();
-					} else {
-						var colindex = event.originalTarget.getAttribute("colindex");
-						var column = tree.columns[colindex];
-						if (column) {
-							var element = column.element;
-							if (element.getAttribute("hidden") == "true") {
-								element.setAttribute("hidden", "false");
-							} else {
-								element.setAttribute("hidden", "true");
-							}
-						}
-					}
-				}
-				]]>
-			</handler>
-		</handlers>
-	</binding>
-</bindings>
--- a/chrome/content/zotero/bindings/guidancepanel.xml
+++ b/chrome/content/zotero/bindings/guidancepanel.xml
@ -32,8 +32,11 @@
 		<implementation>
 			<method name="show">
 				<parameter name="forEl"/>
+				<parameter name="text"/>
 				<body>
 				<![CDATA[
+					Components.utils.import("resource://gre/modules/Services.jsm");
+
 					var about = this.getAttribute("about"),
 						pref = "firstRunGuidanceShown."+about,
 						shown = false;
@ -48,7 +51,8 @@
 						panel = document.getAnonymousNodes(this)[0];
 					
 					if(!forEl) forEl = document.getElementById(this.getAttribute("for"));
-					var text = Zotero.getString("firstRunGuidance."+about).split("\n");
+					if(!text) text = Zotero.getString("firstRunGuidance."+about);
+					text = text.split("\n");
 					var descriptionNode = panel.lastChild;
 					while(text.length) {
 						var textLine = text.shift();
@ -56,10 +60,28 @@
 						if(text.length) descriptionNode.appendChild(document.createElementNS(
 							"http://www.w3.org/1999/xhtml", "br"));
 					}
-					panel.openPopup(forEl, position ? position : "after_start",
-						x ? parseInt(x, 10) : 0, y ? parseInt(y, 10) : 0, false, false, null);
-					
-					Zotero.Prefs.set(pref, true);
+
+					var me = this;
+					var f = function() {
+						if(me.hasAttribute("foregroundonly") && Services.ww.activeWindow != window) return;
+						panel.openPopup(forEl, position ? position : "after_start",
+							x ? parseInt(x, 10) : 0, y ? parseInt(y, 10) : 0, false, false, null);
+						Zotero.Prefs.set(pref, true);
+					};
+
+					if(this.hasAttribute("delay")) {
+						window.setTimeout(f, this.getAttribute("delay"));
+					} else {
+						f();
+					}
+
+					if(this.hasAttribute("noautohide")) {
+						var listener = function() {
+							panel.hidePopup();
+							panel.removeEventListener("click", listener, false);
+						}
+						panel.addEventListener("click", listener, false);
+					}
 				]]>
 				</body>
 			</method>
@ -73,7 +95,7 @@
 		</implementation>
 		
 		<content>
-			<xul:panel orient="horizontal" style="max-width: 400px" type="arrow" align="top">
+			<xul:panel orient="horizontal" style="max-width: 400px" type="arrow" align="top" xbl:inherits="noautohide">
 				<xul:image src="chrome://zotero/skin/zotero-new-z-48px.png" style="margin-right: 10px; width: 48px; height: 48px;"/>
 				<xul:description flex="1"></xul:description>
 			</xul:panel>
--- a/chrome/content/zotero/bindings/styled-textbox.xml
+++ b/chrome/content/zotero/bindings/styled-textbox.xml
@ -125,6 +125,18 @@
 							this._eventHandler = function (event) {
 								//Zotero.debug(event.type);
 								switch (event.type) {
+									case 'keydown':
+										// Intercept and manually trigger redo for Cmd-Shift-Z,
+										// which keeps it from toggling the Zotero pane instead
+										if (Zotero.isMac && event.metaKey && event.shiftKey && !event.ctrlKey
+												&& !event.altKey && event.keyCode == 90) {
+											event.stopPropagation();
+											event.preventDefault();
+											self.redo();
+											return;
+										}
+										break;
+									
 									case 'keypress':
 										// Ignore keypresses that don't change
 										// any text
@ -336,6 +348,14 @@
 				</body>
 			</method>
 			
+			<method name="redo">
+				<body>
+				<![CDATA[
+					this._editor.undoManager.redo();
+				]]>
+				</body>
+			</method>
+			
 			<method name="clearUndo">
 				<body>
 				<![CDATA[
--- a/chrome/content/zotero/browser.js
+++ b/chrome/content/zotero/browser.js
@ -812,8 +812,10 @@ Zotero_Browser.Tab.prototype._translatorsAvailable = function(translate, transla
 			//and the page is still there
 			&& this.page.document.defaultView && !this.page.document.defaultView.closed
 			//this set of translators is not targeting the same URL as a previous set of translators,
-			// because otherwise we want to use the newer set
-			&& this.page.document.location.href != translate.document.location.href
+			// because otherwise we want to use the newer set,
+			// but only if it's not in a subframe of the previous set
+			&& (this.page.document.location.href != translate.document.location.href ||
+				Zotero.Utilities.Internal.isIframeOf(translate.document.defaultView, this.page.document.defaultView))
 				//the best translator we had was of higher priority than the new set
 			&& (this.page.translators[0].priority < translators[0].priority
 				//or the priority was the same, but...
@ -823,11 +825,15 @@ Zotero_Browser.Tab.prototype._translatorsAvailable = function(translate, transla
 						|| translate.document.defaultView !== this.page.document.defaultView.top)
 			))
 		) {
+			Zotero.debug("Translate: a better translator was already found for this page");
 			return; //keep what we had
 		} else {
 			this.clear(); //clear URL bar icon
 		}
 		
+		Zotero.debug("Translate: found translators for page\n"
+			+ "Best translator: " + translators[0].label + " with priority " + translators[0].priority);
+		
 		this.page.translate = translate;
 		this.page.translators = translators;
 		this.page.document = translate.document;
@ -839,6 +845,8 @@ Zotero_Browser.Tab.prototype._translatorsAvailable = function(translate, transla
 		this._attemptLocalFileImport(translate.document);
 	}
 	
+	if(!translators || !translators.length) Zotero.debug("Translate: No translators found");
+	
 	Zotero_Browser.updateStatus();
 }

--- a/chrome/content/zotero/integration/addCitationDialog.xul
+++ b/chrome/content/zotero/integration/addCitationDialog.xul
@ -90,7 +90,7 @@
 									flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 								<splitter class="tree-splitter"/>
 								<treecol
-									id="zotero-items-column-type" hidden="true"
+									id="zotero-items-column-itemType" hidden="true"
 									label="&zotero.items.type_column;"
 									width="40" persist="width ordinal hidden sortActive sortDirection"/>
 								<splitter class="tree-splitter"/>
--- a/chrome/content/zotero/lookup.js
+++ b/chrome/content/zotero/lookup.js
@ -226,6 +226,14 @@ const Zotero_Lookup = new function () {
 		//switch textboxes
 		mlPanel.setAttribute("collapsed", !on);
 		slPanel.setAttribute("collapsed", !!on);
+
+		// Resize arrow box to fit content
+		if(Zotero.isMac) {
+			var panel = document.getElementById("zotero-lookup-panel");
+			var box = panel.firstChild;
+			panel.sizeTo(box.scrollWidth, box.scrollHeight);
+		}
+
 		dest.focus();
 		return dest;
 	}
--- a/chrome/content/zotero/overlay.js
+++ b/chrome/content/zotero/overlay.js
@ -120,6 +120,19 @@ var ZoteroOverlay = new function()
 						document.persist(toolbar.id, "currentset");
 					}
 				}
+
+				if (icon.getAttribute("cui-areatype") == "toolbar") {
+					window.setTimeout(function() {
+						var isUpgrade = false;
+						try {
+							isUpgrade = Zotero.Prefs.get("firstRunGuidanceShown.saveIcon");
+						} catch(e) {}
+						var property = "firstRunGuidance.toolbarButton."+(isUpgrade ? "upgrade" : "new");
+						var shortcut = Zotero.getString(Zotero.isMac ? "general.keys.cmdShift" : "general.keys.ctrlShift")+
+							           Zotero.Prefs.get("keys.openZotero");
+						document.getElementById("zotero-toolbar-button-guidance").show(null, Zotero.getString(property, shortcut));
+					}, 0);
+				}
 			}
 			
 			// Used for loading pages from upgrade wizard
--- a/chrome/content/zotero/overlay.xul
+++ b/chrome/content/zotero/overlay.xul
@ -57,6 +57,8 @@
 		
 		<stack id="zotero-pane-stack" persist="savedHeight" savedHeight="300" hidden="true"/>
 		
+		<zoteroguidancepanel id="zotero-toolbar-button-guidance" about="toolbarButton" for="zotero-toolbar-button" position="bottomcenter topleft" delay="2000" foregroundonly="true"/>
+		
 		<!-- Annotation Toolbar -->
 		<toolbar id="zotero-annotate-tb" crop="end" insertbefore="content" hidden="true">
 			<toolbarbutton id="zotero-annotate-tb-add" tooltiptext="&zotero.annotate.toolbar.add.label;" oncommand="Zotero_Browser.toggleMode(this.id);"/>
--- a/chrome/content/zotero/preferences/preferences_general.js
+++ b/chrome/content/zotero/preferences/preferences_general.js
@ -34,6 +34,14 @@ Zotero_Preferences.General = {
 				'zotero.preferences.launchNonNativeFiles', Zotero.appName
 			);
 		}
+		
+		// Only show icon options for Firefox <29
+		if (Zotero.platformMajorVersion < 29) {
+			let statusBarRow = document.getElementById('zotero-prefpane-general-statusBarIcon-row');
+			if (statusBarRow) {
+				statusBarRow.hidden = false;
+			}
+		}
 	},
 	
 	/**
--- a/chrome/content/zotero/preferences/preferences_general_firefox.xul
+++ b/chrome/content/zotero/preferences/preferences_general_firefox.xul
@ -48,7 +48,7 @@
 							<radio id="zotero-prefpane-general-showIn-appTab" label="&zotero.preferences.showIn.appTab;" value="3"/>
 						</radiogroup>
 					</row>
-					<row position="2" id="zotero-prefpane-general-statusBarIcon-row">
+					<row position="2" id="zotero-prefpane-general-statusBarIcon-row" hidden="true">
 						<hbox align="center">
 							<label id="statusBarIcon-label" value="&zotero.preferences.statusBarIcon;" control="statusBarIcon"/>
 						</hbox>
--- a/chrome/content/zotero/preferences/preferences_keys.js
+++ b/chrome/content/zotero/preferences/preferences_keys.js
@ -32,5 +32,24 @@ Zotero_Preferences.Keys = {
 			// Display the appropriate modifier keys for the platform
 			rows[i].firstChild.nextSibling.value = Zotero.isMac ? Zotero.getString('general.keys.cmdShift') : Zotero.getString('general.keys.ctrlShift');
 		}
+		
+		var textboxes = document.getElementById('zotero-keys-rows').getElementsByTagName('textbox');
+		for (let i=0; i<textboxes.length; i++) {
+			let textbox = textboxes[i];
+			textbox.value = textbox.value.toUpperCase();
+			// .value takes care of the initial value, and this takes care of direct pref changes
+			// while the window is open
+			textbox.setAttribute('onsyncfrompreference', 'return Zotero_Preferences.Keys.capitalizePref(this.id)');
+			textbox.setAttribute('oninput', 'this.value = this.value.toUpperCase()');
+		}
+	},
+	
+	
+	capitalizePref: function (id) {
+		var elem = document.getElementById(id);
+		var pref = document.getElementById(elem.getAttribute('preference'));
+		if (pref.value) {
+			return pref.value.toUpperCase();
+		}
 	}
 };
--- a/chrome/content/zotero/selectItemsDialog.xul
+++ b/chrome/content/zotero/selectItemsDialog.xul
@ -82,7 +82,7 @@
 					flex="1" persist="width ordinal hidden sortActive sortDirection"/>
 				<splitter class="tree-splitter"/>
 				<treecol
-					id="zotero-items-column-type" hidden="true"
+					id="zotero-items-column-itemType" hidden="true"
 					label="&zotero.items.type_column;"
 					width="40" persist="width ordinal hidden sortActive sortDirection"/>
 				<splitter class="tree-splitter"/>
--- a/chrome/content/zotero/xpcom/data/itemFields.js
+++ b/chrome/content/zotero/xpcom/data/itemFields.js
@ -233,12 +233,12 @@ Zotero.ItemFields = new function() {
 	function getFieldIDFromTypeAndBase(itemType, baseField) {
 		var itemTypeID = Zotero.ItemTypes.getID(itemType);
 		if (!itemTypeID) {
-			throw ("Invalid item type '" + itemType + "' in ItemFields.getFieldIDFromTypeAndBase()");
+			throw new Error("Invalid item type '" + itemType + "' in ItemFields.getFieldIDFromTypeAndBase()");
 		}
 		
 		var baseFieldID = this.getID(baseField);
 		if (!baseFieldID) {
-			throw ("Invalid field '" + baseField + '" for base field in ItemFields.getFieldIDFromTypeAndBase()');
+			throw new Error("Invalid field '" + baseField + '" for base field in ItemFields.getFieldIDFromTypeAndBase()');
 		}
 		
 		return _baseTypeFields[itemTypeID][baseFieldID];
@ -379,7 +379,8 @@ Zotero.ItemFields = new function() {
 	function _fieldCheck(field, func) {
 		var fieldID = self.getID(field);
 		if (!fieldID) {
-			throw ("Invalid field '" + field + (func ? "' in ItemFields." + func + "()" : "'"));
+			Zotero.debug((new Error).stack, 1);
+			throw new Error("Invalid field '" + field + (func ? "' in ItemFields." + func + "()" : "'"));
 		}
 		return fieldID;
 	}
--- a/chrome/content/zotero/xpcom/data/items.js
+++ b/chrome/content/zotero/xpcom/data/items.js
@ -300,6 +300,9 @@ Zotero.Items = new function() {
 			if (this.isPrimaryField(field)) {
 				primaryFields.push(field);
 			}
+			else if (field == 'itemType') {
+				primaryFields.push('itemTypeID');
+			}
 			else {
 				fieldIDs.push(Zotero.ItemFields.getID(field));
 				if (Zotero.ItemFields.isBaseField(field)) {
--- a/chrome/content/zotero/xpcom/date.js
+++ b/chrome/content/zotero/xpcom/date.js
@ -533,7 +533,7 @@ Zotero.Date = new function(){
 		
 		if(date.year) {
 			var dateString = Zotero.Utilities.lpad(date.year, "0", 4);
-			if(date.month) {
+			if (parseInt(date.month) == date.month) {
 				dateString += "-"+Zotero.Utilities.lpad(date.month+1, "0", 2);
 				if(date.day) {
 					dateString += "-"+Zotero.Utilities.lpad(date.day, "0", 2);
--- a/chrome/content/zotero/xpcom/debug.js
+++ b/chrome/content/zotero/xpcom/debug.js
@ -111,7 +111,7 @@ Zotero.Debug = new function () {
 				//
 				// TODO: Get rid of the filename and line number
 				if (Zotero.isWin && !Zotero.isStandalone) {
-					let console = Components.utils.import("resource://gre/modules/devtools/Console.jsm", {}).console;
+					var console = Components.utils.import("resource://gre/modules/devtools/Console.jsm", {}).console;
 					console.log(output);
 				}
 				// Otherwise dump to the text console
--- a/chrome/content/zotero/xpcom/itemTreeView.js
+++ b/chrome/content/zotero/xpcom/itemTreeView.js
@ -938,8 +938,7 @@ Zotero.ItemTreeView.prototype.getCellText = function(row, column)
 	if (column.id === "zotero-items-column-hasAttachment") {
 		return;
 	}
-	else if(column.id == "zotero-items-column-type")
-	{
+	else if (column.id == "zotero-items-column-itemType") {
 		val = Zotero.ItemTypes.getLocalizedString(obj.ref.itemTypeID);
 	}
 	// Year column is just date field truncated
@ -1295,14 +1294,14 @@ Zotero.ItemTreeView.prototype.cycleHeader = function(column)
 */
 Zotero.ItemTreeView.prototype.sort = function(itemID)
 {
+	var t = new Date;
+	
 	// If Zotero pane is hidden, mark tree for sorting later in setTree()
 	if (!this._treebox.columns) {
 		this._needsSort = true;
 		return;
 	}
-	else {
-		this._needsSort = false;
-	}
+	this._needsSort = false;
 	
 	// Single child item sort -- just toggle parent open and closed
 	if (itemID && this._itemRowMap[itemID] &&
@ -1313,36 +1312,19 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 		return;
 	}
 	
-	var columnField = this.getSortField();
-	var order = this.getSortDirection() == 'descending';
+	var primaryField = this.getSortField();
+	var sortFields = this.getSortFields();
+	var dir = this.getSortDirection();
+	var order = dir == 'descending' ? -1 : 1;
 	var collation = Zotero.getLocaleCollation();
+	var sortCreatorAsString = Zotero.Prefs.get('sortCreatorAsString');
 	
-	// Year is really the date field truncated
-	var originalColumnField = columnField;
-	if (columnField == 'year') {
-		columnField = 'date';
-	}
-	
-	// The visible fields affect the secondary sorting
-	var visibleFields = {};
-	this.getVisibleFields().forEach(function (val) {
-		visibleFields[val] = true;
-	});
-	
-	// Some fields (e.g. dates) need to be retrieved unformatted for sorting
-	switch (columnField) {
-		case 'date':
-			var unformatted = true;
-			break;
-		
-		default:
-			var unformatted = false;
-	}
+	Zotero.debug("Sorting items list by " + sortFields.join(", ") + " " + dir);
 	
 	// Set whether rows with empty values should be displayed last,
 	// which may be different for primary and secondary sorting.
 	var emptyFirst = {};
-	switch (columnField) {
+	switch (primaryField) {
 	case 'title':
 		emptyFirst.title = true;
 		break;
@ -1357,36 +1339,22 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 	// Cache primary values while sorting, since base-field-mapped getField()
 	// calls are relatively expensive
 	var cache = {};
+	sortFields.forEach(function (x) cache[x] = {})
 	
 	// Get the display field for a row (which might be a placeholder title)
-	var getField;
-	switch (originalColumnField) {
-		case 'title':
-			getField = function (row) {
-				var field;
-				var type = row.ref.itemTypeID;
-				switch (type) {
-					case 8: // letter
-					case 10: // interview
-					case 17: // case
-						field = row.ref.getDisplayTitle();
-						break;
-					
-					default:
-						field = row.getField(columnField, unformatted);
-				}
-				// Ignore some leading and trailing characters when sorting
-				return Zotero.Items.getSortTitle(field);
-			};
-			break;
+	function getField(field, row) {
+		var item = row.ref;
 		
-		case 'hasAttachment':
-			getField = function (row) {
-				if (row.ref.isAttachment()) {
-					var state = row.ref.fileExists() ? 1 : -1;
+		switch (field) {
+			case 'title':
+				return Zotero.Items.getSortTitle(item.getDisplayTitle());
+			
+			case 'hasAttachment':
+				if (item.isAttachment()) {
+					var state = item.fileExists() ? 1 : -1;
 				}
-				else if (row.ref.isRegularItem()) {
-					var state = row.ref.getBestAttachmentState();
+				else if (item.isRegularItem()) {
+					var state = item.getBestAttachmentState();
 				}
 				else {
 					return 0;
@ -1396,20 +1364,23 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 					state = 2;
 				}
 				return state * -1;
-			};
-			break;
-		
-		case 'numNotes':
-			getField = function (row) {
-				// Sort descending by default
-				order = !order;
+			
+			case 'numNotes':
 				return row.numNotes(false, true) || 0;
-			};
-			break;
-		
-		case 'year':
-			getField = function (row) {
-				var val = row.getField(columnField, unformatted);
+			
+			// Use unformatted part of date strings (YYYY-MM-DD) for sorting
+			case 'date':
+				var val = row.ref.getField('date', true);
+				if (val) {
+					val = val.substr(0, 10);
+					if (val.indexOf('0000') == 0) {
+						val = "";
+					}
+				}
+				return val;
+			
+			case 'year':
+				var val = row.ref.getField('date', true);
 				if (val) {
 					val = val.substr(0, 4);
 					if (val == '0000') {
@ -1417,127 +1388,58 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 					}
 				}
 				return val;
-			};
-			break;
-		
-		default:
-			getField = function (row) row.getField(columnField, unformatted);
+			
+			default:
+				return row.ref.getField(field, false, true);
+		}
 	}
 	
 	var includeTrashed = this._itemGroup.isTrash();
 	
-	var me = this,
-		isEmptyFirst = emptyFirst[columnField];
-	function rowSort(a, b) {
-		var cmp,
-			aItemID = a.id,
-			bItemID = b.id,
-			fieldA = cache[aItemID],
-			fieldB = cache[bItemID];
+	function fieldCompare(a, b, sortField) {
+		var aItemID = a.id;
+		var bItemID = b.id;
+		var fieldA = cache[sortField][aItemID];
+		var fieldB = cache[sortField][bItemID];
 		
-		switch (columnField) {
-			case 'date':
-				fieldA = getField(a).substr(0, 10);
-				fieldB = getField(b).substr(0, 10);
-				
-				cmp = strcmp(fieldA, fieldB);
-				if (cmp !== 0) {
-					return cmp;
-				}
-				break;
-			
+		switch (sortField) {
 			case 'firstCreator':
-				cmp = creatorSort(a, b);
-				if (cmp !== 0) {
-					return cmp;
-				}
-				break;
+				return creatorSort(a, b);
 			
-			case 'type':
+			case 'itemType':
 				var typeA = Zotero.ItemTypes.getLocalizedString(a.ref.itemTypeID);
 				var typeB = Zotero.ItemTypes.getLocalizedString(b.ref.itemTypeID);
-				
-				cmp = (typeA > typeB) ? -1 : (typeA < typeB) ? 1 : 0;
-				if (cmp !== 0) {
-					return cmp;
-				}
-				break;
+				return (typeA > typeB) ? 1 : (typeA < typeB) ? -1 : 0;
 				
 			default:
 				if (fieldA === undefined) {
-					cache[aItemID] = fieldA = getField(a);
+					cache[sortField][aItemID] = fieldA = getField(sortField, a);
 				}
 				
 				if (fieldB === undefined) {
-					cache[bItemID] = fieldB = getField(b);
+					cache[sortField][bItemID] = fieldB = getField(sortField, b);
 				}
 				
 				// Display rows with empty values last
-				if (!isEmptyFirst) {
-					if(fieldA === '' && fieldB !== '') return -1;
-					if(fieldA !== '' && fieldB === '') return 1;
+				if (!emptyFirst[sortField]) {
+					if(fieldA === '' && fieldB !== '') return 1;
+					if(fieldA !== '' && fieldB === '') return -1;
 				}
 				
-				cmp = collation.compareString(1, fieldB, fieldA);
-				if (cmp !== 0) {
-					return cmp;
-				}
+				return collation.compareString(1, fieldA, fieldB);
 		}
-		
-		if (columnField !== 'firstCreator') {
-			cmp = creatorSort(a, b);
+	}
+	
+	function rowSort(a, b) {
+		var sortFields = Array.slice(arguments, 2);
+		var sortField;
+		while (sortField = sortFields.shift()) {
+			let cmp = fieldCompare(a, b, sortField);
 			if (cmp !== 0) {
 				return cmp;
 			}
 		}
-		
-		if (columnField !== 'date') {
-			// If year is visible and not date, don't use full date
-			if (visibleFields.year && !visibleFields.date) {
-				fieldA = a.getField('date', true).substr(0, 4);
-				if (fieldA == '0000') {
-					fieldA = "";
-				}
-				fieldB = b.getField('date', true).substr(0, 4);
-				if (fieldB == '0000') {
-					fieldB = "";
-				}
-				
-				cmp = strcmp(fieldA, fieldB);
-				if (cmp !== 0) {
-					return cmp;
-				}
-			}
-			// Otherwise use full date, even if Date column is hidden
-			else {
-				fieldA = a.getField('date', true).substr(0, 10);
-				fieldB = b.getField('date', true).substr(0, 10);
-				
-				cmp = strcmp(fieldA, fieldB);
-				if (cmp !== 0) {
-					return cmp;
-				}
-			}
-		}
-		
-		if (columnField !== 'title') {
-			fieldA = a.getField('title', true);
-			fieldB = b.getField('title', true);
-			
-			if (!emptyFirst.title) {
-				if (fieldA === '' && fieldB !== '') return -1;
-				if (fieldA !== '' && fieldB === '') return 1;
-			}
-			
-			cmp = collation.compareString(1, fieldB, fieldA);
-			if (cmp !== 0) {
-				return cmp;
-			}
-		}
-		
-		fieldA = a.getField('dateAdded');
-		fieldB = b.getField('dateAdded');
-		return (fieldA > fieldB) ? -1 : (fieldA < fieldB) ? 1 : 0;
+		return 0;
 	}
 	
 	var firstCreatorSortCache = {};
@ -1565,8 +1467,8 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 			return 0;
 		}
 		
-		var cmp = strcmp(fieldA, fieldB, true);
-		if (cmp !== 0) {
+		var cmp = strcmp(fieldA, fieldB);
+		if (cmp !== 0 || sortCreatorAsString) {
 			return cmp;
 		}
 		
@ -1663,14 +1565,14 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 			// Compare names
 			fieldA = Zotero.Items.getSortTitle(aCreators[aPos].ref.lastName);
 			fieldB = Zotero.Items.getSortTitle(bCreators[bPos].ref.lastName);
-			cmp = strcmp(fieldA, fieldB, true);
+			cmp = strcmp(fieldA, fieldB);
 			if (cmp) {
 				return cmp;
 			}
 			
 			fieldA = Zotero.Items.getSortTitle(aCreators[aPos].ref.firstName);
 			fieldB = Zotero.Items.getSortTitle(bCreators[bPos].ref.firstName);
-			cmp = strcmp(fieldA, fieldB, true);
+			cmp = strcmp(fieldA, fieldB);
 			if (cmp) {
 				return cmp;
 			}
@ -1728,14 +1630,10 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 	
 	function strcmp(a, b, collationSort) {
 		// Display rows with empty values last
-		if(a === '' && b !== '') return -1;
-		if(a !== '' && b === '') return 1;
+		if (a === '' && b !== '') return 1;
+		if (a !== '' && b === '') return -1;
 		
-		if (collationSort) {
-			return collation.compareString(1, b, a);
-		}
-		
-		return (a > b) ? -1 : (a < b) ? 1 : 0;
+		return collation.compareString(1, a, b);
 	}
 	
 	// Need to close all containers before sorting
@ -1748,23 +1646,19 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 	
 	// Single-row sort
 	if (itemID) {
-		var row = this._itemRowMap[itemID];
-		for (var i=0, len=this._dataItems.length; i<len; i++) {
+		let row = this._itemRowMap[itemID];
+		for (let i=0, len=this._dataItems.length; i<len; i++) {
 			if (i === row) {
 				continue;
 			}
 			
-			if (order) {
-				var cmp = -1*rowSort(this._dataItems[i], this._dataItems[row]);
-			}
-			else {
-				var cmp = rowSort(this._dataItems[i], this._dataItems[row]);
-			}
+			let cmp = rowSort.apply(this,
+				[this._dataItems[i], this._dataItems[row]].concat(sortFields)) * order;
 			
 			// As soon as we find a value greater (or smaller if reverse sort),
 			// insert row at that position
-			if (cmp < 0) {
-				var rowItem = this._dataItems.splice(row, 1);
+			if (cmp > 0) {
+				let rowItem = this._dataItems.splice(row, 1);
 				this._dataItems.splice(row < i ? i-1 : i, 0, rowItem[0]);
 				this._treebox.invalidate();
 				break;
@ -1772,7 +1666,7 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 			
 			// If greater than last row, move to end
 			if (i == len-1) {
-				var rowItem = this._dataItems.splice(row, 1);
+				let rowItem = this._dataItems.splice(row, 1);
 				this._dataItems.splice(i, 0, rowItem[0]);
 				this._treebox.invalidate();
 			}
@ -1780,8 +1674,9 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 	}
 	// Full sort
 	else {
-		this._dataItems.sort(rowSort);
-		if(!order) this._dataItems.reverse();
+		this._dataItems.sort(function (a, b) {
+			return rowSort.apply(this, [a, b].concat(sortFields)) * order;
+		}.bind(this));
 	}
 	
 	this._refreshHashMap();
@ -1793,6 +1688,8 @@ Zotero.ItemTreeView.prototype.sort = function(itemID)
 		this.selection.selectEventsSuppressed = false;
 		this._treebox.endUpdateBatch();
 	}
+	
+	Zotero.debug("Sorted items list in " + (new Date - t) + " ms");
 }

 ////////////////////////////////////////////////////////////////////////////////
@ -2374,6 +2271,39 @@ Zotero.ItemTreeView.prototype.getSortField = function() {
 }


+Zotero.ItemTreeView.prototype.getSortFields = function () {
+	var fields = [this.getSortField()];
+	var secondaryField = this.getSecondarySortField();
+	if (secondaryField) {
+		fields.push(secondaryField);
+	}
+	try {
+		var fallbackFields = Zotero.Prefs.get('fallbackSort')
+			.split(',')
+			.map((x) => x.trim())
+			.filter((x) => x !== '');
+	}
+	catch (e) {
+		Zotero.debug(e, 1);
+		Components.utils.reportError(e);
+		// This should match the default value for the fallbackSort pref
+		var fallbackFields = ['firstCreator', 'date', 'title', 'dateAdded'];
+	}
+	fields = Zotero.Utilities.arrayUnique(fields.concat(fallbackFields));
+	
+	// If date appears after year, remove it, unless it's the explicit secondary sort
+	var yearPos = fields.indexOf('year');
+	if (yearPos != -1) {
+		let datePos = fields.indexOf('date');
+		if (datePos > yearPos && secondaryField != 'date') {
+			fields.splice(datePos, 1);
+		}
+	}
+	
+	return fields;
+}
+
+
 /*
 * Returns 'ascending' or 'descending'
 */
@ -2386,6 +2316,197 @@ Zotero.ItemTreeView.prototype.getSortDirection = function() {
 }


+Zotero.ItemTreeView.prototype.getSecondarySortField = function () {
+	var primaryField = this.getSortField();
+	var secondaryField = Zotero.Prefs.get('secondarySort.' + primaryField);
+	if (!secondaryField || secondaryField == primaryField) {
+		return false;
+	}
+	return secondaryField;
+}
+
+
+Zotero.ItemTreeView.prototype.setSecondarySortField = function (secondaryField) {
+	var primaryField = this.getSortField();
+	var currentSecondaryField = this.getSecondarySortField();
+	var sortFields = this.getSortFields();
+	
+	if (primaryField == secondaryField) {
+		return false;
+	}
+	
+	if (currentSecondaryField) {
+		// If same as the current explicit secondary sort, ignore
+		if (currentSecondaryField == secondaryField) {
+			return false;
+		}
+		
+		// If not, but same as first implicit sort, remove current explicit sort
+		if (sortFields[2] && sortFields[2] == secondaryField) {
+			Zotero.Prefs.clear('secondarySort.' + primaryField);
+			return true;
+		}
+	}
+	// If same as current implicit secondary sort, ignore
+	else if (sortFields[1] && sortFields[1] == secondaryField) {
+		return false;
+	}
+	
+	Zotero.Prefs.set('secondarySort.' + primaryField, secondaryField);
+	return true;
+}
+
+
+/**
+ * Build the More Columns and Secondary Sort submenus while the popup is opening
+ */
+Zotero.ItemTreeView.prototype.onColumnPickerShowing = function (event) {
+	var menupopup = event.originalTarget;
+	
+	var ns = 'http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul';
+	var prefix = 'zotero-column-header-';
+	var doc = menupopup.ownerDocument;
+	
+	var anonid = menupopup.getAttribute('anonid');
+	if (anonid.indexOf(prefix) == 0) {
+		return;
+	}
+	
+	var lastChild = menupopup.lastChild;
+	
+	// More Columns menu
+	try {
+		let id = prefix + 'more-menu';
+		
+		let moreMenu = doc.createElementNS(ns, 'menu');
+		moreMenu.setAttribute('label', Zotero.getString('pane.items.columnChooser.moreColumns'));
+		moreMenu.setAttribute('anonid', id);
+		
+		let moreMenuPopup = doc.createElementNS(ns, 'menupopup');
+		moreMenuPopup.setAttribute('anonid', id + '-popup');
+		
+		let treecols = menupopup.parentNode.parentNode;
+		let subs = [x.getAttribute('label') for (x of treecols.getElementsByAttribute('submenu', 'true'))];
+		
+		var moreItems = [];
+		
+		for (let i=0; i<menupopup.childNodes.length; i++) {
+			let elem = menupopup.childNodes[i];
+			if (elem.localName == 'menuseparator') {
+				break;
+			}
+			if (elem.localName == 'menuitem' && subs.indexOf(elem.getAttribute('label')) != -1) {
+				moreItems.push(elem);
+			}
+		}
+		
+		// Sort fields and move to submenu
+		var collation = Zotero.getLocaleCollation();
+		moreItems.sort(function (a, b) {
+			return collation.compareString(1, a.getAttribute('label'), b.getAttribute('label'));
+		});
+		moreItems.forEach(function (elem) {
+			moreMenuPopup.appendChild(menupopup.removeChild(elem));
+		});
+		
+		moreMenu.appendChild(moreMenuPopup);
+		menupopup.insertBefore(moreMenu, lastChild);
+	}
+	catch (e) {
+		Components.utils.reportError(e);
+		Zotero.debug(e, 1);
+	}
+	
+	// Secondary Sort menu
+	try {
+		let id = prefix + 'sort-menu';
+		let primaryField = this.getSortField();
+		let sortFields = this.getSortFields();
+		let secondaryField = false;
+		if (sortFields[1]) {
+			secondaryField = sortFields[1];
+		}
+		
+		// Get localized names from treecols, since the names are currently done via .dtd
+		let treecols = menupopup.parentNode.parentNode;
+		let primaryFieldLabel = treecols.getElementsByAttribute('id',
+			'zotero-items-column-' + primaryField)[0].getAttribute('label');
+		
+		let sortMenu = doc.createElementNS(ns, 'menu');
+		sortMenu.setAttribute('label',
+			Zotero.getString('pane.items.columnChooser.secondarySort', primaryFieldLabel));
+		sortMenu.setAttribute('anonid', id);
+		
+		let sortMenuPopup = doc.createElementNS(ns, 'menupopup');
+		sortMenuPopup.setAttribute('anonid', id + '-popup');
+		
+		// Generate menuitems
+		let sortOptions = [
+			'title',
+			'firstCreator',
+			'itemType',
+			'date',
+			'year',
+			'publisher',
+			'publicationTitle',
+			'dateAdded',
+			'dateModified'
+		];
+		for (let i=0; i<sortOptions.length; i++) {
+			let field = sortOptions[i];
+			// Hide current primary field, and don't show Year for Date, since it would be a no-op
+			if (field == primaryField || (primaryField == 'date' && field == 'year')) {
+				continue;
+			}
+			let label = treecols.getElementsByAttribute('id',
+				'zotero-items-column-' + field)[0].getAttribute('label');
+			
+			let sortMenuItem = doc.createElementNS(ns, 'menuitem');
+			sortMenuItem.setAttribute('fieldName', field);
+			sortMenuItem.setAttribute('label', label);
+			sortMenuItem.setAttribute('type', 'checkbox');
+			if (field == secondaryField) {
+				sortMenuItem.setAttribute('checked', 'true');
+			}
+			sortMenuItem.setAttribute('oncommand',
+				'var view = ZoteroPane.itemsView; '
+				+ 'if (view.setSecondarySortField(this.getAttribute("fieldName"))) { view.sort(); }');
+			sortMenuPopup.appendChild(sortMenuItem);
+		}
+		
+		sortMenu.appendChild(sortMenuPopup);
+		menupopup.insertBefore(sortMenu, lastChild);
+	}
+	catch (e) {
+		Components.utils.reportError(e);
+		Zotero.debug(e, 1);
+	}
+	
+	sep = doc.createElementNS(ns, 'menuseparator');
+	sep.setAttribute('anonid', prefix + 'sep');
+	menupopup.insertBefore(sep, lastChild);
+}
+
+
+Zotero.ItemTreeView.prototype.onColumnPickerHidden = function (event) {
+	var menupopup = event.originalTarget;
+	var prefix = 'zotero-column-header-';
+	
+	for (let i=0; i<menupopup.childNodes.length; i++) {
+		let elem = menupopup.childNodes[i];
+		if (elem.getAttribute('anonid').indexOf(prefix) == 0) {
+			try {
+				menupopup.removeChild(elem);
+			}
+			catch (e) {
+				Zotero.debug(e, 1);
+			}
+			i--;
+		}
+	}
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////
 ///
 ///  Command Controller:
--- a/chrome/content/zotero/xpcom/openurl.js
+++ b/chrome/content/zotero/xpcom/openurl.js
@ -136,11 +136,11 @@ Zotero.OpenURL = new function() {
 			}
 			_mapTag("article", "genre");
 			
-			if(item.title) _mapTag(item.title, "atitle")		
-			if(item.publicationTitle) _mapTag(item.publicationTitle, (version == "0.1" ? "title" : "jtitle"))		
-			if(item.journalAbbreviation) _mapTag(item.journalAbbreviation, "stitle");
-			if(item.volume) _mapTag(item.volume, "volume");
-			if(item.issue) _mapTag(item.issue, "issue");
+			_mapTag(item.title, "atitle");
+			_mapTag(item.publicationTitle, (version == "0.1" ? "title" : "jtitle"));
+			_mapTag(item.journalAbbreviation, "stitle");
+			_mapTag(item.volume, "volume");
+			_mapTag(item.issue, "issue");
 		} else if(item.itemType == "book" || item.itemType == "bookSection" || item.itemType == "conferencePaper" || item.itemType == "report") {
 			if(version === "1.0") {
 				_mapTag("info:ofi/fmt:kev:mtx:book", "rft_val_fmt", true);
@ -148,43 +148,59 @@ Zotero.OpenURL = new function() {
 			
 			if(item.itemType == "book") {
 				_mapTag("book", "genre");
-				if(item.title) _mapTag(item.title, (version == "0.1" ? "title" : "btitle"));
+				_mapTag(item.title, (version == "0.1" ? "title" : "btitle"));
 			} else if (item.itemType == "conferencePaper") {
 				_mapTag("proceeding", "genre");
-				if(item.title) _mapTag(item.title, "atitle")		
-				if(item.proceedingsTitle) _mapTag(item.proceedingsTitle, (version == "0.1" ? "title" : "btitle"));
+				_mapTag(item.title, "atitle");
+				_mapTag(item.proceedingsTitle, (version == "0.1" ? "title" : "btitle"));
 			} else if (item.itemType == "report") {
 				_mapTag("report", "genre");
-				if(item.seriesTitle) _mapTag(item.seriesTitle, "series");
-				if(item.title) _mapTag(item.title, (version == "0.1" ? "title" : "btitle"));
+				_mapTag(item.seriesTitle, "series");
+				_mapTag(item.title, (version == "0.1" ? "title" : "btitle"));
 			} else {
 				_mapTag("bookitem", "genre");
-				if(item.title) _mapTag(item.title, "atitle")		
-				if(item.publicationTitle) _mapTag(item.publicationTitle, (version == "0.1" ? "title" : "btitle"));
+				_mapTag(item.title, "atitle");
+				_mapTag(item.publicationTitle, (version == "0.1" ? "title" : "btitle"));
 			}
 			
-			if(item.place) _mapTag(item.place, "place");
-			if(item.publisher) _mapTag(item.publisher, "publisher")		
-			if(item.edition) _mapTag(item.edition, "edition");
-			if(item.series) _mapTag(item.series, "series");
+			_mapTag(item.place, "place");
+			_mapTag(item.publisher, "publisher");
+			_mapTag(item.edition, "edition");
+			_mapTag(item.series, "series");
 		} else if(item.itemType == "thesis" && version == "1.0") {
 			_mapTag("info:ofi/fmt:kev:mtx:dissertation", "rft_val_fmt", true);
 			
-			if(item.title) _mapTag(item.title, "title");
-			if(item.publisher) _mapTag(item.publisher, "inst");
-			if(item.type) _mapTag(item.type, "degree");
+			_mapTag(item.title, "title");
+			_mapTag(item.publisher, "inst");
+			_mapTag(item.type, "degree");
 		} else if(item.itemType == "patent" && version == "1.0") {
 			_mapTag("info:ofi/fmt:kev:mtx:patent", "rft_val_fmt", true);
 			
-			if(item.title) _mapTag(item.title, "title");
-			if(item.assignee) _mapTag(item.assignee, "assignee");
-			if(item.patentNumber) _mapTag(item.patentNumber, "number");
+			_mapTag(item.title, "title");
+			_mapTag(item.assignee, "assignee");
+			_mapTag(item.patentNumber, "number");
 			
 			if(item.issueDate) {
 				_mapTag(Zotero.Date.strToISO(item.issueDate), "date");
 			}
 		} else {
-			return false;
+			//we map as much as possible to DC for all other types. This will export some info
+			//and work very nicely on roundtrip. All of these fields legal for mtx:dc according to
+			//http://alcme.oclc.org/openurl/servlet/OAIHandler/extension?verb=GetMetadata&metadataPrefix=mtx&identifier=info:ofi/fmt:kev:mtx:dc
+			_mapTag("info:ofi/fmt:kev:mtx:dc", "rft_val_fmt", true);
+			//lacking something better we use Zotero item types here; no clear alternative and this works for roundtrip
+			_mapTag(item.itemType, "type");
+			_mapTag(item.title, "title");
+			_mapTag(item.publicationTitle, "source");
+			_mapTag(item.rights, "rights");
+			_mapTag(item.publisher, "publisher");
+			_mapTag(item.abstractNote, "description");
+			if(item.DOI){
+				 _mapTag("urn:doi:" + item.DOI, "identifier");
+			}
+			else if(item.url){
+				 _mapTag(item.url, "identifier");
+			}
 		}
 		
 		if(item.creators && item.creators.length) {
@ -220,10 +236,10 @@ Zotero.OpenURL = new function() {
 				if(pages.length >= 2) _mapTag(pages[1], "epage");
 			}
 		}
-		if(item.numPages) _mapTag(item.numPages, "tpages");
-		if(item.ISBN) _mapTag(item.ISBN, "isbn");
-		if(item.ISSN) _mapTag(item.ISSN, "issn");
-		
+		_mapTag(item.numPages, "tpages");
+		_mapTag(item.ISBN, "isbn");
+		_mapTag(item.ISSN, "issn");
+		_mapTag(item.language, "language");
 		if(asObj) return entries;
 		return entries.join("&");
 	}
--- a/chrome/content/zotero/xpcom/rdf/serialize.js
+++ b/chrome/content/zotero/xpcom/rdf/serialize.js
@ -90,23 +90,33 @@ $rdf.Serializer = function () {
    for(var ns in sz.prefixes) {
      namespaces[sz.prefixes[ns]] = ns; // reverse index
    }
-    if('#/'.indexOf(p[p.length - 1]) >= 0) p = p.slice(0, -1);
-    var slash = p.lastIndexOf('/');
-    if(slash >= 0) p = p.slice(slash + 1);
-    var i = 0;
-    while(i < p.length)
-    if(sz.prefixchars.indexOf(p[i]))
+    // trim off illegal characters from the end
+    var i;
+    for(i = p.length - 1; i>=0; i--) {
+      if(sz._notNameChars.indexOf(p.charAt(i)) == -1) break;
+    }
+    p = p.substring(0, i+1);
+    if(p) {
+      // find shortest possible NCName to use as namespace name
+      for(i = p.length - 1; i>=0; i--) {
+        if(sz._notNameChars.indexOf(p.charAt(i)) != -1) break;
+      }
      i++;
-    else
-      break;
-    p = p.slice(0, i);
-    if(p.length < 6 && canUse(p)) return pok; // exact i sbest
-    if(canUse(p.slice(0, 3))) return pok;
-    if(canUse(p.slice(0, 2))) return pok;
-    if(canUse(p.slice(0, 4))) return pok;
-    if(canUse(p.slice(0, 1))) return pok;
-    if(canUse(p.slice(0, 5))) return pok;
-    for(var i = 0;; i++) if(canUse(p.slice(0, 3) + i)) return pok;
+      p = p.substr(i);
+      
+      if(p.length < 6 && canUse(p)) return pok; // exact is best
+      if(canUse(p.slice(0, 3))) return pok;
+      if(canUse(p.slice(0, 2))) return pok;
+      if(canUse(p.slice(0, 4))) return pok;
+      if(canUse(p.slice(0, 1))) return pok;
+      if(canUse(p.slice(0, 5))) return pok;
+      p = p.slice(0, 3);
+    } else {
+      // no suitable characters (weird), fall back to 'ns'
+      p = 'ns';
+      if(canUse(p)) return pok;
+    }
+    for(var i = 0;; i++) if(canUse(p + i)) return pok;
  }


@ -267,8 +277,13 @@ $rdf.Serializer = function () {
    return this.statementsToN3(f.statements);
  }

-  __Serializer.prototype._notQNameChars = "\t\r\n !\"#$%&'()*.,+/;<=>?@[\\]^`{|}~";
+  __Serializer.prototype._notQNameChars = "\t\r\n !\"#$%&'()*,+/;<=>?@[\\]^`{|}~";
  __Serializer.prototype._notNameChars = (__Serializer.prototype._notQNameChars + ":");
+  __Serializer.prototype._NCNameRegExp = (function() {
+    // escape characters that are unsafe inside RegExp character set
+    var reSafeChars = __Serializer.prototype._notNameChars.replace(/[-\]\\]/g, '\\$&');
+    return new RegExp('[^0-9\\-.' + reSafeChars + '][^' + reSafeChars + ']*$');
+  })();


  __Serializer.prototype.statementsToN3 = function (sts) {
@ -663,7 +678,10 @@ $rdf.Serializer = function () {

    function escapeForXML(str) {
      if(typeof str == 'undefined') return '@@@undefined@@@@';
-      return str.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/"/g, '&quot;');
+      return str.replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;');
    }

    function relURI(term) {
@ -822,20 +840,11 @@ $rdf.Serializer = function () {
    function qname(term) {
      var uri = term.uri;

-      var j = uri.indexOf('#');
-      if(j < 0 && sz.flags.indexOf('/') < 0) {
-        j = uri.lastIndexOf('/');
-      }
+      var j = uri.search(sz._NCNameRegExp);
      if(j < 0) throw("Cannot make qname out of <" + uri + ">")
-
-      var canSplit = true;
-      for(var k = j + 1; k < uri.length; k++) {
-        if(__Serializer.prototype._notNameChars.indexOf(uri[k]) >= 0) {
-          throw('Invalid character "' + uri[k] + '" cannot be in XML qname for URI: ' + uri);
-        }
-      }
-      var localid = uri.slice(j + 1);
-      var namesp = uri.slice(0, j + 1);
+      
+      var localid = uri.substr(j);
+      var namesp = uri.substr(0, j);
      if(sz.defaultNamespace
        && sz.defaultNamespace == namesp
        && sz.flags.indexOf('d') < 0) { // d -> suppress default
--- a/chrome/content/zotero/xpcom/translation/translate_firefox.js
+++ b/chrome/content/zotero/xpcom/translation/translate_firefox.js
@ -535,7 +535,8 @@ Zotero.Translate.IO.Read = function(file, mode) {
 	this._openRawStream();
 	
 	// start detecting charset
-	var charset = null;
+	this._charset = null;
+	this._bomLength = 0;
 	
 	// look for a BOM in the document
 	var binStream = Components.classes["@mozilla.org/binaryinputstream;1"].
@ -551,14 +552,13 @@ Zotero.Translate.IO.Read = function(file, mode) {
 	}
 	
 	if(this._charset) {
+		Zotero.debug("Translate: Found BOM. Setting character encoding to " + this._charset);
 		// BOM found; store its length and go back to the beginning of the file
 		this._bomLength = BOMs[this._charset].length;
-		this._rawStream.QueryInterface(Components.interfaces.nsISeekableStream)
-			.seek(Components.interfaces.nsISeekableStream.NS_SEEK_SET, this._bomLength);
 	} else {
-		// look for an XML parse instruction
-		this._bomLength = 0;
+		this._rewind();
 		
+		// look for an XML parse instruction
 		var sStream = Components.classes["@mozilla.org/scriptableinputstream;1"]
 					 .createInstance(Components.interfaces.nsIScriptableInputStream);
 		sStream.init(this._rawStream);
@ -591,17 +591,21 @@ Zotero.Translate.IO.Read = function(file, mode) {
 					} catch(e) {}
 				}
 				
-				// if we know for certain document is XML, we also know for certain that the
-				// default charset for XML is UTF-8
-				if(!this._charset) this._charset = "UTF-8";
+				if(this._charset) {
+					Zotero.debug("Translate: Found XML parse instruction. Setting character encoding to " + this._charset);
+				} else {
+					// if we know for certain document is XML, we also know for certain that the
+					// default charset for XML is UTF-8
+					this._charset = "UTF-8";
+					Zotero.debug("Translate: XML parse instruction not found. Defaulting to UTF-8 for XML files");
+				}
 			}
 		}
 		
 		// If we managed to get a charset here, then translators shouldn't be able to override it,
 		// since it's almost certainly correct. Otherwise, we allow override.
-		this._allowCharsetOverride = !!this._charset;		
-		this._rawStream.QueryInterface(Components.interfaces.nsISeekableStream)
-			.seek(Components.interfaces.nsISeekableStream.NS_SEEK_SET, this._bomLength);
+		this._allowCharsetOverride = !this._charset;
+		this._rewind();
 		
 		if(!this._charset) {
 			// No XML parse instruction or BOM.
@ -668,6 +672,7 @@ Zotero.Translate.IO.Read = function(file, mode) {
 						break;
 					}
 				}
+				this._rewind();
 			} else {
 				// No need to auto-detect; user has specified a charset
 				this._charset = charsetPref;
@ -693,13 +698,18 @@ Zotero.Translate.IO.Read.prototype = {
 		this._rawStream.init(this.file, 0x01, 0664, 0);
 	},
 	
-	"_seekToStart":function(charset) {
-		this._openRawStream();
-		
+	"_rewind":function() {
 		this._linesExhausted = false;
 		this._rawStream.QueryInterface(Components.interfaces.nsISeekableStream)
 			.seek(Components.interfaces.nsISeekableStream.NS_SEEK_SET, this._bomLength);
+		this._rawStream.QueryInterface(Components.interfaces.nsIFileInputStream);
 		this.bytesRead = this._bomLength;
+	},
+	
+	"_seekToStart":function(charset) {
+		this._openRawStream();
+		
+		this._rewind();
 	
 		this.inputStream = Components.classes["@mozilla.org/intl/converter-input-stream;1"]
 			.createInstance(Components.interfaces.nsIConverterInputStream);
@ -747,10 +757,10 @@ Zotero.Translate.IO.Read.prototype = {
 		}
 		
 		// seek back to the beginning
-		this._seekToStart(this._allowCharsetOverride ? this._allowCharsetOverride : this._charset);
+		this._seekToStart(this._allowCharsetOverride ? charset : this._charset);
 		
-		if(!_allowCharsetOverride) {
-			Zotero.debug("Translate: setCharacterSet: translate charset override ignored due to BOM or XML parse instruction");
+		if(!this._allowCharsetOverride) {
+			Zotero.debug("Translate: setCharacterSet: translate charset override ignored due to BOM or XML parse instruction. Using " + this._charset);
 		}
 	},
 	
--- a/chrome/content/zotero/xpcom/utilities.js
+++ b/chrome/content/zotero/xpcom/utilities.js
@ -605,23 +605,19 @@ Zotero.Utilities = {
 	/**
 	 * Return new array with duplicate values removed
 	 *
-	 * From the JSLab Standard Library (JSL)
-	 * Copyright 2007 - 2009 Tavs Dokkedahl
-	 * Contact: http://www.jslab.dk/contact.php
+	 * From http://stackoverflow.com/a/1961068
 	 *
 	 * @param	{Array}		array
 	 * @return	{Array}
 	 */
 	"arrayUnique":function(arr) {
-		var a = [];
-		var l = arr.length;
-		for(var i=0; i<l; i++) {
-			for(var j=i+1; j<l; j++) {
-				// If this[i] is found later in the array
-				if (arr[i] === arr[j])
-					j = ++i;
+		var u = {}, a = [];
+		for (var i=0, l=arr.length; i<l; ++i){
+			if (u.hasOwnProperty(arr[i])) {
+				continue;
 			}
 			a.push(arr[i]);
+			u[arr[i]] = 1;
 		}
 		return a;
 	},
--- a/chrome/content/zotero/xpcom/utilities_internal.js
+++ b/chrome/content/zotero/xpcom/utilities_internal.js
@ -300,6 +300,19 @@ Zotero.Utilities.Internal = {
 			return null;
 		}
 		return str;
+	},
+	
+	/**
+	 * Determine if one Window is a descendant of another Window
+	 * @param {DOMWindow} suspected child window
+	 * @param {DOMWindow} suspected parent window
+	 * @return {boolean}
+	 */
+	"isIframeOf":function isIframeOf(childWindow, parentWindow) {
+		while(childWindow.parent !== childWindow) {
+			childWindow = childWindow.parent;
+			if(childWindow === parentWindow) return true;
+		}
 	}
 }

--- a/chrome/content/zotero/xpcom/zotero.js
+++ b/chrome/content/zotero/xpcom/zotero.js
@ -344,14 +344,12 @@ Components.utils.import("resource://gre/modules/osfile.jsm");
 				if (e.name == 'NS_ERROR_FILE_NOT_FOUND') {
 					Zotero.startupError = Zotero.getString('dataDir.notFound');
 					_startupErrorHandler = function() {
-						var win = Services.wm.getMostRecentWindow('navigator:browser');
-						
 						var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"].
 								createInstance(Components.interfaces.nsIPromptService);
 						var buttonFlags = (ps.BUTTON_POS_0) * (ps.BUTTON_TITLE_OK)
 							+ (ps.BUTTON_POS_1) * (ps.BUTTON_TITLE_IS_STRING)
 							+ (ps.BUTTON_POS_2) * (ps.BUTTON_TITLE_IS_STRING);
-						var index = ps.confirmEx(win,
+						var index = ps.confirmEx(null,
 							Zotero.getString('general.error'),
 							Zotero.startupError + '\n\n' +
 							Zotero.getString('dataDir.previousDir') + ' '
@ -2411,17 +2409,17 @@ Zotero.Keys = new function() {
 	 * Called by Zotero.init()
 	 */
 	function init() {
-		var actions = Zotero.Prefs.prefBranch.getChildList('keys', {}, {});
+		var cmds = Zotero.Prefs.prefBranch.getChildList('keys', {}, {});
 		
 		// Get the key=>command mappings from the prefs
-		for each(var action in actions) {
-			var action = action.substr(5); // strips 'keys.'
+		for each(var cmd in cmds) {
+			cmd = cmd.substr(5); // strips 'keys.'
 			// Remove old pref
-			if (action == 'overrideGlobal') {
+			if (cmd == 'overrideGlobal') {
 				Zotero.Prefs.clear('keys.overrideGlobal');
 				continue;
 			}
-			_keys[Zotero.Prefs.get('keys.' + action)] = action;
+			_keys[this.getKeyForCommand(cmd)] = cmd;
 		}
 	}
 	
@ -2444,7 +2442,7 @@ Zotero.Keys = new function() {
 		globalKeys.forEach(function (x) {
 			let keyElem = document.getElementById('key_' + x.name);
 			if (keyElem) {
-				let prefKey = Zotero.Prefs.get('keys.'  + x.name);
+				let prefKey = this.getKeyForCommand(x.name);
 				// Only override the default with the pref if the <key> hasn't
 				// been manually changed and the pref has been
 				if (keyElem.getAttribute('key') == x.defaultKey
@ -2453,7 +2451,7 @@ Zotero.Keys = new function() {
 					keyElem.setAttribute('key', prefKey);
 				}
 			}
-		});
+		}.bind(this));
 	}
 	
 	
@ -2461,6 +2459,15 @@ Zotero.Keys = new function() {
 		key = key.toUpperCase();
 		return _keys[key] ? _keys[key] : false;
 	}
+	
+	
+	this.getKeyForCommand = function (cmd) {
+		try {
+			var key = Zotero.Prefs.get('keys.' + cmd);
+		}
+		catch (e) {}
+		return key !== undefined ? key.toUpperCase() : false;
+	}
 }


--- a/chrome/content/zotero/zoteroPane.js
+++ b/chrome/content/zotero/zoteroPane.js
@ -635,9 +635,19 @@ var ZoteroPane = new function()
 					try {
 						// Ignore Cmd-Shift-Z keystroke in text areas
 						if (Zotero.isMac && key == 'Z' &&
-								event.originalTarget.localName == 'textarea') {
-							Zotero.debug('Ignoring keystroke in text area');
-							return;
+								(event.originalTarget.localName == 'input'
+									|| event.originalTarget.localName == 'textarea')) {
+							try {
+								var isSearchBar = event.originalTarget.parentNode.parentNode.id == 'zotero-tb-search';
+							}
+							catch (e) {
+								Zotero.debug(e, 1);
+								Components.utils.reportError(e);
+							}
+							if (!isSearchBar) {
+								Zotero.debug('Ignoring keystroke in text field');
+								return;
+							}
 						}
 					}
 					catch (e) {
@ -1179,6 +1189,25 @@ var ZoteroPane = new function()
 			this.itemsView.addCallback(_setTagScope);
 			document.getElementById('zotero-items-tree').view = this.itemsView;
 			this.itemsView.selection.clearSelection();
+			
+			// Add events to treecolpicker to update menu before showing/hiding
+			try {
+				let treecols = document.getElementById('zotero-items-columns-header');
+				let treecolpicker = treecols.boxObject.firstChild.nextSibling;
+				let menupopup = treecolpicker.boxObject.firstChild.nextSibling;
+				let attr = menupopup.getAttribute('onpopupshowing');
+				if (attr.indexOf('Zotero') == -1) {
+					menupopup.setAttribute('onpopupshowing', 'ZoteroPane.itemsView.onColumnPickerShowing(event);')
+						// Keep whatever else is there
+						+ ' ' + attr;
+					menupopup.setAttribute('onpopuphidden', 'ZoteroPane.itemsView.onColumnPickerHidden(event);')
+						// Keep whatever else is there
+						+ ' ' + menupopup.getAttribute('onpopuphidden');
+				}
+			}
+			catch (e) {
+				Zotero.debug(e);
+			}
 		}
 		finally {
 			Zotero.UnresponsiveScriptIndicator.enable();
@ -3308,16 +3337,12 @@ var ZoteroPane = new function()
 							var collectionID = false;
 						}
 						
-						var attachmentItem = Zotero.Attachments.importFromURL(url, false, false, false, collectionID, mimeType, libraryID);
-						
-						// importFromURL() doesn't trigger the notifier until
-						// after download is complete
-						//
-						// TODO: add a callback to importFromURL()
-						setTimeout(function () {
-							self.selectItem(attachmentItem.id);
-						}, 1001);
-						
+						var attachmentItem = Zotero.Attachments.importFromURL(url, false,
+							false, false, collectionID, mimeType, libraryID,
+							function(attachmentItem) {
+								self.selectItem(attachmentItem.id);
+							});
+							
 						return;
 					}
 				}
--- a/chrome/content/zotero/zoteroPane.xul
+++ b/chrome/content/zotero/zoteroPane.xul
@ -359,7 +359,7 @@
 									flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
 								<splitter class="tree-splitter"/>
 								<treecol
-									id="zotero-items-column-type" hidden="true"
+									id="zotero-items-column-itemType" hidden="true"
 									label="&zotero.items.type_column;"
 									width="40" zotero-persist="width ordinal hidden sortActive sortDirection"/>
 								<splitter class="tree-splitter"/>
@ -385,21 +385,25 @@
 								<splitter class="tree-splitter"/>
 								<treecol
 									id="zotero-items-column-journalAbbreviation" hidden="true"
+									submenu="true"
 									label="&zotero.items.journalAbbr_column;"
 									flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
 								<splitter class="tree-splitter"/>
 								<treecol
 									id="zotero-items-column-language" hidden="true"
+									submenu="true"
 									label="&zotero.items.language_column;"
 									flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
 								<splitter class="tree-splitter"/>
 								<treecol
 									id="zotero-items-column-accessDate" hidden="true"
+									submenu="true"
 									label="&zotero.items.accessDate_column;"
 									flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
 								<splitter class="tree-splitter"/>
 								<treecol
 									id="zotero-items-column-libraryCatalog" hidden="true"
+									submenu="true"
 									label="&zotero.items.libraryCatalog_column;"
 									flex="1" zotero-persist="width ordinal hidden sortActive sortDirection"/>
 								<splitter class="tree-splitter"/>
--- a/chrome/locale/af-ZA/zotero/zotero.properties
+++ b/chrome/locale/af-ZA/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Loading items list...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/ar/zotero/zotero.properties
+++ b/chrome/locale/ar/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=تحميل قائمة العناصر...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=نقل لسلة المحذوفات
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/bg-BG/zotero/zotero.properties
+++ b/chrome/locale/bg-BG/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Зарежда списъка на записите...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Премества в кошчето за боклук
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/ca-AD/zotero/zotero.properties
+++ b/chrome/locale/ca-AD/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Fins a %S etiquetes de cada biblioteca poden tenir colors assignats.

 pane.items.loading=Carregant la llista d'elements...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Mou a la paperera
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero pot reconèixer una referència en aquesta pàg
 firstRunGuidance.authorMenu=Zotero també permet especificar editors i traductors. Pots convertir un autor en un editor o traductor mitjançant la selecció d'aquest menú.
 firstRunGuidance.quickFormat=Escriu un títol o autor per cercar una referència.\n\nDesprés que hagis fet la teva selecció, fes clic a la bombolla o prem Ctrl-\u2193 per afegir números de pàgina, prefixos o sufixos. També pots incloure un número de pàgina juntament amb els teus termes de cerca per afegir-lo directament.\n\nLes cites es poden editar directament en el document del processador de textos.
 firstRunGuidance.quickFormatMac=Escriu un títol o autor per cercar una referència.\n\nDesprés que hagis fet la teva selecció, fes clic a la bombolla o prem Cmd-\u2193 per afegir números de pàgina, prefixos o sufixos. També pots incloure un número de pàgina juntament amb els teus termes de cerca per afegir-lo directament.\n\nLes cites es poden editar directament en el document del processador de textos.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/cs-CZ/zotero/zotero.properties
+++ b/chrome/locale/cs-CZ/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Stisknutím klávesy $NUMBER můžete při
 tagColorChooser.maxTags=Barvy může mít přiřazeno až %S štítků v každé knihovně.

 pane.items.loading=Nahrávám seznam položek...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Připojit odkaz k URI
 pane.items.attach.link.uri=Vložte URI:
 pane.items.trash.title=Přesunout do Koše
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero rozpoznalo na této stránce citaci. Pro její
 firstRunGuidance.authorMenu=Zotero umožňuje zvolit i editory a překladatele. Volbou v tomto menu můžete změnit autora na editora či překladatele.
 firstRunGuidance.quickFormat=Napište název, nebo autora k nimž hledáte citaci.\n\n Když si vyberete, kliknutím na bublinu, nebo stiskem Ctrl-\u2193 můžete přidat čísla stran, prefixy, či sufixy. Číslo stránky můžete vložit přímo k vašim vyhledávaným výrazům.\n\nCitace můžete editovat přímo ve vašem textovém procesoru.
 firstRunGuidance.quickFormatMac=Napište název, nebo autora k nimž hledáte citaci.\n\n Když si vyberete, kliknutím na bublinu, nebo stiskem Ctrl-\u2193 můžete přidat čísla stran, prefixy, či sufixy. Číslo stránky můžete vložit přímo k vašim vyhledávaným výrazům.\n\nCitace můžete editovat přímo ve vašem textovém procesoru.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/da-DK/zotero/zotero.properties
+++ b/chrome/locale/da-DK/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Du kan tilføje dette mærke til valgte el
 tagColorChooser.maxTags=Op til %S mærker i hvert bibliotek kan have farver tilknyttet.

 pane.items.loading=Henter listen med elementer...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Vedhæft henvisning til URI
 pane.items.attach.link.uri=Indtast en URI:
 pane.items.trash.title=Flyt til papirkurv
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero har fundet en reference på denne side. Klik p
 firstRunGuidance.authorMenu=Zotero lader dig anføre redaktører og oversættere. Du kan ændre en forfatter til en redaktør eller oversætter ved at vælge fra denne menu.
 firstRunGuidance.quickFormat=Indtast en titel eller forfatter for at søge efter en reference.\n\nNår du har foretaget dit valg, så klik på boblen eller tryk Ctrl-↓ for at tilføje sidenumre, præfikser eller suffikser. Du kan også inkludere et sidenummer sammen med dine søgetermer.\n\nDu kan redigere henvisninger direkte i dit tekstbehandlingsdokument.
 firstRunGuidance.quickFormatMac=Indtast en titel eller forfatter for at søge efter en reference.\n\nNår du har foretaget dit valg, så klik på boblen eller tryk Cmd-↓ for at tilføje sidenumre, præfikser eller suffikser. Du kan også inkludere et sidenummer sammen med dine søgetermer.\n\nDu kan redigere henvisninger direkte i dit tekstbehandlingsdokument.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/de/zotero/zotero.properties
+++ b/chrome/locale/de/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Sie können dieses Tag mit der $NUMBER Tas
 tagColorChooser.maxTags=Sie können bis zu %S Tags in jeder Bibliothek Farben zuweisen.

 pane.items.loading=Lade die Liste der Einträge...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Link zu einer URI anhängen
 pane.items.attach.link.uri=URI eingeben:
 pane.items.trash.title=In den Papierkorb verschieben
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero erkennt einen Eintrag auf dieser Seite. Klicken
 firstRunGuidance.authorMenu=Zotero ermöglicht es Ihnen, auch Herausgeber und Übersetzer anzugeben. Sie können einen Autor zum Übersetzer machen, indem Sie in diesem Menü die entsprechende Auswahl treffen.
 firstRunGuidance.quickFormat=Geben Sie einen Titel oder Autor ein, um nach einer Zitation zu suchen.\n\nNachdem Sie Ihre Auswahl getroffen haben, klicken Sie auf die Blase oder drücken Sie Strg-\u2193, um Seitenzahlen, Präfixe oder Suffixe hinzuzufügen. Sie können die Seitenzahl auch zu Ihren Suchbegriffen hinzufügen, um diese direkt hinzuzufügen.\n\nSie können alle Zitationen direkt im Dokument bearbeiten.
 firstRunGuidance.quickFormatMac=Geben Sie einen Titel oder Autor ein, um nach einer Zitation zu suchen.\n\nNachdem Sie Ihre Auswahl getroffen haben, klicken Sie auf die Blase oder drücken Sie Cmd-\u2193, um Seitenzahlen, Präfixe oder Suffixe hinzuzufügen. Sie können die Seitenzahl auch zu Ihren Suchbegriffen hinzufügen, um diese direkt hinzuzufügen.\n\nSie können alle Zitationen direkt im Dokument bearbeiten.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/el-GR/zotero/zotero.properties
+++ b/chrome/locale/el-GR/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Loading items list...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@ -45,7 +45,7 @@
 <!ENTITY zotero.collections.showUnfiledItems			"Show Unfiled Items">

 <!ENTITY zotero.items.itemType							"Item Type">
-<!ENTITY zotero.items.type_column						"Type">
+<!ENTITY zotero.items.type_column						"Item Type">
 <!ENTITY zotero.items.title_column						"Title">
 <!ENTITY zotero.items.creator_column					"Creator">
 <!ENTITY zotero.items.date_column						"Date">
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions          = You can add this tag to selecte
 tagColorChooser.maxTags                        = Up to %S tags in each library can have colors assigned.

 pane.items.loading				= Loading items list…
+pane.items.columnChooser.moreColumns = More Columns
+pane.items.columnChooser.secondarySort = Secondary Sort (%S)
 pane.items.attach.link.uri.title	 	= Attach Link to URI
 pane.items.attach.link.uri		= Enter a URI:
 pane.items.trash.title			= Move to Trash
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon		= Zotero has found a reference on this page. Click th
 firstRunGuidance.authorMenu		= Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat	= Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-\u2193 to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac	= Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-\u2193 to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new = Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade = The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/es-ES/zotero/zotero.properties
+++ b/chrome/locale/es-ES/zotero/zotero.properties
@ -4,7 +4,7 @@ general.success=Bien
 general.error=Error
 general.warning=Aviso
 general.dontShowWarningAgain=No mostrar más este aviso.
-general.browserIsOffline=%S está en modo desconectado [offline].
+general.browserIsOffline=%S está en modo desconectado.
 general.locate=Encontrar...
 general.restartRequired=Hace falta reiniciar
 general.restartRequiredForChange=%S debe reiniciarse para que se realice el cambio.
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Puedes añadir esta etiqueta  a los ítems
 tagColorChooser.maxTags=Se puede asignar colores a hasta %S etiquetas de cada biblioteca.

 pane.items.loading=Cargando la lista de ítems...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Adjuntar enlace a URI
 pane.items.attach.link.uri=Introducir una URI:
 pane.items.trash.title=Enviar a la papelera
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero ha reconocido una referencia en esta página. P
 firstRunGuidance.authorMenu=Zotero te permite también especificar editores y traductores. Puedes cambiar el rol de autor a editor o traductor seleccionándolo desde este menú.
 firstRunGuidance.quickFormat=Escribe el título o el autor para buscar una referencia. \n\nDespués de que hayas hecho tu selección, haz clic en la burbuja o pulsa Ctrl-\u2193 para agregar números de página, prefijos o sufijos. También puedes incluir un número de página junto con tus términos de búsqueda para añadirlo directamente.\n\nPuedes editar citas directamente en el documento del procesador de textos.
 firstRunGuidance.quickFormatMac=Escribe el título o el autor para buscar una referencia. \n\nDespués de que hayas hecho tu selección, haz clic en la burbuja o pulsa Cmd-\u2193 para agregar números de página, prefijos o sufijos. También puedes incluir un número de página junto con tus términos de búsqueda para añadirlo directamente.\n\nPuedes editar citas directamente en el documento del procesador de textos.
+firstRunGuidance.toolbarButton.new=Clic aquí para abrir Zotero o utilice el atajo de teclado %S
+firstRunGuidance.toolbarButton.upgrade=El ícono Zotero ahora se encuentra en la barra de Firefox. Clic en el ícono para abrir Zotero, o use el atajo de teclado %S.
--- a/chrome/locale/et-EE/zotero/zotero.properties
+++ b/chrome/locale/et-EE/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Kirjete nimekirja laadimine...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Liiguta Prahi hulka
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero tunneb sellel lehel ära viite. Kirje salvestam
 firstRunGuidance.authorMenu=Zotero võimaldab määrata ka toimetajaid ja tõlkijaid. Autori saab muuta toimetajaks või tõlkijaks sellest menüüst.
 firstRunGuidance.quickFormat=Viite otsimiseks kirjutage pealkiri või autor.\n\nKui olete valiku teinud, siis leheküljenumbrite, prefiksite või sufiksite lisamiseks klikkige viite kastikesele või vajutage Ctrl-\u2193. Leheküljenumbri võite sisestada ka kohe kastikese sisse.\n\nSamas võite viiteid toimetada ka tekstiredaktoris.
 firstRunGuidance.quickFormatMac=Viite otsimiseks kirjutage pealkiri või autor.\n\nKui olete valiku teinud, siis leheküljenumbrite, prefiksite või sufiksite lisamiseks klikkige viite kastikesele või vajutage Cmd-\u2193. Leheküljenumbri võite sisestada ka kohe kastikese sisse.\n\nSamas võite viiteid toimetada ka tekstiredaktoris.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/eu-ES/zotero/zotero.properties
+++ b/chrome/locale/eu-ES/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=datuak kargatzen ari...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Zaborrara bota
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/fa/zotero/zotero.properties
+++ b/chrome/locale/fa/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=بار کردن لیست آیتم‌ها...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=انتقال به سطل بازیافت
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/fi-FI/zotero/zotero.properties
+++ b/chrome/locale/fi-FI/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Ladataan kohdeluettelo...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Siirrä roskakoriin
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero tunnistaa viitteen tällä sivulla. Paina osoit
 firstRunGuidance.authorMenu=Zoterossa voit myös määritellä teoksen toimittajat ja kääntäjät. Voit muuttaa kirjoittajan toimittajaksi tai kääntäjäksi tästä valikosta.
 firstRunGuidance.quickFormat=Kirjoita otsikko tai tekijä etsiäksesi viitettä.\n\nKun olet tehnyt valinnan, klikkaa kuplaa tai paina Ctrl-\u2193 lisätäksesi sivunumerot sekä etu- ja jälkiliitteet. Voit myös sisällyttää sivunumeron hakutermien mukana lisätäksesi sen suoraan.\n\nVoit muokata sitaatteja suoraan tekstinkäsittelyohjelman asiakirjassa.
 firstRunGuidance.quickFormatMac=Kirjoita otsikko tai tekijä etsiäksesi viitettä.\n\nKun olet tehnyt valinnan, klikkaa kuplaa tai paina Ctrl-\u2193 lisätäksesi sivunumerot sekä etu- ja jälkiliitteet. Voit myös sisällyttää sivunumeron hakutermien mukana lisätäksesi sen suoraan.\n\nVoit muokata sitaatteja suoraan tekstinkäsittelyohjelman asiakirjassa.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/fr-FR/zotero/zotero.properties
+++ b/chrome/locale/fr-FR/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Vous pouvez ajouter ce marqueur aux docume
 tagColorChooser.maxTags=Jusqu'à %S marqueurs dans chaque bibliothèque peuvent se voir attribuer une couleur.

 pane.items.loading=Chargement de la liste des objets…
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Joindre un lien vers l'URI
 pane.items.attach.link.uri=Saisissez une URI :
 pane.items.trash.title=Mettre à la corbeille
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero a détecté une référence sur cette page. Cli
 firstRunGuidance.authorMenu=Zotero vous permet également de préciser les éditeurs scientifiques, directeurs de publication et les traducteurs. Vous pouvez changer un auteur en éditeur ou en traducteur en cliquant sur le triangle à gauche de "Auteur".
 firstRunGuidance.quickFormat=Tapez son titre ou son auteur pour rechercher une référence.\n\nAprès l'avoir sélectionnée, cliquez sur la bulle ou appuyer sur Ctrl-\u2193 pour ajouter les numéros des pages, un préfixe ou un suffixe. Vous pouvez aussi inclure un numéro de page en même temps que vos termes de recherche afin de l'ajouter directement.\n\nVous pouvez modifier les citations directement dans le document du traitement de texte.
 firstRunGuidance.quickFormatMac=Tapez son titre ou son auteur pour rechercher une référence.\n\nAprès l'avoir sélectionnée, cliquez sur la bulle ou appuyer sur Cmd-\u2193 pour ajouter les numéros des pages, un préfixe ou un suffixe. Vous pouvez aussi inclure un numéro de page en même temps que vos termes de recherche afin de l'ajouter directement.\n\nVous pouvez modifier les citations directement dans le document du traitement de texte.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/gl-ES/zotero/zotero.properties
+++ b/chrome/locale/gl-ES/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Podes engadir esta etiqueta para seleccion
 tagColorChooser.maxTags=Só ata %S etiquetas de cada biblioteca poden ter cores asignadas.

 pane.items.loading=Cargando a lista de elementos ...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Anexar a ligazón á URI
 pane.items.attach.link.uri=Introducir unha URI:
 pane.items.trash.title=Mover ao lixo
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero recoñece unha referencia nesta páxina. Faga c
 firstRunGuidance.authorMenu=Zotero permítelle ademais especificar os editores e tradutores. Escolléndoo neste menú pode asignar a un autor como editor ou tradutor. 
 firstRunGuidance.quickFormat=Teclee un título ou autor para buscar unha referencia.\n\nDespois de facer a selección faga clic na burbulla ou prema Ctrl-\↓ para engadir números de páxina, prefixos ou sufixos. Así mesmo, pode incluír un número de páxina cos datos de busca e engadilo directamente.\n\Ademais, pode editar citas directamente dende o procesador de documentos de texto.
 firstRunGuidance.quickFormatMac=Teclee un título de autor para facer unha busca dunha referencia.\n\nDespois de ter feito a selección prema na burbulla ou prema Cmd-\↓ para engadir os números de páxina, prefixos ou sufixos. Igualmente, pode incluír un número de páxina co seus termos de busca empregados e engadilo directamente.\n\nPode ademais editar citas directamente desde o procesador de documentos de textos.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/he-IL/zotero/zotero.properties
+++ b/chrome/locale/he-IL/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=טוען רשימת פריטים...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/hr-HR/zotero/zotero.properties
+++ b/chrome/locale/hr-HR/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Loading items list...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/hu-HU/zotero/zotero.properties
+++ b/chrome/locale/hu-HU/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Elemek listájának betöltése...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Áthelyezés a kukába
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/id-ID/zotero/zotero.properties
+++ b/chrome/locale/id-ID/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Memuat daftar item...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Pindahkan ke Keranjang Sampah
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero dapat mengenali referensi yang terdapat pada ha
 firstRunGuidance.authorMenu=Zotero juga mengizinkan untuk Anda menentukan editor dan translator.  Anda dapat mengubah penulis menjadi editor atau translator dengan cara memilih dari menu ini.
 firstRunGuidance.quickFormat=Ketikkan judul atau nama penulis untuk mencari sebuah referensi.\n\nSetelah Anda melakukannya, klik pada gelembung atau tekan Ctrl-\u2193 untuk menambahkan nomor halaman, prefiks, atau sufiks. Anda juga dapat memasukkan nomor halaman bersamaan dengan istilah pencarian untuk menambahkannya secara langsung.\n\nAnda dapat mengedit sitasi secara langsung di dalam dokumn pengolah kata. 
 firstRunGuidance.quickFormatMac=Ketikkan judul atau nama penulis untuk mencari sebuah referensi.\n\nSetelah Anda melakukannya, klik pada gelembung atau tekan Cmd-\u2193 untuk menambahkan nomor halaman, prefiks, atau sufiks. Anda juga dapat memasukkan nomor halaman bersamaan dengan istilah pencarian untuk menambahkannya secara langsung.\n\nAnda dapat mengedit sitasi secara langsung di dalam dokumn pengolah kata. 
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/is-IS/zotero/zotero.properties
+++ b/chrome/locale/is-IS/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Flyt inn færslur...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Færa í ruslið
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/it-IT/zotero/zotero.properties
+++ b/chrome/locale/it-IT/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=È possibile aggiungere questa etichetta a
 tagColorChooser.maxTags=Fino a %S etichette per biblioteca possono essere associate a un colore.

 pane.items.loading=Caricamento lista elementi in corso...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Allega un collegamento alla URI
 pane.items.attach.link.uri=Inserire una URI:
 pane.items.trash.title=Sposta nel Cestino
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero ha individuato un riferimento bibliografico su
 firstRunGuidance.authorMenu=Zotero consente di specificare anche i curatori e i traduttori. È possibile convertire un autore in un curatore o traduttore selezionando da questo menu.
 firstRunGuidance.quickFormat=Digitare un titolo o un autore per cercare un riferimento bibliografico.\n\nDopo aver effettuato una selezione cliccare la bolla o premere Ctrl-\u2193 per aggiungere i numeri di pagina, prefissi o suffissi. È possibile includere un numero di pagina nei termini di ricerca per aggiungerlo direttamente.\n\nÈ possibile modificare le citazioni direttamente nel documento dell'elaboratore di testi.
 firstRunGuidance.quickFormatMac=Digitare un titolo o un autore per cercare un riferimento bibliografico.\n\nDopo aver effettuato una selezione cliccare la bolla o premere Cmd-\u2193 per aggiungere i numeri di pagina, prefissi o suffissi. È possibile includere un numero di pagina nei termini di ricerca per aggiungerlo direttamente.\n\nÈ possibile modificare le citazioni direttamente nel documento dell'elaboratore di testi.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/ja-JP/zotero/zotero.properties
+++ b/chrome/locale/ja-JP/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=キーボードの $NUMBER キーを押す
 tagColorChooser.maxTags=各ライブラリ内につき、 最大 %S 個のタグまでしか色を指定できません。

 pane.items.loading=アイテムリストを読み込んでいます...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=URIへのリンクを添付する
 pane.items.attach.link.uri=URIを入力して下さい:
 pane.items.trash.title=ゴミ箱に移動する
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero はこのページの文献を認識するこ
 firstRunGuidance.authorMenu=Zotero では、編集者と翻訳者についても指定することができます。このメニューから選択することによって、作者を編集者または翻訳者へと切り替えることができます。
 firstRunGuidance.quickFormat=題名か著者名を入力して文献を探してください。\n\n選択が完了したら、必要に応じて、泡をクリックするか Ctrl-\u2193を押して、ページ番号、接頭辞、接尾辞を追加してください。検索語句にページ番号を含めれば、ページ番号を直接追加することもできます。\n\n出典表記はワードプロセッサ文書中で直接編集することが可能です。
 firstRunGuidance.quickFormatMac=題名か著者名を入力して文献を探してください。\n\n選択が完了したら、必要に応じて、泡をクリックするか Cmd-\u2193を押して、ページ番号、接頭辞、接尾辞を追加してください。検索語句にページ番号を含めれば、ページ番号を直接追加することもできます。\n\n出典表記はワードプロセッサ文書中で直接編集することが可能です。
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/km/zotero/zotero.properties
+++ b/chrome/locale/km/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=កំពុងបង្ហាញបញ្ជីផ្ទុកឯកសារ...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=លុបចូលធុងសំរាម
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=ហ្ស៊ូតេរ៉ូអាចទទួលស
 firstRunGuidance.authorMenu=ហ្ស៊ូតេរ៉ូក៏អាចឲអ្នកធ្វើការកត់សម្គាល់អ្នកកែតម្រូវ និង អ្នកបកប្រែផងដែរ។ អ្នកអាចធ្វើការប្តូរអ្នកនិពន្ធទៅជាអ្នកកែតម្រូវ និង អ្នកបកប្រែតាមរយៈការជ្រើសរើសចេញពីបញ្ជីនេះ។
 firstRunGuidance.quickFormat=សូមវាយចំណងជើង ឬ អ្នកនិពន្ធសម្រាប់ស្រាវជ្រាវរកឯកសារយោង។ បន្ទាប់ពីអ្នកបានជ្រើសរើស សូមចុចរូបសញ្ញា ឬ ចុច Ctrl-\u2193 ដើម្បីបន្ថែមលេខទំព័រ បុព្វបទ ឬ បច្ច័យ។ អ្នកក៏អាចបន្ថែមលេខទំព័រដោយផ្ទាល់ទៅនឹងកិច្ចការស្រាវជ្រាវ។ អ្នកអាចកែតម្រូវអគតដ្ឋានបានដោយផ្ទាល់នៅក្នុងឯកសារវើដ។
 firstRunGuidance.quickFormatMac=សូមវាយចំណងជើង ឬ អ្នកនិពន្ធសម្រាប់ស្រាវជ្រាវរកឯកសារយោង។ បន្ទាប់ពីអ្នកបានជ្រើសរើស សូមចុចរូបសញ្ញា ឬ ចុច Cmd-\u2193 ដើម្បីបន្ថែមលេខទំព័រ បុព្វបទ ឬ បច្ច័យ។ អ្នកក៏អាចបន្ថែមលេខទំព័រដោយផ្ទាល់ទៅនឹងកិច្ចការស្រាវជ្រាវ។ អ្នកអាចកែតម្រូវអគតដ្ឋានបានដោយផ្ទាល់នៅក្នុងឯកសារវើដ។
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/ko-KR/zotero/zotero.properties
+++ b/chrome/locale/ko-KR/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=항목 목록 불러오기...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=휴지통으로 이동
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero가 이 페이지에서 레퍼런스를 인식
 firstRunGuidance.authorMenu=편집자나 번역자 등을 입력할 수도 있습니다. 작가 탭의 메뉴에서 편집자나 번역가 등을 선택하시면 됩니다.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-\u2193 to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-\u2193 to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/lt-LT/zotero/about.dtd
+++ b/chrome/locale/lt-LT/zotero/about.dtd
@ -1,13 +1,13 @@
 <!ENTITY zotero.version "versija">
-<!ENTITY zotero.createdby "Sukurta:">
+<!ENTITY zotero.createdby "Sukurė:">
 <!ENTITY zotero.director "Direktorius:">
 <!ENTITY zotero.directors "Direktoriai:">
 <!ENTITY zotero.developers "Programuotojai:">
-<!ENTITY zotero.alumni "Buvę studentai:">
+<!ENTITY zotero.alumni "Ankstesni talkininkai:">
 <!ENTITY zotero.about.localizations "Vertėjai:">
-<!ENTITY zotero.about.additionalSoftware "Kitos Programos ir Standartai:">
-<!ENTITY zotero.executiveProducer "Vykdomasis Prodiuseris:">
-<!ENTITY zotero.thanks "Dėkojame:">
-<!ENTITY zotero.about.close "Uždaryti">
-<!ENTITY zotero.moreCreditsAndAcknowledgements "Papildomi Kreditai ir Padėkos">
-<!ENTITY zotero.citationProcessing "Citatų ir Bibliografijos Apdorojimas">
+<!ENTITY zotero.about.additionalSoftware "Kitos programos ir standartai:">
+<!ENTITY zotero.executiveProducer "Pagrindinis rengėjas:">
+<!ENTITY zotero.thanks "Ypač dėkojame:">
+<!ENTITY zotero.about.close "Užverti">
+<!ENTITY zotero.moreCreditsAndAcknowledgements "Kitos padėkos">
+<!ENTITY zotero.citationProcessing "Citatų ir bibliografijos apdorojimas">
--- a/chrome/locale/lt-LT/zotero/preferences.dtd
+++ b/chrome/locale/lt-LT/zotero/preferences.dtd
@ -28,7 +28,7 @@
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader "Leisti zotero.org derinti turinį pagal dabartinę Zotero versiją">
 <!ENTITY zotero.preferences.zoteroDotOrgVersionHeader.tooltip "Jei parinktis įgalinta, dabartinė Zotero versija bus automatiškai įtraukta į zotero.org HTTP užklausas.">
 <!ENTITY zotero.preferences.parseRISRefer "Zotero naudoti BibTeX/RIS/Refer failų parsiuntimui">
-<!ENTITY zotero.preferences.automaticSnapshots "Pagal kuriamiems naujiems įrašams automatiškai sukurti nuotraukas">
+<!ENTITY zotero.preferences.automaticSnapshots "Kuriamiems naujiems įrašams automatiškai sukurti nuotraukas">
 <!ENTITY zotero.preferences.downloadAssociatedFiles "Įrašant įrašus, automatiškai prisegti susijusius PDF dokumentus ir kitus failus">
 <!ENTITY zotero.preferences.automaticTags "Įrašams automatiškai priskirti gaires su raktažodžiais ir temomis">
 <!ENTITY zotero.preferences.trashAutoEmptyDaysPre "Automatiškai šiukšlinės šalinti įrašus, senesnius nei">
@ -39,7 +39,7 @@
 <!ENTITY zotero.preferences.groups.childNotes "įrašams priklausančias pastabas">
 <!ENTITY zotero.preferences.groups.childFiles "įrašams priklausančias nuotraukas ir importuotus failus">
 <!ENTITY zotero.preferences.groups.childLinks "įrašams priklausančias nuorodas">
-<!ENTITY zotero.preferences.groups.tags "gairės">
+<!ENTITY zotero.preferences.groups.tags "gaires">

 <!ENTITY zotero.preferences.openurl.caption "OpenURL">

@ -115,7 +115,7 @@
 <!ENTITY zotero.preferences.cite.styles "Stiliai">
 <!ENTITY zotero.preferences.cite.wordProcessors "Tekstų rengyklės">
 <!ENTITY zotero.preferences.cite.wordProcessors.noWordProcessorPluginsInstalled "Nerasta įdiegtų teksto rengyklės papildinių.">
-<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "Diegti papildinius į tekstų rengykles...">
+<!ENTITY zotero.preferences.cite.wordProcessors.getPlugins "Papildinių diegimas į tekstų rengykles...">
 <!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 "Naudoti klasikinį citatų įdėjimo langą">

--- a/chrome/locale/lt-LT/zotero/zotero.dtd
+++ b/chrome/locale/lt-LT/zotero/zotero.dtd
@ -47,7 +47,7 @@
 <!ENTITY zotero.items.itemType "Įrašo tipas">
 <!ENTITY zotero.items.type_column "Tipas">
 <!ENTITY zotero.items.title_column "Antraštė">
-<!ENTITY zotero.items.creator_column "Kūrėjas">
+<!ENTITY zotero.items.creator_column "Autorius">
 <!ENTITY zotero.items.date_column "Data">
 <!ENTITY zotero.items.year_column "Metai">
 <!ENTITY zotero.items.publisher_column "Leidėjas">
@ -100,7 +100,7 @@
 <!ENTITY zotero.toolbar.removeItem.label "Pašalinti įrašą...">
 <!ENTITY zotero.toolbar.newCollection.label "Naujas rinkinys...">
 <!ENTITY zotero.toolbar.newGroup "Nauja grupė...">
-<!ENTITY zotero.toolbar.newSubcollection.label "Naujas kolekcija kolekcijoje...">
+<!ENTITY zotero.toolbar.newSubcollection.label "Naujas poaplankis...">
 <!ENTITY zotero.toolbar.newSavedSearch.label "Nauja įsiminta paieška...">
 <!ENTITY zotero.toolbar.emptyTrash.label "Išvalyti šiukšlinę">
 <!ENTITY zotero.toolbar.tagSelector.label "Rodyti/slėpti gairių parinkiklį">
@ -188,7 +188,7 @@
 <!ENTITY zotero.citation.page "Puslapis">
 <!ENTITY zotero.citation.paragraph "Pastraipa">
 <!ENTITY zotero.citation.line "Eilutė">
-<!ENTITY zotero.citation.suppressAuthor.label "Trumpinti autorius">
+<!ENTITY zotero.citation.suppressAuthor.label "Nerodyti autoriaus">
 <!ENTITY zotero.citation.prefix.label "Priešdėlis:">
 <!ENTITY zotero.citation.suffix.label "Priesaga:">
 <!ENTITY zotero.citation.editorWarning.label "Įspėjimas: jei pakeisite citavimą tekstų rengyklėje, jis nebebus atnaujinamas pagal jūsiškę duomenų bazę ar citavimo stilių.">
@ -225,7 +225,7 @@

 <!ENTITY zotero.integration.references.label "Nuorodos bibliogafijoje">

-<!ENTITY zotero.sync.button "Sinchronizuoti su Zotero serveriu">
+<!ENTITY zotero.sync.button "Sinchronizavimas su Zotero serveriu">
 <!ENTITY zotero.sync.error "Sinchronizavimo klaida">
 <!ENTITY zotero.sync.storage.progress "Eiga:">
 <!ENTITY zotero.sync.storage.downloads "Siuntiniai:">
--- a/chrome/locale/lt-LT/zotero/zotero.properties
+++ b/chrome/locale/lt-LT/zotero/zotero.properties
@ -116,12 +116,12 @@ dataDir.moveFilesToNewLocation=Prieš vėl atverdami %1$S, būtinai perkelkite s
 dataDir.incompatibleDbVersion.title=Nesuderinama duomenų bazės versija
 dataDir.incompatibleDbVersion.text=Šiuo metu pasirinktas duomenų katalogas nėra suderinamas su savarankiška Zotero programa, kuri gali dalinti savo duomenimis tik su Zotero, kuri skirta Firefox 2.1b3 ir vėlesnėms versijoms.\n\nĮdiekite Firefox programai skirtą Zotero versiją arba savarankiškai Zotero programai pasirinkite kitą duomenų katalogą.
 dataDir.standaloneMigration.title=Aptikta esama Zotero biblioteka
-dataDir.standaloneMigration.description=Regis Jūs pirmą kartą paleidote %1$S. Ar norėtumėte, kad %1$S  importuotų nuostatas iš %2$S ir naudotų jūsų esamą duomenų katalogą?
+dataDir.standaloneMigration.description=%1$S regis paleista pirmą kartą. Ar norėtumėte, kad %1$S naudotų tas pačias kaip ir %2$S, bei naudotų jos duomenų katalogą?
 dataDir.standaloneMigration.multipleProfiles=%1$S dalinsis savo duomenų katalogu su paskiausiai naudotu profiliu.
 dataDir.standaloneMigration.selectCustom=Savitas duomenų katalogas...

-app.standalone=Savarankiška Zotero programa
-app.firefox=Zotero, skirta Firefox
+app.standalone=„Savarankiška Zotero programa“
+app.firefox=„Firefox naršyklei skirta Zotero“

 startupError=Klaida paleidžiant Zotero.
 startupError.databaseInUse=Jūsiškė duomenų bazė šiuo metu yra naudojama. Tuo pačiu metu tik viena Zotero programa gali naudotis ta pačia duomenų baze.
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Įrašams šią gairę galite priskirti sp
 tagColorChooser.maxTags=Spalvas galite priskirti ne daugiau kaip %S gairėms(-ių).

 pane.items.loading=Įkeliamas įrašų sąrašas...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Prisegti nuorodą į URI
 pane.items.attach.link.uri=Įveskite adresą:
 pane.items.trash.title=Perkelti į šiukšlinę
@ -242,8 +244,8 @@ pane.item.duplicates.onlySameItemType=Apjungti galima tik to paties tipo įrašu

 pane.item.changeType.title=Pakeisti įrašo tipą
 pane.item.changeType.text=Tikrai norėtumėte pakeisti įrašo tipą?\n\nPrarasite tokius laukus:
-pane.item.defaultFirstName=pirmas
-pane.item.defaultLastName=paskutinis
+pane.item.defaultFirstName=vardas
+pane.item.defaultLastName=pavardė
 pane.item.defaultFullName=visas vardas
 pane.item.switchFieldMode.one=Rodyti viename lauke
 pane.item.switchFieldMode.two=Rodyti dviejuose laukuose
@ -697,7 +699,7 @@ integration.cited.loading=Įkeliami cituoti įrašai...
 integration.ibid=ten pat
 integration.emptyCitationWarning.title=Tuščia nuoroda
 integration.emptyCitationWarning.body=Naudojant dabartinį citavimo stilių, šis citavimas atrodys tuščias. Tikrai jį pridėti?
-integration.openInLibrary=Atverti su %S
+integration.openInLibrary=Atverti „%S“

 integration.error.incompatibleVersion=Šis Zotero tekstų rengyklės papildinys ($INTEGRATION_VERSION) nesuderinamas su dabar įdiegta Zotero versija (%1$S). Įsitikinkite, ar naudojate abiejų komponentų naujausias versijas.
 integration.error.incompatibleVersion2=Zotero %1$S programai reikia %2$S %3$S arba naujesnės versijos. Naujausią %2$S versiją parsisiųskite iš zotero.org.
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Šiame puslapyje Zotero aptiko nuorodą. Norėdami nuo
 firstRunGuidance.authorMenu=Zotero leidžia jums dar nurodyti sudarytojus (redaktorius) ir vertėjus. Šiame meniu žmogų, kuris šiuo metu nurodytas esąs autorius, galite nurodyti esant sudarytoju arba vertėju.
 firstRunGuidance.quickFormat=Įveskite ieškomą pavadinimą arba autorių.\n\nPasirinkę norimą, paspauskite ties skrituliuku arba nuspauskite Vald+↓ – tada galėsite nurodyti puslapius, priešdėlius, priesagas. Paieškoje prie ieškomų raktažodžių galite nurodyti puslapius.\n\nCitavimą galite redaguoti tekstų rengyklėje tiesiogiai.
 firstRunGuidance.quickFormatMac=Įveskite ieškomą pavadinimą arba autorių.\n\nPasirinkę norimą, paspauskite ties skrituliuku arba nuspauskite Cmd+↓ – tada galėsite nurodyti puslapius, priešdėlius, priesagas. Paieškoje prie ieškomų raktažodžių galite nurodyti puslapius.\n\nCitavimą galite redaguoti tekstų rengyklėje tiesiogiai.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/mn-MN/zotero/zotero.properties
+++ b/chrome/locale/mn-MN/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Loading items list...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/nb-NO/zotero/zotero.properties
+++ b/chrome/locale/nb-NO/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Laster elementliste...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/nl-NL/zotero/zotero.properties
+++ b/chrome/locale/nl-NL/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=U kan dit label toevoegen aan de geselecte
 tagColorChooser.maxTags=%S labels in elke bibliotheek kunnen kleuren toegewezen krijgen.

 pane.items.loading=Lijst met items wordt geladen…
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Koppel link aan een URI
 pane.items.attach.link.uri=Geef een URI:
 pane.items.trash.title=Naar Prullenbak verplaatsen
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero heeft een verwijzing op deze pagina gevonden. K
 firstRunGuidance.authorMenu=Zotero ondersteund ook redacteuren en vertalers. U kunt een auteur veranderen in een redacteur of vertaler via dit menu.
 firstRunGuidance.quickFormat=Type een titel of auteur in om een verwijzing op te zoeken.\n\nNadat u uw selectie heeft gemaakt, klik op de ballon of druk op Ctrl-↓ om pagina-nummers, voorvoegsels en achtervoegsels toe te voegen. U kunt ook het pagina-nummer toevoegen aan uw zoektermen om het zo automatisch toe te voegen.\n\nU kunt verwijzingen direct aanpassen in het document van de tekstverwerker.
 firstRunGuidance.quickFormatMac=Type een titel of auteur in om een verwijzing op te zoeken.\n\nNadat u uw selectie heeft gemaakt, klik op de ballon of druk op Cmd-↓ om pagina-nummers, voorvoegsels en achtervoegsels toe te voegen. U kunt ook het pagina-nummer toevoegen aan uw zoektermen om het zo automatisch toe te voegen.\n\nU kunt verwijzingen direct aanpassen in het document van de tekstverwerker.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/nn-NO/zotero/zotero.properties
+++ b/chrome/locale/nn-NO/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Lastar elementliste …
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Flytt til søppelkorga
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/pl-PL/zotero/zotero.properties
+++ b/chrome/locale/pl-PL/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Wczytywanie listy elementów...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Dołącz odsyłacz do URI
 pane.items.attach.link.uri=Wprowadź URI:
 pane.items.trash.title=Przenieś do Kosza
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero rozpoznaje cytowanie na tej stronie. Kliknij t
 firstRunGuidance.authorMenu=Zotero pozwala także na dodawanie redaktorów i tłumaczy. Można zmienić autora na tłumacza wybierając z tego menu.
 firstRunGuidance.quickFormat=Wpisz tytuł lub autora aby szukać pozycji w bibliotece.\n\nGdy dokonasz wyboru, kliknij bąbelek lub wciśnij Ctrl-\↓ aby dodać numery stron, przedrostki lub przyrostki. Możesz również wpisać numery stron wraz z wyszukiwanymi frazami, aby dodać je bezpośrednio.\n\nMożesz zmieniać odnośniki bezpośrednio w dokumencie edytora tekstu.
 firstRunGuidance.quickFormatMac=Wpisz tytuł lub autora aby szukać pozycji w bibliotece.\n\nGdy dokonasz wyboru, kliknij bąbelek lub wciśnij Cmd-\↓ aby dodać numery stron, przedrostki lub przyrostki. Możesz również wpisać numery stron wraz z wyszukiwanymi frazami, aby dodać je bezpośrednio.\n\nMożesz zmieniać odnośniki bezpośrednio w dokumencie edytora tekstu.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/pt-BR/zotero/zotero.properties
+++ b/chrome/locale/pt-BR/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Você pode adicionar essa etiqueta para se
 tagColorChooser.maxTags=Até %S etiquetas em cada biblioteca podem ter cores designadas.

 pane.items.loading=Carregando lista de itens...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Anexar Link para URI
 pane.items.attach.link.uri=Digite um URI:
 pane.items.trash.title=Mover para a Lixeira
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero pode reconhecer uma referência nessa página.
 firstRunGuidance.authorMenu=O Zotero também permite que você especifique editores e tradutores. Você pode tornar um autor em um editor ou tradutor através desse menu.
 firstRunGuidance.quickFormat=Digite um título ou autor para procurar por uma referência.\n\nDepois de feita a sua seleção, clique na bolha ou pressione Ctrl-\u2193 para adicionar número de páginas, prefixos ou sufixos. Você também pode incluir um número de página junto aos termos de sua pesquisa para adicioná-lo diretamente.\n\nVocê pode editar citações diretamente no seu processador de texto.
 firstRunGuidance.quickFormatMac=Digite um título ou autor para procurar por uma referência.\n\nDepois de feita a sua seleção, clique na bolha ou pressione Cmd-\u2193 para adicionar os números de página, prefixos ou sufixo. Você também pode incluir um número de página junto aos seus termos de pesquisa para adicioná-lo diretamente.\n\nVocê pode editar as citações diretamente do processador de texto. 
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/pt-PT/zotero/zotero.properties
+++ b/chrome/locale/pt-PT/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Pode adicionar esta etiqueta aos itens sel
 tagColorChooser.maxTags=Pode-se atribuir cores a até %S etiquetas por biblioteca.

 pane.items.loading=Carregando lista de itens...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Anexar Ligação a URI
 pane.items.attach.link.uri=Introduza um URI:
 pane.items.trash.title=Mover para o Lixo
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=O Zotero reconhece uma referência nesta página. Carr
 firstRunGuidance.authorMenu=O Zotero também lhe permite especificar editores e tradutores. Pode transformar um autor num editor ou num tradutor fazendo a sua escolha neste menu.
 firstRunGuidance.quickFormat=Introduza um título ou um autor para procurar uma referência.\n\nDepois de fazer a sua selecção, carregue na bolha ou carregue em Ctrl-\u2193 para adicionar números de páginas, prefixos ou sufixos. Pode também incluir um número de página junto com os termos da sua pesquisa para o adicionar directamente.\n\nPode editar as citações directamente no documento do processador de texto.
 firstRunGuidance.quickFormatMac=Introduza um título ou um autor para procurar uma referência.\n\nDepois de fazer a sua selecção, carregue na bolha ou carregue em Cmd-\u2193 para adicionar números de páginas, prefixos ou sufixos. Pode também incluir um número de página junto com os termos da sua pesquisa para o adicionar directamente.\n\nPode editar as citações directamente no documento do processador de texto.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/ro-RO/zotero/zotero.properties
+++ b/chrome/locale/ro-RO/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Poți adăuga această etichetă la înreg
 tagColorChooser.maxTags=Până la %S etichete în fiecare bibliotecă pot avea asignate culori.

 pane.items.loading=Încarcă lista înregistrărilor...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Anexează link la URI
 pane.items.attach.link.uri=Introdu un URI:
 pane.items.trash.title=Mută în coșul de gunoi
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero a găsit o referință pe această pagină. Fă
 firstRunGuidance.authorMenu=Zotero îți permite, de asemenea, să specifici editorii și traducătorii. Poți să schimbi un autor într-un editor sau traducător făcând o selecție în acest meniu. 
 firstRunGuidance.quickFormat=Tastează un titlu sau un autor pentru a căuta o referință.\n\nDupă ce ai făcut selecția pe care o dorești, apasă bulina sau  Ctrl-↓ pentru a adăuga numere de pagină, prefixe sau sufixe. Poți, de asemenea, să incluzi un număr de pagină odată cu căutarea termenilor pentru a-l adăuga direct.\n\nPoți modifica citările direct în documentul din procesorul de texte.
 firstRunGuidance.quickFormatMac=Tastează un titlu sau un autor pentru a căuta o referință.\n\nDupă ce ai făcut selecția pe care o dorești, apasă bulina sau Cmd-↓ pentru a adăuga numere de pagină, prefixe sau sufixe. Poți, de asemenea, să incluzi numărul de pagină odată cu căutarea termenilor, pentru a-l adăuga direct.\n\nPoți modifica citările direct în documentul din procesorul de texte.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/ru-RU/zotero/zotero.properties
+++ b/chrome/locale/ru-RU/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Тег для данного элемен
 tagColorChooser.maxTags=Цвет может быть назначен %S тегам(-у) в каждой библиотеке.

 pane.items.loading=Загружается список документов…
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Прикрепить ссылку на URI
 pane.items.attach.link.uri=Укажите URI:
 pane.items.trash.title=Поместить в Корзину
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero может распознать ссылку н
 firstRunGuidance.authorMenu=Zotero также позволяет указывать редакторов и трансляторов. Вы можете превратить автора в редактора или в транслятора, сделав выбор в меню.
 firstRunGuidance.quickFormat=Введите наименование или автора для поиска по ссылке.\n\nПосле выбора, нажмите на сноску или Ctrl-↓ для добавления номеров страниц, префиксов или суффиксов. Также можно включить номер страницы в условия поиска, чтобы сразу его добавить.\n\n\Цитаты можно редактировать в самом документе, открытом в редакторе.
 firstRunGuidance.quickFormatMac=Введите наименование или автора для поиска по ссылке.\n\nПосле выбора, нажмите на сноску или Cmd-↓ для добавления номеров страниц, префиксов или суффиксов. Также можно включить номер страницы в условия поиска, чтобы сразу его добавить.\n\n\Цитаты можно редактировать в самом документе, открытом в редакторе.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/sk-SK/zotero/zotero.properties
+++ b/chrome/locale/sk-SK/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Túto značku môžete pridať k vybraném
 tagColorChooser.maxTags=Najviac %S značiek v každej knižnici môže mať pridelené farby.

 pane.items.loading=Nahrávam zoznam položiek...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Pripojiť odkaz na URI
 pane.items.attach.link.uri=Vložiť URI:
 pane.items.trash.title=Presunúť do koša
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero dokáže rozpoznať citáciu na tejto stránke.
 firstRunGuidance.authorMenu=Zotero vám tiež dovoľuje určiť zostavovateľov a prekladateľov. Autora môžete zmeniť na zostavovateľa alebo prekladateľa pomocou výberu z tejto ponuky.
 firstRunGuidance.quickFormat=Zadaním názvu alebo autora spustíte hľadanie odkazu.\n\nPo uskutočnení výberu, kliknite na bublinu alebo stlačte Ctrl-\u2193 na pridanie čísiel strán, predpôn alebo prípon. Môžete tiež pridať číslo strany spolu s hľadanými pojmamy, a tak ich môžete zadať priamo.\n\nCitácie môžete upravovať priamo v dokumente textového procesora.
 firstRunGuidance.quickFormatMac=Zadaním názvu alebo autora spustíte hľadanie odkazu.\n\nPo uskutočnení výberu, kliknite na bublinu alebo stlačte Ctrl-\u2193 na pridanie čísiel strán, predpôn alebo prípon. Môžete tiež pridať číslo strany spolu s hľadanými pojmamy, a tak ich môžete zadať priamo.\n\nCitácie môžete upravovať priamo v dokumente textového procesora.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/sl-SI/zotero/zotero.properties
+++ b/chrome/locale/sl-SI/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=To značko lahko dodate izbranim vnosom s
 tagColorChooser.maxTags=Največ %S značk v vsaki knjižnici ima lahko dodeljeno barvo.

 pane.items.loading=Nalaganje seznama vnosov ...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=URI pripni povezavo
 pane.items.attach.link.uri=Vnesite URI:
 pane.items.trash.title=Premakni v koš
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero lahko prepozna sklic na tej strani. Kliknite to
 firstRunGuidance.authorMenu=Zotero omogoča tudi določitev urednikov in prevajalcev. Avtorja lahko spremenite v urednika ali prevajalca z ukazom v tem meniju.
 firstRunGuidance.quickFormat=Za iskanje sklica vnesite naslov ali avtorja.\n\nKo ste opravili izbor, kliknite oblaček ali pritisnite krmilka-\u2193 za dodajanje številk strani, predpon ali pripon. Z iskanimi nizi lahko neposredno vnesete tudi številko strani.\n\nNavedke lahko uredite neposredno v dokumentu urejevalnika besedil.
 firstRunGuidance.quickFormatMac=Za iskanje sklica vnesite naslov ali avtorja.\n\nKo ste opravili izbor, kliknite oblaček ali pritisnite Cmd-\u2193 za dodajanje številk strani, predpon ali pripon. Z iskanimi nizi lahko neposredno vnesete tudi številko strani.\n\nNavedke lahko uredite neposredno v dokumentu urejevalnika besedil.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/sr-RS/zotero/zotero.properties
+++ b/chrome/locale/sr-RS/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Учитавам списак ставки...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Премести у корпу за отпатке
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/sv-SE/zotero/zotero.properties
+++ b/chrome/locale/sv-SE/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Du kan lägga till denna etikett till vald
 tagColorChooser.maxTags=Upp till %S etiketter i varje katalog kan förses med en färg.

 pane.items.loading=Laddar lista med källor...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Bifoga länk till URI
 pane.items.attach.link.uri=Ange en URI:
 pane.items.trash.title=Flytta till papperskorgen
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero känner igen en referens på denna sidan. Klick
 firstRunGuidance.authorMenu=Zotero låter dig även ange redaktörer och översättare. Du kan göra så att en författare anges som redaktör eller översättare från denna meny.
 firstRunGuidance.quickFormat=Skriv in en titel eller författare för att söka bland referenserna.\n\nEfter att du har gjort ditt val, klicka i rutan eller tryck Ctrl-\u2193 för att lägga till sidnummer, prefix eller suffix. Du kan också lägga in ett sidnummer tillsammans med din sökning för att lägga till det direkt.\n\nDu kan redigera citeringen direkt i ordbehandlaren.
 firstRunGuidance.quickFormatMac=Skriv in en titel eller författare för att söka bland referenserna.\n\nEfter att du har gjort ditt val, klicka i rutan eller tryck Ctrl-\u2193 för att lägga till sidnummer, prefix eller suffix. Du kan också lägga in ett sidnummer tillsammans med din sökning för att lägga till det direkt.\n\nDu kan redigera citeringen direkt i ordbehandlaren.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/th-TH/zotero/zotero.properties
+++ b/chrome/locale/th-TH/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=กำลังบรรจุรายการ...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=ย้ายลงถังขยะ
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero สามารถจดจำเอกสา
 firstRunGuidance.authorMenu=Zotero ให้คุณกำหนดบรรณาธิการและผู้แปลด้วย คุณสามารถเปลี่ยนจากผู้แต่งเป็นบรรณาธิการหรือผู้แปลได้โดยเลือกจากเมนูนี้
 firstRunGuidance.quickFormat=พิมพ์ชื่อเรื่องหรือผู้แต่งเพื่อค้นหาเอกสารอ้างอิง\n\nหลังจากเลือกแล้ว ให้คลิกฟองหรือกด Ctrl-\u2193 เพื่อเพิ่มเลขหน้า คำนำหน้าหรือคำตามหลัง คุณสามารถใส่เลขหน้าไปพร้อมกับคำที่ต้องการค้นหาได้โดยตรง\n\nคุณสามารถแก้ไขการอ้างอิงในโปรแกรมประมวลผคำได้โดยตรง
 firstRunGuidance.quickFormatMac=พิมพ์ชื่อเรื่องหรือผู้แต่งเพื่อค้นหาเอกสารอ้างอิง\n\nหลังจากเลือกแล้ว ให้คลิกฟองหรือกด Cmd-\u2193 เพื่อเพิ่มเลขหน้า คำนำหน้าหรือคำตามหลัง คุณสามารถใส่เลขหน้าไปพร้อมกับคำที่ต้องการค้นหาได้โดยตรง\n\nคุณสามารถแก้ไขการอ้างอิงในโปรแกรมประมวลผลคำได้โดยตรง
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/tr-TR/zotero/zotero.properties
+++ b/chrome/locale/tr-TR/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=Bu etiketi klavyedeki $NUMBER tuşuna basa
 tagColorChooser.maxTags=Her kitaplıkta sadece %S etikete renk atanmış olabilir.

 pane.items.loading=Eserlerin listesi yükleniyor...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=URI'ye Bağlantı Ekle.
 pane.items.attach.link.uri=Bir URI giriniz:
 pane.items.trash.title=Çöpe Gönder
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero bu sayfada bir kaynak tanıdı. Kaynağı, adre
 firstRunGuidance.authorMenu=Zotero istediğiniz düzenleyici ve çevirmenleri belirtmenize izin vermektedir. Bu menüden seçerek, bir yazarı düzenleyici veya çevirmene dönüştürebilirsiniz.
 firstRunGuidance.quickFormat=Bir kaynak aramak için bir başlık ya da yazar adı yazınız.\n\nSeçiminizi yaptıktan sonra, sayfa numaraları, önekler ve sonekler eklemek için kabarcığa tıklayınız veya Ctrl-\u2193'ya basınız. Ayrıca arama terimlerinize sayfa numarasını katarak, onları doğrudan ekleyebilirsiniz.\n\nGöndermelerinizi sözcük işlemcisi belgesinde doğrudan değiştirebilirsiniz.
 firstRunGuidance.quickFormatMac=Bir kaynak aramak için bir başlık ya da yazar adı yazınız.\n\nSeçiminizi yaptıktan sonra, sayfa numaraları, önekler ve sonekler eklemek için kabarcığa tıklayınız veya Cmd-\u2193'ya basınız. Ayrıca arama terimlerinize sayfa numarasını katarak, onları doğrudan ekleyebilirsiniz.\n\nGöndermelerinizi sözcük işlemcisi belgesinde doğrudan değiştirebilirsiniz.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/vi-VN/zotero/zotero.properties
+++ b/chrome/locale/vi-VN/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=Tải danh sách các biểu ghi...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=Move to Trash
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero has found a reference on this page. Click this
 firstRunGuidance.authorMenu=Zotero lets you specify editors and translators, too. You can turn an author into an editor or translator by selecting from this menu.
 firstRunGuidance.quickFormat=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Ctrl-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
 firstRunGuidance.quickFormatMac=Type a title or author to search for a reference.\n\nAfter you've made your selection, click the bubble or press Cmd-↓ to add page numbers, prefixes, or suffixes. You can also include a page number along with your search terms to add it directly.\n\nYou can edit citations directly in the word processor document.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/zh-CN/zotero/zotero.properties
+++ b/chrome/locale/zh-CN/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=你可以通过按下$NUMBER 为选定的
 tagColorChooser.maxTags=每个库只允许为%S个标签标记颜色

 pane.items.loading=正在加载条目列表...
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=附加连接到URI
 pane.items.attach.link.uri=输入URI:
 pane.items.trash.title=移动到回收站
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero 可以识别该页面中的参考文献. 在地
 firstRunGuidance.authorMenu=Zotero 允许您指定编辑及译者. 您可以从该菜单选择变更编辑或译者
 firstRunGuidance.quickFormat=键入一个标题或作者搜索特定的参考文献.\n\n一旦选中, 点击气泡或按下 Ctrl-↓ 添加页码, 前缀或后缀. 您也可以将页码直接包含在你的搜索条目中, 然后直接添加.\n\n您可以在文字处理程序中直接编辑引文.
 firstRunGuidance.quickFormatMac=键入一个标题或作者搜索特定的参考文献.\n\n一旦选中, 点击气泡或按下 Cmd-↓ 添加页码, 前缀或后缀.您也可以将页码直接包含在你的搜索条目中, 然后直接添加.\n\n您可以在文字处理程序中直接编辑引文.
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/locale/zh-TW/zotero/zotero.properties
+++ b/chrome/locale/zh-TW/zotero/zotero.properties
@ -192,6 +192,8 @@ tagColorChooser.numberKeyInstructions=You can add this tag to selected items by
 tagColorChooser.maxTags=Up to %S tags in each library can have colors assigned.

 pane.items.loading=正在載入項目清單…
+pane.items.columnChooser.moreColumns=More Columns
+pane.items.columnChooser.secondarySort=Secondary Sort (%S)
 pane.items.attach.link.uri.title=Attach Link to URI
 pane.items.attach.link.uri=Enter a URI:
 pane.items.trash.title=移到垃圾筒
@ -963,3 +965,5 @@ firstRunGuidance.saveIcon=Zotero 能辨識此頁的參考文獻條。按網址
 firstRunGuidance.authorMenu=Zotero 也讓您指定編者與譯者。您能由此選單選擇將作者轉成編者或譯者。
 firstRunGuidance.quickFormat=輸入標題或作者以找出參考文獻條。\n\n您選擇後，按橢圓泡或按 Ctrl-\u2193 以加入頁碼或前綴或後綴。您也可以在待找字後加上頁碼產生無前後綴的引用文獻條。\n\n您可以在文書處理器直接編輯引用文獻條。
 firstRunGuidance.quickFormatMac=輸入標題或作者以找出參考文獻條。\n\n您選擇後，按橢圓泡或按 Ctrl-\u2193 以加入頁碼或前綴或後綴。您也可以在待找字後加上頁碼產生無前後綴的引用文獻條。\n\n您可以在文書處理器直接編輯引用文獻條。
+firstRunGuidance.toolbarButton.new=Click here to open Zotero, or use the %S keyboard shortcut.
+firstRunGuidance.toolbarButton.upgrade=The Zotero icon can now be found in the Firefox toolbar. Click the icon to open Zotero, or use the %S keyboard shortcut.
--- a/chrome/skin/default/zotero/mac/twisty-active-open.png
+++ b/chrome/skin/default/zotero/mac/twisty-active-open.png
--- a/chrome/skin/default/zotero/mac/twisty-active-open.svg
+++ b/chrome/skin/default/zotero/mac/twisty-active-open.svg
@ -0,0 +1,15 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+	 - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg  xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#444">
+    <polyline points="3 4 12 4 7.5 12"/>
+    <g transform="translate(0,16)">
+      <polyline points="3 4 12 4 7.5 12" transform="rotate(-90, 7.5, 7.5)"/>
+    </g>
+  </g>
+</svg>
+
--- a/chrome/skin/default/zotero/mac/twisty-active.png
+++ b/chrome/skin/default/zotero/mac/twisty-active.png
--- a/chrome/skin/default/zotero/mac/twisty-active.svg
+++ b/chrome/skin/default/zotero/mac/twisty-active.svg
@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+	 - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg  xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#444">
+    <polyline points="3 4 12 4 7.5 12" transform="rotate(-90, 7.5, 7.5)"/>
+  </g>
+</svg>
+
--- a/chrome/skin/default/zotero/mac/twisty-open.png
+++ b/chrome/skin/default/zotero/mac/twisty-open.png
--- a/chrome/skin/default/zotero/mac/twisty-open.svg
+++ b/chrome/skin/default/zotero/mac/twisty-open.svg
@ -0,0 +1,11 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+	 - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg  xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#888">
+    <polyline points="3 4 12 4 7.5 12"/>
+  </g>
+</svg>
--- a/chrome/skin/default/zotero/mac/twisty-selected-active-open.svg
+++ b/chrome/skin/default/zotero/mac/twisty-selected-active-open.svg
@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+	 - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg  xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      width="16" height="16" viewBox="0 0 16 16">
+  <g fill="rgba(255, 255, 255, 0.7)">
+    <polyline points="3 4 12 4 7.5 12"/>
+  </g>
+</svg>
+
--- a/chrome/skin/default/zotero/mac/twisty-selected-active.svg
+++ b/chrome/skin/default/zotero/mac/twisty-selected-active.svg
@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+	 - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg  xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      width="16" height="16" viewBox="0 0 16 16">
+  <g fill="rgba(255, 255, 255, 0.7)">
+    <polyline points="3 4 12 4 7.5 12" transform="rotate(-90, 7.5, 7.5)"/>
+  </g>
+</svg>
+
--- a/chrome/skin/default/zotero/mac/twisty-selected-open.png
+++ b/chrome/skin/default/zotero/mac/twisty-selected-open.png
--- a/chrome/skin/default/zotero/mac/twisty-selected-open.svg
+++ b/chrome/skin/default/zotero/mac/twisty-selected-open.svg
@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+	 - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg  xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#FFF">
+    <polyline points="3 4 12 4 7.5 12"/>
+  </g>
+</svg>
+
--- a/chrome/skin/default/zotero/mac/twisty-selected.png
+++ b/chrome/skin/default/zotero/mac/twisty-selected.png
--- a/chrome/skin/default/zotero/mac/twisty-selected.svg
+++ b/chrome/skin/default/zotero/mac/twisty-selected.svg
@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+	 - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg  xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#FFF">
+    <polyline points="3 4 12 4 7.5 12" transform="rotate(-90, 7.5, 7.5)"/>
+  </g>
+</svg>
+
--- a/chrome/skin/default/zotero/mac/twisty.png
+++ b/chrome/skin/default/zotero/mac/twisty.png
--- a/chrome/skin/default/zotero/mac/twisty.svg
+++ b/chrome/skin/default/zotero/mac/twisty.svg
@ -0,0 +1,12 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+	 - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<svg  xmlns="http://www.w3.org/2000/svg"
+      xmlns:xlink="http://www.w3.org/1999/xlink"
+      width="16" height="16" viewBox="0 0 16 16">
+  <g fill="#888">
+    <polyline points="3 4 12 4 7.5 12" transform="rotate(-90, 7.5, 7.5)"/>
+  </g>
+</svg>
+
--- a/chrome/skin/default/zotero/zotero.css
+++ b/chrome/skin/default/zotero/zotero.css
@ -174,11 +174,6 @@ zoteroguidancepanel
 	-moz-binding: url('chrome://zotero/content/bindings/guidancepanel.xml#guidancepanel');
 }

-#zotero-items-columns-header  > treecolpicker
- {
-	-moz-binding: url('chrome://zotero/content/bindings/columnpicker.xml#extended-columnpicker');
-}
-
 zoterofilesyncstatus {
 	-moz-binding: url('chrome://zotero/content/bindings/filesyncstatus.xml#file-sync-status');
 }
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@ -61,6 +61,9 @@ pref("extensions.zotero.lastViewedFolder", 'L');
 pref("extensions.zotero.lastLongTagMode", 0);
 pref("extensions.zotero.lastLongTagDelimiter", ";");

+pref("extensions.zotero.fallbackSort", 'firstCreator,date,title,dateAdded');
+pref("extensions.zotero.sortCreatorAsString", false);
+
 //Tag Cloud
 pref("extensions.zotero.tagCloud", false);

@ -175,5 +178,5 @@ pref("extensions.zotero.fallbackLauncher.windows", "");
 //Translators
 pref("extensions.zotero.translators.attachSupplementary", false);
 pref("extensions.zotero.translators.supplementaryAsLink", false);
-pref("extensions.zotero.translators.RIS.import.ignoreUnknown", false);
+pref("extensions.zotero.translators.RIS.import.ignoreUnknown", true);
 pref("extensions.zotero.translators.RIS.import.keepID", false);
--- a/install.rdf
+++ b/install.rdf
@ -16,7 +16,7 @@
    <em:homepageURL>http://www.zotero.org</em:homepageURL>
    <em:optionsURL>chrome://zotero/content/preferences/preferences.xul</em:optionsURL>
    <em:aboutURL>chrome://zotero/content/about.xul</em:aboutURL>
-    <em:iconURL>chrome://zotero/skin/zotero_z_32px.png</em:iconURL>
+    <em:iconURL>chrome://zotero/skin/zotero-new-z-48px.png</em:iconURL>
    <em:updateURL>https://www.zotero.org/download/update-source.rdf</em:updateURL>
    <em:type>2</em:type> <!-- type=extension --> 
    
--- a/resource/schema/repotime.txt
+++ b/resource/schema/repotime.txt
@ -1 +1 @@
-2014-04-24 05:50:01
+2014-04-29 04:00:01
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit e1031d2e961d6613497171e85d8d8574d39c1cb0
+Subproject commit 0c7b09949ae951836d5d746b9b5f92798f8a68d0